# fixed sub entity returns null if not existing

SchwarzIT · Jun 27, 2017 · 8024b0e · 8024b0e
1 parent 2eb41a0
commit 8024b0e
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/couchbase-entity/src/main/java/com/kaufland/model/EntityGeneration.java b/couchbase-entity/src/main/java/com/kaufland/model/EntityGeneration.java
@@ -181,16 +181,20 @@ private void createToMap(JCodeModel codeModel, JDefinedClass genClazz) {
         toMap.param(genClazz, "obj");
 
         StringBuilder builderSingle = new StringBuilder();
+        builderSingle.append("if(obj == null){ \n");
+        builderSingle.append("return null; \n");
+        builderSingle.append("} \n");
         builderSingle.append("java.util.HashMap<String, Object> result = new java.util.HashMap<String, Object>(); \n");
-        builderSingle.append("result.putAll(((" + genClazz.name() + ")obj).mDoc); \n");
-        builderSingle.append("result.putAll(((" + genClazz.name() + ")obj).mDocChanges);\n");
+        builderSingle.append("result.putAll(obj.mDoc); \n");
+        builderSingle.append("result.putAll(obj.mDocChanges);\n");
         builderSingle.append("return result;\n");
         toMap.body().directStatement(builderSingle.toString());
 
         JMethod toMapList = genClazz.method(JMod.PUBLIC | JMod.STATIC, codeModel.directClass(List.class.getCanonicalName()).narrow(codeModel.directClass(HashMap.class.getCanonicalName()).narrow(String.class).narrow(Object.class)), "toMap");
         toMapList.param(codeModel.directClass(List.class.getCanonicalName()).narrow(genClazz), "obj");
 
         StringBuilder builderMulti = new StringBuilder();
+        builderMulti.append("if(obj == null) return null; \n");
         builderMulti.append("java.util.List<java.util.HashMap<String, Object>> result = new java.util.ArrayList<java.util.HashMap<String, Object>>(); \n");
         builderMulti.append("for(" + genClazz.name() + " entry : obj) {\n");
         builderMulti.append("result.add(((" + genClazz.name() + ")entry).toMap(entry));\n");
@@ -203,19 +207,20 @@ private void createToMap(JCodeModel codeModel, JDefinedClass genClazz) {
     private void createFromMap(JCodeModel codeModel, JDefinedClass genClazz) {
         JMethod fromMap = genClazz.method(JMod.PUBLIC | JMod.STATIC, genClazz, "fromMap");
         fromMap.param(codeModel.directClass(HashMap.class.getCanonicalName()).narrow(String.class).narrow(Object.class), "obj");
-        fromMap.body().directStatement("return new " + genClazz.name() + "(obj);");
+        fromMap.body().directStatement("return obj != null ? new " + genClazz.name() + "(obj) : null;");
 
         JMethod fromMapList = genClazz.method(JMod.PUBLIC | JMod.STATIC, codeModel.directClass(List.class.getCanonicalName()).narrow(genClazz), "fromMap");
         fromMapList.param(codeModel.directClass(List.class.getCanonicalName()).narrow(codeModel.directClass(HashMap.class.getCanonicalName()).narrow(String.class).narrow(Object.class)), "obj");
 
         StringBuilder mBuilder = new StringBuilder()
-                .append("java.util.List<" + genClazz.name() + "> result = new java.util.ArrayList<" + genClazz.name() + ">(); \n")
                 .append("if(obj != null) { \n")
+                .append("java.util.List<" + genClazz.name() + "> result = new java.util.ArrayList<" + genClazz.name() + ">(); \n")
                 .append("for(java.util.HashMap<String, Object> entry : obj) { \n")
                 .append("result.add(new " + genClazz.name() + "(entry)); \n")
                 .append("} \n")
+                .append("return result; \n")
                 .append("} \n")
-                .append("return result; \n");
+                .append("return null; \n");
 
 
         fromMapList.body().directStatement(mBuilder.toString());