Remove code smells and increase code coverage

[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 8f4334c..1715d9d 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
@@ -20,16 +20,9 @@
 
 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;
@@ -41,7 +34,6 @@ public class StdA1Client implements A1Client {
     private static final String POLICY_TYPE_ID = "policyTypeId";
 
     private static final String POLICIES_URI = "/policies";
-    private static final String POLICY_SCHEMA = "policySchema";
 
     private static final UriComponentsBuilder POLICY_TYPE_SCHEMA_URI =
         UriComponentsBuilder.fromPath("/policytypes/{policy-type-name}");
@@ -55,8 +47,6 @@ public class StdA1Client implements A1Client {
     private static final UriComponentsBuilder POLICY_STATUS_URI =
         UriComponentsBuilder.fromPath("/policies/{policy-id}/status");
 
-    private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
     private final AsyncRestClient restClient;
 
     public StdA1Client(RicConfig ricConfig) {
@@ -78,13 +68,13 @@ public class StdA1Client implements A1Client {
     public Mono<String> putPolicy(Policy policy) {
         String uri = POLICY_URI.buildAndExpand(policy.id(), policy.type().name()).toUriString();
         return restClient.put(uri, policy.json()) //
-            .flatMap(this::validateJson);
+            .flatMap(JsonHelper::validateJson);
     }
 
     @Override
     public Mono<List<String>> getPolicyTypeIdentities() {
         return restClient.get(POLICY_TYPES_URI) //
-            .flatMapMany(this::parseJsonArrayOfString) //
+            .flatMapMany(JsonHelper::parseJsonArrayOfString) //
             .collectList();
     }
 
@@ -92,7 +82,7 @@ public class StdA1Client implements A1Client {
     public Mono<String> getPolicyTypeSchema(String policyTypeId) {
         String uri = POLICY_TYPE_SCHEMA_URI.buildAndExpand(policyTypeId).toUriString();
         return restClient.get(uri) //
-            .flatMap(this::extractPolicySchema);
+            .flatMap(JsonHelper::extractPolicySchema);
     }
 
     @Override
@@ -120,46 +110,11 @@ public class StdA1Client implements A1Client {
 
     private Flux<String> getPolicyIds() {
         return restClient.get(POLICIES_URI) //
-            .flatMapMany(this::parseJsonArrayOfString);
+            .flatMapMany(JsonHelper::parseJsonArrayOfString);
     }
 
     private Mono<String> deletePolicyById(String policyId) {
         String uri = POLICY_DELETE_URI.buildAndExpand(policyId).toUriString();
         return restClient.delete(uri);
     }
-
-    private Flux<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 Flux.fromIterable(arrayList);
-        } catch (JSONException ex) { // invalid json
-            return Flux.error(ex);
-        }
-    }
-
-    private Mono<String> extractPolicySchema(String inputString) {
-        try {
-            JSONObject jsonObject = new JSONObject(inputString);
-            JSONObject schemaObject = jsonObject.getJSONObject(POLICY_SCHEMA);
-            String schemaString = schemaObject.toString();
-            return Mono.just(schemaString);
-        } catch (JSONException ex) { // invalid json
-            return Mono.error(ex);
-        }
-    }
-
-    private Mono<String> validateJson(String inputString) {
-        try {
-            new JSONObject(inputString);
-            return Mono.just(inputString);
-        } catch (JSONException ex) { // invalid json
-            return Mono.error(ex);
-        }
-    }
-
 }