RED-183: Fix catching validation errors

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/Application.java

@@ -4,6 +4,7 @@ import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
+import org.apache.commons.lang3.StringUtils;
 import org.kie.api.KieServices;
 import org.kie.api.builder.KieBuilder;
 import org.kie.api.builder.KieFileSystem;
@@ -22,6 +23,7 @@ import org.springframework.context.annotation.Import;
 import com.iqser.gin4.commons.spring.DefaultWebMvcConfiguration;
 import com.iqser.red.service.configuration.v1.api.model.RulesResponse;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
+import com.iqser.red.service.redaction.v1.server.exception.RulesValidationException;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 
 @Import({DefaultWebMvcConfiguration.class})
@@ -33,24 +35,35 @@ public class Application {
     @Autowired
     private RulesClient rulesClient;
 
+
     public static void main(String[] args) {
+
         SpringApplication.run(Application.class, args);
     }
 
+
     @Bean
     public KieContainer kieContainer() {
 
-        KieServices kieServices = KieServices.Factory.get();
+        try {
+            KieServices kieServices = KieServices.Factory.get();
 
-        KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
+            KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
-        RulesResponse rules = rulesClient.getRules();
+            RulesResponse rules = rulesClient.getRules();
-        InputStream input = new ByteArrayInputStream(rules.getRules().getBytes(StandardCharsets.UTF_8));
+            if (StringUtils.isEmpty(rules.getRules())) {
-        kieFileSystem.write("src/main/resources/drools/rules.drl", kieServices.getResources().newInputStreamResource(input));
+                throw new RuntimeException("Rules cannot be empty.");
-        KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
+            }
-        kieBuilder.buildAll();
+            InputStream input = new ByteArrayInputStream(rules.getRules().getBytes(StandardCharsets.UTF_8));
-        KieModule kieModule = kieBuilder.getKieModule();
+            kieFileSystem.write("src/main/resources/drools/rules.drl", kieServices.getResources()
+                    .newInputStreamResource(input));
+            KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
+            kieBuilder.buildAll();
+            KieModule kieModule = kieBuilder.getKieModule();
 
-        return kieServices.newKieContainer(kieModule.getReleaseId());
+            return kieServices.newKieContainer(kieModule.getReleaseId());
+        } catch (Exception e) {
+            throw new RulesValidationException("Could not update rules: " + e.getMessage(), e);
+        }
 
     }
 

redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/redaction/service/DroolsExecutionService.java

@@ -68,7 +68,7 @@ public class DroolsExecutionService {
             KieModule kieModule = kieBuilder.getKieModule();
             kieContainer.updateToVersion(kieModule.getReleaseId());
         } catch (Exception e) {
-            throw new RulesValidationException("Could not update rules", e);
+            throw new RulesValidationException("Could not update rules: " + e.getMessage(), e);
         }
 
     }

redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/RedactionIntegrationTest.java

@@ -52,11 +52,12 @@ import com.iqser.red.service.redaction.v1.server.redaction.utils.TextNormalizati
 @SpringBootTest(webEnvironment = DEFINED_PORT)
 public class RedactionIntegrationTest {
 
-    public static final String VERTEBRATES_CODE = "vertebrate";
+    private static final String RULES = loadFromClassPath("drools/rules.drl");
-    public static final String ADDRESS_CODE = "address";
+    private static final String VERTEBRATES_CODE = "vertebrate";
-    public static final String NAME_CODE = "name";
+    private static final String ADDRESS_CODE = "address";
-    public static final String NO_REDACTION_INDICATOR = "no_redaction_indicator";
+    private static final String NAME_CODE = "name";
-    public static final String DEFAULT = "default";
+    private static final String NO_REDACTION_INDICATOR = "no_redaction_indicator";
+    private static final String DEFAULT = "default";
 
     @Autowired
     private RedactionController redactionController;
@@ -67,8 +68,8 @@ public class RedactionIntegrationTest {
     @MockBean
     private DictionaryClient dictionaryClient;
 
-    private Map<String, List<String>> dictionary = new HashMap<>();
+    private final Map<String, List<String>> dictionary = new HashMap<>();
-    private Map<String, float[]> typeColorMap = new HashMap<>();
+    private final Map<String, float[]> typeColorMap = new HashMap<>();
 
     @TestConfiguration
     public static class RedactionIntegrationTestConfiguration {
@@ -79,21 +80,23 @@ public class RedactionIntegrationTest {
             KieServices kieServices = KieServices.Factory.get();
 
             KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
-            InputStream input = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8));
+            InputStream input = new ByteArrayInputStream(RULES.getBytes(StandardCharsets.UTF_8));
-            kieFileSystem.write("src/main/resources/drools/rules.drl", kieServices.getResources().newInputStreamResource(input));
+            kieFileSystem.write("src/test/resources/drools/rules.drl", kieServices.getResources().newInputStreamResource(input));
             KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
             kieBuilder.buildAll();
             KieModule kieModule = kieBuilder.getKieModule();
 
             return kieServices.newKieContainer(kieModule.getReleaseId());
         }
+
     }
 
