Remove Sonar warnings

[portal/nonrtric-controlpanel.git] / webapp-backend / src / test / java / org / oransc / portal / nonrtric / controlpanel / config / PolicyControllerMockConfiguration.java

diff --git a/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/config/PolicyControllerMockConfiguration.java b/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/config/PolicyControllerMockConfiguration.java
index 0f9599b..6fb657b 100644 (file)
--- a/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/config/PolicyControllerMockConfiguration.java
+++ b/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/config/PolicyControllerMockConfiguration.java
@@ -21,7 +21,6 @@
 package org.oransc.portal.nonrtric.controlpanel.config;
 
 import com.google.gson.GsonBuilder;
-
 import java.io.BufferedReader;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -34,12 +33,12 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Vector;
 import java.util.stream.Collectors;
+import org.oransc.portal.nonrtric.controlpanel.model.ImmutablePolicyInfo;
 import org.oransc.portal.nonrtric.controlpanel.model.PolicyInfo;
 import org.oransc.portal.nonrtric.controlpanel.model.PolicyInstances;
 import org.oransc.portal.nonrtric.controlpanel.model.PolicyType;
 import org.oransc.portal.nonrtric.controlpanel.model.PolicyTypes;
 import org.oransc.portal.nonrtric.controlpanel.policyagentapi.PolicyAgentApi;
-import org.oransc.portal.nonrtric.controlpanel.model.ImmutablePolicyInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.test.context.TestConfiguration;
@@ -78,13 +77,13 @@ public class PolicyControllerMockConfiguration {
         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);
+            return new ResponseEntity<>(HttpStatus.OK);
         }
 
         @Override
         public ResponseEntity<String> deletePolicy(String policyInstanceId) {
             database.deleteInstance(policyInstanceId);
-            return new ResponseEntity<>("Policy was deleted successfully", HttpStatus.NO_CONTENT);
+            return new ResponseEntity<>(HttpStatus.OK);
         }
 
         @Override
@@ -115,8 +114,11 @@ public class PolicyControllerMockConfiguration {
     class Database {
 
         Database() {
+            PolicyType policyType = new PolicyType("", "{}");
+            types.put("", policyType);
+
             String schema = getStringFromFile("demo-policy-schema-1.json");
-            PolicyType policyType = new PolicyType("type2", schema);
+            policyType = new PolicyType("type2", schema);
             types.put("type2", policyType);
 
             schema = getStringFromFile("demo-policy-schema-2.json");
@@ -126,6 +128,8 @@ public class PolicyControllerMockConfiguration {
             schema = getStringFromFile("demo-policy-schema-3.json");
             policyType = new PolicyType("type4", schema);
             types.put("type4", policyType);
+
+            putInstance("", "123", "{\"data\":\"data\"}", "ric_1");
         }
 
         private String getStringFromFile(String path) {