Pull request #94: dev mode features, exception generalisation

Merge in RED/redaction-service from feature/ruleset-integration to master

* commit 'c2669ab56843f3ec335cfb1cd7d1e59dc828fb98':
  fixed tests
  fixed tests
  dev mode features, exception generalisation

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

@@ -1,10 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.client;
 
+import com.iqser.red.service.configuration.v1.api.resource.DictionaryResource;
 import org.springframework.cloud.openfeign.FeignClient;
 
-import com.iqser.red.service.configuration.v1.api.resource.DictionaryResource;
+@FeignClient(name = "DictionaryResource", url = "${configuration-service.url}")
-import com.iqser.red.service.configuration.v1.api.resource.RulesResource;
-
-@FeignClient(name = "DictionaryResource", url = "http://" + RulesResource.SERVICE_NAME + ":8080")
 public interface DictionaryClient extends DictionaryResource {
 }

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

@@ -1,9 +1,8 @@
 package com.iqser.red.service.redaction.v1.server.client;
 
+import com.iqser.red.service.configuration.v1.api.resource.RulesResource;
 import org.springframework.cloud.openfeign.FeignClient;
 
-import com.iqser.red.service.configuration.v1.api.resource.RulesResource;
+@FeignClient(name = RulesResource.SERVICE_NAME, url = "${configuration-service.url}")
-
-@FeignClient(name = RulesResource.SERVICE_NAME, url = "http://" + RulesResource.SERVICE_NAME + ":8080")
 public interface RulesClient extends RulesResource {
 }

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

@@ -63,7 +63,7 @@ public class RedactionController implements RedactionResource {
                     classifiedDoc.getRulesVersion(),
                     redactionRequest.getRuleSetId());
 
-        } catch (IOException e) {
+        } catch (Exception e) {
             throw new RedactionException(e);
         }
 

redaction-service-v1/redaction-service-server-v1/src/main/resources/application-dev.yaml

@@ -0,0 +1,4 @@
+server:
+  port: 8083
+
+configuration-service.url: "http://localhost:8081"

redaction-service-v1/redaction-service-server-v1/src/main/resources/application.yml

@@ -1,6 +1,8 @@
 info:
   description: Redaction Service Server V1
 
+configuration-service.url: "http://configuration-service-v1:8080"
+
 server:
   port: 8080
 

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

@@ -58,10 +58,10 @@ import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.DEFINED_PORT;
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(webEnvironment = DEFINED_PORT)
+@SpringBootTest(webEnvironment = RANDOM_PORT)
 public class RedactionIntegrationTest {
 
     private static final String RULES = loadFromClassPath("drools/rules.drl");

redaction-service-v1/redaction-service-server-v1/src/test/resources/application.yml

@@ -1,9 +1,9 @@
+configuration-service.url: "http://configuration-service-v1:8080"
 
 ribbon:
   ConnectTimeout: 600000
   ReadTimeout: 600000
 
-
 spring:
   main:
     allow-bean-definition-overriding: true