Fix #1 Generate new object name for each new statement

arey · Mar 22, 2016 · 4713c23 · 4713c23
1 parent 9bfa2c1
commit 4713c23
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/main/java/com/javaetmoi/javabean/JavaBeanMarshaller.java b/src/main/java/com/javaetmoi/javabean/JavaBeanMarshaller.java
@@ -183,7 +183,7 @@ public String generateBeanCode(Object bean) {
             return getVariableName(bean);
         }
         processedBeans.add(bean);
-        String varName = getOrGenerateVariableName(bean);
+        String varName = generateVariableName(bean);
         method.addStatement("$T " + varName + " = new $T()", bean.getClass(), bean.getClass());
         PropertyDescriptor[] properties = PropertyUtils.getPropertyDescriptors(bean.getClass());
         for (PropertyDescriptor propertyDescriptor : properties) {
@@ -243,11 +243,20 @@ public String getOrGenerateVariableName(Object obj) {
         return getOrGenerateVariableName(obj, null);
     }
 
+    public String generateVariableName(Object obj) {
+        return generateVariableName(obj, null);
+    }
+
     public String getOrGenerateVariableName(Object obj, SetterParam setterParam) {
         String finaleName = getVariableName(obj);
         if (finaleName != null) {
             return finaleName;
         }
+        return generateVariableName(obj, setterParam);
+    }
+
+    public String generateVariableName(Object obj, SetterParam setterParam) {
+        String finaleName = null;
         String baseName;
         if ((setterParam == null) || (setterParam.getPropertyDescriptor() == null)) {
             baseName = generateBaseVariableName(obj);
@@ -264,7 +273,6 @@ public String getOrGenerateVariableName(Object obj, SetterParam setterParam) {
             }
         }
         variables.put(obj, finaleName);
-
         return finaleName;
     }