TCA:Bug fix for JsonPath with non array values

Change-Id: I98bd9b78a5c7017ca98a0ce85f2ea30a2cb682df
Signed-off-by: Singla, Rajiv (rs153v) <rs153v@att.com>
Issue-Id: DCAEGEN2-153

4 files changed, 24 insertions, 3 deletions

diff --git a/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/filter/GenericJsonMessageFilter.java b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/filter/GenericJsonMessageFilter.java
index 54de5cc..38e8d28 100644
--- a/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/filter/GenericJsonMessageFilter.java
+++ b/dcae-analytics-common/src/main/java/org/openecomp/dcae/apod/analytics/common/service/filter/GenericJsonMessageFilter.java
@@ -29,6 +29,7 @@ import org.openecomp.dcae.apod.analytics.common.service.processor.AbstractMessag
 import org.slf4j.Logger;

 import org.slf4j.LoggerFactory;

 

+import java.util.List;

 import java.util.Set;

 

 /**

@@ -77,7 +78,9 @@ public class GenericJsonMessageFilter extends AbstractMessageProcessor<JsonMessa
             final DocumentContext documentContext = JsonPath.parse(jsonMessage);

             String jsonPathValue = null;

             try {

-                jsonPathValue = documentContext.read(jsonPath, String.class);

+                final List jsonPathValues = documentContext.read(jsonPath);

+                final Object pathValue = jsonPathValues.isEmpty() ? null :  jsonPathValues.get(0);

+                jsonPathValue = pathValue instanceof Number ? pathValue.toString() : (String) pathValue;

             } catch (PathNotFoundException ex) {

                 LOG.info("Unable to find json Path: {}. Exception: {}, Json Message: {}", jsonPath, ex, jsonMessage);

             }

diff --git a/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/BaseAnalyticsCommonUnitTest.java b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/BaseAnalyticsCommonUnitTest.java
index 1cd59e8..fd28624 100644
--- a/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/BaseAnalyticsCommonUnitTest.java
+++ b/dcae-analytics-common/src/test/java/org/openecomp/dcae/apod/analytics/common/BaseAnalyticsCommonUnitTest.java
@@ -20,9 +20,13 @@
 

 package org.openecomp.dcae.apod.analytics.common;

 

+import com.fasterxml.jackson.databind.ObjectMapper;

+import com.google.common.base.Suppliers;

+import org.junit.BeforeClass;

 import org.openecomp.dcae.apod.analytics.common.service.processor.TestEarlyTerminatingProcessor;

 import org.openecomp.dcae.apod.analytics.common.service.processor.TestMessageProcessor1;

 import org.openecomp.dcae.apod.analytics.common.service.processor.TestMessageProcessor2;

+import org.openecomp.dcae.apod.analytics.model.util.json.AnalyticsModelObjectMapperSupplier;

 import org.openecomp.dcae.apod.analytics.test.BaseDCAEAnalyticsUnitTest;

 

 /**

@@ -37,6 +41,18 @@ public abstract class BaseAnalyticsCommonUnitTest extends BaseDCAEAnalyticsUnitT
 

     protected static final String CEF_MESSAGE_FILE_PATH = "data/json/cef/cef_message.json";

 

+    protected static ObjectMapper objectMapper;

+

+    /**

+     * Before running test cases need to assign object mapper.

+     */

+    @BeforeClass

+    public static void beforeClass() {

+        final AnalyticsModelObjectMapperSupplier analyticsModelObjectMapperSupplier =

+                new AnalyticsModelObjectMapperSupplier();

+        objectMapper = Suppliers.memoize(analyticsModelObjectMapperSupplier).get();

+    }

+

     /*

      * Test implementation for {@link CDAPAppSettings}

      */

diff --git a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplier.java b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplier.java
index ff98c3e..1a4feb3 100644
--- a/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplier.java
+++ b/dcae-analytics-model/src/main/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplier.java
@@ -104,7 +104,8 @@ public class AnalyticsModelObjectMapperSupplier implements Supplier<ObjectMapper
             public Set<Option> options() {

 

                 // Json Path exceptions are suppressed, also missing properties are tolerated

-                return EnumSet.of(Option.DEFAULT_PATH_LEAF_TO_NULL, Option.SUPPRESS_EXCEPTIONS);

+                return EnumSet.of(Option.DEFAULT_PATH_LEAF_TO_NULL, Option.SUPPRESS_EXCEPTIONS,

+                        Option.ALWAYS_RETURN_LIST);

             }

         });

 

diff --git a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplierTest.java b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplierTest.java
index 628b7ea..55dd817 100644
--- a/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplierTest.java
+++ b/dcae-analytics-model/src/test/java/org/openecomp/dcae/apod/analytics/model/util/json/AnalyticsModelObjectMapperSupplierTest.java
@@ -57,7 +57,8 @@ public class AnalyticsModelObjectMapperSupplierTest extends BaseAnalyticsModelUn
 

         final Set<Option> configurationOptions = configuration.getOptions();

         assertThat(configurationOptions,

-                containsInAnyOrder(Option.DEFAULT_PATH_LEAF_TO_NULL, Option.SUPPRESS_EXCEPTIONS));

+                containsInAnyOrder(Option.DEFAULT_PATH_LEAF_TO_NULL, Option.SUPPRESS_EXCEPTIONS,

+                        Option.ALWAYS_RETURN_LIST));

     }

 

 }