Changed way of passing REMReM Generate Service uri and path from conf…

…igs (#111)
eiffel-community · Apr 19, 2018 · a90982a · a90982a
1 parent ac0f92c
commit a90982a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 0.5.7
+- Changed way of passing REMReM Generate Service uri and path from configs
+
 ## 0.5.6
 - Removed Protocol Interface dependency
 - Uplifted semantics version to 0.4.1

diff --git a/build.gradle b/build.gradle
@@ -60,7 +60,7 @@ subprojects {
     apply plugin: 'java'
 
     //Latest version for publish
-    version = "0.5.6"
+    version = "0.5.7"
 
     //Declare where to find the dependencies of project here
     repositories {

diff --git a/publish-common/src/main/resources/config.template.properties b/publish-common/src/main/resources/config.template.properties
@@ -23,9 +23,8 @@
   eiffelsemantics.rabbitmq.domainId: eiffelxxx
 
  # properties for server used to generate messages
-  generate.server.host: 127.0.0.1
-  generate.server.port: 8080
-  generate.server.appName: generate
+  generate.server.uri: http://127.0.0.1:8080
+  generate.server.path: /generate
 
 #Add rabbitmq properties for other protocols
 

diff --git a/...a/com/ericsson/eiffel/remrem/publish/controller/EiffelRemremCommonControllerUnitTest.java b/...a/com/ericsson/eiffel/remrem/publish/controller/EiffelRemremCommonControllerUnitTest.java
@@ -147,7 +147,7 @@ public void testGenerateURLTemplate() throws Exception {
         map.put("mp", mp);
         map.put("msgType", msgType);
 
-        String correctURL = "http://{generateServerHost}:{generateServerPort}/{generateServerAppName}/{mp}?msgType={msgType}";
+        String correctURL = "{generateServerUri}{generateServerPath}/{mp}?msgType={msgType}";
 
         Map<String, String> mapTest = generateURLTemplate.getMap(mp, msgType);
 

diff --git a/...vice/src/main/java/com/ericsson/eiffel/remrem/publish/controller/GenerateURLTemplate.java b/...vice/src/main/java/com/ericsson/eiffel/remrem/publish/controller/GenerateURLTemplate.java
@@ -13,26 +13,22 @@
 @Component
 public class GenerateURLTemplate {
 
-    @Value("${generate.server.host}")
-    private String generateServerHost;
+    @Value("${generate.server.uri}")
+    private String generateServerUri;
 
-    @Value("${generate.server.port}")
-    private String generateServerPort;
-
-    @Value("${generate.server.appName}")
-    private String generateServerAppName;
+    @Value("${generate.server.path}")
+    private String generateServerPath;
 
     public String getUrl() {
-        return "http://{generateServerHost}:{generateServerPort}/{generateServerAppName}/{mp}?msgType={msgType}";
+        return "{generateServerUri}{generateServerPath}/{mp}?msgType={msgType}";
     }
 
     public Map<String, String> getMap(final String mp, final String msgType) {
         Map<String, String> map = new HashMap<>();
         map.put("mp", mp);
         map.put("msgType", msgType);
-        map.put("generateServerHost", generateServerHost);
-        map.put("generateServerPort", generateServerPort);
-        map.put("generateServerAppName", generateServerAppName);
+        map.put("generateServerUri", generateServerUri);
+        map.put("generateServerPath", generateServerPath);
 
         return map;
     }