From 483255534374a9fd9da60d2099aed678a5389bd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thierry=20G=C3=B6ckel?= Date: Fri, 17 Jul 2020 12:40:49 +0200 Subject: [PATCH 1/2] RED-155: Bump config service version to make sure, dictionaries and rules are pulled correctly. --- redaction-service-v1/redaction-service-server-v1/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redaction-service-v1/redaction-service-server-v1/pom.xml b/redaction-service-v1/redaction-service-server-v1/pom.xml index c80053ce..d18dabdb 100644 --- a/redaction-service-v1/redaction-service-server-v1/pom.xml +++ b/redaction-service-v1/redaction-service-server-v1/pom.xml @@ -39,7 +39,7 @@ com.iqser.red.service configuration-service-api-v1 - 0.9.0 + 1.0.0 org.drools From c80cae3fc361a651e120626daf26d39de1dc656f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thierry=20G=C3=B6ckel?= Date: Fri, 17 Jul 2020 12:55:49 +0200 Subject: [PATCH 2/2] No need to write or add rules to file in classpath. --- .../redaction/service/DroolsExecutionService.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DroolsExecutionService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DroolsExecutionService.java index 95b4036b..aaf928ad 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DroolsExecutionService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DroolsExecutionService.java @@ -29,8 +29,6 @@ public class DroolsExecutionService { @Autowired private KieContainer kieContainer; - private String currentDrlRules; - private long rulesVersion = -1; public Section executeRules(Section section) { @@ -64,22 +62,15 @@ public class DroolsExecutionService { KieServices kieServices = KieServices.Factory.get(); InputStream input = new ByteArrayInputStream(drlAsString.getBytes(StandardCharsets.UTF_8)); KieFileSystem kieFileSystem = kieServices.newKieFileSystem(); - kieFileSystem.write("src/main/resources/drools/rules.drl", kieServices.getResources() - .newInputStreamResource(input)); + kieFileSystem.write(kieServices.getResources().newInputStreamResource(input)); KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem); kieBuilder.buildAll(); KieModule kieModule = kieBuilder.getKieModule(); kieContainer.updateToVersion(kieModule.getReleaseId()); - currentDrlRules = drlAsString; } catch (Exception e) { throw new RulesValidationException("Could not update rules", e); } } - public String getRules() { - - return currentDrlRules; - } - } \ No newline at end of file