issue #56 fixed

jmapper-framework · Oct 19, 2016 · 9a04618 · 9a04618
1 parent 8a8a410
commit 9a04618
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/JMapper Framework/src/main/java/com/googlecode/jmapper/operations/AGeneralOperation.java b/JMapper Framework/src/main/java/com/googlecode/jmapper/operations/AGeneralOperation.java
@@ -56,6 +56,7 @@ private StringBuilder calculateSourceNestedMapping(){
 		String nestedField = "nestedField"+ ++index;
 		for (NestedMappedField nestedMappedField : this.nestedMappingInfo.getNestedFields()) {
 
+			//TODO tenere conto del MappingType!
 			//TODO potrei volere il safeNavigation in alcuni punti e non in tutti
 			// quindi devo essere in grado di lanciare exception quando serve
 			tryCatch(mapping, nestedField, actualField, nestedMappedField);

diff --git a/... Framework/src/main/java/com/googlecode/jmapper/operations/recursive/ObjectOperation.java b/... Framework/src/main/java/com/googlecode/jmapper/operations/recursive/ObjectOperation.java
@@ -37,7 +37,7 @@ protected StringBuilder fieldToCreate() {
 
 		// name of new Object
 		String newObj = "obj"+count++;
-		return write(getMapper(newObj).mapping(newInstance, ALL_FIELDS, ALL_FIELDS),setDestination(newObj));
+		return write(getMapper(newObj).mapping(newInstance, ALL_FIELDS, getMts()),setDestination(newObj));
 	}
 
 	/**

diff --git a/...mework/src/test/java/com/googlecode/jmapper/operations/recursive/ObjectOperationTest.java b/...mework/src/test/java/com/googlecode/jmapper/operations/recursive/ObjectOperationTest.java
@@ -84,9 +84,11 @@ protected void AllValued() {
 			     newLine + "   }else{" +
 		   	     newLine + "   obj$i = new com.googlecode.jmapper.bean.TargetObject();" +
 			     newLine + "   }" + 
-		 newLine + "   obj$i.setField(source.getMappedObject().getField());"+
-		 newLine + "   destination.setTargetObject(obj$i);"+
-		 newLine + "   }"+newLine;
+			     newLine + "   if(source.getMappedObject().getField()!=null){"+
+			     newLine + "   obj$i.setField(source.getMappedObject().getField());"+
+			     newLine + "   }"+
+			     newLine + "   destination.setTargetObject(obj$i);"+
+			     newLine + "   }"+newLine;
 
 		write(newInstance);
 		verify();
@@ -104,8 +106,10 @@ protected void AllValued() {
 	     newLine + "   }else{" +
    	     newLine + "   obj$i = new com.googlecode.jmapper.bean.TargetObject();" +
 	     newLine + "   }" + 
-		 newLine + "   obj$i.setField(source.getMappedObject().getField());"+
-		 newLine + "   destination.setTargetObject(obj$i);"+
+	     newLine + "   if(source.getMappedObject().getField()!=null){"+
+	     newLine + "   obj$i.setField(source.getMappedObject().getField());"+
+	     newLine + "   }"+
+	     newLine + "   destination.setTargetObject(obj$i);"+
 		 newLine + "   }"+
 		 newLine + "   }"+newLine;
 
@@ -173,8 +177,11 @@ protected void NullValued() {
 	     newLine + "   }else{" +
    	     newLine + "   obj$i = new com.googlecode.jmapper.bean.TargetObject();" +
 	     newLine + "   }" + 
-		 newLine + "   obj$i.setField(source.getMappedObject().getField());"+
-		 newLine + "   destination.setTargetObject(obj$i);"+
+
+newLine + "   if(source.getMappedObject().getField()!=null){"+
+newLine + "   obj$i.setField(source.getMappedObject().getField());"+
+newLine + "   }"+
+newLine + "   destination.setTargetObject(obj$i);"+
 		 newLine + "   }"+
 		 newLine + "   }"+newLine;