Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Removed the DMAAP Accepted/Rejected Call
[nonrtric.git]
/
policy-agent
/
src
/
main
/
java
/
org
/
oransc
/
policyagent
/
controllers
/
PolicyController.java
diff --git
a/policy-agent/src/main/java/org/oransc/policyagent/controllers/PolicyController.java
b/policy-agent/src/main/java/org/oransc/policyagent/controllers/PolicyController.java
index
246fdd4
..
f794ab5
100644
(file)
--- a/
policy-agent/src/main/java/org/oransc/policyagent/controllers/PolicyController.java
+++ b/
policy-agent/src/main/java/org/oransc/policyagent/controllers/PolicyController.java
@@
-31,7
+31,7
@@
import io.swagger.annotations.ApiResponses;
import java.util.Collection;
import java.util.Vector;
import java.util.Collection;
import java.util.Vector;
-import org.oransc.policyagent.clients.A1Client;
+import org.oransc.policyagent.clients.A1Client
Factory
;
import org.oransc.policyagent.configuration.ApplicationConfig;
import org.oransc.policyagent.exceptions.ServiceException;
import org.oransc.policyagent.repository.ImmutablePolicy;
import org.oransc.policyagent.configuration.ApplicationConfig;
import org.oransc.policyagent.exceptions.ServiceException;
import org.oransc.policyagent.repository.ImmutablePolicy;
@@
-59,18
+59,19
@@
public class PolicyController {
private final Rics rics;
private final PolicyTypes policyTypes;
private final Policies policies;
private final Rics rics;
private final PolicyTypes policyTypes;
private final Policies policies;
- private final A1Client
a1Client
;
+ private final A1Client
Factory a1ClientFactory
;
private static Gson gson = new GsonBuilder() //
.serializeNulls() //
.create(); //
@Autowired
private static Gson gson = new GsonBuilder() //
.serializeNulls() //
.create(); //
@Autowired
- PolicyController(ApplicationConfig config, PolicyTypes types, Policies policies, Rics rics, A1Client a1Client) {
+ PolicyController(ApplicationConfig config, PolicyTypes types, Policies policies, Rics rics,
+ A1ClientFactory a1ClientFactory) {
this.policyTypes = types;
this.policies = policies;
this.rics = rics;
this.policyTypes = types;
this.policies = policies;
this.rics = rics;
- this.a1Client
= a1Client
;
+ this.a1Client
Factory = a1ClientFactory
;
}
@GetMapping("/policy_schemas")
}
@GetMapping("/policy_schemas")
@@
-145,8
+146,9
@@
public class PolicyController {
@RequestParam(name = "instance", required = true) String id) {
Policy policy = policies.get(id);
if (policy != null && policy.ric().state().equals(Ric.RicState.IDLE)) {
@RequestParam(name = "instance", required = true) String id) {
Policy policy = policies.get(id);
if (policy != null && policy.ric().state().equals(Ric.RicState.IDLE)) {
- return a1Client.deletePolicy(policy.ric().getConfig().baseUrl(), id) //
- .doOnEach(notUsed -> policies.removeId(id)) //
+ policies.remove(policy);
+ return a1ClientFactory.createA1Client(policy.ric()) //
+ .flatMap(client -> client.deletePolicy(policy)) //
.flatMap(notUsed -> {
return Mono.just(new ResponseEntity<>(HttpStatus.NO_CONTENT));
});
.flatMap(notUsed -> {
return Mono.just(new ResponseEntity<>(HttpStatus.NO_CONTENT));
});
@@
-176,7
+178,8
@@
public class PolicyController {
.ownerServiceName(service) //
.lastModified(getTimeStampUTC()) //
.build();
.ownerServiceName(service) //
.lastModified(getTimeStampUTC()) //
.build();
- return a1Client.putPolicy(policy) //
+ return a1ClientFactory.createA1Client(ric) //
+ .flatMap(client -> client.putPolicy(policy)) //
.doOnNext(notUsed -> policies.put(policy)) //
.flatMap(notUsed -> {
return Mono.just(new ResponseEntity<>(HttpStatus.CREATED));
.doOnNext(notUsed -> policies.put(policy)) //
.flatMap(notUsed -> {
return Mono.just(new ResponseEntity<>(HttpStatus.CREATED));