WIP json refactor - initial tidy

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanCollectionHelp.java

@@ -9,7 +9,7 @@ import com.avaje.ebean.bean.BeanCollection;
 import com.avaje.ebean.bean.BeanCollectionAdd;
 import com.avaje.ebean.bean.BeanCollectionLoader;
 import com.avaje.ebean.bean.EntityBean;
-import com.avaje.ebeaninternal.server.text.json.WriteJsonContext;
+import com.avaje.ebeaninternal.server.text.json.WriteJson;
 
 /**
  * Helper functions for performing tasks on Lists Sets or Maps.
@@ -62,6 +62,6 @@ public interface BeanCollectionHelp<T> {
 	/**
 	 * Write the collection out as json.
 	 */
-    public void jsonWrite(WriteJsonContext ctx, String name, Object collection, boolean explicitInclude);
+    public void jsonWrite(WriteJson ctx, String name, Object collection, boolean explicitInclude);
 
 }

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptor.java

@@ -35,8 +35,6 @@ import com.avaje.ebean.event.BeanPersistListener;
 import com.avaje.ebean.event.BeanQueryAdapter;
 import com.avaje.ebean.meta.MetaBeanInfo;
 import com.avaje.ebean.meta.MetaQueryPlanStatistic;
-import com.avaje.ebean.text.TextException;
-import com.avaje.ebean.text.json.JsonWriteBeanVisitor;
 import com.avaje.ebeaninternal.api.HashQueryPlan;
 import com.avaje.ebeaninternal.api.SpiEbeanServer;
 import com.avaje.ebeaninternal.api.SpiQuery;
@@ -63,10 +61,7 @@ import com.avaje.ebeaninternal.server.query.CQueryPlan;
 import com.avaje.ebeaninternal.server.query.CQueryPlanStats.Snapshot;
 import com.avaje.ebeaninternal.server.query.SplitName;
 import com.avaje.ebeaninternal.server.querydefn.OrmQueryDetail;
-import com.avaje.ebeaninternal.server.text.json.ReadJsonContext;
-import com.avaje.ebeaninternal.server.text.json.ReadJsonContext.ReadBeanState;
-import com.avaje.ebeaninternal.server.text.json.WriteJsonContext;
-import com.avaje.ebeaninternal.server.text.json.WriteJsonContext.WriteBeanState;
+import com.avaje.ebeaninternal.server.text.json.WriteJson;
 import com.avaje.ebeaninternal.server.type.DataBind;
 import com.avaje.ebeaninternal.server.type.TypeManager;
 import com.avaje.ebeaninternal.util.SortByClause;
@@ -2121,84 +2116,16 @@ public class BeanDescriptor<T> implements MetaBeanInfo {
     return propertiesLocal;
   }
 
