From d00d978c46df9dfab02cb804393e29ab40f971e1 Mon Sep 17 00:00:00 2001 From: Manthan Surkar Date: Sat, 15 Aug 2020 01:58:00 +0530 Subject: [PATCH] Removed duplicate status values to check status parameter validity --- .../client/service/ClientReadPlatformServiceImpl.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientReadPlatformServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientReadPlatformServiceImpl.java index d2957868d..cddd2c5a6 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientReadPlatformServiceImpl.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientReadPlatformServiceImpl.java @@ -92,8 +92,6 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService private final ConfigurationReadPlatformService configurationReadPlatformService; private final EntityDatatableChecksReadService entityDatatableChecksReadService; private final ColumnValidator columnValidator; - private final List supportedStatusvalues = new ArrayList( - Arrays.asList("pending", "active", "withdrawn", "closed", "rejected", "transfer_on_hold", "transfer_in_progreess")); @Autowired public ClientReadPlatformServiceImpl(final PlatformSecurityContext context, final RoutingDataSource dataSource, @@ -181,12 +179,11 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService public Page retrieveAll(final SearchParameters searchParameters) { if (searchParameters != null && searchParameters.getStatus() != null - && !supportedStatusvalues.contains(searchParameters.getStatus())) { + && ClientStatus.fromString(searchParameters.getStatus()) == ClientStatus.INVALID) { final List dataValidationErrors = new ArrayList<>(); - final String defaultUserMessage = "The Status value '" + searchParameters.getStatus() - + "' is not supported. The supported status values are " + supportedStatusvalues.toString(); + final String defaultUserMessage = "The Status value '" + searchParameters.getStatus() + "' is not supported."; final ApiParameterError error = ApiParameterError.parameterError("validation.msg.client.status.value.is.not.supported", - defaultUserMessage, "status", searchParameters.getStatus(), supportedStatusvalues.toString()); + defaultUserMessage, "status", searchParameters.getStatus()); dataValidationErrors.add(error); throw new PlatformApiDataValidationException(dataValidationErrors); }