FINERACT-821 Added and Enforced ModifierOrder Checkstyle

fineract-provider/build.gradle

@@ -210,9 +210,38 @@ spotless {
     eclipse().configFile '../config/fineractdev-formatter.xml'
     endWithNewline()
     trimTrailingWhitespace()
+
+    // Enforce style modifier order
+      custom 'Modifier ordering', {
+        def modifierRanking = [
+                public      : 1,
+                protected   : 2,
+                private     : 3,
+                abstract    : 4,
+                default     : 5,
+                static      : 6,
+                final       : 7,
+                transient   : 8,
+                volatile    : 9,
+                synchronized: 10,
+                native      : 11,
+                strictfp    : 12]
+        // Find any instance of multiple modifiers. Lead with a non-word character to avoid
+        // accidental matching against for instance, "an alternative default value"
+        it.replaceAll(/\W(?:public |protected |private |abstract |default |static |final |transient |volatile |synchronized |native |strictfp ){2,}/, {
+          // Do not replace the leading non-word character.  Identify the modifiers
+          it.replaceAll(/(?:public |protected |private |abstract |default |static |final |transient |volatile |synchronized |native |strictfp ){2,}/, {
+            // Sort the modifiers according to the ranking above
+            it.split().sort({ modifierRanking[it] }).join(' ') + ' '
+          }
+          )
+        }
+        )
+      }
+
   }
 
-  lineEndings 'UNIX'
+    lineEndings 'UNIX'
 }
 
 rat {

fineract-provider/config/checkstyle/checkstyle.xml

@@ -173,6 +173,7 @@
              value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
         </module>
         <module name="ParenPad" />
+        <module name="ModifierOrder"/>
 <!-- TODO Enable many more checks (go about this one by one, step by step, raise separate PRs fixing and then enforcing):
 
         <module name="HiddenField">
@@ -206,7 +207,7 @@
         <module name="MissingSwitchDefault"/>
 
 
-        <module name="ModifierOrder"/>
+
         <module name="RedundantModifier"/>
 
         <module name="MemberName">

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountNumberPreferencesTest.java

@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
 
 public class AccountNumberPreferencesTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(AccountNumberPreferencesTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AccountNumberPreferencesTest.class);
     private RequestSpecification requestSpec;
     private ResponseSpecification responseSpec;
     private ResponseSpecification responseValidationError;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountTransferTest.java

@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "rawtypes", "unused" })
 public class AccountTransferTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(AccountTransferTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AccountTransferTest.class);
     public static final String MINIMUM_OPENING_BALANCE = "30000.0";
     public static final String ACCOUNT_TYPE_INDIVIDUAL = "INDIVIDUAL";
     public static final String ACCOUNT_TRANSFER_AMOUNT = "15000.0";

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountingScenarioIntegrationTest.java

@@ -70,7 +70,7 @@ import org.slf4j.LoggerFactory;
 
 public class AccountingScenarioIntegrationTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(AccountingScenarioIntegrationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AccountingScenarioIntegrationTest.class);
     private static RequestSpecification requestSpec;
     private static ResponseSpecification responseSpec;
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ActuatorIntegrationTest.java

@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
 
 public class ActuatorIntegrationTest {
 
-    private final static String INFO_URL = "/fineract-provider/actuator/info";
+    private static final String INFO_URL = "/fineract-provider/actuator/info";
 
     @Test
     public void testActuatorGitBuildInfo() {

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/BatchRequestsIntegrationTest.java

@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
  */
 public class BatchRequestsIntegrationTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(BatchRequestsIntegrationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(BatchRequestsIntegrationTest.class);
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CenterIntegrationTest.java

@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
 
 public class CenterIntegrationTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(CenterIntegrationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CenterIntegrationTest.class);
     private RequestSpecification requestSpec;
     private ResponseSpecification responseSpec;
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java

@@ -69,7 +69,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class ClientLoanIntegrationTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ClientLoanIntegrationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ClientLoanIntegrationTest.class);
 
     public static final String MINIMUM_OPENING_BALANCE = "1000.0";
     public static final String ACCOUNT_TYPE_INDIVIDUAL = "INDIVIDUAL";

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java

@@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "rawtypes" })
 public class ClientSavingsIntegrationTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ClientSavingsIntegrationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ClientSavingsIntegrationTest.class);
     public static final String DEPOSIT_AMOUNT = "2000";
     public static final String WITHDRAW_AMOUNT = "1000";
     public static final String WITHDRAW_AMOUNT_ADJUSTED = "500";

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientStatusChecker.java

