From 98894d1f2139fbd559628ffa816ac0f898656c76 Mon Sep 17 00:00:00 2001 From: a7med3del1973 Date: Thu, 17 Apr 2025 10:06:50 +0200 Subject: [PATCH] FINERACT-2181: Refactor constants to follow naming convention --- .../FinancialActivityAccountsApiResource.java | 6 +++--- .../api/FinancialActivityAccountsConstants.java | 16 ++++++++-------- ...teFinancialActivityAccountFoundException.java | 6 +++--- ...FinancialActivityAccountInvalidException.java | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResource.java b/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResource.java index 4a35cf53d..41adc66c3 100644 --- a/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResource.java +++ b/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsApiResource.java @@ -79,7 +79,7 @@ public class FinancialActivityAccountsApiResource { @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) public FinancialActivityAccountData retrieveTemplate() { - context.authenticatedUser().validateHasReadPermission(FinancialActivityAccountsConstants.resourceNameForPermission); + context.authenticatedUser().validateHasReadPermission(FinancialActivityAccountsConstants.RESOURCE_NAME_FOR_PERMISSION); return financialActivityAccountReadPlatformService.getFinancialActivityAccountTemplate(); } @@ -91,7 +91,7 @@ public class FinancialActivityAccountsApiResource { financialactivityaccounts""") @ApiResponse(responseCode = "200", description = "OK", content = @Content(array = @ArraySchema(schema = @Schema(implementation = FinancialActivityAccountsApiResourceSwagger.GetFinancialActivityAccountsResponse.class)))) public List retrieveAll() { - context.authenticatedUser().validateHasReadPermission(FinancialActivityAccountsConstants.resourceNameForPermission); + context.authenticatedUser().validateHasReadPermission(FinancialActivityAccountsConstants.RESOURCE_NAME_FOR_PERMISSION); return financialActivityAccountReadPlatformService.retrieveAll(); } @@ -105,7 +105,7 @@ public class FinancialActivityAccountsApiResource { @ApiResponse(responseCode = "200", description = "OK", content = @Content(schema = @Schema(implementation = FinancialActivityAccountsApiResourceSwagger.GetFinancialActivityAccountsResponse.class))) public FinancialActivityAccountData retreive(@PathParam("mappingId") @Parameter(description = "mappingId") final Long mappingId, @Context final UriInfo uriInfo) { - context.authenticatedUser().validateHasReadPermission(FinancialActivityAccountsConstants.resourceNameForPermission); + context.authenticatedUser().validateHasReadPermission(FinancialActivityAccountsConstants.RESOURCE_NAME_FOR_PERMISSION); final ApiRequestJsonSerializationSettings settings = apiRequestParameterHelper.process(uriInfo.getQueryParameters()); FinancialActivityAccountData financialActivityAccountData = financialActivityAccountReadPlatformService.retrieve(mappingId); diff --git a/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsConstants.java b/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsConstants.java index 0e2d67419..bc915b3f4 100644 --- a/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsConstants.java +++ b/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/api/FinancialActivityAccountsConstants.java @@ -28,12 +28,12 @@ public final class FinancialActivityAccountsConstants { } - private static final String idParamName = "id"; - private static final String factivityDataParamName = "financialActivityData"; - private static final String glAccountDataParamName = "glAccountData"; - private static final String glAccountOptionsParamName = "glAccountOptions"; - private static final String financialActivityOptionsParamName = "financialActivityOptions"; - public static final String resourceNameForPermission = "FINANCIALACTIVITYACCOUNT"; - static final Set RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(idParamName, factivityDataParamName, - glAccountDataParamName, glAccountOptionsParamName, financialActivityOptionsParamName)); + private static final String ID_PARAM_NAME = "id"; + private static final String FINANCIAL_ACTIVITY_DATA_PARAM_NAME = "financialActivityData"; + private static final String GL_ACCOUNT_DATA_PARAM_NAME = "glAccountData"; + private static final String GL_ACCOUNT_OPTIONS_PARAM_NAME = "glAccountOptions"; + private static final String FINANCIAL_ACTIVITY_OPTIONS_PARAM_NAME = "financialActivityOptions"; + public static final String RESOURCE_NAME_FOR_PERMISSION = "FINANCIALACTIVITYACCOUNT"; + static final Set RESPONSE_DATA_PARAMETERS = new HashSet<>(Arrays.asList(ID_PARAM_NAME, FINANCIAL_ACTIVITY_DATA_PARAM_NAME, + GL_ACCOUNT_DATA_PARAM_NAME, GL_ACCOUNT_OPTIONS_PARAM_NAME, FINANCIAL_ACTIVITY_OPTIONS_PARAM_NAME)); } diff --git a/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/DuplicateFinancialActivityAccountFoundException.java b/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/DuplicateFinancialActivityAccountFoundException.java index c88139fed..a83b920a1 100644 --- a/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/DuplicateFinancialActivityAccountFoundException.java +++ b/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/DuplicateFinancialActivityAccountFoundException.java @@ -25,14 +25,14 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR */ public class DuplicateFinancialActivityAccountFoundException extends AbstractPlatformDomainRuleException { - private static final String errorCode = "error.msg.financialActivityAccount.exists"; + private static final String ERROR_CODE = "error.msg.financialActivityAccount.exists"; public DuplicateFinancialActivityAccountFoundException(final Integer financialActivityType) { - super(errorCode, "Mapping for activity already exists " + financialActivityType, financialActivityType); + super(ERROR_CODE, "Mapping for activity already exists " + financialActivityType, financialActivityType); } public static String getErrorcode() { - return errorCode; + return ERROR_CODE; } } diff --git a/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/FinancialActivityAccountInvalidException.java b/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/FinancialActivityAccountInvalidException.java index 5b4431a55..384b48d1a 100644 --- a/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/FinancialActivityAccountInvalidException.java +++ b/fineract-accounting/src/main/java/org/apache/fineract/accounting/financialactivityaccount/exception/FinancialActivityAccountInvalidException.java @@ -27,10 +27,10 @@ import org.apache.fineract.infrastructure.core.exception.AbstractPlatformDomainR */ public class FinancialActivityAccountInvalidException extends AbstractPlatformDomainRuleException { - private static final String errorCode = "error.msg.financialActivityAccount.invalid"; + private static final String ERROR_CODE = "error.msg.financialActivityAccount.invalid"; public FinancialActivityAccountInvalidException(final FinancialActivity financialActivity, final GLAccount glAccount) { - super(errorCode, + super(ERROR_CODE, "Financial Activity '" + financialActivity.getCode() + "' with Id :" + financialActivity.getValue() + "' can only be associated with a Ledger Account of Type " + financialActivity.getMappedGLAccountType().getCode() + " the provided Ledger Account '" + glAccount.getName() + "(" + glAccount.getGlCode() @@ -40,6 +40,6 @@ public class FinancialActivityAccountInvalidException extends AbstractPlatformDo } public static String getErrorcode() { - return errorCode; + return ERROR_CODE; } }