Fix filter config as an object

* Add use exisiting to DR feed
* Add resource configuration
* Add support for filter config as escaped JSON string

Issue-ID: DCAEGEN2-1826
Change-Id: Ie4fe45e0443af8eb4d859e66609aa6cbffd0e920
Signed-off-by: JoeOLeary <joseph.o.leary@est.tech>

7 files changed, 170 insertions, 17 deletions

diff --git a/dpo/blueprints/k8s-pm-mapper.yaml b/dpo/blueprints/k8s-pm-mapper.yaml
index 1c9578f..c372618 100644
--- a/dpo/blueprints/k8s-pm-mapper.yaml
+++ b/dpo/blueprints/k8s-pm-mapper.yaml
@@ -29,7 +29,7 @@ inputs:
   filter:
     type: string
     description: PM Mapper filter on measInfo, measInfoId, measType, instanceId
-    default: '{ "filters":[]}'
+    default: "{ \"filters\":[] }"
   enable_http:
     type: boolean
     description: Option to turn on HTTP connections
@@ -99,12 +99,25 @@ inputs:
     type: string
     description: DMAAP Message Router host port
     default: '3905'
+  cpu_limit:
+    type: string
+    default: '1000m'
+  cpu_request:
+    type: string
+    default: '1000m'
+  memory_limit:
+    type: string
+    default: '1024Mi'
+  memory_request:
+    type: string
+    default: '1024Mi'
 
 node_templates:
   pm-feed:
     type: ccsdk.nodes.Feed
     properties:
       feed_name: { get_input: feed_name }
+      useExisting: true
 
   pm-topic:
     type: ccsdk.nodes.Topic
@@ -148,6 +161,13 @@ node_templates:
           dmaap_publisher:
             type: message_router
             dmaap_info: <<pm-topic>>
+      resource_config:
+        limits:
+          cpu: { get_input: cpu_limit }
+          memory: { get_input: memory_limit }
+        requests:
+          cpu: { get_input: cpu_request }
+          memory: { get_input: memory_request }
       docker_config:
         healthcheck:
           endpoint: /healthcheck
diff --git a/pom.xml b/pom.xml
index c25b53b..c0d3ee7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
     <groupId>org.onap.dcaegen2.services</groupId>
     <artifactId>pm-mapper</artifactId>
-    <version>1.1.3-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
 
     <parent>
         <groupId>org.onap.oparent</groupId>
diff --git a/src/main/java/org/onap/dcaegen2/services/pmmapper/model/MapperConfig.java b/src/main/java/org/onap/dcaegen2/services/pmmapper/model/MapperConfig.java
index 385a256..ac315ac 100644
--- a/src/main/java/org/onap/dcaegen2/services/pmmapper/model/MapperConfig.java
+++ b/src/main/java/org/onap/dcaegen2/services/pmmapper/model/MapperConfig.java
@@ -29,6 +29,7 @@ import lombok.ToString;
 import org.onap.dcaegen2.services.pmmapper.config.Configurable;
 import org.onap.dcaegen2.services.pmmapper.utils.DMaaPAdapter;
 import org.onap.dcaegen2.services.pmmapper.utils.GSONRequired;
+import org.onap.dcaegen2.services.pmmapper.utils.MeasFilterConfigAdapter;
 
 @Getter
 @EqualsAndHashCode
