From 619add75ea412de8ef331d9ae898412818b203c6 Mon Sep 17 00:00:00 2001
From: "Singla, Rajiv (rs153v)" <rs153v@att.com>
Date: Thu, 12 Oct 2017 11:15:16 -0400
Subject: 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
---
 .../analytics/common/service/filter/GenericJsonMessageFilter.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'dcae-analytics-common/src/main/java')

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);
             }
-- 
cgit 1.2.3-korg