-  public void jsonWrite(WriteJsonContext ctx, EntityBean bean) {
-
-    if (bean != null) {
-
-      ctx.appendObjectBegin();
-      WriteBeanState prevState = ctx.pushBeanState(bean);
-
-      if (inheritInfo != null) {
-        InheritInfo localInheritInfo = inheritInfo.readType(bean.getClass());
-        String discValue = localInheritInfo.getDiscriminatorStringValue();
-        String discColumn = localInheritInfo.getDiscriminatorColumn();
-        ctx.appendDiscriminator(discColumn, discValue);
-
-        BeanDescriptor<?> localDescriptor = localInheritInfo.getBeanDescriptor();
-        localDescriptor.jsonWriteProperties(ctx, bean);
-
-      } else {
-        jsonWriteProperties(ctx, bean);
-      }
-
-      ctx.pushPreviousState(prevState);
-      ctx.appendObjectEnd();
-    }
+  public void jsonWrite(WriteJson writeJson, EntityBean bean) {
+    jsonHelp.jsonWrite(writeJson, bean, null);
+  }  
+  
+  public void jsonWrite(WriteJson writeJson, EntityBean bean, String key) {
+    jsonHelp.jsonWrite(writeJson, bean, key);
   }
 
-  @SuppressWarnings("unchecked")
-  private void jsonWriteProperties(WriteJsonContext ctx, EntityBean bean) {
-
-    JsonWriteBeanVisitor<T> beanVisitor = (JsonWriteBeanVisitor<T>) ctx.getBeanVisitor();
-
-    Set<String> props = ctx.getIncludeProperties();
-
-    boolean explicitAllProps;
-    if (props == null) {
-      explicitAllProps = false;
-    } else {
-      explicitAllProps = props.contains("*");
-      if (explicitAllProps || props.isEmpty()) {
-        props = null;
-      }
-    }
-
-    if (idProperty != null) {
-      Object idValue = idProperty.getValue(bean);
-      if (idValue != null) {
-        if (props == null || props.contains(idProperty.getName())) {
-          idProperty.jsonWrite(ctx, bean);
-        }
-      }
-    }
-
-    if (!explicitAllProps && props == null) {
-      // just render the loaded properties
-      props = ((EntityBean)bean)._ebean_getIntercept().getLoadedPropertyNames();
-    }
-    if (props != null) {
-      // render only the appropriate properties (when not all properties)
-      for (String prop : props) {
-        BeanProperty p = getBeanProperty(prop);
-        if (p != null && !p.isId()) {
-          p.jsonWrite(ctx, bean);
-        }
-      }
-    } else {
-      if (explicitAllProps || !isReference(bean._ebean_getIntercept())) {
-        // render all the properties and invoke lazy loading if required
-        for (int j = 0; j < propertiesNonTransient.length; j++) {
-          propertiesNonTransient[j].jsonWrite(ctx, bean);
-        }
-        for (int j = 0; j < propertiesTransient.length; j++) {
-          propertiesTransient[j].jsonWrite(ctx, bean);
-        }
-      }
-    }
-
-    if (beanVisitor != null) {
-      beanVisitor.visit((T) bean, ctx);
-    }
+  protected void jsonWriteProperties(WriteJson writeJson, EntityBean bean) {
+    jsonHelp.jsonWriteProperties(writeJson, bean);
   }
     
   public T jsonRead(JsonParser parser, String path) {

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorJsonHelp.java

@@ -1,111 +1,56 @@
 package com.avaje.ebeaninternal.server.deploy;
 
-import java.util.Set;
-
-import javax.json.stream.JsonGenerator;
 import javax.json.stream.JsonParser;
 import javax.json.stream.JsonParser.Event;
 
 import com.avaje.ebean.bean.EntityBean;
-import com.avaje.ebean.json.EJson;
 import com.avaje.ebean.text.TextException;
-import com.avaje.ebean.text.json.JsonWriteBeanVisitor;
-import com.avaje.ebeaninternal.server.text.json.WriteJsonContext;
-import com.avaje.ebeaninternal.server.text.json.WriteJsonContext.WriteBeanState;
+import com.avaje.ebeaninternal.server.text.json.WriteJson;
+import com.avaje.ebeaninternal.server.text.json.WriteJson.WriteBean;
 
 public class BeanDescriptorJsonHelp<T> {
 
   private final BeanDescriptor<T> desc;
+  
   private final InheritInfo inheritInfo;
   
   public BeanDescriptorJsonHelp(BeanDescriptor<T> desc) {
     this.desc = desc;
     this.inheritInfo = desc.inheritInfo;
   }
+  
+  public void jsonWrite(WriteJson writeJson, EntityBean bean, String key) {
 
+//    if (writeJson.hasBean()) {
 
-  public void jsonWrite(JsonGenerator ctx, EntityBean bean) {
-
-    if (bean != null) {
-
-      ctx.writeStartObject();
+      writeJson.writeStartObject(key);
       //WriteBeanState prevState = ctx.pushBeanState(bean);
 
-      if (inheritInfo != null) {
+      if (inheritInfo == null) {
+        jsonWriteProperties(writeJson, bean);
+        
+      } else {
         InheritInfo localInheritInfo = inheritInfo.readType(bean.getClass());
         String discValue = localInheritInfo.getDiscriminatorStringValue();
         String discColumn = localInheritInfo.getDiscriminatorColumn();
-        ctx.write(discColumn, discValue);
-        //ctx.appendDiscriminator(discColumn, discValue);
+        writeJson.gen().write(discColumn, discValue);
 
         BeanDescriptor<?> localDescriptor = localInheritInfo.getBeanDescriptor();
-        localDescriptor.jsonWriteProperties(ctx, bean);
-
-      } else {
-        jsonWriteProperties(ctx, bean);
-      }
+        localDescriptor.jsonWriteProperties(writeJson, bean);
+      } 
 
       //ctx.pushPreviousState(prevState);
-      //ctx.appendObjectEnd();
-      ctx.writeEnd();
-    }
+      writeJson.gen().writeEnd();
   }
 
-  @SuppressWarnings("unchecked")
-  private void jsonWriteProperties(JsonGenerator ctx, EntityBean bean) {
+  protected void jsonWriteProperties(WriteJson writeJson, EntityBean bean) {
 
-    //JsonWriteBeanVisitor<T> beanVisitor = (JsonWriteBeanVisitor<T>) ctx.getBeanVisitor();
-
-    Set<String> props = ctx.getIncludeProperties();
-
-    boolean explicitAllProps;
-    if (props == null) {
-      explicitAllProps = false;
-    } else {
-      explicitAllProps = props.contains("*");
-      if (explicitAllProps || props.isEmpty()) {
-        props = null;
-      }
-    }
-
-    if (desc.idProperty != null) {
-      Object idValue = desc.idProperty.getValue(bean);
-      if (idValue != null) {
-        if (props == null || props.contains(idProperty.getName())) {
-          idProperty.jsonWrite(ctx, bean);
-        }
-      }
-    }
-
-    if (!explicitAllProps && props == null) {
-      // just render the loaded properties
-      props = ((EntityBean)bean)._ebean_getIntercept().getLoadedPropertyNames();
-    }
-    if (props != null) {
-      // render only the appropriate properties (when not all properties)
-      for (String prop : props) {
-        BeanProperty p = getBeanProperty(prop);
-        if (p != null && !p.isId()) {
-          p.jsonWrite(ctx, bean);
-        }
-      }
-    } else {
-      if (explicitAllProps || !isReference(bean._ebean_getIntercept())) {
-        // render all the properties and invoke lazy loading if required
-        for (int j = 0; j < propertiesNonTransient.length; j++) {
-          propertiesNonTransient[j].jsonWrite(ctx, bean);
-        }
-        for (int j = 0; j < propertiesTransient.length; j++) {
-          propertiesTransient[j].jsonWrite(ctx, bean);
-        }
-      }
-    }
-
-    if (beanVisitor != null) {
-      beanVisitor.visit((T) bean, ctx);
-    }
+    
+    WriteBean writeBean = writeJson.createWriteBean(desc, bean);
+    writeBean.write(writeJson);
   }
-
+  
+  
   @SuppressWarnings("unchecked")
   public T jsonRead(JsonParser parser, String path) {
     
@@ -124,7 +69,6 @@ public class BeanDescriptorJsonHelp<T> {
       return jsonReadObject(parser, path);
     } 
     
-
     // check for the discriminator value to determine the correct sub type
     String discColumn = inheritInfo.getRoot().getDiscriminatorColumn();
 
@@ -135,6 +79,13 @@ public class BeanDescriptorJsonHelp<T> {
     
     String propName = parser.getString();      
     if (!propName.equalsIgnoreCase(discColumn)) {
+      // just try to assume this is the correct bean type in the inheritance 
+      BeanProperty property = desc.getBeanProperty(propName);
+      if (property != null) {
+        EntityBean bean = desc.createEntityBean();
+        property.jsonRead(parser, bean);
+        return jsonReadProperties(parser, bean);
+      }
       String msg = "Error reading inheritance discriminator, expected property ["+discColumn+"] but got [" + propName + "] ?";
       throw new TextException(msg);        
     }
@@ -152,12 +103,17 @@ public class BeanDescriptorJsonHelp<T> {
     return (T) localDescriptor.jsonReadObject(parser, path);
   }
   
-  @SuppressWarnings("unchecked")
   protected T jsonReadObject(JsonParser parser, String path) {
 
     EntityBean bean = desc.createEntityBean();
     //ctx.pushBean(bean, path, this);
 
+    return jsonReadProperties(parser, bean);
+  }
+  
+  @SuppressWarnings("unchecked")
+  protected T jsonReadProperties(JsonParser parser, EntityBean bean) {
+
     do {
      
       if (parser.hasNext()) {
@@ -169,7 +125,7 @@ public class BeanDescriptorJsonHelp<T> {
             p.jsonRead(parser, bean);
           
           } else {
-            Object rawValue = EJson.parse(parser);           
+            //Object rawValue = EJson.parse(parser);           
             // unknown property key ...
             //ctx.readUnmappedJson(propName);
           }
@@ -183,7 +139,6 @@ public class BeanDescriptorJsonHelp<T> {
       }
       
     } while (true);
-
     return (T)bean;
   }
     

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanListHelp.java

@@ -12,7 +12,7 @@ import com.avaje.ebean.bean.BeanCollectionAdd;
 import com.avaje.ebean.bean.BeanCollectionLoader;
 import com.avaje.ebean.bean.EntityBean;
 import com.avaje.ebean.common.BeanList;
-import com.avaje.ebeaninternal.server.text.json.WriteJsonContext;
+import com.avaje.ebeaninternal.server.text.json.WriteJson;
 
 /**
  * Helper object for dealing with Lists.
@@ -128,7 +128,7 @@ public final class BeanListHelp<T> implements BeanCollectionHelp<T> {
     }
   }
 
-  public void jsonWrite(WriteJsonContext ctx, String name, Object collection, boolean explicitInclude) {
+  public void jsonWrite(WriteJson ctx, String name, Object collection, boolean explicitInclude) {
 
     List<?> list;
     if (collection instanceof BeanCollection<?>) {
@@ -147,15 +147,11 @@ public final class BeanListHelp<T> implements BeanCollectionHelp<T> {
       list = (List<?>) collection;
     }
 
-    ctx.beginAssocMany(name);
+    ctx.gen().writeStartArray(name);
     for (int j = 0; j < list.size(); j++) {
-      if (j > 0) {
-        ctx.appendComma();
-      }
-      Object detailBean = list.get(j);
-      targetDescriptor.jsonWrite(ctx, (EntityBean)detailBean);
+      targetDescriptor.jsonWrite(ctx, (EntityBean)list.get(j));
     }
-    ctx.endAssocMany();
+    ctx.gen().writeEnd();
   }
 
 }

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanMapHelp.java

@@ -13,7 +13,7 @@ import com.avaje.ebean.bean.BeanCollectionAdd;
 import com.avaje.ebean.bean.BeanCollectionLoader;
 import com.avaje.ebean.bean.EntityBean;
 import com.avaje.ebean.common.BeanMap;
-import com.avaje.ebeaninternal.server.text.json.WriteJsonContext;
+import com.avaje.ebeaninternal.server.text.json.WriteJson;
 
 /**
  * Helper specifically for dealing with Maps.
@@ -156,7 +156,7 @@ public final class BeanMapHelp<T> implements BeanCollectionHelp<T> {
 		}
 	}
 
-    public void jsonWrite(WriteJsonContext ctx, String name, Object collection, boolean explicitInclude) {
+    public void jsonWrite(WriteJson ctx, String name, Object collection, boolean explicitInclude) {
         
         Map<?,?> map;
         if (collection instanceof BeanCollection<?>){
@@ -175,19 +175,14 @@ public final class BeanMapHelp<T> implements BeanCollectionHelp<T> {
             map = (Map<?,?>)collection;
         }
         
-        int count = 0;
-        ctx.beginAssocMany(name);
+        ctx.gen().writeStartArray(name);
         Iterator<?> it = map.entrySet().iterator();
         while (it.hasNext()) {
             Entry<?, ?> entry = (Entry<?, ?>)it.next();
-            if (count++ > 0){
-                ctx.appendComma();
-            }
             //FIXME: json write map key ...
-            Object detailBean = entry.getValue();
-            targetDescriptor.jsonWrite(ctx, (EntityBean)detailBean);
+            targetDescriptor.jsonWrite(ctx, (EntityBean) entry.getValue());
         }
-        ctx.endAssocMany();      
+        ctx.gen().writeEnd();      
     }
 
 }

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanProperty.java

@@ -10,7 +10,6 @@ import java.sql.Types;
 import java.util.List;
 import java.util.Map;
 
-import javax.json.stream.JsonGenerator;
 import javax.json.stream.JsonParser;
 import javax.json.stream.JsonParser.Event;
 import javax.persistence.PersistenceException;
@@ -32,7 +31,7 @@ import com.avaje.ebeaninternal.server.query.SqlBeanLoad;
 import com.avaje.ebeaninternal.server.query.SqlJoinType;
 import com.avaje.ebeaninternal.server.reflect.BeanReflectGetter;
 import com.avaje.ebeaninternal.server.reflect.BeanReflectSetter;
-import com.avaje.ebeaninternal.server.text.json.WriteJsonContext;
+import com.avaje.ebeaninternal.server.text.json.WriteJson;
 import com.avaje.ebeaninternal.server.type.DataBind;
 import com.avaje.ebeaninternal.server.type.ScalarType;
 
@@ -1174,54 +1173,18 @@ public class BeanProperty implements ElPropertyValue {
         return name;
     }
 
-    
-
-    @SuppressWarnings("unchecked")
-    public void jsonWrite(JsonGenerator ctx, EntityBean bean) {
-        if(!jsonSerialize){
-            return;
-        }
-        Object value = getValueIntercept(bean);
-        if (value == null) {
-            ctx.writeNull(name);
-        } else {
-          scalarType.jsonWrite(ctx, name, value);
-          //ctx.appendNameValue(name, scalarType, value);
-        }
+  public void jsonWrite(WriteJson writeJson, EntityBean bean) {
+    if (!jsonSerialize) {
+      return;
     }
-
-    @SuppressWarnings("unchecked")
-    public void jsonWrite(WriteJsonContext ctx, EntityBean bean) {
-        if(!jsonSerialize){
-            return;
-        }
-        Object value = getValueIntercept(bean);
-        if (value == null) {
-            ctx.appendNull(name);
-        } else {
-            ctx.appendNameValue(name, scalarType, value);
-        }
+    Object value = getValueIntercept(bean);
+    if (value == null) {
+      writeJson.gen().writeNull(name);
+    } else {
+      scalarType.jsonWrite(writeJson.gen(), name, value);
     }
+  }
 
-//    public void jsonRead(ReadJsonContext ctx, EntityBean bean) {
-//        if(!jsonDeserialize){
-//            return;
-//        }
-//    	String jsonValue;
-//    	try {
-//        	jsonValue = ctx.readScalarValue();
-//    	} catch (TextException e){
-//    		throw new TextException("Error reading property "+getFullBeanName(), e);
-//    	}
-//        Object objValue;
-//        if (jsonValue == null) {
-//            objValue = null;
-//        } else {
-//            objValue = scalarType.jsonFromString(jsonValue, ctx.getValueAdapter());
-//        }
-//        setValue(bean, objValue);
-//    }
-    
   public void jsonRead(JsonParser ctx, EntityBean bean) {
     if (!jsonDeserialize) {
       return;

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocMany.java

@@ -30,9 +30,7 @@ import com.avaje.ebeaninternal.server.el.ElPropertyChainBuilder;
 import com.avaje.ebeaninternal.server.el.ElPropertyValue;
 import com.avaje.ebeaninternal.server.lib.util.StringHelper;
 import com.avaje.ebeaninternal.server.query.SqlBeanLoad;
-import com.avaje.ebeaninternal.server.text.json.ReadJsonContext;
-import com.avaje.ebeaninternal.server.text.json.ReadJsonContext.ReadBeanState;
-import com.avaje.ebeaninternal.server.text.json.WriteJsonContext;
+import com.avaje.ebeaninternal.server.text.json.WriteJson;
 
 /**
  * Property mapped to a List Set or Map.
@@ -883,7 +881,7 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
         return null != targetDescriptor.getId(otherBean);
     }
 
-    public void jsonWrite(WriteJsonContext ctx, EntityBean bean) {
+    public void jsonWrite(WriteJson ctx, EntityBean bean) {
         if(!this.jsonSerialize){
             return;
         }

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyAssocOne.java

@@ -25,8 +25,7 @@ import com.avaje.ebeaninternal.server.el.ElPropertyValue;
 import com.avaje.ebeaninternal.server.query.SplitName;
 import com.avaje.ebeaninternal.server.query.SqlBeanLoad;
 import com.avaje.ebeaninternal.server.query.SqlJoinType;
-import com.avaje.ebeaninternal.server.text.json.ReadJsonContext;
-import com.avaje.ebeaninternal.server.text.json.WriteJsonContext;
+import com.avaje.ebeaninternal.server.text.json.WriteJson;
 
 /**
  * Property mapped to a joined bean.
@@ -832,25 +831,23 @@ public class BeanPropertyAssocOne<T> extends BeanPropertyAssoc<T> {
     }
     
     @Override
-    public void jsonWrite(WriteJsonContext ctx, EntityBean bean) {
+    public void jsonWrite(WriteJson writeJson, EntityBean bean) {
         
         Object value = getValueIntercept(bean);
         if (value == null){
-            ctx.beginAssocOneIsNull(name);
+          writeJson.gen().writeNull(name);
             
         } else {
-            if (ctx.isParentBean(value)){
+            if (writeJson.isParentBean(value)){
                 // bi-directional and already rendered parent
                 
             } else {
               // Hmmm, not writing complex non-entity bean
               if (value instanceof EntityBean) {  
-                ctx.pushParentBean(bean);
-                ctx.beginAssocOne(name);
+                writeJson.beginAssocOne(name, bean);
                 BeanDescriptor<?> refDesc = descriptor.getBeanDescriptor(value.getClass());
-                refDesc.jsonWrite(ctx, (EntityBean)value);                  
-                ctx.endAssocOne();
-                ctx.popParentBean();
+                refDesc.jsonWrite(writeJson, (EntityBean)value, name);                  
+                writeJson.endAssocOne();
               } 
             }
         }

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanPropertyCompound.java

@@ -11,7 +11,7 @@ import com.avaje.ebeaninternal.server.el.ElPropertyChainBuilder;
 import com.avaje.ebeaninternal.server.el.ElPropertyValue;
 import com.avaje.ebeaninternal.server.query.SqlBeanLoad;
 import com.avaje.ebeaninternal.server.text.json.ReadJsonContext;
-import com.avaje.ebeaninternal.server.text.json.WriteJsonContext;
+import com.avaje.ebeaninternal.server.text.json.WriteJson;
 import com.avaje.ebeaninternal.server.type.CtCompoundProperty;
 import com.avaje.ebeaninternal.server.type.CtCompoundPropertyElAdapter;
 import com.avaje.ebeaninternal.server.type.CtCompoundType;
@@ -177,10 +177,10 @@ public class BeanPropertyCompound extends BeanProperty {
         return bean;
     }
 
-    public void jsonWrite(WriteJsonContext ctx, EntityBean bean) {
+    public void jsonWrite(WriteJson ctx, EntityBean bean) {
         
         Object valueObject = getValueIntercept(bean);
-        compoundType.jsonWrite(ctx, valueObject, name);
+        //FIXME: compoundType.jsonWrite(ctx, valueObject, name);
     }
     
     public void jsonRead(ReadJsonContext ctx, EntityBean bean){

src/main/java/com/avaje/ebeaninternal/server/deploy/BeanSetHelp.java

@@ -12,7 +12,7 @@ import com.avaje.ebean.bean.BeanCollectionAdd;
 import com.avaje.ebean.bean.BeanCollectionLoader;
 import com.avaje.ebean.bean.EntityBean;
 import com.avaje.ebean.common.BeanSet;
-import com.avaje.ebeaninternal.server.text.json.WriteJsonContext;
+import com.avaje.ebeaninternal.server.text.json.WriteJson;
 
 /**
  * Helper specifically for dealing with Sets.
@@ -129,7 +129,7 @@ public final class BeanSetHelp<T> implements BeanCollectionHelp<T> {
 		}
 	}
 	
-    public void jsonWrite(WriteJsonContext ctx, String name, Object collection, boolean explicitInclude) {
+    public void jsonWrite(WriteJson ctx, String name, Object collection, boolean explicitInclude) {
         
         Set<?> set;
         if (collection instanceof BeanCollection<?>){
@@ -148,16 +148,11 @@ public final class BeanSetHelp<T> implements BeanCollectionHelp<T> {
             set = (Set<?>)collection;
         }
         
-        int count = 0;
-        ctx.beginAssocMany(name);
+        ctx.gen().writeStartArray(name);
         Iterator<?> it = set.iterator();
         while (it.hasNext()) {
-            Object detailBean = it.next();
-            if (count++ > 0){
-                ctx.appendComma();
-            }
-            targetDescriptor.jsonWrite(ctx, (EntityBean)detailBean);
+            targetDescriptor.jsonWrite(ctx, (EntityBean)it.next());
         }
-        ctx.endAssocMany();        
+        ctx.gen().writeEnd();        
     }
 }