+
     @Before
     public void stubRulesClient() {
 
         when(rulesClient.getVersion()).thenReturn(0L);
-        when(rulesClient.getRules()).thenReturn(new RulesResponse(loadFromClassPath("drools/rules.drl")));
+        when(rulesClient.getRules()).thenReturn(new RulesResponse(RULES));
 
         loadDictionaryForTest();
         loadTypeForTest();
@@ -106,19 +109,41 @@ public class RedactionIntegrationTest {
         when(dictionaryClient.getDictionaryForType(DEFAULT)).thenReturn(getDictionaryResponse(DEFAULT));
     }
 
+
     private void loadDictionaryForTest() {
-        dictionary.computeIfAbsent(NAME_CODE, v -> new ArrayList<>()).addAll(ResourceLoader.load("dictionaries/names.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
+
-        dictionary.computeIfAbsent(VERTEBRATES_CODE, v -> new ArrayList<>()).addAll(ResourceLoader.load("dictionaries/vertebrates.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(NAME_CODE, v -> new ArrayList<>())
-        dictionary.computeIfAbsent(ADDRESS_CODE, v -> new ArrayList<>()).addAll(ResourceLoader.load("dictionaries/addresses.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
+                .addAll(ResourceLoader.load("dictionaries/names.txt")
-        dictionary.computeIfAbsent(NO_REDACTION_INDICATOR, v -> new ArrayList<>()).addAll(ResourceLoader.load("dictionaries/NoRedactionIndicator.txt").stream().map(this::cleanDictionaryEntry).collect(Collectors.toSet()));
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(VERTEBRATES_CODE, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/vertebrates.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(ADDRESS_CODE, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/addresses.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
+        dictionary.computeIfAbsent(NO_REDACTION_INDICATOR, v -> new ArrayList<>())
+                .addAll(ResourceLoader.load("dictionaries/NoRedactionIndicator.txt")
+                        .stream()
+                        .map(this::cleanDictionaryEntry)
+                        .collect(Collectors.toSet()));
         dictionary.put(DEFAULT, new ArrayList<>());
     }
 
+
     private String cleanDictionaryEntry(String entry) {
+
         return TextNormalizationUtilities.removeHyphenLineBreaks(entry).replaceAll("\\n", " ");
     }
 
+
     private void loadTypeForTest() {
+
         typeColorMap.put(VERTEBRATES_CODE, new float[]{0, 1, 0});
         typeColorMap.put(ADDRESS_CODE, new float[]{0, 1, 1});
         typeColorMap.put(NAME_CODE, new float[]{1, 1, 0});
@@ -126,21 +151,31 @@ public class RedactionIntegrationTest {
         typeColorMap.put(DEFAULT, new float[]{1, 0.502f, 0});
     }
 
+
     private List<TypeResult> getTypeResponse() {
-        return typeColorMap.entrySet().stream().map(typeColor -> TypeResult.builder().type(typeColor.getKey()).color(typeColor.getValue()).build()).collect(Collectors.toList());
+
+        return typeColorMap.entrySet()
+                .stream()
+                .map(typeColor -> TypeResult.builder().type(typeColor.getKey()).color(typeColor.getValue()).build())
+                .collect(Collectors.toList());
     }
 
+
     private DictionaryResponse getDictionaryResponse(String type) {
+
         return DictionaryResponse.builder().color(typeColorMap.get(type)).entries(dictionary.get(type)).build();
     }
 
+
     @Test
     public void redactionTest() throws IOException {
 
         long start = System.currentTimeMillis();
         ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S-Metolachlor_RAR_01_Volume_1_2018-09-06.pdf");
 
-        RedactionRequest request = RedactionRequest.builder().document(IOUtils.toByteArray(pdfFileResource.getInputStream())).build();
+        RedactionRequest request = RedactionRequest.builder()
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .build();
         request.setFlatRedaction(false);
 
         RedactionResult result = redactionController.redact(request);
@@ -154,12 +189,15 @@ public class RedactionIntegrationTest {
         System.out.println("numberOfPages: " + result.getNumberOfPages());
     }
 
+
     @Test
     public void classificationTest() throws IOException {
 
         ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/51 Fludioxonil_RAR_02_Volume_2_2018-02-21.pdf");
 
-        RedactionRequest request = RedactionRequest.builder().document(IOUtils.toByteArray(pdfFileResource.getInputStream())).build();
+        RedactionRequest request = RedactionRequest.builder()
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .build();
 
         RedactionResult result = redactionController.classify(request);
 
@@ -168,12 +206,15 @@ public class RedactionIntegrationTest {
         }
     }
 
+
     @Test
     public void sectionsTest() throws IOException {
 
         ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/51 Fludioxonil_RAR_02_Volume_2_2018-02-21.pdf");
 
-        RedactionRequest request = RedactionRequest.builder().document(IOUtils.toByteArray(pdfFileResource.getInputStream())).build();
+        RedactionRequest request = RedactionRequest.builder()
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .build();
 
         RedactionResult result = redactionController.sections(request);
 
@@ -182,12 +223,15 @@ public class RedactionIntegrationTest {
         }
     }
 
+
     @Test
     public void htmlTablesTest() throws IOException {
 
         ClassPathResource pdfFileResource = new ClassPathResource("files/Fludioxonil/51 Fludioxonil_RAR_02_Volume_2_2018-02-21.pdf");
 
-        RedactionRequest request = RedactionRequest.builder().document(IOUtils.toByteArray(pdfFileResource.getInputStream())).build();
+        RedactionRequest request = RedactionRequest.builder()
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .build();
 
         RedactionResult result = redactionController.htmlTables(request);
 
@@ -196,12 +240,15 @@ public class RedactionIntegrationTest {
         }
     }
 
+
     @Test
     public void htmlTableRotationTest() throws IOException {
 
         ClassPathResource pdfFileResource = new ClassPathResource("files/Metolachlor/S-Metolachlor_RAR_02_Volume_2_2018-09-06.pdf");
 
-        RedactionRequest request = RedactionRequest.builder().document(IOUtils.toByteArray(pdfFileResource.getInputStream())).build();
+        RedactionRequest request = RedactionRequest.builder()
+                .document(IOUtils.toByteArray(pdfFileResource.getInputStream()))
+                .build();
 
         RedactionResult result = redactionController.htmlTables(request);
 
@@ -210,10 +257,10 @@ public class RedactionIntegrationTest {
         }
     }
 
-    private String loadFromClassPath(String path) {
 
-        URL resource = ResourceLoader.class.getClassLoader()
+    private static String loadFromClassPath(String path) {
-                .getResource(path);
+
+        URL resource = ResourceLoader.class.getClassLoader().getResource(path);
         if (resource == null) {
             throw new IllegalArgumentException("could not load classpath resource: drools/rules.drl");
         }
@@ -221,12 +268,12 @@ public class RedactionIntegrationTest {
             StringBuilder sb = new StringBuilder();
             String str;
             while ((str = br.readLine()) != null) {
-                sb.append(str)
+                sb.append(str).append("\n");
-                        .append("\n");
             }
             return sb.toString();
         } catch (IOException e) {
             throw new IllegalArgumentException("could not load classpath resource: " + path, e);
         }
     }
+
 }