X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dashboard%2Fwebapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fpolicyagentapi%2FPolicyAgentApiImpl.java;h=af814b9d0b3a6867f1a158037cbdf0d90f200e20;hb=592ce20ec359928373de2e7f06214c8f8ad73c20;hp=d83023b70aa42f53d4caaf8e446ca8adf2ca915e;hpb=581b06ef3c0536416575de7fb7315ba95b849c92;p=nonrtric.git diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/policyagentapi/PolicyAgentApiImpl.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/policyagentapi/PolicyAgentApiImpl.java index d83023b7..af814b9d 100644 --- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/policyagentapi/PolicyAgentApiImpl.java +++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/policyagentapi/PolicyAgentApiImpl.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,37 +19,35 @@ */ package org.oransc.ric.portal.dashboard.policyagentapi; -import org.oransc.ric.portal.dashboard.DashboardConstants; -import org.oransc.ric.portal.dashboard.model.ImmutablePolicyInfo; -import org.oransc.ric.portal.dashboard.model.PolicyInfo; -import org.oransc.ric.portal.dashboard.model.PolicyInstances; -import org.oransc.ric.portal.dashboard.model.PolicyType; -import org.oransc.ric.portal.dashboard.model.PolicyTypes; -import org.springframework.beans.factory.annotation.Autowired; - -import org.springframework.stereotype.Component; -import org.springframework.web.client.RestClientException; -import org.springframework.web.client.RestTemplate; - -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Vector; -import java.lang.invoke.MethodHandles; -import java.lang.reflect.Type; - import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.lang.invoke.MethodHandles; +import java.lang.reflect.Type; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Vector; + import org.immutables.gson.Gson; import org.immutables.value.Value; +import org.oransc.ric.portal.dashboard.model.ImmutablePolicyInfo; +import org.oransc.ric.portal.dashboard.model.PolicyInfo; +import org.oransc.ric.portal.dashboard.model.PolicyInstances; +import org.oransc.ric.portal.dashboard.model.PolicyType; +import org.oransc.ric.portal.dashboard.model.PolicyTypes; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Component; +import org.springframework.web.client.RestClientException; +import org.springframework.web.client.RestTemplate; @Component("PolicyAgentApi") public class PolicyAgentApiImpl implements PolicyAgentApi { @@ -58,14 +56,14 @@ public class PolicyAgentApiImpl implements PolicyAgentApi { RestTemplate restTemplate = new RestTemplate(); private static com.google.gson.Gson gson = new GsonBuilder() // - .serializeNulls() // - .create(); // + .serializeNulls() // + .create(); // private final String urlPrefix; @Autowired public PolicyAgentApiImpl( - @org.springframework.beans.factory.annotation.Value("${policycontroller.url.prefix}") final String urlPrefix) { + @org.springframework.beans.factory.annotation.Value("${policycontroller.url.prefix}") final String urlPrefix) { logger.debug("ctor prefix '{}'", urlPrefix); this.urlPrefix = urlPrefix; } @@ -84,13 +82,16 @@ public class PolicyAgentApiImpl implements PolicyAgentApi { } @Override - public PolicyTypes getAllPolicyTypes() throws RestClientException { + public ResponseEntity getAllPolicyTypes() throws RestClientException { String url = baseUrl() + "/policy_schemas"; - String rsp = this.restTemplate.getForObject(url, String.class); + ResponseEntity rsp = this.restTemplate.getForEntity(url, String.class); + if (!rsp.getStatusCode().is2xxSuccessful()) { + return new ResponseEntity<>(rsp.getStatusCode()); + } PolicyTypes result = new PolicyTypes(); JsonParser jsonParser = new JsonParser(); - JsonArray schemas = jsonParser.parse(rsp).getAsJsonArray(); + JsonArray schemas = jsonParser.parse(rsp.getBody()).getAsJsonArray(); for (JsonElement schema : schemas) { JsonObject schemaObj = schema.getAsJsonObject(); String title = schemaObj.get("title").getAsString(); @@ -98,45 +99,52 @@ public class PolicyAgentApiImpl implements PolicyAgentApi { PolicyType pt = new PolicyType(title, schemaAsStr); result.add(pt); } - return result; + return new ResponseEntity<>(result, rsp.getStatusCode()); } @Override - public PolicyInstances getPolicyInstancesForType(String type) { + public ResponseEntity getPolicyInstancesForType(String type) { String url = baseUrl() + "/policies?type={type}"; Map uriVariables = Map.of("type", type); - String rsp = this.restTemplate.getForObject(url, String.class, uriVariables); + ResponseEntity rsp = this.restTemplate.getForEntity(url, String.class, uriVariables); + if (!rsp.getStatusCode().is2xxSuccessful()) { + return new ResponseEntity<>(rsp.getStatusCode()); + } - Type listType = new TypeToken>() { - }.getType(); - List rspParsed = gson.fromJson(rsp, listType); + Type listType = new TypeToken>() {}.getType(); + List rspParsed = gson.fromJson(rsp.getBody(), listType); PolicyInstances result = new PolicyInstances(); for (PolicyInfo p : rspParsed) { result.add(p); } - return result; + return new ResponseEntity<>(result, rsp.getStatusCode()); } @Override - public String getPolicyInstance(String id) throws RestClientException { + public ResponseEntity getPolicyInstance(String id) throws RestClientException { String url = baseUrl() + "/policy?instance={id}"; Map uriVariables = Map.of("id", id); - return this.restTemplate.getForObject(url, String.class, uriVariables); + return this.restTemplate.getForEntity(url, String.class, uriVariables); } @Override - public void putPolicy(String policyTypeIdString, String policyInstanceId, String json, String ric) - throws RestClientException { + public ResponseEntity putPolicy(String policyTypeIdString, String policyInstanceId, String json, String ric) + throws RestClientException { String url = baseUrl() + "/policy?type={type}&instance={instance}&ric={ric}&service={service}"; Map uriVariables = Map.of( // - "type", policyTypeIdString, // - "instance", policyInstanceId, // - "ric", ric, // - "service", "dashboard"); - - this.restTemplate.put(url, json, uriVariables); + "type", policyTypeIdString, // + "instance", policyInstanceId, // + "ric", ric, // + "service", "dashboard"); + + try { + this.restTemplate.put(url, json, uriVariables); + return new ResponseEntity<>(HttpStatus.OK); + } catch (Exception e) { + return new ResponseEntity<>(e.getMessage(), HttpStatus.NOT_FOUND); + } } @Override @@ -157,20 +165,19 @@ public class PolicyAgentApiImpl implements PolicyAgentApi { } @Override - public Collection getRicsSupportingType(String typeName) { + public ResponseEntity> getRicsSupportingType(String typeName) { String url = baseUrl() + "/rics?policyType={typeName}"; Map uriVariables = Map.of("typeName", typeName); String rsp = this.restTemplate.getForObject(url, String.class, uriVariables); - Type listType = new TypeToken>() { - }.getType(); + Type listType = new TypeToken>() {}.getType(); List rspParsed = gson.fromJson(rsp, listType); Collection result = new Vector<>(rspParsed.size()); for (RicInfo ric : rspParsed) { result.add(ric.name()); } - return result; + return new ResponseEntity<>(result, HttpStatus.OK); } }