Rename None

Author: sayhaed

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

@@ -34,8 +34,8 @@ public enum SavingsCompoundingInterestPeriodType {
     MONTHLY(4, "savingsCompoundingInterestPeriodType.monthly"), //
     QUATERLY(5, "savingsCompoundingInterestPeriodType.quarterly"), //
     BI_ANNUAL(6, "savingsCompoundingInterestPeriodType.biannual"), //
-    ANNUAL(7, "savingsCompoundingInterestPeriodType.annual"),//
-    NO_COMPOUNDING_SIMPLE_INTEREST(8, "savingsCompoundingInterestPeriodType.nocompounding");
+    ANNUAL(7, "savingsCompoundingInterestPeriodType.annual"), //
+    NONE(8, "savingsCompoundingInterestPeriodType.none");//
 
     private final Integer value;
     private final String code;
@@ -79,7 +79,7 @@ public static SavingsCompoundingInterestPeriodType fromInt(final Integer v) {
             case 7:
                 return ANNUAL;
             case 8:
-                return NO_COMPOUNDING_SIMPLE_INTEREST;
+                return NONE;
             default:
                 return INVALID;
         }

fineract-core/src/main/java/org/apache/fineract/portfolio/savings/domain/interest/MonthlyCompoundingPeriod.java

@@ -140,10 +140,10 @@ private BigDecimal calculateUsingDailyBalanceMethod(final SavingsCompoundingInte
                 // break;
                 // case ANNUAL:
                 // break;
-                case NO_COMPOUNDING_SIMPLE_INTEREST:
+                case NONE:
                     interestOnBalanceUnrounded = balance.calculateInterestOnBalance(interestToCompound, interestRateAsFraction, daysInYear,
                             minBalanceForInterestCalculation, overdraftInterestRateAsFraction, minOverdraftForInterestCalculation);
-                    break;
+                break;
                 case INVALID:
                 break;
                 default:

fineract-core/src/main/java/org/apache/fineract/portfolio/savings/domain/interest/PostingPeriod.java

@@ -292,7 +292,7 @@ public BigDecimal calculateInterest(final CompoundInterestValues compoundInteres
         // to be applied to the balanced for interest calculation
         for (final CompoundingPeriod compoundingPeriod : this.compoundingPeriods) {
 
-            if (SavingsCompoundingInterestPeriodType.NO_COMPOUNDING_SIMPLE_INTEREST.equals(this.interestCompoundingType)){
+            if (SavingsCompoundingInterestPeriodType.NONE.equals(this.interestCompoundingType)) {
                 compoundInterestValues.setCompoundedInterest(BigDecimal.ZERO);
             }
 
@@ -448,7 +448,7 @@ private static List<CompoundingPeriod> compoundingPeriodsInPostingPeriod(final L
                     periodStartDate = periodEndDate.plusDays(1);
                 }
             break;
-            case NO_COMPOUNDING_SIMPLE_INTEREST:
+            case NONE:
                 final LocalDate postingPeriodEndDateNONE = postingPeriodInterval.endDate();
 
                 periodStartDate = postingPeriodInterval.startDate();
@@ -472,7 +472,7 @@ private static List<CompoundingPeriod> compoundingPeriodsInPostingPeriod(final L
                     // move periodStartDate forward to day after this period
                     periodStartDate = periodEndDate.plusDays(1);
                 }
-                break;
+            break;
         }
 
         return compoundingPeriods;
@@ -523,9 +523,9 @@ private static LocalDate determineInterestPeriodEndDateFrom(final LocalDate peri
                 }
             break;
 
-            case NO_COMPOUNDING_SIMPLE_INTEREST:
+            case NONE:
                 periodEndDate = periodEndDate.with(TemporalAdjusters.lastDayOfMonth());
-                break;
+            break;
         }
 
         return periodEndDate;

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

@@ -440,13 +440,10 @@ public static EnumOptionData compoundingInterestPeriodType(final SavingsCompound
                 optionData = new EnumOptionData(SavingsCompoundingInterestPeriodType.ANNUAL.getValue().longValue(),
                         codePrefix + SavingsCompoundingInterestPeriodType.ANNUAL.getCode(), "Annually");
             break;
-            case NO_COMPOUNDING_SIMPLE_INTEREST:
-                optionData = new
-                        EnumOptionData(SavingsCompoundingInterestPeriodType.NO_COMPOUNDING_SIMPLE_INTEREST.getValue().longValue(),
-                        codePrefix +
-                                SavingsCompoundingInterestPeriodType.NO_COMPOUNDING_SIMPLE_INTEREST.getCode(),
-                        "No Compounding - Simple Interest");
-                break;
+            case NONE:
+                optionData = new EnumOptionData(SavingsCompoundingInterestPeriodType.NONE.getValue().longValue(),
+                        codePrefix + SavingsCompoundingInterestPeriodType.NONE.getCode(), "None");
+            break;
         }
 
         return optionData;

fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsDropdownReadPlatformServiceImpl.java

@@ -59,7 +59,7 @@ public Collection<EnumOptionData> retrieveCompoundingInterestPeriodTypeOptions()
                 SavingsEnumerations.compoundingInterestPeriodType(SavingsCompoundingInterestPeriodType.MONTHLY),
                 SavingsEnumerations.compoundingInterestPeriodType(SavingsCompoundingInterestPeriodType.QUATERLY),
                 SavingsEnumerations.compoundingInterestPeriodType(SavingsCompoundingInterestPeriodType.BI_ANNUAL),
-                SavingsEnumerations.compoundingInterestPeriodType(SavingsCompoundingInterestPeriodType.NO_COMPOUNDING_SIMPLE_INTEREST),
+                SavingsEnumerations.compoundingInterestPeriodType(SavingsCompoundingInterestPeriodType.NONE),
                 SavingsEnumerations.compoundingInterestPeriodType(SavingsCompoundingInterestPeriodType.ANNUAL));
 
         return allowedOptions;

fineract-savings/src/main/java/org/apache/fineract/portfolio/savings/domain/FixedDepositProduct.java

@@ -285,8 +285,9 @@ public DepositProductTermAndPreClosure depositProductTermAndPreClosure() {
 
     public void validateInterestPostingAndCompoundingPeriodTypes(final DataValidatorBuilder baseDataValidator) {
         Map<SavingsPostingInterestPeriodType, List<SavingsCompoundingInterestPeriodType>> postingtoCompoundMap = new HashMap<>();
-        postingtoCompoundMap.put(SavingsPostingInterestPeriodType.MONTHLY, Arrays.asList(new SavingsCompoundingInterestPeriodType[] {
-                SavingsCompoundingInterestPeriodType.DAILY, SavingsCompoundingInterestPeriodType.MONTHLY, SavingsCompoundingInterestPeriodType.NO_COMPOUNDING_SIMPLE_INTEREST }));
+        postingtoCompoundMap.put(SavingsPostingInterestPeriodType.MONTHLY,
+                Arrays.asList(new SavingsCompoundingInterestPeriodType[] { SavingsCompoundingInterestPeriodType.DAILY,
+                        SavingsCompoundingInterestPeriodType.MONTHLY, SavingsCompoundingInterestPeriodType.NONE }));
 
         postingtoCompoundMap.put(SavingsPostingInterestPeriodType.QUATERLY,
                 Arrays.asList(new SavingsCompoundingInterestPeriodType[] { SavingsCompoundingInterestPeriodType.DAILY,