2024-03 Calcium integration

lighty-core/lighty-codecs-util/src/main/java/io/lighty/codecs/util/JsonNodeConverter.java

@@ -184,7 +184,7 @@ private void parseToResult(final NormalizedNodeStreamWriter writer, final Reader
 
     @Override
     public EffectiveModelContext getModelContext() {
-        return jsonCodecFactory.getEffectiveModelContext();
+        return jsonCodecFactory.modelContext();
     }
 
 }

lighty-core/lighty-codecs-util/src/test/java/io/lighty/codecs/util/AbstractCodecTest.java

@@ -73,7 +73,7 @@ public abstract class AbstractCodecTest {
 
     public AbstractCodecTest() throws YangParserException {
         this.bindingCodecContext = createCodecContext(loadModuleInfos());
-        this.effectiveModelContext = bindingCodecContext.getRuntimeContext().getEffectiveModelContext();
+        this.effectiveModelContext = bindingCodecContext.getRuntimeContext().modelContext();
 
         this.toasterTopLevelContainerNode = topLevelContainerNode();
         this.rpcLeafInputNode = rpcLeafInputNode();
@@ -93,7 +93,7 @@ private static BindingCodecContext createCodecContext(final List<YangModuleInfo>
                 defaultYangParserFactory);
         moduleInfoSnapshotBuilder.add(moduleInfos);
         final BindingRuntimeTypes bindingRuntimeTypes = bindingRuntimeGenerator
-                .generateTypeMapping(moduleInfoSnapshotBuilder.build().getEffectiveModelContext());
+                .generateTypeMapping(moduleInfoSnapshotBuilder.build().modelContext());
 
         final DefaultBindingRuntimeContext defaultBindingRuntimeContext = new DefaultBindingRuntimeContext(
                 bindingRuntimeTypes, moduleInfoSnapshotBuilder.build());

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

@@ -40,7 +40,7 @@
 import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin.rev151013.ClusterAdminService;
-import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -66,7 +66,7 @@ protected void configure() {
                 .toInstance(lightyServices.getDiagStatusService());
         bind(ActorSystemProvider.class)
                 .toInstance(lightyServices.getActorSystemProvider());
-        bind(EffectiveModelContextProvider.class).toInstance(lightyServices.getEffectiveModelContextProvider());
+        bind(EffectiveModelContext.class).toInstance(lightyServices.getEffectiveModelContext());
         bind(DOMSchemaService.class)
                 .toInstance(lightyServices.getDOMSchemaService());
         bind(DOMYangTextSourceProvider.class)

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

@@ -69,7 +69,7 @@ public void testDIActorSystemProvider() {
 
     @Test
     public void testDISchemaContextProvider() {
-        assertNotNull(testService.getSchemaContextProvider());
+        assertNotNull(testService.getSchemaContext());
     }
 
     @Test

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

@@ -39,7 +39,7 @@
 import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin.rev151013.ClusterAdminService;
-import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 
 public class TestService {
 
@@ -50,7 +50,7 @@ public class TestService {
     private ActorSystemProvider actorSystemProvider;
 
     @Inject
-    private EffectiveModelContextProvider effectiveModelContextProvider;
+    private EffectiveModelContext effectiveModelContext;
 
     @Inject
     private DOMSchemaService domSchemaService;
@@ -156,8 +156,8 @@ public ActorSystemProvider getActorSystemProvider() {
         return actorSystemProvider;
     }
 
-    public EffectiveModelContextProvider getSchemaContextProvider() {
-        return effectiveModelContextProvider;
+    public EffectiveModelContext getSchemaContext() {
+        return effectiveModelContext;
     }
 
     public DOMSchemaService getDomSchemaService() {

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

@@ -40,7 +40,7 @@
 import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin.rev151013.ClusterAdminService;
-import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;
@@ -141,8 +141,8 @@ public ActorSystemProvider actorSystemProvider() {
     }
 
     @Bean(destroyMethod = "")
-    public EffectiveModelContextProvider effectiveModelContextProvider() {
-        return this.lightyController.getServices().getEffectiveModelContextProvider();
+    public EffectiveModelContext effectiveModelContext() {
+        return this.lightyController.getServices().getEffectiveModelContext();
     }
 
     @Bean(destroyMethod = "")

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

@@ -47,7 +47,7 @@
 import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin.rev151013.ClusterAdminService;
-import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -81,7 +81,7 @@ public class LightyCoreSpringConfigurationTest extends AbstractJUnit4SpringConte
     ActorSystemProvider actorSystemProviderTestProperty;
 
     @Autowired
-    EffectiveModelContextProvider effectiveModelContextProvider;
+    EffectiveModelContext effectiveModelContext;
 
     @Autowired
     DOMSchemaService domSchemaServiceTestProperty;
@@ -177,7 +177,7 @@ public void testLightyBeansExists() {
         assertNotNull(lightyModuleRegistryServiceTestProperty);
         assertNotNull(diagStatusServiceTestProperty);
         assertNotNull(actorSystemProviderTestProperty);
-        assertNotNull(effectiveModelContextProvider);
+        assertNotNull(effectiveModelContext);
         assertNotNull(domSchemaServiceTestProperty);
         assertNotNull(domYangTextSourceProviderTestProperty);
         assertNotNull(domMountPointServiceTestProperty);

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

@@ -43,7 +43,7 @@
 import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipService;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin.rev151013.ClusterAdminService;
-import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.parser.api.YangParserFactory;
 
 /**
@@ -62,7 +62,7 @@ public interface LightyServices extends LightyModuleRegistryService {
 
     ActorSystemProvider getActorSystemProvider();
 
-    EffectiveModelContextProvider getEffectiveModelContextProvider();
+    EffectiveModelContext getEffectiveModelContext();
 
     DOMSchemaService getDOMSchemaService();
 

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

@@ -125,7 +125,7 @@
 import org.opendaylight.yangtools.util.DurationStatisticsTracker;
 import org.opendaylight.yangtools.util.concurrent.SpecialExecutors;
 import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
-import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.parser.api.YangParserFactory;
 import org.opendaylight.yangtools.yang.parser.impl.DefaultYangParserFactory;
 import org.opendaylight.yangtools.yang.xpath.api.YangXPathParserFactory;
@@ -357,8 +357,7 @@ protected boolean initProcedure() {
             final InitialConfigData initialData = this.initialConfigData.get();
             try (InputStream inputStream = initialData.getAsInputStream()) {
                 FileToDatastoreUtils.importConfigDataFile(inputStream, initialData.getFormat(),
-                        getEffectiveModelContextProvider().getEffectiveModelContext(),
-                        this.getClusteredDOMDataBroker(), true);
+                        getEffectiveModelContext(), this.getClusteredDOMDataBroker(), true);
             } catch (TimeoutException | ExecutionException | IOException | DeserializationException e) {
                 LOG.error("Exception occurred while importing config data from file", e);
                 return false;
@@ -504,8 +503,8 @@ public ActorSystemProvider getActorSystemProvider() {
     }
 
     @Override
-    public EffectiveModelContextProvider getEffectiveModelContextProvider() {
-        return this.moduleInfoSnapshot;
+    public EffectiveModelContext getEffectiveModelContext() {
+        return this.moduleInfoSnapshot.modelContext();
     }
 
     @Override

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

@@ -24,7 +24,7 @@ public void controllerSimpleTest() {
                 lightyController.getServices().getDiagStatusService().getAllServiceDescriptors());
         Assert.assertNotNull(lightyController.getServices().getActorSystemProvider());
         Assert.assertNotNull(lightyController.getServices().getActorSystemProvider().getActorSystem());
-        Assert.assertNotNull(lightyController.getServices().getEffectiveModelContextProvider());
+        Assert.assertNotNull(lightyController.getServices().getEffectiveModelContext());
         Assert.assertNotNull(lightyController.getServices().getDOMSchemaService());
         Assert.assertNotNull(lightyController.getServices().getDOMYangTextSourceProvider());
         Assert.assertNotNull(lightyController.getServices().getDOMNotificationRouter());

lighty-core/lighty-controller/src/test/java/io/lighty/core/controller/util/FileToDatastoreUtilsTest.java

@@ -157,7 +157,7 @@ private void importFile(final String path, final YangInstanceIdentifier yii, fin
         FileToDatastoreUtils.importConfigDataFile(FileToDatastoreUtils.class.getResourceAsStream(path),
                 yii,
                 format,
-                lightyController.getServices().getEffectiveModelContextProvider().getEffectiveModelContext(),
+                lightyController.getServices().getEffectiveModelContext(),
                 lightyController.getServices().getClusteredDOMDataBroker(),
                 true);
     }

lighty-modules/lighty-bgp/src/main/java/io/lighty/modules/bgp/deployer/BgpModule.java

@@ -105,7 +105,7 @@ public BgpModule(final EffectiveModelContext modelContext, final DataBroker data
     }
 
     public BgpModule(final LightyServices lightyServices) {
-        this(lightyServices.getEffectiveModelContextProvider().getEffectiveModelContext(),
+        this(lightyServices.getEffectiveModelContext(),
                 lightyServices.getBindingDataBroker(), lightyServices.getClusteredDOMDataBroker(),
                 lightyServices.getBindingCodecTreeFactory(),
                 lightyServices.getAdapterContext().currentSerializer().getRuntimeContext(),

lighty-modules/lighty-gnmi/lighty-gnmi-commons/src/main/java/io/lighty/modules/gnmi/commons/util/DataConverter.java

@@ -126,7 +126,7 @@ Write result into container builder with identifier (netconf:base)data. Makes po
 
         final NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(resultBuilder);
         final JSONCodecFactory jsonCodecFactory =
-                JSONCodecFactorySupplier.RFC7951.createLazy(inference.getEffectiveModelContext());
+                JSONCodecFactorySupplier.RFC7951.createLazy(inference.modelContext());
 
         try (JsonParserStream jsonParser = JsonParserStream.create(streamWriter,
                 jsonCodecFactory, inference)) {

lighty-modules/lighty-netconf-sb/src/test/java/io/lighty/modules/southbound/netconf/tests/SampleConfigTest.java

@@ -29,8 +29,7 @@ public void loadTopLevelSingleNodeModelsFromJsonConfig() throws Exception {
         final LightyController lightyController = getLightyController("sampleConfigSingleNode.json");
         assertTrue(lightyController.start().get(TIME_OUT, TimeUnit.SECONDS));
 
-        final int loadedModulesSize = lightyController.getServices().getEffectiveModelContextProvider()
-                .getEffectiveModelContext().getModules().size();
+        final int loadedModulesSize = lightyController.getServices().getEffectiveModelContext().getModules().size();
         assertTrue(lightyController.shutdown(TIME_OUT, TimeUnit.SECONDS));
 
         assertEquals(loadedModulesSize, 17);
@@ -41,8 +40,7 @@ public void loadTopLevelClusterModelsFromJsonConfig() throws Exception {
         final LightyController lightyController = getLightyController("sampleConfigCluster.json");
         assertTrue(lightyController.start().get(TIME_OUT, TimeUnit.SECONDS));
 
-        final int loadedModulesSize = lightyController.getServices().getEffectiveModelContextProvider()
-                .getEffectiveModelContext().getModules().size();
+        final int loadedModulesSize = lightyController.getServices().getEffectiveModelContext().getModules().size();
         assertTrue(lightyController.shutdown(TIME_OUT, TimeUnit.SECONDS));
 
         assertEquals(loadedModulesSize, 17);