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=eb3f836867198966e3b28730043dc537887c583a;hb=7a4a590fb0ebf8772169625cdda327da43c79c6d;hp=258086d6dc994d5a18c41afd897b315876ad6cf6;hpb=766e6af8d8ddf946ad5cb45a560b040e4857065e;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 258086d6..eb3f8368 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
@@ -26,7 +26,8 @@ import org.oransc.ric.portal.dashboard.model.PolicyInstances;
 import org.oransc.ric.portal.dashboard.model.PolicyType;
 import org.oransc.ric.portal.dashboard.model.PolicyTypes;
 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;
@@ -39,6 +40,10 @@ import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Type;
 
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
 
@@ -79,53 +84,57 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
         public String schema();
     }
 
-    private PolicyType toPolicyType(PolicyTypeInfo i) {
-        return new PolicyType(i.name(), i.schema());
-    }
-
     @Override
-    public PolicyTypes getAllPolicyTypes() throws RestClientException {
-        String url = baseUrl() + "/policy_types";
-        String rsp = this.restTemplate.getForObject(url, String.class);
-
-        Type listType = new TypeToken<List<ImmutablePolicyTypeInfo>>() {
-        }.getType();
-        List<PolicyTypeInfo> rspParsed = gson.fromJson(rsp, listType);
+    public ResponseEntity<PolicyTypes> getAllPolicyTypes() throws RestClientException {
+        String url = baseUrl() + "/policy_schemas";
+        ResponseEntity<String> rsp = this.restTemplate.getForEntity(url, String.class);
+        if (!rsp.getStatusCode().is2xxSuccessful()) {
+            return new ResponseEntity<>(rsp.getStatusCode());
+        }
 
         PolicyTypes result = new PolicyTypes();
-        for (PolicyTypeInfo i : rspParsed) {
-            result.add(toPolicyType(i));
+        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);
         }
-        return result;
+        return new ResponseEntity<>(result, rsp.getStatusCode());
     }
 
     @Override
-    public PolicyInstances getPolicyInstancesForType(String type) {
+    public ResponseEntity<PolicyInstances> getPolicyInstancesForType(String type) {
         String url = baseUrl() + "/policies?type={type}";
         Map<String, ?> uriVariables = Map.of("type", type);
-        String rsp = this.restTemplate.getForObject(url, String.class, uriVariables);
+        ResponseEntity<String> rsp = this.restTemplate.getForEntity(url, String.class, uriVariables);
+        if (!rsp.getStatusCode().is2xxSuccessful()) {
+            return new ResponseEntity<>(rsp.getStatusCode());
+        }
 
         Type listType = new TypeToken<List<ImmutablePolicyInfo>>() {
         }.getType();
-        List<PolicyInfo> rspParsed = gson.fromJson(rsp, listType);
+        List<PolicyInfo> rspParsed = gson.fromJson(rsp.getBody(), listType);
 
         PolicyInstances result = new PolicyInstances();
         for (PolicyInfo p : rspParsed) {
             result.add(p);
         }
-        return result;
+        return new ResponseEntity<>(result, rsp.getStatusCode());
     }
 
     @Override
-    public String getPolicyInstance(String id) throws RestClientException {
+    public ResponseEntity<String> getPolicyInstance(String id) throws RestClientException {
         String url = baseUrl() + "/policy?instance={id}";
         Map<String, ?> uriVariables = Map.of("id", id);
 
-        return this.restTemplate.getForObject(url, String.class, uriVariables);
+        return this.restTemplate.getForEntity(url, String.class, uriVariables);
     }
 
     @Override
-    public void putPolicy(String policyTypeIdString, String policyInstanceId, String json, String ric)
+    public ResponseEntity<String> putPolicy(String policyTypeIdString, String policyInstanceId, String json, String ric)
             throws RestClientException {
         String url = baseUrl() + "/policy?type={type}&instance={instance}&ric={ric}&service={service}";
         Map<String, ?> uriVariables = Map.of( //
@@ -134,7 +143,12 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
                 "ric", ric, //
                 "service", "dashboard");
 
-        this.restTemplate.put(url, json, uriVariables);
+        try {
+            this.restTemplate.put(url, json, uriVariables);
+            return new ResponseEntity<>(HttpStatus.OK);
+        } catch (Exception e) {
+            return new ResponseEntity<>(e.getMessage(), HttpStatus.NOT_FOUND);
+        }
     }
 
     @Override
@@ -155,7 +169,7 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
     }
 
     @Override
-    public Collection<String> getRicsSupportingType(String typeName) {
+    public ResponseEntity<Collection<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);
@@ -168,7 +182,7 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
         for (RicInfo ric : rspParsed) {
             result.add(ric.name());
         }
-        return result;
+        return new ResponseEntity<>(result, HttpStatus.OK);
     }
 
 }