From bfdd5bb6f922b2ffbf87251e607de3ae73782984 Mon Sep 17 00:00:00 2001
From: elinuxhenrik <henrik.b.andersson@est.tech>
Date: Mon, 4 May 2020 17:37:59 +0200
Subject: [PATCH] Fixing timeout parameter in MRConsumer

The properties for the timeout and limit parameters where added as
integers, but should be added as strings to the properties.

Change-Id: I02b84362d1a6c9cc38a4c670f3e4b40ecba235be
Issue-ID: NONRTRIC-209
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
---
 policy-agent/pom.xml                                              | 2 +-
 .../oransc/policyagent/configuration/ApplicationConfigParser.java | 4 ++--
 .../policyagent/configuration/ApplicationConfigParserTest.java    | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/policy-agent/pom.xml b/policy-agent/pom.xml
index aec78f2d..8ed33684 100644
--- a/policy-agent/pom.xml
+++ b/policy-agent/pom.xml
@@ -58,7 +58,7 @@
         <formatter-maven-plugin.version>2.8.1</formatter-maven-plugin.version>
         <spotless-maven-plugin.version>1.18.0</spotless-maven-plugin.version>
         <docker-maven-plugin>0.30.0</docker-maven-plugin>
-        <version.dmaap>1.1.9</version.dmaap>
+        <version.dmaap>1.1.11</version.dmaap>
         <javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>
         <sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>
         <jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
diff --git a/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java b/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java
index ea660537..8418749e 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java
@@ -205,8 +205,8 @@ public class ApplicationConfigParser {
             dmaapProps.put("group", path.consumerGroup);
             dmaapProps.put("id", path.consumerId);
             dmaapProps.put("TransportType", ProtocolTypeConstants.HTTPNOAUTH.toString());
-            dmaapProps.put("timeout", 15000);
-            dmaapProps.put("limit", 100);
+            dmaapProps.put("timeout", "15000");
+            dmaapProps.put("limit", "100");
             dmaapProps.put("maxBatchSize", "10");
             dmaapProps.put("maxAgeMs", "10000");
             dmaapProps.put("compress", true);
diff --git a/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigParserTest.java b/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigParserTest.java
index eb37ec56..79eb07a6 100644
--- a/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigParserTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/configuration/ApplicationConfigParserTest.java
@@ -68,8 +68,8 @@ public class ApplicationConfigParserTest {
             () -> assertEquals("admin", actualPublisherConfig.get("password"), "Wrong password"),
             () -> assertEquals(ProtocolTypeConstants.HTTPNOAUTH.toString(), actualPublisherConfig.get("TransportType"),
                 "Wrong TransportType"),
-            () -> assertEquals(15000, actualPublisherConfig.get("timeout"), "Wrong timeout"),
-            () -> assertEquals(100, actualPublisherConfig.get("limit"), "Wrong limit"));
+            () -> assertEquals("15000", actualPublisherConfig.get("timeout"), "Wrong timeout"),
+            () -> assertEquals("100", actualPublisherConfig.get("limit"), "Wrong limit"));
 
         Properties actualConsumerConfig = result.dmaapConsumerConfig();
         assertAll("consumerConfig",
@@ -84,8 +84,8 @@ public class ApplicationConfigParserTest {
             () -> assertEquals("policy-agent", actualConsumerConfig.get("id"), "Wrong id"),
             () -> assertEquals(ProtocolTypeConstants.HTTPNOAUTH.toString(), actualConsumerConfig.get("TransportType"),
                 "Wrong TransportType"),
-            () -> assertEquals(15000, actualConsumerConfig.get("timeout"), "Wrong timeout"),
-            () -> assertEquals(100, actualConsumerConfig.get("limit"), "Wrong limit"));
+            () -> assertEquals("15000", actualConsumerConfig.get("timeout"), "Wrong timeout"),
+            () -> assertEquals("100", actualConsumerConfig.get("limit"), "Wrong limit"));
 
         Map<String, ControllerConfig> controllers = result.controllerConfigs();
         assertEquals(1, controllers.size(), "size");
-- 
2.16.6