diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index 8e8bec066..e4cd4b95d 100644
--- a/fineract-provider/build.gradle
+++ b/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 {
diff --git a/fineract-provider/config/checkstyle/checkstyle.xml b/fineract-provider/config/checkstyle/checkstyle.xml
index 01ad7efe7..5720b78a5 100644
--- a/fineract-provider/config/checkstyle/checkstyle.xml
+++ b/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">
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountNumberPreferencesTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountNumberPreferencesTest.java
index d10110dd4..3fa7566e6 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountNumberPreferencesTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountTransferTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountTransferTest.java
index 8989def03..93f835f06 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountTransferTest.java
+++ b/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";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountingScenarioIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountingScenarioIntegrationTest.java
index 4202d077b..a0adb0881 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/AccountingScenarioIntegrationTest.java
+++ b/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;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ActuatorIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ActuatorIntegrationTest.java
index af920e1b2..824b6c2bd 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ActuatorIntegrationTest.java
+++ b/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() {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/BatchRequestsIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/BatchRequestsIntegrationTest.java
index 4bd25bd99..9a9b137f0 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/BatchRequestsIntegrationTest.java
+++ b/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;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CenterIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CenterIntegrationTest.java
index 258487a04..22a35a481 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/CenterIntegrationTest.java
+++ b/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;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java
index 669ed0dda..aa8c7ed1c 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientLoanIntegrationTest.java
+++ b/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";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java
index cbf168774..db31fdfa3 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientSavingsIntegrationTest.java
+++ b/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";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientStatusChecker.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientStatusChecker.java
index 495a268ed..b27442a1c 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientStatusChecker.java
+++ b/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"));
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ConcurrencyIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ConcurrencyIntegrationTest.java
index e8a00833f..ef61c399e 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ConcurrencyIntegrationTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ExternalServicesConfigurationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ExternalServicesConfigurationTest.java
index 2e4a25759..497507150 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ExternalServicesConfigurationTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FixedDepositTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FixedDepositTest.java
index 7dbd91196..25f125be2 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FixedDepositTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FlexibleSavingsInterestPostingIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FlexibleSavingsInterestPostingIntegrationTest.java
index 7d6b03532..a087235cc 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/FlexibleSavingsInterestPostingIntegrationTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupLoanIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupLoanIntegrationTest.java
index df19c30ac..b078ffdd1 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupLoanIntegrationTest.java
+++ b/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() {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupSavingsIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupSavingsIntegrationTest.java
index 613c872c1..8655b24f4 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupSavingsIntegrationTest.java
+++ b/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() {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupTest.java
index b38142608..9320ae039 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/GroupTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/HookIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/HookIntegrationTest.java
index 3f70aa75e..3729c464e 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/HookIntegrationTest.java
+++ b/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;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanApplicationApprovalTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanApplicationApprovalTest.java
index e52094954..8d3ee936c 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanApplicationApprovalTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanApplicationUndoLastTrancheTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanApplicationUndoLastTrancheTest.java
index 4544dc2ec..9f3b62b0e 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanApplicationUndoLastTrancheTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanDisbursalDateValidationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanDisbursalDateValidationTest.java
index 139233a85..4a2bdff6a 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanDisbursalDateValidationTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanDisbursementDetailsIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanDisbursementDetailsIntegrationTest.java
index 1bf251be8..dc98baa98 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanDisbursementDetailsIntegrationTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanRepaymentRescheduleAtDisbursementTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanRepaymentRescheduleAtDisbursementTest.java
index d71668c5a..8d3a887b1 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanRepaymentRescheduleAtDisbursementTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanRescheduleRequestTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanRescheduleRequestTest.java
index b33833589..d3d30e578 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanRescheduleRequestTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanReschedulingWithinCenterTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanReschedulingWithinCenterTest.java
index 59bc15b93..9d2a2f036 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanReschedulingWithinCenterTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanWithWaiveInterestAndWriteOffIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanWithWaiveInterestAndWriteOffIntegrationTest.java
index 0e9173e33..53ce86a4f 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/LoanWithWaiveInterestAndWriteOffIntegrationTest.java
+++ b/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;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/NotificationApiTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/NotificationApiTest.java
index 48de87210..efcb9e174 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/NotificationApiTest.java
+++ b/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;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/PasswordPreferencesIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/PasswordPreferencesIntegrationTest.java
index c4f7905fb..fa3af54c7 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/PasswordPreferencesIntegrationTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/RecurringDepositTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/RecurringDepositTest.java
index 39df6e732..45f72622a 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/RecurringDepositTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/RolesTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/RolesTest.java
index d23f20c48..40e2c6ce8 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/RolesTest.java
+++ b/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;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SkipRepaymentOnMonthFirstTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SkipRepaymentOnMonthFirstTest.java
index 73386a8b4..90c0b6f6c 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/SkipRepaymentOnMonthFirstTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/UserAdministrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/UserAdministrationTest.java
index 81936d772..3fa9c3d83 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/UserAdministrationTest.java
+++ b/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<>();
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/XBRLIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/XBRLIntegrationTest.java
index bfa62f509..61d023f63 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/XBRLIntegrationTest.java
+++ b/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;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/client/ClientEntityImportHandlerTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/client/ClientEntityImportHandlerTest.java
index b555193b8..3bbb957be 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/client/ClientEntityImportHandlerTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/loan/LoanImportHandlerTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/loan/LoanImportHandlerTest.java
index 8dee9f55c..c1897bd4d 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/loan/LoanImportHandlerTest.java
+++ b/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";
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/office/OfficeImportHandlerTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/office/OfficeImportHandlerTest.java
index d1f510314..671e7d9db 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/office/OfficeImportHandlerTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/savings/SavingsImportHandlerTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/savings/SavingsImportHandlerTest.java
index f2ad53e71..a7ff0fa31 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/bulkimport/importhandler/savings/SavingsImportHandlerTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/BatchHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/BatchHelper.java
index 8bb347a3a..5a026b523 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/BatchHelper.java
+++ b/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";
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CalendarHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CalendarHelper.java
index c64b4bdb3..d70256519 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CalendarHelper.java
+++ b/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";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterDomain.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterDomain.java
index 87ea6fcda..321c4e07a 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterDomain.java
+++ b/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 {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterHelper.java
index 8a8ea7526..527473644 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterHelper.java
+++ b/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";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ClientHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ClientHelper.java
index bd1b1994f..f22f729f4 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ClientHelper.java
+++ b/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;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CommonConstants.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CommonConstants.java
index 2857caf29..f7c9c416b 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CommonConstants.java
+++ b/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";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CurrenciesHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CurrenciesHelper.java
index 3d4afdaab..73e903ea3 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CurrenciesHelper.java
+++ b/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,
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/GlobalConfigurationHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/GlobalConfigurationHelper.java
index d8d185585..fa52e444d 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/GlobalConfigurationHelper.java
+++ b/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;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/GroupHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/GroupHelper.java
index 9ab1d73c8..5affaacf2 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/GroupHelper.java
+++ b/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";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HolidayHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HolidayHelper.java
index 8362470da..3d49f4c57 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HolidayHelper.java
+++ b/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;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HookHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HookHelper.java
index 716ea235f..d7b81302c 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HookHelper.java
+++ b/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;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ImageHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ImageHelper.java
index 9171c81be..4d112410c 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ImageHelper.java
+++ b/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";
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/NotificationHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/NotificationHelper.java
index d0917f646..e375059f2 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/NotificationHelper.java
+++ b/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;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/OfficeHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/OfficeHelper.java
index 99dfafb7b..f6f5faf1c 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/OfficeHelper.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ProvisioningIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ProvisioningIntegrationTest.java
index 88269b100..8e568db0f 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ProvisioningIntegrationTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SchedulerJobHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SchedulerJobHelper.java
index a603c4ce8..1a4f2871c 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SchedulerJobHelper.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/StandingInstructionsHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/StandingInstructionsHelper.java
index 20ceec78a..f95191856 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/StandingInstructionsHelper.java
+++ b/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";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SurveyHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SurveyHelper.java
index 41250a8e5..840ac4b81 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SurveyHelper.java
+++ b/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) {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxComponentHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxComponentHelper.java
index d24f06f1e..b27e1a889 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxComponentHelper.java
+++ b/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,
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxGroupHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxGroupHelper.java
index cdf71f29f..9fc8958b9 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxGroupHelper.java
+++ b/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,
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java
index 88eaee6f0..512e62702 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java
+++ b/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";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/WorkingDaysHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/WorkingDaysHelper.java
index df14bb8b0..7c3d831bd 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/WorkingDaysHelper.java
+++ b/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) {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/charges/ChargesHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/charges/ChargesHelper.java
index bbb659278..6f4025f98 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/charges/ChargesHelper.java
+++ b/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();
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountHelper.java
index 3e525be31..9021b5d73 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountHelper.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountStatusChecker.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountStatusChecker.java
index 68ba676d9..be71da180 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountStatusChecker.java
+++ b/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) {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositProductHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositProductHelper.java
index 0f8c81ef6..4cd81d3ec 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositProductHelper.java
+++ b/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;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanApplicationTestBuilder.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanApplicationTestBuilder.java
index 487e5818a..c3c39999f 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanApplicationTestBuilder.java
+++ b/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";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java
index f9312b967..168c0d85f 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanTransactionHelper.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/CampaignsHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/CampaignsHelper.java
index 3bb669d17..580f60ea2 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/CampaignsHelper.java
+++ b/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;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/CurrencyHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/CurrencyHelper.java
index aeb8e79fd..12994666e 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/CurrencyHelper.java
+++ b/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";
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/EntityDatatableChecksHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/EntityDatatableChecksHelper.java
index 35373112f..bce369f68 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/EntityDatatableChecksHelper.java
+++ b/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;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/EntityDatatableChecksIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/EntityDatatableChecksIntegrationTest.java
index dfc2d1a16..630c1eec1 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/EntityDatatableChecksIntegrationTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/StaffHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/StaffHelper.java
index b3988b84a..969384eaa 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/StaffHelper.java
+++ b/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";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/provisioning/ProvisioningHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/provisioning/ProvisioningHelper.java
index 356d574c5..77a667083 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/provisioning/ProvisioningHelper.java
+++ b/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");
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/rates/RatesHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/rates/RatesHelper.java
index 7c1043f8e..a0ac462a0 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/rates/RatesHelper.java
+++ b/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, "");
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositAccountHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositAccountHelper.java
index bf402209b..ed2bd25b9 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositAccountHelper.java
+++ b/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;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositAccountStatusChecker.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositAccountStatusChecker.java
index ef8bed391..694647d26 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositAccountStatusChecker.java
+++ b/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) {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositProductHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositProductHelper.java
index 49ae0815e..6da8255a7 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositProductHelper.java
+++ b/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;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/AccountTransferHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/AccountTransferHelper.java
index a9f21dd93..9368fb510 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/AccountTransferHelper.java
+++ b/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";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsAccountHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsAccountHelper.java
index 959f912ad..99567f673 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsAccountHelper.java
+++ b/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";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsApplicationTestBuilder.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsApplicationTestBuilder.java
index 8109fa37f..0382f40e6 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsApplicationTestBuilder.java
+++ b/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 = "";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsProductHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsProductHelper.java
index d35e4d950..e6b3b808a 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsProductHelper.java
+++ b/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;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsStatusChecker.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsStatusChecker.java
index cd0169efc..80a0e2845 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsStatusChecker.java
+++ b/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) {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountHelper.java
index 23f1c2498..c57bb0c5c 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountHelper.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountIntegrationTests.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountIntegrationTests.java
index bfa5fd220..187a87119 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountIntegrationTests.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareProductHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareProductHelper.java
index c1b9f7c1c..6c75392b8 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareProductHelper.java
+++ b/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";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/AccountNumberPreferencesHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/AccountNumberPreferencesHelper.java
index 8a9d6c569..10d57c575 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/AccountNumberPreferencesHelper.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/DatatableHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/DatatableHelper.java
index 8bc93ee5a..f537f5590 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/DatatableHelper.java
+++ b/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;
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/interoperation/InteropHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/interoperation/InteropHelper.java
index 09bfbec6c..95669e161 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/interoperation/InteropHelper.java
+++ b/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";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/interoperation/InteropTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/interoperation/InteropTest.java
index 234968a28..e928425fe 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/interoperation/InteropTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/loanaccount/guarantor/GuarantorTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/loanaccount/guarantor/GuarantorTest.java
index a36d0adcf..aad4a8fab 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/loanaccount/guarantor/GuarantorTest.java
+++ b/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;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/loanaccount/guarantor/GuarantorTestBuilder.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/loanaccount/guarantor/GuarantorTestBuilder.java
index 304720048..0de66880b 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/loanaccount/guarantor/GuarantorTestBuilder.java
+++ b/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";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsDecliningBalanceHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsDecliningBalanceHelper.java
index d03001ba1..362e795dc 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsDecliningBalanceHelper.java
+++ b/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) {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsFlatHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsFlatHelper.java
index 37364c6da..49655c7c3 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsFlatHelper.java
+++ b/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) {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsIntegrationTest.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsIntegrationTest.java
index 15943115d..8c7b5bdef 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/variableinstallments/VariableInstallmentsIntegrationTest.java
+++ b/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;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureWritePlatformServiceJpaRepositoryImpl.java
index aa326deff..411836a54 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/closure/service/GLClosureWritePlatformServiceJpaRepositoryImpl.java
+++ b/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;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/DuplicateFinancialActivityAccountFoundException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/DuplicateFinancialActivityAccountFoundException.java
index 51e547529..070532b1b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/DuplicateFinancialActivityAccountFoundException.java
+++ b/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);
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/FinancialActivityAccountInvalidException.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/FinancialActivityAccountInvalidException.java
index f5a34f08d..1e62cb3b6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/FinancialActivityAccountInvalidException.java
+++ b/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,
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountWritePlatformServiceImpl.java
index f1fff00d8..7d14a953d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/service/FinancialActivityAccountWritePlatformServiceImpl.java
+++ b/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(
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountReadPlatformServiceImpl.java
index 3512b23a6..893f4d05e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountReadPlatformServiceImpl.java
+++ b/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) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountWritePlatformServiceJpaRepositoryImpl.java
index d0e9726f2..88083f0fe 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/service/GLAccountWritePlatformServiceJpaRepositoryImpl.java
+++ b/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;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java
index be6e2d075..256531927 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryRunningBalanceUpdateServiceImpl.java
+++ b/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;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java
index 3fb8c2701..c121fd642 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/journalentry/service/JournalEntryWritePlatformServiceJpaRepositoryImpl.java
@@ -88,7 +88,7 @@ import org.springframework.util.CollectionUtils;
 @Service
 public class JournalEntryWritePlatformServiceJpaRepositoryImpl implements JournalEntryWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(JournalEntryWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JournalEntryWritePlatformServiceJpaRepositoryImpl.class);
 
     private final GLClosureRepository glClosureRepository;
     private final GLAccountRepository glAccountRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/constant/ProvisioningEntriesApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/constant/ProvisioningEntriesApiConstants.java
index a9126d3a1..e85310ca0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/constant/ProvisioningEntriesApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/constant/ProvisioningEntriesApiConstants.java
@@ -20,16 +20,16 @@ package org.apache.fineract.accounting.provisioning.constant;
 
 public interface ProvisioningEntriesApiConstants {
 
-    public final static String JSON_DATE_PARAM = "date";
+    public static final String JSON_DATE_PARAM = "date";
 
-    public final static String JSON_DATEFORMAT_PARAM = "dateFormat";
+    public static final String JSON_DATEFORMAT_PARAM = "dateFormat";
 
-    public final static String JSON_LOCALE_PARAM = "locale";
+    public static final String JSON_LOCALE_PARAM = "locale";
 
-    public final static String JSON_CREATEJOURNALENTRIES_PARAM = "createjournalentries";
+    public static final String JSON_CREATEJOURNALENTRIES_PARAM = "createjournalentries";
 
-    public final static String PROVISIONINGENTRY_PARAM = "provisioningentry";
+    public static final String PROVISIONINGENTRY_PARAM = "provisioningentry";
 
-    public final static String ENTRIES_PARAM = "entries";
+    public static final String ENTRIES_PARAM = "entries";
 
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesReadPlatformServiceImpl.java
index 39522b841..915971d1c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesReadPlatformServiceImpl.java
@@ -43,7 +43,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProvisioningEntriesReadPlatformServiceImpl implements ProvisioningEntriesReadPlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ProvisioningEntriesReadPlatformServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ProvisioningEntriesReadPlatformServiceImpl.class);
     private final JdbcTemplate jdbcTemplate;
 
     private final PaginationHelper<LoanProductProvisioningEntryData> loanProductProvisioningEntryDataPaginationHelper = new PaginationHelper<>();
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesWritePlatformServiceJpaRepositoryImpl.java
index 851b3cfe5..d708b030a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/provisioning/service/ProvisioningEntriesWritePlatformServiceJpaRepositoryImpl.java
@@ -68,7 +68,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProvisioningEntriesWritePlatformServiceJpaRepositoryImpl implements ProvisioningEntriesWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ProvisioningEntriesWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ProvisioningEntriesWritePlatformServiceJpaRepositoryImpl.class);
     private final ProvisioningEntriesReadPlatformService provisioningEntriesReadPlatformService;
     private final ProvisioningCriteriaReadPlatformService provisioningCriteriaReadPlatformService;
     private final LoanProductRepository loanProductRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleWritePlatformServiceJpaRepositoryImpl.java
index 69ea6b731..bb73a74dc 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/service/AccountingRuleWritePlatformServiceJpaRepositoryImpl.java
@@ -57,7 +57,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class AccountingRuleWritePlatformServiceJpaRepositoryImpl implements AccountingRuleWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(AccountingRuleWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AccountingRuleWritePlatformServiceJpaRepositoryImpl.class);
 
     private final AccountingRuleRepositoryWrapper accountingRuleRepositoryWrapper;
     private final AccountingRuleRepository accountingRuleRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocScheduledJobRunnerServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocScheduledJobRunnerServiceImpl.java
index 2c9e0094d..4f2152f1d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocScheduledJobRunnerServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocScheduledJobRunnerServiceImpl.java
@@ -41,7 +41,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service(value = "adHocScheduledJobRunnerService")
 public class AdHocScheduledJobRunnerServiceImpl implements AdHocScheduledJobRunnerService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(AdHocScheduledJobRunnerServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AdHocScheduledJobRunnerServiceImpl.class);
     private final AdHocReadPlatformService adHocReadPlatformService;
     private final JdbcTemplate jdbcTemplate;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocWritePlatformServiceJpaRepositoryImpl.java
index b622c397d..beeefa9ee 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/adhocquery/service/AdHocWritePlatformServiceJpaRepositoryImpl.java
@@ -37,7 +37,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class AdHocWritePlatformServiceJpaRepositoryImpl implements AdHocWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(AdHocWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AdHocWritePlatformServiceJpaRepositoryImpl.class);
     private final PlatformSecurityContext context;
     private final AdHocRepository adHocRepository;
     private final AdHocDataValidator adHocCommandFromApiJsonDeserializer;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/service/AuditReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/commands/service/AuditReadPlatformServiceImpl.java
index 235b9e386..54a6b2310 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/commands/service/AuditReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/commands/service/AuditReadPlatformServiceImpl.java
@@ -74,8 +74,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class AuditReadPlatformServiceImpl implements AuditReadPlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(AuditReadPlatformServiceImpl.class);
-    private final static Set<String> supportedOrderByValues = new HashSet<>(
+    private static final Logger LOG = LoggerFactory.getLogger(AuditReadPlatformServiceImpl.class);
+    private static final Set<String> supportedOrderByValues = new HashSet<>(
             Arrays.asList("id", "actionName", "entityName", "resourceId", "subresourceId", "madeOnDate", "checkedOnDate", "officeName",
                     "groupName", "clientName", "loanAccountNo", "savingsAccountNo", "clientId", "loanId"));
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/commands/service/PortfolioCommandSourceWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/commands/service/PortfolioCommandSourceWritePlatformServiceImpl.java
index 08e68c70c..b9804f494 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/commands/service/PortfolioCommandSourceWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/commands/service/PortfolioCommandSourceWritePlatformServiceImpl.java
@@ -50,7 +50,7 @@ public class PortfolioCommandSourceWritePlatformServiceImpl implements Portfolio
     private final FromJsonHelper fromApiJsonHelper;
     private final CommandProcessingService processAndLogCommandService;
     private final SchedulerJobRunnerReadService schedulerJobRunnerReadService;
-    private final static Logger LOG = LoggerFactory.getLogger(PortfolioCommandSourceWritePlatformServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PortfolioCommandSourceWritePlatformServiceImpl.class);
 
     @Autowired
     public PortfolioCommandSourceWritePlatformServiceImpl(final PlatformSecurityContext context,
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormatEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormatEnumerations.java
index d66bf1898..a994b0917 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormatEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormatEnumerations.java
@@ -30,19 +30,19 @@ import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
 public class AccountNumberFormatEnumerations {
 
-    public final static Set<AccountNumberPrefixType> accountNumberPrefixesForClientAccounts = Collections
+    public static final Set<AccountNumberPrefixType> accountNumberPrefixesForClientAccounts = Collections
             .unmodifiableSet(new HashSet<>(Arrays.asList(AccountNumberPrefixType.OFFICE_NAME, AccountNumberPrefixType.CLIENT_TYPE)));
 
-    public final static Set<AccountNumberPrefixType> accountNumberPrefixesForLoanAccounts = Collections.unmodifiableSet(
+    public static final Set<AccountNumberPrefixType> accountNumberPrefixesForLoanAccounts = Collections.unmodifiableSet(
             new HashSet<>(Arrays.asList(AccountNumberPrefixType.OFFICE_NAME, AccountNumberPrefixType.LOAN_PRODUCT_SHORT_NAME)));
 
-    public final static Set<AccountNumberPrefixType> accountNumberPrefixesForSavingsAccounts = Collections.unmodifiableSet(
+    public static final Set<AccountNumberPrefixType> accountNumberPrefixesForSavingsAccounts = Collections.unmodifiableSet(
             new HashSet<>(Arrays.asList(AccountNumberPrefixType.OFFICE_NAME, AccountNumberPrefixType.SAVINGS_PRODUCT_SHORT_NAME)));
 
-    public final static Set<AccountNumberPrefixType> accountNumberPrefixesForCenters = Collections
+    public static final Set<AccountNumberPrefixType> accountNumberPrefixesForCenters = Collections
             .unmodifiableSet(new HashSet<>(Collections.singletonList(AccountNumberPrefixType.OFFICE_NAME)));
 
-    public final static Set<AccountNumberPrefixType> accountNumberPrefixesForGroups = Collections
+    public static final Set<AccountNumberPrefixType> accountNumberPrefixesForGroups = Collections
             .unmodifiableSet(new HashSet<>(Collections.singletonList(AccountNumberPrefixType.OFFICE_NAME)));
 
     public enum AccountNumberPrefixType {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatWritePlatformServiceJpaRepositoryImpl.java
index 2cb3059ad..84fcfe65d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatWritePlatformServiceJpaRepositoryImpl.java
@@ -41,7 +41,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class AccountNumberFormatWritePlatformServiceJpaRepositoryImpl implements AccountNumberFormatWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(AccountNumberFormatWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AccountNumberFormatWritePlatformServiceJpaRepositoryImpl.class);
     private final AccountNumberFormatRepositoryWrapper accountNumberFormatRepository;
     private final AccountNumberFormatDataValidator accountNumberFormatDataValidator;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/TemplatePopulateImportConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/TemplatePopulateImportConstants.java
index 03f2b4f3d..a58a810cd 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/TemplatePopulateImportConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/TemplatePopulateImportConstants.java
@@ -21,10 +21,10 @@ package org.apache.fineract.infrastructure.bulkimport.constants;
 public class TemplatePopulateImportConstants {
 
     // columns sizes
-    public final static int SMALL_COL_SIZE = 4000;
-    public final static int MEDIUM_COL_SIZE = 6000;
-    public final static int LARGE_COL_SIZE = 8000;
-    public final static int EXTRALARGE_COL_SIZE = 10000;
+    public static final int SMALL_COL_SIZE = 4000;
+    public static final int MEDIUM_COL_SIZE = 6000;
+    public static final int LARGE_COL_SIZE = 8000;
+    public static final int EXTRALARGE_COL_SIZE = 10000;
 
     // Sheet names
     public static final String OFFICE_SHEET_NAME = "Offices";
@@ -53,19 +53,19 @@ public class TemplatePopulateImportConstants {
     public static final String ROLES_SHEET_NAME = "Roles";
     public static final String USER_SHEET_NAME = "Users";
 
-    public final static int ROWHEADER_INDEX = 0;
-    public final static short ROW_HEADER_HEIGHT = 500;
-    public final static int FIRST_COLUMN_INDEX = 0;
+    public static final int ROWHEADER_INDEX = 0;
+    public static final short ROW_HEADER_HEIGHT = 500;
+    public static final int FIRST_COLUMN_INDEX = 0;
 
     // Status column
-    public final static String STATUS_CELL_IMPORTED = "Imported";
-    public final static String STATUS_CREATION_FAILED = "Creation failed";
-    public final static String STATUS_APPROVAL_FAILED = "Approval failed";
-    public final static String STATUS_ACTIVATION_FAILED = "Activation failed";
-    public final static String STATUS_MEETING_FAILED = "Meeting failed";
-    public final static String STATUS_DISBURSAL_FAILED = "Disbursal failed";
-    public final static String STATUS_DISBURSAL_REPAYMENT_FAILED = "Repayment failed";
-    public final static String STATUS_COLUMN_HEADER = "Status";
+    public static final String STATUS_CELL_IMPORTED = "Imported";
+    public static final String STATUS_CREATION_FAILED = "Creation failed";
+    public static final String STATUS_APPROVAL_FAILED = "Approval failed";
+    public static final String STATUS_ACTIVATION_FAILED = "Activation failed";
+    public static final String STATUS_MEETING_FAILED = "Meeting failed";
+    public static final String STATUS_DISBURSAL_FAILED = "Disbursal failed";
+    public static final String STATUS_DISBURSAL_REPAYMENT_FAILED = "Repayment failed";
+    public static final String STATUS_COLUMN_HEADER = "Status";
 
     // Frequency Calender
     public static final String FREQUENCY_DAILY = "Daily";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/center/CenterImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/center/CenterImportHandler.java
index c44f10019..4cf645aee 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/center/CenterImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/center/CenterImportHandler.java
@@ -54,7 +54,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class CenterImportHandler implements ImportHandler {
 
-    private final static Logger LOG = LoggerFactory.getLogger(CenterImportHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CenterImportHandler.class);
     private List<CenterData> centers;
     private List<CalendarData> meetings;
     private List<String> statuses;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/chartofaccounts/ChartOfAccountsImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/chartofaccounts/ChartOfAccountsImportHandler.java
index e3b575838..e58f7cf28 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/chartofaccounts/ChartOfAccountsImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/chartofaccounts/ChartOfAccountsImportHandler.java
@@ -50,7 +50,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class ChartOfAccountsImportHandler implements ImportHandler {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ChartOfAccountsImportHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ChartOfAccountsImportHandler.class);
     private List<GLAccountData> glAccounts;
     private Workbook workbook;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientEntityImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientEntityImportHandler.java
index 6b4edba4a..724dc9091 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientEntityImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientEntityImportHandler.java
@@ -51,7 +51,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class ClientEntityImportHandler implements ImportHandler {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ClientEntityImportHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ClientEntityImportHandler.class);
     private Workbook workbook;
     private List<ClientData> clients;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientPersonImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientPersonImportHandler.java
index 33ca5fa79..c92a9702e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientPersonImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/client/ClientPersonImportHandler.java
@@ -49,7 +49,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class ClientPersonImportHandler implements ImportHandler {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ClientPersonImportHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ClientPersonImportHandler.class);
     private Workbook workbook;
     private List<ClientData> clients;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/fixeddeposits/FixedDepositImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/fixeddeposits/FixedDepositImportHandler.java
index a78b1232c..0b713535a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/fixeddeposits/FixedDepositImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/fixeddeposits/FixedDepositImportHandler.java
@@ -56,7 +56,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class FixedDepositImportHandler implements ImportHandler {
 
-    private final static Logger LOG = LoggerFactory.getLogger(FixedDepositImportHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FixedDepositImportHandler.class);
     private Workbook workbook;
 
     private List<FixedDepositAccountData> savings;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/fixeddeposits/FixedDepositTransactionImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/fixeddeposits/FixedDepositTransactionImportHandler.java
index b6c9f0581..f50b5f9e6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/fixeddeposits/FixedDepositTransactionImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/fixeddeposits/FixedDepositTransactionImportHandler.java
@@ -50,7 +50,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class FixedDepositTransactionImportHandler implements ImportHandler {
 
-    private final static Logger LOG = LoggerFactory.getLogger(FixedDepositTransactionImportHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FixedDepositTransactionImportHandler.class);
     private Workbook workbook;
     private List<SavingsAccountTransactionData> savingsTransactions;
     private String savingsAccountId = "";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/group/GroupImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/group/GroupImportHandler.java
index a97d35aff..2c1de0f0e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/group/GroupImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/group/GroupImportHandler.java
@@ -54,7 +54,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class GroupImportHandler implements ImportHandler {
 
-    private final static Logger LOG = LoggerFactory.getLogger(GroupImportHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(GroupImportHandler.class);
     private List<GroupGeneralData> groups;
     private List<CalendarData> meetings;
     private Workbook workbook;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/guarantor/GuarantorImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/guarantor/GuarantorImportHandler.java
index 8dc366ca8..c98afb42b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/guarantor/GuarantorImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/guarantor/GuarantorImportHandler.java
@@ -49,7 +49,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class GuarantorImportHandler implements ImportHandler {
 
-    private final static Logger LOG = LoggerFactory.getLogger(GuarantorImportHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(GuarantorImportHandler.class);
     private Workbook workbook;
     private List<GuarantorData> guarantors;
     private Long loanAccountId;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/journalentry/JournalEntriesImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/journalentry/JournalEntriesImportHandler.java
index f4610ee12..410bf228c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/journalentry/JournalEntriesImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/journalentry/JournalEntriesImportHandler.java
@@ -50,7 +50,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class JournalEntriesImportHandler implements ImportHandler {
 
-    private final static Logger LOG = LoggerFactory.getLogger(JournalEntriesImportHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JournalEntriesImportHandler.class);
     private Workbook workbook;
     private List<JournalEntryData> gltransaction;
     private LocalDate transactionDate;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/loan/LoanImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/loan/LoanImportHandler.java
index c48ca4bd4..98a87eea2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/loan/LoanImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/loan/LoanImportHandler.java
@@ -57,7 +57,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class LoanImportHandler implements ImportHandler {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LoanImportHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoanImportHandler.class);
     private Workbook workbook;
     private List<LoanAccountData> loans;
     private List<LoanApprovalData> approvalDates;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/loanrepayment/LoanRepaymentImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/loanrepayment/LoanRepaymentImportHandler.java
index ac93049fe..9f0b6b9fd 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/loanrepayment/LoanRepaymentImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/loanrepayment/LoanRepaymentImportHandler.java
@@ -49,7 +49,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class LoanRepaymentImportHandler implements ImportHandler {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LoanRepaymentImportHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoanRepaymentImportHandler.class);
     private Workbook workbook;
     private List<LoanTransactionData> loanRepayments;
     private Long loanAccountId;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/office/OfficeImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/office/OfficeImportHandler.java
index 04663e6f0..5a3f99b9c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/office/OfficeImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/office/OfficeImportHandler.java
@@ -46,7 +46,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class OfficeImportHandler implements ImportHandler {
 
-    private final static Logger LOG = LoggerFactory.getLogger(OfficeImportHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(OfficeImportHandler.class);
     private List<OfficeData> offices;
     private Workbook workbook;
     private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/recurringdeposit/RecurringDepositImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/recurringdeposit/RecurringDepositImportHandler.java
index 0be97aa45..2407ec2ef 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/recurringdeposit/RecurringDepositImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/recurringdeposit/RecurringDepositImportHandler.java
@@ -53,7 +53,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class RecurringDepositImportHandler implements ImportHandler {
 
-    private final static Logger LOG = LoggerFactory.getLogger(RecurringDepositImportHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RecurringDepositImportHandler.class);
     private Workbook workbook;
     private List<RecurringDepositAccountData> savings;
     private List<SavingsApproval> approvalDates;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/recurringdeposit/RecurringDepositTransactionImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/recurringdeposit/RecurringDepositTransactionImportHandler.java
index 7ec9ad8b5..20c681386 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/recurringdeposit/RecurringDepositTransactionImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/recurringdeposit/RecurringDepositTransactionImportHandler.java
@@ -51,7 +51,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class RecurringDepositTransactionImportHandler implements ImportHandler {
 
-    private final static Logger LOG = LoggerFactory.getLogger(RecurringDepositTransactionImportHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RecurringDepositTransactionImportHandler.class);
     private Workbook workbook;
     private List<SavingsAccountTransactionData> savingsTransactions;
     private String savingsAccountId = "";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/savings/SavingsImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/savings/SavingsImportHandler.java
index 4b8fa5af8..030f8bf1e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/savings/SavingsImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/savings/SavingsImportHandler.java
@@ -54,7 +54,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class SavingsImportHandler implements ImportHandler {
 
-    private final static Logger LOG = LoggerFactory.getLogger(SavingsImportHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SavingsImportHandler.class);
     private Workbook workbook;
     private List<SavingsAccountData> savings;
     private List<SavingsApproval> approvalDates;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/savings/SavingsTransactionImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/savings/SavingsTransactionImportHandler.java
index 71f6604ef..dcc95fa46 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/savings/SavingsTransactionImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/savings/SavingsTransactionImportHandler.java
@@ -50,7 +50,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class SavingsTransactionImportHandler implements ImportHandler {
 
-    private final static Logger LOG = LoggerFactory.getLogger(SavingsTransactionImportHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SavingsTransactionImportHandler.class);
     private Workbook workbook;
     private List<SavingsAccountTransactionData> savingsTransactions;
     private String savingsAccountId = "";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/sharedaccount/SharedAccountImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/sharedaccount/SharedAccountImportHandler.java
index 77a0df75f..6711d071a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/sharedaccount/SharedAccountImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/sharedaccount/SharedAccountImportHandler.java
@@ -48,7 +48,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class SharedAccountImportHandler implements ImportHandler {
 
-    private final static Logger LOG = LoggerFactory.getLogger(SharedAccountImportHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SharedAccountImportHandler.class);
     private Workbook workbook;
     private List<ShareAccountData> shareAccountDataList;
     private List<String> statuses;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/staff/StaffImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/staff/StaffImportHandler.java
index 51694c9e0..641747b6b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/staff/StaffImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/staff/StaffImportHandler.java
@@ -46,7 +46,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class StaffImportHandler implements ImportHandler {
 
-    private final static Logger LOG = LoggerFactory.getLogger(StaffImportHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(StaffImportHandler.class);
     private List<StaffData> staffList;
     private Workbook workbook;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/users/UserImportHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/users/UserImportHandler.java
index 77b29014e..f8e29e173 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/users/UserImportHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/users/UserImportHandler.java
@@ -45,7 +45,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class UserImportHandler implements ImportHandler {
 
-    private final static Logger LOG = LoggerFactory.getLogger(UserImportHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(UserImportHandler.class);
     private Workbook workbook;
     private List<AppUserData> users;
     private List<String> statuses;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/AbstractWorkbookPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/AbstractWorkbookPopulator.java
index 73bab46dc..59c58d323 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/AbstractWorkbookPopulator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/AbstractWorkbookPopulator.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
 
 public abstract class AbstractWorkbookPopulator implements WorkbookPopulator {
 
-    private final static Logger LOG = LoggerFactory.getLogger(AbstractWorkbookPopulator.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AbstractWorkbookPopulator.class);
 
     protected void writeInt(int colIndex, Row row, int value) {
         row.createCell(colIndex).setCellValue(value);
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/chartofaccounts/ChartOfAccountsWorkbook.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/chartofaccounts/ChartOfAccountsWorkbook.java
index c917708ff..c552392c6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/chartofaccounts/ChartOfAccountsWorkbook.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/chartofaccounts/ChartOfAccountsWorkbook.java
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
 
 public class ChartOfAccountsWorkbook extends AbstractWorkbookPopulator {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ChartOfAccountsWorkbook.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ChartOfAccountsWorkbook.class);
     private List<GLAccountData> glAccounts;
     private Map<String, List<String>> accountTypeToAccountNameAndTag;
     private Map<Integer, Integer[]> accountTypeToBeginEndIndexesofAccountNames;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/fixeddeposits/FixedDepositWorkbookPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/fixeddeposits/FixedDepositWorkbookPopulator.java
index a106cdfc9..0fde396a2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/fixeddeposits/FixedDepositWorkbookPopulator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/fixeddeposits/FixedDepositWorkbookPopulator.java
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
 
 public class FixedDepositWorkbookPopulator extends AbstractWorkbookPopulator {
 
-    private final static Logger LOG = LoggerFactory.getLogger(FixedDepositWorkbookPopulator.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FixedDepositWorkbookPopulator.class);
     private OfficeSheetPopulator officeSheetPopulator;
     private ClientSheetPopulator clientSheetPopulator;
     private PersonnelSheetPopulator personnelSheetPopulator;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/loanrepayment/LoanRepaymentWorkbookPopulator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/loanrepayment/LoanRepaymentWorkbookPopulator.java
index fd2aaeaba..b5291a85c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/loanrepayment/LoanRepaymentWorkbookPopulator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/populator/loanrepayment/LoanRepaymentWorkbookPopulator.java
@@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory;
 
 public class LoanRepaymentWorkbookPopulator extends AbstractWorkbookPopulator {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LoanRepaymentWorkbookPopulator.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoanRepaymentWorkbookPopulator.class);
     private OfficeSheetPopulator officeSheetPopulator;
     private ClientSheetPopulator clientSheetPopulator;
     private ExtrasSheetPopulator extrasSheetPopulator;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportEventListener.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportEventListener.java
index f83cd3088..326b763f7 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportEventListener.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportEventListener.java
@@ -49,7 +49,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class BulkImportEventListener implements ApplicationListener<BulkImportEvent> {
 
-    private final static Logger LOG = LoggerFactory.getLogger(BulkImportEventListener.class);
+    private static final Logger LOG = LoggerFactory.getLogger(BulkImportEventListener.class);
     private final TenantDetailsService tenantDetailsService;
     private final ApplicationContext applicationContext;
     private final ImportDocumentRepository importRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookPopulatorServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookPopulatorServiceImpl.java
index 0df93ef72..6da380d70 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookPopulatorServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookPopulatorServiceImpl.java
@@ -115,7 +115,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class BulkImportWorkbookPopulatorServiceImpl implements BulkImportWorkbookPopulatorService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(BulkImportWorkbookPopulatorServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(BulkImportWorkbookPopulatorServiceImpl.class);
     private final PlatformSecurityContext context;
     private final OfficeReadPlatformService officeReadPlatformService;
     private final StaffReadPlatformService staffReadPlatformService;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookServiceImpl.java
index 2cb9cd46f..d215567be 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/service/BulkImportWorkbookServiceImpl.java
@@ -63,7 +63,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class BulkImportWorkbookServiceImpl implements BulkImportWorkbookService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(BulkImportWorkbookServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(BulkImportWorkbookServiceImpl.class);
     private final ApplicationContext applicationContext;
     private final PlatformSecurityContext securityContext;
     private final DocumentWritePlatformService documentWritePlatformService;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignWritePlatformCommandHandlerImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignWritePlatformCommandHandlerImpl.java
index 6f69c4f3c..0f8c3db30 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignWritePlatformCommandHandlerImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignWritePlatformCommandHandlerImpl.java
@@ -99,7 +99,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class EmailCampaignWritePlatformCommandHandlerImpl implements EmailCampaignWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(EmailCampaignWritePlatformCommandHandlerImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(EmailCampaignWritePlatformCommandHandlerImpl.class);
 
     private final PlatformSecurityContext context;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailMessageJobEmailServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailMessageJobEmailServiceImpl.java
index 3b28b4510..519464405 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailMessageJobEmailServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailMessageJobEmailServiceImpl.java
@@ -37,7 +37,7 @@ import org.springframework.stereotype.Service;
 @Service
 public final class EmailMessageJobEmailServiceImpl implements EmailMessageJobEmailService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(EmailMessageJobEmailServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(EmailMessageJobEmailServiceImpl.class);
     private EmailConfigurationRepository emailConfigurationRepository;
 
     @Autowired
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailWritePlatformServiceJpaRepositoryImpl.java
index 98ae878c8..44700da2d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailWritePlatformServiceJpaRepositoryImpl.java
@@ -37,7 +37,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class EmailWritePlatformServiceJpaRepositoryImpl implements EmailWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(EmailWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(EmailWritePlatformServiceJpaRepositoryImpl.class);
 
     private final EmailMessageAssembler assembler;
     private final EmailMessageRepository repository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignDomainServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignDomainServiceImpl.java
index ba87cf963..7199ba8f7 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignDomainServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignDomainServiceImpl.java
@@ -66,7 +66,7 @@ public class SmsCampaignDomainServiceImpl implements SmsCampaignDomainService {
 
     private static final Logger LOG = LoggerFactory.getLogger(SmsCampaignDomainServiceImpl.class);
 
-    // private final static int POOL_SIZE = 5 ;
+    // private static final int POOL_SIZE = 5 ;
 
     private final SmsCampaignRepository smsCampaignRepository;
     private final SmsMessageRepository smsMessageRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignDropdownReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignDropdownReadPlatformServiceImpl.java
index ba9413819..4f564e0ed 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignDropdownReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignDropdownReadPlatformServiceImpl.java
@@ -48,7 +48,7 @@ import org.springframework.web.client.RestTemplate;
 @Service
 public class SmsCampaignDropdownReadPlatformServiceImpl implements SmsCampaignDropdownReadPlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(SmsCampaignDropdownReadPlatformServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SmsCampaignDropdownReadPlatformServiceImpl.class);
     private final RestTemplate restTemplate;
 
     private final SmsConfigUtils smsConfigUtils;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignWritePlatformServiceJpaImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignWritePlatformServiceJpaImpl.java
index 4326fbe54..9378cca87 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignWritePlatformServiceJpaImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignWritePlatformServiceJpaImpl.java
@@ -94,7 +94,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class SmsCampaignWritePlatformServiceJpaImpl implements SmsCampaignWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(SmsCampaignWritePlatformServiceJpaImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SmsCampaignWritePlatformServiceJpaImpl.class);
 
     private final PlatformSecurityContext context;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeValueWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeValueWritePlatformServiceJpaRepositoryImpl.java
index 2deffd211..3538a8127 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeValueWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeValueWritePlatformServiceJpaRepositoryImpl.java
@@ -42,7 +42,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class CodeValueWritePlatformServiceJpaRepositoryImpl implements CodeValueWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(CodeValueWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CodeValueWritePlatformServiceJpaRepositoryImpl.class);
 
     private final PlatformSecurityContext context;
     private final CodeValueRepositoryWrapper codeValueRepositoryWrapper;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeWritePlatformServiceJpaRepositoryImpl.java
index 2f7c8952a..ead12a043 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/service/CodeWritePlatformServiceJpaRepositoryImpl.java
@@ -42,7 +42,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class CodeWritePlatformServiceJpaRepositoryImpl implements CodeWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(CodeWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CodeWritePlatformServiceJpaRepositoryImpl.class);
 
     private final PlatformSecurityContext context;
     private final CodeRepository codeRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ExternalServiceWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ExternalServiceWritePlatformServiceJpaRepositoryImpl.java
index 3432d6b9b..6a713c7ce 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ExternalServiceWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ExternalServiceWritePlatformServiceJpaRepositoryImpl.java
@@ -41,7 +41,7 @@ import org.springframework.transaction.annotation.Transactional;
 public class ExternalServiceWritePlatformServiceJpaRepositoryImpl implements ExternalServiceWritePlatformService {
 
     @SuppressWarnings("unused")
-    private final static Logger LOG = LoggerFactory.getLogger(ExternalServiceWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ExternalServiceWritePlatformServiceJpaRepositoryImpl.class);
 
     private final PlatformSecurityContext context;
     private final ExternalServicesPropertiesRepositoryWrapper repositoryWrapper;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/GlobalConfigurationWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/GlobalConfigurationWritePlatformServiceJpaRepositoryImpl.java
index c6e1fe96c..328e6fead 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/GlobalConfigurationWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/GlobalConfigurationWritePlatformServiceJpaRepositoryImpl.java
@@ -38,7 +38,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class GlobalConfigurationWritePlatformServiceJpaRepositoryImpl implements GlobalConfigurationWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(GlobalConfigurationWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(GlobalConfigurationWritePlatformServiceJpaRepositoryImpl.class);
 
     private final PlatformSecurityContext context;
     private final GlobalConfigurationRepositoryWrapper repository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/DateAdapter.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/DateAdapter.java
index 17178344a..9a9163ba6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/DateAdapter.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/DateAdapter.java
@@ -34,7 +34,7 @@ import java.util.Date;
  */
 public class DateAdapter implements JsonSerializer<Date> {
 
-    private final static DateTimeFormatter formatter = DateTimeFormatter.ISO_INSTANT;
+    private static final DateTimeFormatter formatter = DateTimeFormatter.ISO_INSTANT;
 
     @Override
     @SuppressWarnings("unused")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/ApplicationExitUtil.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/ApplicationExitUtil.java
index a23c129e7..7e8f2b3be 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/ApplicationExitUtil.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/ApplicationExitUtil.java
@@ -28,7 +28,7 @@ import org.springframework.context.ConfigurableApplicationContext;
 
 public abstract class ApplicationExitUtil {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ApplicationExitUtil.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ApplicationExitUtil.class);
 
     private ApplicationExitUtil() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/JDBCDriverConfig.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/JDBCDriverConfig.java
index 95ea516fe..37b11ae49 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/JDBCDriverConfig.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/boot/JDBCDriverConfig.java
@@ -27,9 +27,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class JDBCDriverConfig {
 
-    private final static String DRIVER_CLASS_PROPERTYNAME = "DRIVERCLASS_NAME";
-    private final static String PROTOCOL_PROPERTYNAME = "PROTOCOL";
-    private final static String SUBPROTOCOL_PROPERTYNAME = "SUB_PROTOCOL";
+    private static final String DRIVER_CLASS_PROPERTYNAME = "DRIVERCLASS_NAME";
+    private static final String PROTOCOL_PROPERTYNAME = "PROTOCOL";
+    private static final String SUBPROTOCOL_PROPERTYNAME = "SUB_PROTOCOL";
 
     private String driverClassName;
     private String protocol;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/MultiException.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/MultiException.java
index 869e0f9a3..1e51d74d0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/MultiException.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/MultiException.java
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
  */
 public class MultiException extends Exception {
 
-    private final static Logger LOG = LoggerFactory.getLogger(MultiException.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MultiException.class);
     private final List<Throwable> throwables;
 
     public MultiException(List<Throwable> problems) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/DatatableCommandFromApiJsonDeserializer.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/DatatableCommandFromApiJsonDeserializer.java
index 0a9bad838..f74a5370a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/DatatableCommandFromApiJsonDeserializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/DatatableCommandFromApiJsonDeserializer.java
@@ -40,8 +40,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class DatatableCommandFromApiJsonDeserializer {
 
-    private final static String DATATABLE_NAME_REGEX_PATTERN = "^[a-zA-Z][a-zA-Z0-9\\-_\\s]{0,48}[a-zA-Z0-9]$";
-    private final static String DATATABLE_COLUMN_NAME_REGEX_PATTERN = "^[a-zA-Z][a-zA-Z0-9\\-_\\s]{0,}[a-zA-Z0-9]$";
+    private static final String DATATABLE_NAME_REGEX_PATTERN = "^[a-zA-Z][a-zA-Z0-9\\-_\\s]{0,48}[a-zA-Z0-9]$";
+    private static final String DATATABLE_COLUMN_NAME_REGEX_PATTERN = "^[a-zA-Z][a-zA-Z0-9\\-_\\s]{0,}[a-zA-Z0-9]$";
     /**
      * The parameters supported for this command.
      */
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/AbandonedConnectionCleanupShutdownListener.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/AbandonedConnectionCleanupShutdownListener.java
index b39558434..cad8f5c7b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/AbandonedConnectionCleanupShutdownListener.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/AbandonedConnectionCleanupShutdownListener.java
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class AbandonedConnectionCleanupShutdownListener implements ApplicationListener<ContextClosedEvent> {
 
-    private final static Logger LOG = LoggerFactory.getLogger(AbandonedConnectionCleanupShutdownListener.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AbandonedConnectionCleanupShutdownListener.class);
 
     /**
      * @see JobRegisterServiceImpl#onApplicationEvent(ContextClosedEvent) doc
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/SearchParameters.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/SearchParameters.java
index dcbe2031c..0d4250559 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/SearchParameters.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/SearchParameters.java
@@ -174,7 +174,7 @@ public final class SearchParameters {
                 loanId, savingsId, orphansOnly, isSelfUser);
     }
 
-    public final static SearchParameters forProvisioningEntries(final Long provisioningEntryId, final Long officeId, final Long productId,
+    public static final SearchParameters forProvisioningEntries(final Long provisioningEntryId, final Long officeId, final Long productId,
             final Long categoryId, final Integer offset, final Integer limit) {
         return new SearchParameters(provisioningEntryId, officeId, productId, categoryId, offset, limit);
     }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java
index 283efa1c0..b4ac1e5ae 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java
@@ -44,7 +44,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class TenantDatabaseUpgradeService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(TenantDatabaseUpgradeService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TenantDatabaseUpgradeService.class);
 
     private final TenantDetailsService tenantDetailsService;
     protected final DataSource tenantDataSource;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DatatablesApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DatatablesApiResource.java
index 19d323fbb..c4829a099 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DatatablesApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DatatablesApiResource.java
@@ -74,7 +74,7 @@ public class DatatablesApiResource {
     private final ReadWriteNonCoreDataService readWriteNonCoreDataService;
     private final ToApiJsonSerializer<GenericResultsetData> toApiJsonSerializer;
     private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService;
-    private final static org.slf4j.Logger LOG = LoggerFactory.getLogger(DatatablesApiResource.class);
+    private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(DatatablesApiResource.class);
 
     @Autowired
     public DatatablesApiResource(final PlatformSecurityContext context, final GenericDataService genericDataService,
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/EntityDatatableChecksApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/EntityDatatableChecksApiResource.java
index f2d1f3cdc..6ef832978 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/EntityDatatableChecksApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/EntityDatatableChecksApiResource.java
@@ -69,7 +69,7 @@ public class EntityDatatableChecksApiResource {
     private final EntityDatatableChecksReadService readEntityDatatableChecksService;
     private final ToApiJsonSerializer<GenericResultsetData> toApiJsonSerializer;
     private final PortfolioCommandSourceWritePlatformService commandsSourceWritePlatformService;
-    private final static org.slf4j.Logger LOG = LoggerFactory.getLogger(EntityDatatableChecksApiResource.class);
+    private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(EntityDatatableChecksApiResource.class);
 
     @Autowired
     public EntityDatatableChecksApiResource(final PlatformSecurityContext context, final GenericDataService genericDataService,
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/EntityDatatableChecksWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/EntityDatatableChecksWritePlatformServiceImpl.java
index fef4d496a..580ede22f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/EntityDatatableChecksWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/EntityDatatableChecksWritePlatformServiceImpl.java
@@ -56,7 +56,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class EntityDatatableChecksWritePlatformServiceImpl implements EntityDatatableChecksWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(EntityDatatableChecksWritePlatformServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(EntityDatatableChecksWritePlatformServiceImpl.class);
 
     private final PlatformSecurityContext context;
     private final EntityDatatableChecksDataValidator fromApiJsonDeserializer;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/GenericDataServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/GenericDataServiceImpl.java
index c33d39495..288ffacf7 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/GenericDataServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/GenericDataServiceImpl.java
@@ -44,7 +44,7 @@ public class GenericDataServiceImpl implements GenericDataService {
 
     private final JdbcTemplate jdbcTemplate;
     private final DataSource dataSource;
-    private final static Logger LOG = LoggerFactory.getLogger(GenericDataServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(GenericDataServiceImpl.class);
 
     @Autowired
     public GenericDataServiceImpl(final RoutingDataSource dataSource) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java
index 7b6d3f596..c39d2810b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java
@@ -67,8 +67,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class ReadReportingServiceImpl implements ReadReportingService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ReadReportingServiceImpl.class);
-    private final static String REPORT_NAME_REGEX_PATTERN = "^[a-zA-Z][a-zA-Z0-9\\-_\\s]{0,48}[a-zA-Z0-9]$";
+    private static final Logger LOG = LoggerFactory.getLogger(ReadReportingServiceImpl.class);
+    private static final String REPORT_NAME_REGEX_PATTERN = "^[a-zA-Z][a-zA-Z0-9\\-_\\s]{0,48}[a-zA-Z0-9]$";
 
     private final JdbcTemplate jdbcTemplate;
     private final DataSource dataSource;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
index 367d74f32..4d52941c6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
@@ -86,16 +86,16 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataService {
 
-    private final static String DATATABLE_NAME_REGEX_PATTERN = "^[a-zA-Z][a-zA-Z0-9\\-_\\s]{0,48}[a-zA-Z0-9]$";
+    private static final String DATATABLE_NAME_REGEX_PATTERN = "^[a-zA-Z][a-zA-Z0-9\\-_\\s]{0,48}[a-zA-Z0-9]$";
 
-    private final static String CODE_VALUES_TABLE = "m_code_value";
+    private static final String CODE_VALUES_TABLE = "m_code_value";
 
-    private final static Logger LOG = LoggerFactory.getLogger(ReadWriteNonCoreDataServiceImpl.class);
-    private final static ImmutableMap<String, String> apiTypeToMySQL = ImmutableMap.<String, String>builder().put("string", "VARCHAR")
+    private static final Logger LOG = LoggerFactory.getLogger(ReadWriteNonCoreDataServiceImpl.class);
+    private static final ImmutableMap<String, String> apiTypeToMySQL = ImmutableMap.<String, String>builder().put("string", "VARCHAR")
             .put("number", "INT").put("boolean", "BIT").put("decimal", "DECIMAL").put("date", "DATE").put("datetime", "DATETIME")
             .put("text", "TEXT").put("dropdown", "INT").build();
 
-    private final static List<String> stringDataTypes = Arrays.asList("char", "varchar", "blob", "text", "tinyblob", "tinytext",
+    private static final List<String> stringDataTypes = Arrays.asList("char", "varchar", "blob", "text", "tinyblob", "tinytext",
             "mediumblob", "mediumtext", "longblob", "longtext");
 
     private final JdbcTemplate jdbcTemplate;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReportWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReportWritePlatformServiceImpl.java
index 78b225728..1e507a594 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReportWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReportWritePlatformServiceImpl.java
@@ -53,7 +53,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class ReportWritePlatformServiceImpl implements ReportWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ReportWritePlatformServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ReportWritePlatformServiceImpl.class);
 
     private final PlatformSecurityContext context;
     private final ReportCommandFromApiJsonDeserializer fromApiJsonDeserializer;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/FileSystemContentRepository.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/FileSystemContentRepository.java
index 9790cd0e8..592ad5c1a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/FileSystemContentRepository.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/FileSystemContentRepository.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
 
 public class FileSystemContentRepository implements ContentRepository {
 
-    private final static Logger LOG = LoggerFactory.getLogger(FileSystemContentRepository.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FileSystemContentRepository.class);
 
     public static final String FINERACT_BASE_DIR = System.getProperty("user.home") + File.separator + ".fineract";
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/S3ContentRepository.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/S3ContentRepository.java
index 257416ce6..c5c98d39d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/S3ContentRepository.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/S3ContentRepository.java
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
 
 public class S3ContentRepository implements ContentRepository {
 
-    private final static Logger LOG = LoggerFactory.getLogger(S3ContentRepository.class);
+    private static final Logger LOG = LoggerFactory.getLogger(S3ContentRepository.class);
 
     private final String s3BucketName;
     private final AmazonS3 s3Client;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/data/ImageData.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/data/ImageData.java
index 27c785ab6..2c704ed12 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/data/ImageData.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/data/ImageData.java
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
 
 public class ImageData {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ImageData.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ImageData.class);
 
     @SuppressWarnings("unused")
     private final Long imageId;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/DocumentWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/DocumentWritePlatformServiceJpaRepositoryImpl.java
index 001c53b6a..dd1f56078 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/DocumentWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/service/DocumentWritePlatformServiceJpaRepositoryImpl.java
@@ -42,7 +42,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class DocumentWritePlatformServiceJpaRepositoryImpl implements DocumentWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(DocumentWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DocumentWritePlatformServiceJpaRepositoryImpl.class);
 
     private final PlatformSecurityContext context;
     private final DocumentRepository documentRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessReadServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessReadServiceImpl.java
index f10d692a8..fdddb0406 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessReadServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessReadServiceImpl.java
@@ -46,7 +46,7 @@ public class FineractEntityAccessReadServiceImpl implements FineractEntityAccess
 
     private final PlatformSecurityContext context;
     private final JdbcTemplate jdbcTemplate;
-    private final static Logger LOG = LoggerFactory.getLogger(FineractEntityAccessReadServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FineractEntityAccessReadServiceImpl.class);
     private final FineractEntityRelationRepositoryWrapper fineractEntityRelationRepository;
 
     @Autowired
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessWriteServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessWriteServiceImpl.java
index 756cf46e9..8deabfb8f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessWriteServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/service/FineractEntityAccessWriteServiceImpl.java
@@ -47,7 +47,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class FineractEntityAccessWriteServiceImpl implements FineractEntityAccessWriteService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(FineractEntityAccessWriteServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FineractEntityAccessWriteServiceImpl.class);
     private final FineractEntityAccessRepository entityAccessRepository;
     private final FineractEntityRelationRepositoryWrapper fineractEntityRelationRepositoryWrapper;
     private final FineractEntityToEntityMappingRepository fineractEntityToEntityMappingRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/processor/ProcessorHelper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/processor/ProcessorHelper.java
index 7bd774f80..d87f93aba 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/processor/ProcessorHelper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/processor/ProcessorHelper.java
@@ -40,7 +40,7 @@ import retrofit.client.Response;
 @SuppressWarnings("unused")
 public class ProcessorHelper {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ProcessorHelper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ProcessorHelper.class);
 
     @SuppressWarnings("null")
     public static OkHttpClient configureClient(final OkHttpClient client) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/processor/TwilioHookProcessor.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/processor/TwilioHookProcessor.java
index ac642893e..79fa317e5 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/processor/TwilioHookProcessor.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/processor/TwilioHookProcessor.java
@@ -44,7 +44,7 @@ import retrofit.Callback;
 @Service
 public class TwilioHookProcessor implements HookProcessor {
 
-    private final static Logger LOG = LoggerFactory.getLogger(TwilioHookProcessor.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TwilioHookProcessor.class);
     private final HookConfigurationRepository hookConfigurationRepository;
     private final TemplateMergeService templateMergeService;
     private final ClientRepositoryWrapper clientRepositoryWrapper;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/processor/WebHookService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/processor/WebHookService.java
index f00024ade..f76fc7e53 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/processor/WebHookService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/processor/WebHookService.java
@@ -32,11 +32,11 @@ import retrofit.http.POST;
 
 public interface WebHookService {
 
-    final static String ENTITY_HEADER = "X-Fineract-Entity";
-    final static String ACTION_HEADER = "X-Fineract-Action";
-    final static String TENANT_HEADER = "Fineract-Platform-TenantId";
-    final static String ENDPOINT_HEADER = "X-Fineract-Endpoint";
-    final static String API_KEY_HEADER = "X-Fineract-API-Key";
+    static final String ENTITY_HEADER = "X-Fineract-Entity";
+    static final String ACTION_HEADER = "X-Fineract-Action";
+    static final String TENANT_HEADER = "Fineract-Platform-TenantId";
+    static final String ENDPOINT_HEADER = "X-Fineract-Endpoint";
+    static final String API_KEY_HEADER = "X-Fineract-API-Key";
 
     // Ping
     @GET("/")
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobRegisterServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobRegisterServiceImpl.java
index 8a2396726..169532be4 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobRegisterServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/JobRegisterServiceImpl.java
@@ -66,7 +66,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class JobRegisterServiceImpl implements JobRegisterService, ApplicationListener<ContextClosedEvent> {
 
-    private final static Logger LOG = LoggerFactory.getLogger(JobRegisterServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(JobRegisterServiceImpl.class);
 
     // MIFOSX-1184: This class cannot use constructor injection, because one of
     // its dependencies (SchedulerStopListener) has a circular dependency to
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerTriggerListener.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerTriggerListener.java
index bf8f3860b..76baba468 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerTriggerListener.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/SchedulerTriggerListener.java
@@ -35,7 +35,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class SchedulerTriggerListener implements TriggerListener {
 
-    private final static Logger LOG = LoggerFactory.getLogger(SchedulerTriggerListener.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SchedulerTriggerListener.class);
 
     private final SchedularWritePlatformService schedularService;
     private final TenantDetailsService tenantDetailsService;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/helper/IPv4Helper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/helper/IPv4Helper.java
index 86fee586f..65f5543ff 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/helper/IPv4Helper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/helper/IPv4Helper.java
@@ -42,7 +42,7 @@ public class IPv4Helper {
      * @throws IllegalArgumentException
      *             if <code>ipAddress</code> is invalid
      */
-    private final static Logger LOG = LoggerFactory.getLogger(IPv4Helper.class);
+    private static final Logger LOG = LoggerFactory.getLogger(IPv4Helper.class);
 
     public static long ipAddressToLong(String ipAddress) {
         if (ipAddress == null || ipAddress.isEmpty()) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobEmailServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobEmailServiceImpl.java
index 4c0efcaee..0c976db45 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobEmailServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobEmailServiceImpl.java
@@ -36,7 +36,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class ReportMailingJobEmailServiceImpl implements ReportMailingJobEmailService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ReportMailingJobEmailServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ReportMailingJobEmailServiceImpl.class);
     private final ReportMailingJobConfigurationReadPlatformService reportMailingJobConfigurationReadPlatformService;
     private Collection<ReportMailingJobConfigurationData> reportMailingJobConfigurationDataCollection;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobWritePlatformServiceImpl.java
index 094896abe..415b8d26b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/service/ReportMailingJobWritePlatformServiceImpl.java
@@ -74,7 +74,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class ReportMailingJobWritePlatformServiceImpl implements ReportMailingJobWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ReportMailingJobWritePlatformServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ReportMailingJobWritePlatformServiceImpl.class);
     private final ReportRepositoryWrapper reportRepositoryWrapper;
     private final ReportMailingJobValidator reportMailingJobValidator;
     private final ReportMailingJobRepositoryWrapper reportMailingJobRepositoryWrapper;
@@ -84,7 +84,7 @@ public class ReportMailingJobWritePlatformServiceImpl implements ReportMailingJo
     private final ReadReportingService readReportingService;
     private final ReportingProcessServiceProvider reportingProcessServiceProvider;
     private final ReportMailingJobRunHistoryRepository reportMailingJobRunHistoryRepository;
-    private final static String DATETIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
+    private static final String DATETIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
 
     @Autowired
     public ReportMailingJobWritePlatformServiceImpl(final ReportRepositoryWrapper reportRepositoryWrapper,
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareBasicAuthenticationFilter.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareBasicAuthenticationFilter.java
index dd9058dfd..83f55a988 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareBasicAuthenticationFilter.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareBasicAuthenticationFilter.java
@@ -67,7 +67,7 @@ import org.springframework.stereotype.Service;
 public class TenantAwareBasicAuthenticationFilter extends BasicAuthenticationFilter {
 
     private static boolean firstRequestProcessed = false;
-    private final static Logger LOG = LoggerFactory.getLogger(TenantAwareBasicAuthenticationFilter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TenantAwareBasicAuthenticationFilter.class);
 
     private final BasicAuthTenantDetailsService basicAuthTenantDetailsService;
     private final ToApiJsonSerializer<PlatformRequestLog> toApiJsonSerializer;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareTenantIdentifierFilter.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareTenantIdentifierFilter.java
index 324f119cb..4680b655b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareTenantIdentifierFilter.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareTenantIdentifierFilter.java
@@ -62,7 +62,7 @@ import org.springframework.web.filter.GenericFilterBean;
 public class TenantAwareTenantIdentifierFilter extends GenericFilterBean {
 
     private static boolean firstRequestProcessed = false;
-    private final static Logger LOG = LoggerFactory.getLogger(TenantAwareTenantIdentifierFilter.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TenantAwareTenantIdentifierFilter.class);
 
     private final BasicAuthTenantDetailsService basicAuthTenantDetailsService;
     private final ToApiJsonSerializer<PlatformRequestLog> toApiJsonSerializer;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/SpringSecurityPlatformSecurityContext.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/SpringSecurityPlatformSecurityContext.java
index 29cdedeb9..7bf411a1e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/SpringSecurityPlatformSecurityContext.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/service/SpringSecurityPlatformSecurityContext.java
@@ -44,7 +44,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class SpringSecurityPlatformSecurityContext implements PlatformSecurityContext {
 
-    // private final static Logger LOG =
+    // private static final Logger LOG =
     // LoggerFactory.getLogger(SpringSecurityPlatformSecurityContext.class);
 
     private final ConfigurationDomainService configurationDomainService;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/ColumnValidator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/ColumnValidator.java
index 7a0dad5b5..a5953f52b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/ColumnValidator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/ColumnValidator.java
@@ -40,7 +40,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class ColumnValidator {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ColumnValidator.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ColumnValidator.class);
     private final JdbcTemplate jdbcTemplate;
 
     @Autowired
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLBuilder.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLBuilder.java
index 39bcdad6f..9bdf08de3 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLBuilder.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLBuilder.java
@@ -37,7 +37,7 @@ import java.util.regex.Pattern;
  */
 public class SQLBuilder {
 
-    private final static Pattern ATOZ = Pattern.compile("([a-zA-Z_][a-zA-Z0-9_-]*\\.)?[a-zA-Z_-][a-zA-Z0-9_-]*");
+    private static final Pattern ATOZ = Pattern.compile("([a-zA-Z_][a-zA-Z0-9_-]*\\.)?[a-zA-Z_-][a-zA-Z0-9_-]*");
 
     // This holds the query string, with the '?' placeholders, but no argument
     // values
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLInjectionValidator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLInjectionValidator.java
index b88c55999..60ff8e367 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLInjectionValidator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLInjectionValidator.java
@@ -24,15 +24,15 @@ import java.util.regex.Pattern;
 
 public class SQLInjectionValidator {
 
-    private final static String[] DDL_COMMANDS = { "create", "drop", "alter", "truncate", "comment", "sleep" };
+    private static final String[] DDL_COMMANDS = { "create", "drop", "alter", "truncate", "comment", "sleep" };
 
-    private final static String[] DML_COMMANDS = { "select", "insert", "update", "delete", "merge", "upsert", "call" };
+    private static final String[] DML_COMMANDS = { "select", "insert", "update", "delete", "merge", "upsert", "call" };
 
-    private final static String[] COMMENTS = { "--", "({", "/*", "#" };
+    private static final String[] COMMENTS = { "--", "({", "/*", "#" };
 
-    private final static String SQL_PATTERN = "[a-zA-Z_=,\\-'!><.?\"`% ()0-9*\n\r]*";
+    private static final String SQL_PATTERN = "[a-zA-Z_=,\\-'!><.?\"`% ()0-9*\n\r]*";
 
-    public final static void validateSQLInput(final String sqlSearch) {
+    public static final void validateSQLInput(final String sqlSearch) {
         String lowerCaseSQL = sqlSearch.toLowerCase();
         for (String ddl : DDL_COMMANDS) {
             if (lowerCaseSQL.contains(ddl)) {
@@ -117,7 +117,7 @@ public class SQLInjectionValidator {
         }
     }
 
-    public final static void validateAdhocQuery(final String sqlSearch) {
+    public static final void validateAdhocQuery(final String sqlSearch) {
         String lowerCaseSQL = sqlSearch.toLowerCase().trim();
         for (String ddl : DDL_COMMANDS) {
             if (lowerCaseSQL.startsWith(ddl)) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/service/SmsWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/service/SmsWritePlatformServiceJpaRepositoryImpl.java
index df177cdb1..e3c27344b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/service/SmsWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/service/SmsWritePlatformServiceJpaRepositoryImpl.java
@@ -37,7 +37,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class SmsWritePlatformServiceJpaRepositoryImpl implements SmsWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(SmsWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SmsWritePlatformServiceJpaRepositoryImpl.class);
 
     private final SmsMessageAssembler assembler;
     private final SmsMessageRepository repository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/PovertyLineApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/PovertyLineApiConstants.java
index 053c24e80..45ba445fc 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/PovertyLineApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/PovertyLineApiConstants.java
@@ -20,5 +20,5 @@ package org.apache.fineract.infrastructure.survey.api;
 
 public class PovertyLineApiConstants {
 
-    final static String POVERTY_LINE_RESOURCE_NAME = "PovertyLine";
+    static final String POVERTY_LINE_RESOURCE_NAME = "PovertyLine";
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/SurveyApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/SurveyApiConstants.java
index fa9a14bdb..21ce9ca12 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/SurveyApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/SurveyApiConstants.java
@@ -23,5 +23,5 @@ package org.apache.fineract.infrastructure.survey.api;
  */
 public class SurveyApiConstants {
 
-    final static String SURVEY_RESOURCE_NAME = "Survey";
+    static final String SURVEY_RESOURCE_NAME = "Survey";
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/ClientScoresOverview.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/ClientScoresOverview.java
index e4b8a62c1..62e83d119 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/ClientScoresOverview.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/ClientScoresOverview.java
@@ -26,19 +26,19 @@ import org.joda.time.LocalDate;
 public class ClientScoresOverview {
 
     @SuppressWarnings("unused")
-    final private String surveyName;
+    private final String surveyName;
     @SuppressWarnings("unused")
-    final private long id;
+    private final long id;
     @SuppressWarnings("unused")
-    final private String likelihoodCode;
+    private final String likelihoodCode;
     @SuppressWarnings("unused")
-    final private String likelihoodName;
+    private final String likelihoodName;
     @SuppressWarnings("unused")
-    final private long score;
+    private final long score;
     @SuppressWarnings("unused")
-    final private Double povertyLine;
+    private final Double povertyLine;
     @SuppressWarnings("unused")
-    final private LocalDate date;
+    private final LocalDate date;
 
     public ClientScoresOverview(final String likelihoodCode, final String likelihoodName, final long score, final Double povertyLine,
             final LocalDate date, final long resourceId, final String surveyName) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/LikelihoodStatus.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/LikelihoodStatus.java
index 3ac0cb398..468e2d1de 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/LikelihoodStatus.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/LikelihoodStatus.java
@@ -23,6 +23,6 @@ package org.apache.fineract.infrastructure.survey.data;
  */
 public class LikelihoodStatus {
 
-    public final static long ENABLED = 200;
-    public final static long DISABLED = 100;
+    public static final long ENABLED = 200;
+    public static final long DISABLED = 100;
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/WriteLikelihoodServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/WriteLikelihoodServiceImpl.java
index 4b941d877..1b21573b8 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/WriteLikelihoodServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/service/WriteLikelihoodServiceImpl.java
@@ -39,7 +39,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class WriteLikelihoodServiceImpl implements WriteLikelihoodService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(WriteLikelihoodServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(WriteLikelihoodServiceImpl.class);
     private final PlatformSecurityContext context;
     private final LikelihoodDataValidator likelihoodDataValidator;
     private final LikelihoodRepository repository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/interoperation/service/InteropServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/interoperation/service/InteropServiceImpl.java
index 46221b2b6..fcfe9397d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/interoperation/service/InteropServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/interoperation/service/InteropServiceImpl.java
@@ -92,7 +92,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class InteropServiceImpl implements InteropService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(InteropServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(InteropServiceImpl.class);
 
     private final PlatformSecurityContext securityContext;
     private final InteropDataValidator dataValidator;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/mix/service/XBRLResultServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/mix/service/XBRLResultServiceImpl.java
index 9b918ae86..c77bb4cbf 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/mix/service/XBRLResultServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/mix/service/XBRLResultServiceImpl.java
@@ -44,7 +44,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class XBRLResultServiceImpl implements XBRLResultService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(XBRLResultServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(XBRLResultServiceImpl.class);
     private static final ScriptEngine SCRIPT_ENGINE = new ScriptEngineManager().getEngineByName("JavaScript");
 
     private final MixTaxonomyMappingReadPlatformService readTaxonomyMappingService;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayWritePlatformServiceJpaRepositoryImpl.java
index 0b6e5c118..82bf9c281 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayWritePlatformServiceJpaRepositoryImpl.java
@@ -54,7 +54,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class HolidayWritePlatformServiceJpaRepositoryImpl implements HolidayWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(HolidayWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(HolidayWritePlatformServiceJpaRepositoryImpl.class);
 
     private final HolidayDataValidator fromApiJsonDeserializer;
     private final HolidayRepositoryWrapper holidayRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/service/OfficeReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/service/OfficeReadPlatformServiceImpl.java
index 7b6761138..ea65bd193 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/service/OfficeReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/service/OfficeReadPlatformServiceImpl.java
@@ -49,7 +49,7 @@ public class OfficeReadPlatformServiceImpl implements OfficeReadPlatformService
     private final PlatformSecurityContext context;
     private final CurrencyReadPlatformService currencyReadPlatformService;
     private final ColumnValidator columnValidator;
-    private final static String nameDecoratedBaseOnHierarchy = "concat(substring('........................................', 1, ((LENGTH(o.hierarchy) - LENGTH(REPLACE(o.hierarchy, '.', '')) - 1) * 4)), o.name)";
+    private static final String nameDecoratedBaseOnHierarchy = "concat(substring('........................................', 1, ((LENGTH(o.hierarchy) - LENGTH(REPLACE(o.hierarchy, '.', '')) - 1) * 4)), o.name)";
 
     @Autowired
     public OfficeReadPlatformServiceImpl(final PlatformSecurityContext context,
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/service/OfficeWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/service/OfficeWritePlatformServiceJpaRepositoryImpl.java
index ba0f606c4..b2663b637 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/service/OfficeWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/service/OfficeWritePlatformServiceJpaRepositoryImpl.java
@@ -51,7 +51,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class OfficeWritePlatformServiceJpaRepositoryImpl implements OfficeWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(OfficeWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(OfficeWritePlatformServiceJpaRepositoryImpl.class);
 
     private final PlatformSecurityContext context;
     private final OfficeCommandFromApiJsonDeserializer fromApiJsonDeserializer;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/constants/ProvisioningCriteriaConstants.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/constants/ProvisioningCriteriaConstants.java
index eed3d865b..f758ebabd 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/constants/ProvisioningCriteriaConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/constants/ProvisioningCriteriaConstants.java
@@ -20,26 +20,26 @@ package org.apache.fineract.organisation.provisioning.constants;
 
 public interface ProvisioningCriteriaConstants {
 
-    public final static String JSON_LOCALE_PARAM = "locale";
-    public final static String JSON_CRITERIAID_PARAM = "criteriaId";
-    public final static String JSON_CRITERIANAME_PARAM = "criteriaName";
-    public final static String JSON_LOANPRODUCTS_PARAM = "loanProducts";
-    public final static String JSON_LOAN_PRODUCT_ID_PARAM = "id";
-    public final static String JSON_LOAN_PRODUCTNAME_PARAM = "name";
-    public final static String JSON_LOAN_PRODUCT_BORROWERCYCLE_PARAM = "includeInBorrowerCycle";
-    public final static String JSON_PROVISIONING_DEFINITIONS_PARAM = "definitions";
-    public final static String JSON_CATEOGRYID_PARAM = "categoryId";
-    public final static String JSON_CATEOGRYNAME_PARAM = "categoryName";
-    public final static String JSON_MINIMUM_AGE_PARAM = "minAge";
-    public final static String JSON_MAXIMUM_AGE_PARAM = "maxAge";
-    public final static String JSON_PROVISIONING_PERCENTAGE_PARAM = "provisioningPercentage";
-    public final static String JSON_LIABILITY_ACCOUNT_PARAM = "liabilityAccount";
-    public final static String JSON_EXPENSE_ACCOUNT_PARAM = "expenseAccount";
-    public final static String DEFINITIONS_PARAM = "definitions";
-    public final static String LOANPRODUCTS_PARAM = "loanProducts";
-    public final static String GLACCOUNTS_PARAM = "glAccounts";
-    public final static String CRITERIA_PARAM = "criteriaName";
-    public final static String CRITERIA_ID_PARAM = "criteriaId";
-    public final static String CRITERIA_NAME_PARAM = "criterianame";
-    public final static String CREATED_BY_PARAM = "createdby";
+    public static final String JSON_LOCALE_PARAM = "locale";
+    public static final String JSON_CRITERIAID_PARAM = "criteriaId";
+    public static final String JSON_CRITERIANAME_PARAM = "criteriaName";
+    public static final String JSON_LOANPRODUCTS_PARAM = "loanProducts";
+    public static final String JSON_LOAN_PRODUCT_ID_PARAM = "id";
+    public static final String JSON_LOAN_PRODUCTNAME_PARAM = "name";
+    public static final String JSON_LOAN_PRODUCT_BORROWERCYCLE_PARAM = "includeInBorrowerCycle";
+    public static final String JSON_PROVISIONING_DEFINITIONS_PARAM = "definitions";
+    public static final String JSON_CATEOGRYID_PARAM = "categoryId";
+    public static final String JSON_CATEOGRYNAME_PARAM = "categoryName";
+    public static final String JSON_MINIMUM_AGE_PARAM = "minAge";
+    public static final String JSON_MAXIMUM_AGE_PARAM = "maxAge";
+    public static final String JSON_PROVISIONING_PERCENTAGE_PARAM = "provisioningPercentage";
+    public static final String JSON_LIABILITY_ACCOUNT_PARAM = "liabilityAccount";
+    public static final String JSON_EXPENSE_ACCOUNT_PARAM = "expenseAccount";
+    public static final String DEFINITIONS_PARAM = "definitions";
+    public static final String LOANPRODUCTS_PARAM = "loanProducts";
+    public static final String GLACCOUNTS_PARAM = "glAccounts";
+    public static final String CRITERIA_PARAM = "criteriaName";
+    public static final String CRITERIA_ID_PARAM = "criteriaId";
+    public static final String CRITERIA_NAME_PARAM = "criterianame";
+    public static final String CREATED_BY_PARAM = "createdby";
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/serialization/ProvisioningCriteriaDefinitionJsonDeserializer.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/serialization/ProvisioningCriteriaDefinitionJsonDeserializer.java
index 3d2c58516..4b2d43b96 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/serialization/ProvisioningCriteriaDefinitionJsonDeserializer.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/serialization/ProvisioningCriteriaDefinitionJsonDeserializer.java
@@ -46,16 +46,16 @@ public class ProvisioningCriteriaDefinitionJsonDeserializer implements Provision
 
     private final FromJsonHelper fromApiJsonHelper;
 
-    private final static Set<String> supportedParametersForCreate = new HashSet<>(
+    private static final Set<String> supportedParametersForCreate = new HashSet<>(
             Arrays.asList(JSON_LOCALE_PARAM, JSON_CRITERIANAME_PARAM, JSON_LOANPRODUCTS_PARAM, JSON_PROVISIONING_DEFINITIONS_PARAM));
 
-    private final static Set<String> supportedParametersForUpdate = new HashSet<>(Arrays.asList(JSON_CRITERIAID_PARAM, JSON_LOCALE_PARAM,
+    private static final Set<String> supportedParametersForUpdate = new HashSet<>(Arrays.asList(JSON_CRITERIAID_PARAM, JSON_LOCALE_PARAM,
             JSON_CRITERIANAME_PARAM, JSON_LOANPRODUCTS_PARAM, JSON_PROVISIONING_DEFINITIONS_PARAM));
 
-    private final static Set<String> loanProductSupportedParams = new HashSet<>(
+    private static final Set<String> loanProductSupportedParams = new HashSet<>(
             Arrays.asList(JSON_LOAN_PRODUCT_ID_PARAM, JSON_LOAN_PRODUCTNAME_PARAM, JSON_LOAN_PRODUCT_BORROWERCYCLE_PARAM));
 
-    private final static Set<String> provisioningcriteriaSupportedParams = new HashSet<>(
+    private static final Set<String> provisioningcriteriaSupportedParams = new HashSet<>(
             Arrays.asList(JSON_CATEOGRYID_PARAM, JSON_CATEOGRYNAME_PARAM, JSON_MINIMUM_AGE_PARAM, JSON_MAXIMUM_AGE_PARAM,
                     JSON_MINIMUM_AGE_PARAM, JSON_PROVISIONING_PERCENTAGE_PARAM, JSON_EXPENSE_ACCOUNT_PARAM, JSON_LIABILITY_ACCOUNT_PARAM));
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCategoryWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCategoryWritePlatformServiceJpaRepositoryImpl.java
index cd418981f..f4ecdd4a3 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCategoryWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCategoryWritePlatformServiceJpaRepositoryImpl.java
@@ -41,7 +41,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProvisioningCategoryWritePlatformServiceJpaRepositoryImpl implements ProvisioningCategoryWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ProvisioningCategoryWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ProvisioningCategoryWritePlatformServiceJpaRepositoryImpl.class);
 
     private final ProvisioningCategoryRepository provisioningCategoryRepository;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl.java
index 2f53951ad..c91ace105 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/service/ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl.java
@@ -53,7 +53,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl implements ProvisioningCriteriaWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ProvisioningCriteriaWritePlatformServiceJpaRepositoryImpl.class);
 
     private final ProvisioningCriteriaDefinitionJsonDeserializer fromApiJsonDeserializer;
     private final ProvisioningCriteriaAssembler provisioningCriteriaAssembler;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/domain/StaffRepository.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/domain/StaffRepository.java
index 7ab0f273b..158a0bf20 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/domain/StaffRepository.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/domain/StaffRepository.java
@@ -25,7 +25,7 @@ import org.springframework.data.repository.query.Param;
 
 public interface StaffRepository extends JpaRepository<Staff, Long>, JpaSpecificationExecutor<Staff> {
 
-    public final static String FIND_BY_OFFICE_QUERY = "select s from Staff s where s.id = :id AND s.office.id = :officeId";
+    public static final String FIND_BY_OFFICE_QUERY = "select s from Staff s where s.id = :id AND s.office.id = :officeId";
 
     /**
      * Find staff by officeid.
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffWritePlatformServiceJpaRepositoryImpl.java
index 907f67467..97c7f3e21 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/service/StaffWritePlatformServiceJpaRepositoryImpl.java
@@ -42,7 +42,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class StaffWritePlatformServiceJpaRepositoryImpl implements StaffWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(StaffWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(StaffWritePlatformServiceJpaRepositoryImpl.class);
 
     private final StaffCommandFromApiJsonDeserializer fromApiJsonDeserializer;
     private final StaffRepository staffRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/CashierTransactionDataValidator.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/CashierTransactionDataValidator.java
index 9ce50f2a9..3417a489f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/CashierTransactionDataValidator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/data/CashierTransactionDataValidator.java
@@ -45,7 +45,7 @@ public class CashierTransactionDataValidator {
 
     private final TellerManagementReadPlatformService tellerManagementReadPlatformService;
     private final JdbcTemplate jdbcTemplate;
-    private final static Logger LOG = LoggerFactory.getLogger(CashierTransactionDataValidator.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CashierTransactionDataValidator.class);
 
     @Autowired
     public CashierTransactionDataValidator(final TellerManagementReadPlatformService tellerManagementReadPlatformService,
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformServiceJpaImpl.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformServiceJpaImpl.java
index cfc733d82..59a44d0bf 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformServiceJpaImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/service/TellerWritePlatformServiceJpaImpl.java
@@ -63,7 +63,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class TellerWritePlatformServiceJpaImpl implements TellerWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(TellerWritePlatformServiceJpaImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TellerWritePlatformServiceJpaImpl.class);
 
     private final PlatformSecurityContext context;
     private final TellerCommandFromApiJsonDeserializer fromApiJsonDeserializer;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/util/DateRange.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/util/DateRange.java
index 32857d4dd..b951ebf56 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/util/DateRange.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/util/DateRange.java
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
 
 public class DateRange {
 
-    private final static Logger LOG = LoggerFactory.getLogger(DateRange.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DateRange.class);
     private static final String ISO_8601_DATE_PATTERN = "yyy-MM-dd";
     private static final String RANGE_DELIMITER = "..";
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiResourceSwagger.java
index e34591f3c..e90cd5e3a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiResourceSwagger.java
@@ -31,7 +31,7 @@ final class AccountTransfersApiResourceSwagger {
     private AccountTransfersApiResourceSwagger() {}
 
     @ApiModel(value = "GetAccountTransfersTemplateResponse")
-    public final static class GetAccountTransfersTemplateResponse {
+    public static final class GetAccountTransfersTemplateResponse {
 
         private GetAccountTransfersTemplateResponse() {}
 
@@ -141,7 +141,7 @@ final class AccountTransfersApiResourceSwagger {
     }
 
     @ApiModel(value = "PostAccountTransfersRequest")
-    public final static class PostAccountTransfersRequest {
+    public static final class PostAccountTransfersRequest {
 
         private PostAccountTransfersRequest() {}
 
@@ -174,7 +174,7 @@ final class AccountTransfersApiResourceSwagger {
     }
 
     @ApiModel(value = "PostAccountTransfersResponse")
-    public final static class PostAccountTransfersResponse {
+    public static final class PostAccountTransfersResponse {
 
         private PostAccountTransfersResponse() {}
 
@@ -185,7 +185,7 @@ final class AccountTransfersApiResourceSwagger {
     }
 
     @ApiModel(value = "GetAccountTransfersResponse")
-    public final static class GetAccountTransfersResponse {
+    public static final class GetAccountTransfersResponse {
 
         private GetAccountTransfersResponse() {}
 
@@ -558,7 +558,7 @@ final class AccountTransfersApiResourceSwagger {
     }
 
     @ApiModel(value = "PostAccountTransfersRefundByTransferResponse")
-    public final static class PostAccountTransfersRefundByTransferResponse {
+    public static final class PostAccountTransfersRefundByTransferResponse {
 
         private PostAccountTransfersRefundByTransferResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/StandingInstructionHistoryApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/StandingInstructionHistoryApiResourceSwagger.java
index 1a07e336c..7a97bfcca 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/StandingInstructionHistoryApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/StandingInstructionHistoryApiResourceSwagger.java
@@ -31,7 +31,7 @@ final class StandingInstructionHistoryApiResourceSwagger {
     private StandingInstructionHistoryApiResourceSwagger() {}
 
     @ApiModel(value = "GetStandingInstructionRunHistoryResponse")
-    public final static class GetStandingInstructionRunHistoryResponse {
+    public static final class GetStandingInstructionRunHistoryResponse {
 
         private GetStandingInstructionRunHistoryResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/domain/StandingInstructionRepository.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/domain/StandingInstructionRepository.java
index 45aa95458..054888d84 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/domain/StandingInstructionRepository.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/domain/StandingInstructionRepository.java
@@ -29,13 +29,13 @@ import org.springframework.data.repository.query.Param;
 public interface StandingInstructionRepository
         extends JpaRepository<AccountTransferStandingInstruction, Long>, JpaSpecificationExecutor<AccountTransferStandingInstruction> {
 
-    public final static String FIND_BY_LOAN_AND_STATUS_QUERY = "select accountTransferStandingInstruction "
+    public static final String FIND_BY_LOAN_AND_STATUS_QUERY = "select accountTransferStandingInstruction "
             + "from AccountTransferStandingInstruction accountTransferStandingInstruction "
             + "where accountTransferStandingInstruction.status = :status "
             + "and (accountTransferStandingInstruction.accountTransferDetails.toLoanAccount = :loan "
             + "or accountTransferStandingInstruction.accountTransferDetails.fromLoanAccount = :loan)";
 
-    public final static String FIND_BY_SAVINGS_AND_STATUS_QUERY = "select accountTransferStandingInstruction "
+    public static final String FIND_BY_SAVINGS_AND_STATUS_QUERY = "select accountTransferStandingInstruction "
             + "from AccountTransferStandingInstruction accountTransferStandingInstruction "
             + "where accountTransferStandingInstruction.status = :status "
             + "and (accountTransferStandingInstruction.accountTransferDetails.toSavingsAccount = :savingsAccount "
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountAssociationsReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountAssociationsReadPlatformServiceImpl.java
index 806123fb1..ab9306d80 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountAssociationsReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountAssociationsReadPlatformServiceImpl.java
@@ -41,7 +41,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class AccountAssociationsReadPlatformServiceImpl implements AccountAssociationsReadPlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(AccountAssociationsReadPlatformServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AccountAssociationsReadPlatformServiceImpl.class);
     private final JdbcTemplate jdbcTemplate;
 
     @Autowired
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionWritePlatformServiceImpl.java
index 4a2e8b356..b43f1b10a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/StandingInstructionWritePlatformServiceImpl.java
@@ -71,7 +71,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class StandingInstructionWritePlatformServiceImpl implements StandingInstructionWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(StandingInstructionWritePlatformServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(StandingInstructionWritePlatformServiceImpl.class);
 
     private final StandingInstructionDataValidator standingInstructionDataValidator;
     private final StandingInstructionAssembler standingInstructionAssembler;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountDetailsReadPlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountDetailsReadPlatformServiceJpaRepositoryImpl.java
index a7f2117f1..e11cf508e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountDetailsReadPlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountDetailsReadPlatformServiceJpaRepositoryImpl.java
@@ -218,7 +218,7 @@ public class AccountDetailsReadPlatformServiceJpaRepositoryImpl implements Accou
         return this.jdbcTemplate.query(sql, rm, inputs);
     }
 
-    private final static class ShareAccountSummaryDataMapper implements RowMapper<ShareAccountSummaryData> {
+    private static final class ShareAccountSummaryDataMapper implements RowMapper<ShareAccountSummaryData> {
 
         private final String schema;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/api/AccountsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/api/AccountsApiResourceSwagger.java
index 9b0f71757..b680846de 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/api/AccountsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accounts/api/AccountsApiResourceSwagger.java
@@ -32,7 +32,7 @@ final class AccountsApiResourceSwagger {
     private AccountsApiResourceSwagger() {}
 
     @ApiModel(value = "GetAccountsTypeTemplateResponse")
-    public final static class GetAccountsTypeTemplateResponse {
+    public static final class GetAccountsTypeTemplateResponse {
 
         private GetAccountsTypeTemplateResponse() {}
 
@@ -58,7 +58,7 @@ final class AccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetAccountsTypeAccountIdResponse")
-    public final static class GetAccountsTypeAccountIdResponse {
+    public static final class GetAccountsTypeAccountIdResponse {
 
         private GetAccountsTypeAccountIdResponse() {}
 
@@ -323,7 +323,7 @@ final class AccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetAccountsTypeResponse")
-    public final static class GetAccountsTypeResponse {
+    public static final class GetAccountsTypeResponse {
 
         private GetAccountsTypeResponse() {}
 
@@ -407,7 +407,7 @@ final class AccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostAccountsTypeRequest")
-    public final static class PostAccountsTypeRequest {
+    public static final class PostAccountsTypeRequest {
 
         private PostAccountsTypeRequest() {}
 
@@ -453,7 +453,7 @@ final class AccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostAccountsTypeResponse")
-    public final static class PostAccountsTypeResponse {
+    public static final class PostAccountsTypeResponse {
 
         private PostAccountsTypeResponse() {}
 
@@ -462,7 +462,7 @@ final class AccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostAccountsTypeAccountIdRequest")
-    public final static class PostAccountsTypeAccountIdRequest {
+    public static final class PostAccountsTypeAccountIdRequest {
 
         private PostAccountsTypeAccountIdRequest() {}
 
@@ -478,7 +478,7 @@ final class AccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostAccountsTypeAccountIdResponse")
-    public final static class PostAccountsTypeAccountIdResponse {
+    public static final class PostAccountsTypeAccountIdResponse {
 
         private PostAccountsTypeAccountIdResponse() {}
 
@@ -487,7 +487,7 @@ final class AccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutAccountsTypeAccountIdRequest")
-    public final static class PutAccountsTypeAccountIdRequest {
+    public static final class PutAccountsTypeAccountIdRequest {
 
         private PutAccountsTypeAccountIdRequest() {}
 
@@ -502,7 +502,7 @@ final class AccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutAccountsTypeAccountIdResponse")
-    public final static class PutAccountsTypeAccountIdResponse {
+    public static final class PutAccountsTypeAccountIdResponse {
 
         private PutAccountsTypeAccountIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java
index 0547d5343..94fb7e029 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
 
 public class CalendarUtils {
 
-    private final static Logger LOG = LoggerFactory.getLogger(CalendarUtils.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CalendarUtils.class);
 
     static {
         System.setProperty("net.fortuna.ical4j.timezone.date.floating", "true");
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeWritePlatformServiceJpaRepositoryImpl.java
index d67c01960..17bb9d882 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeWritePlatformServiceJpaRepositoryImpl.java
@@ -56,7 +56,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class ChargeWritePlatformServiceJpaRepositoryImpl implements ChargeWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ChargeWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ChargeWritePlatformServiceJpaRepositoryImpl.class);
     private final PlatformSecurityContext context;
     private final ChargeDefinitionCommandFromApiJsonDeserializer fromApiJsonDeserializer;
     private final JdbcTemplate jdbcTemplate;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientAddressApiResourcesSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientAddressApiResourcesSwagger.java
index 65ef724b7..d2c97a964 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientAddressApiResourcesSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientAddressApiResourcesSwagger.java
@@ -29,7 +29,7 @@ final class ClientAddressApiResourcesSwagger {
     private ClientAddressApiResourcesSwagger() {}
 
     @ApiModel(value = "PostClientClientIdAddressesRequest")
-    public final static class PostClientClientIdAddressesRequest {
+    public static final class PostClientClientIdAddressesRequest {
 
         private PostClientClientIdAddressesRequest() {}
 
@@ -52,7 +52,7 @@ final class ClientAddressApiResourcesSwagger {
     }
 
     @ApiModel(value = "PostClientClientIdAddressesResponse")
-    public final static class PostClientClientIdAddressesResponse {
+    public static final class PostClientClientIdAddressesResponse {
 
         private PostClientClientIdAddressesResponse() {}
 
@@ -61,7 +61,7 @@ final class ClientAddressApiResourcesSwagger {
     }
 
     @ApiModel(value = "GetClientClientIdAddressesResponse")
-    public final static class GetClientClientIdAddressesResponse {
+    public static final class GetClientClientIdAddressesResponse {
 
         private GetClientClientIdAddressesResponse() {}
 
@@ -106,7 +106,7 @@ final class ClientAddressApiResourcesSwagger {
     }
 
     @ApiModel(value = "PutClientClientIdAddressesRequest")
-    public final static class PutClientClientIdAddressesRequest {
+    public static final class PutClientClientIdAddressesRequest {
 
         private PutClientClientIdAddressesRequest() {}
 
@@ -117,7 +117,7 @@ final class ClientAddressApiResourcesSwagger {
     }
 
     @ApiModel(value = "PutClientClientIdAddressesResponse")
-    public final static class PutClientClientIdAddressesResponse {
+    public static final class PutClientClientIdAddressesResponse {
 
         private PutClientClientIdAddressesResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientChargesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientChargesApiResourceSwagger.java
index 799ae9883..8d77a24b9 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientChargesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientChargesApiResourceSwagger.java
@@ -32,7 +32,7 @@ final class ClientChargesApiResourceSwagger {
     private ClientChargesApiResourceSwagger() {}
 
     @ApiModel(value = "GetClientsClientIdChargesResponse")
-    public final static class GetClientsClientIdChargesResponse {
+    public static final class GetClientsClientIdChargesResponse {
 
         private GetClientsClientIdChargesResponse() {}
 
@@ -121,7 +121,7 @@ final class ClientChargesApiResourceSwagger {
     }
 
     @ApiModel(value = "PostClientsClientIdChargesRequest")
-    public final static class PostClientsClientIdChargesRequest {
+    public static final class PostClientsClientIdChargesRequest {
 
         private PostClientsClientIdChargesRequest() {}
 
@@ -138,7 +138,7 @@ final class ClientChargesApiResourceSwagger {
     }
 
     @ApiModel(value = "PostClientsClientIdChargesResponse")
-    public final static class PostClientsClientIdChargesResponse {
+    public static final class PostClientsClientIdChargesResponse {
 
         private PostClientsClientIdChargesResponse() {}
 
@@ -151,7 +151,7 @@ final class ClientChargesApiResourceSwagger {
     }
 
     @ApiModel(value = "PostClientsClientIdChargesChargeIdRequest")
-    public final static class PostClientsClientIdChargesChargeIdRequest {
+    public static final class PostClientsClientIdChargesChargeIdRequest {
 
         private PostClientsClientIdChargesChargeIdRequest() {}
 
@@ -166,7 +166,7 @@ final class ClientChargesApiResourceSwagger {
     }
 
     @ApiModel(value = "PostClientsClientIdChargesChargeIdResponse")
-    public final static class PostClientsClientIdChargesChargeIdResponse {
+    public static final class PostClientsClientIdChargesChargeIdResponse {
 
         private PostClientsClientIdChargesChargeIdResponse() {}
 
@@ -181,7 +181,7 @@ final class ClientChargesApiResourceSwagger {
     }
 
     @ApiModel(value = "DeleteClientsClientIdChargesChargeIdResponse")
-    public final static class DeleteClientsClientIdChargesChargeIdResponse {
+    public static final class DeleteClientsClientIdChargesChargeIdResponse {
 
         private DeleteClientsClientIdChargesChargeIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientIdentifiersApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientIdentifiersApiResourceSwagger.java
index 7859270f1..3f4f896f5 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientIdentifiersApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientIdentifiersApiResourceSwagger.java
@@ -30,7 +30,7 @@ final class ClientIdentifiersApiResourceSwagger {
     private ClientIdentifiersApiResourceSwagger() {}
 
     @ApiModel(value = "GetClientsClientIdIdentifiersResponse")
-    public final static class GetClientsClientIdIdentifiersResponse {
+    public static final class GetClientsClientIdIdentifiersResponse {
 
         private GetClientsClientIdIdentifiersResponse() {}
 
@@ -56,7 +56,7 @@ final class ClientIdentifiersApiResourceSwagger {
     }
 
     @ApiModel(value = "GetClientsClientIdIdentifiersTemplateResponse")
-    public final static class GetClientsClientIdIdentifiersTemplateResponse {
+    public static final class GetClientsClientIdIdentifiersTemplateResponse {
 
         private GetClientsClientIdIdentifiersTemplateResponse() {}
 
@@ -76,7 +76,7 @@ final class ClientIdentifiersApiResourceSwagger {
     }
 
     @ApiModel(value = "PostClientsClientIdIdentifiersRequest")
-    public final static class PostClientsClientIdIdentifiersRequest {
+    public static final class PostClientsClientIdIdentifiersRequest {
 
         private PostClientsClientIdIdentifiersRequest() {}
 
@@ -89,7 +89,7 @@ final class ClientIdentifiersApiResourceSwagger {
     }
 
     @ApiModel(value = "PutClientsClientIdIdentifiersIdentifierIdRequest")
-    public final static class PutClientsClientIdIdentifiersIdentifierIdRequest {
+    public static final class PutClientsClientIdIdentifiersIdentifierIdRequest {
 
         private PutClientsClientIdIdentifiersIdentifierIdRequest() {}
 
@@ -102,7 +102,7 @@ final class ClientIdentifiersApiResourceSwagger {
     }
 
     @ApiModel(value = "PutClientsClientIdIdentifiersIdentifierIdResponse")
-    public final static class PutClientsClientIdIdentifiersIdentifierIdResponse {
+    public static final class PutClientsClientIdIdentifiersIdentifierIdResponse {
 
         private PutClientsClientIdIdentifiersIdentifierIdResponse() {}
 
@@ -116,7 +116,7 @@ final class ClientIdentifiersApiResourceSwagger {
     }
 
     @ApiModel(value = "PostClientsClientIdIdentifiersResponse")
-    public final static class PostClientsClientIdIdentifiersResponse {
+    public static final class PostClientsClientIdIdentifiersResponse {
 
         private PostClientsClientIdIdentifiersResponse() {}
 
@@ -129,7 +129,7 @@ final class ClientIdentifiersApiResourceSwagger {
     }
 
     @ApiModel(value = "DeleteClientsClientIdIdentifiersIdentifierIdResponse")
-    public final static class DeleteClientsClientIdIdentifiersIdentifierIdResponse {
+    public static final class DeleteClientsClientIdIdentifiersIdentifierIdResponse {
 
         private DeleteClientsClientIdIdentifiersIdentifierIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientTransactionsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientTransactionsApiResourceSwagger.java
index 303816721..6b8415f63 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientTransactionsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientTransactionsApiResourceSwagger.java
@@ -32,7 +32,7 @@ final class ClientTransactionsApiResourceSwagger {
     private ClientTransactionsApiResourceSwagger() {}
 
     @ApiModel(value = "GetClientsClientIdTransactionsResponse")
-    public final static class GetClientsClientIdTransactionsResponse {
+    public static final class GetClientsClientIdTransactionsResponse {
 
         private GetClientsClientIdTransactionsResponse() {}
 
@@ -94,7 +94,7 @@ final class ClientTransactionsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetClientsClientIdTransactionsTransactionIdResponse")
-    public final static class GetClientsClientIdTransactionsTransactionIdResponse {
+    public static final class GetClientsClientIdTransactionsTransactionIdResponse {
 
         private GetClientsClientIdTransactionsTransactionIdResponse() {}
 
@@ -117,7 +117,7 @@ final class ClientTransactionsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostClientsClientIdTransactionsTransactionIdResponse")
-    public final static class PostClientsClientIdTransactionsTransactionIdResponse {
+    public static final class PostClientsClientIdTransactionsTransactionIdResponse {
 
         private PostClientsClientIdTransactionsTransactionIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResourceSwagger.java
index 9a2be2628..548eb76e0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResourceSwagger.java
@@ -32,7 +32,7 @@ final class ClientsApiResourceSwagger {
     private ClientsApiResourceSwagger() {}
 
     @ApiModel(value = "GetClientsTemplateResponse")
-    public final static class GetClientsTemplateResponse {
+    public static final class GetClientsTemplateResponse {
 
         private GetClientsTemplateResponse() {}
 
@@ -126,7 +126,7 @@ final class ClientsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetClientsResponse")
-    public final static class GetClientsResponse {
+    public static final class GetClientsResponse {
 
         private GetClientsResponse() {}
 
@@ -169,7 +169,7 @@ final class ClientsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetClientsClientIdResponse")
-    public final static class GetClientsClientIdResponse {
+    public static final class GetClientsClientIdResponse {
 
         private GetClientsClientIdResponse() {}
 
@@ -237,7 +237,7 @@ final class ClientsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostClientsRequest")
-    public final static class PostClientsRequest {
+    public static final class PostClientsRequest {
 
         private PostClientsRequest() {}
 
@@ -258,7 +258,7 @@ final class ClientsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostClientsResponse")
-    public final static class PostClientsResponse {
+    public static final class PostClientsResponse {
 
         private PostClientsResponse() {}
 
@@ -273,7 +273,7 @@ final class ClientsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutClientsClientIdRequest")
-    public final static class PutClientsClientIdRequest {
+    public static final class PutClientsClientIdRequest {
 
         private PutClientsClientIdRequest() {}
 
@@ -282,7 +282,7 @@ final class ClientsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutClientsClientIdResponse")
-    public final static class PutClientsClientIdResponse {
+    public static final class PutClientsClientIdResponse {
 
         private PutClientsClientIdResponse() {}
 
@@ -296,13 +296,13 @@ final class ClientsApiResourceSwagger {
     }
 
     @ApiModel(value = "DeleteClientsClientIdRequest")
-    public final static class DeleteClientsClientIdRequest {
+    public static final class DeleteClientsClientIdRequest {
 
         private DeleteClientsClientIdRequest() {}
     }
 
     @ApiModel(value = "DeleteClientsClientIdResponse")
-    public final static class DeleteClientsClientIdResponse {
+    public static final class DeleteClientsClientIdResponse {
 
         private DeleteClientsClientIdResponse() {}
 
@@ -315,7 +315,7 @@ final class ClientsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostClientsClientIdRequest")
-    public final static class PostClientsClientIdRequest {
+    public static final class PostClientsClientIdRequest {
 
         private PostClientsClientIdRequest() {}
 
@@ -324,7 +324,7 @@ final class ClientsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostClientsClientIdResponse")
-    public final static class PostClientsClientIdResponse {
+    public static final class PostClientsClientIdResponse {
 
         private PostClientsClientIdResponse() {}
 
@@ -335,7 +335,7 @@ final class ClientsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetClientsClientIdAccountsResponse")
-    public final static class GetClientsClientIdAccountsResponse {
+    public static final class GetClientsClientIdAccountsResponse {
 
         private GetClientsClientIdAccountsResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/AccountNumberGenerator.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/AccountNumberGenerator.java
index 33f199ad5..7b2523d5a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/AccountNumberGenerator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/AccountNumberGenerator.java
@@ -38,14 +38,14 @@ import org.springframework.stereotype.Component;
 @Component
 public class AccountNumberGenerator {
 
-    private final static int maxLength = 9;
+    private static final int maxLength = 9;
 
-    private final static String ID = "id";
-    private final static String CLIENT_TYPE = "clientType";
-    private final static String OFFICE_NAME = "officeName";
-    private final static String LOAN_PRODUCT_SHORT_NAME = "loanProductShortName";
-    private final static String SAVINGS_PRODUCT_SHORT_NAME = "savingsProductShortName";
-    private final static String SHARE_PRODUCT_SHORT_NAME = "sharesProductShortName";
+    private static final String ID = "id";
+    private static final String CLIENT_TYPE = "clientType";
+    private static final String OFFICE_NAME = "officeName";
+    private static final String LOAN_PRODUCT_SHORT_NAME = "loanProductShortName";
+    private static final String SAVINGS_PRODUCT_SHORT_NAME = "savingsProductShortName";
+    private static final String SHARE_PRODUCT_SHORT_NAME = "sharesProductShortName";
 
     public String generate(Client client, AccountNumberFormat accountNumberFormat) {
         Map<String, String> propertyMap = new HashMap<>();
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientChargeWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientChargeWritePlatformServiceJpaRepositoryImpl.java
index 613a558f7..fc3de2639 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientChargeWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientChargeWritePlatformServiceJpaRepositoryImpl.java
@@ -65,7 +65,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class ClientChargeWritePlatformServiceJpaRepositoryImpl implements ClientChargeWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ClientChargeWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ClientChargeWritePlatformServiceJpaRepositoryImpl.class);
 
     private final PlatformSecurityContext context;
     private final ChargeRepositoryWrapper chargeRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientFamilyMembersWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientFamilyMembersWritePlatformServiceImpl.java
index 33743914a..1b8ec03dd 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientFamilyMembersWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientFamilyMembersWritePlatformServiceImpl.java
@@ -45,7 +45,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class ClientFamilyMembersWritePlatformServiceImpl implements ClientFamilyMembersWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ClientFamilyMembersWritePlatformServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ClientFamilyMembersWritePlatformServiceImpl.class);
     private final PlatformSecurityContext context;
     private final CodeValueRepository codeValueRepository;
     private final ClientFamilyMembersRepository clientFamilyRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientIdentifierWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientIdentifierWritePlatformServiceJpaRepositoryImpl.java
index 0e772747b..a709ad83a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientIdentifierWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientIdentifierWritePlatformServiceJpaRepositoryImpl.java
@@ -47,7 +47,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class ClientIdentifierWritePlatformServiceJpaRepositoryImpl implements ClientIdentifierWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ClientIdentifierWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ClientIdentifierWritePlatformServiceJpaRepositoryImpl.class);
 
     private final PlatformSecurityContext context;
     private final ClientRepositoryWrapper clientRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java
index 7ecd4db2b..e7f552e4e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java
@@ -96,7 +96,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class ClientWritePlatformServiceJpaRepositoryImpl implements ClientWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ClientWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ClientWritePlatformServiceJpaRepositoryImpl.class);
 
     private final PlatformSecurityContext context;
     private final ClientRepositoryWrapper clientRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/service/CollateralWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/service/CollateralWritePlatformServiceJpaRepositoryImpl.java
index fa8f08b96..477f3a5b4 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/service/CollateralWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/service/CollateralWritePlatformServiceJpaRepositoryImpl.java
@@ -51,7 +51,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class CollateralWritePlatformServiceJpaRepositoryImpl implements CollateralWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(CollateralWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CollateralWritePlatformServiceJpaRepositoryImpl.class);
 
     private final PlatformSecurityContext context;
     private final LoanRepositoryWrapper loanRepositoryWrapper;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/api/CollectionSheetApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/api/CollectionSheetApiResourceSwagger.java
index a4f34fb51..07be5c9f5 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/api/CollectionSheetApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/api/CollectionSheetApiResourceSwagger.java
@@ -30,7 +30,7 @@ final class CollectionSheetApiResourceSwagger {
     private CollectionSheetApiResourceSwagger() {}
 
     @ApiModel(value = "PostCollectionSheetRequest")
-    public final static class PostCollectionSheetRequest {
+    public static final class PostCollectionSheetRequest {
 
         private PostCollectionSheetRequest() {}
 
@@ -62,7 +62,7 @@ final class CollectionSheetApiResourceSwagger {
     }
 
     @ApiModel(value = "PostCollectionSheetResponse")
-    public final static class PostCollectionSheetResponse {
+    public static final class PostCollectionSheetResponse {
 
         private PostCollectionSheetResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/api/FloatingRatesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/api/FloatingRatesApiResourceSwagger.java
index 3cc650826..9a37e31f3 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/api/FloatingRatesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/api/FloatingRatesApiResourceSwagger.java
@@ -30,7 +30,7 @@ final class FloatingRatesApiResourceSwagger {
     private FloatingRatesApiResourceSwagger() {}
 
     @ApiModel(value = "PostFloatingRatesRequest")
-    public final static class PostFloatingRatesRequest {
+    public static final class PostFloatingRatesRequest {
 
         private PostFloatingRatesRequest() {}
 
@@ -58,7 +58,7 @@ final class FloatingRatesApiResourceSwagger {
     }
 
     @ApiModel(value = "PostFloatingRatesResponse")
-    public final static class PostFloatingRatesResponse {
+    public static final class PostFloatingRatesResponse {
 
         private PostFloatingRatesResponse() {}
 
@@ -67,7 +67,7 @@ final class FloatingRatesApiResourceSwagger {
     }
 
     @ApiModel(value = "GetFloatingRatesResponse")
-    public final static class GetFloatingRatesResponse {
+    public static final class GetFloatingRatesResponse {
 
         private GetFloatingRatesResponse() {}
 
@@ -90,7 +90,7 @@ final class FloatingRatesApiResourceSwagger {
     }
 
     @ApiModel(value = "GetFloatingRatesFloatingRateIdResponse")
-    public final static class GetFloatingRatesFloatingRateIdResponse {
+    public static final class GetFloatingRatesFloatingRateIdResponse {
 
         private GetFloatingRatesFloatingRateIdResponse() {}
 
@@ -138,7 +138,7 @@ final class FloatingRatesApiResourceSwagger {
     }
 
     @ApiModel(value = "PutFloatingRatesFloatingRateIdRequest")
-    public final static class PutFloatingRatesFloatingRateIdRequest {
+    public static final class PutFloatingRatesFloatingRateIdRequest {
 
         private PutFloatingRatesFloatingRateIdRequest() {}
 
@@ -152,7 +152,7 @@ final class FloatingRatesApiResourceSwagger {
     }
 
     @ApiModel(value = "PutFloatingRatesFloatingRateIdResponse")
-    public final static class PutFloatingRatesFloatingRateIdResponse {
+    public static final class PutFloatingRatesFloatingRateIdResponse {
 
         private PutFloatingRatesFloatingRateIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRateWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRateWritePlatformServiceImpl.java
index 572013c92..40aa99fed 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRateWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRateWritePlatformServiceImpl.java
@@ -40,7 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class FloatingRateWritePlatformServiceImpl implements FloatingRateWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(FloatingRateWritePlatformServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FloatingRateWritePlatformServiceImpl.class);
     private final PlatformSecurityContext context;
     private final FloatingRateDataValidator fromApiJsonDeserializer;
     private final FloatingRateRepositoryWrapper floatingRateRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/fund/service/FundWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/fund/service/FundWritePlatformServiceJpaRepositoryImpl.java
index 1a1581c3b..d0495552e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/fund/service/FundWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/fund/service/FundWritePlatformServiceJpaRepositoryImpl.java
@@ -41,7 +41,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class FundWritePlatformServiceJpaRepositoryImpl implements FundWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(FundWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(FundWritePlatformServiceJpaRepositoryImpl.class);
 
     private final PlatformSecurityContext context;
     private final FundCommandFromApiJsonDeserializer fromApiJsonDeserializer;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/CentersApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/CentersApiResourceSwagger.java
index a08069195..c260f649c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/CentersApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/CentersApiResourceSwagger.java
@@ -31,7 +31,7 @@ final class CentersApiResourceSwagger {
     private CentersApiResourceSwagger() {}
 
     @ApiModel(value = "GetCentersTemplateResponse")
-    public final static class GetCentersTemplateResponse {
+    public static final class GetCentersTemplateResponse {
 
         private GetCentersTemplateResponse() {}
 
@@ -68,7 +68,7 @@ final class CentersApiResourceSwagger {
     }
 
     @ApiModel(value = "GetCentersResponse")
-    public final static class GetCentersResponse {
+    public static final class GetCentersResponse {
 
         private GetCentersResponse() {}
 
@@ -109,7 +109,7 @@ final class CentersApiResourceSwagger {
     }
 
     @ApiModel(value = "GetCentersCenterIdResponse")
-    public final static class GetCentersCenterIdResponse {
+    public static final class GetCentersCenterIdResponse {
 
         private GetCentersCenterIdResponse() {}
 
@@ -129,7 +129,7 @@ final class CentersApiResourceSwagger {
     }
 
     @ApiModel(value = "PostCentersRequest")
-    public final static class PostCentersRequest {
+    public static final class PostCentersRequest {
 
         private PostCentersRequest() {}
 
@@ -142,7 +142,7 @@ final class CentersApiResourceSwagger {
     }
 
     @ApiModel(value = "PostCentersResponse")
-    public final static class PostCentersResponse {
+    public static final class PostCentersResponse {
 
         private PostCentersResponse() {}
 
@@ -155,7 +155,7 @@ final class CentersApiResourceSwagger {
     }
 
     @ApiModel(value = "PutCentersCenterIdRequest")
-    public final static class PutCentersCenterIdRequest {
+    public static final class PutCentersCenterIdRequest {
 
         private PutCentersCenterIdRequest() {}
 
@@ -164,7 +164,7 @@ final class CentersApiResourceSwagger {
     }
 
     @ApiModel(value = "PutCentersCenterIdResponse")
-    public final static class PutCentersCenterIdResponse {
+    public static final class PutCentersCenterIdResponse {
 
         private PutCentersCenterIdResponse() {}
 
@@ -186,7 +186,7 @@ final class CentersApiResourceSwagger {
     }
 
     @ApiModel(value = "DeleteCentersCenterIdResponse")
-    public final static class DeleteCentersCenterIdResponse {
+    public static final class DeleteCentersCenterIdResponse {
 
         private DeleteCentersCenterIdResponse() {}
 
@@ -201,7 +201,7 @@ final class CentersApiResourceSwagger {
     }
 
     @ApiModel(value = "PostCentersCenterIdRequest")
-    public final static class PostCentersCenterIdRequest {
+    public static final class PostCentersCenterIdRequest {
 
         private PostCentersCenterIdRequest() {}
 
@@ -216,7 +216,7 @@ final class CentersApiResourceSwagger {
     }
 
     @ApiModel(value = "PostCentersCenterIdResponse")
-    public final static class PostCentersCenterIdResponse {
+    public static final class PostCentersCenterIdResponse {
 
         private PostCentersCenterIdResponse() {}
 
@@ -225,7 +225,7 @@ final class CentersApiResourceSwagger {
     }
 
     @ApiModel(value = "GetCentersCenterIdAccountsResponse")
-    public final static class GetCentersCenterIdAccountsResponse {
+    public static final class GetCentersCenterIdAccountsResponse {
 
         private GetCentersCenterIdAccountsResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/GroupsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/GroupsApiResourceSwagger.java
index 4b1ed3b2b..670da0940 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/GroupsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/GroupsApiResourceSwagger.java
@@ -31,7 +31,7 @@ final class GroupsApiResourceSwagger {
     private GroupsApiResourceSwagger() {}
 
     @ApiModel(value = "GetGroupsTemplateResponse")
-    public final static class GetGroupsTemplateResponse {
+    public static final class GetGroupsTemplateResponse {
 
         private GetGroupsTemplateResponse() {}
 
@@ -156,7 +156,7 @@ final class GroupsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetGroupsGroupIdResponse")
-    public final static class GetGroupsGroupIdResponse {
+    public static final class GetGroupsGroupIdResponse {
 
         private GetGroupsGroupIdResponse() {}
 
@@ -190,7 +190,7 @@ final class GroupsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostGroupsRequest")
-    public final static class PostGroupsRequest {
+    public static final class PostGroupsRequest {
 
         private PostGroupsRequest() {}
 
@@ -203,7 +203,7 @@ final class GroupsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostGroupsResponse")
-    public final static class PostGroupsResponse {
+    public static final class PostGroupsResponse {
 
         private PostGroupsResponse() {}
 
@@ -216,7 +216,7 @@ final class GroupsApiResourceSwagger {
     }
 
     @ApiModel(value = "DeleteGroupsGroupIdResponse")
-    public final static class DeleteGroupsGroupIdResponse {
+    public static final class DeleteGroupsGroupIdResponse {
 
         private DeleteGroupsGroupIdResponse() {}
 
@@ -229,7 +229,7 @@ final class GroupsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostGroupsGroupIdCommandUnassignStaffRequest")
-    public final static class PostGroupsGroupIdCommandUnassignStaffRequest {
+    public static final class PostGroupsGroupIdCommandUnassignStaffRequest {
 
         private PostGroupsGroupIdCommandUnassignStaffRequest() {}
 
@@ -238,7 +238,7 @@ final class GroupsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostGroupsGroupIdCommandUnassignStaffResponse")
-    public final static class PostGroupsGroupIdCommandUnassignStaffResponse {
+    public static final class PostGroupsGroupIdCommandUnassignStaffResponse {
 
         private PostGroupsGroupIdCommandUnassignStaffResponse() {}
 
@@ -257,7 +257,7 @@ final class GroupsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutGroupsGroupIdRequest")
-    public final static class PutGroupsGroupIdRequest {
+    public static final class PutGroupsGroupIdRequest {
 
         private PutGroupsGroupIdRequest() {}
 
@@ -266,7 +266,7 @@ final class GroupsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutGroupsGroupIdResponse")
-    public final static class PutGroupsGroupIdResponse {
+    public static final class PutGroupsGroupIdResponse {
 
         private PutGroupsGroupIdResponse() {}
 
@@ -288,7 +288,7 @@ final class GroupsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetGroupsGroupIdAccountsResponse")
-    public final static class GetGroupsGroupIdAccountsResponse {
+    public static final class GetGroupsGroupIdAccountsResponse {
 
         private GetGroupsGroupIdAccountsResponse() {}
 
@@ -499,7 +499,7 @@ final class GroupsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostGroupsGroupIdRequest")
-    public final static class PostGroupsGroupIdRequest {
+    public static final class PostGroupsGroupIdRequest {
 
         private PostGroupsGroupIdRequest() {}
 
@@ -517,7 +517,7 @@ final class GroupsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostGroupsGroupIdResponse")
-    public final static class PostGroupsGroupIdResponse {
+    public static final class PostGroupsGroupIdResponse {
 
         private PostGroupsGroupIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/CenterReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/CenterReadPlatformServiceImpl.java
index b95f31031..ac5494098 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/CenterReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/CenterReadPlatformServiceImpl.java
@@ -98,7 +98,7 @@ public class CenterReadPlatformServiceImpl implements CenterReadPlatformService
 
     private final PaginationHelper<CenterData> paginationHelper = new PaginationHelper<>();
     private final PaginationParametersDataValidator paginationParametersDataValidator;
-    private final static Set<String> SUPPORTED_ORDER_BY_VALUES = new HashSet<>(Arrays.asList("id", "name", "officeId", "officeName"));
+    private static final Set<String> SUPPORTED_ORDER_BY_VALUES = new HashSet<>(Arrays.asList("id", "name", "officeId", "officeName"));
 
     @Autowired
     public CenterReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource,
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupReadPlatformServiceImpl.java
index d5508324d..a50f0dcda 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupReadPlatformServiceImpl.java
@@ -73,7 +73,7 @@ public class GroupReadPlatformServiceImpl implements GroupReadPlatformService {
     private final PaginationParametersDataValidator paginationParametersDataValidator;
     private final ColumnValidator columnValidator;
 
-    private final static Set<String> supportedOrderByValues = new HashSet<>(Arrays.asList("id", "name", "officeId", "officeName"));
+    private static final Set<String> supportedOrderByValues = new HashSet<>(Arrays.asList("id", "name", "officeId", "officeName"));
 
     @Autowired
     public GroupReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource,
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupRolesWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupRolesWritePlatformServiceJpaRepositoryImpl.java
index 480eaf750..8c2cedc1b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupRolesWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupRolesWritePlatformServiceJpaRepositoryImpl.java
@@ -44,7 +44,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class GroupRolesWritePlatformServiceJpaRepositoryImpl implements GroupRolesWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(GroupRolesWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(GroupRolesWritePlatformServiceJpaRepositoryImpl.class);
 
     private final PlatformSecurityContext context;
     private final GroupRepositoryWrapper groupRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java
index 286846bdc..37cf4bed2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupingTypesWritePlatformServiceJpaRepositoryImpl.java
@@ -96,7 +96,7 @@ import org.springframework.util.ObjectUtils;
 @Service
 public class GroupingTypesWritePlatformServiceJpaRepositoryImpl implements GroupingTypesWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(GroupingTypesWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(GroupingTypesWritePlatformServiceJpaRepositoryImpl.class);
 
     private final PlatformSecurityContext context;
     private final GroupRepositoryWrapper groupRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/api/InterestRateChartSlabsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/api/InterestRateChartSlabsApiResourceSwagger.java
index cad6724f0..1223b6701 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/api/InterestRateChartSlabsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/api/InterestRateChartSlabsApiResourceSwagger.java
@@ -30,7 +30,7 @@ final class InterestRateChartSlabsApiResourceSwagger {
     private InterestRateChartSlabsApiResourceSwagger() {}
 
     @ApiModel(value = "GetInterestRateChartsChartIdChartSlabsResponse")
-    public final static class GetInterestRateChartsChartIdChartSlabsResponse {
+    public static final class GetInterestRateChartsChartIdChartSlabsResponse {
 
         private GetInterestRateChartsChartIdChartSlabsResponse() {}
 
@@ -154,7 +154,7 @@ final class InterestRateChartSlabsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostInterestRateChartsChartIdChartSlabsResponse")
-    public final static class PostInterestRateChartsChartIdChartSlabsResponse {
+    public static final class PostInterestRateChartsChartIdChartSlabsResponse {
 
         private PostInterestRateChartsChartIdChartSlabsResponse() {}
 
@@ -184,7 +184,7 @@ final class InterestRateChartSlabsApiResourceSwagger {
     }
 
     @ApiModel(value = "DeleteInterestRateChartsChartIdChartSlabsResponse")
-    public final static class DeleteInterestRateChartsChartIdChartSlabsResponse {
+    public static final class DeleteInterestRateChartsChartIdChartSlabsResponse {
 
         private DeleteInterestRateChartsChartIdChartSlabsResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/api/InterestRateChartsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/api/InterestRateChartsApiResourceSwagger.java
index 060f5e381..f5652cca1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/api/InterestRateChartsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/api/InterestRateChartsApiResourceSwagger.java
@@ -31,7 +31,7 @@ final class InterestRateChartsApiResourceSwagger {
     private InterestRateChartsApiResourceSwagger() {}
 
     @ApiModel(value = "GetInterestRateChartsTemplateResponse")
-    public final static class GetInterestRateChartsTemplateResponse {
+    public static final class GetInterestRateChartsTemplateResponse {
 
         private GetInterestRateChartsTemplateResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartSlabWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartSlabWritePlatformServiceJpaRepositoryImpl.java
index 6edd54895..0daeac12e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartSlabWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartSlabWritePlatformServiceJpaRepositoryImpl.java
@@ -40,7 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
 public class InterestRateChartSlabWritePlatformServiceJpaRepositoryImpl implements InterestRateChartSlabWritePlatformService {
 
     @SuppressWarnings("unused")
-    private final static Logger LOG = LoggerFactory.getLogger(InterestRateChartSlabWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(InterestRateChartSlabWritePlatformServiceJpaRepositoryImpl.class);
     @SuppressWarnings("unused")
     private final PlatformSecurityContext context;
     private final InterestRateChartSlabDataValidator interestRateChartSlabDataValidator;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartWritePlatformServiceJpaRepositoryImpl.java
index fa7e15152..7ae7f0b01 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartWritePlatformServiceJpaRepositoryImpl.java
@@ -37,7 +37,7 @@ import org.springframework.transaction.annotation.Transactional;
 public class InterestRateChartWritePlatformServiceJpaRepositoryImpl implements InterestRateChartWritePlatformService {
 
     @SuppressWarnings("unused")
-    private final static Logger LOG = LoggerFactory.getLogger(InterestRateChartWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(InterestRateChartWritePlatformServiceJpaRepositoryImpl.class);
     @SuppressWarnings("unused")
     private final PlatformSecurityContext context;
     private final InterestRateChartDataValidator interestRateChartDataValidator;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanScheduleApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanScheduleApiResourceSwagger.java
index e35824afd..6528b0bb2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanScheduleApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanScheduleApiResourceSwagger.java
@@ -30,13 +30,13 @@ final class LoanScheduleApiResourceSwagger {
     private LoanScheduleApiResourceSwagger() {}
 
     @ApiModel(value = "PostLoansLoanIdScheduleRequest")
-    public final static class PostLoansLoanIdScheduleRequest {
+    public static final class PostLoansLoanIdScheduleRequest {
 
         private PostLoansLoanIdScheduleRequest() {}
     }
 
     @ApiModel(value = "PostLoansLoanIdScheduleResponse")
-    public final static class PostLoansLoanIdScheduleResponse {
+    public static final class PostLoansLoanIdScheduleResponse {
 
         private PostLoansLoanIdScheduleResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanTransactionsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanTransactionsApiResourceSwagger.java
index aeccc4397..0c3ee82a6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanTransactionsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanTransactionsApiResourceSwagger.java
@@ -30,7 +30,7 @@ final class LoanTransactionsApiResourceSwagger {
     private LoanTransactionsApiResourceSwagger() {}
 
     @ApiModel(value = "GetLoansLoanIdTransactionsTemplateResponse")
-    public final static class GetLoansLoanIdTransactionsTemplateResponse {
+    public static final class GetLoansLoanIdTransactionsTemplateResponse {
 
         private GetLoansLoanIdTransactionsTemplateResponse() {}
 
@@ -79,7 +79,7 @@ final class LoanTransactionsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetLoansLoanIdTransactionsTransactionIdResponse")
-    public final static class GetLoansLoanIdTransactionsTransactionIdResponse {
+    public static final class GetLoansLoanIdTransactionsTransactionIdResponse {
 
         private GetLoansLoanIdTransactionsTransactionIdResponse() {}
 
@@ -144,13 +144,13 @@ final class LoanTransactionsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostLoansLoanIdTransactionsRequest")
-    public final static class PostLoansLoanIdTransactionsRequest {
+    public static final class PostLoansLoanIdTransactionsRequest {
 
         private PostLoansLoanIdTransactionsRequest() {}
     }
 
     @ApiModel(value = "PostLoansLoanIdTransactionsResponse")
-    public final static class PostLoansLoanIdTransactionsResponse {
+    public static final class PostLoansLoanIdTransactionsResponse {
 
         private PostLoansLoanIdTransactionsResponse() {}
 
@@ -163,7 +163,7 @@ final class LoanTransactionsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostLoansLoanIdTransactionsTransactionIdRequest")
-    public final static class PostLoansLoanIdTransactionsTransactionIdRequest {
+    public static final class PostLoansLoanIdTransactionsTransactionIdRequest {
 
         private PostLoansLoanIdTransactionsTransactionIdRequest() {}
 
@@ -180,7 +180,7 @@ final class LoanTransactionsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostLoansLoanIdTransactionsTransactionIdResponse")
-    public final static class PostLoansLoanIdTransactionsTransactionIdResponse {
+    public static final class PostLoansLoanIdTransactionsTransactionIdResponse {
 
         private PostLoansLoanIdTransactionsTransactionIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java
index ec8f5d0a4..875521b40 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResourceSwagger.java
@@ -31,7 +31,7 @@ final class LoansApiResourceSwagger {
     private LoansApiResourceSwagger() {}
 
     @ApiModel(value = "GetLoansTemplateResponse")
-    public final static class GetLoansTemplateResponse {
+    public static final class GetLoansTemplateResponse {
 
         private GetLoansTemplateResponse() {}
 
@@ -64,7 +64,7 @@ final class LoansApiResourceSwagger {
     }
 
     @ApiModel(value = "GetLoansLoanIdResponse")
-    public final static class GetLoansLoanIdResponse {
+    public static final class GetLoansLoanIdResponse {
 
         private GetLoansLoanIdResponse() {}
 
@@ -472,7 +472,7 @@ final class LoansApiResourceSwagger {
     }
 
     @ApiModel(value = "GetLoansResponse")
-    public final static class GetLoansResponse {
+    public static final class GetLoansResponse {
 
         private GetLoansResponse() {}
 
@@ -580,7 +580,7 @@ final class LoansApiResourceSwagger {
     }
 
     @ApiModel(value = "PutLoansLoanIdRequest")
-    public final static class PutLoansLoanIdRequest {
+    public static final class PutLoansLoanIdRequest {
 
         private PutLoansLoanIdRequest() {}
 
@@ -617,7 +617,7 @@ final class LoansApiResourceSwagger {
     }
 
     @ApiModel(value = "PutLoansLoanIdResponse")
-    public final static class PutLoansLoanIdResponse {
+    public static final class PutLoansLoanIdResponse {
 
         private PutLoansLoanIdResponse() {}
 
@@ -658,7 +658,7 @@ final class LoansApiResourceSwagger {
     }
 
     @ApiModel(value = "PostLoansLoanIdRequest")
-    public final static class PostLoansLoanIdRequest {
+    public static final class PostLoansLoanIdRequest {
 
         private PostLoansLoanIdRequest() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformServiceJpaRepositoryIImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformServiceJpaRepositoryIImpl.java
index ed727e5d4..d1572d355 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformServiceJpaRepositoryIImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorWritePlatformServiceJpaRepositoryIImpl.java
@@ -64,7 +64,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class GuarantorWritePlatformServiceJpaRepositoryIImpl implements GuarantorWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(GuarantorWritePlatformServiceJpaRepositoryIImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(GuarantorWritePlatformServiceJpaRepositoryIImpl.class);
 
     private final ClientRepositoryWrapper clientRepositoryWrapper;
     private final StaffRepositoryWrapper staffRepositoryWrapper;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/RescheduleLoansApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/RescheduleLoansApiConstants.java
index 1d190dfe7..3904fa8da 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/RescheduleLoansApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/RescheduleLoansApiConstants.java
@@ -25,7 +25,7 @@ import java.util.Set;
 
 public class RescheduleLoansApiConstants {
 
-    public final static String ENTITY_NAME = "RESCHEDULELOAN";
+    public static final String ENTITY_NAME = "RESCHEDULELOAN";
 
     public static final String LOAN_RESCHEDULE_REASON = "LoanRescheduleReason";
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestWritePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestWritePlatformServiceImpl.java
index 86263b773..1b85773d6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestWritePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/service/LoanRescheduleRequestWritePlatformServiceImpl.java
@@ -92,7 +92,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class LoanRescheduleRequestWritePlatformServiceImpl implements LoanRescheduleRequestWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LoanRescheduleRequestWritePlatformServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoanRescheduleRequestWritePlatformServiceImpl.class);
 
     private final CodeValueRepositoryWrapper codeValueRepositoryWrapper;
     private final PlatformSecurityContext platformSecurityContext;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualPlatformServiceImpl.java
index bb19ad1d4..e78c77cc5 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAccrualPlatformServiceImpl.java
@@ -37,7 +37,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class LoanAccrualPlatformServiceImpl implements LoanAccrualPlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LoanAccrualPlatformServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoanAccrualPlatformServiceImpl.class);
 
     private final LoanReadPlatformService loanReadPlatformService;
     private final LoanAccrualWritePlatformService loanAccrualWritePlatformService;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java
index 4fbfb7e0d..b62b7bd13 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java
@@ -149,7 +149,7 @@ import org.springframework.util.CollectionUtils;
 @Service
 public class LoanApplicationWritePlatformServiceJpaRepositoryImpl implements LoanApplicationWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LoanApplicationWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoanApplicationWritePlatformServiceJpaRepositoryImpl.class);
 
     private final PlatformSecurityContext context;
     private final FromJsonHelper fromJsonHelper;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanArrearsAgingServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanArrearsAgingServiceImpl.java
index a88d255c4..67e01ca28 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanArrearsAgingServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanArrearsAgingServiceImpl.java
@@ -56,7 +56,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class LoanArrearsAgingServiceImpl implements LoanArrearsAgingService, BusinessEventListner {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LoanArrearsAgingServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoanArrearsAgingServiceImpl.class);
     private final BusinessEventNotifierService businessEventNotifierService;
     private final DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd");
     private final JdbcTemplate jdbcTemplate;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanSchedularServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanSchedularServiceImpl.java
index 795065f27..4f6044ab9 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanSchedularServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanSchedularServiceImpl.java
@@ -54,7 +54,7 @@ import org.springframework.util.CollectionUtils;
 @Service
 public class LoanSchedularServiceImpl implements LoanSchedularService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LoanSchedularServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoanSchedularServiceImpl.class);
 
     private final ConfigurationDomainService configurationDomainService;
     private final LoanReadPlatformService loanReadPlatformService;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
index f973aa941..ef31aee14 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
@@ -196,7 +196,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LoanWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoanWritePlatformServiceJpaRepositoryImpl.class);
 
     private final PlatformSecurityContext context;
     private final LoanEventApiJsonValidator loanEventApiJsonValidator;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/RecalculateInterestPoster.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/RecalculateInterestPoster.java
index 592b87c89..7a867057a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/RecalculateInterestPoster.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/RecalculateInterestPoster.java
@@ -36,7 +36,7 @@ import org.springframework.stereotype.Component;
 @Scope("prototype")
 public class RecalculateInterestPoster implements Callable<Void> {
 
-    private final static Logger LOG = LoggerFactory.getLogger(RecalculateInterestPoster.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RecalculateInterestPoster.class);
 
     private Collection<Long> loanIds;
     private LoanWritePlatformService loanWritePlatformService;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java
index c241720f2..abc5decd1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/api/LoanProductsApiResourceSwagger.java
@@ -32,7 +32,7 @@ final class LoanProductsApiResourceSwagger {
     private LoanProductsApiResourceSwagger() {}
 
     @ApiModel(value = "PostLoanProductsRequest")
-    public final static class PostLoanProductsRequest {
+    public static final class PostLoanProductsRequest {
 
         private PostLoanProductsRequest() {}
 
@@ -99,7 +99,7 @@ final class LoanProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostLoanProductsResponse")
-    public final static class PostLoanProductsResponse {
+    public static final class PostLoanProductsResponse {
 
         private PostLoanProductsResponse() {}
 
@@ -108,7 +108,7 @@ final class LoanProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetLoanProductsResponse")
-    public final static class GetLoanProductsResponse {
+    public static final class GetLoanProductsResponse {
 
         private GetLoanProductsResponse() {}
 
@@ -354,7 +354,7 @@ final class LoanProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetLoanProductsTemplateResponse")
-    public final static class GetLoanProductsTemplateResponse {
+    public static final class GetLoanProductsTemplateResponse {
 
         private GetLoanProductsTemplateResponse() {}
 
@@ -807,7 +807,7 @@ final class LoanProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetLoanProductsProductIdResponse")
-    public final static class GetLoanProductsProductIdResponse {
+    public static final class GetLoanProductsProductIdResponse {
 
         private GetLoanProductsProductIdResponse() {}
 
@@ -1075,7 +1075,7 @@ final class LoanProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutLoanProductsProductIdRequest")
-    public final static class PutLoanProductsProductIdRequest {
+    public static final class PutLoanProductsProductIdRequest {
 
         private PutLoanProductsProductIdRequest() {}
 
@@ -1086,7 +1086,7 @@ final class LoanProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutLoanProductsProductIdResponse")
-    public final static class PutLoanProductsProductIdResponse {
+    public static final class PutLoanProductsProductIdResponse {
 
         private PutLoanProductsProductIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/service/ProductMixWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/service/ProductMixWritePlatformServiceJpaRepositoryImpl.java
index a5f5be454..ba95ee9d6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/service/ProductMixWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/productmix/service/ProductMixWritePlatformServiceJpaRepositoryImpl.java
@@ -49,7 +49,7 @@ import org.springframework.util.CollectionUtils;
 @Service
 public class ProductMixWritePlatformServiceJpaRepositoryImpl implements ProductMixWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ProductMixWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ProductMixWritePlatformServiceJpaRepositoryImpl.class);
     private final PlatformSecurityContext context;
     private final ProductMixDataValidator fromApiJsonDeserializer;
     private final ProductMixRepository productMixRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductWritePlatformServiceJpaRepositoryImpl.java
index 2e726ebff..a76dcaed5 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductWritePlatformServiceJpaRepositoryImpl.java
@@ -71,7 +71,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class LoanProductWritePlatformServiceJpaRepositoryImpl implements LoanProductWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(LoanProductWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LoanProductWritePlatformServiceJpaRepositoryImpl.class);
     private final PlatformSecurityContext context;
     private final LoanProductDataValidator fromApiJsonDeserializer;
     private final LoanProductRepository loanProductRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/api/NotesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/api/NotesApiResourceSwagger.java
index 588b22206..c5f0a22bd 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/api/NotesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/api/NotesApiResourceSwagger.java
@@ -30,7 +30,7 @@ final class NotesApiResourceSwagger {
     private NotesApiResourceSwagger() {}
 
     @ApiModel(value = "GetResourceTypeResourceIdNotesResponse")
-    public final static class GetResourceTypeResourceIdNotesResponse {
+    public static final class GetResourceTypeResourceIdNotesResponse {
 
         private GetResourceTypeResourceIdNotesResponse() {}
 
@@ -68,7 +68,7 @@ final class NotesApiResourceSwagger {
     }
 
     @ApiModel(value = "GetResourceTypeResourceIdNotesNoteIdResponse")
-    public final static class GetResourceTypeResourceIdNotesNoteIdResponse {
+    public static final class GetResourceTypeResourceIdNotesNoteIdResponse {
 
         private GetResourceTypeResourceIdNotesNoteIdResponse() {}
 
@@ -94,7 +94,7 @@ final class NotesApiResourceSwagger {
     }
 
     @ApiModel(value = "PostResourceTypeResourceIdNotesRequest")
-    public final static class PostResourceTypeResourceIdNotesRequest {
+    public static final class PostResourceTypeResourceIdNotesRequest {
 
         private PostResourceTypeResourceIdNotesRequest() {}
 
@@ -103,7 +103,7 @@ final class NotesApiResourceSwagger {
     }
 
     @ApiModel(value = "PostResourceTypeResourceIdNotesResponse")
-    public final static class PostResourceTypeResourceIdNotesResponse {
+    public static final class PostResourceTypeResourceIdNotesResponse {
 
         private PostResourceTypeResourceIdNotesResponse() {}
 
@@ -116,7 +116,7 @@ final class NotesApiResourceSwagger {
     }
 
     @ApiModel(value = "PutResourceTypeResourceIdNotesNoteIdRequest")
-    public final static class PutResourceTypeResourceIdNotesNoteIdRequest {
+    public static final class PutResourceTypeResourceIdNotesNoteIdRequest {
 
         private PutResourceTypeResourceIdNotesNoteIdRequest() {}
 
@@ -125,7 +125,7 @@ final class NotesApiResourceSwagger {
     }
 
     @ApiModel(value = "PutResourceTypeResourceIdNotesNoteIdResponse")
-    public final static class PutResourceTypeResourceIdNotesNoteIdResponse {
+    public static final class PutResourceTypeResourceIdNotesNoteIdResponse {
 
         private PutResourceTypeResourceIdNotesNoteIdResponse() {}
 
@@ -147,7 +147,7 @@ final class NotesApiResourceSwagger {
     }
 
     @ApiModel(value = "DeleteResourceTypeResourceIdNotesNoteIdResponse")
-    public final static class DeleteResourceTypeResourceIdNotesNoteIdResponse {
+    public static final class DeleteResourceTypeResourceIdNotesNoteIdResponse {
 
         private DeleteResourceTypeResourceIdNotesNoteIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResourceSwagger.java
index c1e10e79e..48ee1e7a3 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResourceSwagger.java
@@ -29,7 +29,7 @@ final class PaymentTypeApiResourceSwagger {
     private PaymentTypeApiResourceSwagger() {}
 
     @ApiModel(value = "GetPaymentTypesResponse")
-    public final static class GetPaymentTypesResponse {
+    public static final class GetPaymentTypesResponse {
 
         private GetPaymentTypesResponse() {}
 
@@ -46,7 +46,7 @@ final class PaymentTypeApiResourceSwagger {
     }
 
     @ApiModel(value = "GetPaymentTypesPaymentTypeIdResponse")
-    public final static class GetPaymentTypesPaymentTypeIdResponse {
+    public static final class GetPaymentTypesPaymentTypeIdResponse {
 
         private GetPaymentTypesPaymentTypeIdResponse() {}
 
@@ -63,7 +63,7 @@ final class PaymentTypeApiResourceSwagger {
     }
 
     @ApiModel(value = "PostPaymentTypesRequest")
-    public final static class PostPaymentTypesRequest {
+    public static final class PostPaymentTypesRequest {
 
         private PostPaymentTypesRequest() {}
 
@@ -78,7 +78,7 @@ final class PaymentTypeApiResourceSwagger {
     }
 
     @ApiModel(value = "PostPaymentTypesResponse")
-    public final static class PostPaymentTypesResponse {
+    public static final class PostPaymentTypesResponse {
 
         private PostPaymentTypesResponse() {}
 
@@ -87,7 +87,7 @@ final class PaymentTypeApiResourceSwagger {
     }
 
     @ApiModel(value = "PutPaymentTypesPaymentTypeIdRequest")
-    public final static class PutPaymentTypesPaymentTypeIdRequest {
+    public static final class PutPaymentTypesPaymentTypeIdRequest {
 
         private PutPaymentTypesPaymentTypeIdRequest() {}
 
@@ -102,7 +102,7 @@ final class PaymentTypeApiResourceSwagger {
     }
 
     @ApiModel(value = "PutPaymentTypesPaymentTypeIdResponse")
-    public final static class PutPaymentTypesPaymentTypeIdResponse {
+    public static final class PutPaymentTypesPaymentTypeIdResponse {
 
         private PutPaymentTypesPaymentTypeIdResponse() {}
 
@@ -111,7 +111,7 @@ final class PaymentTypeApiResourceSwagger {
     }
 
     @ApiModel(value = "DeletePaymentTypesPaymentTypeIdResponse")
-    public final static class DeletePaymentTypesPaymentTypeIdResponse {
+    public static final class DeletePaymentTypesPaymentTypeIdResponse {
 
         private DeletePaymentTypesPaymentTypeIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/api/ProductsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/api/ProductsApiResourceSwagger.java
index 174225275..82ed03450 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/api/ProductsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/products/api/ProductsApiResourceSwagger.java
@@ -30,7 +30,7 @@ final class ProductsApiResourceSwagger {
     private ProductsApiResourceSwagger() {}
 
     @ApiModel(value = "GetProductsTypeProductIdResponse")
-    public final static class GetProductsTypeProductIdResponse {
+    public static final class GetProductsTypeProductIdResponse {
 
         private GetProductsTypeProductIdResponse() {}
 
@@ -482,7 +482,7 @@ final class ProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostProductsTypeRequest")
-    public final static class PostProductsTypeRequest {
+    public static final class PostProductsTypeRequest {
 
         private PostProductsTypeRequest() {}
 
@@ -551,7 +551,7 @@ final class ProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostProductsTypeResponse")
-    public final static class PostProductsTypeResponse {
+    public static final class PostProductsTypeResponse {
 
         private PostProductsTypeResponse() {}
 
@@ -560,7 +560,7 @@ final class ProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutProductsTypeProductIdRequest")
-    public final static class PutProductsTypeProductIdRequest {
+    public static final class PutProductsTypeProductIdRequest {
 
         private PutProductsTypeProductIdRequest() {}
 
@@ -573,7 +573,7 @@ final class ProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutProductsTypeProductIdResponse")
-    public final static class PutProductsTypeProductIdResponse {
+    public static final class PutProductsTypeProductIdResponse {
 
         private PutProductsTypeProductIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateWriteServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateWriteServiceImpl.java
index aac4699ab..3fb703a1b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateWriteServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateWriteServiceImpl.java
@@ -48,7 +48,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class RateWriteServiceImpl implements RateWriteService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(RateWriteServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RateWriteServiceImpl.class);
 
     private final RateRepository rateRepository;
     private final AppUserRepository appUserRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositAccountsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositAccountsApiResourceSwagger.java
index e8af96279..7dcd311d5 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositAccountsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositAccountsApiResourceSwagger.java
@@ -31,7 +31,7 @@ final class FixedDepositAccountsApiResourceSwagger {
     private FixedDepositAccountsApiResourceSwagger() {}
 
     @ApiModel(value = "GetFixedDepositAccountsTemplateResponse")
-    public final static class GetFixedDepositAccountsTemplateResponse {
+    public static final class GetFixedDepositAccountsTemplateResponse {
 
         private GetFixedDepositAccountsTemplateResponse() {}
 
@@ -53,7 +53,7 @@ final class FixedDepositAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetFixedDepositAccountsResponse")
-    public final static class GetFixedDepositAccountsResponse {
+    public static final class GetFixedDepositAccountsResponse {
 
         private GetFixedDepositAccountsResponse() {}
 
@@ -258,7 +258,7 @@ final class FixedDepositAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostFixedDepositAccountsRequest")
-    public final static class PostFixedDepositAccountsRequest {
+    public static final class PostFixedDepositAccountsRequest {
 
         private PostFixedDepositAccountsRequest() {}
 
@@ -281,7 +281,7 @@ final class FixedDepositAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostFixedDepositAccountsResponse")
-    public final static class PostFixedDepositAccountsResponse {
+    public static final class PostFixedDepositAccountsResponse {
 
         private PostFixedDepositAccountsResponse() {}
 
@@ -296,7 +296,7 @@ final class FixedDepositAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetFixedDepositAccountsAccountIdResponse")
-    public final static class GetFixedDepositAccountsAccountIdResponse {
+    public static final class GetFixedDepositAccountsAccountIdResponse {
 
         private GetFixedDepositAccountsAccountIdResponse() {}
 
@@ -450,7 +450,7 @@ final class FixedDepositAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutFixedDepositAccountsAccountIdRequest")
-    public final static class PutFixedDepositAccountsAccountIdRequest {
+    public static final class PutFixedDepositAccountsAccountIdRequest {
 
         private PutFixedDepositAccountsAccountIdRequest() {}
 
@@ -461,7 +461,7 @@ final class FixedDepositAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutFixedDepositAccountsAccountIdResponse")
-    public final static class PutFixedDepositAccountsAccountIdResponse {
+    public static final class PutFixedDepositAccountsAccountIdResponse {
 
         private PutFixedDepositAccountsAccountIdResponse() {}
 
@@ -487,13 +487,13 @@ final class FixedDepositAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostFixedDepositAccountsAccountIdRequest")
-    public final static class PostFixedDepositAccountsAccountIdRequest {
+    public static final class PostFixedDepositAccountsAccountIdRequest {
 
         private PostFixedDepositAccountsAccountIdRequest() {}
     }
 
     @ApiModel(value = "PostFixedDepositAccountsAccountIdResponse")
-    public final static class PostFixedDepositAccountsAccountIdResponse {
+    public static final class PostFixedDepositAccountsAccountIdResponse {
 
         private PostFixedDepositAccountsAccountIdResponse() {}
 
@@ -508,7 +508,7 @@ final class FixedDepositAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "DeleteFixedDepositAccountsAccountIdResponse")
-    public final static class DeleteFixedDepositAccountsAccountIdResponse {
+    public static final class DeleteFixedDepositAccountsAccountIdResponse {
 
         private DeleteFixedDepositAccountsAccountIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositProductsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositProductsApiResourceSwagger.java
index ef1ab62da..ce1daa7b8 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositProductsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/FixedDepositProductsApiResourceSwagger.java
@@ -31,7 +31,7 @@ final class FixedDepositProductsApiResourceSwagger {
     private FixedDepositProductsApiResourceSwagger() {}
 
     @ApiModel(value = "PostFixedDepositProductsRequest")
-    public final static class PostFixedDepositProductsRequest {
+    public static final class PostFixedDepositProductsRequest {
 
         private PostFixedDepositProductsRequest() {}
 
@@ -106,7 +106,7 @@ final class FixedDepositProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostFixedDepositProductsResponse")
-    public final static class PostFixedDepositProductsResponse {
+    public static final class PostFixedDepositProductsResponse {
 
         private PostFixedDepositProductsResponse() {}
 
@@ -115,7 +115,7 @@ final class FixedDepositProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutFixedDepositProductsProductIdRequest")
-    public final static class PutFixedDepositProductsProductIdRequest {
+    public static final class PutFixedDepositProductsProductIdRequest {
 
         private PutFixedDepositProductsProductIdRequest() {}
 
@@ -130,7 +130,7 @@ final class FixedDepositProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutFixedDepositProductsProductIdResponse")
-    public final static class PutFixedDepositProductsProductIdResponse {
+    public static final class PutFixedDepositProductsProductIdResponse {
 
         private PutFixedDepositProductsProductIdResponse() {}
 
@@ -150,7 +150,7 @@ final class FixedDepositProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetFixedDepositProductsResponse")
-    public final static class GetFixedDepositProductsResponse {
+    public static final class GetFixedDepositProductsResponse {
 
         private GetFixedDepositProductsResponse() {}
 
@@ -285,7 +285,7 @@ final class FixedDepositProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetFixedDepositProductsProductIdResponse")
-    public final static class GetFixedDepositProductsProductIdResponse {
+    public static final class GetFixedDepositProductsProductIdResponse {
 
         private GetFixedDepositProductsProductIdResponse() {}
 
@@ -572,7 +572,7 @@ final class FixedDepositProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "DeleteFixedDepositProductsProductIdResponse")
-    public final static class DeleteFixedDepositProductsProductIdResponse {
+    public static final class DeleteFixedDepositProductsProductIdResponse {
 
         private DeleteFixedDepositProductsProductIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountTransactionsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountTransactionsApiResourceSwagger.java
index d775236b9..f3ce1ee04 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountTransactionsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountTransactionsApiResourceSwagger.java
@@ -32,7 +32,7 @@ final class RecurringDepositAccountTransactionsApiResourceSwagger {
     private RecurringDepositAccountTransactionsApiResourceSwagger() {}
 
     @ApiModel(value = "GetRecurringDepositAccountsRecurringDepositAccountIdTransactionsTemplateResponse")
-    public final static class GetRecurringDepositAccountsRecurringDepositAccountIdTransactionsTemplateResponse {
+    public static final class GetRecurringDepositAccountsRecurringDepositAccountIdTransactionsTemplateResponse {
 
         private GetRecurringDepositAccountsRecurringDepositAccountIdTransactionsTemplateResponse() {}
 
@@ -109,7 +109,7 @@ final class RecurringDepositAccountTransactionsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetRecurringDepositAccountsRecurringDepositAccountIdTransactionsTransactionIdResponse")
-    public final static class GetRecurringDepositAccountsRecurringDepositAccountIdTransactionsTransactionIdResponse {
+    public static final class GetRecurringDepositAccountsRecurringDepositAccountIdTransactionsTransactionIdResponse {
 
         private GetRecurringDepositAccountsRecurringDepositAccountIdTransactionsTransactionIdResponse() {}
 
@@ -202,7 +202,7 @@ final class RecurringDepositAccountTransactionsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostRecurringDepositAccountsRecurringDepositAccountIdTransactionsRequest")
-    public final static class PostRecurringDepositAccountsRecurringDepositAccountIdTransactionsRequest {
+    public static final class PostRecurringDepositAccountsRecurringDepositAccountIdTransactionsRequest {
 
         private PostRecurringDepositAccountsRecurringDepositAccountIdTransactionsRequest() {}
 
@@ -229,7 +229,7 @@ final class RecurringDepositAccountTransactionsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostRecurringDepositAccountsRecurringDepositAccountIdTransactionsResponse")
-    public final static class PostRecurringDepositAccountsRecurringDepositAccountIdTransactionsResponse {
+    public static final class PostRecurringDepositAccountsRecurringDepositAccountIdTransactionsResponse {
 
         private PostRecurringDepositAccountsRecurringDepositAccountIdTransactionsResponse() {}
 
@@ -261,7 +261,7 @@ final class RecurringDepositAccountTransactionsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostRecurringDepositAccountsRecurringDepositAccountIdTransactionsTransactionIdResponse")
-    public final static class PostRecurringDepositAccountsRecurringDepositAccountIdTransactionsTransactionIdResponse {
+    public static final class PostRecurringDepositAccountsRecurringDepositAccountIdTransactionsTransactionIdResponse {
 
         private PostRecurringDepositAccountsRecurringDepositAccountIdTransactionsTransactionIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountsApiResourceSwagger.java
index 1cb72dbf6..eff026f4f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositAccountsApiResourceSwagger.java
@@ -31,7 +31,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
     private RecurringDepositAccountsApiResourceSwagger() {}
 
     @ApiModel(value = "GetRecurringDepositAccountsTemplateResponse")
-    public final static class GetRecurringDepositAccountsTemplateResponse {
+    public static final class GetRecurringDepositAccountsTemplateResponse {
 
         private GetRecurringDepositAccountsTemplateResponse() {}
 
@@ -53,7 +53,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetRecurringDepositAccountsResponse")
-    public final static class GetRecurringDepositAccountsResponse {
+    public static final class GetRecurringDepositAccountsResponse {
 
         private GetRecurringDepositAccountsResponse() {}
 
@@ -273,7 +273,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostRecurringDepositAccountsRequest")
-    public final static class PostRecurringDepositAccountsRequest {
+    public static final class PostRecurringDepositAccountsRequest {
 
         private PostRecurringDepositAccountsRequest() {}
 
@@ -304,7 +304,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostRecurringDepositAccountsResponse")
-    public final static class PostRecurringDepositAccountsResponse {
+    public static final class PostRecurringDepositAccountsResponse {
 
         private PostRecurringDepositAccountsResponse() {}
 
@@ -319,7 +319,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetRecurringDepositAccountsAccountIdResponse")
-    public final static class GetRecurringDepositAccountsAccountIdResponse {
+    public static final class GetRecurringDepositAccountsAccountIdResponse {
 
         private GetRecurringDepositAccountsAccountIdResponse() {}
 
@@ -443,7 +443,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutRecurringDepositAccountsAccountIdRequest")
-    public final static class PutRecurringDepositAccountsAccountIdRequest {
+    public static final class PutRecurringDepositAccountsAccountIdRequest {
 
         private PutRecurringDepositAccountsAccountIdRequest() {}
 
@@ -454,7 +454,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutRecurringDepositAccountsAccountIdResponse")
-    public final static class PutRecurringDepositAccountsAccountIdResponse {
+    public static final class PutRecurringDepositAccountsAccountIdResponse {
 
         private PutRecurringDepositAccountsAccountIdResponse() {}
 
@@ -480,13 +480,13 @@ final class RecurringDepositAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostRecurringDepositAccountsAccountIdRequest")
-    public final static class PostRecurringDepositAccountsAccountIdRequest {
+    public static final class PostRecurringDepositAccountsAccountIdRequest {
 
         private PostRecurringDepositAccountsAccountIdRequest() {}
     }
 
     @ApiModel(value = "PostRecurringDepositAccountsAccountIdResponse")
-    public final static class PostRecurringDepositAccountsAccountIdResponse {
+    public static final class PostRecurringDepositAccountsAccountIdResponse {
 
         private PostRecurringDepositAccountsAccountIdResponse() {}
 
@@ -501,7 +501,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "DeleteRecurringDepositAccountsResponse")
-    public final static class DeleteRecurringDepositAccountsResponse {
+    public static final class DeleteRecurringDepositAccountsResponse {
 
         private DeleteRecurringDepositAccountsResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositProductsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositProductsApiResourceSwagger.java
index 81382ed59..4b9bcbe6c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositProductsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/RecurringDepositProductsApiResourceSwagger.java
@@ -31,7 +31,7 @@ final class RecurringDepositProductsApiResourceSwagger {
     private RecurringDepositProductsApiResourceSwagger() {}
 
     @ApiModel(value = "PostRecurringDepositProductsRequest")
-    public final static class PostRecurringDepositProductsRequest {
+    public static final class PostRecurringDepositProductsRequest {
 
         private PostRecurringDepositProductsRequest() {}
 
@@ -116,7 +116,7 @@ final class RecurringDepositProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostRecurringDepositProductsResponse")
-    public final static class PostRecurringDepositProductsResponse {
+    public static final class PostRecurringDepositProductsResponse {
 
         private PostRecurringDepositProductsResponse() {}
 
@@ -125,7 +125,7 @@ final class RecurringDepositProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutRecurringDepositProductsRequest")
-    public final static class PutRecurringDepositProductsRequest {
+    public static final class PutRecurringDepositProductsRequest {
 
         private PutRecurringDepositProductsRequest() {}
 
@@ -140,7 +140,7 @@ final class RecurringDepositProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutRecurringDepositProductsResponse")
-    public final static class PutRecurringDepositProductsResponse {
+    public static final class PutRecurringDepositProductsResponse {
 
         private PutRecurringDepositProductsResponse() {}
 
@@ -160,7 +160,7 @@ final class RecurringDepositProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetRecurringDepositProductsResponse")
-    public final static class GetRecurringDepositProductsResponse {
+    public static final class GetRecurringDepositProductsResponse {
 
         private GetRecurringDepositProductsResponse() {}
 
@@ -310,7 +310,7 @@ final class RecurringDepositProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetRecurringDepositProductsProductIdResponse")
-    public final static class GetRecurringDepositProductsProductIdResponse {
+    public static final class GetRecurringDepositProductsProductIdResponse {
 
         private GetRecurringDepositProductsProductIdResponse() {}
 
@@ -600,7 +600,7 @@ final class RecurringDepositProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "DeleteRecurringDepositProductsProductIdResponse")
-    public final static class DeleteRecurringDepositProductsProductIdResponse {
+    public static final class DeleteRecurringDepositProductsProductIdResponse {
 
         private DeleteRecurringDepositProductsProductIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountChargesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountChargesApiResourceSwagger.java
index 4c5a55ec6..5f3cc657b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountChargesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountChargesApiResourceSwagger.java
@@ -30,7 +30,7 @@ final class SavingsAccountChargesApiResourceSwagger {
     private SavingsAccountChargesApiResourceSwagger() {}
 
     @ApiModel(value = "GetSavingsAccountsSavingsAccountIdChargesResponse")
-    public final static class GetSavingsAccountsSavingsAccountIdChargesResponse {
+    public static final class GetSavingsAccountsSavingsAccountIdChargesResponse {
 
         private GetSavingsAccountsSavingsAccountIdChargesResponse() {}
 
@@ -106,7 +106,7 @@ final class SavingsAccountChargesApiResourceSwagger {
     }
 
     @ApiModel(value = "GetSavingsAccountsSavingsAccountIdChargesTemplateResponse")
-    public final static class GetSavingsAccountsSavingsAccountIdChargesTemplateResponse {
+    public static final class GetSavingsAccountsSavingsAccountIdChargesTemplateResponse {
 
         private GetSavingsAccountsSavingsAccountIdChargesTemplateResponse() {}
 
@@ -166,7 +166,7 @@ final class SavingsAccountChargesApiResourceSwagger {
     }
 
     @ApiModel(value = "GetSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdResponse")
-    public final static class GetSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdResponse {
+    public static final class GetSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdResponse {
 
         private GetSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdResponse() {}
 
@@ -200,7 +200,7 @@ final class SavingsAccountChargesApiResourceSwagger {
     }
 
     @ApiModel(value = "PostSavingsAccountsSavingsAccountIdChargesRequest")
-    public final static class PostSavingsAccountsSavingsAccountIdChargesRequest {
+    public static final class PostSavingsAccountsSavingsAccountIdChargesRequest {
 
         private PostSavingsAccountsSavingsAccountIdChargesRequest() {}
 
@@ -217,7 +217,7 @@ final class SavingsAccountChargesApiResourceSwagger {
     }
 
     @ApiModel(value = "PostSavingsAccountsSavingsAccountIdChargesResponse")
-    public final static class PostSavingsAccountsSavingsAccountIdChargesResponse {
+    public static final class PostSavingsAccountsSavingsAccountIdChargesResponse {
 
         private PostSavingsAccountsSavingsAccountIdChargesResponse() {}
 
@@ -232,7 +232,7 @@ final class SavingsAccountChargesApiResourceSwagger {
     }
 
     @ApiModel(value = "PutSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdRequest")
-    public final static class PutSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdRequest {
+    public static final class PutSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdRequest {
 
         private PutSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdRequest() {}
 
@@ -247,7 +247,7 @@ final class SavingsAccountChargesApiResourceSwagger {
     }
 
     @ApiModel(value = "PutSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdResponse")
-    public final static class PutSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdResponse {
+    public static final class PutSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdResponse {
 
         private PutSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdResponse() {}
 
@@ -277,7 +277,7 @@ final class SavingsAccountChargesApiResourceSwagger {
     }
 
     @ApiModel(value = "PostSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdRequest")
-    public final static class PostSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdRequest {
+    public static final class PostSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdRequest {
 
         private PostSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdRequest() {}
 
@@ -292,7 +292,7 @@ final class SavingsAccountChargesApiResourceSwagger {
     }
 
     @ApiModel(value = "PostSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdResponse")
-    public final static class PostSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdResponse {
+    public static final class PostSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdResponse {
 
         private PostSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdResponse() {}
 
@@ -307,7 +307,7 @@ final class SavingsAccountChargesApiResourceSwagger {
     }
 
     @ApiModel(value = "DeleteSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdResponse")
-    public final static class DeleteSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdResponse {
+    public static final class DeleteSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdResponse {
 
         private DeleteSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountsApiResourceSwagger.java
index 0c366b6f4..420c792a7 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsAccountsApiResourceSwagger.java
@@ -31,7 +31,7 @@ final class SavingsAccountsApiResourceSwagger {
     private SavingsAccountsApiResourceSwagger() {}
 
     @ApiModel(value = "GetSavingsAccountsTemplateResponse")
-    public final static class GetSavingsAccountsTemplateResponse {
+    public static final class GetSavingsAccountsTemplateResponse {
 
         private GetSavingsAccountsTemplateResponse() {}
 
@@ -53,7 +53,7 @@ final class SavingsAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetSavingsAccountsResponse")
-    public final static class GetSavingsAccountsResponse {
+    public static final class GetSavingsAccountsResponse {
 
         private GetSavingsAccountsResponse() {}
 
@@ -201,7 +201,7 @@ final class SavingsAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostSavingsAccountsRequest")
-    public final static class PostSavingsAccountsRequest {
+    public static final class PostSavingsAccountsRequest {
 
         private PostSavingsAccountsRequest() {}
 
@@ -218,7 +218,7 @@ final class SavingsAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostSavingsAccountsResponse")
-    public final static class PostSavingsAccountsResponse {
+    public static final class PostSavingsAccountsResponse {
 
         private PostSavingsAccountsResponse() {}
 
@@ -233,7 +233,7 @@ final class SavingsAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetSavingsAccountsAccountIdResponse")
-    public final static class GetSavingsAccountsAccountIdResponse {
+    public static final class GetSavingsAccountsAccountIdResponse {
 
         private GetSavingsAccountsAccountIdResponse() {}
 
@@ -275,7 +275,7 @@ final class SavingsAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutSavingsAccountsAccountIdRequest")
-    public final static class PutSavingsAccountsAccountIdRequest {
+    public static final class PutSavingsAccountsAccountIdRequest {
 
         private PutSavingsAccountsAccountIdRequest() {}
 
@@ -286,7 +286,7 @@ final class SavingsAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutSavingsAccountsAccountIdResponse")
-    public final static class PutSavingsAccountsAccountIdResponse {
+    public static final class PutSavingsAccountsAccountIdResponse {
 
         private PutSavingsAccountsAccountIdResponse() {}
 
@@ -312,7 +312,7 @@ final class SavingsAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostSavingsAccountsAccountIdRequest")
-    public final static class PostSavingsAccountsAccountIdRequest {
+    public static final class PostSavingsAccountsAccountIdRequest {
 
         private PostSavingsAccountsAccountIdRequest() {}
 
@@ -325,7 +325,7 @@ final class SavingsAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostSavingsAccountsAccountIdResponse")
-    public final static class PostSavingsAccountsAccountIdResponse {
+    public static final class PostSavingsAccountsAccountIdResponse {
 
         private PostSavingsAccountsAccountIdResponse() {}
 
@@ -344,7 +344,7 @@ final class SavingsAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "DeleteSavingsAccountsAccountIdResponse")
-    public final static class DeleteSavingsAccountsAccountIdResponse {
+    public static final class DeleteSavingsAccountsAccountIdResponse {
 
         private DeleteSavingsAccountsAccountIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsProductsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsProductsApiResourceSwagger.java
index 4bc972fb3..e64fd2907 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsProductsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/api/SavingsProductsApiResourceSwagger.java
@@ -32,7 +32,7 @@ final class SavingsProductsApiResourceSwagger {
     private SavingsProductsApiResourceSwagger() {}
 
     @ApiModel(value = "PostSavingsProductsRequest")
-    public final static class PostSavingsProductsRequest {
+    public static final class PostSavingsProductsRequest {
 
         private PostSavingsProductsRequest() {}
 
@@ -74,7 +74,7 @@ final class SavingsProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostSavingsProductsResponse")
-    public final static class PostSavingsProductsResponse {
+    public static final class PostSavingsProductsResponse {
 
         private PostSavingsProductsResponse() {}
 
@@ -83,7 +83,7 @@ final class SavingsProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutSavingsProductsProductIdRequest")
-    public final static class PutSavingsProductsProductIdRequest {
+    public static final class PutSavingsProductsProductIdRequest {
 
         private PutSavingsProductsProductIdRequest() {}
 
@@ -96,7 +96,7 @@ final class SavingsProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "PutSavingsProductsProductIdResponse")
-    public final static class PutSavingsProductsProductIdResponse {
+    public static final class PutSavingsProductsProductIdResponse {
 
         private PutSavingsProductsProductIdResponse() {}
 
@@ -118,7 +118,7 @@ final class SavingsProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetSavingsProductsResponse")
-    public final static class GetSavingsProductsResponse {
+    public static final class GetSavingsProductsResponse {
 
         private GetSavingsProductsResponse() {}
 
@@ -221,7 +221,7 @@ final class SavingsProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetSavingsProductsProductIdResponse")
-    public final static class GetSavingsProductsProductIdResponse {
+    public static final class GetSavingsProductsProductIdResponse {
 
         private GetSavingsProductsProductIdResponse() {}
 
@@ -422,7 +422,7 @@ final class SavingsProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetSavingsProductsTemplateResponse")
-    public final static class GetSavingsProductsTemplateResponse {
+    public static final class GetSavingsProductsTemplateResponse {
 
         private GetSavingsProductsTemplateResponse() {}
 
@@ -725,7 +725,7 @@ final class SavingsProductsApiResourceSwagger {
     }
 
     @ApiModel(value = "DeleteSavingsProductsProductIdResponse")
-    public final static class DeleteSavingsProductsProductIdResponse {
+    public static final class DeleteSavingsProductsProductIdResponse {
 
         private DeleteSavingsProductsProductIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountAssembler.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountAssembler.java
index be1cce600..c57e810b0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountAssembler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountAssembler.java
@@ -79,7 +79,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class SavingsAccountAssembler {
 
-    private final static Logger LOG = LoggerFactory.getLogger(SavingsAccountAssembler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SavingsAccountAssembler.class);
     private final SavingsAccountTransactionSummaryWrapper savingsAccountTransactionSummaryWrapper;
     private final SavingsHelper savingsHelper;
     private final ClientRepositoryWrapper clientRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountReadPlatformServiceImpl.java
index 8be8f6ac5..5c1bc58bd 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountReadPlatformServiceImpl.java
@@ -124,7 +124,7 @@ public class DepositAccountReadPlatformServiceImpl implements DepositAccountRead
     private final DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd");
     private final PaymentTypeReadPlatformService paymentTypeReadPlatformService;
     // allowed column names for sorting the query result
-    private final static Set<String> supportedOrderByValues = new HashSet<>(Arrays.asList("id", "accountNumbr", "officeId", "officeName"));
+    private static final Set<String> supportedOrderByValues = new HashSet<>(Arrays.asList("id", "accountNumbr", "officeId", "officeName"));
 
     @Autowired
     public DepositAccountReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource,
@@ -539,7 +539,7 @@ public class DepositAccountReadPlatformServiceImpl implements DepositAccountRead
                 formatter.print(DateUtils.getLocalDateOfTenant()));
     }
 
-    private static abstract class DepositAccountMapper implements RowMapper<DepositAccountData> {
+    private abstract static class DepositAccountMapper implements RowMapper<DepositAccountData> {
 
         private final String selectFieldsSql;
         private final String selectTablesSql;
@@ -1075,7 +1075,7 @@ public class DepositAccountReadPlatformServiceImpl implements DepositAccountRead
         }
     }
 
-    private static abstract class DepositAccountTemplateMapper implements RowMapper<DepositAccountData> {
+    private abstract static class DepositAccountTemplateMapper implements RowMapper<DepositAccountData> {
 
         private final String selectFieldsSql;
         private final String selectTablesSql;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountWritePlatformServiceJpaRepositoryImpl.java
index f833da2e0..66c36a44c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositAccountWritePlatformServiceJpaRepositoryImpl.java
@@ -123,7 +123,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class DepositAccountWritePlatformServiceJpaRepositoryImpl implements DepositAccountWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(DepositAccountWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DepositAccountWritePlatformServiceJpaRepositoryImpl.class);
 
     private final PlatformSecurityContext context;
     private final SavingsAccountRepositoryWrapper savingAccountRepositoryWrapper;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl.java
index 0fe3e9d9c..8bac0c01d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl.java
@@ -104,7 +104,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl implements DepositApplicationProcessWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(DepositApplicationProcessWritePlatformServiceJpaRepositoryImpl.class);
 
     private final PlatformSecurityContext context;
     private final SavingsAccountRepositoryWrapper savingAccountRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositProductReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositProductReadPlatformServiceImpl.java
index 4e0b100f1..7042bb368 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositProductReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/DepositProductReadPlatformServiceImpl.java
@@ -126,7 +126,7 @@ public class DepositProductReadPlatformServiceImpl implements DepositProductRead
         return depositProduct;
     }
 
-    private static abstract class DepositProductMapper implements RowMapper<DepositProductData> {
+    private abstract static class DepositProductMapper implements RowMapper<DepositProductData> {
 
         private final String schemaSql;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformServiceJpaRepositoryImpl.java
index 76ff80b65..8b3afbcf9 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformServiceJpaRepositoryImpl.java
@@ -205,7 +205,7 @@ public class SavingsAccountWritePlatformServiceJpaRepositoryImpl implements Savi
         this.gsimRepository = gsimRepository;
     }
 
-    private final static Logger LOG = LoggerFactory.getLogger(SavingsAccountWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SavingsAccountWritePlatformServiceJpaRepositoryImpl.class);
 
     @Transactional
     @Override
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.java
index ac1438487..56e5fda16 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.java
@@ -95,7 +95,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl implements SavingsApplicationProcessWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SavingsApplicationProcessWritePlatformServiceJpaRepositoryImpl.class);
 
     private final PlatformSecurityContext context;
     private final SavingsAccountRepositoryWrapper savingAccountRepository;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsSchedularServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsSchedularServiceImpl.java
index 4913793f9..b91d5dbe6 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsSchedularServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsSchedularServiceImpl.java
@@ -40,7 +40,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class SavingsSchedularServiceImpl implements SavingsSchedularService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(SavingsSchedularServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(SavingsSchedularServiceImpl.class);
 
     private final SavingsAccountAssembler savingAccountAssembler;
     private final SavingsAccountWritePlatformService savingsAccountWritePlatformService;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/api/SelfAccountTransferApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/api/SelfAccountTransferApiResourceSwagger.java
index 19cf52250..f723c4041 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/api/SelfAccountTransferApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/api/SelfAccountTransferApiResourceSwagger.java
@@ -31,7 +31,7 @@ final class SelfAccountTransferApiResourceSwagger {
     private SelfAccountTransferApiResourceSwagger() {}
 
     @ApiModel(value = "GetAccountTransferTemplateResponse")
-    public final static class GetAccountTransferTemplateResponse {
+    public static final class GetAccountTransferTemplateResponse {
 
         private GetAccountTransferTemplateResponse() {}
 
@@ -95,7 +95,7 @@ final class SelfAccountTransferApiResourceSwagger {
     }
 
     @ApiModel(value = "PostNewTransferRequest")
-    public final static class PostNewTransferRequest {
+    public static final class PostNewTransferRequest {
 
         private PostNewTransferRequest() {}
 
@@ -129,7 +129,7 @@ final class SelfAccountTransferApiResourceSwagger {
     }
 
     @ApiModel(value = "PostNewTransferResponse")
-    public final static class PostNewTransferResponse {
+    public static final class PostNewTransferResponse {
 
         private PostNewTransferResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/api/SelfBeneficiariesTPTApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/api/SelfBeneficiariesTPTApiResourceSwagger.java
index 5d4174cf7..7ed1ab0e9 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/api/SelfBeneficiariesTPTApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/api/SelfBeneficiariesTPTApiResourceSwagger.java
@@ -30,7 +30,7 @@ final class SelfBeneficiariesTPTApiResourceSwagger {
     private SelfBeneficiariesTPTApiResourceSwagger() {}
 
     @ApiModel(value = "GetSelfBeneficiariesTPTTemplateResponse")
-    public final static class GetSelfBeneficiariesTPTTemplateResponse {
+    public static final class GetSelfBeneficiariesTPTTemplateResponse {
 
         private GetSelfBeneficiariesTPTTemplateResponse() {}
 
@@ -50,7 +50,7 @@ final class SelfBeneficiariesTPTApiResourceSwagger {
     }
 
     @ApiModel(value = "PostSelfBeneficiariesTPTRequest")
-    public final static class PostSelfBeneficiariesTPTRequest {
+    public static final class PostSelfBeneficiariesTPTRequest {
 
         private PostSelfBeneficiariesTPTRequest() {}
 
@@ -69,7 +69,7 @@ final class SelfBeneficiariesTPTApiResourceSwagger {
     }
 
     @ApiModel(value = "PostSelfBeneficiariesTPTResponse")
-    public final static class PostSelfBeneficiariesTPTResponse {
+    public static final class PostSelfBeneficiariesTPTResponse {
 
         private PostSelfBeneficiariesTPTResponse() {}
 
@@ -78,7 +78,7 @@ final class SelfBeneficiariesTPTApiResourceSwagger {
     }
 
     @ApiModel(value = "PutSelfBeneficiariesTPTBeneficiaryIdRequest")
-    public final static class PutSelfBeneficiariesTPTBeneficiaryIdRequest {
+    public static final class PutSelfBeneficiariesTPTBeneficiaryIdRequest {
 
         private PutSelfBeneficiariesTPTBeneficiaryIdRequest() {}
 
@@ -89,7 +89,7 @@ final class SelfBeneficiariesTPTApiResourceSwagger {
     }
 
     @ApiModel(value = "PutSelfBeneficiariesTPTBeneficiaryIdResponse")
-    public final static class PutSelfBeneficiariesTPTBeneficiaryIdResponse {
+    public static final class PutSelfBeneficiariesTPTBeneficiaryIdResponse {
 
         private PutSelfBeneficiariesTPTBeneficiaryIdResponse() {}
 
@@ -109,7 +109,7 @@ final class SelfBeneficiariesTPTApiResourceSwagger {
     }
 
     @ApiModel(value = "DeleteSelfBeneficiariesTPTBeneficiaryIdResponse")
-    public final static class DeleteSelfBeneficiariesTPTBeneficiaryIdResponse {
+    public static final class DeleteSelfBeneficiariesTPTBeneficiaryIdResponse {
 
         private DeleteSelfBeneficiariesTPTBeneficiaryIdResponse() {}
 
@@ -118,7 +118,7 @@ final class SelfBeneficiariesTPTApiResourceSwagger {
     }
 
     @ApiModel(value = "GetSelfBeneficiariesTPTResponse")
-    public final static class GetSelfBeneficiariesTPTResponse {
+    public static final class GetSelfBeneficiariesTPTResponse {
 
         private GetSelfBeneficiariesTPTResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/client/api/SelfClientsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/client/api/SelfClientsApiResourceSwagger.java
index c694021e2..ff207cf6c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/client/api/SelfClientsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/client/api/SelfClientsApiResourceSwagger.java
@@ -33,7 +33,7 @@ final class SelfClientsApiResourceSwagger {
     private SelfClientsApiResourceSwagger() {}
 
     @ApiModel(value = "GetSelfClientsResponse")
-    public final static class GetSelfClientsResponse {
+    public static final class GetSelfClientsResponse {
 
         private GetSelfClientsResponse() {}
 
@@ -78,7 +78,7 @@ final class SelfClientsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetSelfClientsClientIdResponse")
-    public final static class GetSelfClientsClientIdResponse {
+    public static final class GetSelfClientsClientIdResponse {
 
         private GetSelfClientsClientIdResponse() {}
 
@@ -134,7 +134,7 @@ final class SelfClientsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetSelfClientsClientIdAccountsResponse")
-    public final static class GetSelfClientsClientIdAccountsResponse {
+    public static final class GetSelfClientsClientIdAccountsResponse {
 
         private GetSelfClientsClientIdAccountsResponse() {}
 
@@ -261,7 +261,7 @@ final class SelfClientsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetSelfClientsClientIdChargesResponse")
-    public final static class GetSelfClientsClientIdChargesResponse {
+    public static final class GetSelfClientsClientIdChargesResponse {
 
         private GetSelfClientsClientIdChargesResponse() {}
 
@@ -332,7 +332,7 @@ final class SelfClientsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetSelfClientsClientIdChargesChargeIdResponse")
-    public final static class GetSelfClientsClientIdChargesChargeIdResponse {
+    public static final class GetSelfClientsClientIdChargesChargeIdResponse {
 
         private GetSelfClientsClientIdChargesChargeIdResponse() {}
 
@@ -370,7 +370,7 @@ final class SelfClientsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetSelfClientsClientIdTransactionsResponse")
-    public final static class GetSelfClientsClientIdTransactionsResponse {
+    public static final class GetSelfClientsClientIdTransactionsResponse {
 
         private GetSelfClientsClientIdTransactionsResponse() {}
 
@@ -414,7 +414,7 @@ final class SelfClientsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetSelfClientsClientIdTransactionsTransactionIdResponse")
-    public final static class GetSelfClientsClientIdTransactionsTransactionIdResponse {
+    public static final class GetSelfClientsClientIdTransactionsTransactionIdResponse {
 
         private GetSelfClientsClientIdTransactionsTransactionIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/loanaccount/api/SelfLoansApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/loanaccount/api/SelfLoansApiResourceSwagger.java
index 1773a2915..db783273f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/loanaccount/api/SelfLoansApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/loanaccount/api/SelfLoansApiResourceSwagger.java
@@ -31,7 +31,7 @@ final class SelfLoansApiResourceSwagger {
     private SelfLoansApiResourceSwagger() {}
 
     @ApiModel(value = "GetSelfLoansLoanIdResponse")
-    public final static class GetSelfLoansLoanIdResponse {
+    public static final class GetSelfLoansLoanIdResponse {
 
         private GetSelfLoansLoanIdResponse() {}
 
@@ -469,7 +469,7 @@ final class SelfLoansApiResourceSwagger {
     }
 
     @ApiModel(value = "GetSelfLoansLoanIdTransactionsTransactionIdResponse")
-    public final static class GetSelfLoansLoanIdTransactionsTransactionIdResponse {
+    public static final class GetSelfLoansLoanIdTransactionsTransactionIdResponse {
 
         private GetSelfLoansLoanIdTransactionsTransactionIdResponse() {}
 
@@ -516,7 +516,7 @@ final class SelfLoansApiResourceSwagger {
     }
 
     @ApiModel(value = "GetSelfLoansLoanIdChargesResponse")
-    public final static class GetSelfLoansLoanIdChargesResponse {
+    public static final class GetSelfLoansLoanIdChargesResponse {
 
         private GetSelfLoansLoanIdChargesResponse() {}
 
@@ -574,7 +574,7 @@ final class SelfLoansApiResourceSwagger {
     }
 
     @ApiModel(value = "GetSelfLoansTemplateResponse")
-    public final static class GetSelfLoansTemplateResponse {
+    public static final class GetSelfLoansTemplateResponse {
 
         private GetSelfLoansTemplateResponse() {}
 
@@ -607,7 +607,7 @@ final class SelfLoansApiResourceSwagger {
     }
 
     @ApiModel(value = "PostSelfLoansRequest")
-    public final static class PostSelfLoansRequest {
+    public static final class PostSelfLoansRequest {
 
         private PostSelfLoansRequest() {}
 
@@ -691,7 +691,7 @@ final class SelfLoansApiResourceSwagger {
     }
 
     @ApiModel(value = "PostSelfLoansResponse")
-    public final static class PostSelfLoansResponse {
+    public static final class PostSelfLoansResponse {
 
         private PostSelfLoansResponse() {}
 
@@ -706,7 +706,7 @@ final class SelfLoansApiResourceSwagger {
     }
 
     @ApiModel(value = "PutSelfLoansLoanIdRequest")
-    public final static class PutSelfLoansLoanIdRequest {
+    public static final class PutSelfLoansLoanIdRequest {
 
         private PutSelfLoansLoanIdRequest() {}
 
@@ -743,7 +743,7 @@ final class SelfLoansApiResourceSwagger {
     }
 
     @ApiModel(value = "PutSelfLoansLoanIdResponse")
-    public final static class PutSelfLoansLoanIdResponse {
+    public static final class PutSelfLoansLoanIdResponse {
 
         private PutSelfLoansLoanIdResponse() {}
 
@@ -769,7 +769,7 @@ final class SelfLoansApiResourceSwagger {
     }
 
     @ApiModel(value = "PostSelfLoansLoanIdRequest")
-    public final static class PostSelfLoansLoanIdRequest {
+    public static final class PostSelfLoansLoanIdRequest {
 
         private PostSelfLoansLoanIdRequest() {}
 
@@ -784,7 +784,7 @@ final class SelfLoansApiResourceSwagger {
     }
 
     @ApiModel(value = "PostSelfLoansLoanIdResponse")
-    public final static class PostSelfLoansLoanIdResponse {
+    public static final class PostSelfLoansLoanIdResponse {
 
         private PostSelfLoansLoanIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/pockets/api/PocketApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/pockets/api/PocketApiResourceSwagger.java
index 7f5f97726..32480f737 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/pockets/api/PocketApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/pockets/api/PocketApiResourceSwagger.java
@@ -31,7 +31,7 @@ final class PocketApiResourceSwagger {
     private PocketApiResourceSwagger() {}
 
     @ApiModel(value = "PostLinkDelinkAccountsToFromPocketRequest")
-    public final static class PostLinkDelinkAccountsToFromPocketRequest {
+    public static final class PostLinkDelinkAccountsToFromPocketRequest {
 
         private PostLinkDelinkAccountsToFromPocketRequest() {}
 
@@ -49,7 +49,7 @@ final class PocketApiResourceSwagger {
     }
 
     @ApiModel(value = "PostLinkDelinkAccountsToFromPocketResponse")
-    public final static class PostLinkDelinkAccountsToFromPocketResponse {
+    public static final class PostLinkDelinkAccountsToFromPocketResponse {
 
         private PostLinkDelinkAccountsToFromPocketResponse() {}
 
@@ -58,7 +58,7 @@ final class PocketApiResourceSwagger {
     }
 
     @ApiModel(value = "GetAccountsLinkedToPocketResponse")
-    public final static class GetAccountsLinkedToPocketResponse {
+    public static final class GetAccountsLinkedToPocketResponse {
 
         private GetAccountsLinkedToPocketResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/runreport/SelfRunReportApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/runreport/SelfRunReportApiResourceSwagger.java
index a088240f1..e602670d1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/runreport/SelfRunReportApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/runreport/SelfRunReportApiResourceSwagger.java
@@ -31,7 +31,7 @@ final class SelfRunReportApiResourceSwagger {
     private SelfRunReportApiResourceSwagger() {}
 
     @ApiModel(value = "GetRunReportResponse")
-    public final static class GetRunReportResponse {
+    public static final class GetRunReportResponse {
 
         private GetRunReportResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/savings/api/SelfSavingsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/savings/api/SelfSavingsApiResourceSwagger.java
index f0adba803..b5d1670fb 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/savings/api/SelfSavingsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/savings/api/SelfSavingsApiResourceSwagger.java
@@ -30,7 +30,7 @@ final class SelfSavingsApiResourceSwagger {
     private SelfSavingsApiResourceSwagger() {}
 
     @ApiModel(value = "GetSelfSavingsAccountsResponse")
-    public final static class GetSelfSavingsAccountsResponse {
+    public static final class GetSelfSavingsAccountsResponse {
 
         private GetSelfSavingsAccountsResponse() {}
 
@@ -169,7 +169,7 @@ final class SelfSavingsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetSelfSavingsAccountsAccountIdTransactionsTransactionIdResponse")
-    public final static class GetSelfSavingsAccountsAccountIdTransactionsTransactionIdResponse {
+    public static final class GetSelfSavingsAccountsAccountIdTransactionsTransactionIdResponse {
 
         private GetSelfSavingsAccountsAccountIdTransactionsTransactionIdResponse() {}
 
@@ -262,7 +262,7 @@ final class SelfSavingsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetSelfSavingsAccountsAccountIdChargesResponse")
-    public final static class GetSelfSavingsAccountsAccountIdChargesResponse {
+    public static final class GetSelfSavingsAccountsAccountIdChargesResponse {
 
         private GetSelfSavingsAccountsAccountIdChargesResponse() {}
 
@@ -322,7 +322,7 @@ final class SelfSavingsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetSelfSavingsAccountsAccountIdChargesSavingsAccountChargeIdResponse")
-    public final static class GetSelfSavingsAccountsAccountIdChargesSavingsAccountChargeIdResponse {
+    public static final class GetSelfSavingsAccountsAccountIdChargesSavingsAccountChargeIdResponse {
 
         private GetSelfSavingsAccountsAccountIdChargesSavingsAccountChargeIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfAuthenticationApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfAuthenticationApiResourceSwagger.java
index fa3946ba0..35ae6f061 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfAuthenticationApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfAuthenticationApiResourceSwagger.java
@@ -31,7 +31,7 @@ final class SelfAuthenticationApiResourceSwagger {
     private SelfAuthenticationApiResourceSwagger() {}
 
     @ApiModel(value = "PostSelfAuthenticationResponse")
-    public final static class PostSelfAuthenticationResponse {
+    public static final class PostSelfAuthenticationResponse {
 
         private PostSelfAuthenticationResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfUserApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfUserApiResourceSwagger.java
index 3fc0de99e..a49a4feac 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfUserApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfUserApiResourceSwagger.java
@@ -29,7 +29,7 @@ final class SelfUserApiResourceSwagger {
     private SelfUserApiResourceSwagger() {}
 
     @ApiModel(value = "PutSelfUserRequest")
-    public final static class PutSelfUserRequest {
+    public static final class PutSelfUserRequest {
 
         private PutSelfUserRequest() {}
 
@@ -40,7 +40,7 @@ final class SelfUserApiResourceSwagger {
     }
 
     @ApiModel(value = "PutSelfUserResponse")
-    public final static class PutSelfUserResponse {
+    public static final class PutSelfUserResponse {
 
         private PutSelfUserResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfUserDetailsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfUserDetailsApiResourceSwagger.java
index bf1c93e4c..9d2d3c30c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfUserDetailsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/security/api/SelfUserDetailsApiResourceSwagger.java
@@ -31,7 +31,7 @@ final class SelfUserDetailsApiResourceSwagger {
     private SelfUserDetailsApiResourceSwagger() {}
 
     @ApiModel(value = "GetSelfUserDetailsResponse")
-    public final static class GetSelfUserDetailsResponse {
+    public static final class GetSelfUserDetailsResponse {
 
         private GetSelfUserDetailsResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/shareaccounts/api/SelfShareAccountsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/shareaccounts/api/SelfShareAccountsApiResourceSwagger.java
index 1a28b2853..9da47924b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/shareaccounts/api/SelfShareAccountsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/shareaccounts/api/SelfShareAccountsApiResourceSwagger.java
@@ -34,7 +34,7 @@ final class SelfShareAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetShareAccountsClientIdResponse")
-    public final static class GetShareAccountsClientIdResponse {
+    public static final class GetShareAccountsClientIdResponse {
 
         private GetShareAccountsClientIdResponse() {}
 
@@ -148,7 +148,7 @@ final class SelfShareAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "GetShareAccountsClientIdProductIdResponse")
-    public final static class GetShareAccountsClientIdProductIdResponse {
+    public static final class GetShareAccountsClientIdProductIdResponse {
 
         private GetShareAccountsClientIdProductIdResponse() {}
 
@@ -596,7 +596,7 @@ final class SelfShareAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostNewShareApplicationRequest")
-    public final static class PostNewShareApplicationRequest {
+    public static final class PostNewShareApplicationRequest {
 
         private PostNewShareApplicationRequest() {}
 
@@ -632,7 +632,7 @@ final class SelfShareAccountsApiResourceSwagger {
     }
 
     @ApiModel(value = "PostNewShareApplicationResponse")
-    public final static class PostNewShareApplicationResponse {
+    public static final class PostNewShareApplicationResponse {
 
         private PostNewShareApplicationResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/PurchasedSharesReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/PurchasedSharesReadPlatformServiceImpl.java
index b60c027d2..2c58ac0b8 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/PurchasedSharesReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/PurchasedSharesReadPlatformServiceImpl.java
@@ -49,7 +49,7 @@ public class PurchasedSharesReadPlatformServiceImpl implements PurchasedSharesRe
         return this.jdbcTemplate.query(sql, mapper, new Object[] { accountId });
     }
 
-    private final static class PurchasedSharesDataRowMapper implements RowMapper<ShareAccountTransactionData> {
+    private static final class PurchasedSharesDataRowMapper implements RowMapper<ShareAccountTransactionData> {
 
         private final String schema;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountChargeReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountChargeReadPlatformServiceImpl.java
index 0439c36a1..350d24db9 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountChargeReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountChargeReadPlatformServiceImpl.java
@@ -59,7 +59,7 @@ public class ShareAccountChargeReadPlatformServiceImpl implements ShareAccountCh
         return this.jdbcTemplate.query(sqlBuilder.toString(), rm, new Object[] { accountId });
     }
 
-    private final static class ShareAccountChargeMapper implements RowMapper<ShareAccountChargeData> {
+    private static final class ShareAccountChargeMapper implements RowMapper<ShareAccountChargeData> {
 
         private final String schema;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountReadPlatformServiceImpl.java
index 5078759a1..ca2b14b1c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/ShareAccountReadPlatformServiceImpl.java
@@ -244,7 +244,7 @@ public class ShareAccountReadPlatformServiceImpl implements ShareAccountReadPlat
         return savingsCharges;
     }
 
-    private final static class ShareAccountMapper implements RowMapper<AccountData> {
+    private static final class ShareAccountMapper implements RowMapper<AccountData> {
 
         private final Collection<ShareAccountChargeData> charges;
         private final Collection<ShareAccountTransactionData> purchasedShares;
@@ -374,7 +374,7 @@ public class ShareAccountReadPlatformServiceImpl implements ShareAccountReadPlat
         }
     }
 
-    private final static class ShareAccountMapperForDividents implements RowMapper<ShareAccountData> {
+    private static final class ShareAccountMapperForDividents implements RowMapper<ShareAccountData> {
 
         private final String schema;
         final PurchasedSharesDataRowMapper purchasedSharesDataRowMapper = new PurchasedSharesDataRowMapper();
@@ -439,7 +439,7 @@ public class ShareAccountReadPlatformServiceImpl implements ShareAccountReadPlat
         }
     }
 
-    private final static class PurchasedSharesDataRowMapper implements RowMapper<ShareAccountTransactionData> {
+    private static final class PurchasedSharesDataRowMapper implements RowMapper<ShareAccountTransactionData> {
 
         private final String schema;
 
@@ -475,7 +475,7 @@ public class ShareAccountReadPlatformServiceImpl implements ShareAccountReadPlat
         }
     }
 
-    private final static class ShareAccountDividendRowMapper implements RowMapper<ShareAccountDividendData> {
+    private static final class ShareAccountDividendRowMapper implements RowMapper<ShareAccountDividendData> {
 
         private final String schema;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/service/ShareProductReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/service/ShareProductReadPlatformServiceImpl.java
index 450acf02a..72da3936c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/service/ShareProductReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareproducts/service/ShareProductReadPlatformServiceImpl.java
@@ -200,7 +200,7 @@ public class ShareProductReadPlatformServiceImpl implements ProductReadPlatformS
         }
     }
 
-    private final static class ShareProductRowMapper implements RowMapper<ProductData> {
+    private static final class ShareProductRowMapper implements RowMapper<ProductData> {
 
         Collection<ShareProductMarketPriceData> shareMarketCollection;
         Collection<ChargeData> charges;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxComponentApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxComponentApiResourceSwagger.java
index 717c741b7..99368b86c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxComponentApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxComponentApiResourceSwagger.java
@@ -31,7 +31,7 @@ final class TaxComponentApiResourceSwagger {
     private TaxComponentApiResourceSwagger() {}
 
     @ApiModel(value = "GetTaxesComponentsResponse")
-    public final static class GetTaxesComponentsResponse {
+    public static final class GetTaxesComponentsResponse {
 
         private GetTaxesComponentsResponse() {}
 
@@ -78,7 +78,7 @@ final class TaxComponentApiResourceSwagger {
     }
 
     @ApiModel(value = "PostTaxesComponentsRequest")
-    public final static class PostTaxesComponentsRequest {
+    public static final class PostTaxesComponentsRequest {
 
         private PostTaxesComponentsRequest() {}
 
@@ -99,7 +99,7 @@ final class TaxComponentApiResourceSwagger {
     }
 
     @ApiModel(value = "PostTaxesComponentsResponse")
-    public final static class PostTaxesComponentsResponse {
+    public static final class PostTaxesComponentsResponse {
 
         private PostTaxesComponentsResponse() {}
 
@@ -108,7 +108,7 @@ final class TaxComponentApiResourceSwagger {
     }
 
     @ApiModel(value = "PutTaxesComponentsTaxComponentIdRequest")
-    public final static class PutTaxesComponentsTaxComponentIdRequest {
+    public static final class PutTaxesComponentsTaxComponentIdRequest {
 
         private PutTaxesComponentsTaxComponentIdRequest() {}
 
@@ -125,7 +125,7 @@ final class TaxComponentApiResourceSwagger {
     }
 
     @ApiModel(value = "PutTaxesComponentsTaxComponentIdResponse")
-    public final static class PutTaxesComponentsTaxComponentIdResponse {
+    public static final class PutTaxesComponentsTaxComponentIdResponse {
 
         private PutTaxesComponentsTaxComponentIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxGroupApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxGroupApiResourceSwagger.java
index 50f8314ce..e5bfbf613 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxGroupApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/api/TaxGroupApiResourceSwagger.java
@@ -32,7 +32,7 @@ final class TaxGroupApiResourceSwagger {
     private TaxGroupApiResourceSwagger() {}
 
     @ApiModel(value = "GetTaxesGroupResponse")
-    public final static class GetTaxesGroupResponse {
+    public static final class GetTaxesGroupResponse {
 
         private GetTaxesGroupResponse() {}
 
@@ -65,7 +65,7 @@ final class TaxGroupApiResourceSwagger {
     }
 
     @ApiModel(value = "PostTaxesGroupRequest")
-    public final static class PostTaxesGroupRequest {
+    public static final class PostTaxesGroupRequest {
 
         private PostTaxesGroupRequest() {}
 
@@ -98,7 +98,7 @@ final class TaxGroupApiResourceSwagger {
     }
 
     @ApiModel(value = "PutTaxesGroupTaxGroupIdRequest")
-    public final static class PutTaxesGroupTaxGroupIdRequest {
+    public static final class PutTaxesGroupTaxGroupIdRequest {
 
         private PutTaxesGroupTaxGroupIdRequest() {}
 
@@ -124,7 +124,7 @@ final class TaxGroupApiResourceSwagger {
     }
 
     @ApiModel(value = "PutTaxesGroupTaxGroupIdResponse")
-    public final static class PutTaxesGroupTaxGroupIdResponse {
+    public static final class PutTaxesGroupTaxGroupIdResponse {
 
         private PutTaxesGroupTaxGroupIdResponse() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/scheduledjobs/service/ScheduledJobRunnerServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/scheduledjobs/service/ScheduledJobRunnerServiceImpl.java
index 78b7df826..50c31826b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/scheduledjobs/service/ScheduledJobRunnerServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/scheduledjobs/service/ScheduledJobRunnerServiceImpl.java
@@ -62,7 +62,7 @@ import org.springframework.util.CollectionUtils;
 @Service(value = "scheduledJobRunnerService")
 public class ScheduledJobRunnerServiceImpl implements ScheduledJobRunnerService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(ScheduledJobRunnerServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(ScheduledJobRunnerServiceImpl.class);
 
     private final DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd");
     private final DateTimeFormatter formatterWithTime = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
diff --git a/fineract-provider/src/main/java/org/apache/fineract/template/service/TemplateMergeService.java b/fineract-provider/src/main/java/org/apache/fineract/template/service/TemplateMergeService.java
index 3818d2f99..b807827a9 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/template/service/TemplateMergeService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/template/service/TemplateMergeService.java
@@ -49,7 +49,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class TemplateMergeService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(TemplateMergeService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(TemplateMergeService.class);
 
     // private final FromJsonHelper fromApiJsonHelper;
     private Map<String, Object> scopes;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/domain/AppUser.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/domain/AppUser.java
index ce63572d8..0eb20f31a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/domain/AppUser.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/domain/AppUser.java
@@ -61,7 +61,7 @@ import org.springframework.security.core.userdetails.User;
 @Table(name = "m_appuser", uniqueConstraints = @UniqueConstraint(columnNames = { "username" }, name = "username_org"))
 public class AppUser extends AbstractPersistableCustom implements PlatformUser {
 
-    private final static Logger LOG = LoggerFactory.getLogger(AppUser.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AppUser.class);
 
     @Column(name = "email", nullable = false, length = 100)
     private String email;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/AppUserWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/AppUserWritePlatformServiceJpaRepositoryImpl.java
index 8969ba556..fa12ec1f2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/AppUserWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/AppUserWritePlatformServiceJpaRepositoryImpl.java
@@ -73,7 +73,7 @@ import org.springframework.util.ObjectUtils;
 @Service
 public class AppUserWritePlatformServiceJpaRepositoryImpl implements AppUserWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(AppUserWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AppUserWritePlatformServiceJpaRepositoryImpl.class);
 
     private final PlatformSecurityContext context;
     private final UserDomainService userDomainService;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/PasswordPreferencesWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/PasswordPreferencesWritePlatformServiceJpaRepositoryImpl.java
index 10b79c8f1..280da8a33 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/PasswordPreferencesWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/PasswordPreferencesWritePlatformServiceJpaRepositoryImpl.java
@@ -40,7 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class PasswordPreferencesWritePlatformServiceJpaRepositoryImpl implements PasswordPreferencesWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(PasswordPreferencesWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PasswordPreferencesWritePlatformServiceJpaRepositoryImpl.class);
     private final PasswordValidationPolicyRepository validationRepository;
     private final PasswordPreferencesDataValidator dataValidator;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/PermissionReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/PermissionReadPlatformServiceImpl.java
index cc08e98c2..a922176b0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/PermissionReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/PermissionReadPlatformServiceImpl.java
@@ -34,7 +34,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class PermissionReadPlatformServiceImpl implements PermissionReadPlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(PermissionReadPlatformServiceImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PermissionReadPlatformServiceImpl.class);
 
     private final JdbcTemplate jdbcTemplate;
     private final PlatformSecurityContext context;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/RoleWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/RoleWritePlatformServiceJpaRepositoryImpl.java
index 0ecaa6d62..996bd0442 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/RoleWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/RoleWritePlatformServiceJpaRepositoryImpl.java
@@ -50,7 +50,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Service
 public class RoleWritePlatformServiceJpaRepositoryImpl implements RoleWritePlatformService {
 
-    private final static Logger LOG = LoggerFactory.getLogger(RoleWritePlatformServiceJpaRepositoryImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RoleWritePlatformServiceJpaRepositoryImpl.class);
     private final PlatformSecurityContext context;
     private final RoleRepository roleRepository;
     private final PermissionRepository permissionRepository;
diff --git a/fineract-provider/src/test/java/org/apache/fineract/common/Utils.java b/fineract-provider/src/test/java/org/apache/fineract/common/Utils.java
index 84a520723..99d50b58e 100644
--- a/fineract-provider/src/test/java/org/apache/fineract/common/Utils.java
+++ b/fineract-provider/src/test/java/org/apache/fineract/common/Utils.java
@@ -42,7 +42,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_IDENTIFIER = "tenantIdentifier=default";
 
     private static final String LOGIN_URL = "/fineract-provider/api/v1/authentication?username=mifos&password=password&"
diff --git a/fineract-provider/src/test/java/org/apache/fineract/mix/report/service/XBRLBuilderTest.java b/fineract-provider/src/test/java/org/apache/fineract/mix/report/service/XBRLBuilderTest.java
index 7aab3e4a6..926ea47a6 100644
--- a/fineract-provider/src/test/java/org/apache/fineract/mix/report/service/XBRLBuilderTest.java
+++ b/fineract-provider/src/test/java/org/apache/fineract/mix/report/service/XBRLBuilderTest.java
@@ -51,7 +51,7 @@ import org.xml.sax.SAXException;
 @ExtendWith(MockitoExtension.class)
 public class XBRLBuilderTest {
 
-    private final static Logger LOG = LoggerFactory.getLogger(XBRLBuilderTest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(XBRLBuilderTest.class);
     @Mock
     private NamespaceReadPlatformServiceImpl readNamespaceService;
 
diff --git a/fineract-provider/src/test/java/org/apache/fineract/notification/Listener.java b/fineract-provider/src/test/java/org/apache/fineract/notification/Listener.java
index b915d588d..22a372e86 100644
--- a/fineract-provider/src/test/java/org/apache/fineract/notification/Listener.java
+++ b/fineract-provider/src/test/java/org/apache/fineract/notification/Listener.java
@@ -28,7 +28,7 @@ import org.springframework.jms.listener.SessionAwareMessageListener;
 
 public class Listener implements SessionAwareMessageListener {
 
-    private final static Logger LOG = LoggerFactory.getLogger(Listener.class);
+    private static final Logger LOG = LoggerFactory.getLogger(Listener.class);
 
     @Override
     public void onMessage(Message message, Session session) throws JMSException {