X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cps-ncmp-service%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fcps%2Fncmp%2Fapi%2Fimpl%2Fevents%2Fcmsubscription%2Fservice%2FCmNotificationSubscriptionHandlerServiceImpl.java;fp=cps-ncmp-service%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fcps%2Fncmp%2Fapi%2Fimpl%2Fevents%2Fcmsubscription%2Fservice%2FCmNotificationSubscriptionHandlerServiceImpl.java;h=7872ba0a3488559d8927c8a06c229349c4f732f1;hb=6c35c5dd0dbfc417a57bad71c22b03f21cb71e5f;hp=395c511af71236bcd103fd34ab008099b9d1604b;hpb=c5f6c45eb5cd94f76f1f39e5a4593996a9f25474;p=cps.git

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/events/cmsubscription/service/CmNotificationSubscriptionHandlerServiceImpl.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/events/cmsubscription/service/CmNotificationSubscriptionHandlerServiceImpl.java
index 395c511af..7872ba0a3 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/events/cmsubscription/service/CmNotificationSubscriptionHandlerServiceImpl.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/events/cmsubscription/service/CmNotificationSubscriptionHandlerServiceImpl.java
@@ -57,20 +57,26 @@ public class CmNotificationSubscriptionHandlerServiceImpl implements CmNotificat
         if (cmNotificationSubscriptionPersistenceService.isUniqueSubscriptionId(subscriptionId)) {
             dmiCmNotificationSubscriptionCacheHandler.add(subscriptionId, predicates);
             sendSubscriptionCreateRequestToDmi(subscriptionId);
+            scheduleCmNotificationSubscriptionNcmpOutEventResponse(subscriptionId);
         } else {
-            final Set<String> subscriptionTargetFilters = predicates.stream().flatMap(
-                    predicate -> predicate.getTargetFilter().stream()).collect(Collectors.toSet());
             rejectAndPublishCmNotificationSubscriptionCreateRequest(subscriptionId,
-                    new ArrayList<>(subscriptionTargetFilters));
+                    predicates);
         }
     }
 
+    private void scheduleCmNotificationSubscriptionNcmpOutEventResponse(final String subscriptionId) {
+        cmNotificationSubscriptionEventsHandler.publishCmNotificationSubscriptionNcmpOutEvent(subscriptionId,
+                "subscriptionCreateResponse", null, true);
+    }
+
     private void rejectAndPublishCmNotificationSubscriptionCreateRequest(final String subscriptionId,
-                                                                         final List<String> subscriptionTargetFilters) {
+            final List<Predicate> predicates) {
+        final Set<String> subscriptionTargetFilters =
+                predicates.stream().flatMap(predicate -> predicate.getTargetFilter().stream())
+                        .collect(Collectors.toSet());
         final CmNotificationSubscriptionNcmpOutEvent cmNotificationSubscriptionNcmpOutEvent =
-                cmNotificationSubscriptionMappersHandler
-                        .toCmNotificationSubscriptionNcmpOutEventForRejectedRequest(subscriptionId,
-                                subscriptionTargetFilters);
+                cmNotificationSubscriptionMappersHandler.toCmNotificationSubscriptionNcmpOutEventForRejectedRequest(
+                        subscriptionId, new ArrayList<>(subscriptionTargetFilters));
         cmNotificationSubscriptionEventsHandler.publishCmNotificationSubscriptionNcmpOutEvent(subscriptionId,
                 "subscriptionCreateResponse", cmNotificationSubscriptionNcmpOutEvent, false);
     }