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 failing tests
This commit is contained in:
yhampe 2024-10-16 11:18:23 +02:00
parent ed9f2defbc
commit 1306e4ac32
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/factory/RuleFileParser.java
View File

@ -54,7 +54,7 @@ public class RuleFileParser {
@SneakyThrows @SneakyThrows
public RuleFileBluePrint buildBluePrintFromRulesString(String rulesString, boolean isUserRuleUpdate) { public RuleFileBluePrint buildBluePrintFromRulesString(String rulesString, boolean removeImports) {
DrlParser parser = new DrlParser(LanguageLevelOption.DRL6); DrlParser parser = new DrlParser(LanguageLevelOption.DRL6);
PackageDescr packageDescr = parser.parse(false, rulesString); PackageDescr packageDescr = parser.parse(false, rulesString);
@ -86,7 +86,7 @@ public class RuleFileParser {
declarations.add(BasicDeclaration.fromDeclarationDescription(declaration, rulesString)); declarations.add(BasicDeclaration.fromDeclarationDescription(declaration, rulesString));
} }
String imports = ""; String imports = "";
if (isUserRuleUpdate && !packageDescr.getImports().isEmpty()) { if (!removeImports && !packageDescr.getImports().isEmpty()) {
imports = rulesString.substring(0, imports = rulesString.substring(0,
packageDescr.getImports() packageDescr.getImports()
.stream() .stream()

6
redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RuleBuilderTest.java
View File

@ -30,6 +30,8 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.RuleFileTyp
import com.iqser.red.service.persistence.service.v1.api.shared.model.common.JSONPrimitive; import com.iqser.red.service.persistence.service.v1.api.shared.model.common.JSONPrimitive;
import com.iqser.red.service.redaction.v1.server.model.RuleMergingResult; import com.iqser.red.service.redaction.v1.server.model.RuleMergingResult;
import com.iqser.red.service.redaction.v1.server.model.drools.RuleCompilationResult; import com.iqser.red.service.redaction.v1.server.model.drools.RuleCompilationResult;
import com.iqser.red.service.redaction.v1.server.rulesmanagement.factory.RuleFileParser;
import com.iqser.red.service.redaction.v1.server.rulesmanagement.models.RuleFileBluePrint;
import com.iqser.red.service.redaction.v1.server.service.RuleBuilderService; import com.iqser.red.service.redaction.v1.server.service.RuleBuilderService;
import com.iqser.red.service.redaction.v1.server.service.drools.RuleCompilationResultParser; import com.iqser.red.service.redaction.v1.server.service.drools.RuleCompilationResultParser;
import com.iqser.red.storage.commons.StorageAutoConfiguration; import com.iqser.red.storage.commons.StorageAutoConfiguration;
@ -37,8 +39,6 @@ import com.iqser.red.storage.commons.service.StorageService;
import com.iqser.red.storage.commons.utils.FileSystemBackedStorageService; import com.iqser.red.storage.commons.utils.FileSystemBackedStorageService;
import com.knecon.fforesight.service.layoutparser.processor.LayoutParsingServiceProcessorConfiguration; import com.knecon.fforesight.service.layoutparser.processor.LayoutParsingServiceProcessorConfiguration;
import com.knecon.fforesight.tenantcommons.TenantContext; import com.knecon.fforesight.tenantcommons.TenantContext;
import com.iqser.red.service.redaction.v1.server.rulesmanagement.factory.RuleFileParser;
import com.iqser.red.service.redaction.v1.server.rulesmanagement.models.RuleFileBluePrint;
@ExtendWith(SpringExtension.class) @ExtendWith(SpringExtension.class)
@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@ -47,7 +47,7 @@ import com.iqser.red.service.redaction.v1.server.rulesmanagement.models.RuleFile
public class RuleBuilderTest extends AbstractRedactionIntegrationTest { public class RuleBuilderTest extends AbstractRedactionIntegrationTest {
private static final String RULES = loadFromClassPath("drools/rules_v2.drl"); private static final String RULES = loadFromClassPath("drools/rules_v2.drl");
private static final String USER_RULES = loadFromClassPath("drools/user_rule_update.drl"); private static final String USER_RULES = loadFromClassPath("rulesmanagement/userrules/user_rule_update.drl");
private final List<String> systemRules = new ArrayList<>(Arrays.asList("AI", "MAN", "X", "DICT", "FA", "LDS")); private final List<String> systemRules = new ArrayList<>(Arrays.asList("AI", "MAN", "X", "DICT", "FA", "LDS"));
@Autowired @Autowired

0
redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/user_rule_update.drl → redaction-service-v1/redaction-service-server-v1/src/test/resources/rulesmanagement/userrules/user_rule_update.drl
View File