Fixed the sonar code complaints.

bcgov · Jan 30, 2025 · f94a2d2 · f94a2d2
1 parent 061e782
commit f94a2d2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/service/DataConversionService.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/service/DataConversionService.java
@@ -258,7 +258,7 @@ private GraduationStudentRecordEntity handleNewGraduationStatus(GraduationStuden
     }
 
     private Map<FieldName, OngoingUpdateFieldDTO> populateOngoingUpdateFields(List<OngoingUpdateFieldDTO> fields, GraduationStudentRecordEntity gradEntity, String accessToken) {
-        Map<FieldName, OngoingUpdateFieldDTO> updateFieldsMap = new HashMap<>();
+        Map<FieldName, OngoingUpdateFieldDTO> updateFieldsMap = new EnumMap<>(FieldName.class);
         fields.forEach(f -> {
             populate(f, updateFieldsMap, gradEntity);
             if (f.getName() == FieldName.GRAD_PROGRAM) {

diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/service/GradBaseService.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/service/GradBaseService.java
@@ -62,15 +62,12 @@ protected void validateStudentStatusAndResetBatchFlags(GraduationStudentRecordEn
         // 1. If a student in GRAD is ARC/TER then do not set TVR flag when their other data changes
         // 2. If a student in GRAD is changed to ARC/TER then set TVR flag to NULL
         if (STUDENT_STATUS_ARCHIVED.equalsIgnoreCase(studentStatus) || STUDENT_STATUS_TERMINATED.equalsIgnoreCase(studentStatus)) {
-            //gradEntity.setRecalculateProjectedGrad(null);
             addUpdateFieldIntoMap(updateFieldsMap, FieldName.RECALC_TVR, FieldType.STRING, NULL_VALUE);
         }
         // GRAD2-2922 & GRAD2-2950
         // 1. If a student in GRAD is MER then do not set Transcript & TVR flags  when their other data changes
         // 2. If a student in GRAD is changed to MER then set Transcript & TVR flags to NULL
         if (STUDENT_STATUS_MERGED.equalsIgnoreCase(studentStatus)) {
-//            gradEntity.setRecalculateGradStatus(null);
-//            gradEntity.setRecalculateProjectedGrad(null);
             addUpdateFieldIntoMap(updateFieldsMap, FieldName.RECALC_GRAD_ALG, FieldType.STRING, NULL_VALUE);
             addUpdateFieldIntoMap(updateFieldsMap, FieldName.RECALC_TVR, FieldType.STRING, NULL_VALUE);
         }