diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/RedactionServiceSettings.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/RedactionServiceSettings.java index ebdf6779..540cc581 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/RedactionServiceSettings.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/RedactionServiceSettings.java @@ -32,7 +32,7 @@ public class RedactionServiceSettings { private int dictionaryCacheExpireAfterAccessDays = 3; - private int droolsExecutionTimeoutSecs = 300; + private int droolsExecutionTimeoutSecs = 600; private boolean ruleExecutionSecured = true; 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 eb90ac88..355c6a73 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 @@ -123,7 +123,7 @@ public class ComponentDroolsExecutionService { logger.error(e, "Exception during rule execution"); kieSession.dispose(); if (e.getCause() instanceof TimeoutException) { - throw new DroolsTimeoutException(e, false, RuleFileType.COMPONENT); + throw new DroolsTimeoutException(String.format("The file %s caused a timeout",context.getFileId()), e, false, RuleFileType.COMPONENT); } throw new RuntimeException(e); } catch (InterruptedException e) { @@ -131,7 +131,7 @@ public class ComponentDroolsExecutionService { kieSession.dispose(); throw new RuntimeException(e); } catch (TimeoutException e) { - throw new DroolsTimeoutException(e, false, RuleFileType.COMPONENT); + throw new DroolsTimeoutException(String.format("The file %s caused a timeout",context.getFileId()), e, false, RuleFileType.COMPONENT); } List resultingFileAttributes = getFileAttributes(kieSession); 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 b5da9b1e..bbad6457 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 @@ -156,7 +156,7 @@ public class EntityDroolsExecutionService { logger.error(e, "Exception during rule execution"); kieSession.dispose(); if (e.getCause() instanceof TimeoutException) { - throw new DroolsTimeoutException(e, false, RuleFileType.ENTITY); + throw new DroolsTimeoutException(String.format("The file %s caused a timeout",context.getFileId()), e, false, RuleFileType.ENTITY); } throw new RuntimeException(e); } catch (InterruptedException e) { @@ -164,7 +164,7 @@ public class EntityDroolsExecutionService { kieSession.dispose(); throw new RuntimeException(e); } catch (TimeoutException e) { - throw new DroolsTimeoutException(e, false, RuleFileType.ENTITY); + throw new DroolsTimeoutException(String.format("The file %s caused a timeout",context.getFileId()), e, false, RuleFileType.ENTITY); } List resultingFileAttributes = getFileAttributes(kieSession); diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/utils/exception/DroolsTimeoutException.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/utils/exception/DroolsTimeoutException.java index e4ee9642..aa955c6c 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/utils/exception/DroolsTimeoutException.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/utils/exception/DroolsTimeoutException.java @@ -22,6 +22,14 @@ public class DroolsTimeoutException extends RuntimeException { } + public DroolsTimeoutException(String message, Throwable cause, boolean reported, RuleFileType ruleFileType) { + + super(message, cause); + this.reported = reported; + this.ruleFileType = ruleFileType; + } + + public DroolsTimeoutException(boolean reported, RuleFileType ruleFileType) { super(DROOLS_TIMEOUT_MESSAGE); diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumineFloraTest.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumineFloraTest.java index 430ab672..2f5d5a56 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumineFloraTest.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/DocumineFloraTest.java @@ -261,6 +261,7 @@ public class DocumineFloraTest extends AbstractRedactionIntegrationTest { } + @Disabled @Test public void testDoseMortalityExtraction() { diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/syngenta b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/syngenta index 5705cc07..0da08b1d 160000 --- a/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/syngenta +++ b/redaction-service-v1/redaction-service-server-v1/src/test/resources/files/syngenta @@ -1 +1 @@ -Subproject commit 5705cc0782605fdca5dfff134b436f7143c9e421 +Subproject commit 0da08b1d9d1bc815a3fb51aa9638eafea2cf02d5