Adapt A1 controller to latest A1 spec

[nonrtric.git] / policy-agent / src / main / java / org / oransc / policyagent / clients / StdA1Client.java

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 4eb0c06..4c1d140 100644 (file)
--- a/policy-agent/src/main/java/org/oransc/policyagent/clients/StdA1Client.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/clients/StdA1Client.java
@@ -22,7 +22,6 @@ package org.oransc.policyagent.clients;
 
 import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 import org.json.JSONArray;
@@ -32,49 +31,44 @@ import org.oransc.policyagent.configuration.RicConfig;
 import org.oransc.policyagent.repository.Policy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+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 final RicConfig ricConfig;
     private final AsyncRestClient restClient;
 
     public StdA1Client(RicConfig ricConfig) {
-        this.ricConfig = ricConfig;
-        this.restClient = new AsyncRestClient(getBaseUrl());
+        String baseUrl = ricConfig.baseUrl() + "/A1-P/v1";
+        this.restClient = new AsyncRestClient(baseUrl);
     }
 
     public StdA1Client(RicConfig ricConfig, AsyncRestClient restClient) {
-        this.ricConfig = ricConfig;
         this.restClient = restClient;
     }
 
     @Override
-    public Mono<Collection<String>> getPolicyTypeIdentities() {
-        logger.debug("getPolicyTypeIdentities nearRtRicUrl = {}", ricConfig.baseUrl());
+    public Mono<List<String>> getPolicyTypeIdentities() {
         return restClient.get("/policytypes/identities") //
             .flatMap(this::parseJsonArrayOfString);
     }
 
     @Override
-    public Mono<Collection<String>> getPolicyIdentities() {
-        logger.debug("getPolicyIdentities nearRtRicUrl = {}", ricConfig.baseUrl());
+    public Mono<List<String>> getPolicyIdentities() {
         return restClient.get("/policies/identities") //
             .flatMap(this::parseJsonArrayOfString);
     }
 
     @Override
     public Mono<String> getPolicyTypeSchema(String policyTypeId) {
-        logger.debug("getPolicyType nearRtRicUrl = {}, policyTypeId = {}", ricConfig.baseUrl(), policyTypeId);
         Mono<String> response = restClient.get("/policytypes/" + policyTypeId);
         return response.flatMap(this::createMono);
     }
 
     @Override
     public Mono<String> putPolicy(Policy policy) {
-        logger.debug("putPolicy nearRtRicUrl = {}, policyId = {}, policyString = {}", //
-            policy.ric().getConfig().baseUrl(), policy.id(), policy.json());
         // TODO update when simulator is updated to include policy type
         // Mono<String> response = client.put("/policies/" + policy.id() + "?policyTypeId=" + policy.type().name(),
         // policy.json());
@@ -84,9 +78,15 @@ public class StdA1Client implements A1Client {
     }
 
     @Override
-    public Mono<String> deletePolicy(String policyId) {
-        logger.debug("deletePolicy nearRtRicUrl = {}, policyId = {}", ricConfig.baseUrl(), policyId);
-        return restClient.delete("/policies/" + policyId);
+    public Mono<String> deletePolicy(Policy policy) {
+        return deletePolicy(policy.id());
+    }
+
+    @Override
+    public Flux<String> deleteAllPolicies() {
+        return getPolicyIdentities() //
+            .flatMapMany(policyIds -> Flux.fromIterable(policyIds)) // )
+            .flatMap(policyId -> deletePolicy(policyId)); //
     }
 
     @Override
@@ -95,11 +95,11 @@ public class StdA1Client implements A1Client {
             .flatMap(x -> Mono.just(A1ProtocolType.STD_V1));
     }
 
-    private String getBaseUrl() {
-        return ricConfig.baseUrl() + "/A1-P/v1";
+    private Mono<String> deletePolicy(String policyId) {
+        return restClient.delete("/policies/" + policyId);
     }
 
-    private Mono<Collection<String>> parseJsonArrayOfString(String inputString) {
+    private Mono<List<String>> parseJsonArrayOfString(String inputString) {
         try {
             List<String> arrayList = new ArrayList<>();
             JSONArray jsonArray = new JSONArray(inputString);