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=c661e6616ad5456d50f6897e816d0a0561e091b6;hb=63c033af195f6b0dd4f12b92fa70965ee06bb60d;hp=b80389cf3e549916a8831824ddf3a36615d98754;hpb=c666f5e9ddadbe4ab6064b746189f5ff142f6d83;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 b80389cf..c661e661 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
@@ -25,12 +25,14 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.reflect.TypeToken;
+
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Type;
 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;
 import org.oransc.ric.portal.dashboard.model.ImmutablePolicyInfo;
@@ -44,7 +46,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
 @Component("PolicyAgentApi")
@@ -80,47 +81,54 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
     }
 
     @Override
-    public ResponseEntity<PolicyTypes> getAllPolicyTypes() throws RestClientException {
+    public ResponseEntity<String> getAllPolicyTypes() {
         String url = baseUrl() + "/policy_schemas";
         ResponseEntity<String> rsp = this.restTemplate.getForEntity(url, String.class);
         if (!rsp.getStatusCode().is2xxSuccessful()) {
-            return new ResponseEntity<>(rsp.getStatusCode());
+            return rsp;
         }
 
         PolicyTypes result = new PolicyTypes();
         JsonParser jsonParser = new JsonParser();
-        JsonArray schemas = jsonParser.parse(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);
+        try {
+            JsonArray schemas = jsonParser.parse(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);
+            }
+            return new ResponseEntity<>(gson.toJson(result), rsp.getStatusCode());
+        } catch (Exception e) {
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
-        return new ResponseEntity<>(result, rsp.getStatusCode());
     }
 
     @Override
-    public ResponseEntity<PolicyInstances> getPolicyInstancesForType(String type) {
+    public ResponseEntity<String> getPolicyInstancesForType(String type) {
         String url = baseUrl() + "/policies?type={type}";
         Map<String, ?> uriVariables = Map.of("type", type);
         ResponseEntity<String> rsp = this.restTemplate.getForEntity(url, String.class, uriVariables);
         if (!rsp.getStatusCode().is2xxSuccessful()) {
-            return new ResponseEntity<>(rsp.getStatusCode());
+            return rsp;
         }
 
-        Type listType = new TypeToken<List<ImmutablePolicyInfo>>() {}.getType();
-        List<PolicyInfo> rspParsed = gson.fromJson(rsp.getBody(), listType);
-
-        PolicyInstances result = new PolicyInstances();
-        for (PolicyInfo p : rspParsed) {
-            result.add(p);
+        try {
+            Type listType = new TypeToken<List<ImmutablePolicyInfo>>() {}.getType();
+            List<PolicyInfo> rspParsed = gson.fromJson(rsp.getBody(), listType);
+            PolicyInstances result = new PolicyInstances();
+            for (PolicyInfo p : rspParsed) {
+                result.add(p);
+            }
+            return new ResponseEntity<>(gson.toJson(result), rsp.getStatusCode());
+        } catch (Exception e) {
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
-        return new ResponseEntity<>(result, rsp.getStatusCode());
     }
 
     @Override
-    public ResponseEntity<String> getPolicyInstance(String id) throws RestClientException {
+    public ResponseEntity<String> getPolicyInstance(String id) {
         String url = baseUrl() + "/policy?instance={id}";
         Map<String, ?> uriVariables = Map.of("id", id);
 
@@ -128,8 +136,8 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
     }
 
     @Override
-    public ResponseEntity<String> putPolicy(String policyTypeIdString, String policyInstanceId, String json, String ric)
-        throws RestClientException {
+    public ResponseEntity<String> putPolicy(String policyTypeIdString, String policyInstanceId, String json,
+        String ric) {
         String url = baseUrl() + "/policy?type={type}&instance={instance}&ric={ric}&service={service}";
         Map<String, ?> uriVariables = Map.of( //
             "type", policyTypeIdString, //
@@ -139,17 +147,23 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
 
         try {
             this.restTemplate.put(url, json, uriVariables);
-            return new ResponseEntity<>(HttpStatus.OK);
+            return new ResponseEntity<>("Policy was put successfully", HttpStatus.OK);
         } catch (Exception e) {
-            return new ResponseEntity<>(e.getMessage(), HttpStatus.NOT_FOUND);
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
     }
 
     @Override
-    public void deletePolicy(String policyInstanceId) throws RestClientException {
+    public ResponseEntity<String> deletePolicy(String policyInstanceId) {
         String url = baseUrl() + "/policy?instance={instance}";
         Map<String, ?> uriVariables = Map.of("instance", policyInstanceId);
-        this.restTemplate.delete(url, uriVariables);
+        try {
+            this.restTemplate.delete(url, uriVariables);
+            return new ResponseEntity<>("Policy was deleted successfully", HttpStatus.NO_CONTENT);
+        } catch (Exception e) {
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.NOT_FOUND);
+        }
+
     }
 
     @Value.Immutable
@@ -163,19 +177,22 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
     }
 
     @Override
-    public ResponseEntity<Collection<String>> getRicsSupportingType(String typeName) {
+    public ResponseEntity<String> getRicsSupportingType(String typeName) {
         String url = baseUrl() + "/rics?policyType={typeName}";
         Map<String, ?> uriVariables = Map.of("typeName", typeName);
         String rsp = this.restTemplate.getForObject(url, String.class, uriVariables);
 
-        Type listType = new TypeToken<List<ImmutableRicInfo>>() {}.getType();
-        List<RicInfo> rspParsed = gson.fromJson(rsp, listType);
-
-        Collection<String> result = new Vector<>(rspParsed.size());
-        for (RicInfo ric : rspParsed) {
-            result.add(ric.name());
+        try {
+            Type listType = new TypeToken<List<ImmutableRicInfo>>() {}.getType();
+            List<RicInfo> rspParsed = gson.fromJson(rsp, listType);
+            Collection<String> result = new Vector<>(rspParsed.size());
+            for (RicInfo ric : rspParsed) {
+                result.add(ric.name());
+            }
+            return new ResponseEntity<>(gson.toJson(result), HttpStatus.OK);
+        } catch (Exception e) {
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
         }
-        return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
 }