From: PatrikBuhr <patrik.buhr@est.tech>
Date: Tue, 21 Apr 2020 06:43:12 +0000 (+0200)
Subject: Bugfix, handling of empty types
X-Git-Tag: BronzeRC0~10^2
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=c5abb3fc87ac95b29b212326158c93f97e8574a0;p=portal%2Fnonrtric-controlpanel.git

Bugfix, handling of empty types

The controlpanel did not cope with the empty type used for indicating
"no type". Fixed by ignoring it.

Change-Id: If2d362b58dbfdfdf85eaafbee2536c49c025bfc8
Issue-ID: NONRTRIC-152
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
---

diff --git a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/policyagentapi/PolicyAgentApiImpl.java b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/policyagentapi/PolicyAgentApiImpl.java
index ef90b5d..30dcdc5 100644
--- a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/policyagentapi/PolicyAgentApiImpl.java
+++ b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/policyagentapi/PolicyAgentApiImpl.java
@@ -105,10 +105,14 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
             JsonArray schemas = JsonParser.parseString(rsp.getBody()).getAsJsonArray();
             for (JsonElement schema : schemas) {
                 JsonObject schemaObj = schema.getAsJsonObject();
-                String title = schemaObj.get("title").getAsString();
-                String schemaAsStr = schemaObj.toString();
-                PolicyType pt = new PolicyType(title, schemaAsStr);
-                result.add(pt);
+                if (schemaObj.get("title") != null) {
+                    String title = schemaObj.get("title").getAsString();
+                    String schemaAsStr = schemaObj.toString();
+                    PolicyType pt = new PolicyType(title, schemaAsStr);
+                    result.add(pt);
+                } else {
+                    logger.warn("Ignoring schema: {}", schemaObj);
+                }
             }
             return new ResponseEntity<>(gson.toJson(result), rsp.getStatusCode());
         } catch (Exception e) {