initial rework for new enhancement

This commit is contained in:
Robin Bygrave committed 2013-06-19 20:36:24 +12:00
1 parent eb1eafe98c
commit 4ec62a5772
193 files changed
+2737 -5285

No files matched your search

@@ -11,6 +11,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import com.avaje.ebean.bean.EntityBean;
import com.avaje.ebean.text.TextException;
import com.avaje.ebean.text.json.JsonContext;
import com.avaje.ebean.text.json.JsonElement;
@@ -217,7 +218,7 @@ public class DJsonContext implements JsonContext {
} else {
BeanDescriptor<?> d = getDecriptor(o.getClass());
WriteJsonContext ctx = new WriteJsonContext(buffer, pretty, dfltValueAdapter, options, requestCallback);
d.jsonWrite(ctx, o);
d.jsonWrite(ctx, (EntityBean)o);
ctx.end();
}
}
@@ -238,11 +239,11 @@ public class DJsonContext implements JsonContext {
BeanDescriptor<?> d = getDecriptor(o.getClass());
ctx.appendArrayBegin();
d.jsonWrite(ctx, o);
d.jsonWrite(ctx, (EntityBean)o);
while (it.hasNext()) {
ctx.appendComma();
T t = it.next();
d.jsonWrite(ctx, t);
d.jsonWrite(ctx, (EntityBean)t);
}
ctx.appendArrayEnd();
ctx.end();
@@ -320,45 +320,18 @@ public class WriteJsonContext implements JsonWriter {
return beanState.isReferenceBean();
}
public boolean includedProp(String name) {
return beanState.includedProp(name);
}
public Set<String> getLoadedProps() {
return beanState.getLoadedProps();
}
public static class WriteBeanState {
private final EntityBeanIntercept ebi;
private final Set<String> loadedProps;
private final boolean referenceBean;
private boolean firstKeyOut;
public WriteBeanState(Object bean) {
if (bean instanceof EntityBean){
this.ebi = ((EntityBean)bean)._ebean_getIntercept();
this.loadedProps = ebi.getLoadedProps();
this.referenceBean = ebi.isReference();
} else {
this.ebi = null;
this.loadedProps = null;
this.referenceBean = false;
}
}
this.ebi = ((EntityBean)bean)._ebean_getIntercept();
this.referenceBean = ebi.isReference();
}
public Set<String> getLoadedProps() {
return loadedProps;
}
public boolean includedProp(String name) {
if (loadedProps == null || loadedProps.contains(name)){
return true;
} else {
return false;
}
}
public boolean isReferenceBean() {
return referenceBean;
}