diff --git a/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/service/PagedRequest.java b/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/service/PagedRequest.java
index 12c3ff881..e2becbb50 100644
--- a/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/service/PagedRequest.java
+++ b/fineract-core/src/main/java/org/apache/fineract/infrastructure/core/service/PagedRequest.java
@@ -54,7 +54,7 @@ public class PagedRequest<T> {
 
     @Data
     @SuppressWarnings({ "unused" })
-    private static class SortOrder {
+    private static final class SortOrder {
 
         private Sort.Direction direction;
         private String property;
diff --git a/fineract-investor/src/main/java/org/apache/fineract/investor/service/ExternalAssetOwnerJournalEntryServiceImpl.java b/fineract-investor/src/main/java/org/apache/fineract/investor/service/ExternalAssetOwnerJournalEntryServiceImpl.java
index 14d8e9398..dcd41fcb2 100644
--- a/fineract-investor/src/main/java/org/apache/fineract/investor/service/ExternalAssetOwnerJournalEntryServiceImpl.java
+++ b/fineract-investor/src/main/java/org/apache/fineract/investor/service/ExternalAssetOwnerJournalEntryServiceImpl.java
@@ -50,7 +50,7 @@ public class ExternalAssetOwnerJournalEntryServiceImpl implements ExternalAssetO
                 new HandleLoanJournalEntryCreatedBusinessEvent());
     }
 
-    private class HandleLoanJournalEntryCreatedBusinessEvent implements BusinessEventListener<LoanJournalEntryCreatedBusinessEvent> {
+    private final class HandleLoanJournalEntryCreatedBusinessEvent implements BusinessEventListener<LoanJournalEntryCreatedBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanJournalEntryCreatedBusinessEvent event) {
diff --git a/fineract-investor/src/main/java/org/apache/fineract/investor/service/ExternalAssetOwnerLoanStatusChangePlatformServiceImpl.java b/fineract-investor/src/main/java/org/apache/fineract/investor/service/ExternalAssetOwnerLoanStatusChangePlatformServiceImpl.java
index 352be35f8..e1855f0b1 100644
--- a/fineract-investor/src/main/java/org/apache/fineract/investor/service/ExternalAssetOwnerLoanStatusChangePlatformServiceImpl.java
+++ b/fineract-investor/src/main/java/org/apache/fineract/investor/service/ExternalAssetOwnerLoanStatusChangePlatformServiceImpl.java
@@ -43,7 +43,7 @@ public class ExternalAssetOwnerLoanStatusChangePlatformServiceImpl implements Ex
                 new ExternalAssetOwnerLoanStatusChangedListener());
     }
 
-    private class ExternalAssetOwnerLoanStatusChangedListener implements BusinessEventListener<LoanStatusChangedBusinessEvent> {
+    private final class ExternalAssetOwnerLoanStatusChangedListener implements BusinessEventListener<LoanStatusChangedBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanStatusChangedBusinessEvent event) {
diff --git a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/impl/AdvancedPaymentScheduleTransactionProcessor.java b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/impl/AdvancedPaymentScheduleTransactionProcessor.java
index 9d3adeedc..ca91b8ae6 100644
--- a/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/impl/AdvancedPaymentScheduleTransactionProcessor.java
+++ b/fineract-loan/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/transactionprocessor/impl/AdvancedPaymentScheduleTransactionProcessor.java
@@ -910,7 +910,7 @@ public class AdvancedPaymentScheduleTransactionProcessor extends AbstractLoanRep
     @AllArgsConstructor
     @Getter
     @Setter
-    private static class Balances {
+    private static final class Balances {
 
         private Money aggregatedPrincipalPortion;
         private Money aggregatedFeeChargesPortion;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/ServerApplication.java b/fineract-provider/src/main/java/org/apache/fineract/ServerApplication.java
index 2bbe662e9..f95ad1c23 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/ServerApplication.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/ServerApplication.java
@@ -42,7 +42,7 @@ import org.springframework.context.annotation.Import;
 public class ServerApplication extends SpringBootServletInitializer {
 
     @Import({ FineractWebApplicationConfiguration.class, FineractLiquibaseOnlyApplicationConfiguration.class })
-    private static class Configuration {}
+    private static final class Configuration {}
 
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignDomainServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignDomainServiceImpl.java
index 92880b7e1..64b1283a4 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignDomainServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailCampaignDomainServiceImpl.java
@@ -55,7 +55,7 @@ public class EmailCampaignDomainServiceImpl implements EmailCampaignDomainServic
                 new SendEmailOnLoanRepayment());
     }
 
-    private class SendEmailOnLoanRepayment implements BusinessEventListener<LoanTransactionMakeRepaymentPostBusinessEvent> {
+    private final class SendEmailOnLoanRepayment implements BusinessEventListener<LoanTransactionMakeRepaymentPostBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanTransactionMakeRepaymentPostBusinessEvent event) {
@@ -68,7 +68,7 @@ public class EmailCampaignDomainServiceImpl implements EmailCampaignDomainServic
         }
     }
 
-    private class SendEmailOnLoanRejected implements BusinessEventListener<LoanRejectedBusinessEvent> {
+    private final class SendEmailOnLoanRejected implements BusinessEventListener<LoanRejectedBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanRejectedBusinessEvent event) {
@@ -81,7 +81,7 @@ public class EmailCampaignDomainServiceImpl implements EmailCampaignDomainServic
         }
     }
 
