X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fclients%2FOscA1Client.java;h=3216a48d570c0d07a55285cdc0758ad177d11196;hb=19f20ea9d077ab6587e12a98783e2ead5c5a41bf;hp=d03dbb4e1079b6068991c9aa1f5ebda455a8679f;hpb=336d24471b994ebe62828d5327e116f766bbfc85;p=nonrtric.git

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/clients/OscA1Client.java b/policy-agent/src/main/java/org/oransc/policyagent/clients/OscA1Client.java
index d03dbb4e..3216a48d 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/clients/OscA1Client.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/clients/OscA1Client.java
@@ -2,7 +2,7 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2019 Nordix Foundation
+ * Copyright (C) 2020 Nordix Foundation
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,11 +21,7 @@
 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;
@@ -38,7 +34,7 @@ import reactor.core.publisher.Mono;
 public class OscA1Client implements A1Client {
     private static final String URL_PREFIX = "/a1-p";
 
-    private static final String POLICYTYPES = "/policytypes";
+    private static final String POLICY_TYPES = "/policytypes";
     private static final String CREATE_SCHEMA = "create_schema";
     private static final String TITLE = "title";
 
@@ -74,16 +70,14 @@ public class OscA1Client implements A1Client {
 
     @Override
     public Mono<List<String>> getPolicyTypeIdentities() {
-        return restClient.get(POLICYTYPES) //
-            .flatMap(this::parseJsonArrayOfString);
+        return getPolicyTypeIds() //
+            .collectList();
     }
 
     @Override
     public Mono<List<String>> getPolicyIdentities() {
-        return getPolicyTypeIdentities() //
-            .flatMapMany(types -> Flux.fromIterable(types)) //
-            .flatMap(type -> getPolicyIdentitiesById(type)) //
-            .flatMap(policyIds -> Flux.fromIterable(policyIds)) //
+        return getPolicyTypeIds() //
+            .flatMap(this::getPolicyIdentitiesByType) //
             .collectList();
     }
 
@@ -108,14 +102,13 @@ public class OscA1Client implements A1Client {
     @Override
     public Mono<A1ProtocolType> getProtocolVersion() {
         return restClient.get(HEALTHCHECK) //
-            .flatMap(resp -> Mono.just(A1ProtocolType.OSC_V1));
+            .flatMap(notUsed -> Mono.just(A1ProtocolType.OSC_V1));
     }
 
     @Override
     public Flux<String> deleteAllPolicies() {
-        return getPolicyTypeIdentities() //
-            .flatMapMany(types -> Flux.fromIterable(types)) //
-            .flatMap(typeId -> deletePoliciesForType(typeId)); //
+        return getPolicyTypeIds() //
+            .flatMap(this::deletePoliciesForType);
     }
 
     @Override
@@ -125,10 +118,14 @@ public class OscA1Client implements A1Client {
 
     }
 
-    private Mono<List<String>> getPolicyIdentitiesById(String typeId) {
-        String uri = POLICY_IDS_URI.buildAndExpand(typeId).toUriString();
-        return restClient.get(uri) //
-            .flatMap(this::parseJsonArrayOfString);
+    private Flux<String> getPolicyTypeIds() {
+        return restClient.get(POLICY_TYPES) //
+            .flatMapMany(JsonHelper::parseJsonArrayOfString);
+    }
+
+    private Flux<String> getPolicyIdentitiesByType(String typeId) {
+        return restClient.get(POLICY_IDS_URI.buildAndExpand(typeId).toUriString()) //
+            .flatMapMany(JsonHelper::parseJsonArrayOfString);
     }
 
     private Mono<String> getCreateSchema(String policyTypeResponse, String policyTypeId) {
@@ -149,22 +146,7 @@ public class OscA1Client implements A1Client {
     }
 
     private Flux<String> deletePoliciesForType(String typeId) {
-        return getPolicyIdentitiesById(typeId) //
-            .flatMapMany(policyIds -> Flux.fromIterable(policyIds)) //
-            .flatMap(policyId -> deletePolicyById(typeId, policyId)); //
-    }
-
-    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);
-        }
+        return getPolicyIdentitiesByType(typeId) //
+            .flatMap(policyId -> deletePolicyById(typeId, policyId));
     }
 }