Performance Improvement: Temporal event

- Call the admin service in the async pool thread to fetch the anchor
  details in case of raising event on save, update and delete a node or
  delete list elements
- Admin service is still called in the main thread in case of
  DeleteNodes method as we require to have anchor as we are deleting all
  the anchors.
- Fixed the test scenarios related to processing async event
- Rearranged method formal params

Issue-ID: CPS-1126
Issue-ID: CPS-1209
Change-Id: Ibd8f001c4d7c7de63914f6de24042aaf01a063b2
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>

2 files changed, 48 insertions, 37 deletions

diff --git a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsDataServiceImplSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsDataServiceImplSpec.groovy
index 8b9d545295..6c995fa85e 100644
--- a/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsDataServiceImplSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/api/impl/CpsDataServiceImplSpec.groovy
@@ -67,7 +67,7 @@ class CpsDataServiceImplSpec extends Specification {
             1 * mockCpsDataPersistenceService.storeDataNode(dataspaceName, anchorName,
                 { dataNode -> dataNode.xpath == '/test-tree' })
         and: 'data updated event is sent to notification service'
-            1 * mockNotificationService.processDataUpdatedEvent(anchor, observedTimestamp, '/', Operation.CREATE)
+            1 * mockNotificationService.processDataUpdatedEvent(dataspaceName, anchorName, '/', Operation.CREATE, observedTimestamp)
     }
 
     def 'Saving json data with invalid #scenario.'() {
@@ -76,9 +76,9 @@ class CpsDataServiceImplSpec extends Specification {
         then: 'a data validation exception is thrown'
             thrown(DataValidationException)
         and: 'the persistence service method is not invoked'
-            0 * mockCpsDataPersistenceService.storeDataNode(_, _, _)
+            0 * mockCpsDataPersistenceService.storeDataNode(*_)
         and: 'data updated event is not sent to notification service'
-            0 * mockNotificationService.processDataUpdatedEvent(_, _, _, _)
+            0 * mockNotificationService.processDataUpdatedEvent(*_)
         where: 'the following parameters are used'
             scenario                    | dataspaceName                 | anchorName
             'dataspace name'            | 'dataspace names with spaces' | 'anchorName'
@@ -96,7 +96,7 @@ class CpsDataServiceImplSpec extends Specification {
             1 * mockCpsDataPersistenceService.addChildDataNode(dataspaceName, anchorName, '/test-tree',
                 { dataNode -> dataNode.xpath == '/test-tree/branch[@name=\'New\']' })
         and: 'data updated event is sent to notification service'
-            1 * mockNotificationService.processDataUpdatedEvent(anchor, observedTimestamp, '/test-tree', Operation.CREATE)
+            1 * mockNotificationService.processDataUpdatedEvent(dataspaceName, anchorName, '/test-tree', Operation.CREATE, observedTimestamp)
     }
 
     def 'Saving child data fragment under existing node with invalid #scenario.'() {
@@ -105,9 +105,9 @@ class CpsDataServiceImplSpec extends Specification {
         then: 'a data validation exception is thrown'
             thrown(DataValidationException)
         and: 'the persistence service method is not invoked'
-            0 * mockCpsDataPersistenceService.addChildDataNode(_, _, _,_)
+            0 * mockCpsDataPersistenceService.addChildDataNode(*_)
         and: 'data updated event is not sent to notification service'
-            0 * mockNotificationService.processDataUpdatedEvent(_, _, _, _)
+            0 * mockNotificationService.processDataUpdatedEvent(*_)
         where: 'the following parameters are used'
             scenario                    | dataspaceName                 | anchorName
             'dataspace name'            | 'dataspace names with spaces' | 'anchorName'
@@ -132,7 +132,7 @@ class CpsDataServiceImplSpec extends Specification {
                 }
             )
         and: 'data updated event is sent to notification service'
-            1 * mockNotificationService.processDataUpdatedEvent(anchor, observedTimestamp, '/test-tree', Operation.UPDATE)
+            1 * mockNotificationService.processDataUpdatedEvent(dataspaceName, anchorName, '/test-tree', Operation.UPDATE, observedTimestamp)
     }
 
     def 'Saving empty list element data fragment.'() {
@@ -151,7 +151,7 @@ class CpsDataServiceImplSpec extends Specification {
         then: 'a data validation exception is thrown'
             thrown(DataValidationException)
         and: 'add list elements persistence method is not invoked'
-            0 * mockCpsDataPersistenceService.addListElements(_, _, _, _)
+            0 * mockCpsDataPersistenceService.addListElements(*_)
         where: 'the following parameters are used'
             scenario                    | dataspaceName                 | anchorName
             'dataspace name'            | 'dataspace names with spaces' | 'anchorName'
@@ -176,7 +176,7 @@ class CpsDataServiceImplSpec extends Specification {
         then: 'a data validation exception is thrown'
             thrown(DataValidationException)
         and: 'get data node persistence service is not invoked'
-            0 * mockCpsDataPersistenceService.getDataNode(_, _, _, _)
+            0 * mockCpsDataPersistenceService.getDataNode(*_)
         where: 'the following parameters are used'
             scenario                    | dataspaceName                 | anchorName
             'dataspace name'            | 'dataspace names with spaces' | 'anchorName'
@@ -192,7 +192,7 @@ class CpsDataServiceImplSpec extends Specification {
         then: 'the persistence service method is invoked with correct parameters'
             1 * mockCpsDataPersistenceService.updateDataLeaves(dataspaceName, anchorName, expectedNodeXpath, leaves)
         and: 'data updated event is sent to notification service'
-            1 * mockNotificationService.processDataUpdatedEvent(anchor, observedTimestamp, parentNodeXpath, Operation.UPDATE)
+            1 * mockNotificationService.processDataUpdatedEvent(dataspaceName, anchorName, parentNodeXpath, Operation.UPDATE, observedTimestamp)
         where: 'following parameters were used'
             scenario         | parentNodeXpath | jsonData                        || expectedNodeXpath                   | leaves
             'top level node' | '/'             | '{"test-tree": {"branch": []}}' || '/test-tree'                        | Collections.emptyMap()
@@ -205,9 +205,9 @@ class CpsDataServiceImplSpec extends Specification {
         then: 'a data validation exception is thrown'
             thrown(DataValidationException)
         and: 'the persistence service method is not invoked'
-            0 * mockCpsDataPersistenceService.updateDataLeaves(_, _, _, _)
+            0 * mockCpsDataPersistenceService.updateDataLeaves(*_)
         and: 'data updated event is not sent to notification service'
-            0 * mockNotificationService.processDataUpdatedEvent(_, _, _, _)
+            0 * mockNotificationService.processDataUpdatedEvent(*_)
         where: 'the following parameters are used'
             scenario                    | dataspaceName                 | anchorName
             'dataspace name'            | 'dataspace names with spaces' | 'anchorName'
@@ -241,7 +241,7 @@ class CpsDataServiceImplSpec extends Specification {
             1 * mockCpsDataPersistenceService.updateDataLeaves(dataspaceName, anchorName,
                 "/bookstore/categories[@code='01']", ['name':'Romance', 'code': '01'])
         and: 'the data updated event is sent to the notification service'
-            1 * mockNotificationService.processDataUpdatedEvent(anchor, observedTimestamp, '/bookstore', Operation.UPDATE)
+            1 * mockNotificationService.processDataUpdatedEvent(dataspaceName, anchorName, '/bookstore', Operation.UPDATE, observedTimestamp)
     }
 
     def 'Update Bookstore node leaves with invalid #scenario' () {
@@ -251,9 +251,9 @@ class CpsDataServiceImplSpec extends Specification {
         then: 'a data validation exception is thrown'
             thrown(DataValidationException)
         and: 'the persistence service method is not invoked'
-            0 * mockCpsDataPersistenceService.updateDataLeaves(_, _, _, _)
+            0 * mockCpsDataPersistenceService.updateDataLeaves(*_)
         and: 'the data updated event is not sent to the notification service'
-            0 * mockNotificationService.processDataUpdatedEvent(_, _, _, _)
+            0 * mockNotificationService.processDataUpdatedEvent(*_)
         where: 'the following parameters are used'
             scenario                    | dataspaceName                 | anchorName
             'dataspace name'            | 'dataspace names with spaces' | 'anchorName'
@@ -271,7 +271,7 @@ class CpsDataServiceImplSpec extends Specification {
             1 * mockCpsDataPersistenceService.replaceDataNodeTree(dataspaceName, anchorName,
                 { dataNode -> dataNode.xpath == expectedNodeXpath })
         and: 'data updated event is sent to notification service'
-            1 * mockNotificationService.processDataUpdatedEvent(anchor, observedTimestamp, parentNodeXpath, Operation.UPDATE)
+            1 * mockNotificationService.processDataUpdatedEvent(dataspaceName, anchorName, parentNodeXpath, Operation.UPDATE, observedTimestamp)
         where: 'following parameters were used'
             scenario         | parentNodeXpath | jsonData                        || expectedNodeXpath
             'top level node' | '/'             | '{"test-tree": {"branch": []}}' || '/test-tree'
@@ -284,9 +284,9 @@ class CpsDataServiceImplSpec extends Specification {
         then: 'a data validation exception is thrown'
             thrown(DataValidationException)
         and: 'the persistence service method is not invoked'
-            0 * mockCpsDataPersistenceService.replaceDataNodeTree(_, _,_)
+            0 * mockCpsDataPersistenceService.replaceDataNodeTree(*_)
         and: 'data updated event is not sent to notification service'
-            0 * mockNotificationService.processDataUpdatedEvent(_, _, _, _)
+            0 * mockNotificationService.processDataUpdatedEvent(*_)
         where: 'the following parameters are used'
             scenario                    | dataspaceName                 | anchorName
             'dataspace name'            | 'dataspace names with spaces' | 'anchorName'
@@ -311,7 +311,7 @@ class CpsDataServiceImplSpec extends Specification {
                 }
             )
         and: 'data updated event is sent to notification service'
-            1 * mockNotificationService.processDataUpdatedEvent(anchor, observedTimestamp, '/test-tree', Operation.UPDATE)
+            1 * mockNotificationService.processDataUpdatedEvent(dataspaceName, anchorName, '/test-tree', Operation.UPDATE, observedTimestamp)
     }
 
     def 'Replace whole list content with empty list element.'() {
@@ -330,9 +330,9 @@ class CpsDataServiceImplSpec extends Specification {
         then: 'a data validation exception is thrown'
             thrown(DataValidationException)
         and: 'the persistence service method is not invoked'
-            0 * mockCpsDataPersistenceService.replaceListContent(_, _,_)
+            0 * mockCpsDataPersistenceService.replaceListContent(*_)
         and: 'data updated event is not sent to notification service'
-            0 * mockNotificationService.processDataUpdatedEvent(_, _, _, _)
+            0 * mockNotificationService.processDataUpdatedEvent(*_)
         where: 'the following parameters are used'
             scenario                    | dataspaceName                 | anchorName
             'dataspace name'            | 'dataspace names with spaces' | 'anchorName'
@@ -348,7 +348,7 @@ class CpsDataServiceImplSpec extends Specification {
         then: 'the persistence service method is invoked with correct parameters'
             1 * mockCpsDataPersistenceService.deleteListDataNode(dataspaceName, anchorName, '/test-tree/branch')
         and: 'data updated event is sent to notification service'
-            1 * mockNotificationService.processDataUpdatedEvent(anchor, observedTimestamp, '/test-tree/branch', Operation.DELETE)
+            1 * mockNotificationService.processDataUpdatedEvent(dataspaceName, anchorName, '/test-tree/branch', Operation.DELETE, observedTimestamp)
     }
 
 
@@ -358,9 +358,9 @@ class CpsDataServiceImplSpec extends Specification {
         then: 'a data validation exception is thrown'
             thrown(DataValidationException)
         and: 'the persistence service method is not invoked'
-            0 * mockCpsDataPersistenceService.deleteListDataNode(_, _, _)
+            0 * mockCpsDataPersistenceService.deleteListDataNode(*_)
         and: 'data updated event is not sent to notification service'
-            0 * mockNotificationService.processDataUpdatedEvent(_, _, _, _)
+            0 * mockNotificationService.processDataUpdatedEvent(*_)
         where: 'the following parameters are used'
             scenario                    | dataspaceName                 | anchorName
             'dataspace name'            | 'dataspace names with spaces' | 'anchorName'
@@ -376,7 +376,7 @@ class CpsDataServiceImplSpec extends Specification {
         then: 'the persistence service method is invoked with the correct parameters'
             1 * mockCpsDataPersistenceService.deleteDataNode(dataspaceName, anchorName, '/data-node')
         and: 'data updated event is sent to notification service'
-            1 * mockNotificationService.processDataUpdatedEvent(anchor, observedTimestamp, '/data-node', Operation.DELETE)
+            1 * mockNotificationService.processDataUpdatedEvent(dataspaceName, anchorName, '/data-node', Operation.DELETE, observedTimestamp)
     }
 
     def 'Delete data node with an invalid #scenario.'() {
@@ -385,9 +385,9 @@ class CpsDataServiceImplSpec extends Specification {
         then: 'a data validation exception is thrown'
             thrown(DataValidationException)
         and: 'the persistence service method is not invoked'
-            0 * mockCpsDataPersistenceService.deleteDataNode(_, _, _)
+            0 * mockCpsDataPersistenceService.deleteDataNode(*_)
         and: 'data updated event is not sent to notification service'
-            0 * mockNotificationService.processDataUpdatedEvent(_, _, _, _)
+            0 * mockNotificationService.processDataUpdatedEvent(*_)
         where: 'the following parameters are used'
             scenario                    | dataspaceName                 | anchorName
             'dataspace name'            | 'dataspace names with spaces' | 'anchorName'
@@ -400,11 +400,10 @@ class CpsDataServiceImplSpec extends Specification {
             setupSchemaSetMocks('test-tree.yang')
         when: 'delete data node method is invoked with correct parameters'
             objectUnderTest.deleteDataNodes(dataspaceName, anchorName, observedTimestamp)
-        then: 'the persistence service method is invoked with the correct parameters'
+        then: 'data updated event is sent to notification service before the delete'
+            1 * mockNotificationService.processDataUpdatedEvent(dataspaceName, anchorName, '/', Operation.DELETE, observedTimestamp)
+        and: 'the persistence service method is invoked with the correct parameters'
             1 * mockCpsDataPersistenceService.deleteDataNodes(dataspaceName, anchorName)
-        and: 'data updated event is sent to notification service'
-            1 * mockNotificationService.processDataUpdatedEvent(anchor, observedTimestamp, '/', Operation.DELETE)
-
     }
 
     def setupSchemaSetMocks(String... yangResources) {
diff --git a/cps-service/src/test/groovy/org/onap/cps/notification/NotificationServiceSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/notification/NotificationServiceSpec.groovy
index 8263c31f07..a996195c07 100644
--- a/cps-service/src/test/groovy/org/onap/cps/notification/NotificationServiceSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/notification/NotificationServiceSpec.groovy
@@ -1,6 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (c) 2021-2022 Bell Canada.
+ *  Modifications Copyright (C) 2022 Nordix Foundation
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -20,7 +21,7 @@
 
 package org.onap.cps.notification
 
-import java.time.OffsetDateTime
+import org.onap.cps.api.CpsAdminService
 import org.onap.cps.config.AsyncConfig
 import org.onap.cps.event.model.CpsDataUpdatedEvent
 import org.onap.cps.spi.model.Anchor
@@ -33,6 +34,7 @@ import org.springframework.test.context.ContextConfiguration
 import spock.lang.Shared
 import spock.lang.Specification
 
+import java.time.OffsetDateTime
 import java.util.concurrent.TimeUnit
 
 @SpringBootTest
@@ -48,19 +50,29 @@ class NotificationServiceSpec extends Specification {
     NotificationErrorHandler spyNotificationErrorHandler
     @SpringSpy
     NotificationProperties spyNotificationProperties
+    @SpringBean
+    CpsAdminService mockCpsAdminService = Mock()
 
     @Autowired
     NotificationService objectUnderTest
 
     @Shared
+    def dataspaceName = 'my-dataspace-published'
+    @Shared
+    def anchorName = 'my-anchorname'
+    @Shared
     def anchor = new Anchor('my-anchorname', 'my-dataspace-published', 'my-schemaset-name')
     def myObservedTimestamp = OffsetDateTime.now()
 
+    def setup() {
+        mockCpsAdminService.getAnchor(dataspaceName, anchorName) >> anchor
+    }
+
     def 'Skip sending notification when disabled.'() {
         given: 'notification is disabled'
             spyNotificationProperties.isEnabled() >> false
         when: 'dataUpdatedEvent is received'
-            objectUnderTest.processDataUpdatedEvent(anchor, myObservedTimestamp, '/', Operation.CREATE)
+            objectUnderTest.processDataUpdatedEvent(dataspaceName, anchorName, '/', Operation.CREATE, myObservedTimestamp)
         then: 'the notification is not sent'
             0 * mockNotificationPublisher.sendNotification(_)
     }
@@ -75,8 +87,8 @@ class NotificationServiceSpec extends Specification {
             mockCpsDataUpdatedEventFactory.createCpsDataUpdatedEvent(anchor, myObservedTimestamp, Operation.CREATE) >>
                     cpsDataUpdatedEvent
         when: 'dataUpdatedEvent is received'
-            def future = objectUnderTest.processDataUpdatedEvent(anchor, myObservedTimestamp,
-                    '/', Operation.CREATE)
+            def future = objectUnderTest.processDataUpdatedEvent(dataspaceName, anchorName,
+                '/', Operation.CREATE, myObservedTimestamp)
         and: 'wait for async processing to complete'
             future.get(10, TimeUnit.SECONDS)
         then: 'async process completed successfully'
@@ -97,7 +109,7 @@ class NotificationServiceSpec extends Specification {
             mockCpsDataUpdatedEventFactory.createCpsDataUpdatedEvent(anchor, myObservedTimestamp, expectedOperationInEvent) >>
                     cpsDataUpdatedEvent
         when: 'dataUpdatedEvent is received for #xpath'
-            def future = objectUnderTest.processDataUpdatedEvent(anchor, myObservedTimestamp, xpath, operation)
+            def future = objectUnderTest.processDataUpdatedEvent(dataspaceName, anchorName, xpath, operation, myObservedTimestamp)
         and: 'wait for async processing to complete'
             future.get(10, TimeUnit.SECONDS)
         then: 'async process completed successfully'
@@ -127,7 +139,7 @@ class NotificationServiceSpec extends Specification {
             mockCpsDataUpdatedEventFactory.createCpsDataUpdatedEvent(anchor, myObservedTimestamp, Operation.CREATE) >>
                     { throw new Exception("Could not create event") }
         when: 'event is sent for processing'
-            def future = objectUnderTest.processDataUpdatedEvent(anchor, myObservedTimestamp, '/', Operation.CREATE)
+            def future = objectUnderTest.processDataUpdatedEvent(dataspaceName, anchorName, '/', Operation.CREATE, myObservedTimestamp)
         and: 'wait for async processing to complete'
             future.get(10, TimeUnit.SECONDS)
         then: 'async process completed successfully'