X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dashboard%2Fwebapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fpolicyagentapi%2FPolicyAgentApiImpl.java;h=a2d8c3ed9eafdec08a114754a15f39b5c5509db6;hb=a2ad32a98e7a3f32214d3ecd7ca9730e3602d11f;hp=c0dde9bd1202ceff8ad96a9e5b56902a368a4285;hpb=7dc42f177188d1e56da95d366d94a65d37b0cec6;p=nonrtric.git

diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/policyagentapi/PolicyAgentApiImpl.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/policyagentapi/PolicyAgentApiImpl.java
index c0dde9bd..a2d8c3ed 100644
--- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/policyagentapi/PolicyAgentApiImpl.java
+++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/policyagentapi/PolicyAgentApiImpl.java
@@ -2,7 +2,7 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2019 AT&T Intellectual Property
+ * Copyright (C) 2019 Nordix Foundation
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,10 +28,10 @@ import com.google.gson.reflect.TypeToken;
 
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Type;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Vector;
 
 import org.immutables.gson.Gson;
 import org.immutables.value.Value;
@@ -55,7 +55,7 @@ import org.springframework.web.client.RestTemplate;
 public class PolicyAgentApiImpl implements PolicyAgentApi {
     private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-    RestTemplate restTemplate = new RestTemplate();
+    RestTemplate restTemplate;
 
     private static com.google.gson.Gson gson = new GsonBuilder() //
         .serializeNulls() //
@@ -66,8 +66,13 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
     @Autowired
     public PolicyAgentApiImpl(
         @org.springframework.beans.factory.annotation.Value("${policycontroller.url.prefix}") final String urlPrefix) {
+        this(urlPrefix, new RestTemplate());
         logger.debug("ctor prefix '{}'", urlPrefix);
+    }
+
+    public PolicyAgentApiImpl(String urlPrefix, RestTemplate restTemplate) {
         this.urlPrefix = urlPrefix;
+        this.restTemplate = restTemplate;
     }
 
     private String baseUrl() {
@@ -132,15 +137,15 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
     }
 
     @Override
-    public ResponseEntity<String> getPolicyInstance(String id) {
+    public ResponseEntity<Object> getPolicyInstance(String id) {
         String url = baseUrl() + "/policy?instance={id}";
         Map<String, ?> uriVariables = Map.of("id", id);
 
-        return this.restTemplate.getForEntity(url, String.class, uriVariables);
+        return this.restTemplate.getForEntity(url, Object.class, uriVariables);
     }
 
     @Override
-    public ResponseEntity<String> putPolicy(String policyTypeIdString, String policyInstanceId, String json,
+    public ResponseEntity<String> putPolicy(String policyTypeIdString, String policyInstanceId, Object json,
         String ric) {
         String url = baseUrl() + "/policy?type={type}&instance={instance}&ric={ric}&service={service}";
         Map<String, ?> uriVariables = Map.of( //
@@ -173,7 +178,7 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
     @Value.Immutable
     @Gson.TypeAdapters
     interface RicInfo {
-        public String name();
+        public String ricName();
 
         public Collection<String> nodeNames();
 
@@ -189,9 +194,9 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
         try {
             Type listType = new TypeToken<List<ImmutableRicInfo>>() {}.getType();
             List<RicInfo> rspParsed = gson.fromJson(rsp, listType);
-            Collection<String> result = new Vector<>(rspParsed.size());
+            Collection<String> result = new ArrayList<>(rspParsed.size());
             for (RicInfo ric : rspParsed) {
-                result.add(ric.name());
+                result.add(ric.ricName());
             }
             return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK);
         } catch (Exception e) {
@@ -199,10 +204,10 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
         }
     }
 
-    private HttpEntity<String> createJsonHttpEntity(String content) {
+    private HttpEntity<Object> createJsonHttpEntity(Object content) {
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
-        return new HttpEntity<String>(content, headers);
+        return new HttpEntity<>(content, headers);
     }
 
 }