From 5cb81e7f8b0ab16e37af3dbcdfe89318d225af7d Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Fri, 28 Jun 2024 08:29:39 +0200 Subject: [PATCH] RED-9349 - Remove context from rules and check before setting the global logger --- .../redaction/v1/server/logger/RulesLogger.java | 16 +++++++++------- .../drools/ComponentDroolsExecutionService.java | 16 +++++++++++----- .../drools/EntityDroolsExecutionService.java | 15 ++++++++++----- .../main/resources/drools/all_rules_documine.drl | 3 +-- .../resources/drools/base_component_rules.drl | 3 +-- .../src/main/resources/drools/base_rules.drl | 3 +-- .../v1/server/logger/RulesLoggerTest.java | 7 +++---- .../test/resources/drools/acceptance_rules.drl | 3 +-- .../drools/all_redact_manager_rules.drl | 3 +-- .../src/test/resources/drools/documine_flora.drl | 3 +-- .../drools/documine_flora_components.drl | 3 +-- .../test/resources/drools/efsa_sanitisation.drl | 3 +-- .../resources/drools/manual_redaction_rules.drl | 3 +-- .../src/test/resources/drools/rules.drl | 3 +-- .../src/test/resources/drools/rules_v2.drl | 3 +-- .../src/test/resources/drools/table_demo.drl | 3 +-- .../resources/drools/table_demo_components.drl | 3 +-- .../test/resources/drools/test_components.drl | 3 +-- .../src/test/resources/drools/test_rules.drl | 3 +-- .../src/test/resources/logs/rules_logging.drl | 6 ++---- .../EFSA_sanitisation_GFL_v1/rules.drl | 3 +-- .../main/resources/all_redact_manager_rules.drl | 3 +-- .../src/main/resources/all_rules_documine.drl | 3 +-- 23 files changed, 53 insertions(+), 61 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/logger/RulesLogger.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/logger/RulesLogger.java index aae52fca..702f7fcc 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/logger/RulesLogger.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/logger/RulesLogger.java @@ -6,31 +6,33 @@ import java.util.regex.Pattern; import com.iqser.red.service.redaction.v1.server.service.WebSocketService; import lombok.RequiredArgsConstructor; +import lombok.Setter; @RequiredArgsConstructor public class RulesLogger { private final WebSocketService webSocketService; + private final Context context; - public void info(Context context, String message, Object... args) { + public void info(String message, Object... args) { - log(LogLevel.INFO, context, message, args); + log(LogLevel.INFO, message, args); } - public void warn(Context context, String message, Object... args) { + public void warn(String message, Object... args) { - log(LogLevel.WARN, context, message, args); + log(LogLevel.WARN, message, args); } - public void error(Context context, String message, Throwable throwable, Object... args) { + public void error(Throwable throwable, String message, Object... args) { - log(LogLevel.ERROR, context, message + " Exception: " + throwable.toString(), args); + log(LogLevel.ERROR, message + " Exception: " + throwable.toString(), args); } - private void log(LogLevel logLevel, Context context, String message, Object... args) { + private void log(LogLevel logLevel, String message, Object... args) { var formattedMessage = formatMessage(message, args); var ruleLog = RuleLogEvent.builder() diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/ComponentDroolsExecutionService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/ComponentDroolsExecutionService.java index dbed5a5e..c93340de 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/ComponentDroolsExecutionService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/ComponentDroolsExecutionService.java @@ -9,6 +9,8 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import org.drools.model.Global; +import org.kie.api.definition.KiePackage; import org.kie.api.runtime.KieContainer; import org.kie.api.runtime.KieSession; import org.kie.api.runtime.rule.QueryResults; @@ -63,11 +65,15 @@ public class ComponentDroolsExecutionService { KieSession kieSession = kieContainer.newKieSession(); ComponentCreationService componentCreationService = new ComponentCreationService(kieSession); ComponentMappingService componentMappingService = new ComponentMappingService(componentMappingMemoryCache, componentMappings); - RulesLogger logger = new RulesLogger(webSocketService); + RulesLogger logger = new RulesLogger(webSocketService, context); kieSession.setGlobal("componentCreationService", componentCreationService); - kieSession.setGlobal("logger", logger); - kieSession.setGlobal("context", context); + try { + kieSession.setGlobal("logger", logger); + } catch (RuntimeException e) { + log.warn("Logger is not present"); + } + if (hasComponentMappingServiceGlobal(kieSession)) { kieSession.setGlobal(COMPONENT_MAPPING_SERVICE_GLOBAL, componentMappingService); @@ -103,14 +109,14 @@ public class ComponentDroolsExecutionService { completableFuture.orTimeout(settings.getDroolsExecutionTimeoutSecs(document.getNumberOfPages()), TimeUnit.SECONDS) .get(); } catch (ExecutionException e) { - logger.error(context, "Exception during rule execution", e); + logger.error(e, "Exception during rule execution"); kieSession.dispose(); if (e.getCause() instanceof TimeoutException) { throw new DroolsTimeoutException(e, false, RuleFileType.COMPONENT); } throw new RuntimeException(e); } catch (InterruptedException e) { - logger.error(context, "Exception during rule execution", e); + logger.error(e, "Exception during rule execution"); kieSession.dispose(); throw new RuntimeException(e); } diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/EntityDroolsExecutionService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/EntityDroolsExecutionService.java index 7451057f..42675b01 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/EntityDroolsExecutionService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/drools/EntityDroolsExecutionService.java @@ -10,6 +10,8 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import org.drools.model.Global; +import org.kie.api.KieBase; import org.kie.api.runtime.KieContainer; import org.kie.api.runtime.KieSession; import org.kie.api.runtime.rule.QueryResults; @@ -95,14 +97,17 @@ public class EntityDroolsExecutionService { .count() ? Collections.emptySet() : buildSet(sectionsToAnalyze, document); EntityCreationService entityCreationService = new EntityCreationService(entityEnrichmentService, kieSession, nodesInKieSession); - RulesLogger logger = new RulesLogger(webSocketService); + RulesLogger logger = new RulesLogger(webSocketService, context); kieSession.setGlobal("document", document); kieSession.setGlobal("entityCreationService", entityCreationService); kieSession.setGlobal("manualChangesApplicationService", manualChangesApplicationService); kieSession.setGlobal("dictionary", dictionary); - kieSession.setGlobal("logger", logger); - kieSession.setGlobal("context", context); + try { + kieSession.setGlobal("logger", logger); + } catch (RuntimeException e) { + log.warn("Logger is not present"); + } kieSession.insert(document); @@ -142,14 +147,14 @@ public class EntityDroolsExecutionService { completableFuture.orTimeout(settings.getDroolsExecutionTimeoutSecs(document.getNumberOfPages()), TimeUnit.SECONDS) .get(); } catch (ExecutionException e) { - logger.error(context, "Exception during rule execution", e); + logger.error(e,"Exception during rule execution"); kieSession.dispose(); if (e.getCause() instanceof TimeoutException) { throw new DroolsTimeoutException(e, false, RuleFileType.ENTITY); } throw new RuntimeException(e); } catch (InterruptedException e) { - logger.error(context, "Exception during rule execution", e); + logger.error(e,"Exception during rule execution"); kieSession.dispose(); throw new RuntimeException(e); } diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/all_rules_documine.drl b/redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/all_rules_documine.drl index 75152656..ffd89bca 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/all_rules_documine.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/all_rules_documine.drl @@ -13,7 +13,6 @@ import java.util.stream.Stream; import java.util.Optional; import com.iqser.red.service.redaction.v1.server.logger.RulesLogger; -import com.iqser.red.service.redaction.v1.server.logger.Context; import com.iqser.red.service.redaction.v1.server.model.document.TextRange; import com.iqser.red.service.redaction.v1.server.model.document.entity.IEntity; import com.iqser.red.service.redaction.v1.server.model.document.entity.EntityType; @@ -55,7 +54,7 @@ global EntityCreationService entityCreationService global ManualChangesApplicationService manualChangesApplicationService global Dictionary dictionary global RulesLogger logger -global Context context + //------------------------------------ queries ------------------------------------ diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/base_component_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/base_component_rules.drl index 560536a6..1f35f6d6 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/base_component_rules.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/base_component_rules.drl @@ -13,7 +13,6 @@ import java.util.stream.Stream; import java.util.Optional; import com.iqser.red.service.redaction.v1.server.logger.RulesLogger; -import com.iqser.red.service.redaction.v1.server.logger.Context; import com.iqser.red.service.redaction.v1.server.model.component.Component; import com.iqser.red.service.redaction.v1.server.model.component.Entity; @@ -32,7 +31,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribu global ComponentCreationService componentCreationService global ComponentMappingService componentMappingService global RulesLogger logger -global Context context + /** The imports, globals, queries and rules from this file are required for any component rule file. diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/base_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/base_rules.drl index 8819c93c..d6ad2b43 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/base_rules.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/main/resources/drools/base_rules.drl @@ -13,7 +13,6 @@ import java.util.stream.Stream; import java.util.Optional; import com.iqser.red.service.redaction.v1.server.logger.RulesLogger; -import com.iqser.red.service.redaction.v1.server.logger.Context; import com.iqser.red.service.redaction.v1.server.model.document.*; import com.iqser.red.service.redaction.v1.server.model.document.TextRange; import com.iqser.red.service.redaction.v1.server.model.document.entity.*; @@ -62,7 +61,7 @@ global EntityCreationService entityCreationService global ManualChangesApplicationService manualChangesApplicationService global Dictionary dictionary global RulesLogger logger -global Context context + /** The imports, globals, queries and rules from this file are required for any entity rule file. diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/logger/RulesLoggerTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/logger/RulesLoggerTest.java index 3a01498f..1e3a196f 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/logger/RulesLoggerTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/logger/RulesLoggerTest.java @@ -40,7 +40,8 @@ class RulesLoggerTest { void testRulesLogging() { System.setOut(new PrintStream(outContent)); - RulesLogger logger = new RulesLogger(webSocketService); + Context context = new Context("fileId", "dossierId", "dossierTemplateId", 1, 1, "redaction"); + RulesLogger logger = new RulesLogger(webSocketService, context); KieServices ks = KieServices.Factory.get(); KieFileSystem kfs = ks.newKieFileSystem(); @@ -52,14 +53,12 @@ class RulesLoggerTest { KieContainer kContainer = ks.newKieContainer(releaseId); KieSession kSession = kContainer.newKieSession(); - Context context = new Context("fileId", "dossierId", "dossierTemplateId", 1, 1, "redaction"); kSession.setGlobal("logger", logger); - kSession.setGlobal("context", context); try { kSession.fireAllRules(); } catch (Exception e) { - logger.error(context, "Exception during rule execution", e); + logger.error(e,"Exception during rule execution"); } finally { kSession.dispose(); } diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/acceptance_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/acceptance_rules.drl index 7909714a..48bd6e54 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/acceptance_rules.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/acceptance_rules.drl @@ -13,7 +13,6 @@ import java.util.stream.Stream; import java.util.Optional; import com.iqser.red.service.redaction.v1.server.logger.RulesLogger; -import com.iqser.red.service.redaction.v1.server.logger.Context; import com.iqser.red.service.redaction.v1.server.model.document.*; import com.iqser.red.service.redaction.v1.server.model.document.TextRange; import com.iqser.red.service.redaction.v1.server.model.document.entity.*; @@ -63,7 +62,7 @@ global EntityCreationService entityCreationService global ManualChangesApplicationService manualChangesApplicationService global Dictionary dictionary global RulesLogger logger -global Context context + //------------------------------------ queries ------------------------------------ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/all_redact_manager_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/all_redact_manager_rules.drl index d1220cb9..7cc86d57 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/all_redact_manager_rules.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/all_redact_manager_rules.drl @@ -13,7 +13,6 @@ import java.util.stream.Stream; import java.util.Optional; import com.iqser.red.service.redaction.v1.server.logger.RulesLogger; -import com.iqser.red.service.redaction.v1.server.logger.Context; import com.iqser.red.service.redaction.v1.server.model.document.*; import com.iqser.red.service.redaction.v1.server.model.document.TextRange; import com.iqser.red.service.redaction.v1.server.model.document.entity.*; @@ -63,7 +62,7 @@ global EntityCreationService entityCreationService global ManualChangesApplicationService manualChangesApplicationService global Dictionary dictionary global RulesLogger logger -global Context context + //------------------------------------ queries ------------------------------------ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/documine_flora.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/documine_flora.drl index 778ef6fa..6f92b3d1 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/documine_flora.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/documine_flora.drl @@ -13,7 +13,6 @@ import java.util.stream.Stream; import java.util.Optional; import com.iqser.red.service.redaction.v1.server.logger.RulesLogger; -import com.iqser.red.service.redaction.v1.server.logger.Context; import com.iqser.red.service.redaction.v1.server.model.document.TextRange; import com.iqser.red.service.redaction.v1.server.model.document.entity.IEntity; import com.iqser.red.service.redaction.v1.server.model.document.entity.EntityType; @@ -55,7 +54,7 @@ global EntityCreationService entityCreationService global ManualChangesApplicationService manualChangesApplicationService global Dictionary dictionary global RulesLogger logger -global Context context + //------------------------------------ queries ------------------------------------ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/documine_flora_components.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/documine_flora_components.drl index 9ba49e3f..71d9d598 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/documine_flora_components.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/documine_flora_components.drl @@ -13,7 +13,6 @@ import java.util.stream.Stream; import java.util.Optional; import com.iqser.red.service.redaction.v1.server.logger.RulesLogger; -import com.iqser.red.service.redaction.v1.server.logger.Context; import com.iqser.red.service.redaction.v1.server.model.component.Component; import com.iqser.red.service.redaction.v1.server.model.component.Entity; @@ -32,7 +31,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribu global ComponentCreationService componentCreationService global ComponentMappingService componentMappingService global RulesLogger logger -global Context context + //------------------------------------ queries ------------------------------------ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/efsa_sanitisation.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/efsa_sanitisation.drl index 0fe0c5a6..886fa4cc 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/efsa_sanitisation.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/efsa_sanitisation.drl @@ -13,7 +13,6 @@ import java.util.stream.Stream; import java.util.Optional; import com.iqser.red.service.redaction.v1.server.logger.RulesLogger; -import com.iqser.red.service.redaction.v1.server.logger.Context; import com.iqser.red.service.redaction.v1.server.model.document.*; import com.iqser.red.service.redaction.v1.server.model.document.TextRange; import com.iqser.red.service.redaction.v1.server.model.document.entity.*; @@ -63,7 +62,7 @@ global EntityCreationService entityCreationService global ManualChangesApplicationService manualChangesApplicationService global Dictionary dictionary global RulesLogger logger -global Context context + //------------------------------------ queries ------------------------------------ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/manual_redaction_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/manual_redaction_rules.drl index be1b4544..34955669 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/manual_redaction_rules.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/manual_redaction_rules.drl @@ -13,7 +13,6 @@ import java.util.stream.Stream; import java.util.Optional; import com.iqser.red.service.redaction.v1.server.logger.RulesLogger; -import com.iqser.red.service.redaction.v1.server.logger.Context; import com.iqser.red.service.redaction.v1.server.model.document.*; import com.iqser.red.service.redaction.v1.server.model.document.TextRange; import com.iqser.red.service.redaction.v1.server.model.document.entity.*; @@ -63,7 +62,7 @@ global EntityCreationService entityCreationService global ManualChangesApplicationService manualChangesApplicationService global Dictionary dictionary global RulesLogger logger -global Context context + //------------------------------------ queries ------------------------------------ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl index 3ba52b73..8530db58 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules.drl @@ -13,7 +13,6 @@ import java.util.stream.Stream; import java.util.Optional; import com.iqser.red.service.redaction.v1.server.logger.RulesLogger; -import com.iqser.red.service.redaction.v1.server.logger.Context; import com.iqser.red.service.redaction.v1.server.model.document.*; import com.iqser.red.service.redaction.v1.server.model.document.TextRange; import com.iqser.red.service.redaction.v1.server.model.document.entity.*; @@ -63,7 +62,7 @@ global EntityCreationService entityCreationService global ManualChangesApplicationService manualChangesApplicationService global Dictionary dictionary global RulesLogger logger -global Context context + //------------------------------------ queries ------------------------------------ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl index dceccd0b..6a89aefa 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/rules_v2.drl @@ -13,7 +13,6 @@ import java.util.stream.Stream; import java.util.Optional; import com.iqser.red.service.redaction.v1.server.logger.RulesLogger; -import com.iqser.red.service.redaction.v1.server.logger.Context; import com.iqser.red.service.redaction.v1.server.model.document.*; import com.iqser.red.service.redaction.v1.server.model.document.TextRange; import com.iqser.red.service.redaction.v1.server.model.document.entity.*; @@ -63,7 +62,7 @@ global EntityCreationService entityCreationService global ManualChangesApplicationService manualChangesApplicationService global Dictionary dictionary global RulesLogger logger -global Context context + //------------------------------------ queries ------------------------------------ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/table_demo.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/table_demo.drl index 6180b70d..a25e4590 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/table_demo.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/table_demo.drl @@ -13,7 +13,6 @@ import java.util.stream.Stream; import java.util.Optional; import com.iqser.red.service.redaction.v1.server.logger.RulesLogger; -import com.iqser.red.service.redaction.v1.server.logger.Context; import com.iqser.red.service.redaction.v1.server.model.document.*; import com.iqser.red.service.redaction.v1.server.model.document.TextRange; import com.iqser.red.service.redaction.v1.server.model.document.entity.*; @@ -63,7 +62,7 @@ global EntityCreationService entityCreationService global ManualChangesApplicationService manualChangesApplicationService global Dictionary dictionary global RulesLogger logger -global Context context + //------------------------------------ queries ------------------------------------ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/table_demo_components.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/table_demo_components.drl index 1c3acb74..818546ee 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/table_demo_components.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/table_demo_components.drl @@ -13,7 +13,6 @@ import java.util.stream.Stream; import java.util.Optional; import com.iqser.red.service.redaction.v1.server.logger.RulesLogger; -import com.iqser.red.service.redaction.v1.server.logger.Context; import com.iqser.red.service.redaction.v1.server.model.component.Component; import com.iqser.red.service.redaction.v1.server.model.component.Entity; @@ -30,7 +29,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribu global ComponentCreationService componentCreationService global RulesLogger logger -global Context context + //------------------------------------ queries ------------------------------------ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_components.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_components.drl index 0361a3f4..5b4c863a 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_components.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_components.drl @@ -13,7 +13,6 @@ import java.util.stream.Stream; import java.util.Optional; import com.iqser.red.service.redaction.v1.server.logger.RulesLogger; -import com.iqser.red.service.redaction.v1.server.logger.Context; import com.iqser.red.service.redaction.v1.server.model.component.Component; import com.iqser.red.service.redaction.v1.server.model.component.Entity; @@ -30,7 +29,7 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttribu global ComponentCreationService componentCreationService global RulesLogger logger -global Context context + //------------------------------------ queries ------------------------------------ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_rules.drl index 8e72fe89..c722d8da 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_rules.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/drools/test_rules.drl @@ -13,7 +13,6 @@ import java.util.stream.Stream; import java.util.Optional; import com.iqser.red.service.redaction.v1.server.logger.RulesLogger; -import com.iqser.red.service.redaction.v1.server.logger.Context; import com.iqser.red.service.redaction.v1.server.model.document.*; import com.iqser.red.service.redaction.v1.server.model.document.TextRange; import com.iqser.red.service.redaction.v1.server.model.document.entity.*; @@ -63,7 +62,7 @@ global EntityCreationService entityCreationService global ManualChangesApplicationService manualChangesApplicationService global Dictionary dictionary global RulesLogger logger -global Context context + //------------------------------------ queries ------------------------------------ diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/logs/rules_logging.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/logs/rules_logging.drl index 49ef4924..0fc761c8 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/logs/rules_logging.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/logs/rules_logging.drl @@ -1,10 +1,8 @@ package drools import com.iqser.red.service.redaction.v1.server.logger.RulesLogger; -import com.iqser.red.service.redaction.v1.server.logger.Context; global RulesLogger logger -global Context context rule "LOG.0.0: Test log info" @@ -12,7 +10,7 @@ salience 1 when eval(true) then - logger.info(context, "This is a test log {}", "placeholder"); + logger.info("This is a test log {}", "placeholder"); end rule "LOG.0.1: Test log warn" @@ -20,7 +18,7 @@ salience 1 when eval(true) then - logger.warn(context, "This is a warning log with multiple placeholders {} {} {}", "p1", "p2", "p3"); + logger.warn("This is a warning log with multiple placeholders {} {} {}", "p1", "p2", "p3"); end rule "LOG.0.2: Test log error" diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/performance/dictionaries/EFSA_sanitisation_GFL_v1/rules.drl b/redaction-service-v1/redaction-service-server-v1/src/test/resources/performance/dictionaries/EFSA_sanitisation_GFL_v1/rules.drl index 8b7cb1ba..6336f279 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/performance/dictionaries/EFSA_sanitisation_GFL_v1/rules.drl +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/performance/dictionaries/EFSA_sanitisation_GFL_v1/rules.drl @@ -13,7 +13,6 @@ import java.util.stream.Stream; import java.util.Optional; import com.iqser.red.service.redaction.v1.server.logger.RulesLogger; -import com.iqser.red.service.redaction.v1.server.logger.Context; import com.iqser.red.service.redaction.v1.server.document.graph.*; import com.iqser.red.service.redaction.v1.server.document.graph.nodes.*; import com.iqser.red.service.redaction.v1.server.document.graph.nodes.Section; @@ -58,7 +57,7 @@ global ManualChangesApplicationService manualChangesApplicationService global NerEntitiesAdapter nerEntitiesAdapter global Dictionary dictionary global RulesLogger logger -global Context context + //------------------------------------ queries ------------------------------------ diff --git a/redaction-service-v1/rules-management/src/main/resources/all_redact_manager_rules.drl b/redaction-service-v1/rules-management/src/main/resources/all_redact_manager_rules.drl index 827e2710..d460093f 100644 --- a/redaction-service-v1/rules-management/src/main/resources/all_redact_manager_rules.drl +++ b/redaction-service-v1/rules-management/src/main/resources/all_redact_manager_rules.drl @@ -13,7 +13,6 @@ import java.util.stream.Stream; import java.util.Optional; import com.iqser.red.service.redaction.v1.server.logger.RulesLogger; -import com.iqser.red.service.redaction.v1.server.logger.Context; import com.iqser.red.service.redaction.v1.server.model.document.*; import com.iqser.red.service.redaction.v1.server.model.document.TextRange; import com.iqser.red.service.redaction.v1.server.model.document.entity.*; @@ -63,7 +62,7 @@ global EntityCreationService entityCreationService global ManualChangesApplicationService manualChangesApplicationService global Dictionary dictionary global RulesLogger logger -global Context context + //------------------------------------ queries ------------------------------------ diff --git a/redaction-service-v1/rules-management/src/main/resources/all_rules_documine.drl b/redaction-service-v1/rules-management/src/main/resources/all_rules_documine.drl index 75152656..ffd89bca 100644 --- a/redaction-service-v1/rules-management/src/main/resources/all_rules_documine.drl +++ b/redaction-service-v1/rules-management/src/main/resources/all_rules_documine.drl @@ -13,7 +13,6 @@ import java.util.stream.Stream; import java.util.Optional; import com.iqser.red.service.redaction.v1.server.logger.RulesLogger; -import com.iqser.red.service.redaction.v1.server.logger.Context; import com.iqser.red.service.redaction.v1.server.model.document.TextRange; import com.iqser.red.service.redaction.v1.server.model.document.entity.IEntity; import com.iqser.red.service.redaction.v1.server.model.document.entity.EntityType; @@ -55,7 +54,7 @@ global EntityCreationService entityCreationService global ManualChangesApplicationService manualChangesApplicationService global Dictionary dictionary global RulesLogger logger -global Context context + //------------------------------------ queries ------------------------------------