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 09:29:01 +02:00
parent 370b76628b
commit ed9f2defbc
2 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/RuleManagementResources.java
View File

@ -1,56 +1,34 @@
package com.iqser.red.service.redaction.v1.server.rulesmanagement; package com.iqser.red.service.redaction.v1.server.rulesmanagement;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream; import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import com.iqser.red.service.redaction.v1.server.rulesmanagement.models.ApplicationType; import com.iqser.red.service.redaction.v1.server.rulesmanagement.models.ApplicationType;
import lombok.SneakyThrows;
@SuppressWarnings("PMD") @SuppressWarnings("PMD")
public class RuleManagementResources { public class RuleManagementResources {
public static InputStream getAllRulesInputStream(ApplicationType applicationType) { public static InputStream getAllRulesInputStream(ApplicationType applicationType) {
if (applicationType == ApplicationType.RM) { if (applicationType == ApplicationType.RM) {
return RuleManagementResources.class.getClassLoader().getResourceAsStream("all_redact_manager_rules.drl"); return RuleManagementResources.class.getClassLoader().getResourceAsStream("drools/all_redact_manager_rules.drl");
} }
return RuleManagementResources.class.getClassLoader().getResourceAsStream("all_rules_documine.drl"); return RuleManagementResources.class.getClassLoader().getResourceAsStream("drools/all_rules_documine.drl");
} }
public static InputStream getDefaultRuleIdentifiesInputStream(ApplicationType applicationType) { public static InputStream getDefaultRuleIdentifiesInputStream(ApplicationType applicationType) {
if (applicationType == ApplicationType.RM) { if (applicationType == ApplicationType.RM) {
return RuleManagementResources.class.getClassLoader().getResourceAsStream("default_rule_identifiers.txt"); return RuleManagementResources.class.getClassLoader().getResourceAsStream("rulesmanagement/default_rule_identifiers.txt");
} else { } else {
return RuleManagementResources.class.getClassLoader().getResourceAsStream("default_rule_identifiers_dm.txt"); return RuleManagementResources.class.getClassLoader().getResourceAsStream("rulesmanagement/default_rule_identifiers_dm.txt");
} }
} }
public static InputStream getTemplateInputStream() { public static InputStream getTemplateInputStream() {
return RuleManagementResources.class.getClassLoader().getResourceAsStream("order_template.txt"); return RuleManagementResources.class.getClassLoader().getResourceAsStream("rulesmanagement/order_template.txt");
}
public static InputStream getOldRulesCsvInputStream() {
return RuleManagementResources.class.getClassLoader().getResourceAsStream("old_rules_with_translations.csv");
}
@SneakyThrows
public static String createTempOldRulesCsv(String formattedAsCsv) {
File csvFile = File.createTempFile("old_rules_with_translations-", ".csv");
try (var out = new FileOutputStream(csvFile)) {
out.write(formattedAsCsv.getBytes(StandardCharsets.UTF_8));
}
return csvFile.toString();
} }
} }

2
redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/RuleCompilationResultMergingTest.java → redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/rulesmanagement/RuleFileBluePrintMergingTest.java
View File

@ -8,7 +8,7 @@ import com.iqser.red.service.redaction.v1.server.rulesmanagement.factory.RuleFil
import com.iqser.red.service.redaction.v1.server.rulesmanagement.models.RuleFileBluePrint; import com.iqser.red.service.redaction.v1.server.rulesmanagement.models.RuleFileBluePrint;
import com.iqser.red.service.redaction.v1.server.rulesmanagement.models.RuleIdentifier; import com.iqser.red.service.redaction.v1.server.rulesmanagement.models.RuleIdentifier;
public class RuleCompilationResultMergingTest { public class RuleFileBluePrintMergingTest {
@Test @Test
public void testBothRuleFilesCanBeMerged() { public void testBothRuleFilesCanBeMerged() {