Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add unit tests for PolicyAgentApi in dashboard
[nonrtric.git]
/
dashboard
/
webapp-backend
/
src
/
main
/
java
/
org
/
oransc
/
ric
/
portal
/
dashboard
/
policyagentapi
/
PolicyAgentApiImpl.java
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
470e2df
..
b41c30e
100644
(file)
--- 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
@@
-28,10
+28,10
@@
import com.google.gson.reflect.TypeToken;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Type;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Type;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
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.immutables.gson.Gson;
import org.immutables.value.Value;
@@
-55,19
+55,24
@@
import org.springframework.web.client.RestTemplate;
public class PolicyAgentApiImpl implements PolicyAgentApi {
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public class PolicyAgentApiImpl implements PolicyAgentApi {
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- RestTemplate restTemplate
= new RestTemplate()
;
+ RestTemplate restTemplate;
private static com.google.gson.Gson gson = new GsonBuilder() //
private static com.google.gson.Gson gson = new GsonBuilder() //
-
.serializeNulls() //
-
.create(); //
+ .serializeNulls() //
+ .create(); //
private final String urlPrefix;
@Autowired
public PolicyAgentApiImpl(
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) {
+ this(urlPrefix, new RestTemplate());
logger.debug("ctor prefix '{}'", urlPrefix);
logger.debug("ctor prefix '{}'", urlPrefix);
+ }
+
+ public PolicyAgentApiImpl(String urlPrefix, RestTemplate restTemplate) {
this.urlPrefix = urlPrefix;
this.urlPrefix = urlPrefix;
+ this.restTemplate = restTemplate;
}
private String baseUrl() {
}
private String baseUrl() {
@@
-119,8
+124,7
@@
public class PolicyAgentApiImpl implements PolicyAgentApi {
}
try {
}
try {
- Type listType = new TypeToken<List<ImmutablePolicyInfo>>() {
- }.getType();
+ Type listType = new TypeToken<List<ImmutablePolicyInfo>>() {}.getType();
List<PolicyInfo> rspParsed = gson.fromJson(rsp.getBody(), listType);
PolicyInstances result = new PolicyInstances();
for (PolicyInfo p : rspParsed) {
List<PolicyInfo> rspParsed = gson.fromJson(rsp.getBody(), listType);
PolicyInstances result = new PolicyInstances();
for (PolicyInfo p : rspParsed) {
@@
-142,13
+146,13
@@
public class PolicyAgentApiImpl implements PolicyAgentApi {
@Override
public ResponseEntity<String> putPolicy(String policyTypeIdString, String policyInstanceId, Object json,
@Override
public ResponseEntity<String> putPolicy(String policyTypeIdString, String policyInstanceId, Object json,
-
String ric) {
+ String ric) {
String url = baseUrl() + "/policy?type={type}&instance={instance}&ric={ric}&service={service}";
Map<String, ?> uriVariables = Map.of( //
String url = baseUrl() + "/policy?type={type}&instance={instance}&ric={ric}&service={service}";
Map<String, ?> uriVariables = Map.of( //
-
"type", policyTypeIdString, //
-
"instance", policyInstanceId, //
-
"ric", ric, //
-
"service", "dashboard");
+ "type", policyTypeIdString, //
+ "instance", policyInstanceId, //
+ "ric", ric, //
+ "service", "dashboard");
try {
this.restTemplate.put(url, createJsonHttpEntity(json), uriVariables);
try {
this.restTemplate.put(url, createJsonHttpEntity(json), uriVariables);
@@
-188,10
+192,9
@@
public class PolicyAgentApiImpl implements PolicyAgentApi {
String rsp = this.restTemplate.getForObject(url, String.class, uriVariables);
try {
String rsp = this.restTemplate.getForObject(url, String.class, uriVariables);
try {
- Type listType = new TypeToken<List<ImmutableRicInfo>>() {
- }.getType();
+ Type listType = new TypeToken<List<ImmutableRicInfo>>() {}.getType();
List<RicInfo> rspParsed = gson.fromJson(rsp, listType);
List<RicInfo> rspParsed = gson.fromJson(rsp, listType);
- Collection<String> result = new
Vector
<>(rspParsed.size());
+ Collection<String> result = new
ArrayList
<>(rspParsed.size());
for (RicInfo ric : rspParsed) {
result.add(ric.ricName());
}
for (RicInfo ric : rspParsed) {
result.add(ric.ricName());
}
@@
-204,7
+207,7
@@
public class PolicyAgentApiImpl implements PolicyAgentApi {
private HttpEntity<Object> createJsonHttpEntity(Object content) {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
private HttpEntity<Object> createJsonHttpEntity(Object content) {
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
- return new HttpEntity<
Object
>(content, headers);
+ return new HttpEntity<>(content, headers);
}
}
}
}