X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dashboard%2Fwebapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fconfig%2FPolicyControllerMockConfiguration.java;h=836463dbc19377edcf4167c06274d804e4f5e12e;hb=0bf1e8c65fb6b3c2a011e25587500fa45d50d6c0;hp=e695b688322caa15dea8df770d9ae049c776b9e8;hpb=fb4bc7967a4733d10775351440a3af14327d5f20;p=nonrtric.git

diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/PolicyControllerMockConfiguration.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/PolicyControllerMockConfiguration.java
index e695b688..836463db 100644
--- a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/PolicyControllerMockConfiguration.java
+++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/config/PolicyControllerMockConfiguration.java
@@ -3,6 +3,7 @@
  * O-RAN-SC
  * %%
  * Copyright (C) 2019 Nordix Foundation
+ * Modifications Copyright (C) 2020 Nordix Foundation
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,12 +71,12 @@ public class PolicyControllerMockConfiguration {
         private final Database database = new Database();
 
         @Override
-        public ResponseEntity<String> getPolicyInstance(String id) {
+        public ResponseEntity<Object> getPolicyInstance(String id) {
             return new ResponseEntity<>(database.getInstance(id), HttpStatus.OK);
         }
 
         @Override
-        public ResponseEntity<String> putPolicy(String policyTypeIdString, String policyInstanceId, String json,
+        public ResponseEntity<String> putPolicy(String policyTypeIdString, String policyInstanceId, Object json,
             String ric) {
             database.putInstance(policyTypeIdString, policyInstanceId, json, ric);
             return new ResponseEntity<>("Policy was put successfully", HttpStatus.OK);
@@ -115,26 +116,17 @@ public class PolicyControllerMockConfiguration {
     class Database {
 
         Database() {
-            String schema = getStringFromFile("anr-policy-schema.json");
-            PolicyType policy = new PolicyType("ANR", schema);
-            types.put("ANR", policy);
-
-            schema = getStringFromFile("demo-policy-schema-1.json");
-            policy = new PolicyType("type2", schema);
-            types.put("type2", policy);
+            String schema = getStringFromFile("demo-policy-schema-1.json");
+            PolicyType policyType = new PolicyType("type2", schema);
+            types.put("type2", policyType);
 
             schema = getStringFromFile("demo-policy-schema-2.json");
-            policy = new PolicyType("type3", schema);
-            types.put("type3", policy);
+            policyType = new PolicyType("type3", schema);
+            types.put("type3", policyType);
 
             schema = getStringFromFile("demo-policy-schema-3.json");
-            policy = new PolicyType("type4", schema);
-            types.put("type4", policy);
-            try {
-                putInstance("ANR", "ANR-1", getStringFromFile("anr-policy-instance.json"), "ric_1");
-            } catch (Exception e) {
-                // Nothing
-            }
+            policyType = new PolicyType("type4", schema);
+            types.put("type4", policyType);
         }
 
         private String getStringFromFile(String path) {
@@ -156,7 +148,7 @@ public class PolicyControllerMockConfiguration {
             return java.time.Instant.now().toString();
         }
 
-        void putInstance(String typeId, String instanceId, String instanceData, String ric) {
+        void putInstance(String typeId, String instanceId, Object instanceData, String ric) {
             PolicyInfo i = ImmutablePolicyInfo.builder().json(instanceData).lastModified(getTimeStampUTC())
                 .id(instanceId).ric(ric).service("service").type(typeId).build();
             instances.put(instanceId, i);
@@ -166,7 +158,7 @@ public class PolicyControllerMockConfiguration {
             instances.remove(instanceId);
         }
 
-        String getInstance(String id) throws RestClientException {
+        Object getInstance(String id) throws RestClientException {
             PolicyInfo i = instances.get(id);
             if (i == null) {
                 throw new RestClientException("Type not found: " + id);