Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

RED-9472: seperation of system rules

Browse Source 
working on fixing bug
This commit is contained in:
yhampe 2024-12-18 09:49:07 +01:00
parent 88155dc211
commit 69ae276c75
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RuleBuilderController.java
View File

@ -63,7 +63,6 @@ public class RuleBuilderController implements RuleBuilderResource {
} }
try { try {
var droolsValidation = droolsValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), mergingResult.getMergedRules())); var droolsValidation = droolsValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), mergingResult.getMergedRules()));
log.info("result of validation: " + droolsValidation);
droolsValidationResponse = DroolsValidationResponse.builder() droolsValidationResponse = DroolsValidationResponse.builder()
.syntaxErrorMessages(droolsValidation.getSyntaxErrorMessages() .syntaxErrorMessages(droolsValidation.getSyntaxErrorMessages()
.stream() .stream()
@ -100,7 +99,7 @@ public class RuleBuilderController implements RuleBuilderResource {
} catch (Exception e) { } catch (Exception e) {
throw new RulesValidationException("Could not test rules: " + e.getMessage(), e); throw new RulesValidationException("Could not test rules: " + e.getMessage(), e);
} }
log.info("result after validation: {}", rulesUpdateRequest); log.info("result after validation: {}", rulesUploadResponse);
return new ResponseEntity<>(rulesUploadResponse, HttpStatus.OK); return new ResponseEntity<>(rulesUploadResponse, HttpStatus.OK);
} }

1
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/models/RuleFileBluePrint.java
View File

@ -78,7 +78,6 @@ public class RuleFileBluePrint {
.map(line -> line.startsWith(GLOBAL_PREFIX) ? line : GLOBAL_PREFIX + line) .map(line -> line.startsWith(GLOBAL_PREFIX) ? line : GLOBAL_PREFIX + line)
.collect(Collectors.toCollection(LinkedHashSet::new)); .collect(Collectors.toCollection(LinkedHashSet::new));
// Combine globals while maintaining order and format
StringBuilder globalsBuilder = new StringBuilder(); StringBuilder globalsBuilder = new StringBuilder();
Stream.concat(existingGlobals.stream(), newGlobals.stream()) Stream.concat(existingGlobals.stream(), newGlobals.stream())
.distinct() .distinct()