You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by aw...@apache.org on 2020/06/19 13:39:13 UTC

[fineract] branch develop updated: FINERACT-822 Enforce ClassCanBeStatic check

This is an automated email from the ASF dual-hosted git repository.

awasum pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git


The following commit(s) were added to refs/heads/develop by this push:
     new a72c2f4  FINERACT-822 Enforce ClassCanBeStatic check
a72c2f4 is described below

commit a72c2f4e472f38d792fcdc58b1c89071f825a975
Author: percyashu <pe...@gmail.com>
AuthorDate: Thu Jun 18 20:18:55 2020 +0100

    FINERACT-822 Enforce ClassCanBeStatic check
---
 fineract-provider/build.gradle                     |   2 +-
 ...inancialActivityAccountsApiResourceSwagger.java |   2 +-
 ...EntryWritePlatformServiceJpaRepositoryImpl.java |   2 +-
 .../rule/api/AccountingRuleApiResourceSwagger.java |   2 +-
 .../fineract/batch/service/ResolutionHelper.java   |   2 +-
 .../sms/service/SmsCampaignDomainServiceImpl.java  |   2 +-
 .../codes/api/CodeValuesApiResourceSwagger.java    |   2 +-
 .../codes/api/CodesApiResourceSwagger.java         |   2 +-
 .../api/GlobalConfigurationApiResourceSwagger.java |   2 +-
 .../api/DatatablesApiResourceSwagger.java          |   8 +-
 .../dataqueries/api/ReportsApiResourceSwagger.java |   2 +-
 .../api/DocumentManagementApiResourceSwagger.java  |   4 +-
 .../fineract/infrastructure/gcm/domain/Sender.java |   2 +-
 .../hooks/api/HookApiResourceSwagger.java          |   2 +-
 .../jobs/api/SchedulerJobApiResourceSwagger.java   |   2 +-
 .../api/ReportMailingJobApiResourceSwagger.java    |   2 +-
 .../survey/api/SurveyApiResourceSwagger.java       |   2 +-
 .../service/NotificationDomainServiceImpl.java     |   2 +-
 .../holiday/api/HolidaysApiResourceSwagger.java    |   4 +-
 .../office/api/OfficesApiResourceSwagger.java      |   2 +-
 .../ProvisioningCriteriaApiResourceSwagger.java    |   2 +-
 .../staff/api/StaffApiResourceSwagger.java         |   2 +-
 .../organisation/teller/api/TellerApiResource.java |   2 +-
 .../teller/api/TellerApiResourceSwagger.java       |   4 +-
 .../api/AccountTransfersApiResourceSwagger.java    |  54 ++++-----
 .../api/StandingInstructionApiResourceSwagger.java |  58 +++++-----
 ...andingInstructionHistoryApiResourceSwagger.java |  10 +-
 .../accounts/api/AccountsApiResourceSwagger.java   |  42 +++----
 .../charge/api/ChargesApiResourceSwagger.java      |  16 +--
 .../api/ClientChargesApiResourceSwagger.java       |   8 +-
 .../api/ClientIdentifiersApiResourceSwagger.java   |   4 +-
 .../api/ClientTransactionsApiResourceSwagger.java  |   6 +-
 .../client/api/ClientsApiResourceSwagger.java      |  30 ++---
 .../api/CollateralsApiResourceSwagger.java         |   6 +-
 .../api/CollectionSheetApiResourceSwagger.java     |   4 +-
 .../api/FloatingRatesApiResourceSwagger.java       |   6 +-
 .../FloatingRatesReadPlatformServiceImpl.java      |   6 +-
 .../group/api/CentersApiResourceSwagger.java       |  24 ++--
 .../group/api/GroupsApiResourceSwagger.java        |  46 ++++----
 .../InterestRateChartSlabsApiResourceSwagger.java  |  12 +-
 .../api/InterestRateChartsApiResourceSwagger.java  |   6 +-
 .../api/LoanChargesApiResourceSwagger.java         |  12 +-
 .../api/LoanScheduleApiResourceSwagger.java        |   2 +-
 .../api/LoanTransactionsApiResourceSwagger.java    |   8 +-
 .../loanaccount/api/LoansApiResourceSwagger.java   |  46 ++++----
 .../domain/AbstractLoanScheduleGenerator.java      |   4 +-
 .../api/LoanProductsApiResourceSwagger.java        | 122 ++++++++++-----------
 .../note/api/NotesApiResourceSwagger.java          |   4 +-
 .../products/api/ProductsApiResourceSwagger.java   |  62 +++++------
 .../FixedDepositAccountsApiResourceSwagger.java    |  40 +++----
 .../FixedDepositProductsApiResourceSwagger.java    |  62 +++++------
 ...positAccountTransactionsApiResourceSwagger.java |  14 +--
 ...RecurringDepositAccountsApiResourceSwagger.java |  38 +++----
 ...RecurringDepositProductsApiResourceSwagger.java |  64 +++++------
 .../SavingsAccountChargesApiResourceSwagger.java   |  14 +--
 .../api/SavingsAccountsApiResourceSwagger.java     |  26 ++---
 .../api/SavingsProductsApiResourceSwagger.java     |  88 +++++++--------
 .../savings/domain/RecurringDepositAccount.java    |   2 +-
 .../DepositAccountReadPlatformServiceImpl.java     |   2 +-
 .../api/SelfAccountTransferApiResourceSwagger.java |   6 +-
 .../SelfBeneficiariesTPTApiResourceSwagger.java    |   4 +-
 .../SelfAccountTransferReadServiceImpl.java        |   2 +-
 .../client/api/SelfClientsApiResourceSwagger.java  |  28 ++---
 .../api/SelfLoansApiResourceSwagger.java           |  64 +++++------
 .../self/pockets/api/PocketApiResourceSwagger.java |   8 +-
 .../runreport/SelfRunReportApiResourceSwagger.java |   4 +-
 .../savings/api/SelfSavingsApiResourceSwagger.java |  28 ++---
 .../api/SelfAuthenticationApiResourceSwagger.java  |   4 +-
 .../security/api/SelfUserApiResourceSwagger.java   |   2 +-
 .../api/SelfUserDetailsApiResourceSwagger.java     |   4 +-
 .../api/SelfShareAccountsApiResourceSwagger.java   |  74 ++++++-------
 .../tax/api/TaxComponentApiResourceSwagger.java    |   8 +-
 .../tax/api/TaxGroupApiResourceSwagger.java        |  12 +-
 .../api/RolesApiResourceSwagger.java               |   8 +-
 .../api/UsersApiResourceSwagger.java               |   4 +-
 75 files changed, 634 insertions(+), 634 deletions(-)

diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index f67d5bb..1dfcfd3 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -335,7 +335,6 @@ tasks.withType(JavaCompile) {
         //Todo Remove necessary checks from this list
         disable(
                 "UnusedVariable",
-                "ClassCanBeStatic",
                 "SameNameButDifferent",
                 "StringSplitter",
                 "ImmutableEnumChecker",
@@ -396,6 +395,7 @@ tasks.withType(JavaCompile) {
                 "WildcardImport",
                 "FutureReturnValueIgnored",
                 "PrivateConstructorForNoninstantiableModule",
+                "ClassCanBeStatic",
                 "ClassNewInstance",
                 "UnsafeFinalization",
                 "JodaPlusMinusLong",
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResourceSwagger.java
index f533a62..44a8b4b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResourceSwagger.java
@@ -88,7 +88,7 @@ final class FinancialActivityAccountsApiResourceSwagger {
 
         }
 
-        public final class PutFinancialActivityAccountscommentsSwagger {
+        public static final class PutFinancialActivityAccountscommentsSwagger {
 
             private PutFinancialActivityAccountscommentsSwagger() {}
 
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 165e32f..3fb8c27 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
@@ -782,7 +782,7 @@ public class JournalEntryWritePlatformServiceJpaRepositoryImpl implements Journa
         accountingProcessorForClientTransactions.createJournalEntriesForClientTransaction(clientTransactionDTO);
     }
 
-    private class OfficeCurrencyKey {
+    private static class OfficeCurrencyKey {
 
         Office office;
         String currency;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleApiResourceSwagger.java
index 6fb0841..a29bb38 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/rule/api/AccountingRuleApiResourceSwagger.java
@@ -117,7 +117,7 @@ final class AccountingRuleApiResourceSwagger {
 
         }
 
-        public class PutAccountingRulesResponsechangesSwagger {
+        public static class PutAccountingRulesResponsechangesSwagger {
 
             public PutAccountingRulesResponsechangesSwagger() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/batch/service/ResolutionHelper.java b/fineract-provider/src/main/java/org/apache/fineract/batch/service/ResolutionHelper.java
index ec43caa..50102e1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/batch/service/ResolutionHelper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/batch/service/ResolutionHelper.java
@@ -49,7 +49,7 @@ public class ResolutionHelper {
      * @author Rishabh shukla
      *
      */
-    public class BatchRequestNode {
+    public static class BatchRequestNode {
 
         private BatchRequest request;
         private final List<BatchRequestNode> childRequests = new ArrayList<>();
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 e128b56..ba87cf9 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
@@ -384,7 +384,7 @@ public class SmsCampaignDomainServiceImpl implements SmsCampaignDomainService {
         return smsParams;
     }
 
-    private abstract class SmsBusinessEventAdapter implements BusinessEventListner {
+    private abstract static class SmsBusinessEventAdapter implements BusinessEventListner {
 
         @Override
         public void businessEventToBeExecuted(Map<BusinessEntity, Object> businessEventEntity) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodeValuesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodeValuesApiResourceSwagger.java
index 9035061..7684a81 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodeValuesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodeValuesApiResourceSwagger.java
@@ -95,7 +95,7 @@ final class CodeValuesApiResourceSwagger {
 
         }
 
-        private final class PutCodeValuechangesSwagger {
+        private static final class PutCodeValuechangesSwagger {
 
             private PutCodeValuechangesSwagger() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodesApiResourceSwagger.java
index bdf1820..9241966 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/codes/api/CodesApiResourceSwagger.java
@@ -85,7 +85,7 @@ final class CodesApiResourceSwagger {
 
         }
 
-        private final class PutCodesApichangesSwagger {
+        private static final class PutCodesApichangesSwagger {
 
             private PutCodesApichangesSwagger() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/GlobalConfigurationApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/GlobalConfigurationApiResourceSwagger.java
index 18e4ef8..bb50dd8 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/GlobalConfigurationApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/GlobalConfigurationApiResourceSwagger.java
@@ -56,7 +56,7 @@ final class GlobalConfigurationApiResourceSwagger {
 
         private PutGlobalConfigurationsResponse() {}
 
-        final class PutGlobalConfigurationsResponsechangesSwagger {
+        static final class PutGlobalConfigurationsResponsechangesSwagger {
 
             private PutGlobalConfigurationsResponsechangesSwagger() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DatatablesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DatatablesApiResourceSwagger.java
index 7bf0ac4..6bbceaf 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DatatablesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DatatablesApiResourceSwagger.java
@@ -81,7 +81,7 @@ final class DatatablesApiResourceSwagger {
 
         }
 
-        final class PutDataTablesRequestDropColumns {
+        static final class PutDataTablesRequestDropColumns {
 
             private PutDataTablesRequestDropColumns() {}
 
@@ -89,7 +89,7 @@ final class DatatablesApiResourceSwagger {
             public String name;
         }
 
-        final class PutDataTablesRequestAddColumns {
+        static final class PutDataTablesRequestAddColumns {
 
             private PutDataTablesRequestAddColumns() {}
 
@@ -103,7 +103,7 @@ final class DatatablesApiResourceSwagger {
             public boolean mandatory;
         }
 
-        final class PutDataTablesRequestChangeColumns {
+        static final class PutDataTablesRequestChangeColumns {
 
             private PutDataTablesRequestChangeColumns() {}
 
@@ -221,7 +221,7 @@ final class DatatablesApiResourceSwagger {
 
         }
 
-        final class PutDataTablesAppTableIdResponseChanges {
+        static final class PutDataTablesAppTableIdResponseChanges {
 
             private PutDataTablesAppTableIdResponseChanges() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/ReportsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/ReportsApiResourceSwagger.java
index d62dd9c..248b567 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/ReportsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/ReportsApiResourceSwagger.java
@@ -126,7 +126,7 @@ final class ReportsApiResourceSwagger {
 
         }
 
-        final class PutReportResponseChanges {
+        static final class PutReportResponseChanges {
 
             private PutReportResponseChanges() {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/DocumentManagementApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/DocumentManagementApiResourceSwagger.java
index d4d84b0..3cf6b7c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/DocumentManagementApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/api/DocumentManagementApiResourceSwagger.java
@@ -80,7 +80,7 @@ final class DocumentManagementApiResourceSwagger {
 
         }
 
-        public final class PutEntityTypeEntityIdDocumentsResponseChangesSwagger {
+        public static final class PutEntityTypeEntityIdDocumentsResponseChangesSwagger {
 
             private PutEntityTypeEntityIdDocumentsResponseChangesSwagger() {
 
@@ -102,7 +102,7 @@ final class DocumentManagementApiResourceSwagger {
 
         }
 
-        public final class PutEntityTypeEntityIdDocumentsResponseChangesSwagger {
+        public static final class PutEntityTypeEntityIdDocumentsResponseChangesSwagger {
 
             private PutEntityTypeEntityIdDocumentsResponseChangesSwagger() {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Sender.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Sender.java
index 48918e3..3beeff1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Sender.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/domain/Sender.java
@@ -603,7 +603,7 @@ public class Sender {
         return (Number) value;
     }
 
-    class CustomParserException extends RuntimeException {
+    static class CustomParserException extends RuntimeException {
 
         CustomParserException(String message) {
             super(message);
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/api/HookApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/api/HookApiResourceSwagger.java
index 4a8fd4c..0c4703f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/api/HookApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/api/HookApiResourceSwagger.java
@@ -142,7 +142,7 @@ final class HookApiResourceSwagger {
 
         }
 
-        final class PutHookResponseChangesSwagger {
+        static final class PutHookResponseChangesSwagger {
 
             private PutHookResponseChangesSwagger() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerJobApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerJobApiResourceSwagger.java
index 205749d..641debd 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerJobApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerJobApiResourceSwagger.java
@@ -80,7 +80,7 @@ final class SchedulerJobApiResourceSwagger {
 
         }
 
-        final class JobDetailHistoryDataSwagger {
+        static final class JobDetailHistoryDataSwagger {
 
             private JobDetailHistoryDataSwagger() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobApiResourceSwagger.java
index 65791f0..189ca90 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/api/ReportMailingJobApiResourceSwagger.java
@@ -155,7 +155,7 @@ final class ReportMailingJobApiResourceSwagger {
 
         }
 
-        final class PutReportMailingJobsResponseChanges {
+        static final class PutReportMailingJobsResponseChanges {
 
             private PutReportMailingJobsResponseChanges() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/SurveyApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/SurveyApiResourceSwagger.java
index aefdc98..34709a8 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/SurveyApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/SurveyApiResourceSwagger.java
@@ -40,7 +40,7 @@ final class SurveyApiResourceSwagger {
 
         }
 
-        final class GetSurveyResponseDatatableData {
+        static final class GetSurveyResponseDatatableData {
 
             private GetSurveyResponseDatatableData() {
 
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 d1a1593..297cc4c 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
@@ -106,7 +106,7 @@ public class NotificationDomainServiceImpl implements NotificationDomainService
         businessEventNotifierService.addBusinessEventPostListners(BusinessEvents.SHARE_ACCOUNT_APPROVE, new ShareAccountApprovedListener());
     }
 
-    private abstract class NotificationBusinessEventAdapter implements BusinessEventListner {
+    private abstract static class NotificationBusinessEventAdapter implements BusinessEventListner {
 
         @Override
         public void businessEventToBeExecuted(Map<BusinessEventNotificationConstants.BusinessEntity, Object> businessEventEntity) {}
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/api/HolidaysApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/api/HolidaysApiResourceSwagger.java
index 5146bdc..5a7b673 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/api/HolidaysApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/api/HolidaysApiResourceSwagger.java
@@ -62,7 +62,7 @@ final class HolidaysApiResourceSwagger {
 
         }
 
-        final class PostHolidaysRequestOffices {
+        static final class PostHolidaysRequestOffices {
 
             private PostHolidaysRequestOffices() {
 
@@ -139,7 +139,7 @@ final class HolidaysApiResourceSwagger {
 
         }
 
-        final class PutHolidaysHolidayIdResponseChanges {
+        static final class PutHolidaysHolidayIdResponseChanges {
 
             private PutHolidaysHolidayIdResponseChanges() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/api/OfficesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/api/OfficesApiResourceSwagger.java
index b749239..8a78eab 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/office/api/OfficesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/office/api/OfficesApiResourceSwagger.java
@@ -122,7 +122,7 @@ final class OfficesApiResourceSwagger {
 
         }
 
-        final class PutOfficesOfficeIdResponseChanges {
+        static final class PutOfficesOfficeIdResponseChanges {
 
             private PutOfficesOfficeIdResponseChanges() {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/api/ProvisioningCriteriaApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/api/ProvisioningCriteriaApiResourceSwagger.java
index 8612a66..e523511 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/api/ProvisioningCriteriaApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/provisioning/api/ProvisioningCriteriaApiResourceSwagger.java
@@ -109,7 +109,7 @@ final class ProvisioningCriteriaApiResourceSwagger {
 
         }
 
-        final class PutProvisioningCriteriaResponseChanges {
+        static final class PutProvisioningCriteriaResponseChanges {
 
             private PutProvisioningCriteriaResponseChanges() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/api/StaffApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/api/StaffApiResourceSwagger.java
index b4dbd8a..f9f83b9 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/api/StaffApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/api/StaffApiResourceSwagger.java
@@ -126,7 +126,7 @@ final class StaffApiResourceSwagger {
 
         }
 
-        final class PutStaffResponseChanges {
+        static final class PutStaffResponseChanges {
 
             private PutStaffResponseChanges() {}
 
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 be06cae..50ff531 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
@@ -418,7 +418,7 @@ public class TellerApiResource {
         return this.jsonSerializer.serialize(journals);
     }
 
-    private class CashiersForTeller {
+    private static class CashiersForTeller {
 
         public Long tellerId;
         public String tellerName;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/TellerApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/TellerApiResourceSwagger.java
index 2edac30..c4c2ee4 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/TellerApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/teller/api/TellerApiResourceSwagger.java
@@ -136,7 +136,7 @@ final class TellerApiResourceSwagger {
 
         }
 
-        final class PutTellersResponseChanges {
+        static final class PutTellersResponseChanges {
 
             private PutTellersResponseChanges() {}
 
@@ -280,7 +280,7 @@ final class TellerApiResourceSwagger {
 
         }
 
-        final class PutTellersTellerIdCashiersCashierIdResponseChanges {
+        static final class PutTellersTellerIdCashiersCashierIdResponseChanges {
 
             private PutTellersTellerIdCashiersCashierIdResponseChanges() {}
 
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 d131c51..e34591f 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
@@ -35,7 +35,7 @@ final class AccountTransfersApiResourceSwagger {
 
         private GetAccountTransfersTemplateResponse() {}
 
-        final class GetAccountTransfersFromOffice {
+        static final class GetAccountTransfersFromOffice {
 
             private GetAccountTransfersFromOffice() {}
 
@@ -53,7 +53,7 @@ final class AccountTransfersApiResourceSwagger {
             public String hierarchy;
         }
 
-        final class GetAccountTransfersFromAccountType {
+        static final class GetAccountTransfersFromAccountType {
 
             private GetAccountTransfersFromAccountType() {}
 
@@ -65,7 +65,7 @@ final class AccountTransfersApiResourceSwagger {
             public String value;
         }
 
-        final class GetAccountTransfersFromOfficeOptions {
+        static final class GetAccountTransfersFromOfficeOptions {
 
             private GetAccountTransfersFromOfficeOptions() {}
 
@@ -77,7 +77,7 @@ final class AccountTransfersApiResourceSwagger {
             public String nameDecorated;
         }
 
-        final class GetAccountTransfersFromClientOptions {
+        static final class GetAccountTransfersFromClientOptions {
 
             private GetAccountTransfersFromClientOptions() {}
 
@@ -91,7 +91,7 @@ final class AccountTransfersApiResourceSwagger {
             public String officeName;
         }
 
-        final class GetAccountTransfersFromAccountTypeOptions {
+        static final class GetAccountTransfersFromAccountTypeOptions {
 
             private GetAccountTransfersFromAccountTypeOptions() {}
 
@@ -103,7 +103,7 @@ final class AccountTransfersApiResourceSwagger {
             public String value;
         }
 
-        final class GetAccountTransfersToOfficeOptions {
+        static final class GetAccountTransfersToOfficeOptions {
 
             private GetAccountTransfersToOfficeOptions() {}
 
@@ -115,7 +115,7 @@ final class AccountTransfersApiResourceSwagger {
             public String nameDecorated;
         }
 
-        final class GetAccountTransfersToAccountTypeOptions {
+        static final class GetAccountTransfersToAccountTypeOptions {
 
             private GetAccountTransfersToAccountTypeOptions() {}
 
@@ -189,11 +189,11 @@ final class AccountTransfersApiResourceSwagger {
 
         private GetAccountTransfersResponse() {}
 
-        final class GetAccountTransfersPageItems {
+        static final class GetAccountTransfersPageItems {
 
             private GetAccountTransfersPageItems() {}
 
-            final class GetAccountTransfersPageItemsCurrency {
+            static final class GetAccountTransfersPageItemsCurrency {
 
                 private GetAccountTransfersPageItemsCurrency() {}
 
@@ -211,7 +211,7 @@ final class AccountTransfersApiResourceSwagger {
                 public String displayLabel;
             }
 
-            final class GetAccountTransfersPageItemsFromOffice {
+            static final class GetAccountTransfersPageItemsFromOffice {
 
                 private GetAccountTransfersPageItemsFromOffice() {}
 
@@ -221,7 +221,7 @@ final class AccountTransfersApiResourceSwagger {
                 public String name;
             }
 
-            final class GetAccountTransfersPageItemsFromAccount {
+            static final class GetAccountTransfersPageItemsFromAccount {
 
                 private GetAccountTransfersPageItemsFromAccount() {}
 
@@ -231,7 +231,7 @@ final class AccountTransfersApiResourceSwagger {
                 public Long accountNo;
             }
 
-            final class GetAccountTransfersPageItemsToAccountType {
+            static final class GetAccountTransfersPageItemsToAccountType {
 
                 private GetAccountTransfersPageItemsToAccountType() {}
 
@@ -274,7 +274,7 @@ final class AccountTransfersApiResourceSwagger {
 
         private GetAccountTransfersTemplateRefundByTransferResponse() {}
 
-        final class GetAccountTransfersTemplateRefundByTransferCurrency {
+        static final class GetAccountTransfersTemplateRefundByTransferCurrency {
 
             private GetAccountTransfersTemplateRefundByTransferCurrency() {}
 
@@ -294,7 +294,7 @@ final class AccountTransfersApiResourceSwagger {
             public String displayLabel;
         }
 
-        final class GetAccountTransfersTemplateRefundByTransferFromOffice {
+        static final class GetAccountTransfersTemplateRefundByTransferFromOffice {
 
             private GetAccountTransfersTemplateRefundByTransferFromOffice() {}
 
@@ -312,11 +312,11 @@ final class AccountTransfersApiResourceSwagger {
             public String hierarchy;
         }
 
-        final class GetAccountTransfersTemplateRefundByTransferFromClient {
+        static final class GetAccountTransfersTemplateRefundByTransferFromClient {
 
             private GetAccountTransfersTemplateRefundByTransferFromClient() {}
 
-            final class GetAccountTransfersStatus {
+            static final class GetAccountTransfersStatus {
 
                 private GetAccountTransfersStatus() {}
 
@@ -328,22 +328,22 @@ final class AccountTransfersApiResourceSwagger {
                 public String value;
             }
 
-            final class GetAccountTransfersGender {
+            static final class GetAccountTransfersGender {
 
                 private GetAccountTransfersGender() {}
             }
 
-            final class GetAccountTransfersClientType {
+            static final class GetAccountTransfersClientType {
 
                 private GetAccountTransfersClientType() {}
             }
 
-            final class GetAccountTransfersClientClassification {
+            static final class GetAccountTransfersClientClassification {
 
                 private GetAccountTransfersClientClassification() {}
             }
 
-            final class GetAccountTransfersTimeline {
+            static final class GetAccountTransfersTimeline {
 
                 private GetAccountTransfersTimeline() {}
 
@@ -365,7 +365,7 @@ final class AccountTransfersApiResourceSwagger {
                 public String activatedByLastname;
             }
 
-            final class GetAccountTransfersGroups {
+            static final class GetAccountTransfersGroups {
 
                 private GetAccountTransfersGroups() {}
             }
@@ -396,7 +396,7 @@ final class AccountTransfersApiResourceSwagger {
             public GetAccountTransfersGroups groups;
         }
 
-        final class GetAccountTransfersTemplateRefundByTransferFromAccount {
+        static final class GetAccountTransfersTemplateRefundByTransferFromAccount {
 
             private GetAccountTransfersTemplateRefundByTransferFromAccount() {}
 
@@ -419,7 +419,7 @@ final class AccountTransfersApiResourceSwagger {
             public Float amtForTransfer;
         }
 
-        final class GetAccountTransfersTemplateRefundByTransferToClient {
+        static final class GetAccountTransfersTemplateRefundByTransferToClient {
 
             private GetAccountTransfersTemplateRefundByTransferToClient() {}
 
@@ -433,7 +433,7 @@ final class AccountTransfersApiResourceSwagger {
             public String officeName;
         }
 
-        final class GetAccountTransfersTemplateRefundByTransferToAccount {
+        static final class GetAccountTransfersTemplateRefundByTransferToAccount {
 
             private GetAccountTransfersTemplateRefundByTransferToAccount() {}
 
@@ -454,7 +454,7 @@ final class AccountTransfersApiResourceSwagger {
             public GetAccountTransfersTemplateRefundByTransferCurrency currency;
         }
 
-        final class GetAccountTransfersTemplateRefundByTransferFromOfficeOptions {
+        static final class GetAccountTransfersTemplateRefundByTransferFromOfficeOptions {
 
             private GetAccountTransfersTemplateRefundByTransferFromOfficeOptions() {}
 
@@ -466,7 +466,7 @@ final class AccountTransfersApiResourceSwagger {
             public String nameDecorated;
         }
 
-        final class GetAccountTransfersTemplateRefundByTransferFromClientOptions {
+        static final class GetAccountTransfersTemplateRefundByTransferFromClientOptions {
 
             private GetAccountTransfersTemplateRefundByTransferFromClientOptions() {}
 
@@ -480,7 +480,7 @@ final class AccountTransfersApiResourceSwagger {
             public String officeName;
         }
 
-        final class GetAccountTransfersTemplateRefundByTransferFromAccountOptions {
+        static final class GetAccountTransfersTemplateRefundByTransferFromAccountOptions {
 
             private GetAccountTransfersTemplateRefundByTransferFromAccountOptions() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/StandingInstructionApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/StandingInstructionApiResourceSwagger.java
index 2f0c806..a797dcc 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/StandingInstructionApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/StandingInstructionApiResourceSwagger.java
@@ -37,7 +37,7 @@ final class StandingInstructionApiResourceSwagger {
 
         private GetStandingInstructionsTemplateResponse() {}
 
-        final class GetFromOfficeResponseStandingInstructionSwagger {
+        static final class GetFromOfficeResponseStandingInstructionSwagger {
 
             private GetFromOfficeResponseStandingInstructionSwagger() {}
 
@@ -55,7 +55,7 @@ final class StandingInstructionApiResourceSwagger {
             public String hierarchy;
         }
 
-        final class GetFromAccountTypeResponseStandingInstructionSwagger {
+        static final class GetFromAccountTypeResponseStandingInstructionSwagger {
 
             private GetFromAccountTypeResponseStandingInstructionSwagger() {}
 
@@ -67,7 +67,7 @@ final class StandingInstructionApiResourceSwagger {
             public String value;
         }
 
-        final class GetFromOfficeOptionsResponseStandingInstructionSwagger {
+        static final class GetFromOfficeOptionsResponseStandingInstructionSwagger {
 
             private GetFromOfficeOptionsResponseStandingInstructionSwagger() {}
 
@@ -79,7 +79,7 @@ final class StandingInstructionApiResourceSwagger {
             public String nameDecorated;
         }
 
-        final class GetFromClientOptionsResponseStandingInstructionSwagger {
+        static final class GetFromClientOptionsResponseStandingInstructionSwagger {
 
             private GetFromClientOptionsResponseStandingInstructionSwagger() {}
 
@@ -93,7 +93,7 @@ final class StandingInstructionApiResourceSwagger {
             public String officeName;
         }
 
-        final class GetFromAccountTypeOptionsResponseStandingInstructionSwagger {
+        static final class GetFromAccountTypeOptionsResponseStandingInstructionSwagger {
 
             private GetFromAccountTypeOptionsResponseStandingInstructionSwagger() {}
 
@@ -105,7 +105,7 @@ final class StandingInstructionApiResourceSwagger {
             public String value;
         }
 
-        final class GetToOfficeOptionsResponseStandingInstructionSwagger {
+        static final class GetToOfficeOptionsResponseStandingInstructionSwagger {
 
             private GetToOfficeOptionsResponseStandingInstructionSwagger() {}
 
@@ -117,7 +117,7 @@ final class StandingInstructionApiResourceSwagger {
             public String nameDecorated;
         }
 
-        final class GetToAccountTypeOptionsResponseStandingInstructionSwagger {
+        static final class GetToAccountTypeOptionsResponseStandingInstructionSwagger {
 
             private GetToAccountTypeOptionsResponseStandingInstructionSwagger() {}
 
@@ -129,7 +129,7 @@ final class StandingInstructionApiResourceSwagger {
             public String value;
         }
 
-        final class GetTransferTypeOptionsResponseStandingInstructionSwagger {
+        static final class GetTransferTypeOptionsResponseStandingInstructionSwagger {
 
             private GetTransferTypeOptionsResponseStandingInstructionSwagger() {}
 
@@ -141,7 +141,7 @@ final class StandingInstructionApiResourceSwagger {
             public String value;
         }
 
-        final class GetStatusOptionsResponseStandingInstructionSwagger {
+        static final class GetStatusOptionsResponseStandingInstructionSwagger {
 
             private GetStatusOptionsResponseStandingInstructionSwagger() {}
 
@@ -153,7 +153,7 @@ final class StandingInstructionApiResourceSwagger {
             public String value;
         }
 
-        final class GetInstructionTypeOptionsResponseStandingInstructionSwagger {
+        static final class GetInstructionTypeOptionsResponseStandingInstructionSwagger {
 
             private GetInstructionTypeOptionsResponseStandingInstructionSwagger() {}
 
@@ -165,7 +165,7 @@ final class StandingInstructionApiResourceSwagger {
             public String value;
         }
 
-        final class GetPriorityOptionsResponseStandingInstructionSwagger {
+        static final class GetPriorityOptionsResponseStandingInstructionSwagger {
 
             private GetPriorityOptionsResponseStandingInstructionSwagger() {}
 
@@ -177,7 +177,7 @@ final class StandingInstructionApiResourceSwagger {
             public String value;
         }
 
-        final class GetRecurrenceTypeOptionsResponseStandingInstructionSwagger {
+        static final class GetRecurrenceTypeOptionsResponseStandingInstructionSwagger {
 
             private GetRecurrenceTypeOptionsResponseStandingInstructionSwagger() {}
 
@@ -189,7 +189,7 @@ final class StandingInstructionApiResourceSwagger {
             public String value;
         }
 
-        final class GetRecurrenceFrequencyOptionsResponseStandingInstructionSwagger {
+        static final class GetRecurrenceFrequencyOptionsResponseStandingInstructionSwagger {
 
             private GetRecurrenceFrequencyOptionsResponseStandingInstructionSwagger() {}
 
@@ -232,9 +232,9 @@ final class StandingInstructionApiResourceSwagger {
 
         private GetStandingInstructionsResponse() {}
 
-        final class GetPageItemsStandingInstructionSwagger {
+        static final class GetPageItemsStandingInstructionSwagger {
 
-            final class GetFromOfficeStandingInstructionSwagger {
+            static final class GetFromOfficeStandingInstructionSwagger {
 
                 private GetFromOfficeStandingInstructionSwagger() {}
 
@@ -244,7 +244,7 @@ final class StandingInstructionApiResourceSwagger {
                 public String name;
             }
 
-            final class GetFromClientStandingInstructionSwagger {
+            static final class GetFromClientStandingInstructionSwagger {
 
                 private GetFromClientStandingInstructionSwagger() {}
 
@@ -258,7 +258,7 @@ final class StandingInstructionApiResourceSwagger {
                 public String officeName;
             }
 
-            final class GetFromAccountTypeStandingInstructionSwagger {
+            static final class GetFromAccountTypeStandingInstructionSwagger {
 
                 private GetFromAccountTypeStandingInstructionSwagger() {}
 
@@ -270,7 +270,7 @@ final class StandingInstructionApiResourceSwagger {
                 public String value;
             }
 
-            final class GetFromAccountStandingInstructionSwagger {
+            static final class GetFromAccountStandingInstructionSwagger {
 
                 private GetFromAccountStandingInstructionSwagger() {}
 
@@ -284,7 +284,7 @@ final class StandingInstructionApiResourceSwagger {
                 public String productName;
             }
 
-            final class GetToOfficeStandingInstructionSwagger {
+            static final class GetToOfficeStandingInstructionSwagger {
 
                 private GetToOfficeStandingInstructionSwagger() {}
 
@@ -294,7 +294,7 @@ final class StandingInstructionApiResourceSwagger {
                 public String name;
             }
 
-            final class GetToClientStandingInstructionSwagger {
+            static final class GetToClientStandingInstructionSwagger {
 
                 private GetToClientStandingInstructionSwagger() {}
 
@@ -308,7 +308,7 @@ final class StandingInstructionApiResourceSwagger {
                 public String officeName;
             }
 
-            final class GetToAccountTypeStandingInstructionSwagger {
+            static final class GetToAccountTypeStandingInstructionSwagger {
 
                 private GetToAccountTypeStandingInstructionSwagger() {}
 
@@ -320,7 +320,7 @@ final class StandingInstructionApiResourceSwagger {
                 public String value;
             }
 
-            final class GetToAccountStandingInstructionSwagger {
+            static final class GetToAccountStandingInstructionSwagger {
 
                 private GetToAccountStandingInstructionSwagger() {}
 
@@ -334,7 +334,7 @@ final class StandingInstructionApiResourceSwagger {
                 public String productName;
             }
 
-            final class GetTransferTypeStandingInstructionSwagger {
+            static final class GetTransferTypeStandingInstructionSwagger {
 
                 private GetTransferTypeStandingInstructionSwagger() {}
 
@@ -346,7 +346,7 @@ final class StandingInstructionApiResourceSwagger {
                 public String value;
             }
 
-            final class GetPriorityStandingInstructionSwagger {
+            static final class GetPriorityStandingInstructionSwagger {
 
                 private GetPriorityStandingInstructionSwagger() {}
 
@@ -358,7 +358,7 @@ final class StandingInstructionApiResourceSwagger {
                 public String value;
             }
 
-            final class GetInstructionTypeStandingInstructionSwagger {
+            static final class GetInstructionTypeStandingInstructionSwagger {
 
                 private GetInstructionTypeStandingInstructionSwagger() {}
 
@@ -370,7 +370,7 @@ final class StandingInstructionApiResourceSwagger {
                 public String value;
             }
 
-            final class GetStatusStandingInstructionSwagger {
+            static final class GetStatusStandingInstructionSwagger {
 
                 private GetStatusStandingInstructionSwagger() {}
 
@@ -382,7 +382,7 @@ final class StandingInstructionApiResourceSwagger {
                 public String value;
             }
 
-            final class GetRecurrenceTypeStandingInstructionSwagger {
+            static final class GetRecurrenceTypeStandingInstructionSwagger {
 
                 private GetRecurrenceTypeStandingInstructionSwagger() {}
 
@@ -394,7 +394,7 @@ final class StandingInstructionApiResourceSwagger {
                 public String value;
             }
 
-            final class GetRecurrenceFrequencyStandingInstructionSwagger {
+            static final class GetRecurrenceFrequencyStandingInstructionSwagger {
 
                 private GetRecurrenceFrequencyStandingInstructionSwagger() {}
 
@@ -532,7 +532,7 @@ final class StandingInstructionApiResourceSwagger {
 
         private PutStandingInstructionsStandingInstructionIdResponse() {}
 
-        final class PutUpdateStandingInstructionChanges {
+        static final class PutUpdateStandingInstructionChanges {
 
             @ApiModelProperty(example = "2")
             public Integer recurrenceInterval;
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 c174dde..1a07e33 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
@@ -35,9 +35,9 @@ final class StandingInstructionHistoryApiResourceSwagger {
 
         private GetStandingInstructionRunHistoryResponse() {}
 
-        final class GetStandingInstructionHistoryPageItemsResponse {
+        static final class GetStandingInstructionHistoryPageItemsResponse {
 
-            final class GetStandingInstructionHistoryPageItemsFromClient {
+            static final class GetStandingInstructionHistoryPageItemsFromClient {
 
                 private GetStandingInstructionHistoryPageItemsFromClient() {}
 
@@ -51,7 +51,7 @@ final class StandingInstructionHistoryApiResourceSwagger {
                 public String officeName;
             }
 
-            final class GetStandingInstructionHistoryFromAccount {
+            static final class GetStandingInstructionHistoryFromAccount {
 
                 private GetStandingInstructionHistoryFromAccount() {}
 
@@ -65,7 +65,7 @@ final class StandingInstructionHistoryApiResourceSwagger {
                 public String productName;
             }
 
-            final class GetStandingInstructionHistoryToAccount {
+            static final class GetStandingInstructionHistoryToAccount {
 
                 private GetStandingInstructionHistoryToAccount() {}
 
@@ -79,7 +79,7 @@ final class StandingInstructionHistoryApiResourceSwagger {
                 public String productName;
             }
 
-            final class GetStandingInstructionHistoryToClient {
+            static final class GetStandingInstructionHistoryToClient {
 
                 private GetStandingInstructionHistoryToClient() {}
 
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 a341efc..9b0f717 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
@@ -36,7 +36,7 @@ final class AccountsApiResourceSwagger {
 
         private GetAccountsTypeTemplateResponse() {}
 
-        final class GetAccountsTypeProductOptions {
+        static final class GetAccountsTypeProductOptions {
 
             private GetAccountsTypeProductOptions() {}
 
@@ -62,7 +62,7 @@ final class AccountsApiResourceSwagger {
 
         private GetAccountsTypeAccountIdResponse() {}
 
-        final class GetAccountsStatus {
+        static final class GetAccountsStatus {
 
             private GetAccountsStatus() {}
 
@@ -84,7 +84,7 @@ final class AccountsApiResourceSwagger {
             public Boolean closed;
         }
 
-        final class GetAccountsTimeline {
+        static final class GetAccountsTimeline {
 
             private GetAccountsTimeline() {}
 
@@ -108,7 +108,7 @@ final class AccountsApiResourceSwagger {
             public LocalDate activatedDate;
         }
 
-        final class GetAccountsCurrency {
+        static final class GetAccountsCurrency {
 
             private GetAccountsCurrency() {}
 
@@ -128,7 +128,7 @@ final class AccountsApiResourceSwagger {
             public String displayLabel;
         }
 
-        final class GetAccountsSummary {
+        static final class GetAccountsSummary {
 
             private GetAccountsSummary() {}
 
@@ -149,11 +149,11 @@ final class AccountsApiResourceSwagger {
             public GetAccountsCurrency currency;
         }
 
-        final class GetAccountsPurchasedShares {
+        static final class GetAccountsPurchasedShares {
 
             private GetAccountsPurchasedShares() {}
 
-            final class GetAccountsPurchasedSharesStatus {
+            static final class GetAccountsPurchasedSharesStatus {
 
                 private GetAccountsPurchasedSharesStatus() {}
 
@@ -165,7 +165,7 @@ final class AccountsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetAccountsPurchasedSharesType {
+            static final class GetAccountsPurchasedSharesType {
 
                 private GetAccountsPurchasedSharesType() {}
 
@@ -197,7 +197,7 @@ final class AccountsApiResourceSwagger {
             public Double amountPaid;
         }
 
-        final class GetAccountsLockPeriodTypeEnum {
+        static final class GetAccountsLockPeriodTypeEnum {
 
             private GetAccountsLockPeriodTypeEnum() {}
 
@@ -209,11 +209,11 @@ final class AccountsApiResourceSwagger {
             public String value;
         }
 
-        final class GetAccountsCharges {
+        static final class GetAccountsCharges {
 
             private GetAccountsCharges() {}
 
-            final class GetAccountsChargeTimeType {
+            static final class GetAccountsChargeTimeType {
 
                 private GetAccountsChargeTimeType() {}
 
@@ -225,7 +225,7 @@ final class AccountsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetAccountsChargeCalculationType {
+            static final class GetAccountsChargeCalculationType {
 
                 private GetAccountsChargeCalculationType() {}
 
@@ -237,7 +237,7 @@ final class AccountsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetAccountsChargesCurrency {
+            static final class GetAccountsChargesCurrency {
 
                 private GetAccountsChargesCurrency() {}
 
@@ -327,11 +327,11 @@ final class AccountsApiResourceSwagger {
 
         private GetAccountsTypeResponse() {}
 
-        final class GetAccountsPageItems {
+        static final class GetAccountsPageItems {
 
             private GetAccountsPageItems() {}
 
-            final class GetAccountsTypeStatus {
+            static final class GetAccountsTypeStatus {
 
                 private GetAccountsTypeStatus() {}
 
@@ -353,7 +353,7 @@ final class AccountsApiResourceSwagger {
                 public Boolean closed;
             }
 
-            final class GetAccountsTypeTimeline {
+            static final class GetAccountsTypeTimeline {
 
                 private GetAccountsTypeTimeline() {}
 
@@ -361,7 +361,7 @@ final class AccountsApiResourceSwagger {
                 public LocalDate submittedOnDate;
             }
 
-            final class GetAccountsTypePurchasedShares {
+            static final class GetAccountsTypePurchasedShares {
 
                 private GetAccountsTypePurchasedShares() {}
 
@@ -375,7 +375,7 @@ final class AccountsApiResourceSwagger {
                 public Integer purchasedPrice;
             }
 
-            final class GetAccountsTypeSummary {
+            static final class GetAccountsTypeSummary {
 
                 private GetAccountsTypeSummary() {}
 
@@ -411,7 +411,7 @@ final class AccountsApiResourceSwagger {
 
         private PostAccountsTypeRequest() {}
 
-        final class PostAccountsCharges {
+        static final class PostAccountsCharges {
 
             private PostAccountsCharges() {}
 
@@ -466,7 +466,7 @@ final class AccountsApiResourceSwagger {
 
         private PostAccountsTypeAccountIdRequest() {}
 
-        final class PostAccountsRequestedShares {
+        static final class PostAccountsRequestedShares {
 
             private PostAccountsRequestedShares() {}
 
@@ -506,7 +506,7 @@ final class AccountsApiResourceSwagger {
 
         private PutAccountsTypeAccountIdResponse() {}
 
-        final class PutAccountsChanges {
+        static final class PutAccountsChanges {
 
             private PutAccountsChanges() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/api/ChargesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/api/ChargesApiResourceSwagger.java
index 5dc58cd..fa56715 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/api/ChargesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/api/ChargesApiResourceSwagger.java
@@ -32,7 +32,7 @@ final class ChargesApiResourceSwagger {
 
         private GetChargesResponse() {}
 
-        final class GetChargesCurrencyResponse {
+        static final class GetChargesCurrencyResponse {
 
             @ApiModelProperty(example = "USD")
             public String code;
@@ -48,7 +48,7 @@ final class ChargesApiResourceSwagger {
             public String displayLabel;
         }
 
-        final class GetChargesTimeTypeResponse {
+        static final class GetChargesTimeTypeResponse {
 
             private GetChargesTimeTypeResponse() {}
 
@@ -60,7 +60,7 @@ final class ChargesApiResourceSwagger {
             public String value;
         }
 
-        final class GetChargesAppliesToResponse {
+        static final class GetChargesAppliesToResponse {
 
             private GetChargesAppliesToResponse() {}
 
@@ -72,7 +72,7 @@ final class ChargesApiResourceSwagger {
             public String value;
         }
 
-        final class GetChargesCalculationTypeResponse {
+        static final class GetChargesCalculationTypeResponse {
 
             private GetChargesCalculationTypeResponse() {}
 
@@ -84,7 +84,7 @@ final class ChargesApiResourceSwagger {
             public String value;
         }
 
-        final class GetChargesPaymentModeResponse {
+        static final class GetChargesPaymentModeResponse {
 
             private GetChargesPaymentModeResponse() {}
 
@@ -180,7 +180,7 @@ final class ChargesApiResourceSwagger {
 
         private GetChargesTemplateResponse() {}
 
-        final class GetChargesTemplateLoanChargeCalculationTypeOptions {
+        static final class GetChargesTemplateLoanChargeCalculationTypeOptions {
 
             private GetChargesTemplateLoanChargeCalculationTypeOptions() {}
 
@@ -192,7 +192,7 @@ final class ChargesApiResourceSwagger {
             public String value;
         }
 
-        final class GetChargesTemplateLoanChargeTimeTypeOptions {
+        static final class GetChargesTemplateLoanChargeTimeTypeOptions {
 
             private GetChargesTemplateLoanChargeTimeTypeOptions() {}
 
@@ -204,7 +204,7 @@ final class ChargesApiResourceSwagger {
             public String value;
         }
 
-        final class GetChargesTemplateFeeFrequencyOptions {
+        static final class GetChargesTemplateFeeFrequencyOptions {
 
             private GetChargesTemplateFeeFrequencyOptions() {}
 
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 14b3a3a..799ae98 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
@@ -36,11 +36,11 @@ final class ClientChargesApiResourceSwagger {
 
         private GetClientsClientIdChargesResponse() {}
 
-        final class GetClientsChargesPageItems {
+        static final class GetClientsChargesPageItems {
 
             private GetClientsChargesPageItems() {}
 
-            final class GetClientChargeTimeType {
+            static final class GetClientChargeTimeType {
 
                 private GetClientChargeTimeType() {}
 
@@ -52,7 +52,7 @@ final class ClientChargesApiResourceSwagger {
                 public String value;
             }
 
-            final class GetClientChargeCalculationType {
+            static final class GetClientChargeCalculationType {
 
                 private GetClientChargeCalculationType() {}
 
@@ -64,7 +64,7 @@ final class ClientChargesApiResourceSwagger {
                 public String value;
             }
 
-            final class GetClientChargeCurrency {
+            static final class GetClientChargeCurrency {
 
                 private GetClientChargeCurrency() {}
 
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 228e581..7859270 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
@@ -34,7 +34,7 @@ final class ClientIdentifiersApiResourceSwagger {
 
         private GetClientsClientIdIdentifiersResponse() {}
 
-        final class GetClientsDocumentType {
+        static final class GetClientsDocumentType {
 
             private GetClientsDocumentType() {}
 
@@ -60,7 +60,7 @@ final class ClientIdentifiersApiResourceSwagger {
 
         private GetClientsClientIdIdentifiersTemplateResponse() {}
 
-        final class GetClientsAllowedDocumentTypes {
+        static final class GetClientsAllowedDocumentTypes {
 
             private GetClientsAllowedDocumentTypes() {}
 
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 7ea9ca9..3038167 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
@@ -36,11 +36,11 @@ final class ClientTransactionsApiResourceSwagger {
 
         private GetClientsClientIdTransactionsResponse() {}
 
-        final class GetClientsPageItems {
+        static final class GetClientsPageItems {
 
             private GetClientsPageItems() {}
 
-            final class GetClientsClientIdTransactionsType {
+            static final class GetClientsClientIdTransactionsType {
 
                 private GetClientsClientIdTransactionsType() {}
 
@@ -52,7 +52,7 @@ final class ClientTransactionsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetClientTransactionsCurrency {
+            static final class GetClientTransactionsCurrency {
 
                 private GetClientTransactionsCurrency() {}
 
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 552a4cc..9a2be26 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
@@ -36,7 +36,7 @@ final class ClientsApiResourceSwagger {
 
         private GetClientsTemplateResponse() {}
 
-        final class GetClientsOfficeOptions {
+        static final class GetClientsOfficeOptions {
 
             private GetClientsOfficeOptions() {}
 
@@ -48,7 +48,7 @@ final class ClientsApiResourceSwagger {
             public String nameDecorated;
         }
 
-        final class GetClientsStaffOptions {
+        static final class GetClientsStaffOptions {
 
             private GetClientsStaffOptions() {}
 
@@ -70,7 +70,7 @@ final class ClientsApiResourceSwagger {
             public Boolean isActive;
         }
 
-        final class GetClientsSavingProductOptions {
+        static final class GetClientsSavingProductOptions {
 
             private GetClientsSavingProductOptions() {}
 
@@ -84,11 +84,11 @@ final class ClientsApiResourceSwagger {
             public Boolean allowOverdraft;
         }
 
-        final class GetClientsDataTables {
+        static final class GetClientsDataTables {
 
             private GetClientsDataTables() {}
 
-            final class GetClientsColumnHeaderData {
+            static final class GetClientsColumnHeaderData {
 
                 private GetClientsColumnHeaderData() {}
 
@@ -130,11 +130,11 @@ final class ClientsApiResourceSwagger {
 
         private GetClientsResponse() {}
 
-        final class GetClientsPageItemsResponse {
+        static final class GetClientsPageItemsResponse {
 
             private GetClientsPageItemsResponse() {}
 
-            final class GetClientStatus {
+            static final class GetClientStatus {
 
                 private GetClientStatus() {}
 
@@ -173,7 +173,7 @@ final class ClientsApiResourceSwagger {
 
         private GetClientsClientIdResponse() {}
 
-        final class GetClientsClientIdStatus {
+        static final class GetClientsClientIdStatus {
 
             private GetClientsClientIdStatus() {}
 
@@ -185,7 +185,7 @@ final class ClientsApiResourceSwagger {
             public String value;
         }
 
-        final class GetClientsTimeline {
+        static final class GetClientsTimeline {
 
             private GetClientsTimeline() {}
 
@@ -339,11 +339,11 @@ final class ClientsApiResourceSwagger {
 
         private GetClientsClientIdAccountsResponse() {}
 
-        final class GetClientsLoanAccounts {
+        static final class GetClientsLoanAccounts {
 
             private GetClientsLoanAccounts() {}
 
-            final class GetClientsLoanAccountsStatus {
+            static final class GetClientsLoanAccountsStatus {
 
                 private GetClientsLoanAccountsStatus() {}
 
@@ -371,7 +371,7 @@ final class ClientsApiResourceSwagger {
                 public Boolean overpaid;
             }
 
-            final class GetClientsLoanAccountsType {
+            static final class GetClientsLoanAccountsType {
 
                 private GetClientsLoanAccountsType() {}
 
@@ -399,11 +399,11 @@ final class ClientsApiResourceSwagger {
             public Integer loanCycle;
         }
 
-        final class GetClientsSavingsAccounts {
+        static final class GetClientsSavingsAccounts {
 
             private GetClientsSavingsAccounts() {}
 
-            final class GetClientsSavingsAccountsCurrency {
+            static final class GetClientsSavingsAccountsCurrency {
 
                 private GetClientsSavingsAccountsCurrency() {}
 
@@ -421,7 +421,7 @@ final class ClientsApiResourceSwagger {
                 public String displayLabel;
             }
 
-            final class GetClientsSavingsAccountsStatus {
+            static final class GetClientsSavingsAccountsStatus {
 
                 private GetClientsSavingsAccountsStatus() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralsApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralsApiResourceSwagger.java
index 356c2cd..dc3d679 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralsApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralsApiResourceSwagger.java
@@ -34,7 +34,7 @@ final class CollateralsApiResourceSwagger {
 
         private GetLoansLoanIdCollateralsResponse() {}
 
-        final class GetCollateralTypeResponse {
+        static final class GetCollateralTypeResponse {
 
             private GetCollateralTypeResponse() {}
 
@@ -44,7 +44,7 @@ final class CollateralsApiResourceSwagger {
             public String name;
         }
 
-        final class GetCollateralCurrencyResponse {
+        static final class GetCollateralCurrencyResponse {
 
             private GetCollateralCurrencyResponse() {}
 
@@ -118,7 +118,7 @@ final class CollateralsApiResourceSwagger {
 
         private GetLoansLoanIdCollateralsTemplateResponse() {}
 
-        final class GetCollateralsTemplateAllowedTypes {
+        static final class GetCollateralsTemplateAllowedTypes {
 
             private GetCollateralsTemplateAllowedTypes() {}
 
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 8450888..a4f34fb 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
@@ -34,7 +34,7 @@ final class CollectionSheetApiResourceSwagger {
 
         private PostCollectionSheetRequest() {}
 
-        final class PostCollectionSheetBulkRepaymentTransactions {
+        static final class PostCollectionSheetBulkRepaymentTransactions {
 
             private PostCollectionSheetBulkRepaymentTransactions() {}
 
@@ -66,7 +66,7 @@ final class CollectionSheetApiResourceSwagger {
 
         private PostCollectionSheetResponse() {}
 
-        final class PostCollectionSheetChanges {
+        static final class PostCollectionSheetChanges {
 
             private PostCollectionSheetChanges() {}
 
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 dc20408..3cc6508 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
@@ -34,7 +34,7 @@ final class FloatingRatesApiResourceSwagger {
 
         private PostFloatingRatesRequest() {}
 
-        final class PostFloatingRatesRatePeriods {
+        static final class PostFloatingRatesRatePeriods {
 
             private PostFloatingRatesRatePeriods() {}
 
@@ -94,7 +94,7 @@ final class FloatingRatesApiResourceSwagger {
 
         private GetFloatingRatesFloatingRateIdResponse() {}
 
-        final class GetFloatingRatesRatePeriods {
+        static final class GetFloatingRatesRatePeriods {
 
             private GetFloatingRatesRatePeriods() {}
 
@@ -156,7 +156,7 @@ final class FloatingRatesApiResourceSwagger {
 
         private PutFloatingRatesFloatingRateIdResponse() {}
 
-        final class PutFloatingRatesChanges {
+        static final class PutFloatingRatesChanges {
 
             private PutFloatingRatesChanges() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadPlatformServiceImpl.java
index 5d1943f..76749c2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadPlatformServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/service/FloatingRatesReadPlatformServiceImpl.java
@@ -140,7 +140,7 @@ public class FloatingRatesReadPlatformServiceImpl implements FloatingRatesReadPl
         }
     }
 
-    private final class FloatingRatePeriodRowMapper implements RowMapper<FloatingRatePeriodData> {
+    private static final class FloatingRatePeriodRowMapper implements RowMapper<FloatingRatePeriodData> {
 
         private final StringBuilder sqlQuery = new StringBuilder().append("period.id as id, ").append("period.from_date as fromDate, ")
                 .append("period.interest_rate as interestRate, ")
@@ -171,7 +171,7 @@ public class FloatingRatesReadPlatformServiceImpl implements FloatingRatesReadPl
         }
     }
 
-    private final class FloatingRateLookupMapper implements RowMapper<FloatingRateData> {
+    private static final class FloatingRateLookupMapper implements RowMapper<FloatingRateData> {
 
         private final StringBuilder sqlQuery = new StringBuilder().append("rate.id as id, ").append("rate.name as name, ")
                 .append("rate.is_base_lending_rate as isBaseLendingRate ").append("FROM m_floating_rates as rate ");
@@ -189,7 +189,7 @@ public class FloatingRatesReadPlatformServiceImpl implements FloatingRatesReadPl
         }
     }
 
-    private final class FloatingInterestRatePeriodRowMapper implements RowMapper<InterestRatePeriodData> {
+    private static final class FloatingInterestRatePeriodRowMapper implements RowMapper<InterestRatePeriodData> {
 
         private final StringBuilder sqlQuery = new StringBuilder().append("select ")
                 .append("    linkedrateperiods.from_date as linkedrateperiods_from_date, ")
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 e56228b..a080691 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
@@ -35,7 +35,7 @@ final class CentersApiResourceSwagger {
 
         private GetCentersTemplateResponse() {}
 
-        final class GetCentersOfficeOptions {
+        static final class GetCentersOfficeOptions {
 
             private GetCentersOfficeOptions() {}
 
@@ -47,7 +47,7 @@ final class CentersApiResourceSwagger {
             public String nameDecorated;
         }
 
-        final class GetCentersStaffOptions {
+        static final class GetCentersStaffOptions {
 
             private GetCentersStaffOptions() {}
 
@@ -72,11 +72,11 @@ final class CentersApiResourceSwagger {
 
         private GetCentersResponse() {}
 
-        final class GetCentersPageItems {
+        static final class GetCentersPageItems {
 
             private GetCentersPageItems() {}
 
-            final class GetCentersStatus {
+            static final class GetCentersStatus {
 
                 private GetCentersStatus() {}
 
@@ -168,7 +168,7 @@ final class CentersApiResourceSwagger {
 
         private PutCentersCenterIdResponse() {}
 
-        final class PutCentersChanges {
+        static final class PutCentersChanges {
 
             private PutCentersChanges() {}
 
@@ -190,7 +190,7 @@ final class CentersApiResourceSwagger {
 
         private DeleteCentersCenterIdResponse() {}
 
-        final class DeleteCentersChanges {
+        static final class DeleteCentersChanges {
 
             private DeleteCentersChanges() {}
         }
@@ -229,11 +229,11 @@ final class CentersApiResourceSwagger {
 
         private GetCentersCenterIdAccountsResponse() {}
 
-        final class GetCentersSavingsAccounts {
+        static final class GetCentersSavingsAccounts {
 
             private GetCentersSavingsAccounts() {}
 
-            final class GetCentersCenterIdStatus {
+            static final class GetCentersCenterIdStatus {
 
                 private GetCentersCenterIdStatus() {}
 
@@ -263,7 +263,7 @@ final class CentersApiResourceSwagger {
                 public Boolean transferOnHold;
             }
 
-            final class GetCentersCenterIdCurrency {
+            static final class GetCentersCenterIdCurrency {
 
                 private GetCentersCenterIdCurrency() {}
 
@@ -283,7 +283,7 @@ final class CentersApiResourceSwagger {
                 public String displayLabel;
             }
 
-            final class GetCentersAccountType {
+            static final class GetCentersAccountType {
 
                 private GetCentersAccountType() {}
 
@@ -295,7 +295,7 @@ final class CentersApiResourceSwagger {
                 public String value;
             }
 
-            final class GetCentersTimeline {
+            static final class GetCentersTimeline {
 
                 private GetCentersTimeline() {}
 
@@ -309,7 +309,7 @@ final class CentersApiResourceSwagger {
                 public String submittedByLastname;
             }
 
-            final class GetCentersDepositType {
+            static final class GetCentersDepositType {
 
                 private GetCentersDepositType() {}
 
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 be059ea..4b1ed3b 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
@@ -35,7 +35,7 @@ final class GroupsApiResourceSwagger {
 
         private GetGroupsTemplateResponse() {}
 
-        final class GetGroupsTemplateOfficeOptions {
+        static final class GetGroupsTemplateOfficeOptions {
 
             private GetGroupsTemplateOfficeOptions() {}
 
@@ -47,7 +47,7 @@ final class GroupsApiResourceSwagger {
             public String nameDecorated;
         }
 
-        final class GetGroupsTemplateStaffOptions {
+        static final class GetGroupsTemplateStaffOptions {
 
             private GetGroupsTemplateStaffOptions() {}
 
@@ -57,7 +57,7 @@ final class GroupsApiResourceSwagger {
             public String displayName;
         }
 
-        final class GetGroupsTemplateClientOptions {
+        static final class GetGroupsTemplateClientOptions {
 
             private GetGroupsTemplateClientOptions() {}
 
@@ -71,15 +71,15 @@ final class GroupsApiResourceSwagger {
             public String officeName;
         }
 
-        final class GetGroupsTemplateDatatables {
+        static final class GetGroupsTemplateDatatables {
 
             private GetGroupsTemplateDatatables() {}
 
-            final class GetGroupsTemplateColumnHeaderData {
+            static final class GetGroupsTemplateColumnHeaderData {
 
                 private GetGroupsTemplateColumnHeaderData() {}
 
-                final class GetGroupsTemplateColumnValues {
+                static final class GetGroupsTemplateColumnValues {
 
                     private GetGroupsTemplateColumnValues() {}
                 }
@@ -119,11 +119,11 @@ final class GroupsApiResourceSwagger {
 
         private GetGroupsResponse() {}
 
-        final class GetGroupsPageItems {
+        static final class GetGroupsPageItems {
 
             private GetGroupsPageItems() {}
 
-            final class GetGroupsStatus {
+            static final class GetGroupsStatus {
 
                 private GetGroupsStatus() {}
 
@@ -160,7 +160,7 @@ final class GroupsApiResourceSwagger {
 
         private GetGroupsGroupIdResponse() {}
 
-        final class GetGroupsGroupIdTimeline {
+        static final class GetGroupsGroupIdTimeline {
 
             private GetGroupsGroupIdTimeline() {}
 
@@ -242,7 +242,7 @@ final class GroupsApiResourceSwagger {
 
         private PostGroupsGroupIdCommandUnassignStaffResponse() {}
 
-        final class PostGroupsGroupIdCommandUnassignStaffChanges {
+        static final class PostGroupsGroupIdCommandUnassignStaffChanges {
 
             private PostGroupsGroupIdCommandUnassignStaffChanges() {}
         }
@@ -270,7 +270,7 @@ final class GroupsApiResourceSwagger {
 
         private PutGroupsGroupIdResponse() {}
 
-        final class PutGroupsGroupIdChanges {
+        static final class PutGroupsGroupIdChanges {
 
             private PutGroupsGroupIdChanges() {}
 
@@ -292,11 +292,11 @@ final class GroupsApiResourceSwagger {
 
         private GetGroupsGroupIdAccountsResponse() {}
 
-        final class GetGroupsGroupIdAccountsLoanAccounts {
+        static final class GetGroupsGroupIdAccountsLoanAccounts {
 
             private GetGroupsGroupIdAccountsLoanAccounts() {}
 
-            final class GetGroupsGroupIdAccountsStatus {
+            static final class GetGroupsGroupIdAccountsStatus {
 
                 private GetGroupsGroupIdAccountsStatus() {}
 
@@ -324,7 +324,7 @@ final class GroupsApiResourceSwagger {
                 public Boolean overpaid;
             }
 
-            final class GetGroupsGroupIdAccountsLoanType {
+            static final class GetGroupsGroupIdAccountsLoanType {
 
                 private GetGroupsGroupIdAccountsLoanType() {}
 
@@ -348,11 +348,11 @@ final class GroupsApiResourceSwagger {
             public GetGroupsGroupIdAccountsLoanType loanType;
         }
 
-        final class GetGroupsGroupIdAccountsSavingAccounts {
+        static final class GetGroupsGroupIdAccountsSavingAccounts {
 
             private GetGroupsGroupIdAccountsSavingAccounts() {}
 
-            final class GetGroupsGroupIdAccountsSavingStatus {
+            static final class GetGroupsGroupIdAccountsSavingStatus {
 
                 private GetGroupsGroupIdAccountsSavingStatus() {}
 
@@ -376,7 +376,7 @@ final class GroupsApiResourceSwagger {
                 public Boolean closed;
             }
 
-            final class GetGroupsGroupIdAccountsSavingCurrency {
+            static final class GetGroupsGroupIdAccountsSavingCurrency {
 
                 private GetGroupsGroupIdAccountsSavingCurrency() {}
 
@@ -394,7 +394,7 @@ final class GroupsApiResourceSwagger {
                 public String displayLabel;
             }
 
-            final class GetGroupsGroupIdAccountsSavingAccountType {
+            static final class GetGroupsGroupIdAccountsSavingAccountType {
 
                 private GetGroupsGroupIdAccountsSavingAccountType() {}
 
@@ -419,11 +419,11 @@ final class GroupsApiResourceSwagger {
             public GetGroupsGroupIdAccountsSavingAccountType accountType;
         }
 
-        final class GetGroupsGroupIdAccountsMemberLoanAccounts {
+        static final class GetGroupsGroupIdAccountsMemberLoanAccounts {
 
             private GetGroupsGroupIdAccountsMemberLoanAccounts() {}
 
-            final class GetGroupsGroupIdAccountsMemberLoanStatus {
+            static final class GetGroupsGroupIdAccountsMemberLoanStatus {
 
                 private GetGroupsGroupIdAccountsMemberLoanStatus() {}
 
@@ -451,7 +451,7 @@ final class GroupsApiResourceSwagger {
                 public Boolean overpaid;
             }
 
-            final class GetGroupsGroupIdAccountsMemberLoanType {
+            static final class GetGroupsGroupIdAccountsMemberLoanType {
 
                 private GetGroupsGroupIdAccountsMemberLoanType() {}
 
@@ -475,7 +475,7 @@ final class GroupsApiResourceSwagger {
             public GetGroupsGroupIdAccountsMemberLoanType loanType;
         }
 
-        final class GetGroupsGroupIdAccountsMemberSavingsAccounts {
+        static final class GetGroupsGroupIdAccountsMemberSavingsAccounts {
 
             private GetGroupsGroupIdAccountsMemberSavingsAccounts() {}
 
@@ -503,7 +503,7 @@ final class GroupsApiResourceSwagger {
 
         private PostGroupsGroupIdRequest() {}
 
-        final class PostGroupsGroupIdClients {
+        static final class PostGroupsGroupIdClients {
 
             private PostGroupsGroupIdClients() {}
 
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 239866d..cad6724 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
@@ -34,11 +34,11 @@ final class InterestRateChartSlabsApiResourceSwagger {
 
         private GetInterestRateChartsChartIdChartSlabsResponse() {}
 
-        final class GetInterestRateChartsChartIdChartSlabsIncentives {
+        static final class GetInterestRateChartsChartIdChartSlabsIncentives {
 
             private GetInterestRateChartsChartIdChartSlabsIncentives() {}
 
-            final class GetInterestRateChartsChartIdChartSlabsEntityType {
+            static final class GetInterestRateChartsChartIdChartSlabsEntityType {
 
                 private GetInterestRateChartsChartIdChartSlabsEntityType() {}
 
@@ -50,7 +50,7 @@ final class InterestRateChartSlabsApiResourceSwagger {
                 public Integer value;
             }
 
-            final class GetInterestRateChartsChartIdChartSlabsAttributeName {
+            static final class GetInterestRateChartsChartIdChartSlabsAttributeName {
 
                 private GetInterestRateChartsChartIdChartSlabsAttributeName() {}
 
@@ -62,7 +62,7 @@ final class InterestRateChartSlabsApiResourceSwagger {
                 public Integer value;
             }
 
-            final class GetInterestRateChartsChartIdChartSlabsConditionType {
+            static final class GetInterestRateChartsChartIdChartSlabsConditionType {
 
                 private GetInterestRateChartsChartIdChartSlabsConditionType() {}
 
@@ -74,7 +74,7 @@ final class InterestRateChartSlabsApiResourceSwagger {
                 public Integer value;
             }
 
-            final class GetInterestRateChartsChartIdChartSlabsIncentiveType {
+            static final class GetInterestRateChartsChartIdChartSlabsIncentiveType {
 
                 private GetInterestRateChartsChartIdChartSlabsIncentiveType() {}
 
@@ -120,7 +120,7 @@ final class InterestRateChartSlabsApiResourceSwagger {
 
         private PostInterestRateChartsChartIdChartSlabsRequest() {}
 
-        final class PostInterestRateChartsChartIdChartSlabsIncentives {
+        static final class PostInterestRateChartsChartIdChartSlabsIncentives {
 
             private PostInterestRateChartsChartIdChartSlabsIncentives() {}
 
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 f1a0ca1..060f5e3 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
@@ -35,7 +35,7 @@ final class InterestRateChartsApiResourceSwagger {
 
         private GetInterestRateChartsTemplateResponse() {}
 
-        final class GetInterestRateChartsTemplatePeriodTypes {
+        static final class GetInterestRateChartsTemplatePeriodTypes {
 
             private GetInterestRateChartsTemplatePeriodTypes() {}
 
@@ -55,7 +55,7 @@ final class InterestRateChartsApiResourceSwagger {
 
         private GetInterestRateChartsResponse() {}
 
-        final class GetInterestRateChartsChartSlabs {
+        static final class GetInterestRateChartsChartSlabs {
 
             private GetInterestRateChartsChartSlabs() {}
 
@@ -69,7 +69,7 @@ final class InterestRateChartsApiResourceSwagger {
             public GetInterestRateChartsCurrency currency;
         }
 
-        final class GetInterestRateChartsCurrency {
+        static final class GetInterestRateChartsCurrency {
 
             private GetInterestRateChartsCurrency() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanChargesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanChargesApiResourceSwagger.java
index 6571cc4..8e3b3ef 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanChargesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoanChargesApiResourceSwagger.java
@@ -34,7 +34,7 @@ final class LoanChargesApiResourceSwagger {
 
         private GetLoansLoanIdChargesChargeIdResponse() {}
 
-        final class GetLoanChargeTimeType {
+        static final class GetLoanChargeTimeType {
 
             private GetLoanChargeTimeType() {}
 
@@ -46,7 +46,7 @@ final class LoanChargesApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoanChargeCalculationType {
+        static final class GetLoanChargeCalculationType {
 
             private GetLoanChargeCalculationType() {}
 
@@ -58,7 +58,7 @@ final class LoanChargesApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoanChargeCurrency {
+        static final class GetLoanChargeCurrency {
 
             private GetLoanChargeCurrency() {}
 
@@ -110,11 +110,11 @@ final class LoanChargesApiResourceSwagger {
 
         private GetLoansLoanIdChargesTemplateResponse() {}
 
-        final class GetLoanChargeTemplateChargeOptions {
+        static final class GetLoanChargeTemplateChargeOptions {
 
             private GetLoanChargeTemplateChargeOptions() {}
 
-            final class GetLoanChargeTemplateChargeTimeType {
+            static final class GetLoanChargeTemplateChargeTimeType {
 
                 private GetLoanChargeTemplateChargeTimeType() {}
 
@@ -126,7 +126,7 @@ final class LoanChargesApiResourceSwagger {
                 public String value;
             }
 
-            final class GetLoanChargeTemplateChargeAppliesTo {
+            static final class GetLoanChargeTemplateChargeAppliesTo {
 
                 private GetLoanChargeTemplateChargeAppliesTo() {}
 
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 13e6d66..e35824a 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
@@ -40,7 +40,7 @@ final class LoanScheduleApiResourceSwagger {
 
         private PostLoansLoanIdScheduleResponse() {}
 
-        final class PostLoanChanges {
+        static final class PostLoanChanges {
 
             private PostLoanChanges() {}
 
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 22cade2..aeccc43 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
@@ -34,7 +34,7 @@ final class LoanTransactionsApiResourceSwagger {
 
         private GetLoansLoanIdTransactionsTemplateResponse() {}
 
-        final class GetLoansTransactionType {
+        static final class GetLoansTransactionType {
 
             private GetLoansTransactionType() {}
 
@@ -46,7 +46,7 @@ final class LoanTransactionsApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoansTotal {
+        static final class GetLoansTotal {
 
             private GetLoansTotal() {}
 
@@ -83,7 +83,7 @@ final class LoanTransactionsApiResourceSwagger {
 
         private GetLoansLoanIdTransactionsTransactionIdResponse() {}
 
-        final class GetLoansType {
+        static final class GetLoansType {
 
             private GetLoansType() {}
 
@@ -111,7 +111,7 @@ final class LoanTransactionsApiResourceSwagger {
             public Boolean recoveryRepayment;
         }
 
-        final class GetLoansCurrency {
+        static final class GetLoansCurrency {
 
             private GetLoansCurrency() {}
 
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 d1a035a..ec8f5d0 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
@@ -35,7 +35,7 @@ final class LoansApiResourceSwagger {
 
         private GetLoansTemplateResponse() {}
 
-        final class GetLoansTemplateTimeline {
+        static final class GetLoansTemplateTimeline {
 
             private GetLoansTemplateTimeline() {}
 
@@ -43,7 +43,7 @@ final class LoansApiResourceSwagger {
             public LocalDate expectedDisbursementDate;
         }
 
-        final class GetLoansTemplateProductOptions {
+        static final class GetLoansTemplateProductOptions {
 
             private GetLoansTemplateProductOptions() {}
 
@@ -68,7 +68,7 @@ final class LoansApiResourceSwagger {
 
         private GetLoansLoanIdResponse() {}
 
-        final class GetLoansLoanIdStatus {
+        static final class GetLoansLoanIdStatus {
 
             private GetLoansLoanIdStatus() {}
 
@@ -96,7 +96,7 @@ final class LoansApiResourceSwagger {
             public Boolean overpaid;
         }
 
-        final class GetLoansLoanIdLoanType {
+        static final class GetLoansLoanIdLoanType {
 
             private GetLoansLoanIdLoanType() {}
 
@@ -108,7 +108,7 @@ final class LoansApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoansLoanIdCurrency {
+        static final class GetLoansLoanIdCurrency {
 
             private GetLoansLoanIdCurrency() {}
 
@@ -126,7 +126,7 @@ final class LoansApiResourceSwagger {
             public String displayLabel;
         }
 
-        final class GetLoansLoanIdTermPeriodFrequencyType {
+        static final class GetLoansLoanIdTermPeriodFrequencyType {
 
             private GetLoansLoanIdTermPeriodFrequencyType() {}
 
@@ -138,7 +138,7 @@ final class LoansApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoansLoanIdRepaymentFrequencyType {
+        static final class GetLoansLoanIdRepaymentFrequencyType {
 
             private GetLoansLoanIdRepaymentFrequencyType() {}
 
@@ -150,7 +150,7 @@ final class LoansApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoansLoanIdInterestRateFrequencyType {
+        static final class GetLoansLoanIdInterestRateFrequencyType {
 
             private GetLoansLoanIdInterestRateFrequencyType() {}
 
@@ -162,7 +162,7 @@ final class LoansApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoansLoanIdAmortizationType {
+        static final class GetLoansLoanIdAmortizationType {
 
             private GetLoansLoanIdAmortizationType() {}
 
@@ -174,7 +174,7 @@ final class LoansApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoansLoanIdInterestType {
+        static final class GetLoansLoanIdInterestType {
 
             private GetLoansLoanIdInterestType() {}
 
@@ -186,7 +186,7 @@ final class LoansApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoansLoanIdInterestCalculationPeriodType {
+        static final class GetLoansLoanIdInterestCalculationPeriodType {
 
             private GetLoansLoanIdInterestCalculationPeriodType() {}
 
@@ -198,7 +198,7 @@ final class LoansApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoansLoanIdTimeline {
+        static final class GetLoansLoanIdTimeline {
 
             private GetLoansLoanIdTimeline() {}
 
@@ -232,16 +232,16 @@ final class LoansApiResourceSwagger {
             public LocalDate expectedMaturityDate;
         }
 
-        final class GetLoansLoanIdSummary {
+        static final class GetLoansLoanIdSummary {
 
             private GetLoansLoanIdSummary() {}
 
-            final class GetLoansLoanIdEmiVariations {
+            static final class GetLoansLoanIdEmiVariations {
 
                 private GetLoansLoanIdEmiVariations() {}
             }
 
-            final class GetLoansLoanIdLinkedAccount {
+            static final class GetLoansLoanIdLinkedAccount {
 
                 private GetLoansLoanIdLinkedAccount() {}
 
@@ -251,7 +251,7 @@ final class LoansApiResourceSwagger {
                 public Long accountNo;
             }
 
-            final class GetLoansLoanIdDisbursementDetails {
+            static final class GetLoansLoanIdDisbursementDetails {
 
                 private GetLoansLoanIdDisbursementDetails() {}
 
@@ -265,11 +265,11 @@ final class LoansApiResourceSwagger {
                 public Float approvedPrincipal;
             }
 
-            final class GetLoansLoanIdOverdueCharges {
+            static final class GetLoansLoanIdOverdueCharges {
 
                 private GetLoansLoanIdOverdueCharges() {}
 
-                final class GetLoansLoanIdChargeTimeType {
+                static final class GetLoansLoanIdChargeTimeType {
 
                     private GetLoansLoanIdChargeTimeType() {}
 
@@ -281,7 +281,7 @@ final class LoansApiResourceSwagger {
                     public String value;
                 }
 
-                final class GetLoansLoanIdChargeCalculationType {
+                static final class GetLoansLoanIdChargeCalculationType {
 
                     private GetLoansLoanIdChargeCalculationType() {}
 
@@ -293,7 +293,7 @@ final class LoansApiResourceSwagger {
                     public String value;
                 }
 
-                final class GetLoansLoanIdChargePaymentMode {
+                static final class GetLoansLoanIdChargePaymentMode {
 
                     private GetLoansLoanIdChargePaymentMode() {}
 
@@ -305,7 +305,7 @@ final class LoansApiResourceSwagger {
                     public String value;
                 }
 
-                final class GetLoansLoanIdFeeFrequency {
+                static final class GetLoansLoanIdFeeFrequency {
 
                     private GetLoansLoanIdFeeFrequency() {}
 
@@ -523,7 +523,7 @@ final class LoansApiResourceSwagger {
 
         private PostLoansResponse() {}
 
-        final class PostLoansRepaymentSchedulePeriods {
+        static final class PostLoansRepaymentSchedulePeriods {
 
             private PostLoansRepaymentSchedulePeriods() {}
 
@@ -621,7 +621,7 @@ final class LoansApiResourceSwagger {
 
         private PutLoansLoanIdResponse() {}
 
-        final class PutLoansLoanIdChanges {
+        static final class PutLoansLoanIdChanges {
 
             private PutLoansLoanIdChanges() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java
index 3ddf70b..c2edf6f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/AbstractLoanScheduleGenerator.java
@@ -2639,7 +2639,7 @@ public abstract class AbstractLoanScheduleGenerator implements LoanScheduleGener
                 feeCharges.getAmount(), penaltyCharges.getAmount(), false, compoundingDetails);
     }
 
-    private final class LoanTermVariationParams {
+    private static final class LoanTermVariationParams {
 
         private final boolean skipPeriod;
         private final boolean recalculateAmounts;
@@ -2672,7 +2672,7 @@ public abstract class AbstractLoanScheduleGenerator implements LoanScheduleGener
 
     }
 
-    private final class ScheduleCurrentPeriodParams {
+    private static final class ScheduleCurrentPeriodParams {
 
         Money earlyPaidAmount;
         LoanScheduleModelPeriod lastInstallment;
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 d1a3477..c241720 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
@@ -112,7 +112,7 @@ final class LoanProductsApiResourceSwagger {
 
         private GetLoanProductsResponse() {}
 
-        final class GetLoanProductsCurrency {
+        static final class GetLoanProductsCurrency {
 
             private GetLoanProductsCurrency() {}
 
@@ -132,7 +132,7 @@ final class LoanProductsApiResourceSwagger {
             public String displayLabel;
         }
 
-        final class GetLoanProductsRepaymentFrequencyType {
+        static final class GetLoanProductsRepaymentFrequencyType {
 
             private GetLoanProductsRepaymentFrequencyType() {}
 
@@ -144,7 +144,7 @@ final class LoanProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoanProductsInterestRateFrequencyType {
+        static final class GetLoanProductsInterestRateFrequencyType {
 
             private GetLoanProductsInterestRateFrequencyType() {}
 
@@ -156,7 +156,7 @@ final class LoanProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoanProductsAmortizationType {
+        static final class GetLoanProductsAmortizationType {
 
             private GetLoanProductsAmortizationType() {}
 
@@ -168,7 +168,7 @@ final class LoanProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoanProductsInterestType {
+        static final class GetLoanProductsInterestType {
 
             private GetLoanProductsInterestType() {}
 
@@ -180,7 +180,7 @@ final class LoanProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoansProductsInterestCalculationPeriodType {
+        static final class GetLoansProductsInterestCalculationPeriodType {
 
             private GetLoansProductsInterestCalculationPeriodType() {}
 
@@ -192,7 +192,7 @@ final class LoanProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoansProductsDaysInMonthType {
+        static final class GetLoansProductsDaysInMonthType {
 
             private GetLoansProductsDaysInMonthType() {}
 
@@ -204,7 +204,7 @@ final class LoanProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoansProductsDaysInYearType {
+        static final class GetLoansProductsDaysInYearType {
 
             private GetLoansProductsDaysInYearType() {}
 
@@ -216,11 +216,11 @@ final class LoanProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoanProductsInterestRecalculationData {
+        static final class GetLoanProductsInterestRecalculationData {
 
             private GetLoanProductsInterestRecalculationData() {}
 
-            final class GetLoanProductsInterestRecalculationCompoundingType {
+            static final class GetLoanProductsInterestRecalculationCompoundingType {
 
                 private GetLoanProductsInterestRecalculationCompoundingType() {}
 
@@ -232,7 +232,7 @@ final class LoanProductsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetLoanProductsInterestRecalculationCompoundingFrequencyType {
+            static final class GetLoanProductsInterestRecalculationCompoundingFrequencyType {
 
                 private GetLoanProductsInterestRecalculationCompoundingFrequencyType() {}
 
@@ -244,7 +244,7 @@ final class LoanProductsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetLoanProductsRescheduleStrategyType {
+            static final class GetLoanProductsRescheduleStrategyType {
 
                 private GetLoanProductsRescheduleStrategyType() {}
 
@@ -256,7 +256,7 @@ final class LoanProductsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetLoanProductsPreClosureInterestCalculationStrategy {
+            static final class GetLoanProductsPreClosureInterestCalculationStrategy {
 
                 private GetLoanProductsPreClosureInterestCalculationStrategy() {}
 
@@ -281,7 +281,7 @@ final class LoanProductsApiResourceSwagger {
             public Boolean isArrearsBasedOnOriginalSchedule;
         }
 
-        final class GetLoanProductsAccountingRule {
+        static final class GetLoanProductsAccountingRule {
 
             private GetLoanProductsAccountingRule() {}
 
@@ -358,7 +358,7 @@ final class LoanProductsApiResourceSwagger {
 
         private GetLoanProductsTemplateResponse() {}
 
-        final class GetLoanProductsTemplateCurrency {
+        static final class GetLoanProductsTemplateCurrency {
 
             private GetLoanProductsTemplateCurrency() {}
 
@@ -378,7 +378,7 @@ final class LoanProductsApiResourceSwagger {
             public String displayLabel;
         }
 
-        final class GetLoanProductsRepaymentTemplateFrequencyType {
+        static final class GetLoanProductsRepaymentTemplateFrequencyType {
 
             private GetLoanProductsRepaymentTemplateFrequencyType() {}
 
@@ -390,7 +390,7 @@ final class LoanProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoanProductsInterestRateTemplateFrequencyType {
+        static final class GetLoanProductsInterestRateTemplateFrequencyType {
 
             private GetLoanProductsInterestRateTemplateFrequencyType() {}
 
@@ -402,7 +402,7 @@ final class LoanProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoanProductsInterestTemplateType {
+        static final class GetLoanProductsInterestTemplateType {
 
             private GetLoanProductsInterestTemplateType() {}
 
@@ -414,7 +414,7 @@ final class LoanProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoanProductsAccountingRule {
+        static final class GetLoanProductsAccountingRule {
 
             private GetLoanProductsAccountingRule() {}
 
@@ -426,7 +426,7 @@ final class LoanProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoansProductsDaysInMonthTemplateType {
+        static final class GetLoansProductsDaysInMonthTemplateType {
 
             private GetLoansProductsDaysInMonthTemplateType() {}
 
@@ -438,7 +438,7 @@ final class LoanProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoanProductsDaysInYearTemplateType {
+        static final class GetLoanProductsDaysInYearTemplateType {
 
             private GetLoanProductsDaysInYearTemplateType() {}
 
@@ -450,11 +450,11 @@ final class LoanProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoanProductsInterestRecalculationTemplateData {
+        static final class GetLoanProductsInterestRecalculationTemplateData {
 
             private GetLoanProductsInterestRecalculationTemplateData() {}
 
-            final class GetLoanProductsInterestRecalculationCompoundingType {
+            static final class GetLoanProductsInterestRecalculationCompoundingType {
 
                 private GetLoanProductsInterestRecalculationCompoundingType() {}
 
@@ -466,7 +466,7 @@ final class LoanProductsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetLoanProductsRescheduleStrategyType {
+            static final class GetLoanProductsRescheduleStrategyType {
 
                 private GetLoanProductsRescheduleStrategyType() {}
 
@@ -483,7 +483,7 @@ final class LoanProductsApiResourceSwagger {
             public GetLoanProductsResponse.GetLoanProductsInterestRecalculationData.GetLoanProductsPreClosureInterestCalculationStrategy preClosureInterestCalculationStrategy;
         }
 
-        final class GetLoanProductsPaymentTypeOptions {
+        static final class GetLoanProductsPaymentTypeOptions {
 
             private GetLoanProductsPaymentTypeOptions() {}
 
@@ -495,7 +495,7 @@ final class LoanProductsApiResourceSwagger {
             public Integer position;
         }
 
-        final class GetLoanProductsCurrencyOptions {
+        static final class GetLoanProductsCurrencyOptions {
 
             private GetLoanProductsCurrencyOptions() {}
 
@@ -513,7 +513,7 @@ final class LoanProductsApiResourceSwagger {
             public String displayLabel;
         }
 
-        final class GetLoanProductsTransactionProcessingStrategyOptions {
+        static final class GetLoanProductsTransactionProcessingStrategyOptions {
 
             private GetLoanProductsTransactionProcessingStrategyOptions() {}
 
@@ -525,11 +525,11 @@ final class LoanProductsApiResourceSwagger {
             public String name;
         }
 
-        final class GetLoanProductsChargeOptions {
+        static final class GetLoanProductsChargeOptions {
 
             private GetLoanProductsChargeOptions() {}
 
-            final class GetLoanChargeTimeType {
+            static final class GetLoanChargeTimeType {
 
                 private GetLoanChargeTimeType() {}
 
@@ -541,7 +541,7 @@ final class LoanProductsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetLoanProductsChargeAppliesTo {
+            static final class GetLoanProductsChargeAppliesTo {
 
                 private GetLoanProductsChargeAppliesTo() {}
 
@@ -553,7 +553,7 @@ final class LoanProductsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetLoanChargeCalculationType {
+            static final class GetLoanChargeCalculationType {
 
                 private GetLoanChargeCalculationType() {}
 
@@ -565,7 +565,7 @@ final class LoanProductsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetLoansChargePaymentMode {
+            static final class GetLoansChargePaymentMode {
 
                 private GetLoansChargePaymentMode() {}
 
@@ -594,15 +594,15 @@ final class LoanProductsApiResourceSwagger {
             public GetLoansChargePaymentMode chargePaymentMode;
         }
 
-        final class GetLoanProductsAccountingMappingOptions {
+        static final class GetLoanProductsAccountingMappingOptions {
 
             private GetLoanProductsAccountingMappingOptions() {}
 
-            final class GetLoanProductsLiabilityAccountOptions {
+            static final class GetLoanProductsLiabilityAccountOptions {
 
                 private GetLoanProductsLiabilityAccountOptions() {}
 
-                final class GetLoanProductsLiabilityType {
+                static final class GetLoanProductsLiabilityType {
 
                     private GetLoanProductsLiabilityType() {}
 
@@ -614,7 +614,7 @@ final class LoanProductsApiResourceSwagger {
                     public String value;
                 }
 
-                final class GetLoanProductsLiabilityUsage {
+                static final class GetLoanProductsLiabilityUsage {
 
                     private GetLoanProductsLiabilityUsage() {}
 
@@ -626,7 +626,7 @@ final class LoanProductsApiResourceSwagger {
                     public String value;
                 }
 
-                final class GetLoanProductsLiabilityTagId {
+                static final class GetLoanProductsLiabilityTagId {
 
                     private GetLoanProductsLiabilityTagId() {}
 
@@ -653,7 +653,7 @@ final class LoanProductsApiResourceSwagger {
                 public Integer organizationRunningBalance;
             }
 
-            final class GetLoanProductsAssetAccountOptions {
+            static final class GetLoanProductsAssetAccountOptions {
 
                 private GetLoanProductsAssetAccountOptions() {}
 
@@ -676,11 +676,11 @@ final class LoanProductsApiResourceSwagger {
                 public Integer organizationRunningBalance;
             }
 
-            final class GetLoanProductsExpenseAccountOptions {
+            static final class GetLoanProductsExpenseAccountOptions {
 
                 private GetLoanProductsExpenseAccountOptions() {}
 
-                final class GetLoanProductsExpenseType {
+                static final class GetLoanProductsExpenseType {
 
                     private GetLoanProductsExpenseType() {}
 
@@ -711,11 +711,11 @@ final class LoanProductsApiResourceSwagger {
                 public Integer organizationRunningBalance;
             }
 
-            final class GetLoanProductsIncomeAccountOptions {
+            static final class GetLoanProductsIncomeAccountOptions {
 
                 private GetLoanProductsIncomeAccountOptions() {}
 
-                final class GetLoanProductsIncomeType {
+                static final class GetLoanProductsIncomeType {
 
                     private GetLoanProductsIncomeType() {}
 
@@ -752,7 +752,7 @@ final class LoanProductsApiResourceSwagger {
             public Set<GetLoanProductsIncomeAccountOptions> incomeAccountOptions;
         }
 
-        final class GetLoanProductsValueConditionTypeOptions {
+        static final class GetLoanProductsValueConditionTypeOptions {
 
             private GetLoanProductsValueConditionTypeOptions() {}
 
@@ -811,7 +811,7 @@ final class LoanProductsApiResourceSwagger {
 
         private GetLoanProductsProductIdResponse() {}
 
-        final class GetLoanProductsInterestRateFrequencyType {
+        static final class GetLoanProductsInterestRateFrequencyType {
 
             private GetLoanProductsInterestRateFrequencyType() {}
 
@@ -823,11 +823,11 @@ final class LoanProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoanProductsPrincipalVariationsForBorrowerCycle {
+        static final class GetLoanProductsPrincipalVariationsForBorrowerCycle {
 
             private GetLoanProductsPrincipalVariationsForBorrowerCycle() {}
 
-            final class GetLoanProductsParamType {
+            static final class GetLoanProductsParamType {
 
                 private GetLoanProductsParamType() {}
 
@@ -839,7 +839,7 @@ final class LoanProductsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetLoanProductsValueConditionType {
+            static final class GetLoanProductsValueConditionType {
 
                 private GetLoanProductsValueConditionType() {}
 
@@ -865,11 +865,11 @@ final class LoanProductsApiResourceSwagger {
             public Float defaultValue;
         }
 
-        final class GetLoanAccountingMappings {
+        static final class GetLoanAccountingMappings {
 
             private GetLoanAccountingMappings() {}
 
-            final class GetLoanFundSourceAccount {
+            static final class GetLoanFundSourceAccount {
 
                 private GetLoanFundSourceAccount() {}
 
@@ -881,7 +881,7 @@ final class LoanProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetLoanPortfolioAccount {
+            static final class GetLoanPortfolioAccount {
 
                 private GetLoanPortfolioAccount() {}
 
@@ -893,7 +893,7 @@ final class LoanProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetLoanTransfersInSuspenseAccount {
+            static final class GetLoanTransfersInSuspenseAccount {
 
                 private GetLoanTransfersInSuspenseAccount() {}
 
@@ -905,7 +905,7 @@ final class LoanProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetLoanInterestOnLoanAccount {
+            static final class GetLoanInterestOnLoanAccount {
 
                 private GetLoanInterestOnLoanAccount() {}
 
@@ -917,7 +917,7 @@ final class LoanProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetLoanIncomeFromFeeAccount {
+            static final class GetLoanIncomeFromFeeAccount {
 
                 private GetLoanIncomeFromFeeAccount() {}
 
@@ -929,7 +929,7 @@ final class LoanProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetLoanIncomeFromPenaltyAccount {
+            static final class GetLoanIncomeFromPenaltyAccount {
 
                 private GetLoanIncomeFromPenaltyAccount() {}
 
@@ -941,7 +941,7 @@ final class LoanProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetLoanWriteOffAccount {
+            static final class GetLoanWriteOffAccount {
 
                 private GetLoanWriteOffAccount() {}
 
@@ -953,7 +953,7 @@ final class LoanProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetLoanOverpaymentLiabilityAccount {
+            static final class GetLoanOverpaymentLiabilityAccount {
 
                 private GetLoanOverpaymentLiabilityAccount() {}
 
@@ -975,11 +975,11 @@ final class LoanProductsApiResourceSwagger {
             public GetLoanOverpaymentLiabilityAccount overpaymentLiabilityAccount;
         }
 
-        final class GetLoanPaymentChannelToFundSourceMappings {
+        static final class GetLoanPaymentChannelToFundSourceMappings {
 
             private GetLoanPaymentChannelToFundSourceMappings() {}
 
-            final class GetLoanPaymentType {
+            static final class GetLoanPaymentType {
 
                 private GetLoanPaymentType() {}
 
@@ -993,11 +993,11 @@ final class LoanProductsApiResourceSwagger {
             public GetLoanAccountingMappings.GetLoanFundSourceAccount fundSourceAccount;
         }
 
-        final class GetLoanFeeToIncomeAccountMappings {
+        static final class GetLoanFeeToIncomeAccountMappings {
 
             private GetLoanFeeToIncomeAccountMappings() {}
 
-            final class GetLoanCharge {
+            static final class GetLoanCharge {
 
                 private GetLoanCharge() {}
 
@@ -1090,7 +1090,7 @@ final class LoanProductsApiResourceSwagger {
 
         private PutLoanProductsProductIdResponse() {}
 
-        final class PutLoanChanges {
+        static final class PutLoanChanges {
 
             private PutLoanChanges() {}
 
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 6f7b86d..588b222 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
@@ -34,7 +34,7 @@ final class NotesApiResourceSwagger {
 
         private GetResourceTypeResourceIdNotesResponse() {}
 
-        final class GetNotesNoteType {
+        static final class GetNotesNoteType {
 
             private GetNotesNoteType() {}
 
@@ -129,7 +129,7 @@ final class NotesApiResourceSwagger {
 
         private PutResourceTypeResourceIdNotesNoteIdResponse() {}
 
-        final class PutNotesChanges {
+        static final class PutNotesChanges {
 
             private PutNotesChanges() {}
 
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 6bb5b73..1742252 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
@@ -34,7 +34,7 @@ final class ProductsApiResourceSwagger {
 
         private GetProductsTypeProductIdResponse() {}
 
-        final class GetProductsCurrency {
+        static final class GetProductsCurrency {
 
             private GetProductsCurrency() {}
 
@@ -54,7 +54,7 @@ final class ProductsApiResourceSwagger {
             public String displayLabel;
         }
 
-        final class GetProductsMarketPrice {
+        static final class GetProductsMarketPrice {
 
             private GetProductsMarketPrice() {}
 
@@ -66,11 +66,11 @@ final class ProductsApiResourceSwagger {
             public Integer shareValue;
         }
 
-        final class GetProductsCharges {
+        static final class GetProductsCharges {
 
             private GetProductsCharges() {}
 
-            final class GetChargesCurrency {
+            static final class GetChargesCurrency {
 
                 private GetChargesCurrency() {}
 
@@ -88,7 +88,7 @@ final class ProductsApiResourceSwagger {
                 public String displayLabel;
             }
 
-            final class GetChargeTimeType {
+            static final class GetChargeTimeType {
 
                 private GetChargeTimeType() {}
 
@@ -100,7 +100,7 @@ final class ProductsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetChargeAppliesTo {
+            static final class GetChargeAppliesTo {
 
                 private GetChargeAppliesTo() {}
 
@@ -112,7 +112,7 @@ final class ProductsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetChargeCalculationType {
+            static final class GetChargeCalculationType {
 
                 private GetChargeCalculationType() {}
 
@@ -124,7 +124,7 @@ final class ProductsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetChargePaymentMode {
+            static final class GetChargePaymentMode {
 
                 private GetChargePaymentMode() {}
 
@@ -153,7 +153,7 @@ final class ProductsApiResourceSwagger {
             public GetChargePaymentMode chargePaymentMode;
         }
 
-        final class GetLockPeriodTypeEnum {
+        static final class GetLockPeriodTypeEnum {
 
             private GetLockPeriodTypeEnum() {}
 
@@ -163,7 +163,7 @@ final class ProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetProductsAccountingRule {
+        static final class GetProductsAccountingRule {
 
             private GetProductsAccountingRule() {}
 
@@ -175,11 +175,11 @@ final class ProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetProductsAccountingMappings {
+        static final class GetProductsAccountingMappings {
 
             private GetProductsAccountingMappings() {}
 
-            final class GetShareReferenceId {
+            static final class GetShareReferenceId {
 
                 private GetShareReferenceId() {}
 
@@ -191,7 +191,7 @@ final class ProductsApiResourceSwagger {
                 public String glCode;
             }
 
-            final class GetIncomeFromFeeAccountId {
+            static final class GetIncomeFromFeeAccountId {
 
                 private GetIncomeFromFeeAccountId() {}
 
@@ -203,7 +203,7 @@ final class ProductsApiResourceSwagger {
                 public String glCode;
             }
 
-            final class GetShareEquityId {
+            static final class GetShareEquityId {
 
                 private GetShareEquityId() {}
 
@@ -215,7 +215,7 @@ final class ProductsApiResourceSwagger {
                 public String glCode;
             }
 
-            final class GetShareSuspenseId {
+            static final class GetShareSuspenseId {
 
                 private GetShareSuspenseId() {}
 
@@ -233,7 +233,7 @@ final class ProductsApiResourceSwagger {
             public GetShareSuspenseId shareSuspenseId;
         }
 
-        final class GetProductsMinimumActivePeriodFrequencyTypeOptions {
+        static final class GetProductsMinimumActivePeriodFrequencyTypeOptions {
 
             private GetProductsMinimumActivePeriodFrequencyTypeOptions() {}
 
@@ -245,15 +245,15 @@ final class ProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetProductsAccountingMappingOptions {
+        static final class GetProductsAccountingMappingOptions {
 
             private GetProductsAccountingMappingOptions() {}
 
-            final class GetProductsLiabilityAccountOptions {
+            static final class GetProductsLiabilityAccountOptions {
 
                 private GetProductsLiabilityAccountOptions() {}
 
-                final class GetProductsLiabilityType {
+                static final class GetProductsLiabilityType {
 
                     private GetProductsLiabilityType() {}
 
@@ -265,7 +265,7 @@ final class ProductsApiResourceSwagger {
                     public String value;
                 }
 
-                final class GetProductsLiabilityUsage {
+                static final class GetProductsLiabilityUsage {
 
                     private GetProductsLiabilityUsage() {}
 
@@ -277,7 +277,7 @@ final class ProductsApiResourceSwagger {
                     public String value;
                 }
 
-                final class GetProductsTagId {
+                static final class GetProductsTagId {
 
                     private GetProductsTagId() {}
 
@@ -306,11 +306,11 @@ final class ProductsApiResourceSwagger {
                 public GetProductsTagId tagId;
             }
 
-            final class GetProductsAssetAccountOptions {
+            static final class GetProductsAssetAccountOptions {
 
                 private GetProductsAssetAccountOptions() {}
 
-                final class GetAssetType {
+                static final class GetAssetType {
 
                     private GetAssetType() {}
 
@@ -341,11 +341,11 @@ final class ProductsApiResourceSwagger {
                 public GetProductsLiabilityAccountOptions.GetProductsTagId tagId;
             }
 
-            final class GetProductsIncomeAccountOptions {
+            static final class GetProductsIncomeAccountOptions {
 
                 private GetProductsIncomeAccountOptions() {}
 
-                final class GetIncomeType {
+                static final class GetIncomeType {
 
                     private GetIncomeType() {}
 
@@ -376,11 +376,11 @@ final class ProductsApiResourceSwagger {
                 public GetProductsLiabilityAccountOptions.GetProductsTagId tagId;
             }
 
-            final class GetProductsEquityAccountOptions {
+            static final class GetProductsEquityAccountOptions {
 
                 private GetProductsEquityAccountOptions() {}
 
-                final class GetEquityType {
+                static final class GetEquityType {
 
                     private GetEquityType() {}
 
@@ -462,7 +462,7 @@ final class ProductsApiResourceSwagger {
 
         private GetProductsTypeResponse() {}
 
-        final class GetProductsPageItems {
+        static final class GetProductsPageItems {
 
             private GetProductsPageItems() {}
 
@@ -486,7 +486,7 @@ final class ProductsApiResourceSwagger {
 
         private PostProductsTypeRequest() {}
 
-        final class PostProductsMarketPricePeriods {
+        static final class PostProductsMarketPricePeriods {
 
             private PostProductsMarketPricePeriods() {}
 
@@ -500,7 +500,7 @@ final class ProductsApiResourceSwagger {
             public Integer shareValue;
         }
 
-        final class PostProductsChargesSelected {
+        static final class PostProductsChargesSelected {
 
             private PostProductsChargesSelected() {}
 
@@ -577,7 +577,7 @@ final class ProductsApiResourceSwagger {
 
         private PutProductsTypeProductIdResponse() {}
 
-        final class PutProductsChanges {
+        static final class PutProductsChanges {
 
             private PutProductsChanges() {}
 
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 44fc7df..e8af962 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
@@ -35,7 +35,7 @@ final class FixedDepositAccountsApiResourceSwagger {
 
         private GetFixedDepositAccountsTemplateResponse() {}
 
-        final class GetFixedDepositAccountsProductOptions {
+        static final class GetFixedDepositAccountsProductOptions {
 
             private GetFixedDepositAccountsProductOptions() {}
 
@@ -57,7 +57,7 @@ final class FixedDepositAccountsApiResourceSwagger {
 
         private GetFixedDepositAccountsResponse() {}
 
-        final class GetFixedDepositAccountsStatus {
+        static final class GetFixedDepositAccountsStatus {
 
             private GetFixedDepositAccountsStatus() {}
 
@@ -87,7 +87,7 @@ final class FixedDepositAccountsApiResourceSwagger {
             public Boolean transferOnHold;
         }
 
-        final class GetFixedDepositAccountsTimeline {
+        static final class GetFixedDepositAccountsTimeline {
 
             private GetFixedDepositAccountsTimeline() {}
 
@@ -101,7 +101,7 @@ final class FixedDepositAccountsApiResourceSwagger {
             public String submittedByLastname;
         }
 
-        final class GetFixedDepositAccountsCurrency {
+        static final class GetFixedDepositAccountsCurrency {
 
             private GetFixedDepositAccountsCurrency() {}
 
@@ -121,7 +121,7 @@ final class FixedDepositAccountsApiResourceSwagger {
             public String displayLabel;
         }
 
-        final class GetFixedDepositAccountsInterestCompoundingPeriodType {
+        static final class GetFixedDepositAccountsInterestCompoundingPeriodType {
 
             private GetFixedDepositAccountsInterestCompoundingPeriodType() {}
 
@@ -133,7 +133,7 @@ final class FixedDepositAccountsApiResourceSwagger {
             public String value;
         }
 
-        final class GetFixedDepositAccountsInterestPostingPeriodType {
+        static final class GetFixedDepositAccountsInterestPostingPeriodType {
 
             private GetFixedDepositAccountsInterestPostingPeriodType() {}
 
@@ -145,7 +145,7 @@ final class FixedDepositAccountsApiResourceSwagger {
             public String value;
         }
 
-        final class GetFixedDepositAccountsInterestCalculationType {
+        static final class GetFixedDepositAccountsInterestCalculationType {
 
             private GetFixedDepositAccountsInterestCalculationType() {}
 
@@ -157,7 +157,7 @@ final class FixedDepositAccountsApiResourceSwagger {
             public String value;
         }
 
-        final class GetFixedDepositAccountsInterestCalculationDaysInYearType {
+        static final class GetFixedDepositAccountsInterestCalculationDaysInYearType {
 
             private GetFixedDepositAccountsInterestCalculationDaysInYearType() {}
 
@@ -169,7 +169,7 @@ final class FixedDepositAccountsApiResourceSwagger {
             public String value;
         }
 
-        final class GetFixedDepositAccountsSummary {
+        static final class GetFixedDepositAccountsSummary {
 
             private GetFixedDepositAccountsSummary() {}
 
@@ -178,7 +178,7 @@ final class FixedDepositAccountsApiResourceSwagger {
             public Float accountBalance;
         }
 
-        final class GetFixedDepositAccountsMinDepositTermType {
+        static final class GetFixedDepositAccountsMinDepositTermType {
 
             private GetFixedDepositAccountsMinDepositTermType() {}
 
@@ -190,7 +190,7 @@ final class FixedDepositAccountsApiResourceSwagger {
             public String value;
         }
 
-        final class GetFixedDepositAccountsMaxDepositTermType {
+        static final class GetFixedDepositAccountsMaxDepositTermType {
 
             private GetFixedDepositAccountsMaxDepositTermType() {}
 
@@ -202,7 +202,7 @@ final class FixedDepositAccountsApiResourceSwagger {
             public String value;
         }
 
-        final class GetFixedDepositAccountsDepositPeriodFrequency {
+        static final class GetFixedDepositAccountsDepositPeriodFrequency {
 
             private GetFixedDepositAccountsDepositPeriodFrequency() {}
 
@@ -300,15 +300,15 @@ final class FixedDepositAccountsApiResourceSwagger {
 
         private GetFixedDepositAccountsAccountIdResponse() {}
 
-        final class GetFixedDepositAccountsAccountChart {
+        static final class GetFixedDepositAccountsAccountChart {
 
             private GetFixedDepositAccountsAccountChart() {}
 
-            final class GetFixedDepositAccountsChartSlabs {
+            static final class GetFixedDepositAccountsChartSlabs {
 
                 private GetFixedDepositAccountsChartSlabs() {}
 
-                final class GetFixedDepositAccountsPeriodType {
+                static final class GetFixedDepositAccountsPeriodType {
 
                     private GetFixedDepositAccountsPeriodType() {}
 
@@ -320,7 +320,7 @@ final class FixedDepositAccountsApiResourceSwagger {
                     public String value;
                 }
 
-                final class GetFixedDepositAccountsAccountChartCurrency {
+                static final class GetFixedDepositAccountsAccountChartCurrency {
 
                     private GetFixedDepositAccountsAccountChartCurrency() {}
 
@@ -350,7 +350,7 @@ final class FixedDepositAccountsApiResourceSwagger {
                 public GetFixedDepositAccountsAccountChartCurrency currency;
             }
 
-            final class GetFixedDepositAccountsPeriodTypes {
+            static final class GetFixedDepositAccountsPeriodTypes {
 
                 private GetFixedDepositAccountsPeriodTypes() {}
 
@@ -374,7 +374,7 @@ final class FixedDepositAccountsApiResourceSwagger {
             public Set<GetFixedDepositAccountsPeriodTypes> periodTypes;
         }
 
-        final class GetFixedDepositAccountsAccountIdCurrency {
+        static final class GetFixedDepositAccountsAccountIdCurrency {
 
             private GetFixedDepositAccountsAccountIdCurrency() {}
 
@@ -394,7 +394,7 @@ final class FixedDepositAccountsApiResourceSwagger {
             public String displayLabel;
         }
 
-        final class GetFixedDepositAccountsAccountIdSummary {
+        static final class GetFixedDepositAccountsAccountIdSummary {
 
             private GetFixedDepositAccountsAccountIdSummary() {}
 
@@ -465,7 +465,7 @@ final class FixedDepositAccountsApiResourceSwagger {
 
         private PutFixedDepositAccountsAccountIdResponse() {}
 
-        final class PutFixedDepositAccountsChanges {
+        static final class PutFixedDepositAccountsChanges {
 
             private PutFixedDepositAccountsChanges() {}
 
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 ffaf5af..ef1ab62 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
@@ -35,11 +35,11 @@ final class FixedDepositProductsApiResourceSwagger {
 
         private PostFixedDepositProductsRequest() {}
 
-        final class PostFixedDepositProductsCharts {
+        static final class PostFixedDepositProductsCharts {
 
             private PostFixedDepositProductsCharts() {}
 
-            final class PostFixedDepositProductsChartSlabs {
+            static final class PostFixedDepositProductsChartSlabs {
 
                 private PostFixedDepositProductsChartSlabs() {}
 
@@ -134,7 +134,7 @@ final class FixedDepositProductsApiResourceSwagger {
 
         private PutFixedDepositProductsProductIdResponse() {}
 
-        final class PutFixedDepositProductsChanges {
+        static final class PutFixedDepositProductsChanges {
 
             private PutFixedDepositProductsChanges() {}
 
@@ -154,7 +154,7 @@ final class FixedDepositProductsApiResourceSwagger {
 
         private GetFixedDepositProductsResponse() {}
 
-        final class GetFixedDepositProductsCurrency {
+        static final class GetFixedDepositProductsCurrency {
 
             private GetFixedDepositProductsCurrency() {}
 
@@ -174,7 +174,7 @@ final class FixedDepositProductsApiResourceSwagger {
             public String displayLabel;
         }
 
-        final class GetFixedDepositProductsMinDepositTermType {
+        static final class GetFixedDepositProductsMinDepositTermType {
 
             private GetFixedDepositProductsMinDepositTermType() {}
 
@@ -186,7 +186,7 @@ final class FixedDepositProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetFixedDepositProductsMaxDepositTermType {
+        static final class GetFixedDepositProductsMaxDepositTermType {
 
             private GetFixedDepositProductsMaxDepositTermType() {}
 
@@ -198,7 +198,7 @@ final class FixedDepositProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetFixedDepositProductsInterestCompoundingPeriodType {
+        static final class GetFixedDepositProductsInterestCompoundingPeriodType {
 
             private GetFixedDepositProductsInterestCompoundingPeriodType() {}
 
@@ -210,7 +210,7 @@ final class FixedDepositProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetFixedDepositProductsInterestPostingPeriodType {
+        static final class GetFixedDepositProductsInterestPostingPeriodType {
 
             private GetFixedDepositProductsInterestPostingPeriodType() {}
 
@@ -222,7 +222,7 @@ final class FixedDepositProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetFixedDepositProductsInterestCalculationType {
+        static final class GetFixedDepositProductsInterestCalculationType {
 
             private GetFixedDepositProductsInterestCalculationType() {}
 
@@ -234,7 +234,7 @@ final class FixedDepositProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetFixedDepositProductsInterestCalculationDaysInYearType {
+        static final class GetFixedDepositProductsInterestCalculationDaysInYearType {
 
             private GetFixedDepositProductsInterestCalculationDaysInYearType() {}
 
@@ -246,7 +246,7 @@ final class FixedDepositProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetFixedDepositProductsAccountingRule {
+        static final class GetFixedDepositProductsAccountingRule {
 
             private GetFixedDepositProductsAccountingRule() {}
 
@@ -289,7 +289,7 @@ final class FixedDepositProductsApiResourceSwagger {
 
         private GetFixedDepositProductsProductIdResponse() {}
 
-        final class GetFixedDepositProductsProductIdCurrency {
+        static final class GetFixedDepositProductsProductIdCurrency {
 
             private GetFixedDepositProductsProductIdCurrency() {}
 
@@ -307,7 +307,7 @@ final class FixedDepositProductsApiResourceSwagger {
             public String displayLabel;
         }
 
-        final class GetFixedDepositProductsProductIdInterestCompoundingPeriodType {
+        static final class GetFixedDepositProductsProductIdInterestCompoundingPeriodType {
 
             private GetFixedDepositProductsProductIdInterestCompoundingPeriodType() {}
 
@@ -319,11 +319,11 @@ final class FixedDepositProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetFixedDepositProductsProductIdAccountingMappings {
+        static final class GetFixedDepositProductsProductIdAccountingMappings {
 
             private GetFixedDepositProductsProductIdAccountingMappings() {}
 
-            final class GetFixedDepositProductsProductIdSavingsReferenceAccount {
+            static final class GetFixedDepositProductsProductIdSavingsReferenceAccount {
 
                 private GetFixedDepositProductsProductIdSavingsReferenceAccount() {}
 
@@ -335,7 +335,7 @@ final class FixedDepositProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetFixedDepositProductsProductIdIncomeFromFeeAccount {
+            static final class GetFixedDepositProductsProductIdIncomeFromFeeAccount {
 
                 private GetFixedDepositProductsProductIdIncomeFromFeeAccount() {}
 
@@ -347,7 +347,7 @@ final class FixedDepositProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetFixedDepositProductsProductIdIncomeFromPenaltyAccount {
+            static final class GetFixedDepositProductsProductIdIncomeFromPenaltyAccount {
 
                 private GetFixedDepositProductsProductIdIncomeFromPenaltyAccount() {}
 
@@ -359,7 +359,7 @@ final class FixedDepositProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetFixedDepositProductsProductIdInterestOnSavingsAccount {
+            static final class GetFixedDepositProductsProductIdInterestOnSavingsAccount {
 
                 private GetFixedDepositProductsProductIdInterestOnSavingsAccount() {}
 
@@ -371,7 +371,7 @@ final class FixedDepositProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetFixedDepositProductsProductIdSavingsControlAccount {
+            static final class GetFixedDepositProductsProductIdSavingsControlAccount {
 
                 private GetFixedDepositProductsProductIdSavingsControlAccount() {}
 
@@ -383,7 +383,7 @@ final class FixedDepositProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetFixedDepositProductsProductIdTransfersInSuspenseAccount {
+            static final class GetFixedDepositProductsProductIdTransfersInSuspenseAccount {
 
                 private GetFixedDepositProductsProductIdTransfersInSuspenseAccount() {}
 
@@ -403,11 +403,11 @@ final class FixedDepositProductsApiResourceSwagger {
             public GetFixedDepositProductsProductIdTransfersInSuspenseAccount transfersInSuspenseAccount;
         }
 
-        final class GetFixedDepositProductsProductIdFeeToIncomeAccountMappings {
+        static final class GetFixedDepositProductsProductIdFeeToIncomeAccountMappings {
 
             private GetFixedDepositProductsProductIdFeeToIncomeAccountMappings() {}
 
-            final class GetFixedDepositProductsProductIdFeeToIncomeAccountMappingsCharge {
+            static final class GetFixedDepositProductsProductIdFeeToIncomeAccountMappingsCharge {
 
                 private GetFixedDepositProductsProductIdFeeToIncomeAccountMappingsCharge() {}
 
@@ -421,7 +421,7 @@ final class FixedDepositProductsApiResourceSwagger {
                 public Boolean penalty;
             }
 
-            final class GetFixedDepositProductsProductIdFeeToIncomeAccountMappingsIncomeAccount {
+            static final class GetFixedDepositProductsProductIdFeeToIncomeAccountMappingsIncomeAccount {
 
                 private GetFixedDepositProductsProductIdFeeToIncomeAccountMappingsIncomeAccount() {}
 
@@ -437,11 +437,11 @@ final class FixedDepositProductsApiResourceSwagger {
             public GetFixedDepositProductsProductIdFeeToIncomeAccountMappingsIncomeAccount incomeAccount;
         }
 
-        final class GetFixedDepositProductsProductIdPenaltyToIncomeAccountMappings {
+        static final class GetFixedDepositProductsProductIdPenaltyToIncomeAccountMappings {
 
             private GetFixedDepositProductsProductIdPenaltyToIncomeAccountMappings() {}
 
-            final class GetFixedDepositProductsProductIdPenaltyToIncomeAccountMappingsCharge {
+            static final class GetFixedDepositProductsProductIdPenaltyToIncomeAccountMappingsCharge {
 
                 private GetFixedDepositProductsProductIdPenaltyToIncomeAccountMappingsCharge() {}
 
@@ -459,7 +459,7 @@ final class FixedDepositProductsApiResourceSwagger {
             public GetFixedDepositProductsProductIdAccountingMappings.GetFixedDepositProductsProductIdIncomeFromPenaltyAccount incomeAccount;
         }
 
-        final class GetFixedDepositProductsProductIdPreClosurePenalInterestOnType {
+        static final class GetFixedDepositProductsProductIdPreClosurePenalInterestOnType {
 
             private GetFixedDepositProductsProductIdPreClosurePenalInterestOnType() {}
 
@@ -471,7 +471,7 @@ final class FixedDepositProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetFixedDepositProductsProductIdMinDepositTermType {
+        static final class GetFixedDepositProductsProductIdMinDepositTermType {
 
             private GetFixedDepositProductsProductIdMinDepositTermType() {}
 
@@ -483,7 +483,7 @@ final class FixedDepositProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetFixedDepositProductsProductIdMaxDepositTermType {
+        static final class GetFixedDepositProductsProductIdMaxDepositTermType {
 
             private GetFixedDepositProductsProductIdMaxDepositTermType() {}
 
@@ -495,15 +495,15 @@ final class FixedDepositProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetFixedDepositProductsProductIdActiveChart {
+        static final class GetFixedDepositProductsProductIdActiveChart {
 
             private GetFixedDepositProductsProductIdActiveChart() {}
 
-            final class GetFixedDepositProductsProductIdChartSlabs {
+            static final class GetFixedDepositProductsProductIdChartSlabs {
 
                 private GetFixedDepositProductsProductIdChartSlabs() {}
 
-                final class GetFixedDepositProductsProductIdPeriodType {
+                static final class GetFixedDepositProductsProductIdPeriodType {
 
                     private GetFixedDepositProductsProductIdPeriodType() {}
 
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 cbac093..d775236 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
@@ -36,7 +36,7 @@ final class RecurringDepositAccountTransactionsApiResourceSwagger {
 
         private GetRecurringDepositAccountsRecurringDepositAccountIdTransactionsTemplateResponse() {}
 
-        final class GetRecurringTransactionType {
+        static final class GetRecurringTransactionType {
 
             private GetRecurringTransactionType() {}
 
@@ -70,7 +70,7 @@ final class RecurringDepositAccountTransactionsApiResourceSwagger {
             public Boolean overdraftFee;
         }
 
-        final class GetRecurringCurrency {
+        static final class GetRecurringCurrency {
 
             private GetRecurringCurrency() {}
 
@@ -113,7 +113,7 @@ final class RecurringDepositAccountTransactionsApiResourceSwagger {
 
         private GetRecurringDepositAccountsRecurringDepositAccountIdTransactionsTransactionIdResponse() {}
 
-        final class GetRecurringTransactionsCurrency {
+        static final class GetRecurringTransactionsCurrency {
 
             private GetRecurringTransactionsCurrency() {}
 
@@ -133,7 +133,7 @@ final class RecurringDepositAccountTransactionsApiResourceSwagger {
             public String displayLabel;
         }
 
-        final class GetRecurringTransactionsTransactionType {
+        static final class GetRecurringTransactionsTransactionType {
 
             private GetRecurringTransactionsTransactionType() {}
 
@@ -153,11 +153,11 @@ final class RecurringDepositAccountTransactionsApiResourceSwagger {
             public Boolean feeDeduction;
         }
 
-        final class GetRecurringPaymentDetailData {
+        static final class GetRecurringPaymentDetailData {
 
             private GetRecurringPaymentDetailData() {}
 
-            final class GetRecurringPaymentType {
+            static final class GetRecurringPaymentType {
 
                 private GetRecurringPaymentType() {}
 
@@ -233,7 +233,7 @@ final class RecurringDepositAccountTransactionsApiResourceSwagger {
 
         private PostRecurringDepositAccountsRecurringDepositAccountIdTransactionsResponse() {}
 
-        final class PostRecurringChanges {
+        static final class PostRecurringChanges {
 
             private PostRecurringChanges() {}
 
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 b9e2e65..1cb72db 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
@@ -35,7 +35,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
 
         private GetRecurringDepositAccountsTemplateResponse() {}
 
-        final class GetRecurringProductOptions {
+        static final class GetRecurringProductOptions {
 
             private GetRecurringProductOptions() {}
 
@@ -57,7 +57,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
 
         private GetRecurringDepositAccountsResponse() {}
 
-        final class GetRecurringDepositAccountsStatus {
+        static final class GetRecurringDepositAccountsStatus {
 
             private GetRecurringDepositAccountsStatus() {}
 
@@ -87,7 +87,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
             public Boolean transferOnHold;
         }
 
-        final class GetRecurringDepositAccountsTimeline {
+        static final class GetRecurringDepositAccountsTimeline {
 
             private GetRecurringDepositAccountsTimeline() {}
 
@@ -101,7 +101,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
             public String submittedByLastname;
         }
 
-        final class GetRecurringDepositAccountsCurrency {
+        static final class GetRecurringDepositAccountsCurrency {
 
             private GetRecurringDepositAccountsCurrency() {}
 
@@ -121,7 +121,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
             public String displayLabel;
         }
 
-        final class GetRecurringDepositAccountsInterestCompoundingPeriodType {
+        static final class GetRecurringDepositAccountsInterestCompoundingPeriodType {
 
             private GetRecurringDepositAccountsInterestCompoundingPeriodType() {}
 
@@ -133,7 +133,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
             public String value;
         }
 
-        final class GetRecurringDepositAccountsInterestPostingPeriodType {
+        static final class GetRecurringDepositAccountsInterestPostingPeriodType {
 
             private GetRecurringDepositAccountsInterestPostingPeriodType() {}
 
@@ -145,7 +145,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
             public String value;
         }
 
-        final class GetRecurringDepositAccountsInterestCalculationType {
+        static final class GetRecurringDepositAccountsInterestCalculationType {
 
             private GetRecurringDepositAccountsInterestCalculationType() {}
 
@@ -157,7 +157,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
             public String value;
         }
 
-        final class GetRecurringDepositAccountsInterestCalculationDaysInYearType {
+        static final class GetRecurringDepositAccountsInterestCalculationDaysInYearType {
 
             private GetRecurringDepositAccountsInterestCalculationDaysInYearType() {}
 
@@ -169,7 +169,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
             public String value;
         }
 
-        final class GetRecurringDepositAccountsSummary {
+        static final class GetRecurringDepositAccountsSummary {
 
             private GetRecurringDepositAccountsSummary() {}
 
@@ -178,7 +178,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
             public Float accountBalance;
         }
 
-        final class GetRecurringDepositAccountsMinDepositTermType {
+        static final class GetRecurringDepositAccountsMinDepositTermType {
 
             private GetRecurringDepositAccountsMinDepositTermType() {}
 
@@ -190,7 +190,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
             public String value;
         }
 
-        final class GetRecurringDepositAccountsMaxDepositTermType {
+        static final class GetRecurringDepositAccountsMaxDepositTermType {
 
             private GetRecurringDepositAccountsMaxDepositTermType() {}
 
@@ -202,7 +202,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
             public String value;
         }
 
-        final class GetRecurringDepositAccountsDepositPeriodFrequency {
+        static final class GetRecurringDepositAccountsDepositPeriodFrequency {
 
             private GetRecurringDepositAccountsDepositPeriodFrequency() {}
 
@@ -214,7 +214,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
             public String value;
         }
 
-        final class GetRecurringDepositAccountsRecurringDepositFrequencyType {
+        static final class GetRecurringDepositAccountsRecurringDepositFrequencyType {
 
             private GetRecurringDepositAccountsRecurringDepositFrequencyType() {}
 
@@ -323,15 +323,15 @@ final class RecurringDepositAccountsApiResourceSwagger {
 
         private GetRecurringDepositAccountsAccountIdResponse() {}
 
-        final class GetRecurringDepositAccountsAccountChart {
+        static final class GetRecurringDepositAccountsAccountChart {
 
             private GetRecurringDepositAccountsAccountChart() {}
 
-            final class GetRecurringDepositAccountsChartSlabs {
+            static final class GetRecurringDepositAccountsChartSlabs {
 
                 private GetRecurringDepositAccountsChartSlabs() {}
 
-                final class GetRecurringDepositAccountsPeriodType {
+                static final class GetRecurringDepositAccountsPeriodType {
 
                     private GetRecurringDepositAccountsPeriodType() {}
 
@@ -343,7 +343,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
                     public String value;
                 }
 
-                final class GetRecurringDepositAccountsAccountChartCurrency {
+                static final class GetRecurringDepositAccountsAccountChartCurrency {
 
                     private GetRecurringDepositAccountsAccountChartCurrency() {}
 
@@ -373,7 +373,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
                 public GetRecurringDepositAccountsAccountChartCurrency currency;
             }
 
-            final class GetRecurringDepositAccountsPeriodTypes {
+            static final class GetRecurringDepositAccountsPeriodTypes {
 
                 private GetRecurringDepositAccountsPeriodTypes() {}
 
@@ -458,7 +458,7 @@ final class RecurringDepositAccountsApiResourceSwagger {
 
         private PutRecurringDepositAccountsAccountIdResponse() {}
 
-        final class PutRecurringDepositAccountsChanges {
+        static final class PutRecurringDepositAccountsChanges {
 
             private PutRecurringDepositAccountsChanges() {}
 
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 2c498ea..81382ed 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
@@ -35,11 +35,11 @@ final class RecurringDepositProductsApiResourceSwagger {
 
         private PostRecurringDepositProductsRequest() {}
 
-        final class PostRecurringDepositProductsCharts {
+        static final class PostRecurringDepositProductsCharts {
 
             private PostRecurringDepositProductsCharts() {}
 
-            final class PostRecurringDepositProductsChartSlabs {
+            static final class PostRecurringDepositProductsChartSlabs {
 
                 private PostRecurringDepositProductsChartSlabs() {}
 
@@ -144,7 +144,7 @@ final class RecurringDepositProductsApiResourceSwagger {
 
         private PutRecurringDepositProductsResponse() {}
 
-        final class PutRecurringDepositProductsChanges {
+        static final class PutRecurringDepositProductsChanges {
 
             private PutRecurringDepositProductsChanges() {}
 
@@ -164,7 +164,7 @@ final class RecurringDepositProductsApiResourceSwagger {
 
         private GetRecurringDepositProductsResponse() {}
 
-        final class GetRecurringDepositProductsCurrency {
+        static final class GetRecurringDepositProductsCurrency {
 
             private GetRecurringDepositProductsCurrency() {}
 
@@ -184,7 +184,7 @@ final class RecurringDepositProductsApiResourceSwagger {
             public String displayLabel;
         }
 
-        final class GetRecurringDepositProductsMinDepositTermType {
+        static final class GetRecurringDepositProductsMinDepositTermType {
 
             private GetRecurringDepositProductsMinDepositTermType() {}
 
@@ -196,7 +196,7 @@ final class RecurringDepositProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetRecurringDepositProductsMaxDepositTermType {
+        static final class GetRecurringDepositProductsMaxDepositTermType {
 
             private GetRecurringDepositProductsMaxDepositTermType() {}
 
@@ -208,7 +208,7 @@ final class RecurringDepositProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetRecurringDepositProductsInterestCompoundingPeriodType {
+        static final class GetRecurringDepositProductsInterestCompoundingPeriodType {
 
             private GetRecurringDepositProductsInterestCompoundingPeriodType() {}
 
@@ -220,7 +220,7 @@ final class RecurringDepositProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetRecurringDepositProductsInterestPostingPeriodType {
+        static final class GetRecurringDepositProductsInterestPostingPeriodType {
 
             private GetRecurringDepositProductsInterestPostingPeriodType() {}
 
@@ -232,7 +232,7 @@ final class RecurringDepositProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetRecurringDepositProductsInterestCalculationType {
+        static final class GetRecurringDepositProductsInterestCalculationType {
 
             private GetRecurringDepositProductsInterestCalculationType() {}
 
@@ -244,7 +244,7 @@ final class RecurringDepositProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetRecurringDepositProductsInterestCalculationDaysInYearType {
+        static final class GetRecurringDepositProductsInterestCalculationDaysInYearType {
 
             private GetRecurringDepositProductsInterestCalculationDaysInYearType() {}
 
@@ -256,7 +256,7 @@ final class RecurringDepositProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetRecurringDepositProductsAccountingRule {
+        static final class GetRecurringDepositProductsAccountingRule {
 
             private GetRecurringDepositProductsAccountingRule() {}
 
@@ -268,7 +268,7 @@ final class RecurringDepositProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetRecurringDepositProductsRecurringDepositFrequencyType {
+        static final class GetRecurringDepositProductsRecurringDepositFrequencyType {
 
             private GetRecurringDepositProductsRecurringDepositFrequencyType() {}
 
@@ -314,7 +314,7 @@ final class RecurringDepositProductsApiResourceSwagger {
 
         private GetRecurringDepositProductsProductIdResponse() {}
 
-        final class GetRecurringDepositProductsProductIdCurrency {
+        static final class GetRecurringDepositProductsProductIdCurrency {
 
             private GetRecurringDepositProductsProductIdCurrency() {}
 
@@ -332,7 +332,7 @@ final class RecurringDepositProductsApiResourceSwagger {
             public String displayLabel;
         }
 
-        final class GetRecurringDepositProductsProductIdInterestCompoundingPeriodType {
+        static final class GetRecurringDepositProductsProductIdInterestCompoundingPeriodType {
 
             private GetRecurringDepositProductsProductIdInterestCompoundingPeriodType() {}
 
@@ -344,11 +344,11 @@ final class RecurringDepositProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetRecurringDepositProductsProductIdAccountingMappings {
+        static final class GetRecurringDepositProductsProductIdAccountingMappings {
 
             private GetRecurringDepositProductsProductIdAccountingMappings() {}
 
-            final class GetRecurringDepositProductsProductIdSavingsReferenceAccount {
+            static final class GetRecurringDepositProductsProductIdSavingsReferenceAccount {
 
                 private GetRecurringDepositProductsProductIdSavingsReferenceAccount() {}
 
@@ -360,7 +360,7 @@ final class RecurringDepositProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetRecurringDepositProductsProductIdIncomeFromFeeAccount {
+            static final class GetRecurringDepositProductsProductIdIncomeFromFeeAccount {
 
                 private GetRecurringDepositProductsProductIdIncomeFromFeeAccount() {}
 
@@ -372,7 +372,7 @@ final class RecurringDepositProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetRecurringDepositProductsProductIdIncomeFromPenaltyAccount {
+            static final class GetRecurringDepositProductsProductIdIncomeFromPenaltyAccount {
 
                 private GetRecurringDepositProductsProductIdIncomeFromPenaltyAccount() {}
 
@@ -384,7 +384,7 @@ final class RecurringDepositProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetRecurringDepositProductsProductIdInterestOnSavingsAccount {
+            static final class GetRecurringDepositProductsProductIdInterestOnSavingsAccount {
 
                 private GetRecurringDepositProductsProductIdInterestOnSavingsAccount() {}
 
@@ -396,7 +396,7 @@ final class RecurringDepositProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetRecurringDepositProductsProductIdSavingsControlAccount {
+            static final class GetRecurringDepositProductsProductIdSavingsControlAccount {
 
                 private GetRecurringDepositProductsProductIdSavingsControlAccount() {}
 
@@ -408,7 +408,7 @@ final class RecurringDepositProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetRecurringDepositProductsProductIdTransfersInSuspenseAccount {
+            static final class GetRecurringDepositProductsProductIdTransfersInSuspenseAccount {
 
                 private GetRecurringDepositProductsProductIdTransfersInSuspenseAccount() {}
 
@@ -428,11 +428,11 @@ final class RecurringDepositProductsApiResourceSwagger {
             public GetRecurringDepositProductsProductIdTransfersInSuspenseAccount transfersInSuspenseAccount;
         }
 
-        final class GetRecurringDepositProductsProductIdFeeToIncomeAccountMappings {
+        static final class GetRecurringDepositProductsProductIdFeeToIncomeAccountMappings {
 
             private GetRecurringDepositProductsProductIdFeeToIncomeAccountMappings() {}
 
-            final class GetRecurringDepositProductsProductIdFeeToIncomeAccountMappingsCharge {
+            static final class GetRecurringDepositProductsProductIdFeeToIncomeAccountMappingsCharge {
 
                 private GetRecurringDepositProductsProductIdFeeToIncomeAccountMappingsCharge() {}
 
@@ -446,7 +446,7 @@ final class RecurringDepositProductsApiResourceSwagger {
                 public Boolean penalty;
             }
 
-            final class GetRecurringDepositProductsProductIdFeeToIncomeAccountMappingsIncomeAccount {
+            static final class GetRecurringDepositProductsProductIdFeeToIncomeAccountMappingsIncomeAccount {
 
                 private GetRecurringDepositProductsProductIdFeeToIncomeAccountMappingsIncomeAccount() {}
 
@@ -462,11 +462,11 @@ final class RecurringDepositProductsApiResourceSwagger {
             public GetRecurringDepositProductsProductIdFeeToIncomeAccountMappingsIncomeAccount incomeAccount;
         }
 
-        final class GetRecurringDepositProductsProductIdPenaltyToIncomeAccountMappings {
+        static final class GetRecurringDepositProductsProductIdPenaltyToIncomeAccountMappings {
 
             private GetRecurringDepositProductsProductIdPenaltyToIncomeAccountMappings() {}
 
-            final class GetRecurringDepositProductsProductIdPenaltyToIncomeAccountMappingsCharge {
+            static final class GetRecurringDepositProductsProductIdPenaltyToIncomeAccountMappingsCharge {
 
                 private GetRecurringDepositProductsProductIdPenaltyToIncomeAccountMappingsCharge() {}
 
@@ -484,7 +484,7 @@ final class RecurringDepositProductsApiResourceSwagger {
             public GetRecurringDepositProductsProductIdAccountingMappings.GetRecurringDepositProductsProductIdIncomeFromPenaltyAccount incomeAccount;
         }
 
-        final class GetRecurringDepositProductsProductIdPreClosurePenalInterestOnType {
+        static final class GetRecurringDepositProductsProductIdPreClosurePenalInterestOnType {
 
             private GetRecurringDepositProductsProductIdPreClosurePenalInterestOnType() {}
 
@@ -496,7 +496,7 @@ final class RecurringDepositProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetRecurringDepositProductsProductIdMinDepositTermType {
+        static final class GetRecurringDepositProductsProductIdMinDepositTermType {
 
             private GetRecurringDepositProductsProductIdMinDepositTermType() {}
 
@@ -508,7 +508,7 @@ final class RecurringDepositProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetRecurringDepositProductsProductIdMaxDepositTermType {
+        static final class GetRecurringDepositProductsProductIdMaxDepositTermType {
 
             private GetRecurringDepositProductsProductIdMaxDepositTermType() {}
 
@@ -520,15 +520,15 @@ final class RecurringDepositProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetRecurringDepositProductsProductIdActiveChart {
+        static final class GetRecurringDepositProductsProductIdActiveChart {
 
             private GetRecurringDepositProductsProductIdActiveChart() {}
 
-            final class GetRecurringDepositProductsProductIdChartSlabs {
+            static final class GetRecurringDepositProductsProductIdChartSlabs {
 
                 private GetRecurringDepositProductsProductIdChartSlabs() {}
 
-                final class GetRecurringDepositProductsProductIdPeriodType {
+                static final class GetRecurringDepositProductsProductIdPeriodType {
 
                     private GetRecurringDepositProductsProductIdPeriodType() {}
 
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 48c335c..4c5a55e 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
@@ -34,7 +34,7 @@ final class SavingsAccountChargesApiResourceSwagger {
 
         private GetSavingsAccountsSavingsAccountIdChargesResponse() {}
 
-        final class GetChargesCurrencyResponse {
+        static final class GetChargesCurrencyResponse {
 
             @ApiModelProperty(example = "USD")
             public String code;
@@ -50,7 +50,7 @@ final class SavingsAccountChargesApiResourceSwagger {
             public String displayLabel;
         }
 
-        final class GetChargesChargeCalculationType {
+        static final class GetChargesChargeCalculationType {
 
             private GetChargesChargeCalculationType() {}
 
@@ -62,7 +62,7 @@ final class SavingsAccountChargesApiResourceSwagger {
             public String value;
         }
 
-        final class GetChargesChargeTimeType {
+        static final class GetChargesChargeTimeType {
 
             private GetChargesChargeTimeType() {}
 
@@ -110,11 +110,11 @@ final class SavingsAccountChargesApiResourceSwagger {
 
         private GetSavingsAccountsSavingsAccountIdChargesTemplateResponse() {}
 
-        final class GetSavingsChargesOptions {
+        static final class GetSavingsChargesOptions {
 
             private GetSavingsChargesOptions() {}
 
-            final class GetSavingsChargesChargeTimeType {
+            static final class GetSavingsChargesChargeTimeType {
 
                 private GetSavingsChargesChargeTimeType() {}
 
@@ -126,7 +126,7 @@ final class SavingsAccountChargesApiResourceSwagger {
                 public String value;
             }
 
-            final class GetChargesAppliesTo {
+            static final class GetChargesAppliesTo {
 
                 private GetChargesAppliesTo() {}
 
@@ -251,7 +251,7 @@ final class SavingsAccountChargesApiResourceSwagger {
 
         private PutSavingsAccountsSavingsAccountIdChargesSavingsAccountChargeIdResponse() {}
 
-        final class PutSavingsChanges {
+        static final class PutSavingsChanges {
 
             private PutSavingsChanges() {}
 
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 3ee435f..0c366b6 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
@@ -35,7 +35,7 @@ final class SavingsAccountsApiResourceSwagger {
 
         private GetSavingsAccountsTemplateResponse() {}
 
-        final class GetSavingsProductOptions {
+        static final class GetSavingsProductOptions {
 
             private GetSavingsProductOptions() {}
 
@@ -57,11 +57,11 @@ final class SavingsAccountsApiResourceSwagger {
 
         private GetSavingsAccountsResponse() {}
 
-        final class GetSavingsPageItems {
+        static final class GetSavingsPageItems {
 
             private GetSavingsPageItems() {}
 
-            final class GetSavingsStatus {
+            static final class GetSavingsStatus {
 
                 private GetSavingsStatus() {}
 
@@ -86,7 +86,7 @@ final class SavingsAccountsApiResourceSwagger {
 
             }
 
-            final class GetSavingsTimeline {
+            static final class GetSavingsTimeline {
 
                 private GetSavingsTimeline() {}
 
@@ -94,7 +94,7 @@ final class SavingsAccountsApiResourceSwagger {
                 public LocalDate submittedOnDate;
             }
 
-            final class GetSavingsCurrency {
+            static final class GetSavingsCurrency {
 
                 private GetSavingsCurrency() {}
 
@@ -112,7 +112,7 @@ final class SavingsAccountsApiResourceSwagger {
                 public String displayLabel;
             }
 
-            final class GetSavingsInterestCompoundingPeriodType {
+            static final class GetSavingsInterestCompoundingPeriodType {
 
                 private GetSavingsInterestCompoundingPeriodType() {}
 
@@ -124,7 +124,7 @@ final class SavingsAccountsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetSavingsInterestPostingPeriodType {
+            static final class GetSavingsInterestPostingPeriodType {
 
                 private GetSavingsInterestPostingPeriodType() {}
 
@@ -136,7 +136,7 @@ final class SavingsAccountsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetSavingsInterestCalculationType {
+            static final class GetSavingsInterestCalculationType {
 
                 private GetSavingsInterestCalculationType() {}
 
@@ -148,7 +148,7 @@ final class SavingsAccountsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetSavingsInterestCalculationDaysInYearType {
+            static final class GetSavingsInterestCalculationDaysInYearType {
 
                 private GetSavingsInterestCalculationDaysInYearType() {}
 
@@ -160,7 +160,7 @@ final class SavingsAccountsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetSavingsSummary {
+            static final class GetSavingsSummary {
 
                 private GetSavingsSummary() {}
 
@@ -237,7 +237,7 @@ final class SavingsAccountsApiResourceSwagger {
 
         private GetSavingsAccountsAccountIdResponse() {}
 
-        final class GetSavingsAccountsSummary {
+        static final class GetSavingsAccountsSummary {
 
             private GetSavingsAccountsSummary() {}
 
@@ -290,7 +290,7 @@ final class SavingsAccountsApiResourceSwagger {
 
         private PutSavingsAccountsAccountIdResponse() {}
 
-        final class PutSavingsAccountsChanges {
+        static final class PutSavingsAccountsChanges {
 
             private PutSavingsAccountsChanges() {}
 
@@ -329,7 +329,7 @@ final class SavingsAccountsApiResourceSwagger {
 
         private PostSavingsAccountsAccountIdResponse() {}
 
-        final class PostSavingsAccountsAccountIdChanges {
+        static final class PostSavingsAccountsAccountIdChanges {
 
             private PostSavingsAccountsAccountIdChanges() {}
         }
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 76bc2e5..4bc972f 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
@@ -36,7 +36,7 @@ final class SavingsProductsApiResourceSwagger {
 
         private PostSavingsProductsRequest() {}
 
-        final class PostSavingsCharges {
+        static final class PostSavingsCharges {
 
             private PostSavingsCharges() {}
 
@@ -100,7 +100,7 @@ final class SavingsProductsApiResourceSwagger {
 
         private PutSavingsProductsProductIdResponse() {}
 
-        final class PutSavingsChanges {
+        static final class PutSavingsChanges {
 
             private PutSavingsChanges() {}
 
@@ -122,7 +122,7 @@ final class SavingsProductsApiResourceSwagger {
 
         private GetSavingsProductsResponse() {}
 
-        final class GetSavingsCurrency {
+        static final class GetSavingsCurrency {
 
             private GetSavingsCurrency() {}
 
@@ -140,7 +140,7 @@ final class SavingsProductsApiResourceSwagger {
             public String displayLabel;
         }
 
-        final class GetSavingsProductsInterestCompoundingPeriodType {
+        static final class GetSavingsProductsInterestCompoundingPeriodType {
 
             private GetSavingsProductsInterestCompoundingPeriodType() {}
 
@@ -152,7 +152,7 @@ final class SavingsProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetSavingsProductsInterestPostingPeriodType {
+        static final class GetSavingsProductsInterestPostingPeriodType {
 
             private GetSavingsProductsInterestPostingPeriodType() {}
 
@@ -164,7 +164,7 @@ final class SavingsProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetSavingsProductsInterestCalculationType {
+        static final class GetSavingsProductsInterestCalculationType {
 
             private GetSavingsProductsInterestCalculationType() {}
 
@@ -176,7 +176,7 @@ final class SavingsProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetSavingsProductsInterestCalculationDaysInYearType {
+        static final class GetSavingsProductsInterestCalculationDaysInYearType {
 
             private GetSavingsProductsInterestCalculationDaysInYearType() {}
 
@@ -188,7 +188,7 @@ final class SavingsProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetSavingsProductsAccountingRule {
+        static final class GetSavingsProductsAccountingRule {
 
             private GetSavingsProductsAccountingRule() {}
 
@@ -225,11 +225,11 @@ final class SavingsProductsApiResourceSwagger {
 
         private GetSavingsProductsProductIdResponse() {}
 
-        final class GetSavingsProductsAccountingMappings {
+        static final class GetSavingsProductsAccountingMappings {
 
             private GetSavingsProductsAccountingMappings() {}
 
-            final class GetSavingsProductsSavingsReferenceAccount {
+            static final class GetSavingsProductsSavingsReferenceAccount {
 
                 private GetSavingsProductsSavingsReferenceAccount() {}
 
@@ -241,7 +241,7 @@ final class SavingsProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetSavingsProductsIncomeFromFeeAccount {
+            static final class GetSavingsProductsIncomeFromFeeAccount {
 
                 private GetSavingsProductsIncomeFromFeeAccount() {}
 
@@ -253,7 +253,7 @@ final class SavingsProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetSavingsProductsIncomeFromPenaltyAccount {
+            static final class GetSavingsProductsIncomeFromPenaltyAccount {
 
                 private GetSavingsProductsIncomeFromPenaltyAccount() {}
 
@@ -265,7 +265,7 @@ final class SavingsProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetSavingsProductsInterestOnSavingsAccount {
+            static final class GetSavingsProductsInterestOnSavingsAccount {
 
                 private GetSavingsProductsInterestOnSavingsAccount() {}
 
@@ -277,7 +277,7 @@ final class SavingsProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetSavingsProductsSavingsControlAccount {
+            static final class GetSavingsProductsSavingsControlAccount {
 
                 private GetSavingsProductsSavingsControlAccount() {}
 
@@ -289,7 +289,7 @@ final class SavingsProductsApiResourceSwagger {
                 public Integer glCode;
             }
 
-            final class GetSavingsProductsTransfersInSuspenseAccount {
+            static final class GetSavingsProductsTransfersInSuspenseAccount {
 
                 private GetSavingsProductsTransfersInSuspenseAccount() {}
 
@@ -309,11 +309,11 @@ final class SavingsProductsApiResourceSwagger {
             public GetSavingsProductsTransfersInSuspenseAccount transfersInSuspenseAccount;
         }
 
-        final class GetSavingsProductsPaymentChannelToFundSourceMappings {
+        static final class GetSavingsProductsPaymentChannelToFundSourceMappings {
 
             private GetSavingsProductsPaymentChannelToFundSourceMappings() {}
 
-            final class GetSavingsProductsPaymentType {
+            static final class GetSavingsProductsPaymentType {
 
                 private GetSavingsProductsPaymentType() {}
 
@@ -323,7 +323,7 @@ final class SavingsProductsApiResourceSwagger {
                 public String name;
             }
 
-            final class GetSavingsProductsFundSourceAccount {
+            static final class GetSavingsProductsFundSourceAccount {
 
                 private GetSavingsProductsFundSourceAccount() {}
 
@@ -339,11 +339,11 @@ final class SavingsProductsApiResourceSwagger {
             public GetSavingsProductsFundSourceAccount fundSourceAccount;
         }
 
-        final class GetSavingsProductsFeeToIncomeAccountMappings {
+        static final class GetSavingsProductsFeeToIncomeAccountMappings {
 
             private GetSavingsProductsFeeToIncomeAccountMappings() {}
 
-            final class GetSavingsProductsFeeToIncomeAccountMappingsCharge {
+            static final class GetSavingsProductsFeeToIncomeAccountMappingsCharge {
 
                 private GetSavingsProductsFeeToIncomeAccountMappingsCharge() {}
 
@@ -357,7 +357,7 @@ final class SavingsProductsApiResourceSwagger {
                 public Boolean penalty;
             }
 
-            final class GetSavingsProductsFeeToIncomeAccountMappingsIncomeAccount {
+            static final class GetSavingsProductsFeeToIncomeAccountMappingsIncomeAccount {
 
                 private GetSavingsProductsFeeToIncomeAccountMappingsIncomeAccount() {}
 
@@ -373,11 +373,11 @@ final class SavingsProductsApiResourceSwagger {
             public GetSavingsProductsFeeToIncomeAccountMappingsIncomeAccount incomeAccount;
         }
 
-        final class GetSavingsProductsPenaltyToIncomeAccountMappings {
+        static final class GetSavingsProductsPenaltyToIncomeAccountMappings {
 
             private GetSavingsProductsPenaltyToIncomeAccountMappings() {}
 
-            final class GetSavingsProductsPenaltyToIncomeAccountMappingsCharge {
+            static final class GetSavingsProductsPenaltyToIncomeAccountMappingsCharge {
 
                 private GetSavingsProductsPenaltyToIncomeAccountMappingsCharge() {}
 
@@ -426,7 +426,7 @@ final class SavingsProductsApiResourceSwagger {
 
         private GetSavingsProductsTemplateResponse() {}
 
-        final class GetSavingsProductsTemplateAccountingRule {
+        static final class GetSavingsProductsTemplateAccountingRule {
 
             private GetSavingsProductsTemplateAccountingRule() {}
 
@@ -438,7 +438,7 @@ final class SavingsProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetSavingsProductsLockinPeriodFrequencyTypeOptions {
+        static final class GetSavingsProductsLockinPeriodFrequencyTypeOptions {
 
             private GetSavingsProductsLockinPeriodFrequencyTypeOptions() {}
 
@@ -450,7 +450,7 @@ final class SavingsProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetSavingsProductsWithdrawalFeeTypeOptions {
+        static final class GetSavingsProductsWithdrawalFeeTypeOptions {
 
             private GetSavingsProductsWithdrawalFeeTypeOptions() {}
 
@@ -462,7 +462,7 @@ final class SavingsProductsApiResourceSwagger {
             public String value;
         }
 
-        final class GetSavingsProductsPaymentTypeOptions {
+        static final class GetSavingsProductsPaymentTypeOptions {
 
             private GetSavingsProductsPaymentTypeOptions() {}
 
@@ -474,15 +474,15 @@ final class SavingsProductsApiResourceSwagger {
             public Integer position;
         }
 
-        final class GetSavingsProductsAccountingMappingOptions {
+        static final class GetSavingsProductsAccountingMappingOptions {
 
             private GetSavingsProductsAccountingMappingOptions() {}
 
-            final class GetSavingsProductsLiabilityAccountOptions {
+            static final class GetSavingsProductsLiabilityAccountOptions {
 
                 private GetSavingsProductsLiabilityAccountOptions() {}
 
-                final class GetSavingsProductsLiabilityType {
+                static final class GetSavingsProductsLiabilityType {
 
                     private GetSavingsProductsLiabilityType() {}
 
@@ -494,7 +494,7 @@ final class SavingsProductsApiResourceSwagger {
                     public String value;
                 }
 
-                final class GetSavingsProductsLiabilityUsage {
+                static final class GetSavingsProductsLiabilityUsage {
 
                     private GetSavingsProductsLiabilityUsage() {}
 
@@ -506,7 +506,7 @@ final class SavingsProductsApiResourceSwagger {
                     public String value;
                 }
 
-                final class GetSavingsProductsLiabilityTagId {
+                static final class GetSavingsProductsLiabilityTagId {
 
                     private GetSavingsProductsLiabilityTagId() {}
 
@@ -531,11 +531,11 @@ final class SavingsProductsApiResourceSwagger {
                 public GetSavingsProductsLiabilityTagId tagId;
             }
 
-            final class GetSavingsProductsAssetAccountOptions {
+            static final class GetSavingsProductsAssetAccountOptions {
 
                 private GetSavingsProductsAssetAccountOptions() {}
 
-                final class GetSavingsAssetLiabilityType {
+                static final class GetSavingsAssetLiabilityType {
 
                     private GetSavingsAssetLiabilityType() {}
 
@@ -547,7 +547,7 @@ final class SavingsProductsApiResourceSwagger {
                     public String value;
                 }
 
-                final class GetSavingsAssetTagId {
+                static final class GetSavingsAssetTagId {
 
                     private GetSavingsAssetTagId() {}
                 }
@@ -567,11 +567,11 @@ final class SavingsProductsApiResourceSwagger {
                 public GetSavingsAssetTagId tagId;
             }
 
-            final class GetSavingsProductsExpenseAccountOptions {
+            static final class GetSavingsProductsExpenseAccountOptions {
 
                 private GetSavingsProductsExpenseAccountOptions() {}
 
-                final class GetSavingsProductsExpenseType {
+                static final class GetSavingsProductsExpenseType {
 
                     private GetSavingsProductsExpenseType() {}
 
@@ -598,11 +598,11 @@ final class SavingsProductsApiResourceSwagger {
                 public GetSavingsProductsAssetAccountOptions.GetSavingsAssetTagId tagId;
             }
 
-            final class GetSavingsProductsIncomeAccountOptions {
+            static final class GetSavingsProductsIncomeAccountOptions {
 
                 private GetSavingsProductsIncomeAccountOptions() {}
 
-                final class GetSavingsProductsIncomeType {
+                static final class GetSavingsProductsIncomeType {
 
                     private GetSavingsProductsIncomeType() {}
 
@@ -636,11 +636,11 @@ final class SavingsProductsApiResourceSwagger {
             public Set<GetSavingsProductsIncomeAccountOptions> incomeAccountOptions;
         }
 
-        final class GetSavingsProductsChargeOptions {
+        static final class GetSavingsProductsChargeOptions {
 
             private GetSavingsProductsChargeOptions() {}
 
-            final class GetSavingsChargeTimeType {
+            static final class GetSavingsChargeTimeType {
 
                 private GetSavingsChargeTimeType() {}
 
@@ -652,7 +652,7 @@ final class SavingsProductsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetSavingsProductsChargeAppliesTo {
+            static final class GetSavingsProductsChargeAppliesTo {
 
                 private GetSavingsProductsChargeAppliesTo() {}
 
@@ -664,7 +664,7 @@ final class SavingsProductsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetSavingsChargeCalculationType {
+            static final class GetSavingsChargeCalculationType {
 
                 private GetSavingsChargeCalculationType() {}
 
@@ -676,7 +676,7 @@ final class SavingsProductsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetSavingsChargePaymentMode {
+            static final class GetSavingsChargePaymentMode {
 
                 private GetSavingsChargePaymentMode() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/RecurringDepositAccount.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/RecurringDepositAccount.java
index fa879bd..171fb7a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/RecurringDepositAccount.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/RecurringDepositAccount.java
@@ -1255,7 +1255,7 @@ public class RecurringDepositAccount extends SavingsAccount {
         return this.recurringDetail;
     }
 
-    class RecurringDepositScheduleInstallmentComparator implements Comparator<RecurringDepositScheduleInstallment> {
+    static class RecurringDepositScheduleInstallmentComparator implements Comparator<RecurringDepositScheduleInstallment> {
 
         @Override
         public int compare(final RecurringDepositScheduleInstallment o1, final RecurringDepositScheduleInstallment o2) {
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 0e5b900..8be8f6a 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
@@ -1473,7 +1473,7 @@ public class DepositAccountReadPlatformServiceImpl implements DepositAccountRead
         }
     }
 
-    private class AccountTransferMapper implements RowMapper<AccountTransferDTO> {
+    private static class AccountTransferMapper implements RowMapper<AccountTransferDTO> {
 
         private final String schemaSql;
 
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 d758ea6..19cf522 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
@@ -35,7 +35,7 @@ final class SelfAccountTransferApiResourceSwagger {
 
         private GetAccountTransferTemplateResponse() {}
 
-        final class GetAccountOptions {
+        static final class GetAccountOptions {
 
             private GetAccountOptions() {}
 
@@ -49,7 +49,7 @@ final class SelfAccountTransferApiResourceSwagger {
 
         public Set<GetAccountOptions> accountTypeOptions;
 
-        final class GetFromAccountOptions {
+        static final class GetFromAccountOptions {
 
             private GetFromAccountOptions() {}
 
@@ -71,7 +71,7 @@ final class SelfAccountTransferApiResourceSwagger {
 
         public Set<GetFromAccountOptions> fromAccountTypeOptions;
 
-        final class GetToAccountOptions {
+        static final class GetToAccountOptions {
 
             private GetToAccountOptions() {}
 
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 0668d39..5d4174c 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
@@ -34,7 +34,7 @@ final class SelfBeneficiariesTPTApiResourceSwagger {
 
         private GetSelfBeneficiariesTPTTemplateResponse() {}
 
-        final class GetSelfBeneficiariesAccountOptions {
+        static final class GetSelfBeneficiariesAccountOptions {
 
             private GetSelfBeneficiariesAccountOptions() {}
 
@@ -93,7 +93,7 @@ final class SelfBeneficiariesTPTApiResourceSwagger {
 
         private PutSelfBeneficiariesTPTBeneficiaryIdResponse() {}
 
-        final class PutSelfBeneficiariesChanges {
+        static final class PutSelfBeneficiariesChanges {
 
             private PutSelfBeneficiariesChanges() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/service/SelfAccountTransferReadServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/service/SelfAccountTransferReadServiceImpl.java
index fe4bb9c..e0abed9 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/service/SelfAccountTransferReadServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/account/service/SelfAccountTransferReadServiceImpl.java
@@ -57,7 +57,7 @@ public class SelfAccountTransferReadServiceImpl implements SelfAccountTransferRe
         return this.jdbcTemplate.query(sql.toString(), mapper, new Object[] { user.getId(), user.getId() });
     }
 
-    private final class SelfAccountTemplateMapper implements RowMapper<SelfAccountTemplateData> {
+    private static final class SelfAccountTemplateMapper implements RowMapper<SelfAccountTemplateData> {
 
         @Override
         public SelfAccountTemplateData mapRow(final ResultSet rs, @SuppressWarnings("unused") final int rowNum) throws SQLException {
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 e7fdb3e..c694021 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
@@ -37,11 +37,11 @@ final class SelfClientsApiResourceSwagger {
 
         private GetSelfClientsResponse() {}
 
-        final class GetSelfClientsPageItems {
+        static final class GetSelfClientsPageItems {
 
             private GetSelfClientsPageItems() {}
 
-            final class GetSelfClientsStatus {
+            static final class GetSelfClientsStatus {
 
                 private GetSelfClientsStatus() {}
 
@@ -82,7 +82,7 @@ final class SelfClientsApiResourceSwagger {
 
         private GetSelfClientsClientIdResponse() {}
 
-        final class GetSelfClientsTimeline {
+        static final class GetSelfClientsTimeline {
 
             private GetSelfClientsTimeline() {}
 
@@ -138,11 +138,11 @@ final class SelfClientsApiResourceSwagger {
 
         private GetSelfClientsClientIdAccountsResponse() {}
 
-        final class GetSelfClientsLoanAccounts {
+        static final class GetSelfClientsLoanAccounts {
 
             private GetSelfClientsLoanAccounts() {}
 
-            final class GetSelfClientsLoanAccountsStatus {
+            static final class GetSelfClientsLoanAccountsStatus {
 
                 private GetSelfClientsLoanAccountsStatus() {}
 
@@ -170,7 +170,7 @@ final class SelfClientsApiResourceSwagger {
                 public Boolean overpaid;
             }
 
-            final class GetSelfClientsLoanAccountsType {
+            static final class GetSelfClientsLoanAccountsType {
 
                 private GetSelfClientsLoanAccountsType() {}
 
@@ -198,11 +198,11 @@ final class SelfClientsApiResourceSwagger {
             public Integer loanCycle;
         }
 
-        final class GetSelfClientsSavingsAccounts {
+        static final class GetSelfClientsSavingsAccounts {
 
             private GetSelfClientsSavingsAccounts() {}
 
-            final class GetSelfClientsSavingsAccountsCurrency {
+            static final class GetSelfClientsSavingsAccountsCurrency {
 
                 private GetSelfClientsSavingsAccountsCurrency() {}
 
@@ -220,7 +220,7 @@ final class SelfClientsApiResourceSwagger {
                 public String displayLabel;
             }
 
-            final class GetSelfClientsSavingsAccountsStatus {
+            static final class GetSelfClientsSavingsAccountsStatus {
 
                 private GetSelfClientsSavingsAccountsStatus() {}
 
@@ -265,11 +265,11 @@ final class SelfClientsApiResourceSwagger {
 
         private GetSelfClientsClientIdChargesResponse() {}
 
-        final class GetSelfClientsChargesPageItems {
+        static final class GetSelfClientsChargesPageItems {
 
             private GetSelfClientsChargesPageItems() {}
 
-            final class GetSelfClientsChargeTimeType {
+            static final class GetSelfClientsChargeTimeType {
 
                 private GetSelfClientsChargeTimeType() {}
 
@@ -281,7 +281,7 @@ final class SelfClientsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetSelfClientsChargeCalculationType {
+            static final class GetSelfClientsChargeCalculationType {
 
                 private GetSelfClientsChargeCalculationType() {}
 
@@ -374,11 +374,11 @@ final class SelfClientsApiResourceSwagger {
 
         private GetSelfClientsClientIdTransactionsResponse() {}
 
-        final class GetSelfClientsClientIdTransactionsPageItems {
+        static final class GetSelfClientsClientIdTransactionsPageItems {
 
             private GetSelfClientsClientIdTransactionsPageItems() {}
 
-            final class GetSelfClientsClientIdTransactionsType {
+            static final class GetSelfClientsClientIdTransactionsType {
 
                 private GetSelfClientsClientIdTransactionsType() {}
 
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 ae821ff..1773a29 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
@@ -35,7 +35,7 @@ final class SelfLoansApiResourceSwagger {
 
         private GetSelfLoansLoanIdResponse() {}
 
-        final class GetLoansLoanIdStatus {
+        static final class GetLoansLoanIdStatus {
 
             private GetLoansLoanIdStatus() {}
 
@@ -63,7 +63,7 @@ final class SelfLoansApiResourceSwagger {
             public Boolean overpaid;
         }
 
-        final class GetLoansLoanIdLoanType {
+        static final class GetLoansLoanIdLoanType {
 
             private GetLoansLoanIdLoanType() {}
 
@@ -75,7 +75,7 @@ final class SelfLoansApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoansLoanIdCurrency {
+        static final class GetLoansLoanIdCurrency {
 
             private GetLoansLoanIdCurrency() {}
 
@@ -93,7 +93,7 @@ final class SelfLoansApiResourceSwagger {
             public String displayLabel;
         }
 
-        final class GetLoansLoanIdTermPeriodFrequencyType {
+        static final class GetLoansLoanIdTermPeriodFrequencyType {
 
             private GetLoansLoanIdTermPeriodFrequencyType() {}
 
@@ -105,7 +105,7 @@ final class SelfLoansApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoansLoanIdRepaymentFrequencyType {
+        static final class GetLoansLoanIdRepaymentFrequencyType {
 
             private GetLoansLoanIdRepaymentFrequencyType() {}
 
@@ -117,7 +117,7 @@ final class SelfLoansApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoansLoanIdInterestRateFrequencyType {
+        static final class GetLoansLoanIdInterestRateFrequencyType {
 
             private GetLoansLoanIdInterestRateFrequencyType() {}
 
@@ -129,7 +129,7 @@ final class SelfLoansApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoansLoanIdAmortizationType {
+        static final class GetLoansLoanIdAmortizationType {
 
             private GetLoansLoanIdAmortizationType() {}
 
@@ -141,7 +141,7 @@ final class SelfLoansApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoansLoanIdInterestType {
+        static final class GetLoansLoanIdInterestType {
 
             private GetLoansLoanIdInterestType() {}
 
@@ -153,7 +153,7 @@ final class SelfLoansApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoansLoanIdInterestCalculationPeriodType {
+        static final class GetLoansLoanIdInterestCalculationPeriodType {
 
             private GetLoansLoanIdInterestCalculationPeriodType() {}
 
@@ -165,7 +165,7 @@ final class SelfLoansApiResourceSwagger {
             public String value;
         }
 
-        final class GetLoansLoanIdTimeline {
+        static final class GetLoansLoanIdTimeline {
 
             private GetLoansLoanIdTimeline() {}
 
@@ -199,16 +199,16 @@ final class SelfLoansApiResourceSwagger {
             public LocalDate expectedMaturityDate;
         }
 
-        final class GetLoansLoanIdSummary {
+        static final class GetLoansLoanIdSummary {
 
             private GetLoansLoanIdSummary() {}
 
-            final class GetLoansLoanIdEmiVariations {
+            static final class GetLoansLoanIdEmiVariations {
 
                 private GetLoansLoanIdEmiVariations() {}
             }
 
-            final class GetLoansLoanIdLinkedAccount {
+            static final class GetLoansLoanIdLinkedAccount {
 
                 private GetLoansLoanIdLinkedAccount() {}
 
@@ -218,7 +218,7 @@ final class SelfLoansApiResourceSwagger {
                 public Long accountNo;
             }
 
-            final class GetLoansLoanIdDisbursementDetails {
+            static final class GetLoansLoanIdDisbursementDetails {
 
                 private GetLoansLoanIdDisbursementDetails() {}
 
@@ -232,11 +232,11 @@ final class SelfLoansApiResourceSwagger {
                 public Float approvedPrincipal;
             }
 
-            final class GetLoansLoanIdOverdueCharges {
+            static final class GetLoansLoanIdOverdueCharges {
 
                 private GetLoansLoanIdOverdueCharges() {}
 
-                final class GetLoansLoanIdChargeTimeType {
+                static final class GetLoansLoanIdChargeTimeType {
 
                     private GetLoansLoanIdChargeTimeType() {}
 
@@ -248,7 +248,7 @@ final class SelfLoansApiResourceSwagger {
                     public String value;
                 }
 
-                final class GetLoansLoanIdChargeCalculationType {
+                static final class GetLoansLoanIdChargeCalculationType {
 
                     private GetLoansLoanIdChargeCalculationType() {}
 
@@ -260,7 +260,7 @@ final class SelfLoansApiResourceSwagger {
                     public String value;
                 }
 
-                final class GetLoansLoanIdChargePaymentMode {
+                static final class GetLoansLoanIdChargePaymentMode {
 
                     private GetLoansLoanIdChargePaymentMode() {}
 
@@ -272,7 +272,7 @@ final class SelfLoansApiResourceSwagger {
                     public String value;
                 }
 
-                final class GetLoansLoanIdFeeFrequency {
+                static final class GetLoansLoanIdFeeFrequency {
 
                     private GetLoansLoanIdFeeFrequency() {}
 
@@ -284,7 +284,7 @@ final class SelfLoansApiResourceSwagger {
                     public String value;
                 }
 
-                final class GetLoanCurrency {
+                static final class GetLoanCurrency {
 
                     private GetLoanCurrency() {}
 
@@ -302,7 +302,7 @@ final class SelfLoansApiResourceSwagger {
                     public String displayLabel;
                 }
 
-                final class GetLoanChargeTemplateChargeAppliesTo {
+                static final class GetLoanChargeTemplateChargeAppliesTo {
 
                     private GetLoanChargeTemplateChargeAppliesTo() {}
 
@@ -473,7 +473,7 @@ final class SelfLoansApiResourceSwagger {
 
         private GetSelfLoansLoanIdTransactionsTransactionIdResponse() {}
 
-        final class GetSelfLoansLoanIdTransactionsType {
+        static final class GetSelfLoansLoanIdTransactionsType {
 
             private GetSelfLoansLoanIdTransactionsType() {}
 
@@ -520,7 +520,7 @@ final class SelfLoansApiResourceSwagger {
 
         private GetSelfLoansLoanIdChargesResponse() {}
 
-        final class GetSelfLoansChargeTimeType {
+        static final class GetSelfLoansChargeTimeType {
 
             private GetSelfLoansChargeTimeType() {}
 
@@ -532,7 +532,7 @@ final class SelfLoansApiResourceSwagger {
             public String value;
         }
 
-        final class GetSelfLoansChargeCalculationType {
+        static final class GetSelfLoansChargeCalculationType {
 
             private GetSelfLoansChargeCalculationType() {}
 
@@ -578,7 +578,7 @@ final class SelfLoansApiResourceSwagger {
 
         private GetSelfLoansTemplateResponse() {}
 
-        final class GetSelfLoansTimeline {
+        static final class GetSelfLoansTimeline {
 
             private GetSelfLoansTimeline() {}
 
@@ -586,7 +586,7 @@ final class SelfLoansApiResourceSwagger {
             public LocalDate expectedDisbursementDate;
         }
 
-        final class GetSelfLoansProductOptions {
+        static final class GetSelfLoansProductOptions {
 
             private GetSelfLoansProductOptions() {}
 
@@ -611,7 +611,7 @@ final class SelfLoansApiResourceSwagger {
 
         private PostSelfLoansRequest() {}
 
-        final class PostSelfLoansDisbursementData {
+        static final class PostSelfLoansDisbursementData {
 
             private PostSelfLoansDisbursementData() {}
 
@@ -623,11 +623,11 @@ final class SelfLoansApiResourceSwagger {
             public Long approvedPrincipal;
         }
 
-        final class PostSelfLoansDatatables {
+        static final class PostSelfLoansDatatables {
 
             private PostSelfLoansDatatables() {}
 
-            final class PostSelfLoansData {
+            static final class PostSelfLoansData {
 
                 private PostSelfLoansData() {}
 
@@ -747,7 +747,7 @@ final class SelfLoansApiResourceSwagger {
 
         private PutSelfLoansLoanIdResponse() {}
 
-        final class PutSelfLoansChanges {
+        static final class PutSelfLoansChanges {
 
             private PutSelfLoansChanges() {}
 
@@ -788,11 +788,11 @@ final class SelfLoansApiResourceSwagger {
 
         private PostSelfLoansLoanIdResponse() {}
 
-        final class PostSelfLoansLoanIdChanges {
+        static final class PostSelfLoansLoanIdChanges {
 
             private PostSelfLoansLoanIdChanges() {}
 
-            final class PostSelfLoansLoanIdStatus {
+            static final class PostSelfLoansLoanIdStatus {
 
                 private PostSelfLoansLoanIdStatus() {}
 
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 fb7b936..7f5f977 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
@@ -35,7 +35,7 @@ final class PocketApiResourceSwagger {
 
         private PostLinkDelinkAccountsToFromPocketRequest() {}
 
-        final class GetPocketAccountDetail {
+        static final class GetPocketAccountDetail {
 
             private GetPocketAccountDetail() {}
 
@@ -62,7 +62,7 @@ final class PocketApiResourceSwagger {
 
         private GetAccountsLinkedToPocketResponse() {}
 
-        final class GetPocketLoanAccounts {
+        static final class GetPocketLoanAccounts {
 
             private GetPocketLoanAccounts() {}
 
@@ -78,7 +78,7 @@ final class PocketApiResourceSwagger {
             public Integer id;
         }
 
-        final class GetPocketSavingAccounts {
+        static final class GetPocketSavingAccounts {
 
             private GetPocketSavingAccounts() {}
 
@@ -94,7 +94,7 @@ final class PocketApiResourceSwagger {
             public Integer id;
         }
 
-        final class GetPocketShareAccounts {
+        static final class GetPocketShareAccounts {
 
             private GetPocketShareAccounts() {}
 
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 f81d5b4..a088240 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
@@ -35,7 +35,7 @@ final class SelfRunReportApiResourceSwagger {
 
         private GetRunReportResponse() {}
 
-        final class GetRunReportColumnHeaders {
+        static final class GetRunReportColumnHeaders {
 
             private GetRunReportColumnHeaders() {}
 
@@ -52,7 +52,7 @@ final class SelfRunReportApiResourceSwagger {
 
         }
 
-        final class GetPocketData {
+        static final class GetPocketData {
 
             private GetPocketData() {}
 
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 451aa55..f0adba8 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
@@ -34,7 +34,7 @@ final class SelfSavingsApiResourceSwagger {
 
         private GetSelfSavingsAccountsResponse() {}
 
-        final class GetSelfSavingsStatus {
+        static final class GetSelfSavingsStatus {
 
             private GetSelfSavingsStatus() {}
 
@@ -59,7 +59,7 @@ final class SelfSavingsApiResourceSwagger {
 
         }
 
-        final class GetSelfSavingsTimeline {
+        static final class GetSelfSavingsTimeline {
 
             private GetSelfSavingsTimeline() {}
 
@@ -67,7 +67,7 @@ final class SelfSavingsApiResourceSwagger {
             public LocalDate submittedOnDate;
         }
 
-        final class GetSelfSavingsCurrency {
+        static final class GetSelfSavingsCurrency {
 
             private GetSelfSavingsCurrency() {}
 
@@ -85,7 +85,7 @@ final class SelfSavingsApiResourceSwagger {
             public String displayLabel;
         }
 
-        final class GetSelfSavingsInterestCompoundingPeriodType {
+        static final class GetSelfSavingsInterestCompoundingPeriodType {
 
             private GetSelfSavingsInterestCompoundingPeriodType() {}
 
@@ -97,7 +97,7 @@ final class SelfSavingsApiResourceSwagger {
             public String value;
         }
 
-        final class GetSelfSavingsInterestPostingPeriodType {
+        static final class GetSelfSavingsInterestPostingPeriodType {
 
             private GetSelfSavingsInterestPostingPeriodType() {}
 
@@ -109,7 +109,7 @@ final class SelfSavingsApiResourceSwagger {
             public String value;
         }
 
-        final class GetSelfSavingsInterestCalculationType {
+        static final class GetSelfSavingsInterestCalculationType {
 
             private GetSelfSavingsInterestCalculationType() {}
 
@@ -121,7 +121,7 @@ final class SelfSavingsApiResourceSwagger {
             public String value;
         }
 
-        final class GetSelfSavingsInterestCalculationDaysInYearType {
+        static final class GetSelfSavingsInterestCalculationDaysInYearType {
 
             private GetSelfSavingsInterestCalculationDaysInYearType() {}
 
@@ -133,7 +133,7 @@ final class SelfSavingsApiResourceSwagger {
             public String value;
         }
 
-        final class GetSelfSavingsSummary {
+        static final class GetSelfSavingsSummary {
 
             private GetSelfSavingsSummary() {}
 
@@ -173,7 +173,7 @@ final class SelfSavingsApiResourceSwagger {
 
         private GetSelfSavingsAccountsAccountIdTransactionsTransactionIdResponse() {}
 
-        final class GetSelfSavingsTransactionType {
+        static final class GetSelfSavingsTransactionType {
 
             private GetSelfSavingsTransactionType() {}
 
@@ -193,7 +193,7 @@ final class SelfSavingsApiResourceSwagger {
             public Boolean feeDeduction;
         }
 
-        final class GetSelfSavingsTransactionCurrency {
+        static final class GetSelfSavingsTransactionCurrency {
 
             private GetSelfSavingsTransactionCurrency() {}
 
@@ -213,11 +213,11 @@ final class SelfSavingsApiResourceSwagger {
             public String displayLabel;
         }
 
-        final class GetSelfSavingsPaymentDetailData {
+        static final class GetSelfSavingsPaymentDetailData {
 
             private GetSelfSavingsPaymentDetailData() {}
 
-            final class GetSelfSavingsPaymentType {
+            static final class GetSelfSavingsPaymentType {
 
                 private GetSelfSavingsPaymentType() {}
 
@@ -266,7 +266,7 @@ final class SelfSavingsApiResourceSwagger {
 
         private GetSelfSavingsAccountsAccountIdChargesResponse() {}
 
-        final class GetSelfSavingsChargeTimeType {
+        static final class GetSelfSavingsChargeTimeType {
 
             private GetSelfSavingsChargeTimeType() {}
 
@@ -278,7 +278,7 @@ final class SelfSavingsApiResourceSwagger {
             public String value;
         }
 
-        final class GetSelfSavingsChargeCalculationType {
+        static final class GetSelfSavingsChargeCalculationType {
 
             private GetSelfSavingsChargeCalculationType() {}
 
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 55623b2..fa3946b 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
@@ -35,7 +35,7 @@ final class SelfAuthenticationApiResourceSwagger {
 
         private PostSelfAuthenticationResponse() {}
 
-        final class GetSelfUserDetailsOrganisationalRole {
+        static final class GetSelfUserDetailsOrganisationalRole {
 
             private GetSelfUserDetailsOrganisationalRole() {}
 
@@ -47,7 +47,7 @@ final class SelfAuthenticationApiResourceSwagger {
             public String value;
         }
 
-        final class GetSelfUserDetailsRoles {
+        static final class GetSelfUserDetailsRoles {
 
             private GetSelfUserDetailsRoles() {}
 
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 1460c88..3fc0de9 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
@@ -44,7 +44,7 @@ final class SelfUserApiResourceSwagger {
 
         private PutSelfUserResponse() {}
 
-        final class PutSelfUserChanges {
+        static final class PutSelfUserChanges {
 
             private PutSelfUserChanges() {}
 
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 8dd9c8c..bf1c93e 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
@@ -35,7 +35,7 @@ final class SelfUserDetailsApiResourceSwagger {
 
         private GetSelfUserDetailsResponse() {}
 
-        final class GetSelfUserDetailsOrganisationalRole {
+        static final class GetSelfUserDetailsOrganisationalRole {
 
             private GetSelfUserDetailsOrganisationalRole() {}
 
@@ -47,7 +47,7 @@ final class SelfUserDetailsApiResourceSwagger {
             public String value;
         }
 
-        final class GetSelfUserDetailsRoles {
+        static final class GetSelfUserDetailsRoles {
 
             private GetSelfUserDetailsRoles() {}
 
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 e32cbed..1a28b28 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
@@ -38,7 +38,7 @@ final class SelfShareAccountsApiResourceSwagger {
 
         private GetShareAccountsClientIdResponse() {}
 
-        final class GetShareAccountsProductOptions {
+        static final class GetShareAccountsProductOptions {
 
             private GetShareAccountsProductOptions() {}
 
@@ -52,11 +52,11 @@ final class SelfShareAccountsApiResourceSwagger {
             public Integer totalShares;
         }
 
-        final class GetShareAccountsChargeOptions {
+        static final class GetShareAccountsChargeOptions {
 
             private GetShareAccountsChargeOptions() {}
 
-            final class GetShareAccountsCurrency {
+            static final class GetShareAccountsCurrency {
 
                 private GetShareAccountsCurrency() {}
 
@@ -75,7 +75,7 @@ final class SelfShareAccountsApiResourceSwagger {
 
             }
 
-            final class GetShareAccountsChargeTimeType {
+            static final class GetShareAccountsChargeTimeType {
 
                 private GetShareAccountsChargeTimeType() {}
 
@@ -87,7 +87,7 @@ final class SelfShareAccountsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetShareAccountsChargeAppliesTo {
+            static final class GetShareAccountsChargeAppliesTo {
 
                 private GetShareAccountsChargeAppliesTo() {}
 
@@ -99,7 +99,7 @@ final class SelfShareAccountsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetShareAccountsChargeCalculationType {
+            static final class GetShareAccountsChargeCalculationType {
 
                 private GetShareAccountsChargeCalculationType() {}
 
@@ -111,7 +111,7 @@ final class SelfShareAccountsApiResourceSwagger {
                 public String value;
             }
 
-            final class GetShareAccountsChargePaymentMode {
+            static final class GetShareAccountsChargePaymentMode {
 
                 private GetShareAccountsChargePaymentMode() {}
 
@@ -152,11 +152,11 @@ final class SelfShareAccountsApiResourceSwagger {
 
         private GetShareAccountsClientIdProductIdResponse() {}
 
-        final class GetClientIdProductIdProductOptions {
+        static final class GetClientIdProductIdProductOptions {
 
             private GetClientIdProductIdProductOptions() {}
 
-            final class GetShareAccountsClientIdProductIdLockPeriodTypeEnum {
+            static final class GetShareAccountsClientIdProductIdLockPeriodTypeEnum {
 
                 private GetShareAccountsClientIdProductIdLockPeriodTypeEnum() {}
 
@@ -169,7 +169,7 @@ final class SelfShareAccountsApiResourceSwagger {
 
             }
 
-            final class GetShareAccountsClientIdProductIdMinimumActivePeriodForDividendsTypeEnum {
+            static final class GetShareAccountsClientIdProductIdMinimumActivePeriodForDividendsTypeEnum {
 
                 private GetShareAccountsClientIdProductIdMinimumActivePeriodForDividendsTypeEnum() {}
 
@@ -182,7 +182,7 @@ final class SelfShareAccountsApiResourceSwagger {
 
             }
 
-            final class GetShareAccountsClientIdProductIdAccountingRule {
+            static final class GetShareAccountsClientIdProductIdAccountingRule {
 
                 private GetShareAccountsClientIdProductIdAccountingRule() {}
 
@@ -195,11 +195,11 @@ final class SelfShareAccountsApiResourceSwagger {
 
             }
 
-            final class GetClientIdProductIdAccountingMappings {
+            static final class GetClientIdProductIdAccountingMappings {
 
                 private GetClientIdProductIdAccountingMappings() {}
 
-                final class GetShareAccountsShareReferenceId {
+                static final class GetShareAccountsShareReferenceId {
 
                     private GetShareAccountsShareReferenceId() {}
 
@@ -212,7 +212,7 @@ final class SelfShareAccountsApiResourceSwagger {
 
                 }
 
-                final class GetShareAccountsIncomeFromFeeAccountId {
+                static final class GetShareAccountsIncomeFromFeeAccountId {
 
                     private GetShareAccountsIncomeFromFeeAccountId() {}
 
@@ -225,7 +225,7 @@ final class SelfShareAccountsApiResourceSwagger {
 
                 }
 
-                final class GetShareAccountsShareEquityId {
+                static final class GetShareAccountsShareEquityId {
 
                     private GetShareAccountsShareEquityId() {}
 
@@ -238,7 +238,7 @@ final class SelfShareAccountsApiResourceSwagger {
 
                 }
 
-                final class GetShareAccountsShareSuspenseId {
+                static final class GetShareAccountsShareSuspenseId {
 
                     private GetShareAccountsShareSuspenseId() {}
 
@@ -257,7 +257,7 @@ final class SelfShareAccountsApiResourceSwagger {
                 public GetShareAccountsShareSuspenseId shareSuspenseId;
             }
 
-            final class GetClientIdProductIdMinimumActivePeriodFrequencyTypeOptions {
+            static final class GetClientIdProductIdMinimumActivePeriodFrequencyTypeOptions {
 
                 private GetClientIdProductIdMinimumActivePeriodFrequencyTypeOptions() {}
 
@@ -270,7 +270,7 @@ final class SelfShareAccountsApiResourceSwagger {
 
             }
 
-            final class GetClientIdProductIdLockinPeriodFrequencyTypeOptions {
+            static final class GetClientIdProductIdLockinPeriodFrequencyTypeOptions {
 
                 private GetClientIdProductIdLockinPeriodFrequencyTypeOptions() {}
 
@@ -283,15 +283,15 @@ final class SelfShareAccountsApiResourceSwagger {
 
             }
 
-            final class GetAccountingMappingOptions {
+            static final class GetAccountingMappingOptions {
 
                 private GetAccountingMappingOptions() {}
 
-                final class GetAccountingMappingLiabilityAccountOptions {
+                static final class GetAccountingMappingLiabilityAccountOptions {
 
                     private GetAccountingMappingLiabilityAccountOptions() {}
 
-                    final class GetLiabilityAccountType {
+                    static final class GetLiabilityAccountType {
 
                         private GetLiabilityAccountType() {}
 
@@ -304,7 +304,7 @@ final class SelfShareAccountsApiResourceSwagger {
 
                     }
 
-                    final class GetLiabilityAccountUsage {
+                    static final class GetLiabilityAccountUsage {
 
                         private GetLiabilityAccountUsage() {}
 
@@ -317,7 +317,7 @@ final class SelfShareAccountsApiResourceSwagger {
 
                     }
 
-                    final class GetLiabilityAccountTagId {
+                    static final class GetLiabilityAccountTagId {
 
                         private GetLiabilityAccountTagId() {}
 
@@ -350,11 +350,11 @@ final class SelfShareAccountsApiResourceSwagger {
 
                 }
 
-                final class GetAccountingMappingAssetAccountOptions {
+                static final class GetAccountingMappingAssetAccountOptions {
 
                     private GetAccountingMappingAssetAccountOptions() {}
 
-                    final class GetAssetAccountType {
+                    static final class GetAssetAccountType {
 
                         private GetAssetAccountType() {}
 
@@ -367,7 +367,7 @@ final class SelfShareAccountsApiResourceSwagger {
 
                     }
 
-                    final class GetAssetAccountUsage {
+                    static final class GetAssetAccountUsage {
 
                         private GetAssetAccountUsage() {}
 
@@ -380,7 +380,7 @@ final class SelfShareAccountsApiResourceSwagger {
 
                     }
 
-                    final class GetAssetAccountTagId {
+                    static final class GetAssetAccountTagId {
 
                         private GetAssetAccountTagId() {}
 
@@ -413,11 +413,11 @@ final class SelfShareAccountsApiResourceSwagger {
 
                 }
 
-                final class GetAccountingMappingIncomeAccountOptions {
+                static final class GetAccountingMappingIncomeAccountOptions {
 
                     private GetAccountingMappingIncomeAccountOptions() {}
 
-                    final class GetIncomeAccountType {
+                    static final class GetIncomeAccountType {
 
                         private GetIncomeAccountType() {}
 
@@ -430,7 +430,7 @@ final class SelfShareAccountsApiResourceSwagger {
 
                     }
 
-                    final class GetIncomeAccountUsage {
+                    static final class GetIncomeAccountUsage {
 
                         private GetIncomeAccountUsage() {}
 
@@ -443,7 +443,7 @@ final class SelfShareAccountsApiResourceSwagger {
 
                     }
 
-                    final class GetIncomeAccountTagId {
+                    static final class GetIncomeAccountTagId {
 
                         private GetIncomeAccountTagId() {}
 
@@ -475,11 +475,11 @@ final class SelfShareAccountsApiResourceSwagger {
                     public GetIncomeAccountTagId tagId;
                 }
 
-                final class GetShareAccountAccountingMappingEquityAccountOptions {
+                static final class GetShareAccountAccountingMappingEquityAccountOptions {
 
                     private GetShareAccountAccountingMappingEquityAccountOptions() {}
 
-                    final class GetShareAccountsEquityAccountType {
+                    static final class GetShareAccountsEquityAccountType {
 
                         private GetShareAccountsEquityAccountType() {}
 
@@ -492,7 +492,7 @@ final class SelfShareAccountsApiResourceSwagger {
 
                     }
 
-                    final class GetShareAccountsEquityAccountUsage {
+                    static final class GetShareAccountsEquityAccountUsage {
 
                         private GetShareAccountsEquityAccountUsage() {}
 
@@ -505,7 +505,7 @@ final class SelfShareAccountsApiResourceSwagger {
 
                     }
 
-                    final class GetShareAccountsEquityAccountTagId {
+                    static final class GetShareAccountsEquityAccountTagId {
 
                         private GetShareAccountsEquityAccountTagId() {}
 
@@ -584,7 +584,7 @@ final class SelfShareAccountsApiResourceSwagger {
             public GetAccountingMappingOptions accountingMappingOptions;
         }
 
-        final class GetClientIdProductIdChargeOptions {
+        static final class GetClientIdProductIdChargeOptions {
 
             private GetClientIdProductIdChargeOptions() {}
 
@@ -600,7 +600,7 @@ final class SelfShareAccountsApiResourceSwagger {
 
         private PostNewShareApplicationRequest() {}
 
-        final class GetShareAccountsCharges {
+        static final class GetShareAccountsCharges {
 
             private GetShareAccountsCharges() {}
 
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 c638b45..717c741 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
@@ -35,7 +35,7 @@ final class TaxComponentApiResourceSwagger {
 
         private GetTaxesComponentsResponse() {}
 
-        final class GetTaxesComponentsCreditAccountType {
+        static final class GetTaxesComponentsCreditAccountType {
 
             private GetTaxesComponentsCreditAccountType() {}
 
@@ -47,7 +47,7 @@ final class TaxComponentApiResourceSwagger {
             public String value;
         }
 
-        final class GetTaxesComponentsCreditAccount {
+        static final class GetTaxesComponentsCreditAccount {
 
             private GetTaxesComponentsCreditAccount() {}
 
@@ -59,7 +59,7 @@ final class TaxComponentApiResourceSwagger {
             public String glCode;
         }
 
-        final class GetTaxesComponentsHistories {
+        static final class GetTaxesComponentsHistories {
 
             private GetTaxesComponentsHistories() {}
         }
@@ -129,7 +129,7 @@ final class TaxComponentApiResourceSwagger {
 
         private PutTaxesComponentsTaxComponentIdResponse() {}
 
-        final class PutTaxesComponentsChanges {
+        static final class PutTaxesComponentsChanges {
 
             private PutTaxesComponentsChanges() {}
 
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 e2acb9c..50f8314 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
@@ -36,11 +36,11 @@ final class TaxGroupApiResourceSwagger {
 
         private GetTaxesGroupResponse() {}
 
-        final class GetTaxesGroupTaxAssociations {
+        static final class GetTaxesGroupTaxAssociations {
 
             private GetTaxesGroupTaxAssociations() {}
 
-            final class GetTaxesGroupTaxComponent {
+            static final class GetTaxesGroupTaxComponent {
 
                 private GetTaxesGroupTaxComponent() {}
 
@@ -69,7 +69,7 @@ final class TaxGroupApiResourceSwagger {
 
         private PostTaxesGroupRequest() {}
 
-        final class PostTaxesGroupTaxComponents {
+        static final class PostTaxesGroupTaxComponents {
 
             private PostTaxesGroupTaxComponents() {}
 
@@ -102,7 +102,7 @@ final class TaxGroupApiResourceSwagger {
 
         private PutTaxesGroupTaxGroupIdRequest() {}
 
-        final class PutTaxesGroupTaxComponents {
+        static final class PutTaxesGroupTaxComponents {
 
             private PutTaxesGroupTaxComponents() {}
 
@@ -128,11 +128,11 @@ final class TaxGroupApiResourceSwagger {
 
         private PutTaxesGroupTaxGroupIdResponse() {}
 
-        final class PutTaxesGroupChanges {
+        static final class PutTaxesGroupChanges {
 
             private PutTaxesGroupChanges() {}
 
-            final class PutTaxesGroupModifiedComponents {
+            static final class PutTaxesGroupModifiedComponents {
 
                 private PutTaxesGroupModifiedComponents() {}
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/RolesApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/RolesApiResourceSwagger.java
index 31157e6..48ececb 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/RolesApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/RolesApiResourceSwagger.java
@@ -108,7 +108,7 @@ final class RolesApiResourceSwagger {
 
         }
 
-        final class PutRolesRoleIdResponseChanges {
+        static final class PutRolesRoleIdResponseChanges {
 
             private PutRolesRoleIdResponseChanges() {}
 
@@ -141,7 +141,7 @@ final class RolesApiResourceSwagger {
 
         }
 
-        final class GetRolesRoleIdPermissionsResponsePermissionData {
+        static final class GetRolesRoleIdPermissionsResponsePermissionData {
 
             private GetRolesRoleIdPermissionsResponsePermissionData() {
 
@@ -176,7 +176,7 @@ final class RolesApiResourceSwagger {
 
         }
 
-        final class PostRolesRoleIdPermissionsResponsePermissions {
+        static final class PostRolesRoleIdPermissionsResponsePermissions {
 
             private PostRolesRoleIdPermissionsResponsePermissions() {
 
@@ -197,7 +197,7 @@ final class RolesApiResourceSwagger {
 
         }
 
-        final class PostRolesRoleIdPermissionsResponsePermissions {
+        static final class PostRolesRoleIdPermissionsResponsePermissions {
 
             private PostRolesRoleIdPermissionsResponsePermissions() {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/UsersApiResourceSwagger.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/UsersApiResourceSwagger.java
index 8979e1c..0da5c46 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/UsersApiResourceSwagger.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/UsersApiResourceSwagger.java
@@ -165,7 +165,7 @@ final class UsersApiResourceSwagger {
 
         }
 
-        final class PutUsersUserIdResponseChanges {
+        static final class PutUsersUserIdResponseChanges {
 
             private PutUsersUserIdResponseChanges() {
 
@@ -191,7 +191,7 @@ final class UsersApiResourceSwagger {
 
         }
 
-        final class DeleteUsersUserIdResponseChanges {
+        static final class DeleteUsersUserIdResponseChanges {
 
             private DeleteUsersUserIdResponseChanges() {