X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fclients%2FStdA1ClientVersion1.java;h=f5486a58e949057c968b61db476d31f41b913592;hb=5916f659ffe974b8b00b6d07bc845438695f0896;hp=7480b939a51fe58a4702ad721a58ade5b7b0f52a;hpb=d15a3b60b7dc968bd17f32063508c7dc6defc03a;p=nonrtric.git diff --git a/policy-agent/src/main/java/org/oransc/policyagent/clients/StdA1ClientVersion1.java b/policy-agent/src/main/java/org/oransc/policyagent/clients/StdA1ClientVersion1.java index 7480b939..f5486a58 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/clients/StdA1ClientVersion1.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/clients/StdA1ClientVersion1.java @@ -29,6 +29,9 @@ import org.oransc.policyagent.repository.Policy; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +/** + * Client for accessing standard A1 REST API version 1.1 + */ public class StdA1ClientVersion1 implements A1Client { public static class UriBuilder implements A1UriBuilder { @@ -39,20 +42,32 @@ public class StdA1ClientVersion1 implements A1Client { this.ricConfig = ricConfig; } + /** + * /A1-P/v1/policies/{policyId} + */ @Override public String createPutPolicyUri(String type, String policyId) { return policiesBaseUri() + policyId; } + /** + * /A1-P/v1/policies + */ public String createGetPolicyIdsUri() { return baseUri() + "/policies"; } + /** + * /A1-P/v1/policies/{policyId} + */ @Override public String createDeleteUri(String type, String policyId) { return policiesBaseUri() + policyId; } + /** + * /A1-P/v1/policies/{policyId}/status + */ public String createGetPolicyStatusUri(String type, String policyId) { return policiesBaseUri() + policyId + "/status"; } @@ -86,8 +101,7 @@ public class StdA1ClientVersion1 implements A1Client { @Override public Mono putPolicy(Policy policy) { - return restClient.put(uri.createPutPolicyUri(policy.type().name(), policy.id()), policy.json()) // - .flatMap(JsonHelper::validateJson); + return restClient.put(uri.createPutPolicyUri(policy.type().name(), policy.id()), policy.json()); } @Override @@ -124,7 +138,7 @@ public class StdA1ClientVersion1 implements A1Client { private Flux getPolicyIds() { return restClient.get(uri.createGetPolicyIdsUri()) // - .flatMapMany(JsonHelper::parseJsonArrayOfString); + .flatMapMany(SdncJsonHelper::parseJsonArrayOfString); } private Mono deletePolicyById(String policyId) {