You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by pt...@apache.org on 2020/08/20 04:33:24 UTC

[fineract] branch develop updated: FINERACT-821 Added and Enforced HideUtilityClassConstructor checkstyle

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

ptuomola 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 8a3c190  FINERACT-821 Added and Enforced HideUtilityClassConstructor checkstyle
8a3c190 is described below

commit 8a3c1903a4c28bbd5fa13d94813a0e1a0ddb419e
Author: Manthan Surkar <ma...@gmail.com>
AuthorDate: Sun Aug 9 06:48:25 2020 +0530

    FINERACT-821 Added and Enforced HideUtilityClassConstructor checkstyle
---
 fineract-provider/config/checkstyle/checkstyle.xml     |  2 +-
 .../fineract/integrationtests/ClientStatusChecker.java |  6 +++++-
 .../integrationtests/common/CalendarHelper.java        |  6 +++++-
 .../fineract/integrationtests/common/CenterHelper.java |  6 +++++-
 .../integrationtests/common/CurrenciesHelper.java      |  6 +++++-
 .../fineract/integrationtests/common/ImageHelper.java  |  6 +++++-
 .../common/PasswordPreferencesHelper.java              |  6 +++++-
 .../integrationtests/common/PaymentTypeHelper.java     |  6 +++++-
 .../fineract/integrationtests/common/SurveyHelper.java |  6 +++++-
 .../integrationtests/common/TaxComponentHelper.java    |  6 +++++-
 .../integrationtests/common/TaxGroupHelper.java        |  6 +++++-
 .../apache/fineract/integrationtests/common/Utils.java |  6 +++++-
 .../integrationtests/common/WorkingDaysHelper.java     |  6 +++++-
 .../FinancialActivityAccountsMappingBuilder.java       |  6 +++++-
 .../integrationtests/common/charges/ChargesHelper.java |  6 +++++-
 .../fixeddeposit/FixedDepositAccountStatusChecker.java |  6 +++++-
 .../common/funds/FundsResourceHandler.java             |  6 +++++-
 .../common/loans/LoanStatusChecker.java                |  6 +++++-
 .../common/organisation/StaffHelper.java               |  6 +++++-
 .../common/provisioning/ProvisioningHelper.java        |  6 +++++-
 .../integrationtests/common/rates/RatesHelper.java     |  6 +++++-
 .../RecurringDepositAccountStatusChecker.java          |  6 +++++-
 .../common/savings/SavingsStatusChecker.java           |  6 +++++-
 .../common/shares/ShareAccountTransactionHelper.java   |  6 +++++-
 .../common/shares/ShareDividendsTransactionHelper.java |  6 +++++-
 .../common/shares/ShareProductTransactionHelper.java   |  6 +++++-
 .../integrationtests/common/system/CodeHelper.java     |  6 +++++-
 .../useradministration/roles/RolesHelper.java          |  6 +++++-
 .../useradministration/users/UserHelper.java           |  6 +++++-
 .../accrual/api/AccrualAccountingConstants.java        |  6 +++++-
 .../accounting/common/AccountingConstants.java         |  6 +++++-
 .../accounting/common/AccountingEnumerations.java      |  6 +++++-
 .../api/FinancialActivityAccountsConstants.java        |  8 ++++++--
 .../domain/AccountNumberFormatEnumerations.java        |  6 +++++-
 .../service/AccountNumberFormatConstants.java          |  6 +++++-
 .../bulkimport/constants/CenterConstants.java          |  6 +++++-
 .../bulkimport/constants/ChartOfAcountsConstants.java  |  6 +++++-
 .../bulkimport/constants/ClientEntityConstants.java    |  6 +++++-
 .../bulkimport/constants/ClientPersonConstants.java    |  6 +++++-
 .../bulkimport/constants/FixedDepositConstants.java    |  6 +++++-
 .../bulkimport/constants/GroupConstants.java           |  6 +++++-
 .../bulkimport/constants/GuarantorConstants.java       |  6 +++++-
 .../bulkimport/constants/JournalEntryConstants.java    |  6 +++++-
 .../bulkimport/constants/LoanConstants.java            |  6 +++++-
 .../bulkimport/constants/LoanRepaymentConstants.java   |  6 +++++-
 .../bulkimport/constants/OfficeConstants.java          |  6 +++++-
 .../constants/RecurringDepositConstants.java           |  6 +++++-
 .../bulkimport/constants/SavingsConstants.java         |  6 +++++-
 .../bulkimport/constants/SharedAccountsConstants.java  |  6 +++++-
 .../bulkimport/constants/StaffConstants.java           |  6 +++++-
 .../constants/TemplatePopulateImportConstants.java     |  6 +++++-
 .../bulkimport/constants/TransactionConstants.java     |  6 +++++-
 .../bulkimport/constants/UserConstants.java            |  6 +++++-
 .../bulkimport/importhandler/ImportHandlerUtils.java   |  6 +++++-
 .../infrastructure/cache/CacheApiConstants.java        |  6 +++++-
 .../infrastructure/cache/CacheEnumerations.java        |  6 +++++-
 .../campaigns/email/EmailApiConstants.java             |  6 +++++-
 .../campaigns/email/ScheduledEmailConstants.java       |  6 +++++-
 .../email/data/ScheduledEmailEnumerations.java         |  6 +++++-
 .../email/domain/EmailCampaignStatusEnumerations.java  |  6 +++++-
 .../email/domain/EmailMessageEnumerations.java         |  6 +++++-
 .../sms/constants/SmsCampaignEnumerations.java         |  6 +++++-
 .../sms/domain/SmsCampaignStatusEnumerations.java      |  6 +++++-
 .../api/ExternalServiceConfigurationApiConstant.java   |  8 ++++++--
 .../api/GlobalConfigurationApiConstant.java            |  6 +++++-
 .../service/ExternalServicesConstants.java             |  6 +++++-
 .../infrastructure/core/api/ApiParameterHelper.java    |  6 +++++-
 .../infrastructure/core/domain/JdbcSupport.java        |  6 +++++-
 .../infrastructure/core/service/DateUtils.java         |  6 +++++-
 .../core/service/ThreadLocalContextUtil.java           |  6 +++++-
 .../dataqueries/api/DataTableApiConstant.java          |  6 +++++-
 .../contentrepository/ContentRepositoryUtils.java      |  6 +++++-
 .../entityaccess/FineractEntityAccessConstants.java    |  6 +++++-
 .../api/FineractEntityApiResourceConstants.java        | 11 +++++++----
 .../gcm/api/DeviceRegistrationApiConstants.java        |  6 +++++-
 .../infrastructure/hooks/api/HookApiConstants.java     | 10 +++++++---
 .../hooks/processor/ProcessorHelper.java               |  6 +++++-
 .../jobs/annotation/CronMethodParser.java              |  6 +++++-
 .../jobs/api/SchedulerJobApiConstants.java             | 15 +++++++++------
 .../reportmailingjob/ReportMailingJobConstants.java    |  6 +++++-
 .../reportmailingjob/helper/IPv4Helper.java            |  6 +++++-
 .../util/ReportMailingJobDateUtil.java                 |  6 +++++-
 .../constants/TwoFactorConfigurationConstants.java     |  6 +++++-
 .../security/constants/TwoFactorConstants.java         |  6 +++++-
 .../security/utils/SQLInjectionValidator.java          |  6 +++++-
 .../fineract/infrastructure/sms/SmsApiConstants.java   |  6 +++++-
 .../sms/domain/SmsMessageEnumerations.java             |  6 +++++-
 .../survey/api/LikelihoodApiConstants.java             |  8 ++++++--
 .../survey/api/PovertyLineApiConstants.java            |  6 +++++-
 .../infrastructure/survey/api/SurveyApiConstants.java  |  6 +++++-
 .../infrastructure/survey/data/LikelihoodStatus.java   |  6 +++++-
 .../fineract/interoperation/util/InteropUtil.java      |  6 +++++-
 .../apache/fineract/interoperation/util/MathUtil.java  |  6 +++++-
 .../organisation/holiday/api/HolidayApiConstants.java  | 11 +++++++----
 .../holiday/service/HolidayEnumerations.java           |  6 +++++-
 .../organisation/holiday/service/HolidayUtil.java      |  6 +++++-
 .../organisation/staff/domain/StaffEnumerations.java   |  6 +++++-
 .../workingdays/api/WorkingDaysApiConstants.java       | 10 +++++++---
 .../workingdays/domain/WorkingDaysEnumerations.java    |  6 +++++-
 .../workingdays/service/WorkingDaysUtil.java           |  6 +++++-
 .../portfolio/account/AccountDetailConstants.java      |  6 +++++-
 .../account/api/AccountTransfersApiConstants.java      |  8 ++++++--
 .../account/api/StandingInstructionApiConstants.java   |  8 ++++++--
 .../account/service/AccountTransferEnumerations.java   |  6 +++++-
 .../accountdetails/service/AccountEnumerations.java    |  6 +++++-
 .../fineract/portfolio/calendar/CalendarConstants.java |  6 +++++-
 .../calendar/service/CalendarEnumerations.java         |  6 +++++-
 .../portfolio/calendar/service/CalendarUtils.java      |  6 +++++-
 .../portfolio/charge/api/ChargesApiConstants.java      |  6 +++++-
 .../portfolio/charge/service/ChargeEnumerations.java   |  6 +++++-
 .../portfolio/client/api/ClientApiConstants.java       |  1 +
 .../portfolio/client/domain/ClientEnumerations.java    |  6 +++++-
 .../collateral/api/CollateralApiConstants.java         |  6 +++++-
 .../collectionsheet/CollectionSheetConstants.java      |  6 +++++-
 .../portfolio/common/service/CommonEnumerations.java   |  6 +++++-
 .../portfolio/group/api/GroupingTypesApiConstants.java | 18 +++++++++++-------
 .../group/domain/GroupingTypeEnumerations.java         |  6 +++++-
 .../portfolio/group/service/GroupTypeEnumerations.java |  6 +++++-
 .../InterestRateChartApiConstants.java                 |  6 +++++-
 .../InterestRateChartSlabApiConstants.java             |  6 +++++-
 .../AttributeIncentiveCalculationFactory.java          |  6 +++++-
 .../service/InterestIncentivesEnumerations.java        |  6 +++++-
 .../service/InterestRateChartEnumerations.java         |  6 +++++-
 .../loanaccount/guarantor/GuarantorConstants.java      |  6 +++++-
 .../guarantor/service/GuarantorEnumerations.java       |  6 +++++-
 .../loanschedule/domain/FinanicalFunctions.java        |  6 +++++-
 .../rescheduleloan/RescheduleLoansApiConstants.java    |  6 +++++-
 .../data/LoanRescheduleRequestEnumerations.java        |  6 +++++-
 .../service/LendingStrategyEnumerations.java           |  6 +++++-
 .../loanproduct/service/LoanEnumerations.java          |  6 +++++-
 .../portfolio/meeting/MeetingApiConstants.java         |  6 +++++-
 .../attendance/service/AttendanceEnumerations.java     |  6 +++++-
 .../portfolio/note/service/NoteEnumerations.java       |  6 +++++-
 .../paymentdetail/PaymentDetailConstants.java          |  6 +++++-
 .../api/PaymentTypeApiResourceConstants.java           |  8 ++++++--
 .../fineract/portfolio/rate/api/RateApiConstants.java  |  6 +++++-
 .../portfolio/rate/service/RateEnumerations.java       |  6 +++++-
 .../portfolio/savings/DepositAccountUtils.java         |  6 +++++-
 .../portfolio/savings/DepositsApiConstants.java        |  6 +++++-
 .../portfolio/savings/SavingsApiConstants.java         |  1 +
 .../portfolio/savings/service/SavingsEnumerations.java |  6 +++++-
 .../self/registration/SelfServiceApiConstants.java     |  6 +++++-
 .../self/savings/data/SelfSavingsAccountConstants.java |  6 +++++-
 .../shareaccounts/service/SharesEnumerations.java      |  6 +++++-
 .../fineract/portfolio/tax/service/TaxUtils.java       |  6 +++++-
 .../portfolio/transfer/api/TransferApiConstants.java   |  6 +++++-
 .../apache/fineract/spm/util/SurveyApiConstants.java   |  6 +++++-
 .../fineract/template/domain/TemplateFunctions.java    |  1 +
 .../fineract/template/service/TrustModifier.java       |  6 +++++-
 .../useradministration/api/AppUserApiConstant.java     |  6 +++++-
 .../api/PasswordPreferencesApiConstants.java           |  8 ++++++--
 .../useradministration/service/AppUserConstants.java   |  6 +++++-
 .../test/java/org/apache/fineract/common/Utils.java    |  6 +++++-
 .../LoanProductRelatedDetailTestHelper.java            |  6 +++++-
 .../loanaccount/LoanScheduleTestDataHelper.java        |  6 +++++-
 155 files changed, 784 insertions(+), 180 deletions(-)

diff --git a/fineract-provider/config/checkstyle/checkstyle.xml b/fineract-provider/config/checkstyle/checkstyle.xml
index 70d8208..a9153fd 100644
--- a/fineract-provider/config/checkstyle/checkstyle.xml
+++ b/fineract-provider/config/checkstyle/checkstyle.xml
@@ -162,6 +162,7 @@
              <message key="ws.notPreceded"
              value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
         </module>
+        <module name="HideUtilityClassConstructor"/>
           <module name="OneTopLevelClass"/>
         <module name="MethodName">
             <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
