FINERACT-2326: CodeValue serialization enhancement (#5007)

fineract-core/src/main/java/org/apache/fineract/infrastructure/codes/data/CodeValueData.java

@@ -39,19 +39,11 @@ public class CodeValueData implements Serializable {
     private String name;
     private Integer position;
     private String description;
-    private boolean active;
-    private boolean mandatory;
+    private Boolean active;
+    private Boolean mandatory;
 
-    public static CodeValueData instance(final Long id, final String name, final Integer position, final boolean isActive,
-            final boolean mandatory) {
-        String description = null;
-        return new CodeValueData().setId(id).setName(name).setPosition(position).setDescription(description).setActive(isActive)
-                .setMandatory(mandatory);
-    }
-
-    public static CodeValueData instance(final Long id, final String name, final String description, final boolean isActive,
-            final boolean mandatory) {
-        Integer position = null;
+    public static CodeValueData instance(final Long id, final String name, final String description, final Integer position,
+            final boolean isActive, final boolean mandatory) {
         return new CodeValueData().setId(id).setName(name).setPosition(position).setDescription(description).setActive(isActive)
                 .setMandatory(mandatory);
     }
@@ -67,10 +59,10 @@ public class CodeValueData implements Serializable {
     public static CodeValueData instance(final Long id, final String name) {
         String description = null;
         Integer position = null;
-        boolean isActive = false;
-        boolean mandatory = false;
+        Boolean active = null;
+        Boolean mandatory = null;
 
-        return new CodeValueData().setId(id).setName(name).setPosition(position).setDescription(description).setActive(isActive)
+        return new CodeValueData().setId(id).setName(name).setPosition(position).setDescription(description).setActive(active)
                 .setMandatory(mandatory);
     }
 

fineract-core/src/main/java/org/apache/fineract/infrastructure/codes/domain/CodeValue.java

@@ -126,6 +126,6 @@ public class CodeValue extends AbstractPersistableCustom<Long> {
     }
 
     public CodeValueData toData() {
-        return CodeValueData.instance(getId(), this.label, this.position, this.isActive, this.mandatory);
+        return CodeValueData.instance(getId(), this.label, this.description, this.position, this.isActive, this.mandatory);
     }
 }