From: Ram Krishna Verma <ram_krishna.verma@bell.ca>
Date: Fri, 9 Sep 2022 13:24:34 +0000 (+0000)
Subject: Revert "Fix bug in json schema helper"
X-Git-Tag: 2.5.6~5^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F17%2F130617%2F1;p=policy%2Fapex-pdp.git

Revert "Fix bug in json schema helper"

This reverts commit 76c38f09e566b09c9879bdd624b6919b6840beed.

Reason for revert: The bug was not in the code, rather in the schemas defined in the policy implementation.

Issue-ID: POLICY-4353
Change-Id: I39b60bc40e8c3be8e5820e7d618ef0c47916056d
Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
---

diff --git a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-json/src/main/java/org/onap/policy/apex/plugins/context/schema/json/JsonSchemaHelper.java b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-json/src/main/java/org/onap/policy/apex/plugins/context/schema/json/JsonSchemaHelper.java
index 02aea150c..4896e5d4a 100644
--- a/plugins/plugins-context/plugins-context-schema/plugins-context-schema-json/src/main/java/org/onap/policy/apex/plugins/context/schema/json/JsonSchemaHelper.java
+++ b/plugins/plugins-context/plugins-context-schema/plugins-context-schema-json/src/main/java/org/onap/policy/apex/plugins/context/schema/json/JsonSchemaHelper.java
@@ -117,6 +117,6 @@ public class JsonSchemaHelper extends AbstractSchemaHelper {
      * @return true if it's a straight pass through
      */
     private boolean passThroughObject(final Object object) {
-        return (object instanceof Map || object instanceof List);
+        return (object instanceof JsonElement || object instanceof Map || object instanceof List);
     }
 }