@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
 
 public class ClientStatusChecker {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ClientStatusChecker.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ClientStatusChecker.class);
 
     public static void verifyClientIsActive(final HashMap<String, Object> clientStatusHashMap) {
         assertEquals(300, (int) clientStatusHashMap.get("id"));

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ConcurrencyIntegrationTest.java

@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
 
 public class ConcurrencyIntegrationTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ConcurrencyIntegrationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ConcurrencyIntegrationTest.class);
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
     private LoanTransactionHelper loanTransactionHelper;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ExternalServicesConfigurationTest.java

@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
 
 public class ExternalServicesConfigurationTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ExternalServicesConfigurationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ExternalServicesConfigurationTest.class);
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
     private ExternalServicesConfigurationHelper externalServicesConfigurationHelper;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FixedDepositTest.java

@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "unused", "unchecked", "rawtypes", "static-access" })
 public class FixedDepositTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(FixedDepositTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FixedDepositTest.class);
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
     private FixedDepositProductHelper fixedDepositProductHelper;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FlexibleSavingsInterestPostingIntegrationTest.java

@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "rawtypes", "unused", "unchecked" })
 public class FlexibleSavingsInterestPostingIntegrationTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(FlexibleSavingsInterestPostingIntegrationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FlexibleSavingsInterestPostingIntegrationTest.class);
     public static final String ACCOUNT_TYPE_INDIVIDUAL = "INDIVIDUAL";
 
     private ResponseSpecification responseSpec;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupLoanIntegrationTest.java

@@ -53,7 +53,7 @@ public class GroupLoanIntegrationTest {
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
     private LoanTransactionHelper loanTransactionHelper;
-    private final static Logger LOG = LoggerFactory.getLogger(GroupLoanIntegrationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(GroupLoanIntegrationTest.class);
 
     @BeforeEach
     public void setup() {

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupSavingsIntegrationTest.java

@@ -65,7 +65,7 @@ public class GroupSavingsIntegrationTest {
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
     private SavingsAccountHelper savingsAccountHelper;
-    private final static Logger LOG = LoggerFactory.getLogger(GroupSavingsIntegrationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(GroupSavingsIntegrationTest.class);
 
     @BeforeEach
     public void setup() {

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupTest.java

@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
  */
 public class GroupTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(GroupTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(GroupTest.class);
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
     private LoanTransactionHelper loanTransactionHelper;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/HookIntegrationTest.java

@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
 
 public class HookIntegrationTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(HookIntegrationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(HookIntegrationTest.class);
     private RequestSpecification requestSpec;
     private ResponseSpecification responseSpec;
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanApplicationApprovalTest.java

@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings("rawtypes")
 public class LoanApplicationApprovalTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LoanApplicationApprovalTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoanApplicationApprovalTest.class);
     private ResponseSpecification responseSpec;
     private ResponseSpecification responseSpecForStatusCode403;
     private ResponseSpecification responseSpecForStatusCode400;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanApplicationUndoLastTrancheTest.java

@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings("rawtypes")
 public class LoanApplicationUndoLastTrancheTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LoanApplicationUndoLastTrancheTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoanApplicationUndoLastTrancheTest.class);
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
     private LoanTransactionHelper loanTransactionHelper;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanDisbursalDateValidationTest.java

@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings("rawtypes")
 public class LoanDisbursalDateValidationTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LoanDisbursalDateValidationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoanDisbursalDateValidationTest.class);
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
     private LoanTransactionHelper loanTransactionHelper;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanDisbursementDetailsIntegrationTest.java

@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class LoanDisbursementDetailsIntegrationTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LoanDisbursementDetailsIntegrationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoanDisbursementDetailsIntegrationTest.class);
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
     private LoanTransactionHelper loanTransactionHelper;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanRepaymentRescheduleAtDisbursementTest.java

@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings("rawtypes")
 public class LoanRepaymentRescheduleAtDisbursementTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LoanRepaymentRescheduleAtDisbursementTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoanRepaymentRescheduleAtDisbursementTest.class);
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
     private LoanTransactionHelper loanTransactionHelper;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanRescheduleRequestTest.java

@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "rawtypes" })
 public class LoanRescheduleRequestTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LoanRescheduleRequestTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoanRescheduleRequestTest.class);
     private ResponseSpecification responseSpec;
     private ResponseSpecification generalResponseSpec;
     private RequestSpecification requestSpec;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanReschedulingWithinCenterTest.java

@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
 
 public class LoanReschedulingWithinCenterTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LoanReschedulingWithinCenterTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoanReschedulingWithinCenterTest.class);
     private RequestSpecification requestSpec;
     private ResponseSpecification responseSpec;
     private LoanTransactionHelper loanTransactionHelper;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanWithWaiveInterestAndWriteOffIntegrationTest.java

