* ========================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.
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;
public class OscA1Client implements A1Client {
+ private static final String URL_PREFIX = "/a1-p";
+
+ private static final String POLICY_TYPES = "/policytypes";
+ private static final String CREATE_SCHEMA = "create_schema";
+ private static final String TITLE = "title";
+
+ private static final String HEALTHCHECK = "/healthcheck";
+
+ private static final UriComponentsBuilder POLICY_TYPE_SCHEMA_URI =
+ UriComponentsBuilder.fromPath("/policytypes/{policy-type-name}");
+
+ private static final UriComponentsBuilder POLICY_URI =
+ UriComponentsBuilder.fromPath("/policytypes/{policy-type-name}/policies/{policy-id}");
+
+ private static final UriComponentsBuilder POLICY_IDS_URI =
+ UriComponentsBuilder.fromPath("/policytypes/{policy-type-name}/policies");
+
+ private static final UriComponentsBuilder POLICY_STATUS_URI =
+ UriComponentsBuilder.fromPath("/policytypes/{policy-type-name}/policies/{policy-id}/status");
+
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final AsyncRestClient restClient;
public OscA1Client(RicConfig ricConfig) {
- String baseUrl = ricConfig.baseUrl() + "/a1-p";
+ String baseUrl = ricConfig.baseUrl() + URL_PREFIX;
this.restClient = new AsyncRestClient(baseUrl);
- logger.debug("OscA1Client for ric: {}", ricConfig.name());
+ if (logger.isDebugEnabled()) {
+ logger.debug("OscA1Client for ric: {}", ricConfig.name());
+ }
}
public OscA1Client(AsyncRestClient restClient) {
@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 -> getPolicyIdentities(type)) //
- .flatMap(policyIds -> Flux.fromIterable(policyIds)) //
+ return getPolicyTypeIds() //
+ .flatMap(this::getPolicyIdentitiesByType) //
.collectList();
}
- private Mono<List<String>> getPolicyIdentities(String typeId) {
- return restClient.get("/policytypes/" + typeId + "/policies") //
- .flatMap(this::parseJsonArrayOfString);
- }
-
@Override
public Mono<String> getPolicyTypeSchema(String policyTypeId) {
- return restClient.get("/policytypes/" + policyTypeId) //
+ String uri = POLICY_TYPE_SCHEMA_URI.buildAndExpand(policyTypeId).toUriString();
+ return restClient.get(uri) //
.flatMap(response -> getCreateSchema(response, policyTypeId));
}
- private Mono<String> getCreateSchema(String policyTypeResponse, String policyTypeId) {
- try {
- JSONObject obj = new JSONObject(policyTypeResponse);
- JSONObject schemaObj = obj.getJSONObject("create_schema");
- schemaObj.put("title", policyTypeId);
- return Mono.just(schemaObj.toString());
- } catch (Exception e) {
- logger.error("Unexcpected response for policy type: {}", policyTypeResponse, e);
- return Mono.error(e);
- }
- }
-
@Override
public Mono<String> putPolicy(Policy policy) {
- return restClient.put("/policytypes/" + policy.type().name() + "/policies/" + policy.id(), policy.json());
+ String uri = POLICY_URI.buildAndExpand(policy.type().name(), policy.id()).toUriString();
+ return restClient.put(uri, policy.json());
}
@Override
public Mono<String> deletePolicy(Policy policy) {
- return deletePolicy(policy.type().name(), policy.id());
- }
-
- private Mono<String> deletePolicy(String typeId, String policyId) {
- return restClient.delete("/policytypes/" + typeId + "/policies/" + policyId);
+ return deletePolicyById(policy.type().name(), policy.id());
}
@Override
public Mono<A1ProtocolType> getProtocolVersion() {
- return restClient.get("/healthcheck") //
- .flatMap(resp -> Mono.just(A1ProtocolType.OSC_V1));
+ return restClient.get(HEALTHCHECK) //
+ .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);
}
- private Flux<String> deletePoliciesForType(String typeId) {
- return getPolicyIdentities(typeId) //
- .flatMapMany(policyIds -> Flux.fromIterable(policyIds)) //
- .flatMap(policyId -> deletePolicy(typeId, policyId)); //
+ @Override
+ public Mono<String> getPolicyStatus(Policy policy) {
+ String uri = POLICY_STATUS_URI.buildAndExpand(policy.type().name(), policy.id()).toUriString();
+ return restClient.get(uri);
+
+ }
+
+ 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<List<String>> parseJsonArrayOfString(String inputString) {
+ private Mono<String> getCreateSchema(String policyTypeResponse, String policyTypeId) {
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);
+ JSONObject obj = new JSONObject(policyTypeResponse);
+ JSONObject schemaObj = obj.getJSONObject(CREATE_SCHEMA);
+ schemaObj.put(TITLE, policyTypeId);
+ return Mono.just(schemaObj.toString());
+ } catch (Exception e) {
+ logger.error("Unexpected response for policy type: {}, exception: {}", policyTypeResponse, e.toString());
+ return Mono.error(e);
}
}
- @Override
- public Mono<String> getPolicyStatus(Policy policy) {
- // /a1-p/policytypes/{policy_type_id}/policies/{policy_instance_id}/status
- return restClient.get("/policytypes/" + policy.type().name() + "/policies/" + policy.id() + "/status");
+ private Mono<String> deletePolicyById(String typeId, String policyId) {
+ String uri = POLICY_URI.buildAndExpand(typeId, policyId).toUriString();
+ return restClient.delete(uri);
+ }
+ private Flux<String> deletePoliciesForType(String typeId) {
+ return getPolicyIdentitiesByType(typeId) //
+ .flatMap(policyId -> deletePolicyById(typeId, policyId));
}
}
Code Review / nonrtric.git / blobdiff