From 6412cf37d96bc5ee9035a421203a2066623982f8 Mon Sep 17 00:00:00 2001
From: Timo <timo@devplant.ro>
Date: Wed, 6 Jan 2021 16:41:16 +0200
Subject: [PATCH] dev mode features, exception generalisation

---
 .../redaction/v1/server/client/DictionaryClient.java        | 6 ++----
 .../red/service/redaction/v1/server/client/RulesClient.java | 5 ++---
 .../redaction/v1/server/controller/RedactionController.java | 2 +-
 .../src/main/resources/application-dev.yaml                 | 4 ++++
 4 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 redaction-service-v1/redaction-service-server-v1/src/main/resources/application-dev.yaml

diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/DictionaryClient.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/DictionaryClient.java
index dfefd00f..422c97bb 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/DictionaryClient.java
+++ b/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;
-import com.iqser.red.service.configuration.v1.api.resource.RulesResource;
-
-@FeignClient(name = "DictionaryResource", url = "http://" + RulesResource.SERVICE_NAME + ":8080")
+@FeignClient(name = "DictionaryResource", url = "${configuration-service.url}")
 public interface DictionaryClient extends DictionaryResource {
 }
\ No newline at end of file
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/RulesClient.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/RulesClient.java
index 2923df83..ce41a3ce 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/client/RulesClient.java
+++ b/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 = "http://" + RulesResource.SERVICE_NAME + ":8080")
+@FeignClient(name = RulesResource.SERVICE_NAME, url = "${configuration-service.url}")
 public interface RulesClient extends RulesResource {
 }
\ No newline at end of file
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RedactionController.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RedactionController.java
index 4db4c2fc..63bbcb0a 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/controller/RedactionController.java
+++ b/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);
         }
 
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/resources/application-dev.yaml b/redaction-service-v1/redaction-service-server-v1/src/main/resources/application-dev.yaml
new file mode 100644
index 00000000..302d198a
--- /dev/null
+++ b/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"
\ No newline at end of file