Merge "Dashboard using policy agent NBI"

[nonrtric.git] / policy-agent / src / main / java / org / oransc / policyagent / tasks / ServiceSupervision.java

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/tasks/ServiceSupervision.java b/policy-agent/src/main/java/org/oransc/policyagent/tasks/ServiceSupervision.java
index 03479dd..acb546b 100644 (file)
--- a/policy-agent/src/main/java/org/oransc/policyagent/tasks/ServiceSupervision.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/tasks/ServiceSupervision.java
@@ -68,16 +68,11 @@ public class ServiceSupervision {
             .filter(service -> service.isExpired()) //
             .doOnNext(service -> logger.info("Service is expired:" + service.getName()))
             .flatMap(service -> getAllPolicies(service)) //
-            .flatMap(policy -> deletePolicy(policy));
+            .doOnNext(policy -> this.policies.remove(policy));
     }
 
     Flux<Policy> getAllPolicies(Service service) {
         return Flux.fromIterable(policies.getForService(service.getName()));
     }
 
-    Flux<Policy> deletePolicy(Policy policy) {
-        this.policies.remove(policy);
-        return Flux.just(policy);
-    }
-
 }