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=9c6d40ccddb2afbb27a3e64ed1b4725ba085f380;hb=53bedeac58c92f6219ee7961d7baccf11984b900;hp=2268fe06dcd15b1574f65ad9735b7d3ce5293d3d;hpb=1a9139f93043e662fc7b132af2c7af2bd054d637;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 2268fe06..9c6d40cc 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 @@ -57,8 +57,8 @@ public class PolicyControllerMockConfiguration { private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); private static com.google.gson.Gson gson = new GsonBuilder() // - .serializeNulls() // - .create(); // + .serializeNulls() // + .create(); // @Bean public PolicyAgentApi policyAgentApi() { @@ -70,13 +70,13 @@ public class PolicyControllerMockConfiguration { private final Database database = new Database(); @Override - public ResponseEntity getPolicyInstance(String id) { + public ResponseEntity getPolicyInstance(String id) { return new ResponseEntity<>(database.getInstance(id), HttpStatus.OK); } @Override - public ResponseEntity putPolicy(String policyTypeIdString, String policyInstanceId, String json, - String ric) { + public ResponseEntity putPolicy(String policyTypeIdString, String policyInstanceId, Object json, + String ric) { database.putInstance(policyTypeIdString, policyInstanceId, json, ric); return new ResponseEntity<>("Policy was put successfully", HttpStatus.OK); } @@ -130,8 +130,8 @@ public class PolicyControllerMockConfiguration { private String getStringFromFile(String path) { try { - InputStream inputStream = MethodHandles.lookup().lookupClass().getClassLoader() - .getResourceAsStream(path); + InputStream inputStream = + MethodHandles.lookup().lookupClass().getClassLoader().getResourceAsStream(path); return new BufferedReader(new InputStreamReader(inputStream)).lines().collect(Collectors.joining("\n")); } catch (Exception e) { logger.error("Cannot read file :" + path, e); @@ -147,9 +147,9 @@ 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(); + .id(instanceId).ric(ric).service("service").type(typeId).build(); instances.put(instanceId, i); } @@ -157,7 +157,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);