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 
fixed some sonarqube errors
This commit is contained in:
yhampe 2024-10-16 12:09:29 +02:00
parent 1306e4ac32
commit 514cba835b
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,5 @@
package com.iqser.red.service.redaction.v1.server.controller; package com.iqser.red.service.redaction.v1.server.controller;
import org.junit.Assert;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -44,7 +43,9 @@ public class RuleBuilderController implements RuleBuilderResource {
RulesResponse rulesResponse = new RulesResponse(); RulesResponse rulesResponse = new RulesResponse();
String filteredRules = this.ruleBuilderService.cleanRuleFileOfSystemRules(systemRulesSeperationRequest.getRules(), true); String filteredRules = this.ruleBuilderService.cleanRuleFileOfSystemRules(systemRulesSeperationRequest.getRules(), true);
Assert.assertFalse("There was an error when cleaning the rulefile of system rules", filteredRules.isEmpty()); if (filteredRules.isEmpty()) {
throw new RuntimeException("There was an error when cleaning the rulefile of sytem rules");
}
rulesResponse.setRules(filteredRules); rulesResponse.setRules(filteredRules);
return rulesResponse; return rulesResponse;
} }
@ -56,7 +57,9 @@ public class RuleBuilderController implements RuleBuilderResource {
RulesResponse rulesResponse = new RulesResponse(); RulesResponse rulesResponse = new RulesResponse();
DroolsValidationResponse droolsValidationResponse; DroolsValidationResponse droolsValidationResponse;
RuleMergingResult mergingResult = ruleBuilderService.mergeUserRulesAndSystemRules(rulesUpdateRequest.getExistingRules(), rulesUpdateRequest.getUpdatedRules()); RuleMergingResult mergingResult = ruleBuilderService.mergeUserRulesAndSystemRules(rulesUpdateRequest.getExistingRules(), rulesUpdateRequest.getUpdatedRules());
Assert.assertFalse("There was an error when merging the user rule update", mergingResult.getMergedRules().isEmpty()); if (mergingResult.getMergedRules().isEmpty()) {
throw new RuntimeException("There was an error when merging the user rule update into the rule file");
}
try { try {
var droolsValidation = droolsValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), mergingResult.getMergedRules())); var droolsValidation = droolsValidationService.testRules(new RuleValidationModel(RuleFileType.ENTITY.name(), mergingResult.getMergedRules()));
droolsValidationResponse = DroolsValidationResponse.builder() droolsValidationResponse = DroolsValidationResponse.builder()

3
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/SuperSection.java
View File

@ -2,7 +2,6 @@ package com.iqser.red.service.redaction.v1.server.model.document.nodes;
import lombok.AccessLevel; import lombok.AccessLevel;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.FieldDefaults; import lombok.experimental.FieldDefaults;
@ -46,7 +45,6 @@ public class SuperSection extends AbstractSemanticNode {
} }
@Override @Override
public String toString() { public String toString() {
@ -86,5 +84,4 @@ public class SuperSection extends AbstractSemanticNode {
return streamAllSubNodesOfType(NodeType.HEADLINE).anyMatch(h -> h.containsStringIgnoreCase(value)); return streamAllSubNodesOfType(NodeType.HEADLINE).anyMatch(h -> h.containsStringIgnoreCase(value));
} }
} }

10
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/drools/RuleCompilationResult.java
View File

@ -51,7 +51,7 @@ public final class RuleCompilationResult {
List<RuleClass> rulesToBeRemoved = ruleClasses.stream() List<RuleClass> rulesToBeRemoved = ruleClasses.stream()
.filter(ruleClass -> Objects.equals(ruleClass.ruleType(), ruleType)) .filter(ruleClass -> Objects.equals(ruleClass.ruleType(), ruleType))
.collect(Collectors.toList()); .toList();
log.info("rules to be removed {}", rulesToBeRemoved); log.info("rules to be removed {}", rulesToBeRemoved);
ruleClasses.removeAll(rulesToBeRemoved); ruleClasses.removeAll(rulesToBeRemoved);
} }
@ -63,7 +63,7 @@ public final class RuleCompilationResult {
List<RuleClass> rulesToBeRemoved = ruleClasses.stream() List<RuleClass> rulesToBeRemoved = ruleClasses.stream()
.filter(ruleClass -> filterOutRule(ruleClass.ruleType(), systemRules)) .filter(ruleClass -> filterOutRule(ruleClass.ruleType(), systemRules))
.collect(Collectors.toList()); .toList();
log.info("rules to be removed {}", rulesToBeRemoved); log.info("rules to be removed {}", rulesToBeRemoved);
ruleClasses.removeAll(rulesToBeRemoved); ruleClasses.removeAll(rulesToBeRemoved);
} }
@ -87,7 +87,7 @@ public final class RuleCompilationResult {
List<RuleClass> rulesToBeRemoved = ruleClasses.stream() List<RuleClass> rulesToBeRemoved = ruleClasses.stream()
.filter(ruleClass -> Objects.equals(ruleClass.ruleType(), ruleType)) .filter(ruleClass -> Objects.equals(ruleClass.ruleType(), ruleType))
.collect(Collectors.toList()); .toList();
return rulesToBeRemoved.size(); return rulesToBeRemoved.size();
} }
@ -100,7 +100,7 @@ public final class RuleCompilationResult {
public Set<String> getImportSplitByKeyword() { public Set<String> getImportSplitByKeyword() {
return Arrays.stream(imports.replaceAll("\n", "").split("import")) return Arrays.stream(imports.replace("\n", "").split("import"))
.map(String::trim) .map(String::trim)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
} }
@ -129,7 +129,7 @@ public final class RuleCompilationResult {
public List<RuleIdentifier> getAllRuleIdentifiers() { public List<RuleIdentifier> getAllRuleIdentifiers() {
return streamAllRules().map(BasicRule::getIdentifier) return streamAllRules().map(BasicRule::getIdentifier)
.collect(Collectors.toList()); .toList();
} }