X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fclients%2FA1ClientImpl.java;h=f621566e70aeebbf9aad0bcb51ffc553b26a060e;hb=ffe0c150f08205d73ee362f58f492aeb2703f295;hp=5a16bc270cf746819ef0f3bd8cf86fbe8b599ce9;hpb=023c1b75327ff105348f9dc8eedc0cbf45e7a419;p=nonrtric.git

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/clients/A1ClientImpl.java b/policy-agent/src/main/java/org/oransc/policyagent/clients/A1ClientImpl.java
index 5a16bc27..f621566e 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/clients/A1ClientImpl.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/clients/A1ClientImpl.java
@@ -40,86 +40,72 @@ public class A1ClientImpl implements A1Client {
         return nearRtRicUrl + "/A1-P/v1";
     }
 
+    public AsyncRestClient createClient(final String nearRtRicUrl) {
+        return new AsyncRestClient(getBaseUrl(nearRtRicUrl));
+    }
+
     @Override
-    public Flux<String> getAllPolicyTypes(String nearRtRicUrl) {
-        logger.debug("getAllPolicyTypes nearRtRicUrl = {}", nearRtRicUrl);
-        AsyncRestClient client = new AsyncRestClient(getBaseUrl(nearRtRicUrl));
-        Mono<String> response = client.get("/policytypes");
-        return response.flatMapMany(this::createPolicyTypesFlux);
+    public Flux<String> getPolicyTypeIdentities(String nearRtRicUrl) {
+        logger.debug("getPolicyTypeIdentities nearRtRicUrl = {}", nearRtRicUrl);
+        AsyncRestClient client = createClient(nearRtRicUrl);
+        Mono<String> response = client.get("/policytypes/identities");
+        return response.flatMapMany(this::createFlux);
     }
 
     @Override
-    public Flux<String> getPoliciesForType(String nearRtRicUrl, String policyTypeId) {
-        logger.debug("getPoliciesForType nearRtRicUrl = {}, policyTypeId = {}", nearRtRicUrl, policyTypeId);
-        AsyncRestClient client = new AsyncRestClient(getBaseUrl(nearRtRicUrl));
-        return client.get("/policies") //
-            .flatMapMany(policiesString -> createPoliciesFlux(policiesString, policyTypeId));
+    public Flux<String> getPolicyIdentities(String nearRtRicUrl) {
+        logger.debug("getPolicyIdentities nearRtRicUrl = {}", nearRtRicUrl);
+        AsyncRestClient client = createClient(nearRtRicUrl);
+        Mono<String> response = client.get("/policies/identities");
+        return response.flatMapMany(this::createFlux);
     }
 
     @Override
-    public Mono<String> getPolicy(String nearRtRicUrl, String policyId) {
-        logger.debug("getPolicy nearRtRicUrl = {}, policyId = {}", nearRtRicUrl, policyId);
-        AsyncRestClient client = new AsyncRestClient(getBaseUrl(nearRtRicUrl));
-        Mono<String> response = client.get("/policies/" + policyId);
-        return response.flatMap(this::createPolicyMono);
+    public Mono<String> getPolicyType(String nearRtRicUrl, String policyTypeId) {
+        logger.debug("getPolicyType nearRtRicUrl = {}, policyTypeId = {}", nearRtRicUrl, policyTypeId);
+        AsyncRestClient client = createClient(nearRtRicUrl);
+        Mono<String> response = client.get("/policytypes/" + policyTypeId);
+        return response.flatMap(this::createMono);
     }
 
     @Override
     public Mono<String> putPolicy(String nearRtRicUrl, String policyId, String policyString) {
         logger.debug("putPolicy nearRtRicUrl = {}, policyId = {}, policyString = {}", nearRtRicUrl, policyId,
             policyString);
-        AsyncRestClient client = new AsyncRestClient(getBaseUrl(nearRtRicUrl));
+        AsyncRestClient client = createClient(nearRtRicUrl);
         Mono<String> response = client.put("/policies/" + policyId, policyString);
-        return response.flatMap(this::createPolicyMono);
+        return response.flatMap(this::createMono);
     }
 
     @Override
-    public Mono<Void> deletePolicy(String nearRtRicUrl, String policyId) {
+    public Mono<String> deletePolicy(String nearRtRicUrl, String policyId) {
         logger.debug("deletePolicy nearRtRicUrl = {}, policyId = {}", nearRtRicUrl, policyId);
-        AsyncRestClient client = new AsyncRestClient(getBaseUrl(nearRtRicUrl));
+        AsyncRestClient client = createClient(nearRtRicUrl);
         return client.delete("/policies/" + policyId);
     }
 
-    private Flux<String> createPolicyTypesFlux(String policyTypesString) {
-        try {
-            List<String> policyTypesList = new ArrayList<>();
-            JSONArray policyTypesArray = new JSONArray(policyTypesString);
-            for (int i = 0; i < policyTypesArray.length(); i++) {
-                policyTypesList.add(policyTypesArray.getJSONObject(i).toString());
-            }
-            logger.debug("A1 client: policyTypes = {}", policyTypesList);
-            return Flux.fromIterable(policyTypesList);
-        } catch (JSONException ex) { // invalid json
-            return Flux.error(ex);
-        }
-    }
-
-    private Flux<String> createPoliciesFlux(String policiesString, String policyTypeId) {
+    private Flux<String> createFlux(String inputString) {
         try {
-            List<String> policiesList = new ArrayList<>();
-            JSONArray policiesArray = new JSONArray(policiesString);
-            for (int i = 0; i < policiesArray.length(); i++) {
-                JSONObject policyObject = policiesArray.getJSONObject(i);
-                if (policyObject.get("policyTypeId").equals(policyTypeId)) {
-                    policiesList.add(policyObject.toString());
-                }
+            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: policies = {}", policiesList);
-            return Flux.fromIterable(policiesList);
+            logger.debug("A1 client: received list = {}", arrayList);
+            return Flux.fromIterable(arrayList);
         } catch (JSONException ex) { // invalid json
             return Flux.error(ex);
         }
     }
 
-    private Mono<String> createPolicyMono(String policyString) {
+    private Mono<String> createMono(String inputString) {
         try {
-            JSONObject policyObject = new JSONObject(policyString);
-            String policy = policyObject.toString();
-            logger.debug("A1 client: policy = {}", policy);
-            return Mono.just(policy);
+            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);
-
         }
     }
 }