2024-03 Calcium integration

lighty-core/lighty-controller-guice-di/src/main/java/io/lighty/core/controller/guice/LightyControllerModule.java

@@ -34,6 +34,7 @@
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.mdsal.dom.api.DOMYangTextSourceProvider;
+import org.opendaylight.mdsal.dom.broker.DOMNotificationRouter;
 import org.opendaylight.mdsal.dom.spi.DOMNotificationSubscriptionListenerRegistry;
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService;
@@ -70,8 +71,8 @@ protected void configure() {
                 .toInstance(lightyServices.getDOMSchemaService());
         bind(DOMYangTextSourceProvider.class)
                 .toInstance(lightyServices.getDOMYangTextSourceProvider());
-        bind(DOMNotificationSubscriptionListenerRegistry.class)
-                .toInstance(lightyServices.getDOMNotificationSubscriptionListenerRegistry());
+        bind(DOMNotificationRouter.class)
+                .toInstance(lightyServices.getDOMNotificationRouter());
         bind(DistributedDataStoreInterface.class)
                 .annotatedWith(Names.named("ControllerConfigDatastore"))
                 .toInstance(lightyServices.getConfigDatastore());

lighty-core/lighty-controller-guice-di/src/test/java/io/lighty/core/controller/guice/tests/TestService.java

@@ -59,7 +59,7 @@ public class TestService {
     private DOMYangTextSourceProvider domYangTextSourceProvider;
 
     @Inject
-    private DOMNotificationSubscriptionListenerRegistry domNotificationSubscriptionListenerRegistry;
+    private DOMNotificationRouter domNotificationSubscriptionListenerRegistry;
 
     @Inject
     @Named("ControllerConfigDatastore")
@@ -168,7 +168,7 @@ public DOMYangTextSourceProvider getDomYangTextSourceProvider() {
         return domYangTextSourceProvider;
     }
 
-    public DOMNotificationSubscriptionListenerRegistry getDomNotificationSubscriptionListenerRegistry() {
+    public DOMNotificationRouter getDomNotificationSubscriptionListenerRegistry() {
         return domNotificationSubscriptionListenerRegistry;
     }
 

lighty-core/lighty-controller-spring-di/src/main/java/io/lighty/core/controller/spring/LightyCoreSpringConfiguration.java

@@ -34,6 +34,7 @@
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.mdsal.dom.api.DOMYangTextSourceProvider;
+import org.opendaylight.mdsal.dom.broker.DOMNotificationRouter;
 import org.opendaylight.mdsal.dom.spi.DOMNotificationSubscriptionListenerRegistry;
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService;
@@ -172,8 +173,8 @@ public DOMNotificationService domNotificationService() {
     }
 
     @Bean(destroyMethod = "")
-    public DOMNotificationSubscriptionListenerRegistry domNotificationSubscriptionListenerRegistry() {
-        return this.lightyController.getServices().getDOMNotificationSubscriptionListenerRegistry();
+    public DOMNotificationRouter domNotificationRouter() {
+        return this.lightyController.getServices().getDOMNotificationRouter();
     }
 
     @Bean(name = "ConfigDatastore", destroyMethod = "")

lighty-core/lighty-controller-spring-di/src/test/java/io/lighty/core/controller/spring/LightyCoreSpringConfigurationTest.java

@@ -42,7 +42,7 @@
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.mdsal.dom.api.DOMYangTextSourceProvider;
-import org.opendaylight.mdsal.dom.spi.DOMNotificationSubscriptionListenerRegistry;
+import org.opendaylight.mdsal.dom.broker.DOMNotificationRouter;
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
@@ -99,7 +99,7 @@ public class LightyCoreSpringConfigurationTest extends AbstractJUnit4SpringConte
     DOMNotificationService domNotificationServiceTestProperty;
 
     @Autowired
-    DOMNotificationSubscriptionListenerRegistry domNotificationSubscriptionListenerRegistryTestProperty;
+    DOMNotificationRouter domNotificationSubscriptionListenerRegistryTestProperty;
 
     @Autowired
     @Qualifier("ConfigDatastore")

lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/api/LightyServices.java

@@ -38,7 +38,7 @@
 import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.mdsal.dom.api.DOMYangTextSourceProvider;
-import org.opendaylight.mdsal.dom.spi.DOMNotificationSubscriptionListenerRegistry;
+import org.opendaylight.mdsal.dom.broker.DOMNotificationRouter;
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
@@ -68,7 +68,7 @@ public interface LightyServices extends LightyModuleRegistryService {
 
     DOMYangTextSourceProvider getDOMYangTextSourceProvider();
 
-    DOMNotificationSubscriptionListenerRegistry getDOMNotificationSubscriptionListenerRegistry();
+    DOMNotificationRouter getDOMNotificationRouter();
 
     DistributedDataStoreInterface getConfigDatastore();
 

lighty-core/lighty-controller/src/main/java/io/lighty/core/controller/impl/LightyControllerImpl.java

@@ -111,11 +111,10 @@
 import org.opendaylight.mdsal.dom.broker.DOMMountPointServiceImpl;
 import org.opendaylight.mdsal.dom.broker.DOMNotificationRouter;
 import org.opendaylight.mdsal.dom.broker.DOMRpcRouter;
-import org.opendaylight.mdsal.dom.spi.DOMNotificationSubscriptionListenerRegistry;
 import org.opendaylight.mdsal.dom.spi.FixedDOMSchemaService;
 import org.opendaylight.mdsal.dom.spi.store.DOMStore;
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService;
-import org.opendaylight.mdsal.eos.binding.dom.adapter.BindingDOMEntityOwnershipServiceAdapter;
+import org.opendaylight.mdsal.eos.binding.dom.adapter.DefaultEntityOwnershipService;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
 import org.opendaylight.mdsal.singleton.dom.impl.DOMClusterSingletonServiceProviderImpl;
@@ -168,7 +167,7 @@ public class LightyControllerImpl extends AbstractLightyModule implements Lighty
     private DOMActionService domActionService;
     private DOMActionProviderService domActionProviderService;
     private AkkaEntityOwnershipService akkaEntityOwnershipService;
-    private BindingDOMEntityOwnershipServiceAdapter bindingDOMEntityOwnershipServiceAdapter;
+    private DefaultEntityOwnershipService defaultEntityOwnershipService;
     private ClusterAdminRpcService clusterAdminRpcService;
     private DOMClusterSingletonServiceProviderImpl clusterSingletonServiceProvider;
     private NotificationService notificationService;
@@ -323,7 +322,7 @@ protected boolean initProcedure() {
             return false;
         }
 
-        this.bindingDOMEntityOwnershipServiceAdapter = new BindingDOMEntityOwnershipServiceAdapter(
+        this.defaultEntityOwnershipService = new DefaultEntityOwnershipService(
                 akkaEntityOwnershipService, this.codec);
         this.clusterAdminRpcService =
                 new ClusterAdminRpcService(this.configDatastore, this.operDatastore, this.codec.currentSerializer(),
@@ -403,9 +402,6 @@ protected boolean stopProcedure() throws InterruptedException {
         if (this.clusterSingletonServiceProvider != null) {
             this.clusterSingletonServiceProvider.close();
         }
-        if (this.bindingDOMEntityOwnershipServiceAdapter != null) {
-            this.bindingDOMEntityOwnershipServiceAdapter.close();
-        }
         if (this.akkaEntityOwnershipService != null) {
             try {
                 this.akkaEntityOwnershipService.close();
@@ -523,7 +519,7 @@ public DOMYangTextSourceProvider getDOMYangTextSourceProvider() {
     }
 
     @Override
-    public DOMNotificationSubscriptionListenerRegistry getDOMNotificationSubscriptionListenerRegistry() {
+    public DOMNotificationRouter getDOMNotificationRouter() {
         return this.domNotificationRouter;
     }
 
@@ -559,7 +555,7 @@ public DOMEntityOwnershipService getDOMEntityOwnershipService() {
 
     @Override
     public EntityOwnershipService getEntityOwnershipService() {
-        return this.bindingDOMEntityOwnershipServiceAdapter;
+        return this.defaultEntityOwnershipService;
     }
 
     @Override
@@ -609,12 +605,12 @@ public DOMMountPointService getDOMMountPointService() {
 
     @Override
     public DOMNotificationPublishService getDOMNotificationPublishService() {
-        return this.domNotificationRouter;
+        return domNotificationRouter.notificationPublishService();
     }
 
     @Override
     public DOMNotificationService getDOMNotificationService() {
-        return this.domNotificationRouter;
+        return domNotificationRouter.notificationService();
     }
 
     @Override

lighty-core/lighty-controller/src/test/java/io/lighty/core/controller/impl/tests/LightyControllerTest.java

@@ -27,7 +27,7 @@ public void controllerSimpleTest() {
         Assert.assertNotNull(lightyController.getServices().getEffectiveModelContextProvider());
         Assert.assertNotNull(lightyController.getServices().getDOMSchemaService());
         Assert.assertNotNull(lightyController.getServices().getDOMYangTextSourceProvider());
-        Assert.assertNotNull(lightyController.getServices().getDOMNotificationSubscriptionListenerRegistry());
+        Assert.assertNotNull(lightyController.getServices().getDOMNotificationRouter());
         Assert.assertNotNull(lightyController.getServices().getConfigDatastore());
         Assert.assertNotNull(lightyController.getServices().getOperationalDatastore());
         Assert.assertNotNull(lightyController.getServices().getYangParserFactory());