Fix for integration with SDK

Change-Id: I9947531e2cad813ac8936769147bee710db5a335
Issue-ID: DCAEGEN2-1096
Signed-off-by: pwielebs <piotr.wielebski@nokia.com>

diff --git a/datafile-app-server/config/datafile_endpoints.json b/datafile-app-server/config/datafile_endpoints.json
index 513ee24..7918954 100644 (file)
--- a/datafile-app-server/config/datafile_endpoints.json
+++ b/datafile-app-server/config/datafile_endpoints.json
@@ -11,7 +11,7 @@
                 "dmaapContentType": "application/json",
                 "consumerId": "C12",
                 "consumerGroup": "OpenDcae-c12",
-                "timeoutMS": -1,
+                "timeoutMs": -1,
                 "messageLimit": 1
             },
             "dmaapProducerConfiguration": {

diff --git a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/configuration/AppConfig.java b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/configuration/AppConfig.java
index 1e1b40d..e1e5af2 100644 (file)
--- a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/configuration/AppConfig.java
+++ b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/configuration/AppConfig.java
@@ -66,8 +66,8 @@ public class AppConfig extends DatafileAppConfig {
     @Value("${dmaap.dmaapConsumerConfiguration.consumerGroup:}")
     public String consumerGroup;
 
-    @Value("${dmaap.dmaapConsumerConfiguration.timeoutMS:}")
-    public Integer consumerTimeoutMS;
+    @Value("${dmaap.dmaapConsumerConfiguration.timeoutMs:}")
+    public Integer consumerTimeoutMs;
 
     @Value("${dmaap.dmaapConsumerConfiguration.message-limit:}")
     public Integer consumerMessageLimit;
@@ -147,7 +147,7 @@ public class AppConfig extends DatafileAppConfig {
                 .messageLimit(
                         Optional.ofNullable(consumerMessageLimit).filter(p -> !p.toString().isEmpty())
                                 .orElse(dmaapConsumerConfiguration.messageLimit()))
-                .timeoutMs(Optional.ofNullable(consumerTimeoutMS).filter(p -> !p.toString().isEmpty())
+                .timeoutMs(Optional.ofNullable(consumerTimeoutMs).filter(p -> !p.toString().isEmpty())
                         .orElse(dmaapConsumerConfiguration.timeoutMs()))
                 .consumerGroup(Optional.ofNullable(consumerGroup).filter(isEmpty.negate())
                         .orElse(dmaapConsumerConfiguration.consumerGroup()))

diff --git a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/configuration/CloudConfigParser.java b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/configuration/CloudConfigParser.java
index 44eba77..6c0c156 100644 (file)
--- a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/configuration/CloudConfigParser.java
+++ b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/configuration/CloudConfigParser.java
@@ -56,7 +56,7 @@ public class CloudConfigParser {
 
     DmaapConsumerConfiguration getDmaapConsumerConfig() {
         return new ImmutableDmaapConsumerConfiguration.Builder()
-                .timeoutMs(jsonObject.get("dmaap.dmaapConsumerConfiguration.timeoutMS").getAsInt())
+                .timeoutMs(jsonObject.get("dmaap.dmaapConsumerConfiguration.timeoutMs").getAsInt())
                 .dmaapHostName(jsonObject.get("dmaap.dmaapConsumerConfiguration.dmaapHostName").getAsString())
                 .dmaapUserName(jsonObject.get("dmaap.dmaapConsumerConfiguration.dmaapUserName").getAsString())
                 .dmaapUserPassword(jsonObject.get("dmaap.dmaapConsumerConfiguration.dmaapUserPassword").getAsString())

diff --git a/datafile-app-server/src/main/resources/datafile_endpoints.json b/datafile-app-server/src/main/resources/datafile_endpoints.json
index 9da01d7..0cf4188 100644 (file)
--- a/datafile-app-server/src/main/resources/datafile_endpoints.json
+++ b/datafile-app-server/src/main/resources/datafile_endpoints.json
@@ -11,7 +11,7 @@
                 "dmaapContentType": "application/json",
                 "consumerId": "C12",
                 "consumerGroup": "OpenDcae-c12",
-                "timeoutMS": -1,
+                "timeoutMs": -1,
                 "messageLimit": 1
             },
             "dmaapProducerConfiguration": {

diff --git a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/CloudConfigParserTest.java b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/CloudConfigParserTest.java
index 2e6b63b..3299f71 100644 (file)
--- a/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/CloudConfigParserTest.java
+++ b/datafile-app-server/src/test/java/org/onap/dcaegen2/collectors/datafile/configuration/CloudConfigParserTest.java
@@ -80,7 +80,7 @@ class CloudConfigParserTest {
 
     public JsonObject getCloudConfigJsonObject() {
         JsonObject config = new JsonObject();
-        config.addProperty("dmaap.dmaapConsumerConfiguration.timeoutMS", -1);
+        config.addProperty("dmaap.dmaapConsumerConfiguration.timeoutMs", -1);
         config.addProperty("dmaap.dmaapConsumerConfiguration.dmaapHostName", "message-router.onap.svc.cluster.local");
         config.addProperty("dmaap.dmaapConsumerConfiguration.dmaapUserName", "admin");
         config.addProperty("dmaap.dmaapConsumerConfiguration.dmaapUserPassword", "admin");

diff --git a/datafile-app-server/src/test/resources/datafile_endpoints.json b/datafile-app-server/src/test/resources/datafile_endpoints.json
index af39ac9..a9545f4 100644 (file)
--- a/datafile-app-server/src/test/resources/datafile_endpoints.json
+++ b/datafile-app-server/src/test/resources/datafile_endpoints.json
@@ -11,7 +11,7 @@
                 "dmaapUserPassword": "admin",
                 "dmaapContentType": "application/json",
                 "consumerGroup": "OpenDcae-c12",
-                "timeoutMS": -1,
+                "timeoutMs": -1,
                 "messageLimit": 1
             },
             "dmaapProducerConfiguration": {

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index f8d59cf..481072f 100644 (file)
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       --dmaap.dmaapConsumerConfiguration.dmaapContentType=application/json
       --dmaap.dmaapConsumerConfiguration.consumerId=C12
       --dmaap.dmaapConsumerConfiguration.consumerGroup=OpenDCAE-c12
-      --dmaap.dmaapConsumerConfiguration.timeoutMS=-1
+      --dmaap.dmaapConsumerConfiguration.timeoutMs=-1
       --dmaap.dmaapConsumerConfiguration.message-limit=-1
       --dmaap.dmaapProducerConfiguration.dmaapHostName=<HOST-TO-SET-DMAAP-DR>
       --dmaap.dmaapProducerConfiguration.dmaapPortNumber=8443