@@ -64,6 +65,7 @@ public class MapperConfig implements Configurable {
 
     @GSONRequired
     @SerializedName("pm-mapper-filter")
+    @JsonAdapter(MeasFilterConfigAdapter.class)
     private MeasFilterConfig filterConfig;
 
     @GSONRequired
diff --git a/src/main/java/org/onap/dcaegen2/services/pmmapper/utils/MeasFilterConfigAdapter.java b/src/main/java/org/onap/dcaegen2/services/pmmapper/utils/MeasFilterConfigAdapter.java
new file mode 100644
index 0000000..1826707
--- /dev/null
+++ b/src/main/java/org/onap/dcaegen2/services/pmmapper/utils/MeasFilterConfigAdapter.java
@@ -0,0 +1,57 @@
+/*-
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2019 Nordix Foundation.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.dcaegen2.services.pmmapper.utils;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import org.onap.dcaegen2.services.pmmapper.model.MeasFilterConfig;
+import org.onap.logging.ref.slf4j.ONAPLogAdapter;
+import org.slf4j.LoggerFactory;
+
+public class MeasFilterConfigAdapter extends TypeAdapter<MeasFilterConfig> {
+    private static final ONAPLogAdapter logger = new ONAPLogAdapter(
+            LoggerFactory.getLogger(MeasFilterConfigAdapter.class));
+
+    @Override
+    public void write(JsonWriter jsonWriter, MeasFilterConfig o) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public MeasFilterConfig read(JsonReader jsonReader) throws IOException {
+        JsonElement rootElement = new JsonParser().parse(jsonReader);
+        if (rootElement.isJsonObject()) {
+            logger.unwrap().debug("Reading filter as an object.");
+            return new Gson().fromJson(rootElement, MeasFilterConfig.class);
+        } else if (rootElement.isJsonPrimitive()) {
+            logger.unwrap().debug("Reading filter as an object in a JSON string.");
+            return new Gson().fromJson(rootElement.getAsString(), MeasFilterConfig.class);
+        } else {
+            logger.unwrap().error("Filter does not appear to be formatted correctly.");
+            throw new UnsupportedOperationException("Expected an Object or Object as JSON String.");
+        }
+    }
+}
diff --git a/src/test/java/org/onap/dcaegen2/services/pmmapper/utils/MeasFilterConfigAdapterTest.java b/src/test/java/org/onap/dcaegen2/services/pmmapper/utils/MeasFilterConfigAdapterTest.java
new file mode 100644
index 0000000..a2d53de
--- /dev/null
+++ b/src/test/java/org/onap/dcaegen2/services/pmmapper/utils/MeasFilterConfigAdapterTest.java
@@ -0,0 +1,86 @@
+/*-
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2019 Nordix Foundation.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.dcaegen2.services.pmmapper.utils;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.stream.JsonReader;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.onap.dcaegen2.services.pmmapper.model.MeasFilterConfig;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+@ExtendWith(MockitoExtension.class)
+class MeasFilterConfigAdapterTest {
+    private MeasFilterConfigAdapter objUnderTest;
+    @BeforeEach
+    void setup() {
+        objUnderTest = new MeasFilterConfigAdapter();
+    }
+
+    @Test
+    void testValidConfigString() throws IOException {
+        String filter ="\"{\\\"filters\\\": [{\\\"pmDefVsn\\\":\\\"V9\\\", \\\"nfType\\\": \\\"NrRadio\\\"," +
+                "\\\"vendor\\\": \\\"Ericsson\\\", \\\"measTypes\\\": [\\\"A\\\", \\\"B\\\"]}]}\"";
+        MeasFilterConfig filterConfig = objUnderTest.read(new JsonReader(new StringReader(filter)));
+        assertEquals(2, filterConfig.getFilters().get(0).getMeasTypes().size());
+    }
+
+    @Test
+    void testValidConfigObject() throws IOException {
+        String filter = "{\"filters\": [{\"pmDefVsn\":\"V9\", \"nfType\": \"NrRadio\"," +
+                "\"vendor\":\"Ericsson\", \"measTypes\": [\"A\"]}]}";
+        MeasFilterConfig filterConfig = objUnderTest.read(new JsonReader(new StringReader(filter)));
+        assertEquals(1, filterConfig.getFilters().get(0).getMeasTypes().size());
+    }
+
+    @Test
+    void testInvalidConfigObject() throws IOException {
+        String filter = "{\"filters\": \"invalid\"}";
+        assertThrows(JsonSyntaxException.class, () -> objUnderTest.read(new JsonReader(new StringReader(filter))));
+    }
+
+    @Test
+    void testInvalidConfigString() throws IOException {
+        String filter ="\"{\\\"filters\\\": [{\"pmDefVsn\":\\\"V9\\\", \\\"nfType\\\": \\\"NrRadio\\\"," +
+                "\\\"vendor\\\": \\\"Ericsson\\\", \\\"measTypes\\\": [\\\"A\\\", \\\"B\\\"]}]}\"";
+        assertThrows(JsonSyntaxException.class, () -> objUnderTest.read(new JsonReader(new StringReader(filter))));
+    }
+
+    @Test
+    void testUnsupportedJSONType() throws IOException {
+        String filter = "[]";
+        assertThrows(UnsupportedOperationException.class, () -> objUnderTest.read(new JsonReader(new StringReader(filter))));
+    }
+
+    @Test
+    void testFailWriting() {
+        assertThrows(UnsupportedOperationException.class, () -> objUnderTest.write(null, null));
+    }
+}
diff --git a/src/test/resources/valid_mapper_config.json b/src/test/resources/valid_mapper_config.json
index 39d4ee6..07ccdb1 100644
--- a/src/test/resources/valid_mapper_config.json
+++ b/src/test/resources/valid_mapper_config.json
@@ -1,17 +1,5 @@
 {

-  "pm-mapper-filter": {

-    "filters": [

-      {

-        "pmDefVsn": "V9",

-        "nfType": "NrRadio",

-        "vendor": "Ericsson",

-        "measTypes": [

-          "A",

-          "B"

-        ]

-      }

-    ]

-  },

+  "pm-mapper-filter": "{\"filters\": [{\"pmDefVsn\": \"V9\", \"nfType\": \"NrRadio\", \"vendor\": \"Ericsson\", \"measTypes\": [\"A\", \"B\"]}]}",

   "key_store_path": "src/test/resources/testkeystore.jks.b64",

   "key_store_pass_path": "src/test/resources/password",

   "trust_store_path": "src/test/resources/testkeystore.jks.b64",

diff --git a/version.properties b/version.properties
index 914ccdc..12d377c 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=1
-minor=1
-patch=3
+minor=2
+patch=0
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
\ No newline at end of file