avniproject/avni-client#1452 - initialize inputs with default value.

shraddha761 · Jul 17, 2024 · f1bbdf5 · f1bbdf5
1 parent a45c1d8
commit f1bbdf5
Showing 1 changed file with 4 additions and 14 deletions.
diff --git a/avni-server-api/src/main/java/org/avni/server/domain/ReportCard.java b/avni-server-api/src/main/java/org/avni/server/domain/ReportCard.java
@@ -41,7 +41,7 @@ public class ReportCard extends OrganisationAwareEntity {
 
     @Column
     @Type(type = "jsonObject")
-    private JsonObject standardReportCardInput;
+    private JsonObject standardReportCardInput = new JsonObject(new HashMap<>());
 
     public String getName() {
         return name;
@@ -121,40 +121,30 @@ public List<String> getStandardReportCardInputSubjectTypes() {
     }
 
     public void setStandardReportCardInputSubjectTypes(List<String> subjectTypes) {
-        safeSetterForStandardReportCardInput("subjectTypes", subjectTypes);
+        standardReportCardInput.with("subjectTypes", subjectTypes);
     }
 
     public List<String> getStandardReportCardInputPrograms() {
         return safeGetterForStandardReportCardInput("programs");
     }
 
     public void setStandardReportCardInputPrograms(List<String> programs) {
-        safeSetterForStandardReportCardInput("programs", programs);
+        standardReportCardInput.with("programs", programs);
     }
 
     public List<String> getStandardReportCardInputEncounterTypes() {
         return safeGetterForStandardReportCardInput("encounterTypes");
     }
 
     public void setStandardReportCardInputEncounterTypes(List<String> encounterTypes) {
-        safeSetterForStandardReportCardInput("encounterTypes", encounterTypes);
+        standardReportCardInput.with("encounterTypes", encounterTypes);
     }
 
     private List safeGetterForStandardReportCardInput(String key) {
         return standardReportCardInput == null ? new ArrayList() : standardReportCardInput.getList(key);
     }
 
-    private void safeSetterForStandardReportCardInput(String key, List<String> value) {
-        if (standardReportCardInput == null) {
-            standardReportCardInput = new JsonObject(new HashMap<>());
-        }
-        standardReportCardInput.with(key, value);
-    }
-
     private void safeSetterForStandardReportCardInput(String key, String value) {
-        if (standardReportCardInput == null) {
-            standardReportCardInput = new JsonObject(new HashMap<>());
-        }
         standardReportCardInput.with(key, value);
     }