X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fclients%2FStdA1Client.java;h=73adecee44e3abc80efc69f0b02c65e9faf14046;hb=9c86f9c3b94494d587e7ae7a61effe6515f11159;hp=4c1d140a2fb6f4d4fc926462036b9f3ad380dced;hpb=e8c7fa0b02b0918b3b56a1fc162968a3eef282dc;p=nonrtric.git

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/clients/StdA1Client.java b/policy-agent/src/main/java/org/oransc/policyagent/clients/StdA1Client.java
index 4c1d140a..73adecee 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/clients/StdA1Client.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/clients/StdA1Client.java
@@ -20,73 +20,82 @@
 
 package org.oransc.policyagent.clients;
 
-import java.lang.invoke.MethodHandles;
-import java.util.ArrayList;
 import java.util.List;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
 import org.oransc.policyagent.configuration.RicConfig;
 import org.oransc.policyagent.repository.Policy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.springframework.web.util.UriComponentsBuilder;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 public class StdA1Client implements A1Client {
-    private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+    private static final String URL_PREFIX = "/A1-P/v1";
+
+    private static final String POLICY_TYPES_URI = "/policytypes";
+    private static final String POLICY_TYPE_ID = "policyTypeId";
+
+    private static final String POLICIES_URI = "/policies";
+
+    private static final UriComponentsBuilder POLICY_TYPE_SCHEMA_URI =
+        UriComponentsBuilder.fromPath("/policytypes/{policy-type-name}");
+
+    private static final UriComponentsBuilder POLICY_URI =
+        UriComponentsBuilder.fromPath("/policies/{policy-id}").queryParam(POLICY_TYPE_ID, "{policy-type-name}");
+
+    private static final UriComponentsBuilder POLICY_DELETE_URI =
+        UriComponentsBuilder.fromPath("/policies/{policy-id}");
+
+    private static final UriComponentsBuilder POLICY_STATUS_URI =
+        UriComponentsBuilder.fromPath("/policies/{policy-id}/status");
 
     private final AsyncRestClient restClient;
 
     public StdA1Client(RicConfig ricConfig) {
-        String baseUrl = ricConfig.baseUrl() + "/A1-P/v1";
+        String baseUrl = ricConfig.baseUrl() + URL_PREFIX;
         this.restClient = new AsyncRestClient(baseUrl);
     }
 
-    public StdA1Client(RicConfig ricConfig, AsyncRestClient restClient) {
+    public StdA1Client(AsyncRestClient restClient) {
         this.restClient = restClient;
     }
 
     @Override
-    public Mono<List<String>> getPolicyTypeIdentities() {
-        return restClient.get("/policytypes/identities") //
-            .flatMap(this::parseJsonArrayOfString);
+    public Mono<List<String>> getPolicyIdentities() {
+        return getPolicyIds() //
+            .collectList();
     }
 
     @Override
-    public Mono<List<String>> getPolicyIdentities() {
-        return restClient.get("/policies/identities") //
-            .flatMap(this::parseJsonArrayOfString);
+    public Mono<String> putPolicy(Policy policy) {
+        String uri = POLICY_URI.buildAndExpand(policy.id(), policy.type().name()).toUriString();
+        return restClient.put(uri, policy.json()) //
+            .flatMap(JsonHelper::validateJson);
     }
 
     @Override
-    public Mono<String> getPolicyTypeSchema(String policyTypeId) {
-        Mono<String> response = restClient.get("/policytypes/" + policyTypeId);
-        return response.flatMap(this::createMono);
+    public Mono<List<String>> getPolicyTypeIdentities() {
+        return restClient.get(POLICY_TYPES_URI) //
+            .flatMapMany(JsonHelper::parseJsonArrayOfString) //
+            .collectList();
     }
 
     @Override
-    public Mono<String> putPolicy(Policy policy) {
-        // TODO update when simulator is updated to include policy type
-        // Mono<String> response = client.put("/policies/" + policy.id() + "?policyTypeId=" + policy.type().name(),
-        // policy.json());
-        Mono<String> response = restClient.put("/policies/" + policy.id(), policy.json());
-
-        return response.flatMap(this::createMono);
+    public Mono<String> getPolicyTypeSchema(String policyTypeId) {
+        String uri = POLICY_TYPE_SCHEMA_URI.buildAndExpand(policyTypeId).toUriString();
+        return restClient.get(uri) //
+            .flatMap(JsonHelper::extractPolicySchema);
     }
 
     @Override
     public Mono<String> deletePolicy(Policy policy) {
-        return deletePolicy(policy.id());
+        return deletePolicyById(policy.id());
     }
 
     @Override
     public Flux<String> deleteAllPolicies() {
-        return getPolicyIdentities() //
-            .flatMapMany(policyIds -> Flux.fromIterable(policyIds)) // )
-            .flatMap(policyId -> deletePolicy(policyId)); //
+        return getPolicyIds() //
+            .flatMap(this::deletePolicyById); //
     }
 
     @Override
@@ -95,33 +104,19 @@ public class StdA1Client implements A1Client {
             .flatMap(x -> Mono.just(A1ProtocolType.STD_V1));
     }
 
-    private Mono<String> deletePolicy(String policyId) {
-        return restClient.delete("/policies/" + policyId);
+    @Override
+    public Mono<String> getPolicyStatus(Policy policy) {
+        String uri = POLICY_STATUS_URI.buildAndExpand(policy.id()).toUriString();
+        return restClient.get(uri);
     }
 
-    private Mono<List<String>> parseJsonArrayOfString(String inputString) {
-        try {
-            List<String> arrayList = new ArrayList<>();
-            JSONArray jsonArray = new JSONArray(inputString);
-            for (int i = 0; i < jsonArray.length(); i++) {
-                arrayList.add(jsonArray.getString(i));
-            }
-            logger.debug("A1 client: received list = {}", arrayList);
-            return Mono.just(arrayList);
-        } catch (JSONException ex) { // invalid json
-            return Mono.error(ex);
-        }
+    private Flux<String> getPolicyIds() {
+        return restClient.get(POLICIES_URI) //
+            .flatMapMany(JsonHelper::parseJsonArrayOfString);
     }
 
-    private Mono<String> createMono(String inputString) {
-        try {
-            JSONObject jsonObject = new JSONObject(inputString);
-            String jsonString = jsonObject.toString();
-            logger.debug("A1 client: received string = {}", jsonString);
-            return Mono.just(jsonString);
-        } catch (JSONException ex) { // invalid json
-            return Mono.error(ex);
-        }
+    private Mono<String> deletePolicyById(String policyId) {
+        String uri = POLICY_DELETE_URI.buildAndExpand(policyId).toUriString();
+        return restClient.delete(uri);
     }
-
 }