-    private class SendEmailOnLoanApproved implements BusinessEventListener<LoanApprovedBusinessEvent> {
+    private final class SendEmailOnLoanApproved implements BusinessEventListener<LoanApprovedBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanApprovedBusinessEvent event) {
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 582a4b4d8..62debdffe 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
@@ -382,7 +382,7 @@ public class SmsCampaignDomainServiceImpl implements SmsCampaignDomainService {
         return smsParams;
     }
 
-    private class SendSmsOnLoanApproved implements BusinessEventListener<LoanApprovedBusinessEvent> {
+    private final class SendSmsOnLoanApproved implements BusinessEventListener<LoanApprovedBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanApprovedBusinessEvent event) {
@@ -391,7 +391,7 @@ public class SmsCampaignDomainServiceImpl implements SmsCampaignDomainService {
         }
     }
 
-    private class SendSmsOnLoanRejected implements BusinessEventListener<LoanRejectedBusinessEvent> {
+    private final class SendSmsOnLoanRejected implements BusinessEventListener<LoanRejectedBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanRejectedBusinessEvent event) {
@@ -400,7 +400,7 @@ public class SmsCampaignDomainServiceImpl implements SmsCampaignDomainService {
         }
     }
 
-    private class SendSmsOnLoanRepayment implements BusinessEventListener<LoanTransactionMakeRepaymentPostBusinessEvent> {
+    private final class SendSmsOnLoanRepayment implements BusinessEventListener<LoanTransactionMakeRepaymentPostBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanTransactionMakeRepaymentPostBusinessEvent event) {
@@ -408,7 +408,7 @@ public class SmsCampaignDomainServiceImpl implements SmsCampaignDomainService {
         }
     }
 
-    private class ClientActivatedListener implements BusinessEventListener<ClientActivateBusinessEvent> {
+    private final class ClientActivatedListener implements BusinessEventListener<ClientActivateBusinessEvent> {
 
         @Override
         public void onBusinessEvent(ClientActivateBusinessEvent event) {
@@ -416,7 +416,7 @@ public class SmsCampaignDomainServiceImpl implements SmsCampaignDomainService {
         }
     }
 
-    private class ClientRejectedListener implements BusinessEventListener<ClientRejectBusinessEvent> {
+    private final class ClientRejectedListener implements BusinessEventListener<ClientRejectBusinessEvent> {
 
         @Override
         public void onBusinessEvent(ClientRejectBusinessEvent event) {
@@ -424,7 +424,7 @@ public class SmsCampaignDomainServiceImpl implements SmsCampaignDomainService {
         }
     }
 
-    private class SavingsAccountActivatedListener implements BusinessEventListener<SavingsActivateBusinessEvent> {
+    private final class SavingsAccountActivatedListener implements BusinessEventListener<SavingsActivateBusinessEvent> {
 
         @Override
         public void onBusinessEvent(SavingsActivateBusinessEvent event) {
@@ -432,7 +432,7 @@ public class SmsCampaignDomainServiceImpl implements SmsCampaignDomainService {
         }
     }
 
-    private class SavingsAccountRejectedListener implements BusinessEventListener<SavingsRejectBusinessEvent> {
+    private final class SavingsAccountRejectedListener implements BusinessEventListener<SavingsRejectBusinessEvent> {
 
         @Override
         public void onBusinessEvent(SavingsRejectBusinessEvent event) {
@@ -440,7 +440,7 @@ public class SmsCampaignDomainServiceImpl implements SmsCampaignDomainService {
         }
     }
 
-    private class DepositSavingsAccountTransactionListener implements BusinessEventListener<SavingsDepositBusinessEvent> {
+    private final class DepositSavingsAccountTransactionListener implements BusinessEventListener<SavingsDepositBusinessEvent> {
 
         @Override
         public void onBusinessEvent(SavingsDepositBusinessEvent event) {
@@ -448,7 +448,7 @@ public class SmsCampaignDomainServiceImpl implements SmsCampaignDomainService {
         }
     }
 
-    private class NonDepositSavingsAccountTransactionListener implements BusinessEventListener<SavingsWithdrawalBusinessEvent> {
+    private final class NonDepositSavingsAccountTransactionListener implements BusinessEventListener<SavingsWithdrawalBusinessEvent> {
 
         @Override
         public void onBusinessEvent(SavingsWithdrawalBusinessEvent event) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/jersey/JerseyJacksonObjectArgumentHandler.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/jersey/JerseyJacksonObjectArgumentHandler.java
index 35abe48c9..f0ce35890 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/jersey/JerseyJacksonObjectArgumentHandler.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/jersey/JerseyJacksonObjectArgumentHandler.java
@@ -98,7 +98,7 @@ public class JerseyJacksonObjectArgumentHandler<T> implements MessageBodyReader<
     }
 
     @RequiredArgsConstructor
-    private static class SimpleHttpOutputMessage implements HttpOutputMessage {
+    private static final class SimpleHttpOutputMessage implements HttpOutputMessage {
 
         private final OutputStream outputStream;
         private final HttpHeaders headers;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/notification/service/NotificationDomainServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/notification/service/NotificationDomainServiceImpl.java
index 4a9f2232c..c10f8717f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/notification/service/NotificationDomainServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/notification/service/NotificationDomainServiceImpl.java
@@ -96,7 +96,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
                 new ShareAccountApprovedListener());
     }
 
-    private class ClientCreatedListener implements BusinessEventListener<ClientCreateBusinessEvent> {
+    private final class ClientCreatedListener implements BusinessEventListener<ClientCreateBusinessEvent> {
 
         @Override
         public void onBusinessEvent(ClientCreateBusinessEvent event) {
@@ -106,7 +106,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
         }
     }
 
-    private class CenterCreatedListener implements BusinessEventListener<CentersCreateBusinessEvent> {
+    private final class CenterCreatedListener implements BusinessEventListener<CentersCreateBusinessEvent> {
 
         @Override
         public void onBusinessEvent(CentersCreateBusinessEvent event) {
@@ -116,7 +116,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
         }
     }
 
-    private class GroupCreatedListener implements BusinessEventListener<GroupsCreateBusinessEvent> {
+    private final class GroupCreatedListener implements BusinessEventListener<GroupsCreateBusinessEvent> {
 
         @Override
         public void onBusinessEvent(GroupsCreateBusinessEvent event) {
@@ -126,7 +126,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
         }
     }
 
-    private class SavingsAccountDepositListener implements BusinessEventListener<SavingsDepositBusinessEvent> {
+    private final class SavingsAccountDepositListener implements BusinessEventListener<SavingsDepositBusinessEvent> {
 
         @Override
         public void onBusinessEvent(SavingsDepositBusinessEvent event) {
@@ -137,7 +137,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
         }
     }
 
-    private class ShareProductDividendCreatedListener implements BusinessEventListener<ShareProductDividentsCreateBusinessEvent> {
+    private final class ShareProductDividendCreatedListener implements BusinessEventListener<ShareProductDividentsCreateBusinessEvent> {
 
         @Override
         public void onBusinessEvent(ShareProductDividentsCreateBusinessEvent event) {
@@ -147,7 +147,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
         }
     }
 
-    private class FixedDepositAccountCreatedListener implements BusinessEventListener<FixedDepositAccountCreateBusinessEvent> {
+    private final class FixedDepositAccountCreatedListener implements BusinessEventListener<FixedDepositAccountCreateBusinessEvent> {
 
         @Override
         public void onBusinessEvent(FixedDepositAccountCreateBusinessEvent event) {
@@ -157,7 +157,8 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
         }
     }
 
-    private class RecurringDepositAccountCreatedListener implements BusinessEventListener<RecurringDepositAccountCreateBusinessEvent> {
+    private final class RecurringDepositAccountCreatedListener
+            implements BusinessEventListener<RecurringDepositAccountCreateBusinessEvent> {
 
         @Override
         public void onBusinessEvent(RecurringDepositAccountCreateBusinessEvent event) {
@@ -168,7 +169,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
         }
     }
 
-    private class SavingsAccountApprovedListener implements BusinessEventListener<SavingsApproveBusinessEvent> {
+    private final class SavingsAccountApprovedListener implements BusinessEventListener<SavingsApproveBusinessEvent> {
 
         @Override
         public void onBusinessEvent(SavingsApproveBusinessEvent event) {
@@ -189,7 +190,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
         }
     }
 
-    private class SavingsPostInterestListener implements BusinessEventListener<SavingsPostInterestBusinessEvent> {
+    private final class SavingsPostInterestListener implements BusinessEventListener<SavingsPostInterestBusinessEvent> {
 
         @Override
         public void onBusinessEvent(SavingsPostInterestBusinessEvent event) {
@@ -199,7 +200,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
         }
     }
 
-    private class LoanCreatedListener implements BusinessEventListener<LoanCreatedBusinessEvent> {
+    private final class LoanCreatedListener implements BusinessEventListener<LoanCreatedBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanCreatedBusinessEvent event) {
@@ -209,7 +210,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
         }
     }
 
-    private class LoanApprovedListener implements BusinessEventListener<LoanApprovedBusinessEvent> {
+    private final class LoanApprovedListener implements BusinessEventListener<LoanApprovedBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanApprovedBusinessEvent event) {
@@ -219,7 +220,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
         }
     }
 
-    private class LoanClosedListener implements BusinessEventListener<LoanCloseBusinessEvent> {
+    private final class LoanClosedListener implements BusinessEventListener<LoanCloseBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanCloseBusinessEvent event) {
@@ -229,7 +230,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
         }
     }
 
-    private class LoanCloseAsRescheduledListener implements BusinessEventListener<LoanCloseAsRescheduleBusinessEvent> {
+    private final class LoanCloseAsRescheduledListener implements BusinessEventListener<LoanCloseAsRescheduleBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanCloseAsRescheduleBusinessEvent event) {
@@ -239,7 +240,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
         }
     }
 
-    private class LoanChargebackTransactionListener implements BusinessEventListener<LoanChargebackTransactionBusinessEvent> {
+    private final class LoanChargebackTransactionListener implements BusinessEventListener<LoanChargebackTransactionBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanChargebackTransactionBusinessEvent event) {
@@ -252,7 +253,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
         }
     }
 
-    private class LoanMakeRepaymentListener implements BusinessEventListener<LoanTransactionMakeRepaymentPostBusinessEvent> {
+    private final class LoanMakeRepaymentListener implements BusinessEventListener<LoanTransactionMakeRepaymentPostBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanTransactionMakeRepaymentPostBusinessEvent event) {
@@ -262,7 +263,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
         }
     }
 
-    private class LoanProductCreatedListener implements BusinessEventListener<LoanProductCreateBusinessEvent> {
+    private final class LoanProductCreatedListener implements BusinessEventListener<LoanProductCreateBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanProductCreateBusinessEvent event) {
@@ -272,7 +273,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
         }
     }
 
-    private class SavingsAccountCreatedListener implements BusinessEventListener<SavingsCreateBusinessEvent> {
+    private final class SavingsAccountCreatedListener implements BusinessEventListener<SavingsCreateBusinessEvent> {
 
         @Override
         public void onBusinessEvent(SavingsCreateBusinessEvent event) {
@@ -282,7 +283,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
         }
     }
 
-    private class SavingsAccountClosedListener implements BusinessEventListener<SavingsCloseBusinessEvent> {
+    private final class SavingsAccountClosedListener implements BusinessEventListener<SavingsCloseBusinessEvent> {
 
         @Override
         public void onBusinessEvent(SavingsCloseBusinessEvent event) {
@@ -292,7 +293,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
         }
     }
 
-    private class ShareAccountCreatedListener implements BusinessEventListener<ShareAccountCreateBusinessEvent> {
+    private final class ShareAccountCreatedListener implements BusinessEventListener<ShareAccountCreateBusinessEvent> {
 
         @Override
         public void onBusinessEvent(ShareAccountCreateBusinessEvent event) {
@@ -302,7 +303,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
         }
     }
 
-    private class ShareAccountApprovedListener implements BusinessEventListener<ShareAccountApproveBusinessEvent> {
+    private final class ShareAccountApprovedListener implements BusinessEventListener<ShareAccountApproveBusinessEvent> {
 
         @Override
         public void onBusinessEvent(ShareAccountApproveBusinessEvent event) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/TellerApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/TellerApiResource.java
index ce49ec6b3..b88125466 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/TellerApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/TellerApiResource.java
@@ -403,7 +403,7 @@ public class TellerApiResource {
         return this.jsonSerializer.serialize(journals);
     }
 
-    private static class CashiersForTeller {
+    private static final class CashiersForTeller {
 
         public Long tellerId;
         public String tellerName;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorDomainServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorDomainServiceImpl.java
index 0888fe95d..209df00da 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorDomainServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorDomainServiceImpl.java
@@ -518,7 +518,7 @@ public class GuarantorDomainServiceImpl implements GuarantorDomainService {
         }
     }
 
-    private class ValidateOnBusinessEvent implements BusinessEventListener<LoanApprovedBusinessEvent> {
+    private final class ValidateOnBusinessEvent implements BusinessEventListener<LoanApprovedBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanApprovedBusinessEvent event) {
@@ -527,7 +527,7 @@ public class GuarantorDomainServiceImpl implements GuarantorDomainService {
         }
     }
 
-    private class HoldFundsOnBusinessEvent implements BusinessEventListener<LoanApprovedBusinessEvent> {
+    private final class HoldFundsOnBusinessEvent implements BusinessEventListener<LoanApprovedBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanApprovedBusinessEvent event) {
@@ -536,7 +536,7 @@ public class GuarantorDomainServiceImpl implements GuarantorDomainService {
         }
     }
 
-    private class ReleaseFundsOnBusinessEvent implements BusinessEventListener<LoanTransactionMakeRepaymentPostBusinessEvent> {
+    private final class ReleaseFundsOnBusinessEvent implements BusinessEventListener<LoanTransactionMakeRepaymentPostBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanTransactionMakeRepaymentPostBusinessEvent event) {
@@ -549,7 +549,7 @@ public class GuarantorDomainServiceImpl implements GuarantorDomainService {
         }
     }
 
-    private class ReverseFundsOnBusinessEvent implements BusinessEventListener<LoanUndoWrittenOffBusinessEvent> {
+    private final class ReverseFundsOnBusinessEvent implements BusinessEventListener<LoanUndoWrittenOffBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanUndoWrittenOffBusinessEvent event) {
@@ -560,7 +560,7 @@ public class GuarantorDomainServiceImpl implements GuarantorDomainService {
         }
     }
 
-    private class AdjustFundsOnBusinessEvent implements BusinessEventListener<LoanAdjustTransactionBusinessEvent> {
+    private final class AdjustFundsOnBusinessEvent implements BusinessEventListener<LoanAdjustTransactionBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanAdjustTransactionBusinessEvent event) {
@@ -578,7 +578,7 @@ public class GuarantorDomainServiceImpl implements GuarantorDomainService {
         }
     }
 
-    private class ReverseAllFundsOnBusinessEvent implements BusinessEventListener<LoanUndoDisbursalBusinessEvent> {
+    private final class ReverseAllFundsOnBusinessEvent implements BusinessEventListener<LoanUndoDisbursalBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanUndoDisbursalBusinessEvent event) {
@@ -588,7 +588,7 @@ public class GuarantorDomainServiceImpl implements GuarantorDomainService {
         }
     }
 
-    private class UndoAllFundTransactions implements BusinessEventListener<LoanUndoApprovalBusinessEvent> {
+    private final class UndoAllFundTransactions implements BusinessEventListener<LoanUndoApprovalBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanUndoApprovalBusinessEvent event) {
@@ -597,7 +597,7 @@ public class GuarantorDomainServiceImpl implements GuarantorDomainService {
         }
     }
 
-    private class ReleaseAllFunds implements BusinessEventListener<LoanWrittenOffPostBusinessEvent> {
+    private final class ReleaseAllFunds implements BusinessEventListener<LoanWrittenOffPostBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanWrittenOffPostBusinessEvent event) {
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 f0a245267..52a76ac35 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
@@ -393,7 +393,7 @@ public class LoanArrearsAgingServiceImpl implements LoanArrearsAgingService {
         }
     }
 
-    private class RefundEventListener implements BusinessEventListener<LoanRefundPostBusinessEvent> {
+    private final class RefundEventListener implements BusinessEventListener<LoanRefundPostBusinessEvent> {
 
         @SuppressWarnings("unused")
         @Override
@@ -404,7 +404,7 @@ public class LoanArrearsAgingServiceImpl implements LoanArrearsAgingService {
         }
     }
 
-    private class AdjustTransactionBusinessEventEventListener implements BusinessEventListener<LoanAdjustTransactionBusinessEvent> {
+    private final class AdjustTransactionBusinessEventEventListener implements BusinessEventListener<LoanAdjustTransactionBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanAdjustTransactionBusinessEvent event) {
@@ -417,7 +417,7 @@ public class LoanArrearsAgingServiceImpl implements LoanArrearsAgingService {
         }
     }
 
-    private class MakeRepaymentEventListener implements BusinessEventListener<LoanTransactionMakeRepaymentPostBusinessEvent> {
+    private final class MakeRepaymentEventListener implements BusinessEventListener<LoanTransactionMakeRepaymentPostBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanTransactionMakeRepaymentPostBusinessEvent event) {
@@ -427,7 +427,7 @@ public class LoanArrearsAgingServiceImpl implements LoanArrearsAgingService {
         }
     }
 
-    private class UndoWrittenOffEventListener implements BusinessEventListener<LoanUndoWrittenOffBusinessEvent> {
+    private final class UndoWrittenOffEventListener implements BusinessEventListener<LoanUndoWrittenOffBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanUndoWrittenOffBusinessEvent event) {
@@ -437,7 +437,7 @@ public class LoanArrearsAgingServiceImpl implements LoanArrearsAgingService {
         }
     }
 
-    private class WaiveInterestEventListener implements BusinessEventListener<LoanWaiveInterestBusinessEvent> {
+    private final class WaiveInterestEventListener implements BusinessEventListener<LoanWaiveInterestBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanWaiveInterestBusinessEvent event) {
@@ -447,7 +447,7 @@ public class LoanArrearsAgingServiceImpl implements LoanArrearsAgingService {
         }
     }
 
-    private class LoanForeClosureEventListener implements BusinessEventListener<LoanForeClosurePostBusinessEvent> {
+    private final class LoanForeClosureEventListener implements BusinessEventListener<LoanForeClosurePostBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanForeClosurePostBusinessEvent event) {
@@ -457,7 +457,7 @@ public class LoanArrearsAgingServiceImpl implements LoanArrearsAgingService {
         }
     }
 
-    private class LoanChargePaymentEventListener implements BusinessEventListener<LoanChargePaymentPostBusinessEvent> {
+    private final class LoanChargePaymentEventListener implements BusinessEventListener<LoanChargePaymentPostBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanChargePaymentPostBusinessEvent event) {
@@ -467,7 +467,7 @@ public class LoanArrearsAgingServiceImpl implements LoanArrearsAgingService {
         }
     }
 
-    private class AddChargeEventListener implements BusinessEventListener<LoanAddChargeBusinessEvent> {
+    private final class AddChargeEventListener implements BusinessEventListener<LoanAddChargeBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanAddChargeBusinessEvent event) {
@@ -477,7 +477,7 @@ public class LoanArrearsAgingServiceImpl implements LoanArrearsAgingService {
         }
     }
 
-    private class WaiveChargeEventListener implements BusinessEventListener<LoanWaiveChargeBusinessEvent> {
+    private final class WaiveChargeEventListener implements BusinessEventListener<LoanWaiveChargeBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanWaiveChargeBusinessEvent event) {
@@ -487,7 +487,7 @@ public class LoanArrearsAgingServiceImpl implements LoanArrearsAgingService {
         }
     }
 
-    private class ApplyOverdueChargeEventListener implements BusinessEventListener<LoanApplyOverdueChargeBusinessEvent> {
+    private final class ApplyOverdueChargeEventListener implements BusinessEventListener<LoanApplyOverdueChargeBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanApplyOverdueChargeBusinessEvent event) {
@@ -496,7 +496,7 @@ public class LoanArrearsAgingServiceImpl implements LoanArrearsAgingService {
         }
     }
 
-    private class DisbursementEventListener implements BusinessEventListener<LoanDisbursalBusinessEvent> {
+    private final class DisbursementEventListener implements BusinessEventListener<LoanDisbursalBusinessEvent> {
 
         @SuppressWarnings("unused")
         @Override
@@ -506,7 +506,7 @@ public class LoanArrearsAgingServiceImpl implements LoanArrearsAgingService {
         }
     }
 
-    private class GoodwillCreditEventListener implements BusinessEventListener<LoanTransactionGoodwillCreditPostBusinessEvent> {
+    private final class GoodwillCreditEventListener implements BusinessEventListener<LoanTransactionGoodwillCreditPostBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanTransactionGoodwillCreditPostBusinessEvent event) {
@@ -516,7 +516,7 @@ public class LoanArrearsAgingServiceImpl implements LoanArrearsAgingService {
         }
     }
 
-    private class PaymentRefundEventListener implements BusinessEventListener<LoanTransactionPayoutRefundPostBusinessEvent> {
+    private final class PaymentRefundEventListener implements BusinessEventListener<LoanTransactionPayoutRefundPostBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanTransactionPayoutRefundPostBusinessEvent event) {
@@ -526,7 +526,7 @@ public class LoanArrearsAgingServiceImpl implements LoanArrearsAgingService {
         }
     }
 
-    private class LoanBalanceChangedEventListener implements BusinessEventListener<LoanBalanceChangedBusinessEvent> {
+    private final class LoanBalanceChangedEventListener implements BusinessEventListener<LoanBalanceChangedBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanBalanceChangedBusinessEvent event) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanStatusChangePlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanStatusChangePlatformServiceImpl.java
index 5ca41a4f3..bbfd56df1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanStatusChangePlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanStatusChangePlatformServiceImpl.java
@@ -39,7 +39,7 @@ public class LoanStatusChangePlatformServiceImpl implements LoanStatusChangePlat
         businessEventNotifierService.addPostBusinessEventListener(LoanStatusChangedBusinessEvent.class, new LoanStatusChangedListener());
     }
 
-    private class LoanStatusChangedListener implements BusinessEventListener<LoanStatusChangedBusinessEvent> {
+    private final class LoanStatusChangedListener implements BusinessEventListener<LoanStatusChangedBusinessEvent> {
 
         @Override
         public void onBusinessEvent(LoanStatusChangedBusinessEvent event) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/template/service/TrustModifier.java b/fineract-provider/src/main/java/org/apache/fineract/template/service/TrustModifier.java
index f4e221d4d..390bca73e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/template/service/TrustModifier.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/template/service/TrustModifier.java
@@ -75,7 +75,7 @@ public final class TrustModifier {
         }
     }
 
-    private static class AlwaysTrustManager implements X509TrustManager {
+    private static final class AlwaysTrustManager implements X509TrustManager {
 
         @Override
         public void checkClientTrusted(final X509Certificate[] arg0, final String arg1) throws CertificateException {}// NOSONAR
diff --git a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/event/business/service/BusinessEventNotifierServiceImplTest.java b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/event/business/service/BusinessEventNotifierServiceImplTest.java
index 56984cc84..f69be4296 100644
--- a/fineract-provider/src/test/java/org/apache/fineract/infrastructure/event/business/service/BusinessEventNotifierServiceImplTest.java
+++ b/fineract-provider/src/test/java/org/apache/fineract/infrastructure/event/business/service/BusinessEventNotifierServiceImplTest.java
@@ -210,7 +210,7 @@ class BusinessEventNotifierServiceImplTest {
         return (BusinessEventListener<MockBusinessEvent>) mock(BusinessEventListener.class);
     }
 
-    private static class MockBusinessEvent implements BusinessEvent<Object> {
+    private static final class MockBusinessEvent implements BusinessEvent<Object> {
 
         @Override
         public Object get() {