diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RulesController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RulesController.java index ddcd5ca9c..54eb42f5a 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RulesController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RulesController.java @@ -83,12 +83,12 @@ public class RulesController implements RulesResource { .build()) .toList(); droolsSyntaxValidationResponse.setRulesSyntaxErrorMessages(rulesSyntaxErrorMessages); - if (!rules.isRunDryParameter()) { + if (!rules.isRunDry()) { return new ResponseEntity<>(droolsSyntaxValidationResponse, HttpStatus.BAD_REQUEST); } } - if (rules.isRunDryParameter()) { + if (rules.isRunDry()) { return ResponseEntity.ok(droolsSyntaxValidationResponse); } } catch (FeignException e) { @@ -130,10 +130,10 @@ public class RulesController implements RulesResource { @Override @PreAuthorize("hasAuthority('" + WRITE_RULES + "')") public ResponseEntity uploadFile(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId, - @RequestParam(value = RUN_DRY_PARAMETER) boolean runDryParameter, + @RequestParam(value = RUN_DRY_PARAMETER) boolean runDry, @RequestPart(name = "file") MultipartFile file) { - return uploadFile(dossierTemplateId, RuleFileType.ENTITY, runDryParameter, file); + return uploadFile(dossierTemplateId, RuleFileType.ENTITY, runDry, file); } @@ -141,11 +141,11 @@ public class RulesController implements RulesResource { @PreAuthorize("hasAuthority('" + WRITE_RULES + "')") public ResponseEntity uploadFile(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId, @PathVariable(RULE_FILE_TYPE_PARAMETER_NAME) RuleFileType ruleFileType, - @RequestParam(value = RUN_DRY_PARAMETER) boolean runDryParameter, + @RequestParam(value = RUN_DRY_PARAMETER) boolean runDry, @RequestPart(name = "file") MultipartFile file) { try { - return upload(new RulesUploadRequestModel(new String(file.getBytes(), StandardCharsets.UTF_8), dossierTemplateId, ruleFileType, runDryParameter)); + return upload(new RulesUploadRequestModel(new String(file.getBytes(), StandardCharsets.UTF_8), dossierTemplateId, ruleFileType, runDry)); } catch (IOException e) { throw new FileUploadException("Could not upload file.", e); } diff --git a/persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/RulesResource.java b/persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/RulesResource.java index cfc3dab53..fa966474c 100644 --- a/persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/RulesResource.java +++ b/persistence-service-v1/persistence-service-external-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/external/resource/RulesResource.java @@ -35,7 +35,7 @@ public interface RulesResource { String RULE_FILE_TYPE_PARAMETER_NAME = "ruleFileType"; String RULE_FILE_TYPE_PATH_VARIABLE = "/{ruleFileType}"; - String RUN_DRY_PARAMETER = "runDryParameter"; + String RUN_DRY_PARAMETER = "runDry"; /** @@ -76,7 +76,7 @@ public interface RulesResource { @Operation(summary = "Takes object containing string or rules as argument, which will be used by the redaction service.") @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Rules upload successful or rules validation done."), @ApiResponse(responseCode = "400", description = "Uploaded rules could not be verified.")}) ResponseEntity uploadFile(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId, - @RequestParam(value = RUN_DRY_PARAMETER) boolean runDryParameter, + @RequestParam(value = RUN_DRY_PARAMETER) boolean runDry, @Schema(type = "string", format = "binary", name = "file") @RequestPart(name = "file") MultipartFile file); @@ -86,7 +86,7 @@ public interface RulesResource { @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "Rules upload successful or rules validation done"), @ApiResponse(responseCode = "400", description = "Uploaded rules could not be verified.")}) ResponseEntity uploadFile(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId, @PathVariable(RULE_FILE_TYPE_PARAMETER_NAME) RuleFileType ruleFileType, - @RequestParam(value = RUN_DRY_PARAMETER) boolean runDryParameter, + @RequestParam(value = RUN_DRY_PARAMETER) boolean runDry, @Schema(type = "string", format = "binary", name = "file") @RequestPart(name = "file") MultipartFile file); diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/rules/RulesUploadRequestModel.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/rules/RulesUploadRequestModel.java index ea4155c74..6fb5e5cc6 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/rules/RulesUploadRequestModel.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/rules/RulesUploadRequestModel.java @@ -26,7 +26,7 @@ public class RulesUploadRequestModel { private RuleFileType ruleFileType = RuleFileType.ENTITY; @Schema(description = "The dry-run parameter if set to true the file is not saved (only the validation results are returned", defaultValue = "false") - private boolean runDryParameter; + private boolean runDry; public RulesUploadRequestModel(@NonNull String rules, @NonNull String dossierTemplateId, RuleFileType ruleFileType) { @@ -34,7 +34,7 @@ public class RulesUploadRequestModel { this.rules = rules; this.dossierTemplateId = dossierTemplateId; this.ruleFileType = ruleFileType; - this.runDryParameter = false; + this.runDry = false; } }