@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "rawtypes" })
 public class LoanWithWaiveInterestAndWriteOffIntegrationTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LoanWithWaiveInterestAndWriteOffIntegrationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoanWithWaiveInterestAndWriteOffIntegrationTest.class);
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/NotificationApiTest.java

@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
 
 public class NotificationApiTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(NotificationApiTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(NotificationApiTest.class);
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/PasswordPreferencesIntegrationTest.java

@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class PasswordPreferencesIntegrationTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(PasswordPreferencesIntegrationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PasswordPreferencesIntegrationTest.class);
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
     private ResponseSpecification generalResponseSpec;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/RecurringDepositTest.java

@@ -65,7 +65,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "unused", "rawtypes", "unchecked", "static-access" })
 public class RecurringDepositTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(RecurringDepositTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RecurringDepositTest.class);
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
     private RecurringDepositProductHelper recurringDepositProductHelper;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/RolesTest.java

@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
 
 public class RolesTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(RolesTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RolesTest.class);
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SkipRepaymentOnMonthFirstTest.java

@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
 
 public class SkipRepaymentOnMonthFirstTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(SkipRepaymentOnMonthFirstTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SkipRepaymentOnMonthFirstTest.class);
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
     private GlobalConfigurationHelper globalConfigurationHelper;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/UserAdministrationTest.java

@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
 
 public class UserAdministrationTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(UserAdministrationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(UserAdministrationTest.class);
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
     private List<Integer> transientUsers = new ArrayList<>();

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/XBRLIntegrationTest.java

@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class XBRLIntegrationTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(XBRLIntegrationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(XBRLIntegrationTest.class);
     private RequestSpecification requestSpec;
     private ResponseSpecification responseSpec;
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/client/ClientEntityImportHandlerTest.java

@@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
 
 public class ClientEntityImportHandlerTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ClientEntityImportHandlerTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ClientEntityImportHandlerTest.class);
 
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/loan/LoanImportHandlerTest.java

@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
 
 public class LoanImportHandlerTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LoanImportHandlerTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoanImportHandlerTest.class);
     private static final String CREATE_CLIENT_URL = "/fineract-provider/api/v1/clients?" + Utils.TENANT_IDENTIFIER;
     public static final String DATE_FORMAT = "dd MMMM yyyy";
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/office/OfficeImportHandlerTest.java

