Merge pull request #5579

FINERACT-2515: Fix the TODO comments in the Apache Fineract Code

Author: adamsaghy

fineract-core/src/main/java/org/apache/fineract/portfolio/accountdetails/domain/AccountType.java

@@ -81,10 +81,6 @@ public String getName() {
         return name().toLowerCase();
     }
 
-    public boolean isInvalid() {
-        return this.value.equals(AccountType.INVALID.getValue());
-    }
-
     public boolean isIndividualAccount() {
         return this.value.equals(AccountType.INDIVIDUAL.getValue());
     }

fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/Calendar.java

@@ -526,7 +526,7 @@ private static String constructRecurrence(final CalendarFrequencyType frequencyT
         if (frequencyType.isWeekly()) {
             if (repeatsOnDay != null) {
                 final CalendarWeekDaysType weekDays = CalendarWeekDaysType.fromInt(repeatsOnDay);
-                if (!weekDays.isInvalid()) {
+                if (weekDays != CalendarWeekDaysType.INVALID) {
                     recurrenceBuilder.append(";BYDAY=");
                     recurrenceBuilder.append(weekDays.toString().toUpperCase(java.util.Locale.ROOT));
                 }
@@ -541,12 +541,12 @@ private static String constructRecurrence(final CalendarFrequencyType frequencyT
             } else if (repeatsOnNthDayOfMonth != null && repeatsOnDay != null
                     && !repeatsOnDay.equals(CalendarWeekDaysType.INVALID.getValue())) {
                 final NthDayType nthDay = NthDayType.fromInt(repeatsOnNthDayOfMonth);
-                if (!nthDay.isInvalid()) {
+                if (nthDay != NthDayType.INVALID) {
                     recurrenceBuilder.append(";BYSETPOS=");
                     recurrenceBuilder.append(nthDay.getValue());
                 }
                 final CalendarWeekDaysType weekday = CalendarWeekDaysType.fromInt(repeatsOnDay);
-                if (!weekday.isInvalid()) {
+                if (weekday != CalendarWeekDaysType.INVALID) {
                     recurrenceBuilder.append(";BYDAY=");
                     recurrenceBuilder.append(weekday.toString().toUpperCase(java.util.Locale.ROOT));
                 }

fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarFrequencyType.java

@@ -90,10 +90,6 @@ public boolean isMonthly() {
         return this.value.equals(CalendarFrequencyType.MONTHLY.value);
     }
 
-    public boolean isInvalid() {
-        return this.value.equals(CalendarFrequencyType.INVALID.value);
-    }
-
     /**
      * To convert from period frequency type tp calendar frequency type. This method requires code refactoring.
      *

fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/CalendarWeekDaysType.java

@@ -64,10 +64,6 @@ public String toString() {
         return name();
     }
 
-    public boolean isInvalid() {
-        return this.value.equals(CalendarWeekDaysType.INVALID.value);
-    }
-
     public static CalendarWeekDaysType fromString(final String weekDayString) {
         CalendarWeekDaysType weekDay = CalendarWeekDaysType.INVALID;
 

fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarEnumerations.java

@@ -89,7 +89,7 @@ public static EnumOptionData calendarFrequencyType(final int id) {
 
     public static EnumOptionData calendarFrequencyType(final CalendarFrequencyType calendarFrequencyType) {
         EnumOptionData optionData = null;
-        if (!calendarFrequencyType.isInvalid()) {
+        if (calendarFrequencyType != CalendarFrequencyType.INVALID) {
             optionData = new EnumOptionData(calendarFrequencyType.getValue().longValue(), calendarFrequencyType.getCode(),
                     calendarFrequencyType.toString());
         }
@@ -99,7 +99,7 @@ public static EnumOptionData calendarFrequencyType(final CalendarFrequencyType c
     public static List<EnumOptionData> calendarFrequencyType(final CalendarFrequencyType[] calendarFrequencyTypes) {
         final List<EnumOptionData> optionDatas = new ArrayList<>();
         for (final CalendarFrequencyType calendarFrequencyType : calendarFrequencyTypes) {
-            if (!calendarFrequencyType.isInvalid()) {
+            if (calendarFrequencyType != CalendarFrequencyType.INVALID) {
                 optionDatas.add(calendarFrequencyType(calendarFrequencyType));
             }
         }
@@ -112,7 +112,7 @@ public static EnumOptionData calendarWeekDaysType(final int id) {
 
     public static EnumOptionData calendarWeekDaysType(final CalendarWeekDaysType calendarWeekDaysType) {
         EnumOptionData optionData = null;
-        if (!calendarWeekDaysType.isInvalid()) {
+        if (calendarWeekDaysType != CalendarWeekDaysType.INVALID) {
             optionData = new EnumOptionData(calendarWeekDaysType.getValue().longValue(), calendarWeekDaysType.getCode(),
                     calendarWeekDaysType.toString());
         }
@@ -122,7 +122,7 @@ public static EnumOptionData calendarWeekDaysType(final CalendarWeekDaysType cal
     public static List<EnumOptionData> calendarWeekDaysType(final CalendarWeekDaysType[] calendarWeekDaysTypes) {
         final List<EnumOptionData> optionDatas = new ArrayList<>();
         for (final CalendarWeekDaysType calendarWeekDaysType : calendarWeekDaysTypes) {
-            if (!calendarWeekDaysType.isInvalid()) {
+            if (calendarWeekDaysType != CalendarWeekDaysType.INVALID) {
                 optionDatas.add(calendarWeekDaysType(calendarWeekDaysType));
             }
         }

fineract-core/src/main/java/org/apache/fineract/portfolio/common/domain/ConditionType.java

@@ -68,11 +68,6 @@ public String getCode() {
         return this.code;
     }
 
-    // TODO: why not just use the enum values... just more boilerplate code here!!
-    public boolean isInvalid() {
-        return ConditionType.INVALID.getValue().equals(this.value);
-    }
-
     // TODO: do we really need this?!?
     public static Object[] integerValues() {
         return Arrays.stream(values()).filter(value -> !INVALID.equals(value)).map(value -> value.value).toList().toArray();

fineract-core/src/main/java/org/apache/fineract/portfolio/common/domain/NthDayType.java

@@ -77,10 +77,6 @@ public static NthDayType fromInt(final Integer frequency) {
         return repaymentFrequencyNthDayType;
     }
 
-    public boolean isInvalid() {
-        return this.value.equals(NthDayType.INVALID.value);
-    }
-
     public boolean isLastDay() {
         return this.value.equals(NthDayType.LAST.value);
     }

fineract-core/src/main/java/org/apache/fineract/portfolio/common/domain/PeriodFrequencyType.java

@@ -86,16 +86,6 @@ public boolean isDaily() {
         return this.equals(DAYS);
     }
 
-    // TODO: why not just use the enum values... just more boilerplate code here!!
-    public boolean isWholeTerm() {
-        return this.equals(WHOLE_TERM);
-    }
-
-    // TODO: why not just use the enum values... just more boilerplate code here!!
-    public boolean isInvalid() {
-        return this.equals(INVALID);
-    }
-
     // TODO: do we really need this?!?
     public static Object[] integerValues() {
         return Arrays.stream(values()).filter(value -> !INVALID.equals(value)).map(value -> value.value).toList().toArray();

fineract-core/src/main/java/org/apache/fineract/portfolio/common/service/CommonEnumerations.java

@@ -112,7 +112,7 @@ public static EnumOptionData conditionType(final ConditionType type, final Strin
     public static List<EnumOptionData> conditionType(final ConditionType[] conditionTypes, final String codePrefix) {
         final List<EnumOptionData> optionDatas = new ArrayList<>();
         for (final ConditionType conditionType : conditionTypes) {
-            if (!conditionType.isInvalid()) {
+            if (conditionType != ConditionType.INVALID) {
                 optionDatas.add(conditionType(conditionType, codePrefix));
             }
         }

fineract-core/src/main/java/org/apache/fineract/portfolio/savings/DepositAccountOnClosureType.java

@@ -55,38 +55,7 @@ public static DepositAccountOnClosureType fromInt(final Integer v) {
         };
     }
 
-    // TODO: why not just use the enum values... just more boilerplate code here!!
-    public boolean isWithdarwDeposit() {
-        return this.equals(WITHDRAW_DEPOSIT);
-    }
-
-    // TODO: why not just use the enum values... just more boilerplate code here!!
-    public boolean isTransferToSavings() {
-        return this.equals(TRANSFER_TO_SAVINGS);
-    }
-
-    // TODO: why not just use the enum values... just more boilerplate code here!!
-    public boolean isReinvest() {
-        return this.equals(REINVEST_PRINCIPAL_AND_INTEREST) || this.equals(REINVEST_PRINCIPAL_ONLY);
-    }
-
-    // TODO: why not just use the enum values... just more boilerplate code here!!
-    public boolean isReinvestPrincipal() {
-        return this.equals(REINVEST_PRINCIPAL_ONLY);
-    }
-
-    // TODO: why not just use the enum values... just more boilerplate code here!!
-    public boolean isReinvestPrincipalAndInterest() {
-        return this.equals(REINVEST_PRINCIPAL_AND_INTEREST);
-    }
-
-    // TODO: why not just use the enum values... just more boilerplate code here!!
-    public boolean isInvalid() {
-        return this.equals(INVALID);
-    }
-
-    // TODO: do we really need this?!?
-    public static Object[] integerValues() {
-        return Arrays.stream(values()).filter(value -> !INVALID.equals(value)).map(value -> value.value).toList().toArray();
+    public static Integer[] integerValues() {
+        return Arrays.stream(values()).filter(v -> v != INVALID).map(v -> v.value).toArray(Integer[]::new);
     }
 }