Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-9472: seperation of system rules #776

Open
yannik.hampe wants to merge 100 commits from feature/RED-9472 into master
pull from: feature/RED-9472
merge into: Marmelator:master
Conversation 42 Commits 100 Files Changed 23 +14 -3
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5b1a3bf56a - Show all commits

17
persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RulesController.java vendored
View File

@ -75,16 +75,27 @@ public class RulesController implements RulesResource {
if (ruleEntityOptional.isPresent()) {
RulesUpdateRequest rulesUpdateRequest = new RulesUpdateRequest(ruleEntityOptional.get().getValue(), rules.getRules());
try {
ResponseEntity mergedRules = ruleBuilderClient.mergeUserUpdateRules(rulesUpdateRequest);
ResponseEntity<RulesUploadResponse> mergedRules = ruleBuilderClient.mergeUserUpdateRules(rulesUpdateRequest);
if (mergedRules == null || mergedRules.getBody() == null) {
throw new BadRequestException("Failed to merge rules - received null response from service");
}
if (mergedRules.getStatusCode().equals(HttpStatus.UNPROCESSABLE_ENTITY)) {
DroolsValidationResponse mergedRulesValidationResponse = ((RulesUploadResponse) mergedRules.getBody()).getDroolsValidationResponse();
DroolsValidationResponse mergedRulesValidationResponse = mergedRules.getBody().getDroolsValidationResponse();
return new ResponseEntity<>(mergedRulesValidationResponse, !rules.isDryRun() ? HttpStatus.UNPROCESSABLE_ENTITY : HttpStatus.OK);
}
mergedRulesString = ((RulesUploadResponse) mergedRules.getBody()).getRules();
mergedRulesString = mergedRules.getBody().getRules();
if (mergedRulesString == null) {
throw new BadRequestException("Failed to merge rules - merged result is null");
}
} catch (FeignException e) {
if (e.status() == HttpStatus.BAD_REQUEST.value()) {
throw new BadRequestException("The provided rule file is not a valid drools rule file!");
}
throw new BadRequestException("Failed to merge rules: " + e.getMessage());
}
}
if (!rules.isDryRun()) {