@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
 
 public class OfficeImportHandlerTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(OfficeImportHandlerTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(OfficeImportHandlerTest.class);
 
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/savings/SavingsImportHandlerTest.java

@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
 
 public class SavingsImportHandlerTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(SavingsImportHandlerTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SavingsImportHandlerTest.class);
 
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/BatchHelper.java

@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
  */
 public final class BatchHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(BatchHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(BatchHelper.class);
     private static final String BATCH_API_URL = "/fineract-provider/api/v1/batches?" + Utils.TENANT_IDENTIFIER;
     private static final String BATCH_API_URL_EXT = BATCH_API_URL + "&enclosingTransaction=true";
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CalendarHelper.java

@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
 
 public class CalendarHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(CalendarHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CalendarHelper.class);
     private static final String BASE_URL = "/fineract-provider/api/v1/";
     private static final String PARENT_ENTITY_NAME = "groups/";
     private static final String ENITY_NAME = "/calendars";

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterDomain.java

@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
 
 public class CenterDomain implements Comparable<CenterDomain> {
 
-    private final static Logger LOG = LoggerFactory.getLogger(CenterDomain.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CenterDomain.class);
 
     public final static class Builder {
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterHelper.java

@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class CenterHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(CenterHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CenterHelper.class);
     private static final String CENTERS_URL = "/fineract-provider/api/v1/centers";
 
     public static final String CREATED_DATE = "29 December 2014";

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ClientHelper.java

@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
 
 public class ClientHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ClientHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ClientHelper.class);
     private final RequestSpecification requestSpec;
     private final ResponseSpecification responseSpec;
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CommonConstants.java

@@ -20,7 +20,7 @@ package org.apache.fineract.integrationtests.common;
 
 public interface CommonConstants {
 
-    public final static String LOCALE = "en";
+    public static final String LOCALE = "en";
     public static final String DATE_FORMAT = "dd MMMM yyyy";
     public static final String RESPONSE_RESOURCE_ID = "resourceId";
     public static final String RESPONSE_CHANGES = "changes";

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CurrenciesHelper.java

@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "unused", "rawtypes", "unchecked" })
 public class CurrenciesHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(CurrenciesHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CurrenciesHelper.class);
     private static final String CURRENCIES_URL = "/fineract-provider/api/v1/currencies";
 
     public static ArrayList<CurrencyDomain> getAllCurrencies(final RequestSpecification requestSpec,

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/GlobalConfigurationHelper.java

@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "unused", "rawtypes" })
 public class GlobalConfigurationHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(GlobalConfigurationHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(GlobalConfigurationHelper.class);
     private final RequestSpecification requestSpec;
     private final ResponseSpecification responseSpec;
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/GroupHelper.java

@@ -36,7 +36,7 @@ public class GroupHelper {
 
     private final RequestSpecification requestSpec;
     private final ResponseSpecification responseSpec;
-    private final static Logger LOG = LoggerFactory.getLogger(GroupHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(GroupHelper.class);
 
     private static final String CREATE_GROUP_URL = "/fineract-provider/api/v1/groups?" + Utils.TENANT_IDENTIFIER;
     public static final String DATE_FORMAT = "dd MMMM yyyy";

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HolidayHelper.java

@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "unused", "rawtypes" })
 public class HolidayHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(HolidayHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(HolidayHelper.class);
     private static final String HOLIDAYS_URL = "/fineract-provider/api/v1/holidays";
     private static final String CREATE_HOLIDAY_URL = HOLIDAYS_URL + "?" + Utils.TENANT_IDENTIFIER;
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HookHelper.java

@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
 
 public class HookHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(HookHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(HookHelper.class);
     private final RequestSpecification requestSpec;
     private final ResponseSpecification responseSpec;
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ImageHelper.java

@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
 
 public class ImageHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ImageHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ImageHelper.class);
     private static final String STAFF_IMAGE_URL = "/fineract-provider/api/v1/staff/";
     private static final String IMAGES_URI = "/images";
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/NotificationHelper.java

@@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory;
 
 public class NotificationHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(NotificationHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(NotificationHelper.class);
     private final RequestSpecification requestSpec;
     private final ResponseSpecification responseSpec;
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/OfficeHelper.java

@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
 
 public class OfficeHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(OfficeHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(OfficeHelper.class);
     private static final String OFFICE_URL = "/fineract-provider/api/v1/offices";
     private final RequestSpecification requestSpec;
     private final ResponseSpecification responseSpec;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ProvisioningIntegrationTest.java

@@ -50,9 +50,9 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class ProvisioningIntegrationTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ProvisioningIntegrationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ProvisioningIntegrationTest.class);
     private static final String NONE = "1";
-    private final static int LOANPRODUCTS_SIZE = 10;
+    private static final int LOANPRODUCTS_SIZE = 10;
 
     private RequestSpecification requestSpec;
     private ResponseSpecification responseSpec;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SchedulerJobHelper.java

@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
 
 public class SchedulerJobHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(SchedulerJobHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SchedulerJobHelper.class);
     private final RequestSpecification requestSpec;
     private final ResponseSpecification response200Spec;
     private final ResponseSpecification response202Spec;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/StandingInstructionsHelper.java

@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "unused", "rawtypes", "unchecked" })
 public class StandingInstructionsHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(StandingInstructionsHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(StandingInstructionsHelper.class);
     private static final String STANDING_INSTRUCTIONS_URL = "/fineract-provider/api/v1/standinginstructions";
     private static final String STANDING_INSTRUCTIONS_RUNHISTORY_URL = "/fineract-provider/api/v1/standinginstructionrunhistory";
     private static final String LOCALE = "en_GB";

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SurveyHelper.java

@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
 
 public class SurveyHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(SurveyHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SurveyHelper.class);
     private static final String FULFIL_SURVEY_URL = "/fineract-provider/api/v1/survey/ppi_kenya_2009/clientId?" + Utils.TENANT_IDENTIFIER;
 
     public static Integer fulfilSurvey(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxComponentHelper.java

@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
 
 public class TaxComponentHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(TaxComponentHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TaxComponentHelper.class);
     private static final String CREATE_TAX_COMPONENT_URL = "/fineract-provider/api/v1/taxes/component?" + Utils.TENANT_IDENTIFIER;
 
     public static Integer createTaxComponent(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxGroupHelper.java

@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
 
 public class TaxGroupHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(TaxGroupHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TaxGroupHelper.class);
     private static final String CREATE_TAX_COMPONENT_URL = "/fineract-provider/api/v1/taxes/group?" + Utils.TENANT_IDENTIFIER;
 
     public static Integer createTaxGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java

@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings("unchecked")
 public class Utils {
 
-    private final static Logger LOG = LoggerFactory.getLogger(Utils.class);
+    private static final Logger LOG = LoggerFactory.getLogger(Utils.class);
 
     public static final String TENANT_PARAM_NAME = "tenantIdentifier";
     public static final String DEFAULT_TENANT = "default";

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/WorkingDaysHelper.java

@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
 
 public class WorkingDaysHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(WorkingDaysHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(WorkingDaysHelper.class);
     private static final String WORKINGDAYS_URL = "/fineract-provider/api/v1/workingdays";
 
     public static Object updateWorkingDays(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/charges/ChargesHelper.java

@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class ChargesHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ChargesHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ChargesHelper.class);
     private static final String CHARGES_URL = "/fineract-provider/api/v1/charges";
     private static final String CREATE_CHARGES_URL = CHARGES_URL + "?" + Utils.TENANT_IDENTIFIER;
 
@@ -72,12 +72,12 @@ public class ChargesHelper {
     private static final Integer CHARGE_FEE_FREQUENCY_MONTHS = 2;
     private static final Integer CHARGE_FEE_FREQUENCY_YEARS = 3;
 
-    private final static boolean ACTIVE = true;
-    private final static boolean PENALTY = true;
-    private final static String AMOUNT = "100";
-    private final static String CURRENCY_CODE = "USD";
-    public final static String FEE_ON_MONTH_DAY = "04 March";
-    private final static String MONTH_DAY_FORMAT = "dd MMM";
+    private static final boolean ACTIVE = true;
+    private static final boolean PENALTY = true;
+    private static final String AMOUNT = "100";
+    private static final String CURRENCY_CODE = "USD";
+    public static final String FEE_ON_MONTH_DAY = "04 March";
+    private static final String MONTH_DAY_FORMAT = "dd MMM";
 
     public static String getSavingsSpecifiedDueDateJSON() {
         final HashMap<String, Object> map = populateDefaultsForSavings();

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountHelper.java

@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "unused", "rawtypes" })
 public class FixedDepositAccountHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(FixedDepositAccountHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FixedDepositAccountHelper.class);
     private final RequestSpecification requestSpec;
     private final ResponseSpecification responseSpec;
 
@@ -71,7 +71,7 @@ public class FixedDepositAccountHelper {
     private static final String INTEREST_CALCULATION_USING_AVERAGE_DAILY_BALANCE = "2";
     private static final String DAYS_360 = "360";
     private static final String DAYS_365 = "365";
-    public final static String DEPOSIT_AMOUNT = "100000";
+    public static final String DEPOSIT_AMOUNT = "100000";
     private String newDepositAmount = null;
 
     private String interestCompoundingPeriodType = MONTHLY;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountStatusChecker.java

@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings("rawtypes")
 public class FixedDepositAccountStatusChecker {
 
-    private final static Logger LOG = LoggerFactory.getLogger(FixedDepositAccountStatusChecker.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FixedDepositAccountStatusChecker.class);
     private static final String FIXED_DEPOSIT_ACCOUNT_URL = "/fineract-provider/api/v1/fixeddepositaccounts";
 
     public static void verifyFixedDepositIsApproved(final HashMap fixedDepositStatusHashMap) {

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositProductHelper.java

@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "unused", "rawtypes" })
 public class FixedDepositProductHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(FixedDepositProductHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FixedDepositProductHelper.class);
     private final RequestSpecification requestSpec;
     private final ResponseSpecification responseSpec;
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanApplicationTestBuilder.java

@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
 
 public class LoanApplicationTestBuilder {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LoanApplicationTestBuilder.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoanApplicationTestBuilder.class);
     private static final String DAYS = "0";
     private static final String WEEKS = "1";
     private static final String MONTHS = "2";

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java

@@ -47,7 +47,7 @@ public class LoanTransactionHelper {
 
     private final RequestSpecification requestSpec;
     private final ResponseSpecification responseSpec;
-    private final static Logger LOG = LoggerFactory.getLogger(LoanTransactionHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoanTransactionHelper.class);
 
     private static final String CREATE_LOAN_PRODUCT_URL = "/fineract-provider/api/v1/loanproducts?" + Utils.TENANT_IDENTIFIER;
     private static final String APPLY_LOAN_URL = "/fineract-provider/api/v1/loans?" + Utils.TENANT_IDENTIFIER;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/CampaignsHelper.java

@@ -39,7 +39,7 @@ import org.springframework.util.Assert;
 
 public class CampaignsHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(CampaignsHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CampaignsHelper.class);
     private final RequestSpecification requestSpec;
     private final ResponseSpecification responseSpec;
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/CurrencyHelper.java

@@ -37,7 +37,7 @@ import org.springframework.util.Assert;
 
 public class CurrencyHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(CurrencyHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CurrencyHelper.class);
     private static final String CURRENCY_URL = "/fineract-provider/api/v1/currencies?" + Utils.TENANT_IDENTIFIER;
     private static final String CURRENCY_URL_SELECTED = CURRENCY_URL + "&fields=selectedCurrencyOptions";
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/EntityDatatableChecksHelper.java

@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
 
 public class EntityDatatableChecksHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(EntityDatatableChecksHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(EntityDatatableChecksHelper.class);
     private final RequestSpecification requestSpec;
     private final ResponseSpecification responseSpec;
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/EntityDatatableChecksIntegrationTest.java

@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
  */
 public class EntityDatatableChecksIntegrationTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(EntityDatatableChecksIntegrationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(EntityDatatableChecksIntegrationTest.class);
     private RequestSpecification requestSpec;
     private ResponseSpecification responseSpec;
     private EntityDatatableChecksHelper entityDatatableChecksHelper;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/StaffHelper.java

@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
 
 public class StaffHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(StaffHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(StaffHelper.class);
     private static final String TRANSFER_STAFF_URL = "/fineract-provider/api/v1/groups";
 
     private static final String CREATE_STAFF_URL = "/fineract-provider/api/v1/staff";

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/provisioning/ProvisioningHelper.java

@@ -30,7 +30,7 @@ import org.apache.fineract.integrationtests.common.accounting.Account;
 
 public class ProvisioningHelper {
 
-    public final static Map createProvisioingCriteriaJson(ArrayList<Integer> loanProducts, ArrayList categories, Account liability,
+    public static final Map createProvisioingCriteriaJson(ArrayList<Integer> loanProducts, ArrayList categories, Account liability,
             Account expense) {
         final HashMap<String, Object> map = new HashMap<>();
         map.put("loanProducts", addLoanProducts(loanProducts));
@@ -44,7 +44,7 @@ public class ProvisioningHelper {
         return map;
     }
 
-    public final static String createProvisioningEntryJson() {
+    public static final String createProvisioningEntryJson() {
         final HashMap<String, Object> map = new HashMap<>();
         map.put("createjournalentries", Boolean.FALSE);
         map.put("locale", "en");
@@ -55,7 +55,7 @@ public class ProvisioningHelper {
         return provisioningEntryCreateJson;
     }
 
-    public final static String createProvisioningEntryJsonWithJournalsEnabled() {
+    public static final String createProvisioningEntryJsonWithJournalsEnabled() {
         final HashMap<String, Object> map = new HashMap<>();
         map.put("createjournalentries", Boolean.TRUE);
         map.put("locale", "en");

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/rates/RatesHelper.java

@@ -31,9 +31,9 @@ public class RatesHelper {
 
     private static final String RATES_URL = "/fineract-provider/api/v1/rates";
     private static final String CREATE_RATES_URL = RATES_URL + "?" + Utils.TENANT_IDENTIFIER;
-    private final static String PERCENTAGE = "10";
-    private final static Integer PRODUCT_APPLY_LOAN = 1;
-    private final static Boolean ACTIVE = true;
+    private static final String PERCENTAGE = "10";
+    private static final Integer PRODUCT_APPLY_LOAN = 1;
+    private static final Boolean ACTIVE = true;
 
     public static ArrayList<HashMap> getRates(final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
         return (ArrayList) Utils.performServerGet(requestSpec, responseSpec, RATES_URL + "?" + Utils.TENANT_IDENTIFIER, "");

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositAccountHelper.java

@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "unused", "rawtypes" })
 public class RecurringDepositAccountHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(RecurringDepositAccountHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RecurringDepositAccountHelper.class);
     private final RequestSpecification requestSpec;
     private final ResponseSpecification responseSpec;
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositAccountStatusChecker.java

@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings("rawtypes")
 public class RecurringDepositAccountStatusChecker {
 
-    private final static Logger LOG = LoggerFactory.getLogger(RecurringDepositAccountStatusChecker.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RecurringDepositAccountStatusChecker.class);
     private static final String RECURRING_DEPOSIT_ACCOUNT_URL = "/fineract-provider/api/v1/recurringdepositaccounts";
 
     public static void verifyRecurringDepositIsApproved(final HashMap recurringDepositStatusHashMap) {

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositProductHelper.java

@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "unused", "rawtypes" })
 public class RecurringDepositProductHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(RecurringDepositProductHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RecurringDepositProductHelper.class);
     private final RequestSpecification requestSpec;
     private final ResponseSpecification responseSpec;
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/AccountTransferHelper.java

@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
 
 public class AccountTransferHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(AccountTransferHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AccountTransferHelper.class);
     private static final String ACCOUNT_TRANSFER_URL = "/fineract-provider/api/v1/accounttransfers";
     private static final String LOAN_REFUND_BY_TRANSFER_URL = "/fineract-provider/api/v1/accounttransfers/refundByTransfer";
     private static final String LOCALE = "en_GB";

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsAccountHelper.java

@@ -48,7 +48,7 @@ public class SavingsAccountHelper {
 
     private final RequestSpecification requestSpec;
     private final ResponseSpecification responseSpec;
-    private final static Logger LOG = LoggerFactory.getLogger(SavingsAccountHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SavingsAccountHelper.class);
 
     private static final String SAVINGS_ACCOUNT_URL = "/fineract-provider/api/v1/savingsaccounts";
     private static final String APPROVE_SAVINGS_COMMAND = "approve";

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsApplicationTestBuilder.java

@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
 
 public class SavingsApplicationTestBuilder {
 
-    private final static Logger LOG = LoggerFactory.getLogger(SavingsApplicationTestBuilder.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SavingsApplicationTestBuilder.class);
     private static final String LOCALE = "en_GB";
 
     private String submittedOnDate = "";

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsProductHelper.java

@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings("unused")
 public class SavingsProductHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(SavingsProductHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SavingsProductHelper.class);
     private static final String SAVINGS_PRODUCT_URL = "/fineract-provider/api/v1/savingsproducts";
     private static final String CREATE_SAVINGS_PRODUCT_URL = SAVINGS_PRODUCT_URL + "?" + Utils.TENANT_IDENTIFIER;
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsStatusChecker.java

@@ -30,7 +30,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings("rawtypes")
 public class SavingsStatusChecker {
 
-    private final static Logger LOG = LoggerFactory.getLogger(SavingsStatusChecker.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SavingsStatusChecker.class);
     private static final String SAVINGS_ACCOUNT_URL = "/fineract-provider/api/v1/savingsaccounts";
 
     public static void verifySavingsIsApproved(final HashMap savingsStatusHashMap) {

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountHelper.java

@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
 
 public class ShareAccountHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ShareAccountHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ShareAccountHelper.class);
     private static final String LOCALE = "en_GB";
 
     private String clientId;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountIntegrationTests.java

@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
 
 public class ShareAccountIntegrationTests {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ShareAccountIntegrationTests.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ShareAccountIntegrationTests.class);
     private RequestSpecification requestSpec;
     private ResponseSpecification responseSpec;
     private ShareProductHelper shareProductHelper;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareProductHelper.java

@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
 
 public class ShareProductHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ShareProductHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ShareProductHelper.class);
     private static final String NONE = "1";
     private static final String CASH_BASED = "2";
     private static final String LOCALE = "en_GB";

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/AccountNumberPreferencesHelper.java

@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
 
 public class AccountNumberPreferencesHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(AccountNumberPreferencesHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AccountNumberPreferencesHelper.class);
     private final RequestSpecification requestSpec;
 
     private final ResponseSpecification responseSpec;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/DatatableHelper.java

@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
 
 public class DatatableHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(DatatableHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DatatableHelper.class);
     private final RequestSpecification requestSpec;
     private final ResponseSpecification responseSpec;
 

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/interoperation/InteropHelper.java

@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "rawtypes" })
 public class InteropHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(InteropHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(InteropHelper.class);
 
     private static final String BASE_URL = "/fineract-provider/api/v1/interoperation";
     private static final String HEALTH_URL = BASE_URL + "/health";

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/interoperation/InteropTest.java

@@ -57,13 +57,13 @@ import org.slf4j.LoggerFactory;
 
 public class InteropTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(InteropTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(InteropTest.class);
 
-    private final static String MIN_INTEREST_CALCULATON_BALANCE = null;
-    private final static String MIN_REQUIRED_BALANCE = null;
-    private final static String MIN_OPENING_BALANCE = "100000.0";
-    private final static boolean ENFORCE_MIN_REQUIRED_BALANCE = false;
-    private final static MathContext MATHCONTEXT = new MathContext(12, RoundingMode.HALF_EVEN);
+    private static final String MIN_INTEREST_CALCULATON_BALANCE = null;
+    private static final String MIN_REQUIRED_BALANCE = null;
+    private static final String MIN_OPENING_BALANCE = "100000.0";
+    private static final boolean ENFORCE_MIN_REQUIRED_BALANCE = false;
+    private static final MathContext MATHCONTEXT = new MathContext(12, RoundingMode.HALF_EVEN);
 
     private RequestSpecification requestSpec;
     private ResponseSpecification responseSpec;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/loanaccount/guarantor/GuarantorTest.java

@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
 
 public class GuarantorTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(GuarantorTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(GuarantorTest.class);
     private ResponseSpecification responseSpec;
     private RequestSpecification requestSpec;
     private LoanTransactionHelper loanTransactionHelper;

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/loanaccount/guarantor/GuarantorTestBuilder.java

@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
 
 public class GuarantorTestBuilder {
 
-    private final static Logger LOG = LoggerFactory.getLogger(GuarantorTestBuilder.class);
+    private static final Logger LOG = LoggerFactory.getLogger(GuarantorTestBuilder.class);
     private static final String GUARANTOR_TYPE_CUSTOMER = "1";
     @SuppressWarnings("unused")
     private static final String GUARANTOR_TYPE_STAFF = "2";

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsDecliningBalanceHelper.java

@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class VariableInstallmentsDecliningBalanceHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(VariableInstallmentsDecliningBalanceHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(VariableInstallmentsDecliningBalanceHelper.class);
 
     public static String createLoanProductWithoutVaribleConfig(final boolean multiDisburseLoan, final String accountingRule,
             final Account... accounts) {

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsFlatHelper.java

@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class VariableInstallmentsFlatHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(VariableInstallmentsFlatHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(VariableInstallmentsFlatHelper.class);
 
     public static String createLoanProductWithVaribleConfig(final boolean multiDisburseLoan, final String accountingRule,
             final Account... accounts) {

fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsIntegrationTest.java

@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class VariableInstallmentsIntegrationTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(VariableInstallmentsIntegrationTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(VariableInstallmentsIntegrationTest.class);
     private static final String NONE = "1";
     private RequestSpecification requestSpec;
     private ResponseSpecification responseSpec;

fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureWritePlatformServiceJpaRepositoryImpl.java

@@ -47,7 +47,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class GLClosureWritePlatformServiceJpaRepositoryImpl implements GLClosureWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(GLClosureWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(GLClosureWritePlatformServiceJpaRepositoryImpl.class);
 
     private final GLClosureRepository glClosureRepository;
     private final OfficeRepositoryWrapper officeRepositoryWrapper;

fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/DuplicateFinancialActivityAccountFoundException.java

@@ -26,7 +26,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR
  */
 public class DuplicateFinancialActivityAccountFoundException extends AbstractPlatformDomainRuleException {
 
-    private final static String errorCode = "error.msg.financialActivityAccount.exists";
+    private static final String errorCode = "error.msg.financialActivityAccount.exists";
 
     public DuplicateFinancialActivityAccountFoundException(final Integer financialActivityType) {
         super(errorCode, "Mapping for activity already exists " + financialActivityType, financialActivityType);

fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/FinancialActivityAccountInvalidException.java

@@ -28,7 +28,7 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR
  */
 public class FinancialActivityAccountInvalidException extends AbstractPlatformDomainRuleException {
 
-    private final static String errorCode = "error.msg.financialActivityAccount.invalid";
+    private static final String errorCode = "error.msg.financialActivityAccount.invalid";
 
     public FinancialActivityAccountInvalidException(final FinancialActivity financialActivity, final GLAccount glAccount) {
         super(errorCode,

fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountWritePlatformServiceImpl.java

@@ -47,7 +47,7 @@ public class FinancialActivityAccountWritePlatformServiceImpl implements Financi
     private final FinancialActivityAccountRepositoryWrapper financialActivityAccountRepository;
     private final FinancialActivityAccountDataValidator fromApiJsonDeserializer;
     private final GLAccountRepositoryWrapper glAccountRepositoryWrapper;
-    private final static Logger LOG = LoggerFactory.getLogger(FinancialActivityAccountWritePlatformServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FinancialActivityAccountWritePlatformServiceImpl.class);
 
     @Autowired
     public FinancialActivityAccountWritePlatformServiceImpl(

fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountReadPlatformServiceImpl.java

@@ -45,7 +45,7 @@ import org.springframework.stereotype.Service;
 public class GLAccountReadPlatformServiceImpl implements GLAccountReadPlatformService {
 
     private final JdbcTemplate jdbcTemplate;
-    private final static String nameDecoratedBaseOnHierarchy = "concat(substring('........................................', 1, ((LENGTH(hierarchy) - LENGTH(REPLACE(hierarchy, '.', '')) - 1) * 4)), name)";
+    private static final String nameDecoratedBaseOnHierarchy = "concat(substring('........................................', 1, ((LENGTH(hierarchy) - LENGTH(REPLACE(hierarchy, '.', '')) - 1) * 4)), name)";
 
     @Autowired
     public GLAccountReadPlatformServiceImpl(final RoutingDataSource dataSource) {

fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountWritePlatformServiceJpaRepositoryImpl.java

@@ -57,7 +57,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class GLAccountWritePlatformServiceJpaRepositoryImpl implements GLAccountWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(GLAccountWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(GLAccountWritePlatformServiceJpaRepositoryImpl.class);
 
     private final GLAccountRepository glAccountRepository;
     private final JournalEntryRepository glJournalEntryRepository;

fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java

@@ -53,7 +53,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class JournalEntryRunningBalanceUpdateServiceImpl implements JournalEntryRunningBalanceUpdateService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(JournalEntryRunningBalanceUpdateServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JournalEntryRunningBalanceUpdateServiceImpl.class);
 
     private final JdbcTemplate jdbcTemplate;