@@ -209,7 +210,6 @@
             <property name="setterCanReturnItsClass" value="true" />
         </module>
 
-        <module name="HideUtilityClassConstructor"/>
 
         < ! - - TODO Checks for Exception Handling Anti-Patterns - - >
         <module name="IllegalCatch"/>
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientStatusChecker.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientStatusChecker.java
index b27442a..a9724f5 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientStatusChecker.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/ClientStatusChecker.java
@@ -24,10 +24,14 @@ import java.util.HashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ClientStatusChecker {
+public final class ClientStatusChecker {
 
     private static final Logger LOG = LoggerFactory.getLogger(ClientStatusChecker.class);
 
+    private ClientStatusChecker() {
+
+    }
+
     public static void verifyClientIsActive(final HashMap<String, Object> clientStatusHashMap) {
         assertEquals(300, (int) clientStatusHashMap.get("id"));
     }
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CalendarHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CalendarHelper.java
index d702565..fbcf833 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CalendarHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CalendarHelper.java
@@ -28,7 +28,7 @@ import java.util.HashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class CalendarHelper {
+public final class CalendarHelper {
 
     private static final Logger LOG = LoggerFactory.getLogger(CalendarHelper.class);
     private static final String BASE_URL = "/fineract-provider/api/v1/";
@@ -37,6 +37,10 @@ public class CalendarHelper {
     private static final String CENTER_ENTITY = "centers/";
     private static final String EDIT_CALENDAR = "editcalendarbasedonmeetingdates/";
 
+    private CalendarHelper() {
+
+    }
+
     public static Integer createMeetingCalendarForGroup(final RequestSpecification requestSpec, final ResponseSpecification responseSpec,
             final Integer groupId, final String startDate, final String frequency, final String interval, final String repeatsOnDay) {
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterHelper.java
index 5274736..09816cb 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CenterHelper.java
@@ -31,7 +31,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({ "rawtypes", "unchecked" })
-public class CenterHelper {
+public final class CenterHelper {
 
     private static final Logger LOG = LoggerFactory.getLogger(CenterHelper.class);
     private static final String CENTERS_URL = "/fineract-provider/api/v1/centers";
@@ -39,6 +39,10 @@ public class CenterHelper {
     public static final String CREATED_DATE = "29 December 2014";
     private static final String CREATE_CENTER_URL = "/fineract-provider/api/v1/centers?" + Utils.TENANT_IDENTIFIER;
 
+    private CenterHelper() {
+
+    }
+
     public static CenterDomain retrieveByID(int id, final RequestSpecification requestSpec, final ResponseSpecification responseSpec) {
         final String GET_CENTER_BY_ID_URL = CENTERS_URL + "/" + id + "?associations=groupMembers&" + Utils.TENANT_IDENTIFIER;
         LOG.info("------------------------ RETRIEVING CENTER AT {}-------------------------", id);
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CurrenciesHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CurrenciesHelper.java
index 73e903e..5dbec8c 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CurrenciesHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/CurrenciesHelper.java
@@ -28,7 +28,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({ "unused", "rawtypes", "unchecked" })
-public class CurrenciesHelper {
+public final class CurrenciesHelper {
+
+    private CurrenciesHelper() {
+
+    }
 
     private static final Logger LOG = LoggerFactory.getLogger(CurrenciesHelper.class);
     private static final String CURRENCIES_URL = "/fineract-provider/api/v1/currencies";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ImageHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ImageHelper.java
index 3e4d423..ccf26bb 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ImageHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/ImageHelper.java
@@ -24,7 +24,11 @@ import org.apache.http.HttpHeaders;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ImageHelper {
+public final class ImageHelper {
+
+    private ImageHelper() {
+
+    }
 
     private static final Logger LOG = LoggerFactory.getLogger(ImageHelper.class);
     private static final String STAFF_IMAGE_URL = "/fineract-provider/api/v1/staff/";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PasswordPreferencesHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PasswordPreferencesHelper.java
index 46902f8..fd72e73 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PasswordPreferencesHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PasswordPreferencesHelper.java
@@ -23,7 +23,11 @@ import io.restassured.specification.RequestSpecification;
 import io.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
 
-public class PasswordPreferencesHelper {
+public final class PasswordPreferencesHelper {
+
+    private PasswordPreferencesHelper() {
+
+    }
 
     private static final String PASSWORD_PREFERENCES_URL = "/fineract-provider/api/v1/passwordpreferences";
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PaymentTypeHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PaymentTypeHelper.java
index 626edfd..9a54fa5 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PaymentTypeHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/PaymentTypeHelper.java
@@ -27,7 +27,11 @@ import io.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
 
 @SuppressWarnings({ "rawtypes", "unchecked" })
-public class PaymentTypeHelper {
+public final class PaymentTypeHelper {
+
+    private PaymentTypeHelper() {
+
+    }
 
     private static final String CREATE_PAYMENTTYPE_URL = "/fineract-provider/api/v1/paymenttypes?" + Utils.TENANT_IDENTIFIER;
     private static final String PAYMENTTYPE_URL = "/fineract-provider/api/v1/paymenttypes";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SurveyHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SurveyHelper.java
index 840ac4b..1c72041 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SurveyHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/SurveyHelper.java
@@ -27,7 +27,11 @@ import java.util.HashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SurveyHelper {
+public final class SurveyHelper {
+
+    private SurveyHelper() {
+
+    }
 
     private static final Logger LOG = LoggerFactory.getLogger(SurveyHelper.class);
     private static final String FULFIL_SURVEY_URL = "/fineract-provider/api/v1/survey/ppi_kenya_2009/clientId?" + Utils.TENANT_IDENTIFIER;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxComponentHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxComponentHelper.java
index b27e1a8..8127d7c 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxComponentHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxComponentHelper.java
@@ -26,7 +26,11 @@ import org.apache.fineract.integrationtests.common.accounting.Account;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TaxComponentHelper {
+public final class TaxComponentHelper {
+
+    private TaxComponentHelper() {
+
+    }
 
     private static final Logger LOG = LoggerFactory.getLogger(TaxComponentHelper.class);
     private static final String CREATE_TAX_COMPONENT_URL = "/fineract-provider/api/v1/taxes/component?" + Utils.TENANT_IDENTIFIER;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxGroupHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxGroupHelper.java
index 9fc8958..cf7423e 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxGroupHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/TaxGroupHelper.java
@@ -28,7 +28,11 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TaxGroupHelper {
+public final class TaxGroupHelper {
+
+    private TaxGroupHelper() {
+
+    }
 
     private static final Logger LOG = LoggerFactory.getLogger(TaxGroupHelper.class);
     private static final String CREATE_TAX_COMPONENT_URL = "/fineract-provider/api/v1/taxes/group?" + Utils.TENANT_IDENTIFIER;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java
index 38b3cb7..f968cde 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/Utils.java
@@ -49,7 +49,11 @@ import org.slf4j.LoggerFactory;
  * sync.
  */
 @SuppressWarnings("unchecked")
-public class Utils {
+public final class Utils {
+
+    private Utils() {
+
+    }
 
     private static final Logger LOG = LoggerFactory.getLogger(Utils.class);
 
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/WorkingDaysHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/WorkingDaysHelper.java
index 7c3d831..b9ef3b5 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/WorkingDaysHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/WorkingDaysHelper.java
@@ -26,7 +26,11 @@ import java.util.Random;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class WorkingDaysHelper {
+public final class WorkingDaysHelper {
+
+    private WorkingDaysHelper() {
+
+    }
 
     private static final Logger LOG = LoggerFactory.getLogger(WorkingDaysHelper.class);
     private static final String WORKINGDAYS_URL = "/fineract-provider/api/v1/workingdays";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/FinancialActivityAccountsMappingBuilder.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/FinancialActivityAccountsMappingBuilder.java
index b0f59d6..9204417 100755
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/FinancialActivityAccountsMappingBuilder.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/accounting/FinancialActivityAccountsMappingBuilder.java
@@ -21,7 +21,11 @@ package org.apache.fineract.integrationtests.common.accounting;
 import com.google.gson.Gson;
 import java.util.HashMap;
 
-public class FinancialActivityAccountsMappingBuilder {
+public final class FinancialActivityAccountsMappingBuilder {
+
+    private FinancialActivityAccountsMappingBuilder() {
+
+    }
 
     public static String build(Integer financialActivityId, Integer glAccountId) {
         final HashMap<String, Object> map = new HashMap<>();
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/charges/ChargesHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/charges/ChargesHelper.java
index 6f4025f..32ce65b 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/charges/ChargesHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/charges/ChargesHelper.java
@@ -30,7 +30,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({ "rawtypes", "unchecked" })
-public class ChargesHelper {
+public final class ChargesHelper {
+
+    private ChargesHelper() {
+
+    }
 
     private static final Logger LOG = LoggerFactory.getLogger(ChargesHelper.class);
     private static final String CHARGES_URL = "/fineract-provider/api/v1/charges";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountStatusChecker.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountStatusChecker.java
index be71da1..3d72da5 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountStatusChecker.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/fixeddeposit/FixedDepositAccountStatusChecker.java
@@ -29,7 +29,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings("rawtypes")
-public class FixedDepositAccountStatusChecker {
+public final class FixedDepositAccountStatusChecker {
+
+    private FixedDepositAccountStatusChecker() {
+
+    }
 
     private static final Logger LOG = LoggerFactory.getLogger(FixedDepositAccountStatusChecker.class);
     private static final String FIXED_DEPOSIT_ACCOUNT_URL = "/fineract-provider/api/v1/fixeddepositaccounts";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/funds/FundsResourceHandler.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/funds/FundsResourceHandler.java
index b2d299d..da98f25 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/funds/FundsResourceHandler.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/funds/FundsResourceHandler.java
@@ -26,7 +26,11 @@ import java.util.HashMap;
 import java.util.List;
 import org.apache.fineract.integrationtests.common.Utils;
 
-public class FundsResourceHandler {
+public final class FundsResourceHandler {
+
+    private FundsResourceHandler() {
+
+    }
 
     private static final String FUNDS_URL = "/fineract-provider/api/v1/funds";
     private static final String CREATE_FUNDS_URL = FUNDS_URL + "?" + Utils.TENANT_IDENTIFIER;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanStatusChecker.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanStatusChecker.java
index 6ee9b9e..821fd90 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanStatusChecker.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/loans/LoanStatusChecker.java
@@ -28,7 +28,11 @@ import java.util.HashMap;
 import org.apache.fineract.integrationtests.common.Utils;
 
 @SuppressWarnings("rawtypes")
-public class LoanStatusChecker {
+public final class LoanStatusChecker {
+
+    private LoanStatusChecker() {
+
+    }
 
     public static void verifyLoanIsApproved(final HashMap loanStatusHashMap) {
         assertFalse(getStatus(loanStatusHashMap, "pendingApproval"));
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/StaffHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/StaffHelper.java
index 969384e..c1df1f2 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/StaffHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/organisation/StaffHelper.java
@@ -29,7 +29,11 @@ import org.apache.fineract.integrationtests.common.Utils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class StaffHelper {
+public final class StaffHelper {
+
+    private StaffHelper() {
+
+    }
 
     private static final Logger LOG = LoggerFactory.getLogger(StaffHelper.class);
     private static final String TRANSFER_STAFF_URL = "/fineract-provider/api/v1/groups";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/provisioning/ProvisioningHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/provisioning/ProvisioningHelper.java
index 77a6670..ec7abd8 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/provisioning/ProvisioningHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/provisioning/ProvisioningHelper.java
@@ -28,7 +28,11 @@ import java.util.Random;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.apache.fineract.integrationtests.common.accounting.Account;
 
-public class ProvisioningHelper {
+public final class ProvisioningHelper {
+
+    private ProvisioningHelper() {
+
+    }
 
     public static final Map createProvisioingCriteriaJson(ArrayList<Integer> loanProducts, ArrayList categories, Account liability,
             Account expense) {
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/rates/RatesHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/rates/RatesHelper.java
index a0ac462..548b531 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/rates/RatesHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/rates/RatesHelper.java
@@ -27,7 +27,11 @@ import org.apache.fineract.integrationtests.common.CommonConstants;
 import org.apache.fineract.integrationtests.common.Utils;
 
 @SuppressWarnings({ "rawtypes", "unchecked" })
-public class RatesHelper {
+public final class RatesHelper {
+
+    private RatesHelper() {
+
+    }
 
     private static final String RATES_URL = "/fineract-provider/api/v1/rates";
     private static final String CREATE_RATES_URL = RATES_URL + "?" + Utils.TENANT_IDENTIFIER;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositAccountStatusChecker.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositAccountStatusChecker.java
index 694647d..c1f1be2 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositAccountStatusChecker.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/recurringdeposit/RecurringDepositAccountStatusChecker.java
@@ -29,7 +29,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings("rawtypes")
-public class RecurringDepositAccountStatusChecker {
+public final class RecurringDepositAccountStatusChecker {
+
+    private RecurringDepositAccountStatusChecker() {
+
+    }
 
     private static final Logger LOG = LoggerFactory.getLogger(RecurringDepositAccountStatusChecker.class);
     private static final String RECURRING_DEPOSIT_ACCOUNT_URL = "/fineract-provider/api/v1/recurringdepositaccounts";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsStatusChecker.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsStatusChecker.java
index 80a0e28..629dc4c 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsStatusChecker.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/savings/SavingsStatusChecker.java
@@ -28,7 +28,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings("rawtypes")
-public class SavingsStatusChecker {
+public final class SavingsStatusChecker {
+
+    private SavingsStatusChecker() {
+
+    }
 
     private static final Logger LOG = LoggerFactory.getLogger(SavingsStatusChecker.class);
     private static final String SAVINGS_ACCOUNT_URL = "/fineract-provider/api/v1/savingsaccounts";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountTransactionHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountTransactionHelper.java
index 282d1db..fae790c 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountTransactionHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareAccountTransactionHelper.java
@@ -23,7 +23,11 @@ import io.restassured.specification.ResponseSpecification;
 import java.util.Map;
 import org.apache.fineract.integrationtests.common.Utils;
 
-public class ShareAccountTransactionHelper {
+public final class ShareAccountTransactionHelper {
+
+    private ShareAccountTransactionHelper() {
+
+    }
 
     private static final String SHARE_ACCOUNT_URL = "/fineract-provider/api/v1/accounts/share";
     private static final String CREATE_SHARE_ACCOUNT_URL = SHARE_ACCOUNT_URL + "?" + Utils.TENANT_IDENTIFIER;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareDividendsTransactionHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareDividendsTransactionHelper.java
index 4e78f54..091a91d 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareDividendsTransactionHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareDividendsTransactionHelper.java
@@ -23,7 +23,11 @@ import io.restassured.specification.ResponseSpecification;
 import java.util.Map;
 import org.apache.fineract.integrationtests.common.Utils;
 
-public class ShareDividendsTransactionHelper {
+public final class ShareDividendsTransactionHelper {
+
+    private ShareDividendsTransactionHelper() {
+
+    }
 
     private static final String SHARE_PRODUCT_URL = "/fineract-provider/api/v1/shareproduct";
     private static final String DIVIDEND = "dividend";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareProductTransactionHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareProductTransactionHelper.java
index 83393fb..55de3bf 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareProductTransactionHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/shares/ShareProductTransactionHelper.java
@@ -23,7 +23,11 @@ import io.restassured.specification.ResponseSpecification;
 import java.util.Map;
 import org.apache.fineract.integrationtests.common.Utils;
 
-public class ShareProductTransactionHelper {
+public final class ShareProductTransactionHelper {
+
+    private ShareProductTransactionHelper() {
+
+    }
 
     private static final String SHARE_PRODUCT_URL = "/fineract-provider/api/v1/products/share";
     private static final String CREATE_SHARE_PRODUCT_URL = SHARE_PRODUCT_URL + "?" + Utils.TENANT_IDENTIFIER;
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/CodeHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/CodeHelper.java
index 4403c87..d0b6db2 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/CodeHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/system/CodeHelper.java
@@ -29,7 +29,11 @@ import java.util.HashMap;
 import java.util.List;
 import org.apache.fineract.integrationtests.common.Utils;
 
-public class CodeHelper {
+public final class CodeHelper {
+
+    private CodeHelper() {
+
+    }
 
     public static final String CODE_ID_ATTRIBUTE_NAME = "id";
     public static final String RESPONSE_ID_ATTRIBUTE_NAME = "resourceId";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/useradministration/roles/RolesHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/useradministration/roles/RolesHelper.java
index 570c30d..def8c76 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/useradministration/roles/RolesHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/useradministration/roles/RolesHelper.java
@@ -24,7 +24,11 @@ import io.restassured.specification.ResponseSpecification;
 import java.util.HashMap;
 import org.apache.fineract.integrationtests.common.Utils;
 
-public class RolesHelper {
+public final class RolesHelper {
+
+    private RolesHelper() {
+
+    }
 
     private static final String CREATE_ROLE_URL = "/fineract-provider/api/v1/roles?" + Utils.TENANT_IDENTIFIER;
     private static final String ROLE_URL = "/fineract-provider/api/v1/roles";
diff --git a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/useradministration/users/UserHelper.java b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/useradministration/users/UserHelper.java
index ae0b1c0..f007975 100644
--- a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/useradministration/users/UserHelper.java
+++ b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/useradministration/users/UserHelper.java
@@ -26,7 +26,11 @@ import java.util.List;
 import org.apache.fineract.integrationtests.common.Utils;
 import org.junit.jupiter.api.Assertions;
 
-public class UserHelper {
+public final class UserHelper {
+
+    private UserHelper() {
+
+    }
 
     private static final String CREATE_USER_URL = "/fineract-provider/api/v1/users?" + Utils.TENANT_IDENTIFIER;
     private static final String USER_URL = "/fineract-provider/api/v1/users";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/api/AccrualAccountingConstants.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/api/AccrualAccountingConstants.java
index 196b03f..1a67ca6 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/api/AccrualAccountingConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/accrual/api/AccrualAccountingConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.accounting.accrual.api;
 
-public class AccrualAccountingConstants {
+public final class AccrualAccountingConstants {
+
+    private AccrualAccountingConstants() {
+
+    }
 
     public static final String accrueTillParamName = "tillDate";
     public static final String localeParamName = "locale";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java
index e87a01e..05bf181 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingConstants.java
@@ -25,7 +25,11 @@ import java.util.Map;
 import org.apache.fineract.accounting.financialactivityaccount.data.FinancialActivityData;
 import org.apache.fineract.accounting.glaccount.domain.GLAccountType;
 
-public class AccountingConstants {
+public final class AccountingConstants {
+
+    private AccountingConstants() {
+
+    }
 
     /***
      * Accounting placeholders for cash based accounting for loan products
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingEnumerations.java
index de19dea..ac327eb 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/common/AccountingEnumerations.java
@@ -26,7 +26,11 @@ import org.apache.fineract.accounting.journalentry.domain.JournalEntryType;
 import org.apache.fineract.accounting.producttoaccountmapping.domain.PortfolioProductType;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
-public class AccountingEnumerations {
+public final class AccountingEnumerations {
+
+    private AccountingEnumerations() {
+
+    }
 
     public static EnumOptionData gLAccountType(final int id) {
         return gLAccountType(GLAccountType.fromInt(id));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsConstants.java b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsConstants.java
index fd7df95..0e2d674 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsConstants.java
@@ -22,7 +22,11 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-public class FinancialActivityAccountsConstants {
+public final class FinancialActivityAccountsConstants {
+
+    private FinancialActivityAccountsConstants() {
+
+    }
 
     private static final String idParamName = "id";
     private static final String factivityDataParamName = "financialActivityData";
@@ -30,6 +34,6 @@ public class FinancialActivityAccountsConstants {
     private static final String glAccountOptionsParamName = "glAccountOptions";
     private static final String financialActivityOptionsParamName = "financialActivityOptions";
     public static final String resourceNameForPermission = "FINANCIALACTIVITYACCOUNT";
-    protected static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(idParamName, factivityDataParamName,
+    static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(idParamName, factivityDataParamName,
             glAccountDataParamName, glAccountOptionsParamName, financialActivityOptionsParamName));
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormatEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormatEnumerations.java
index a994b09..37649e2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormatEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/domain/AccountNumberFormatEnumerations.java
@@ -28,7 +28,11 @@ import java.util.Map;
 import java.util.Set;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
-public class AccountNumberFormatEnumerations {
+public final class AccountNumberFormatEnumerations {
+
+    private AccountNumberFormatEnumerations() {
+
+    }
 
     public static final Set<AccountNumberPrefixType> accountNumberPrefixesForClientAccounts = Collections
             .unmodifiableSet(new HashSet<>(Arrays.asList(AccountNumberPrefixType.OFFICE_NAME, AccountNumberPrefixType.CLIENT_TYPE)));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatConstants.java
index 9054a25..0bce265 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/accountnumberformat/service/AccountNumberFormatConstants.java
@@ -20,7 +20,11 @@ package org.apache.fineract.infrastructure.accountnumberformat.service;
 
 import org.apache.fineract.infrastructure.accountnumberformat.data.AccountNumberFormatData;
 
-public class AccountNumberFormatConstants {
+public final class AccountNumberFormatConstants {
+
+    private AccountNumberFormatConstants() {
+
+    }
 
     // resource name for validation
     public static final String ENTITY_NAME = "accountNumberFormat";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/CenterConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/CenterConstants.java
index 4d97399..962954e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/CenterConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/CenterConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.constants;
 
-public class CenterConstants {
+public final class CenterConstants {
+
+    private CenterConstants() {
+
+    }
 
     // Column indices
     public static final int CENTER_NAME_COL = 0;// A
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ChartOfAcountsConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ChartOfAcountsConstants.java
index f13a404..59a9032 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ChartOfAcountsConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ChartOfAcountsConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.constants;
 
-public class ChartOfAcountsConstants {
+public final class ChartOfAcountsConstants {
+
+    private ChartOfAcountsConstants() {
+
+    }
 
     public static final int ACCOUNT_TYPE_COL = 0;// A
     public static final int ACCOUNT_NAME_COL = 1;// B
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ClientEntityConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ClientEntityConstants.java
index 430e79e..ed26a73 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ClientEntityConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ClientEntityConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.constants;
 
-public class ClientEntityConstants {
+public final class ClientEntityConstants {
+
+    private ClientEntityConstants() {
+
+    }
 
     public static final int NAME_COL = 0;// A
     public static final int OFFICE_NAME_COL = 1;// B
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ClientPersonConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ClientPersonConstants.java
index 8e35d80..0073e1c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ClientPersonConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/ClientPersonConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.constants;
 
-public class ClientPersonConstants {
+public final class ClientPersonConstants {
+
+    private ClientPersonConstants() {
+
+    }
 
     public static final int FIRST_NAME_COL = 0;// A
     public static final int LAST_NAME_COL = 1;// B
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/FixedDepositConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/FixedDepositConstants.java
index d617a07..2748110 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/FixedDepositConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/FixedDepositConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.constants;
 
-public class FixedDepositConstants {
+public final class FixedDepositConstants {
+
+    private FixedDepositConstants() {
+
+    }
 
     public static final int OFFICE_NAME_COL = 0;
     public static final int CLIENT_NAME_COL = 1;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/GroupConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/GroupConstants.java
index 8fd1f7c..f11e283 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/GroupConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/GroupConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.constants;
 
-public class GroupConstants {
+public final class GroupConstants {
+
+    private GroupConstants() {
+
+    }
 
     public static final int NAME_COL = 0; // A
     public static final int OFFICE_NAME_COL = 1; // B
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/GuarantorConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/GuarantorConstants.java
index a28f51c..dfae5af 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/GuarantorConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/GuarantorConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.constants;
 
-public class GuarantorConstants {
+public final class GuarantorConstants {
+
+    private GuarantorConstants() {
+
+    }
 
     public static final int OFFICE_NAME_COL = 0;
     public static final int CLIENT_NAME_COL = 1;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/JournalEntryConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/JournalEntryConstants.java
index 89e8c84..9f8ebe1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/JournalEntryConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/JournalEntryConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.constants;
 
-public class JournalEntryConstants {
+public final class JournalEntryConstants {
+
+    private JournalEntryConstants() {
+
+    }
 
     public static final int OFFICE_NAME_COL = 0;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/LoanConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/LoanConstants.java
index 0d42981..b1996c4 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/LoanConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/LoanConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.constants;
 
-public class LoanConstants {
+public final class LoanConstants {
+
+    private LoanConstants() {
+
+    }
 
     public static final int OFFICE_NAME_COL = 0;// A
     public static final int LOAN_TYPE_COL = 1;// B
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/LoanRepaymentConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/LoanRepaymentConstants.java
index 5aa5714..b0a4127 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/LoanRepaymentConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/LoanRepaymentConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.constants;
 
-public class LoanRepaymentConstants {
+public final class LoanRepaymentConstants {
+
+    private LoanRepaymentConstants() {
+
+    }
 
     public static final int OFFICE_NAME_COL = 0;// A
     public static final int CLIENT_NAME_COL = 1;// B
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/OfficeConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/OfficeConstants.java
index c320359..8284a50 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/OfficeConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/OfficeConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.constants;
 
-public class OfficeConstants {
+public final class OfficeConstants {
+
+    private OfficeConstants() {
+
+    }
 
     // Column indices
     public static final int OFFICE_NAME_COL = 0;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/RecurringDepositConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/RecurringDepositConstants.java
index 4d0653d..3cb51e1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/RecurringDepositConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/RecurringDepositConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.constants;
 
-public class RecurringDepositConstants {
+public final class RecurringDepositConstants {
+
+    private RecurringDepositConstants() {
+
+    }
 
     public static final int OFFICE_NAME_COL = 0;
     public static final int CLIENT_NAME_COL = 1;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/SavingsConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/SavingsConstants.java
index 86eacb3..d80107b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/SavingsConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/SavingsConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.constants;
 
-public class SavingsConstants {
+public final class SavingsConstants {
+
+    private SavingsConstants() {
+
+    }
 
     public static final int OFFICE_NAME_COL = 0;
     public static final int SAVINGS_TYPE_COL = 1;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/SharedAccountsConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/SharedAccountsConstants.java
index 68a7919..833eab2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/SharedAccountsConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/SharedAccountsConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.constants;
 
-public class SharedAccountsConstants {
+public final class SharedAccountsConstants {
+
+    private SharedAccountsConstants() {
+
+    }
 
     public static final int CLIENT_NAME_COL = 0;
     public static final int PRODUCT_COL = 1;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/StaffConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/StaffConstants.java
index 67cca0a..4db6907 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/StaffConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/StaffConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.constants;
 
-public class StaffConstants {
+public final class StaffConstants {
+
+    private StaffConstants() {
+
+    }
 
     public static final int OFFICE_NAME_COL = 0;// A
     public static final int FIRST_NAME_COL = 1;// B
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/TemplatePopulateImportConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/TemplatePopulateImportConstants.java
index a58a810..c18abbb 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/TemplatePopulateImportConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/TemplatePopulateImportConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.constants;
 
-public class TemplatePopulateImportConstants {
+public final class TemplatePopulateImportConstants {
+
+    private TemplatePopulateImportConstants() {
+
+    }
 
     // columns sizes
     public static final int SMALL_COL_SIZE = 4000;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/TransactionConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/TransactionConstants.java
index acfa73e..650eda3 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/TransactionConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/TransactionConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.constants;
 
-public class TransactionConstants {
+public final class TransactionConstants {
+
+    private TransactionConstants() {
+
+    }
 
     public static final int OFFICE_NAME_COL = 0;
     public static final int CLIENT_NAME_COL = 1;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/UserConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/UserConstants.java
index 699ab22..f0f3184 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/UserConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/constants/UserConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.bulkimport.constants;
 
-public class UserConstants {
+public final class UserConstants {
+
+    private UserConstants() {
+
+    }
 
     public static final int OFFICE_NAME_COL = 0;
     public static final int STAFF_NAME_COL = 1;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/ImportHandlerUtils.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/ImportHandlerUtils.java
index c8cd9da..a8914dd 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/ImportHandlerUtils.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/ImportHandlerUtils.java
@@ -39,7 +39,11 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.util.CellReference;
 import org.joda.time.LocalDate;
 
-public class ImportHandlerUtils {
+public final class ImportHandlerUtils {
+
+    private ImportHandlerUtils() {
+
+    }
 
     public static Integer getNumberOfRows(Sheet sheet, int primaryColumn) {
         Integer noOfEntries = 0;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/CacheApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/CacheApiConstants.java
index b2d9269..24e2468 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/CacheApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/CacheApiConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.cache;
 
-public class CacheApiConstants {
+public final class CacheApiConstants {
+
+    private CacheApiConstants() {
+
+    }
 
     public static final String RESOURCE_NAME = "CACHE";
     public static final String cacheTypeParameter = "cacheType";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/CacheEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/CacheEnumerations.java
index fbf98cc..7310e53 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/CacheEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/cache/CacheEnumerations.java
@@ -21,7 +21,11 @@ package org.apache.fineract.infrastructure.cache;
 import org.apache.fineract.infrastructure.cache.domain.CacheType;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
-public class CacheEnumerations {
+public final class CacheEnumerations {
+
+    private CacheEnumerations() {
+
+    }
 
     public static EnumOptionData cacheType(final int id) {
         return cacheType(CacheType.fromInt(id));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/EmailApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/EmailApiConstants.java
index bf926ab..bf8b4f2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/EmailApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/EmailApiConstants.java
@@ -22,7 +22,11 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-public class EmailApiConstants {
+public final class EmailApiConstants {
+
+    private EmailApiConstants() {
+
+    }
 
     public static final String RESOURCE_NAME = "email";
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/ScheduledEmailConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/ScheduledEmailConstants.java
index dfb6e4f..e7a6f47 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/ScheduledEmailConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/ScheduledEmailConstants.java
@@ -23,7 +23,11 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-public class ScheduledEmailConstants {
+public final class ScheduledEmailConstants {
+
+    private ScheduledEmailConstants() {
+
+    }
 
     // define the API resource entity name
     public static final String SCHEDULED_EMAIL_ENTITY_NAME = "SCHEDULEDEMAIL";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/data/ScheduledEmailEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/data/ScheduledEmailEnumerations.java
index ef1cbbb..27a4a62 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/data/ScheduledEmailEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/data/ScheduledEmailEnumerations.java
@@ -22,7 +22,11 @@ import org.apache.fineract.infrastructure.campaigns.email.domain.ScheduledEmailA
 import org.apache.fineract.infrastructure.campaigns.email.domain.ScheduledEmailStretchyReportParamDateOption;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
-public class ScheduledEmailEnumerations {
+public final class ScheduledEmailEnumerations {
+
+    private ScheduledEmailEnumerations() {
+
+    }
 
     public static EnumOptionData emailAttachementFileFormat(final Integer emailAttachementFileFormatId) {
         return emailAttachementFileFormat(ScheduledEmailAttachmentFileFormat.instance(emailAttachementFileFormatId));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/domain/EmailCampaignStatusEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/domain/EmailCampaignStatusEnumerations.java
index 0fd6a2f..2862b44 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/domain/EmailCampaignStatusEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/domain/EmailCampaignStatusEnumerations.java
@@ -20,7 +20,11 @@ package org.apache.fineract.infrastructure.campaigns.email.domain;
 
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
-public class EmailCampaignStatusEnumerations {
+public final class EmailCampaignStatusEnumerations {
+
+    private EmailCampaignStatusEnumerations() {
+
+    }
 
     public static EnumOptionData status(final Integer statusId) {
         return status(EmailCampaignStatus.fromInt(statusId));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/domain/EmailMessageEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/domain/EmailMessageEnumerations.java
index c9a6c55..9fdff4e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/domain/EmailMessageEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/domain/EmailMessageEnumerations.java
@@ -20,7 +20,11 @@ package org.apache.fineract.infrastructure.campaigns.email.domain;
 
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
-public class EmailMessageEnumerations {
+public final class EmailMessageEnumerations {
+
+    private EmailMessageEnumerations() {
+
+    }
 
     public static EnumOptionData status(final Integer statusId) {
         return status(EmailMessageStatusType.fromInt(statusId));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/constants/SmsCampaignEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/constants/SmsCampaignEnumerations.java
index 2689cc4..58210ed 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/constants/SmsCampaignEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/constants/SmsCampaignEnumerations.java
@@ -25,7 +25,11 @@ import org.apache.fineract.infrastructure.campaigns.constants.CampaignType;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 import org.apache.fineract.portfolio.common.domain.PeriodFrequencyType;
 
-public class SmsCampaignEnumerations {
+public final class SmsCampaignEnumerations {
+
+    private SmsCampaignEnumerations() {
+
+    }
 
     public static EnumOptionData smscampaignTriggerType(final SmsCampaignTriggerType type) {
         EnumOptionData optionData = new EnumOptionData(SmsCampaignTriggerType.INVALID.getValue().longValue(),
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/domain/SmsCampaignStatusEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/domain/SmsCampaignStatusEnumerations.java
index aa4ae52..3d296cb 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/domain/SmsCampaignStatusEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/domain/SmsCampaignStatusEnumerations.java
@@ -21,7 +21,11 @@ package org.apache.fineract.infrastructure.campaigns.sms.domain;
 import org.apache.fineract.infrastructure.campaigns.sms.constants.SmsCampaignStatus;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
-public class SmsCampaignStatusEnumerations {
+public final class SmsCampaignStatusEnumerations {
+
+    private SmsCampaignStatusEnumerations() {
+
+    }
 
     public static EnumOptionData status(final Integer statusId) {
         return status(SmsCampaignStatus.fromInt(statusId));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/ExternalServiceConfigurationApiConstant.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/ExternalServiceConfigurationApiConstant.java
index 95d446d..39b85fc 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/ExternalServiceConfigurationApiConstant.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/ExternalServiceConfigurationApiConstant.java
@@ -22,11 +22,15 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-public class ExternalServiceConfigurationApiConstant {
+public final class ExternalServiceConfigurationApiConstant {
+
+    private ExternalServiceConfigurationApiConstant() {
+
+    }
 
     public static final String NAME = "name";
     public static final String VALUE = "value";
     public static final String EXTERNAL_SERVICE_RESOURCE_NAME = "externalServiceConfiguration";
 
-    protected static final Set<String> EXTERNAL_SERVICE_CONFIGURATION_DATA_PARAMETERS = new HashSet<>(Arrays.asList(NAME, VALUE));
+    static final Set<String> EXTERNAL_SERVICE_CONFIGURATION_DATA_PARAMETERS = new HashSet<>(Arrays.asList(NAME, VALUE));
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/GlobalConfigurationApiConstant.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/GlobalConfigurationApiConstant.java
index a199786..3174b45 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/GlobalConfigurationApiConstant.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/api/GlobalConfigurationApiConstant.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.configuration.api;
 
-public class GlobalConfigurationApiConstant {
+public final class GlobalConfigurationApiConstant {
+
+    private GlobalConfigurationApiConstant() {
+
+    }
 
     public static final String ENABLED = "enabled";
     public static final String VALUE = "value";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ExternalServicesConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ExternalServicesConstants.java
index f440762..454d1f2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ExternalServicesConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/configuration/service/ExternalServicesConstants.java
@@ -21,7 +21,11 @@ package org.apache.fineract.infrastructure.configuration.service;
 import java.util.HashSet;
 import java.util.Set;
 
-public class ExternalServicesConstants {
+public final class ExternalServicesConstants {
+
+    private ExternalServicesConstants() {
+
+    }
 
     public static final String S3_SERVICE_NAME = "S3";
     public static final String S3_BUCKET_NAME = "s3_bucket_name";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/ApiParameterHelper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/ApiParameterHelper.java
index 78b140b..5335fd3 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/ApiParameterHelper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/api/ApiParameterHelper.java
@@ -30,7 +30,11 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.fineract.infrastructure.core.serialization.JsonParserHelper;
 import org.apache.fineract.infrastructure.security.utils.SQLInjectionValidator;
 
-public class ApiParameterHelper {
+public final class ApiParameterHelper {
+
+    private ApiParameterHelper() {
+
+    }
 
     public static Long commandId(final MultivaluedMap<String, String> queryParams) {
         Long id = null;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/JdbcSupport.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/JdbcSupport.java
index 3b2d727..6621d18 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/JdbcSupport.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/domain/JdbcSupport.java
@@ -34,7 +34,11 @@ import org.springframework.jdbc.support.JdbcUtils;
  * Support for retrieving possibly null values from jdbc recordset delegating to springs {@link JdbcUtils} where
  * possible.
  */
-public class JdbcSupport {
+public final class JdbcSupport {
+
+    private JdbcSupport() {
+
+    }
 
     public static DateTime getDateTime(final ResultSet rs, final String columnName) throws SQLException {
         DateTime dateTime = null;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/DateUtils.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/DateUtils.java
index 0f4c395..03f49ac 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/DateUtils.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/DateUtils.java
@@ -34,7 +34,11 @@ import org.joda.time.LocalDateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 
-public class DateUtils {
+public final class DateUtils {
+
+    private DateUtils() {
+
+    }
 
     public static DateTimeZone getDateTimeZoneOfTenant() {
         final FineractPlatformTenant tenant = ThreadLocalContextUtil.getTenant();
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/ThreadLocalContextUtil.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/ThreadLocalContextUtil.java
index ec98c3e..e00c8f8 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/ThreadLocalContextUtil.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/ThreadLocalContextUtil.java
@@ -24,7 +24,11 @@ import org.springframework.util.Assert;
 /**
  *
  */
-public class ThreadLocalContextUtil {
+public final class ThreadLocalContextUtil {
+
+    private ThreadLocalContextUtil() {
+
+    }
 
     public static final String CONTEXT_TENANTS = "tenants";
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DataTableApiConstant.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DataTableApiConstant.java
index f71468b..39e0b4b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DataTableApiConstant.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/api/DataTableApiConstant.java
@@ -21,7 +21,11 @@ package org.apache.fineract.infrastructure.dataqueries.api;
 /**
  * Created by Cieyou on 2/26/14.
  */
-public class DataTableApiConstant {
+public final class DataTableApiConstant {
+
+    private DataTableApiConstant() {
+
+    }
 
     public static final Integer CATEGORY_PPI = 200;
     public static final Integer CATEGORY_DEFAULT = 100;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/ContentRepositoryUtils.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/ContentRepositoryUtils.java
index 62ff738..660bcf3 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/ContentRepositoryUtils.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/ContentRepositoryUtils.java
@@ -29,7 +29,11 @@ import org.apache.fineract.infrastructure.core.exception.ImageUploadException;
 import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
 import org.apache.fineract.infrastructure.documentmanagement.exception.ContentManagementException;
 
-public class ContentRepositoryUtils {
+public final class ContentRepositoryUtils {
+
+    private ContentRepositoryUtils() {
+
+    }
 
     private static final Random random = new Random();
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/FineractEntityAccessConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/FineractEntityAccessConstants.java
index 003a013..7cc771d 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/FineractEntityAccessConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/FineractEntityAccessConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.entityaccess;
 
-public class FineractEntityAccessConstants {
+public final class FineractEntityAccessConstants {
+
+    private FineractEntityAccessConstants() {
+
+    }
 
     public static final String GLOBAL_CONFIG_FOR_OFFICE_SPECIFIC_PRODUCTS = "office-specific-products-enabled";
     public static final String GLOBAL_CONFIG_FOR_RESTRICT_PRODUCTS_TO_USER_OFFICE = "restrict-products-to-user-office";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/api/FineractEntityApiResourceConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/api/FineractEntityApiResourceConstants.java
index ca4bbea..7e7df1a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/api/FineractEntityApiResourceConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/entityaccess/api/FineractEntityApiResourceConstants.java
@@ -22,7 +22,11 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-public class FineractEntityApiResourceConstants {
+public final class FineractEntityApiResourceConstants {
+
+    private FineractEntityApiResourceConstants() {
+
+    }
 
     public static final String FINERACT_ENTITY_RESOURCE_NAME = "FineractEntity";
     public static final String mappingTypes = "mappingTypes";
@@ -41,9 +45,8 @@ public class FineractEntityApiResourceConstants {
     public static final String ROLE_ACCESS_TO_LOAN_PRODUCTS = " role_access_to_loan_products ";
     public static final String ROLE_ACCESS_TO_SAVINGS_PRODUCTS = " role_access_to_savings_products ";
 
-    protected static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(mappingTypes));
+    static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(mappingTypes));
 
-    protected static final Set<String> FETCH_ENTITY_TO_ENTITY_MAPPINGS = new HashSet<>(
-            Arrays.asList(mapId, relId, fromEnityType, toEntityType));
+    static final Set<String> FETCH_ENTITY_TO_ENTITY_MAPPINGS = new HashSet<>(Arrays.asList(mapId, relId, fromEnityType, toEntityType));
 
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/api/DeviceRegistrationApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/api/DeviceRegistrationApiConstants.java
index 3bb9ebb..a0cf67c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/api/DeviceRegistrationApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/gcm/api/DeviceRegistrationApiConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.gcm.api;
 
-public class DeviceRegistrationApiConstants {
+public final class DeviceRegistrationApiConstants {
+
+    private DeviceRegistrationApiConstants() {
+
+    }
 
     public static final String clientIdParamName = "clientId";
     public static final String registrationIdParamName = "registrationId";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/api/HookApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/api/HookApiConstants.java
index e1757fa..36cc1b1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/api/HookApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/api/HookApiConstants.java
@@ -22,7 +22,11 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-public class HookApiConstants {
+public final class HookApiConstants {
+
+    private HookApiConstants() {
+
+    }
 
     public static final String HOOK_RESOURCE_NAME = "HOOK";
 
@@ -62,10 +66,10 @@ public class HookApiConstants {
 
     public static final String templateNameParamName = "templateName";
 
-    protected static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(nameParamName, displayNameParamName,
+    static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(nameParamName, displayNameParamName,
             templateIdParamName, isActiveParamName, configParamName, eventsParamName, templateNameParamName));
 
-    protected static final Set<String> UPDATE_REQUEST_DATA_PARAMETERS = new HashSet<>(Arrays.asList(nameParamName, displayNameParamName,
+    static final Set<String> UPDATE_REQUEST_DATA_PARAMETERS = new HashSet<>(Arrays.asList(nameParamName, displayNameParamName,
             templateIdParamName, isActiveParamName, configParamName, eventsParamName, templateNameParamName));
 
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/processor/ProcessorHelper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/processor/ProcessorHelper.java
index d87f93a..de56ae8 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/processor/ProcessorHelper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/processor/ProcessorHelper.java
@@ -38,7 +38,11 @@ import retrofit.client.OkClient;
 import retrofit.client.Response;
 
 @SuppressWarnings("unused")
-public class ProcessorHelper {
+public final class ProcessorHelper {
+
+    private ProcessorHelper() {
+
+    }
 
     private static final Logger LOG = LoggerFactory.getLogger(ProcessorHelper.class);
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/annotation/CronMethodParser.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/annotation/CronMethodParser.java
index cff50fb..10623fd 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/annotation/CronMethodParser.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/annotation/CronMethodParser.java
@@ -37,7 +37,11 @@ import org.springframework.util.ClassUtils;
 /**
  * Parser to find method which is marked with CronTargetMethod annotation
  */
-public class CronMethodParser {
+public final class CronMethodParser {
+
+    private CronMethodParser() {
+
+    }
 
     public static class ClassMethodNamesPair {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerJobApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerJobApiConstants.java
index 1746fc6..0a09bce 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerJobApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/api/SchedulerJobApiConstants.java
@@ -22,7 +22,11 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-public class SchedulerJobApiConstants {
+public final class SchedulerJobApiConstants {
+
+    private SchedulerJobApiConstants() {
+
+    }
 
     public static final String JOB_RESOURCE_NAME = "schedulerjob";
     public static final String SCHEDULER_RESOURCE_NAME = "SCHEDULER";
@@ -53,13 +57,12 @@ public class SchedulerJobApiConstants {
     public static final String JOB_RUN_HISTORY = "runhistory";
     public static final String SCHEDULER_STATUS_PATH = "scheduler";
 
-    protected static final Set<String> JOB_DETAIL_RESPONSE_DATA_PARAMETERS = new HashSet<>(
+    static final Set<String> JOB_DETAIL_RESPONSE_DATA_PARAMETERS = new HashSet<>(
             Arrays.asList(jobIdentifierParamName, displayNameParamName, nextRunTimeParamName, initializingErrorParamName,
                     cronExpressionParamName, jobActiveStatusParamName, currentlyRunningParamName, lastRunHistoryObjParamName));
 
-    protected static final Set<String> JOB_HISTORY_RESPONSE_DATA_PARAMETERS = new HashSet<>(
-            Arrays.asList(versionParamName, jobRunStartTimeParamName, jobRunEndTimeParamName, statusParamName, jobRunErrorMessageParamName,
-                    triggerTypeParamName, jobRunErrorLogParamName));
+    static final Set<String> JOB_HISTORY_RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(versionParamName, jobRunStartTimeParamName,
+            jobRunEndTimeParamName, statusParamName, jobRunErrorMessageParamName, triggerTypeParamName, jobRunErrorLogParamName));
 
-    protected static final Set<String> SCHEDULER_DETAIL_RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(schedulerStatusParamName));
+    static final Set<String> SCHEDULER_DETAIL_RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(schedulerStatusParamName));
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/ReportMailingJobConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/ReportMailingJobConstants.java
index 94b9a7b..6c9f1e1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/ReportMailingJobConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/ReportMailingJobConstants.java
@@ -24,7 +24,11 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-public class ReportMailingJobConstants implements Serializable {
+public final class ReportMailingJobConstants implements Serializable {
+
+    private ReportMailingJobConstants() {
+
+    }
 
     // define the API resource entity name
     public static final String REPORT_MAILING_JOB_ENTITY_NAME = "REPORTMAILINGJOB";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/helper/IPv4Helper.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/helper/IPv4Helper.java
index 89ee6b8..dda23c3 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/helper/IPv4Helper.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/helper/IPv4Helper.java
@@ -30,7 +30,11 @@ import org.slf4j.LoggerFactory;
  *
  * @see http://hawkee.com/snippet/9731/
  */
-public class IPv4Helper {
+public final class IPv4Helper {
+
+    private IPv4Helper() {
+
+    }
 
     /**
      * Returns the long format of the provided IP address.
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/util/ReportMailingJobDateUtil.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/util/ReportMailingJobDateUtil.java
index 7357234..78faba0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/util/ReportMailingJobDateUtil.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/reportmailingjob/util/ReportMailingJobDateUtil.java
@@ -23,7 +23,11 @@ import java.util.Calendar;
 import java.util.Date;
 import org.apache.fineract.infrastructure.reportmailingjob.data.ReportMailingJobStretchyReportParamDateOption;
 
-public class ReportMailingJobDateUtil {
+public final class ReportMailingJobDateUtil {
+
+    private ReportMailingJobDateUtil() {
+
+    }
 
     public static final String MYSQL_DATE_FORMAT = "yyyy-MM-dd";
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/constants/TwoFactorConfigurationConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/constants/TwoFactorConfigurationConstants.java
index 0e77ec9..e4b0ee4 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/constants/TwoFactorConfigurationConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/constants/TwoFactorConfigurationConstants.java
@@ -24,7 +24,11 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-public class TwoFactorConfigurationConstants {
+public final class TwoFactorConfigurationConstants {
+
+    private TwoFactorConfigurationConstants() {
+
+    }
 
     public static final String RESOURCE_NAME = "TWOFACTOR_CONFIGURATION";
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/constants/TwoFactorConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/constants/TwoFactorConstants.java
index 7997c39..feae3e2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/constants/TwoFactorConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/constants/TwoFactorConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.security.constants;
 
-public class TwoFactorConstants {
+public final class TwoFactorConstants {
+
+    private TwoFactorConstants() {
+
+    }
 
     public static final String ACCESSTOKEN_RESOURCE_NAME = "TWOFACTOR_ACCESSTOKEN";
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLInjectionValidator.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLInjectionValidator.java
index ce0c85d..a7a77a4 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLInjectionValidator.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/utils/SQLInjectionValidator.java
@@ -23,7 +23,11 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.commons.lang3.StringUtils;
 
-public class SQLInjectionValidator {
+public final class SQLInjectionValidator {
+
+    private SQLInjectionValidator() {
+
+    }
 
     private static final String[] DDL_COMMANDS = { "create", "drop", "alter", "truncate", "comment", "sleep" };
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/SmsApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/SmsApiConstants.java
index d35dc69..ffab914 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/SmsApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/SmsApiConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.sms;
 
-public class SmsApiConstants {
+public final class SmsApiConstants {
+
+    private SmsApiConstants() {
+
+    }
 
     public static final String RESOURCE_NAME = "sms";
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/domain/SmsMessageEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/domain/SmsMessageEnumerations.java
index cc91d6f..0a12883 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/domain/SmsMessageEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/domain/SmsMessageEnumerations.java
@@ -20,7 +20,11 @@ package org.apache.fineract.infrastructure.sms.domain;
 
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
-public class SmsMessageEnumerations {
+public final class SmsMessageEnumerations {
+
+    private SmsMessageEnumerations() {
+
+    }
 
     public static EnumOptionData status(final Integer statusId) {
         return status(SmsMessageStatusType.fromInt(statusId));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/LikelihoodApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/LikelihoodApiConstants.java
index 6e0e5c3..a51441c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/LikelihoodApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/LikelihoodApiConstants.java
@@ -23,12 +23,16 @@ import java.util.HashSet;
 import java.util.Set;
 import org.apache.fineract.infrastructure.survey.data.LikelihoodStatus;
 
-public class LikelihoodApiConstants {
+public final class LikelihoodApiConstants {
+
+    private LikelihoodApiConstants() {
+
+    }
 
     public static final String ACTIVE = "active";
 
     public static final String LIKELIHOOD_RESOURCE_NAME = "likelihood";
 
-    protected static final Set<Long> VALID_LIKELIHOOD_ENABLED_VALUES = new HashSet<>(
+    static final Set<Long> VALID_LIKELIHOOD_ENABLED_VALUES = new HashSet<>(
             Arrays.asList(LikelihoodStatus.DISABLED, LikelihoodStatus.ENABLED));
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/PovertyLineApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/PovertyLineApiConstants.java
index 45ba445..c04fd08 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/PovertyLineApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/PovertyLineApiConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.infrastructure.survey.api;
 
-public class PovertyLineApiConstants {
+public final class PovertyLineApiConstants {
+
+    private PovertyLineApiConstants() {
+
+    }
 
     static final String POVERTY_LINE_RESOURCE_NAME = "PovertyLine";
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/SurveyApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/SurveyApiConstants.java
index 21ce9ca..5ffb354 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/SurveyApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/api/SurveyApiConstants.java
@@ -21,7 +21,11 @@ package org.apache.fineract.infrastructure.survey.api;
 /**
  * Created by Cieyou on 2/27/14.
  */
-public class SurveyApiConstants {
+public final class SurveyApiConstants {
+
+    private SurveyApiConstants() {
+
+    }
 
     static final String SURVEY_RESOURCE_NAME = "Survey";
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/LikelihoodStatus.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/LikelihoodStatus.java
index 468e2d1..0559093 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/LikelihoodStatus.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/survey/data/LikelihoodStatus.java
@@ -21,7 +21,11 @@ package org.apache.fineract.infrastructure.survey.data;
 /**
  * Created by Cieyou on 3/12/14.
  */
-public class LikelihoodStatus {
+public final class LikelihoodStatus {
+
+    private LikelihoodStatus() {
+
+    }
 
     public static final long ENABLED = 200;
     public static final long DISABLED = 100;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/interoperation/util/InteropUtil.java b/fineract-provider/src/main/java/org/apache/fineract/interoperation/util/InteropUtil.java
index d6dd0a7..9888f28 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/interoperation/util/InteropUtil.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/interoperation/util/InteropUtil.java
@@ -20,7 +20,11 @@ package org.apache.fineract.interoperation.util;
 
 import java.util.Locale;
 
-public class InteropUtil {
+public final class InteropUtil {
+
+    private InteropUtil() {
+
+    }
 
     public static final String ISO8601_DATE_TIME_FORMAT = "yyyy-MM-ddTHH:mm:ss.SSS[-HH:MM]";
     public static final String ISO8601_DATE_FORMAT = "yyyy-MM-dd";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/interoperation/util/MathUtil.java b/fineract-provider/src/main/java/org/apache/fineract/interoperation/util/MathUtil.java
index 84a570e..b3c822c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/interoperation/util/MathUtil.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/interoperation/util/MathUtil.java
@@ -25,7 +25,11 @@ import org.apache.fineract.organisation.monetary.domain.MonetaryCurrency;
 import org.apache.fineract.organisation.monetary.domain.Money;
 import org.apache.fineract.organisation.monetary.domain.MoneyHelper;
 
-public class MathUtil {
+public final class MathUtil {
+
+    private MathUtil() {
+
+    }
 
     public static Long nullToZero(Long value) {
         return nullToDefault(value, 0L);
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/api/HolidayApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/api/HolidayApiConstants.java
index 694417e..407fb0a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/api/HolidayApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/api/HolidayApiConstants.java
@@ -22,7 +22,11 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-public class HolidayApiConstants {
+public final class HolidayApiConstants {
+
+    private HolidayApiConstants() {
+
+    }
 
     public static final String HOLIDAY_RESOURCE_NAME = "holiday";
 
@@ -43,7 +47,6 @@ public class HolidayApiConstants {
     public static final String status = "status";
     public static final String reschedulingType = "reschedulingType";
 
-    protected static final Set<String> HOLIDAY_RESPONSE_DATA_PARAMETERS = new HashSet<>(
-            Arrays.asList(idParamName, nameParamName, fromDateParamName, descriptionParamName, toDateParamName,
-                    repaymentsRescheduledToParamName, localeParamName, dateFormatParamName, status));
+    static final Set<String> HOLIDAY_RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(idParamName, nameParamName, fromDateParamName,
+            descriptionParamName, toDateParamName, repaymentsRescheduledToParamName, localeParamName, dateFormatParamName, status));
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayEnumerations.java
index c28e8c1..76c6b48 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayEnumerations.java
@@ -22,7 +22,11 @@ import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 import org.apache.fineract.organisation.holiday.domain.HolidayStatusType;
 import org.apache.fineract.organisation.holiday.domain.RescheduleType;
 
-public class HolidayEnumerations {
+public final class HolidayEnumerations {
+
+    private HolidayEnumerations() {
+
+    }
 
     public static EnumOptionData holidayStatusType(final int id) {
         return holidayStatusType(HolidayStatusType.fromInt(id));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayUtil.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayUtil.java
index 52e3deb..ef45a4c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayUtil.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/holiday/service/HolidayUtil.java
@@ -23,7 +23,11 @@ import org.apache.fineract.organisation.holiday.domain.Holiday;
 import org.apache.fineract.organisation.workingdays.data.AdjustedDateDetailsDTO;
 import org.joda.time.LocalDate;
 
-public class HolidayUtil {
+public final class HolidayUtil {
+
+    private HolidayUtil() {
+
+    }
 
     public static LocalDate getRepaymentRescheduleDateToIfHoliday(LocalDate repaymentDate, final List<Holiday> holidays) {
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/domain/StaffEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/domain/StaffEnumerations.java
index 7c513b6..e2f8aa2 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/domain/StaffEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/staff/domain/StaffEnumerations.java
@@ -20,7 +20,11 @@ package org.apache.fineract.organisation.staff.domain;
 
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
-public class StaffEnumerations {
+public final class StaffEnumerations {
+
+    private StaffEnumerations() {
+
+    }
 
     public static EnumOptionData organisationalRole(final Integer id) {
         return organisationalRole(StaffOrganisationalRoleType.fromInt(id));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/api/WorkingDaysApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/api/WorkingDaysApiConstants.java
index 6bcc23b..0dee1d4 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/api/WorkingDaysApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/api/WorkingDaysApiConstants.java
@@ -22,7 +22,11 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-public class WorkingDaysApiConstants {
+public final class WorkingDaysApiConstants {
+
+    private WorkingDaysApiConstants() {
+
+    }
 
     public static final String WORKING_DAYS_RESOURCE_NAME = "workingdays";
 
@@ -38,8 +42,8 @@ public class WorkingDaysApiConstants {
     public static final String extendTermForDailyRepayments = "extendTermForDailyRepayments";
     public static final String extendTermForRepaymentsOnHolidays = "extendTermForRepaymentsOnHolidays";
 
-    protected static final Set<String> WORKING_DAYS_RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(idParamName, recurrence,
+    static final Set<String> WORKING_DAYS_RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(idParamName, recurrence,
             repayment_rescheduling_enum, extendTermForDailyRepayments, extendTermForRepaymentsOnHolidays));
 
-    protected static final Set<String> WORKING_DAYS_TEMPLATE_PARAMETERS = new HashSet<>(Arrays.asList(rescheduleRepaymentTemplate));
+    static final Set<String> WORKING_DAYS_TEMPLATE_PARAMETERS = new HashSet<>(Arrays.asList(rescheduleRepaymentTemplate));
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/domain/WorkingDaysEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/domain/WorkingDaysEnumerations.java
index 6da9080..e3f9606 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/domain/WorkingDaysEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/domain/WorkingDaysEnumerations.java
@@ -20,7 +20,11 @@ package org.apache.fineract.organisation.workingdays.domain;
 
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
-public class WorkingDaysEnumerations {
+public final class WorkingDaysEnumerations {
+
+    private WorkingDaysEnumerations() {
+
+    }
 
     public static EnumOptionData workingDaysStatusType(final int id) {
         return repaymentRescheduleType(RepaymentRescheduleType.fromInt(id));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysUtil.java b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysUtil.java
index a1f3f0d..3a1614e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysUtil.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/organisation/workingdays/service/WorkingDaysUtil.java
@@ -24,7 +24,11 @@ import org.apache.fineract.organisation.workingdays.domain.WorkingDays;
 import org.apache.fineract.portfolio.calendar.service.CalendarUtils;
 import org.joda.time.LocalDate;
 
-public class WorkingDaysUtil {
+public final class WorkingDaysUtil {
+
+    private WorkingDaysUtil() {
+
+    }
 
     public static LocalDate getOffSetDateIfNonWorkingDay(final LocalDate date, final LocalDate nextMeetingDate,
             final WorkingDays workingDays) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/AccountDetailConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/AccountDetailConstants.java
index 96f3c74..fe1109e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/AccountDetailConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/AccountDetailConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.portfolio.account;
 
-public class AccountDetailConstants {
+public final class AccountDetailConstants {
+
+    private AccountDetailConstants() {
+
+    }
 
     // general
     public static final String localeParamName = "locale";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiConstants.java
index 0a874b1..6df9241 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/AccountTransfersApiConstants.java
@@ -24,7 +24,11 @@ import java.util.Set;
 import org.apache.fineract.portfolio.account.AccountDetailConstants;
 import org.apache.fineract.portfolio.account.data.AccountTransferData;
 
-public class AccountTransfersApiConstants {
+public final class AccountTransfersApiConstants {
+
+    private AccountTransfersApiConstants() {
+
+    }
 
     public static final String ACCOUNT_TRANSFER_RESOURCE_NAME = "accounttransfer";
 
@@ -38,6 +42,6 @@ public class AccountTransfersApiConstants {
      * These parameters will match the class level parameters of {@link AccountTransferData}. Where possible, we try to
      * get response parameters to match those of request parameters.
      */
-    protected static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(
+    static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(
             Arrays.asList(AccountDetailConstants.idParamName, transferDescriptionParamName, currencyParamName));
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/StandingInstructionApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/StandingInstructionApiConstants.java
index 2f33abd..3684d6b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/StandingInstructionApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/api/StandingInstructionApiConstants.java
@@ -23,7 +23,11 @@ import java.util.HashSet;
 import java.util.Set;
 import org.apache.fineract.portfolio.account.AccountDetailConstants;
 
-public class StandingInstructionApiConstants {
+public final class StandingInstructionApiConstants {
+
+    private StandingInstructionApiConstants() {
+
+    }
 
     public static final String STANDING_INSTRUCTION_RESOURCE_NAME = "standinginstruction";
 
@@ -40,7 +44,7 @@ public class StandingInstructionApiConstants {
     public static final String recurrenceOnMonthDayParamName = "recurrenceOnMonthDay";
     public static final String monthDayFormatParamName = "monthDayFormat";
 
-    protected static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(
+    static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(
             Arrays.asList(AccountDetailConstants.idParamName, nameParamName, priorityParamName, instructionTypeParamName, statusParamName,
                     AccountDetailConstants.transferTypeParamName, validFromParamName, validTillParamName));
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountTransferEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountTransferEnumerations.java
index 8d690f4..14a3b09 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountTransferEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/account/service/AccountTransferEnumerations.java
@@ -26,7 +26,11 @@ import org.apache.fineract.portfolio.account.domain.StandingInstructionPriority;
 import org.apache.fineract.portfolio.account.domain.StandingInstructionStatus;
 import org.apache.fineract.portfolio.account.domain.StandingInstructionType;
 
-public class AccountTransferEnumerations {
+public final class AccountTransferEnumerations {
+
+    private AccountTransferEnumerations() {
+
+    }
 
     public static EnumOptionData accountType(final Integer type) {
         return accountType(PortfolioAccountType.fromInt(type));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountEnumerations.java
index 0cdb61d..9b946ce 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountEnumerations.java
@@ -21,7 +21,11 @@ package org.apache.fineract.portfolio.accountdetails.service;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 import org.apache.fineract.portfolio.accountdetails.domain.AccountType;
 
-public class AccountEnumerations {
+public final class AccountEnumerations {
+
+    private AccountEnumerations() {
+
+    }
 
     public static EnumOptionData loanType(final Integer loanTypeId) {
         return loanType(AccountType.fromInt(loanTypeId));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/CalendarConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/CalendarConstants.java
index cccbf8d..6152477 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/CalendarConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/CalendarConstants.java
@@ -21,7 +21,11 @@ package org.apache.fineract.portfolio.calendar;
 import java.util.HashSet;
 import java.util.Set;
 
-public class CalendarConstants {
+public final class CalendarConstants {
+
+    private CalendarConstants() {
+
+    }
 
     public static final String CALENDAR_RESOURCE_NAME = "calendar";
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarEnumerations.java
index c3ee39a..051417e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarEnumerations.java
@@ -29,7 +29,11 @@ import org.apache.fineract.portfolio.calendar.domain.CalendarType;
 import org.apache.fineract.portfolio.calendar.domain.CalendarWeekDaysType;
 import org.apache.fineract.portfolio.common.domain.NthDayType;
 
-public class CalendarEnumerations {
+public final class CalendarEnumerations {
+
+    private CalendarEnumerations() {
+
+    }
 
     public static EnumOptionData calendarEntityType(final int id) {
         return calendarEntityType(CalendarEntityType.fromInt(id));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java
index 6c29f1e..1f5f1ce 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java
@@ -54,7 +54,11 @@ import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class CalendarUtils {
+public final class CalendarUtils {
+
+    private CalendarUtils() {
+
+    }
 
     private static final Logger LOG = LoggerFactory.getLogger(CalendarUtils.class);
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/api/ChargesApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/api/ChargesApiConstants.java
index 7e3526e..bc9626a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/api/ChargesApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/api/ChargesApiConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.portfolio.charge.api;
 
-public class ChargesApiConstants {
+public final class ChargesApiConstants {
+
+    private ChargesApiConstants() {
+
+    }
 
     public static final String glAccountIdParamName = "incomeAccountId";
     public static final String taxGroupIdParamName = "taxGroupId";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeEnumerations.java
index 901771b..a8af2ad 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/charge/service/ChargeEnumerations.java
@@ -24,7 +24,11 @@ import org.apache.fineract.portfolio.charge.domain.ChargeCalculationType;
 import org.apache.fineract.portfolio.charge.domain.ChargePaymentMode;
 import org.apache.fineract.portfolio.charge.domain.ChargeTimeType;
 
-public class ChargeEnumerations {
+public final class ChargeEnumerations {
+
+    private ChargeEnumerations() {
+
+    }
 
     public static EnumOptionData chargeTimeType(final int id) {
         return chargeTimeType(ChargeTimeType.fromInt(id));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientApiConstants.java
index bbafa49..6d07976 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientApiConstants.java
@@ -23,6 +23,7 @@ import java.util.HashSet;
 import java.util.Set;
 import org.apache.fineract.portfolio.client.data.ClientData;
 
+@SuppressWarnings({ "HideUtilityClassConstructor" })
 public class ClientApiConstants {
 
     public static final String CLIENT_RESOURCE_NAME = "client";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientEnumerations.java
index 96b1786..32e4cee 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientEnumerations.java
@@ -22,7 +22,11 @@ import java.util.ArrayList;
 import java.util.List;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
-public class ClientEnumerations {
+public final class ClientEnumerations {
+
+    private ClientEnumerations() {
+
+    }
 
     public static EnumOptionData status(final Integer statusId) {
         return status(ClientStatus.fromInt(statusId));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralApiConstants.java
index 0af11c8..51a1194 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collateral/api/CollateralApiConstants.java
@@ -21,7 +21,11 @@ package org.apache.fineract.portfolio.collateral.api;
 import java.util.HashSet;
 import java.util.Set;
 
-public class CollateralApiConstants {
+public final class CollateralApiConstants {
+
+    private CollateralApiConstants() {
+
+    }
 
     public static final String COLLATERAL_CODE_NAME = "LoanCollateral";
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/CollectionSheetConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/CollectionSheetConstants.java
index 8d23cb8..2b6af30 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/CollectionSheetConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/CollectionSheetConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.portfolio.collectionsheet;
 
-public class CollectionSheetConstants {
+public final class CollectionSheetConstants {
+
+    private CollectionSheetConstants() {
+
+    }
 
     public static final String COLLECTIONSHEET_RESOURCE_NAME = "collectionsheet";
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/service/CommonEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/service/CommonEnumerations.java
index 7e2967e..61a0b93 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/service/CommonEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/common/service/CommonEnumerations.java
@@ -26,7 +26,11 @@ import org.apache.fineract.portfolio.common.domain.DaysInMonthType;
 import org.apache.fineract.portfolio.common.domain.DaysInYearType;
 import org.apache.fineract.portfolio.common.domain.PeriodFrequencyType;
 
-public class CommonEnumerations {
+public final class CommonEnumerations {
+
+    private CommonEnumerations() {
+
+    }
 
     public static final String DAYS_IN_MONTH_TYPE = "daysInMonthType";
     public static final String DAYS_IN_YEAR_TYPE = "daysInYearType";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/GroupingTypesApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/GroupingTypesApiConstants.java
index 34e55c2..47d848a 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/GroupingTypesApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/api/GroupingTypesApiConstants.java
@@ -23,7 +23,11 @@ import java.util.HashSet;
 import java.util.Set;
 import org.apache.fineract.portfolio.group.data.CenterData;
 
-public class GroupingTypesApiConstants {
+public final class GroupingTypesApiConstants {
+
+    private GroupingTypesApiConstants() {
+
+    }
 
     public static final String CENTER_RESOURCE_NAME = "center";
     public static final String GROUP_RESOURCE_NAME = "group";
@@ -92,22 +96,22 @@ public class GroupingTypesApiConstants {
      * These parameters will match the class level parameters of {@link CenterData}. Where possible, we try to get
      * response parameters to match those of request parameters.
      */
-    protected static final Set<String> CENTER_RESPONSE_DATA_PARAMETERS = new HashSet<>(
+    static final Set<String> CENTER_RESPONSE_DATA_PARAMETERS = new HashSet<>(
             Arrays.asList(idParamName, nameParamName, externalIdParamName, officeIdParamName, officeNameParamName, staffIdParamName,
                     staffNameParamName, hierarchyParamName, officeOptionsParamName, staffOptionsParamName, statusParamName, activeParamName,
                     activationDateParamName, timeLine, groupMembersParamName, collectionMeetingCalendar, closureReasons, datatables));
 
-    protected static final Set<String> CENTER_GROUP_RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(idParamName, nameParamName,
+    static final Set<String> CENTER_GROUP_RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(idParamName, nameParamName,
             externalIdParamName, officeIdParamName, officeNameParamName, staffIdParamName, staffNameParamName, hierarchyParamName,
             officeOptionsParamName, staffOptionsParamName, clientOptionsParamName, datatables));
 
-    protected static final Set<String> GROUP_RESPONSE_DATA_PARAMETERS = new HashSet<>(
+    static final Set<String> GROUP_RESPONSE_DATA_PARAMETERS = new HashSet<>(
             Arrays.asList(idParamName, nameParamName, externalIdParamName, officeIdParamName, officeNameParamName, "parentId", "parentName",
                     staffIdParamName, staffNameParamName, hierarchyParamName, officeOptionsParamName, statusParamName, activeParamName,
                     activationDateParamName, staffOptionsParamName, clientOptionsParamName, timeLine, datatables));
 
-    protected static final Set<String> COLLECTIONSHEET_DATA_PARAMETERS = new HashSet<>(Arrays.asList("dueDate", "loanProducts", "groups"));
+    static final Set<String> COLLECTIONSHEET_DATA_PARAMETERS = new HashSet<>(Arrays.asList("dueDate", "loanProducts", "groups"));
 
-    protected static final Set<String> STAFF_CENTER_RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(staffIdParamName,
-            staffNameParamName, meetingFallCenters, totalCollected, totalOverdue, totaldue, installmentDue));
+    static final Set<String> STAFF_CENTER_RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(staffIdParamName, staffNameParamName,
+            meetingFallCenters, totalCollected, totalOverdue, totaldue, installmentDue));
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupingTypeEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupingTypeEnumerations.java
index 69bb51b..6b31c51 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupingTypeEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/GroupingTypeEnumerations.java
@@ -20,7 +20,11 @@ package org.apache.fineract.portfolio.group.domain;
 
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 
-public class GroupingTypeEnumerations {
+public final class GroupingTypeEnumerations {
+
+    private GroupingTypeEnumerations() {
+
+    }
 
     public static EnumOptionData status(final Integer statusId) {
         return status(GroupingTypeStatus.fromInt(statusId));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupTypeEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupTypeEnumerations.java
index 2201828..b801533 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupTypeEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/service/GroupTypeEnumerations.java
@@ -21,7 +21,11 @@ package org.apache.fineract.portfolio.group.service;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 import org.apache.fineract.portfolio.group.domain.GroupTypes;
 
-public class GroupTypeEnumerations {
+public final class GroupTypeEnumerations {
+
+    private GroupTypeEnumerations() {
+
+    }
 
     public static EnumOptionData groupType(final Integer id) {
         return groupType(GroupTypes.fromInt(id));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/InterestRateChartApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/InterestRateChartApiConstants.java
index ed5583f..a240e08 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/InterestRateChartApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/InterestRateChartApiConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.portfolio.interestratechart;
 
-public class InterestRateChartApiConstants {
+public final class InterestRateChartApiConstants {
+
+    private InterestRateChartApiConstants() {
+
+    }
 
     public static final String INTERESTRATE_CHART_RESOURCE_NAME = "interestchart";
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/InterestRateChartSlabApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/InterestRateChartSlabApiConstants.java
index 3fb2627..1545163 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/InterestRateChartSlabApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/InterestRateChartSlabApiConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.portfolio.interestratechart;
 
-public class InterestRateChartSlabApiConstants {
+public final class InterestRateChartSlabApiConstants {
+
+    private InterestRateChartSlabApiConstants() {
+
+    }
 
     public static final String INTERESTRATE_CHART_SLAB_RESOURCE_NAME = "chartslab";
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/AttributeIncentiveCalculationFactory.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/AttributeIncentiveCalculationFactory.java
index 0e9652e..0a5c6df 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/AttributeIncentiveCalculationFactory.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/incentive/AttributeIncentiveCalculationFactory.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.portfolio.interestratechart.incentive;
 
-public class AttributeIncentiveCalculationFactory {
+public final class AttributeIncentiveCalculationFactory {
+
+    private AttributeIncentiveCalculationFactory() {
+
+    }
 
     public static AttributeIncentiveCalculation findAttributeIncentiveCalculation(InterestIncentiveEntityType entityType) {
         AttributeIncentiveCalculation attributeIncentiveCalculation = null;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestIncentivesEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestIncentivesEnumerations.java
index 28932af..33058e0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestIncentivesEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestIncentivesEnumerations.java
@@ -25,7 +25,11 @@ import org.apache.fineract.portfolio.interestratechart.incentive.InterestIncenti
 import org.apache.fineract.portfolio.interestratechart.incentive.InterestIncentiveEntityType;
 import org.apache.fineract.portfolio.interestratechart.incentive.InterestIncentiveType;
 
-public class InterestIncentivesEnumerations {
+public final class InterestIncentivesEnumerations {
+
+    private InterestIncentivesEnumerations() {
+
+    }
 
     public static EnumOptionData attributeName(final Integer attributeName) {
         return attributeName(InterestIncentiveAttributeName.fromInt(attributeName));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartEnumerations.java
index bf03017..f16f8e8 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/interestratechart/service/InterestRateChartEnumerations.java
@@ -25,7 +25,11 @@ import org.apache.fineract.portfolio.common.domain.PeriodFrequencyType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class InterestRateChartEnumerations {
+public final class InterestRateChartEnumerations {
+
+    private InterestRateChartEnumerations() {
+
+    }
 
     private static final Logger LOG = LoggerFactory.getLogger(InterestRateChartEnumerations.class);
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/GuarantorConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/GuarantorConstants.java
index c0a3860..7a27685 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/GuarantorConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/GuarantorConstants.java
@@ -21,7 +21,11 @@ package org.apache.fineract.portfolio.loanaccount.guarantor;
 import java.util.HashSet;
 import java.util.Set;
 
-public class GuarantorConstants {
+public final class GuarantorConstants {
+
+    private GuarantorConstants() {
+
+    }
 
     public static final String GUARANTOR_RELATIONSHIP_CODE_NAME = "GuarantorRelationship";
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorEnumerations.java
index 285c106..ac7cff2 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/service/GuarantorEnumerations.java
@@ -24,7 +24,11 @@ import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 import org.apache.fineract.portfolio.loanaccount.guarantor.domain.GuarantorFundStatusType;
 import org.apache.fineract.portfolio.loanaccount.guarantor.domain.GuarantorType;
 
-public class GuarantorEnumerations {
+public final class GuarantorEnumerations {
+
+    private GuarantorEnumerations() {
+
+    }
 
     public static EnumOptionData guarantorType(final int id) {
         return guarantorType(GuarantorType.fromInt(id));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/FinanicalFunctions.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/FinanicalFunctions.java
index 54c2cd2..8813b09 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/FinanicalFunctions.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/loanschedule/domain/FinanicalFunctions.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.portfolio.loanaccount.loanschedule.domain;
 
-public class FinanicalFunctions {
+public final class FinanicalFunctions {
+
+    private FinanicalFunctions() {
+
+    }
 
     /**
      * PMT calculates a fixed monthly payment to be paid by borrower every 'period' to ensure loan is paid off in full
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/RescheduleLoansApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/RescheduleLoansApiConstants.java
index b871536..73163d1 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/RescheduleLoansApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/RescheduleLoansApiConstants.java
@@ -23,7 +23,11 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-public class RescheduleLoansApiConstants {
+public final class RescheduleLoansApiConstants {
+
+    private RescheduleLoansApiConstants() {
+
+    }
 
     public static final String ENTITY_NAME = "RESCHEDULELOAN";
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/data/LoanRescheduleRequestEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/data/LoanRescheduleRequestEnumerations.java
index 82994d3..77a8183 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/data/LoanRescheduleRequestEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/data/LoanRescheduleRequestEnumerations.java
@@ -21,7 +21,11 @@ package org.apache.fineract.portfolio.loanaccount.rescheduleloan.data;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 import org.apache.fineract.portfolio.loanaccount.domain.LoanStatus;
 
-public class LoanRescheduleRequestEnumerations {
+public final class LoanRescheduleRequestEnumerations {
+
+    private LoanRescheduleRequestEnumerations() {
+
+    }
 
     public static EnumOptionData status(final LoanRescheduleRequestStatusEnumData status) {
         Long id = status.id();
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LendingStrategyEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LendingStrategyEnumerations.java
index 98c79dd..ae99839 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LendingStrategyEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LendingStrategyEnumerations.java
@@ -21,7 +21,11 @@ package org.apache.fineract.portfolio.loanproduct.service;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 import org.apache.fineract.portfolio.loanproduct.domain.LendingStrategy;
 
-public class LendingStrategyEnumerations {
+public final class LendingStrategyEnumerations {
+
+    private LendingStrategyEnumerations() {
+
+    }
 
     public static EnumOptionData lendingStrategy(final Integer id) {
         return lendingStrategy(LendingStrategy.fromInt(id));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanEnumerations.java
index 95dc33c..e2f8e52 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanEnumerations.java
@@ -39,7 +39,11 @@ import org.apache.fineract.portfolio.loanproduct.domain.LoanProductValueConditio
 import org.apache.fineract.portfolio.loanproduct.domain.LoanRescheduleStrategyMethod;
 import org.apache.fineract.portfolio.loanproduct.domain.RecalculationFrequencyType;
 
-public class LoanEnumerations {
+public final class LoanEnumerations {
+
+    private LoanEnumerations() {
+
+    }
 
     public static final String LOAN_TERM_FREQUENCY_TYPE = "loanTermFrequencyType";
     public static final String TERM_FREQUENCY_TYPE = "termFrequencyType";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/MeetingApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/MeetingApiConstants.java
index 2b95eff..c395b05 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/MeetingApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/MeetingApiConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.portfolio.meeting;
 
-public class MeetingApiConstants {
+public final class MeetingApiConstants {
+
+    private MeetingApiConstants() {
+
+    }
 
     public static final String MEETING_RESOURCE_NAME = "meeting";
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/attendance/service/AttendanceEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/attendance/service/AttendanceEnumerations.java
index 118ea92..0f90025 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/attendance/service/AttendanceEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/meeting/attendance/service/AttendanceEnumerations.java
@@ -23,7 +23,11 @@ import java.util.List;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 import org.apache.fineract.portfolio.meeting.attendance.AttendanceType;
 
-public class AttendanceEnumerations {
+public final class AttendanceEnumerations {
+
+    private AttendanceEnumerations() {
+
+    }
 
     public static EnumOptionData attendanceType(final int attendanceType) {
         return attendanceType(AttendanceType.fromInt(attendanceType));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteEnumerations.java
index 6b559ea..6661f09 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteEnumerations.java
@@ -21,7 +21,11 @@ package org.apache.fineract.portfolio.note.service;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 import org.apache.fineract.portfolio.note.domain.NoteType;
 
-public class NoteEnumerations {
+public final class NoteEnumerations {
+
+    private NoteEnumerations() {
+
+    }
 
     public static EnumOptionData noteType(final Integer id) {
         return noteType(NoteType.fromInt(id));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymentdetail/PaymentDetailConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymentdetail/PaymentDetailConstants.java
index 9605e38..8bcbe11 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymentdetail/PaymentDetailConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymentdetail/PaymentDetailConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.portfolio.paymentdetail;
 
-public class PaymentDetailConstants {
+public final class PaymentDetailConstants {
+
+    private PaymentDetailConstants() {
+
+    }
 
     // Code representing Payment Details
     public static final String paymentTypeCodeName = "PaymentType";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResourceConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResourceConstants.java
index e34f2ca..8d84409 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResourceConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/paymenttype/api/PaymentTypeApiResourceConstants.java
@@ -22,7 +22,11 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-public class PaymentTypeApiResourceConstants {
+public final class PaymentTypeApiResourceConstants {
+
+    private PaymentTypeApiResourceConstants() {
+
+    }
 
     public static final String RESOURCE_NAME = "paymenttype";
     public static final String ENTITY_NAME = "PAYMENTTYPE";
@@ -34,5 +38,5 @@ public class PaymentTypeApiResourceConstants {
     public static final String ISCASHPAYMENT = "isCashPayment";
     public static final String POSITION = "position";
 
-    protected static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(ID, NAME, DESCRIPTION, ISCASHPAYMENT));
+    static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(ID, NAME, DESCRIPTION, ISCASHPAYMENT));
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/api/RateApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/api/RateApiConstants.java
index d3b1f64..e77e1a0 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/api/RateApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/api/RateApiConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.portfolio.rate.api;
 
-public class RateApiConstants {
+public final class RateApiConstants {
+
+    private RateApiConstants() {
+
+    }
 
     public static final String approveUserIdParamName = "approveUserId";
     public static final String rate = "rate";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateEnumerations.java
index 6513c16..041fcc7 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/service/RateEnumerations.java
@@ -22,7 +22,11 @@ package org.apache.fineract.portfolio.rate.service;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 import org.apache.fineract.portfolio.rate.domain.RateAppliesTo;
 
-public class RateEnumerations {
+public final class RateEnumerations {
+
+    private RateEnumerations() {
+
+    }
 
     public static EnumOptionData rateAppliesTo(final int id) {
         return rateAppliesTo(RateAppliesTo.fromInt(id));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/DepositAccountUtils.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/DepositAccountUtils.java
index 62e75fa..d3c3a86 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/DepositAccountUtils.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/DepositAccountUtils.java
@@ -25,7 +25,11 @@ import org.joda.time.LocalDate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class DepositAccountUtils {
+public final class DepositAccountUtils {
+
+    private DepositAccountUtils() {
+
+    }
 
     private static final Logger LOG = LoggerFactory.getLogger(DepositAccountUtils.class);
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/DepositsApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/DepositsApiConstants.java
index d5af5f8..517003b 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/DepositsApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/DepositsApiConstants.java
@@ -23,7 +23,11 @@ import java.util.HashSet;
 import java.util.Set;
 import org.apache.fineract.accounting.common.AccountingConstants.SavingProductAccountingParams;
 
-public class DepositsApiConstants {
+public final class DepositsApiConstants {
+
+    private DepositsApiConstants() {
+
+    }
 
     // Deposit products
     public static final String FIXED_DEPOSIT_PRODUCT_RESOURCE_NAME = "fixeddeposit";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsApiConstants.java
index 68f3127..8f2e884 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/SavingsApiConstants.java
@@ -18,6 +18,7 @@
  */
 package org.apache.fineract.portfolio.savings;
 
+@SuppressWarnings({ "HideUtilityClassConstructor" })
 public class SavingsApiConstants {
 
     public static final String SAVINGS_PRODUCT_RESOURCE_NAME = "savingsproduct";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsEnumerations.java
index 0bdb032..2c5ca04 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsEnumerations.java
@@ -40,7 +40,11 @@ import org.apache.fineract.portfolio.savings.data.SavingsAccountTransactionEnumD
 import org.apache.fineract.portfolio.savings.domain.SavingsAccountStatusType;
 import org.apache.fineract.portfolio.savings.domain.SavingsAccountSubStatusEnum;
 
-public class SavingsEnumerations {
+public final class SavingsEnumerations {
+
+    private SavingsEnumerations() {
+
+    }
 
     public static final String INTEREST_COMPOUNDING_PERIOD_TYPE = "interestCompoundingPeriodType";
     public static final String INTEREST_POSTING_PERIOD_TYPE = "interestPostingPeriodType";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/SelfServiceApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/SelfServiceApiConstants.java
index 03d6ded..eab8681 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/SelfServiceApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/registration/SelfServiceApiConstants.java
@@ -24,7 +24,11 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-public class SelfServiceApiConstants {
+public final class SelfServiceApiConstants {
+
+    private SelfServiceApiConstants() {
+
+    }
 
     public static final String accountNumberParamName = "accountNumber";
     public static final String passwordParamName = "password";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/savings/data/SelfSavingsAccountConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/savings/data/SelfSavingsAccountConstants.java
index 326c021..f2cc834 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/savings/data/SelfSavingsAccountConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/self/savings/data/SelfSavingsAccountConstants.java
@@ -19,7 +19,11 @@
 
 package org.apache.fineract.portfolio.self.savings.data;
 
-public class SelfSavingsAccountConstants {
+public final class SelfSavingsAccountConstants {
+
+    private SelfSavingsAccountConstants() {
+
+    }
 
     public static final String savingsAccountResource = "savings";
     public static final String clientIdParameterName = "clientId";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/SharesEnumerations.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/SharesEnumerations.java
index 3779e53..596d93f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/SharesEnumerations.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/shareaccounts/service/SharesEnumerations.java
@@ -26,7 +26,11 @@ import org.apache.fineract.portfolio.shareaccounts.domain.ShareAccountStatusType
 import org.apache.fineract.portfolio.shareproducts.SharePeriodFrequencyType;
 import org.apache.fineract.portfolio.shareproducts.domain.ShareProductDividendStatusType;
 
-public class SharesEnumerations {
+public final class SharesEnumerations {
+
+    private SharesEnumerations() {
+
+    }
 
     public static ShareAccountStatusEnumData status(final Integer statusEnum) {
         return status(ShareAccountStatusType.fromInt(statusEnum));
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/service/TaxUtils.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/service/TaxUtils.java
index 2f70f9e..52ea65f 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/service/TaxUtils.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/tax/service/TaxUtils.java
@@ -28,7 +28,11 @@ import org.apache.fineract.portfolio.tax.domain.TaxComponent;
 import org.apache.fineract.portfolio.tax.domain.TaxGroupMappings;
 import org.joda.time.LocalDate;
 
-public class TaxUtils {
+public final class TaxUtils {
+
+    private TaxUtils() {
+
+    }
 
     public static Map<TaxComponent, BigDecimal> splitTax(final BigDecimal amount, final LocalDate date,
             final Set<TaxGroupMappings> taxGroupMappings, final int scale) {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/transfer/api/TransferApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/transfer/api/TransferApiConstants.java
index 5f73e2d..46bf811 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/transfer/api/TransferApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/transfer/api/TransferApiConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.portfolio.transfer.api;
 
-public class TransferApiConstants {
+public final class TransferApiConstants {
+
+    private TransferApiConstants() {
+
+    }
 
     // general
     public static final String localeParamName = "locale";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/spm/util/SurveyApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/spm/util/SurveyApiConstants.java
index 25733ee..ef6c84c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/spm/util/SurveyApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/spm/util/SurveyApiConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.spm.util;
 
-public class SurveyApiConstants {
+public final class SurveyApiConstants {
+
+    private SurveyApiConstants() {
+
+    }
 
     public static final String SURVEY_RESOURCE_NAME = "survey";
     public static final String keyParamName = "key";
diff --git a/fineract-provider/src/main/java/org/apache/fineract/template/domain/TemplateFunctions.java b/fineract-provider/src/main/java/org/apache/fineract/template/domain/TemplateFunctions.java
index 76a66ee..5a37bac 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/template/domain/TemplateFunctions.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/template/domain/TemplateFunctions.java
@@ -22,6 +22,7 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+@SuppressWarnings({ "HideUtilityClassConstructor" })
 public class TemplateFunctions {
 
     public static String now() {
diff --git a/fineract-provider/src/main/java/org/apache/fineract/template/service/TrustModifier.java b/fineract-provider/src/main/java/org/apache/fineract/template/service/TrustModifier.java
index c9c6c23..e9f3e6e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/template/service/TrustModifier.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/template/service/TrustModifier.java
@@ -33,7 +33,11 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
 @SuppressWarnings("unused")
-public class TrustModifier {
+public final class TrustModifier {
+
+    private TrustModifier() {
+
+    }
 
     private static final TrustingHostnameVerifier TRUSTING_HOSTNAME_VERIFIER = new TrustingHostnameVerifier();
     private static SSLSocketFactory factory;
diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/AppUserApiConstant.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/AppUserApiConstant.java
index f1f05b7..7c9862c 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/AppUserApiConstant.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/AppUserApiConstant.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.useradministration.api;
 
-public class AppUserApiConstant {
+public final class AppUserApiConstant {
+
+    private AppUserApiConstant() {
+
+    }
 
     public static final int numberOfPreviousPasswords = 3;
 
diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/PasswordPreferencesApiConstants.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/PasswordPreferencesApiConstants.java
index c74887a..4dd9ed8 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/PasswordPreferencesApiConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/api/PasswordPreferencesApiConstants.java
@@ -22,7 +22,11 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
-public class PasswordPreferencesApiConstants {
+public final class PasswordPreferencesApiConstants {
+
+    private PasswordPreferencesApiConstants() {
+
+    }
 
     public static final String RESOURCE_NAME = "passwordpreferences";
     public static final String ENTITY_NAME = "PASSWORD_PREFERENCES";
@@ -37,6 +41,6 @@ public class PasswordPreferencesApiConstants {
     // request parameters
     public static final String VALIDATION_POLICY_ID = "validationPolicyId";
 
-    protected static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(ID_PARAM_NAME, ACTIVE, DESCRIPTION));
+    static final Set<String> RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(ID_PARAM_NAME, ACTIVE, DESCRIPTION));
 
 }
diff --git a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/AppUserConstants.java b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/AppUserConstants.java
index f54e6f7..0bb0cca 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/AppUserConstants.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/useradministration/service/AppUserConstants.java
@@ -18,7 +18,11 @@
  */
 package org.apache.fineract.useradministration.service;
 
-public class AppUserConstants {
+public final class AppUserConstants {
+
+    private AppUserConstants() {
+
+    }
 
     public static final String PASSWORD_NEVER_EXPIRES = "passwordNeverExpires";
     public static final String IS_SELF_SERVICE_USER = "isSelfServiceUser";
diff --git a/fineract-provider/src/test/java/org/apache/fineract/common/Utils.java b/fineract-provider/src/test/java/org/apache/fineract/common/Utils.java
index 22c2d41..73556a5 100644
--- a/fineract-provider/src/test/java/org/apache/fineract/common/Utils.java
+++ b/fineract-provider/src/test/java/org/apache/fineract/common/Utils.java
@@ -38,7 +38,11 @@ import org.slf4j.LoggerFactory;
  * eventually do completely away with src/integrationTest and have only src/test.. can you help? ;)
  */
 @SuppressWarnings("unchecked")
-public class Utils {
+public final class Utils {
+
+    private Utils() {
+
+    }
 
     private static final Logger LOG = LoggerFactory.getLogger(Utils.class);
     public static final String TENANT_IDENTIFIER = "tenantIdentifier=default";
diff --git a/fineract-provider/src/test/java/org/apache/fineract/portfolio/loanaccount/LoanProductRelatedDetailTestHelper.java b/fineract-provider/src/test/java/org/apache/fineract/portfolio/loanaccount/LoanProductRelatedDetailTestHelper.java
index 2732359..6341321 100644
--- a/fineract-provider/src/test/java/org/apache/fineract/portfolio/loanaccount/LoanProductRelatedDetailTestHelper.java
+++ b/fineract-provider/src/test/java/org/apache/fineract/portfolio/loanaccount/LoanProductRelatedDetailTestHelper.java
@@ -33,7 +33,11 @@ import org.apache.fineract.portfolio.loanproduct.domain.LoanProductRelatedDetail
  * This class is used to keep in one place configurations for setting up {@link LoanProductRelatedDetail} object used in
  * {@link LoanScheduleGenerator} 's
  */
-public class LoanProductRelatedDetailTestHelper {
+public final class LoanProductRelatedDetailTestHelper {
+
+    private LoanProductRelatedDetailTestHelper() {
+
+    }
 
     public static LoanProductRelatedDetail createSettingsForEqualPrincipalAmortizationQuarterly() {
 
diff --git a/fineract-provider/src/test/java/org/apache/fineract/portfolio/loanaccount/LoanScheduleTestDataHelper.java b/fineract-provider/src/test/java/org/apache/fineract/portfolio/loanaccount/LoanScheduleTestDataHelper.java
index 8733579..fb3ccec 100644
--- a/fineract-provider/src/test/java/org/apache/fineract/portfolio/loanaccount/LoanScheduleTestDataHelper.java
+++ b/fineract-provider/src/test/java/org/apache/fineract/portfolio/loanaccount/LoanScheduleTestDataHelper.java
@@ -27,7 +27,11 @@ import org.joda.time.LocalDate;
 /**
  * Helper class for creating loan schedule data suitable for testing.
  */
-public class LoanScheduleTestDataHelper {
+public final class LoanScheduleTestDataHelper {
+
+    private LoanScheduleTestDataHelper() {
+
+    }
 
     /**
      * Creates brand new three installment loan: