From 4250dbaa6c21c8eabdf39337d9528260e143b3f1 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 21 Jun 2023 13:45:57 +0200 Subject: [PATCH] Hide BindingReflections.getModuleInfo() We have a replacement in BindingRuntimeHelpers.getYangModuleInfo(). This patch migrates users and eliminates getModuleInfo() from public view. JIRA: MDSAL-781 Change-Id: Ifd1cdbee440e8f14c1f53b2432b3b8cf3a7fc8df Signed-off-by: Robert Varga --- .../dom/adapter/BindingDOMRpcIntegrationTest.java | 6 +++--- .../binding/dom/adapter/Bug1125RegressionTest.java | 7 ++++--- .../dom/adapter/Bug1333DataChangeListenerTest.java | 7 +++---- .../dom/adapter/Bug1418AugmentationTest.java | 6 +++--- .../Bug2562DeserializedUnkeyedListTest.java | 14 +++++++------- .../binding/dom/adapter/Bug3090MultiKeyList.java | 4 ++-- .../dom/adapter/DataTreeChangeListenerTest.java | 9 ++++----- .../adapter/ForwardedNotificationAdapterTest.java | 8 ++------ .../ListInsertionDataChangeListenerTest.java | 5 ++--- .../mdsal/binding/dom/adapter/Mdsal500Test.java | 8 ++++---- .../binding/spec/reflect/BindingReflections.java | 2 +- 11 files changed, 35 insertions(+), 41 deletions(-) diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMRpcIntegrationTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMRpcIntegrationTest.java index 2c370d5d22..1287fdeda9 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMRpcIntegrationTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMRpcIntegrationTest.java @@ -26,7 +26,7 @@ import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; import org.opendaylight.mdsal.binding.api.RpcProviderService; import org.opendaylight.mdsal.binding.dom.adapter.test.util.BindingBrokerTestFactory; import org.opendaylight.mdsal.binding.dom.adapter.test.util.BindingTestContext; -import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; +import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier; import org.opendaylight.mdsal.dom.api.DOMRpcProviderService; import org.opendaylight.mdsal.dom.api.DOMRpcResult; @@ -69,8 +69,8 @@ public class BindingDOMRpcIntegrationTest { testContext = testFactory.getTestContext(); testContext.setSchemaModuleInfos(ImmutableSet.of( - BindingReflections.getModuleInfo(OpendaylightKnockKnockRpcService.class), - BindingReflections.getModuleInfo(Top.class))); + BindingRuntimeHelpers.getYangModuleInfo(OpendaylightKnockKnockRpcService.class), + BindingRuntimeHelpers.getYangModuleInfo(Top.class))); testContext.start(); baRpcProviderService = testContext.getBindingRpcProviderRegistry(); baRpcConsumerService = testContext.getBindingRpcConsumerRegistry(); diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug1125RegressionTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug1125RegressionTest.java index 4a77244baf..c1ffd9d88a 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug1125RegressionTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug1125RegressionTest.java @@ -14,7 +14,7 @@ import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.t import java.util.Set; import org.junit.Test; import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataTreeChangeListenerTest; -import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; +import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeComplexUsesAugment; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeComplexUsesAugmentBuilder; @@ -43,8 +43,9 @@ public class Bug1125RegressionTest extends AbstractDataTreeChangeListenerTest { @Override protected Set getModuleInfos() throws Exception { - return Set.of(BindingReflections.getModuleInfo(Top.class), - BindingReflections.getModuleInfo(TreeComplexUsesAugment.class)); + return Set.of( + BindingRuntimeHelpers.getYangModuleInfo(Top.class), + BindingRuntimeHelpers.getYangModuleInfo(TreeComplexUsesAugment.class)); } @Test diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug1333DataChangeListenerTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug1333DataChangeListenerTest.java index 50bfca6606..8e9e55cf60 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug1333DataChangeListenerTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug1333DataChangeListenerTest.java @@ -15,11 +15,10 @@ import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.p import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.top; import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.topLevelList; -import com.google.common.collect.ImmutableSet; import java.util.Set; import org.junit.Test; import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataTreeChangeListenerTest; -import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; +import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeComplexUsesAugment; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.Top; @@ -41,8 +40,8 @@ public class Bug1333DataChangeListenerTest extends AbstractDataTreeChangeListene @Override protected Set getModuleInfos() throws Exception { - return ImmutableSet.of(BindingReflections.getModuleInfo(Top.class), - BindingReflections.getModuleInfo(TreeComplexUsesAugment.class)); + return Set.of(BindingRuntimeHelpers.getYangModuleInfo(Top.class), + BindingRuntimeHelpers.getYangModuleInfo(TreeComplexUsesAugment.class)); } private static Top topWithListItem() { diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug1418AugmentationTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug1418AugmentationTest.java index eb4c0c637b..d8365e4764 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug1418AugmentationTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug1418AugmentationTest.java @@ -18,7 +18,7 @@ import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATI import java.util.Set; import org.junit.Test; import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataTreeChangeListenerTest; -import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; +import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeComplexUsesAugment; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeLeafOnlyUsesAugment; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.complex.from.grouping.ListViaUsesKey; @@ -42,8 +42,8 @@ public class Bug1418AugmentationTest extends AbstractDataTreeChangeListenerTest @Override protected Set getModuleInfos() { - return Set.of(BindingReflections.getModuleInfo(Top.class), - BindingReflections.getModuleInfo(TreeComplexUsesAugment.class)); + return Set.of(BindingRuntimeHelpers.getYangModuleInfo(Top.class), + BindingRuntimeHelpers.getYangModuleInfo(TreeComplexUsesAugment.class)); } @Test diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug2562DeserializedUnkeyedListTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug2562DeserializedUnkeyedListTest.java index 4aed5155bd..b35578160c 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug2562DeserializedUnkeyedListTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug2562DeserializedUnkeyedListTest.java @@ -8,33 +8,33 @@ package org.opendaylight.mdsal.binding.dom.adapter; import java.util.List; -import java.util.Map; import java.util.Set; import org.junit.Test; import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataTreeChangeListenerTest; -import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; +import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yang.gen.v1.opendaylight.test.bug._2562.namespace.rev160101.Root; import org.opendaylight.yang.gen.v1.opendaylight.test.bug._2562.namespace.rev160101.RootBuilder; import org.opendaylight.yang.gen.v1.opendaylight.test.bug._2562.namespace.rev160101.root.FoorootBuilder; import org.opendaylight.yang.gen.v1.opendaylight.test.bug._2562.namespace.rev160101.root.fooroot.BarrootBuilder; -import org.opendaylight.yang.gen.v1.opendaylight.test.bug._2562.namespace.rev160101.root.fooroot.BarrootKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.YangModuleInfo; +import org.opendaylight.yangtools.yang.binding.util.BindingMap; public class Bug2562DeserializedUnkeyedListTest extends AbstractDataTreeChangeListenerTest { private static final InstanceIdentifier ROOT_PATH = InstanceIdentifier.create(Root.class); @Override protected Set getModuleInfos() throws Exception { - return Set.of(BindingReflections.getModuleInfo(Root.class)); + return Set.of(BindingRuntimeHelpers.getYangModuleInfo(Root.class)); } @Test public void writeListToList2562Root() { - final var barRoot = new BarrootBuilder().setType(2).setValue(2).withKey(new BarrootKey(2)).build(); - final var fooRoot = new FoorootBuilder().setBarroot(Map.of(barRoot.key(), barRoot)).build(); - final var root = new RootBuilder().setFooroot(List.of(fooRoot)).build(); + final var root = new RootBuilder() + .setFooroot(List.of(new FoorootBuilder() + .setBarroot(BindingMap.of(new BarrootBuilder().setType(2).setValue(2).build())) + .build())).build(); try (var collector = createCollector(LogicalDatastoreType.CONFIGURATION, ROOT_PATH)) { collector.verifyModifications(); diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug3090MultiKeyList.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug3090MultiKeyList.java index 2afd118b39..368fb7951b 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug3090MultiKeyList.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Bug3090MultiKeyList.java @@ -15,7 +15,7 @@ import java.util.stream.Collectors; import org.junit.Test; import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType; import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataTreeChangeListenerTest; -import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; +import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.opendaylight.test.bug._3090.rev160101.Root; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.opendaylight.test.bug._3090.rev160101.RootBuilder; @@ -30,7 +30,7 @@ public class Bug3090MultiKeyList extends AbstractDataTreeChangeListenerTest { @Override protected Set getModuleInfos() throws Exception { - return Set.of(BindingReflections.getModuleInfo(Root.class)); + return Set.of(BindingRuntimeHelpers.getYangModuleInfo(Root.class)); } @Test diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/DataTreeChangeListenerTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/DataTreeChangeListenerTest.java index 7576509282..14fca329f2 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/DataTreeChangeListenerTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/DataTreeChangeListenerTest.java @@ -33,7 +33,7 @@ import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; import org.opendaylight.mdsal.binding.api.DataTreeModification; import org.opendaylight.mdsal.binding.api.WriteTransaction; import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataBrokerTest; -import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; +import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.augment.rev140709.TreeComplexUsesAugment; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.Top; @@ -67,7 +67,7 @@ public class DataTreeChangeListenerTest extends AbstractDataBrokerTest { @Override public void onDataTreeChanged(final Collection> changes) { - this.futureChanges.set(changes); + futureChanges.set(changes); } @@ -81,9 +81,8 @@ public class DataTreeChangeListenerTest extends AbstractDataBrokerTest { @Override protected Set getModuleInfos() throws Exception { return ImmutableSet.of( - BindingReflections.getModuleInfo(TwoLevelList.class), - BindingReflections.getModuleInfo(TreeComplexUsesAugment.class) - ); + BindingRuntimeHelpers.getYangModuleInfo(TwoLevelList.class), + BindingRuntimeHelpers.getYangModuleInfo(TreeComplexUsesAugment.class)); } @Override diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ForwardedNotificationAdapterTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ForwardedNotificationAdapterTest.java index d998bcbea3..024bf793a2 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ForwardedNotificationAdapterTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ForwardedNotificationAdapterTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.opendaylight.mdsal.binding.api.NotificationPublishService; import org.opendaylight.mdsal.binding.api.NotificationService.Listener; import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractNotificationBrokerTest; -import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; +import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.OpendaylightMdsalBindingTestListener; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.TwoLevelListChanged; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.TwoLevelListChangedBuilder; @@ -31,15 +31,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.te import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.two.level.list.TopLevelListKey; import org.opendaylight.yangtools.yang.binding.YangModuleInfo; import org.opendaylight.yangtools.yang.binding.util.BindingMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class ForwardedNotificationAdapterTest extends AbstractNotificationBrokerTest { - private static final Logger LOG = LoggerFactory.getLogger(ForwardedNotificationAdapterTest.class); - @Override protected Set getModuleInfos() throws Exception { - return Set.of(BindingReflections.getModuleInfo(TwoLevelListChanged.class)); + return Set.of(BindingRuntimeHelpers.getYangModuleInfo(TwoLevelListChanged.class)); } @Test diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ListInsertionDataChangeListenerTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ListInsertionDataChangeListenerTest.java index 4a33fef41e..c02d18407d 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ListInsertionDataChangeListenerTest.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/ListInsertionDataChangeListenerTest.java @@ -13,7 +13,6 @@ import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.t import static org.opendaylight.mdsal.binding.test.model.util.ListsBindingUtils.topLevelList; import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION; -import com.google.common.collect.ImmutableSet; import java.util.HashSet; import java.util.Objects; import java.util.Set; @@ -23,7 +22,7 @@ import org.junit.Test; import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType; import org.opendaylight.mdsal.binding.api.WriteTransaction; import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataTreeChangeListenerTest; -import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; +import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.Top; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.two.level.list.TopLevelList; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.two.level.list.TopLevelListBuilder; @@ -42,7 +41,7 @@ public class ListInsertionDataChangeListenerTest extends AbstractDataTreeChangeL @Override protected Set getModuleInfos() throws Exception { - return ImmutableSet.of(BindingReflections.getModuleInfo(Top.class)); + return Set.of(BindingRuntimeHelpers.getYangModuleInfo(Top.class)); } @Before diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Mdsal500Test.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Mdsal500Test.java index bc54e670ea..16d11d0fe0 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Mdsal500Test.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/Mdsal500Test.java @@ -14,11 +14,11 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import com.google.common.collect.HashMultimap; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; +import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; @@ -29,7 +29,7 @@ import org.opendaylight.mdsal.binding.api.RpcConsumerRegistry; import org.opendaylight.mdsal.binding.api.RpcProviderService; import org.opendaylight.mdsal.binding.dom.adapter.test.util.BindingBrokerTestFactory; import org.opendaylight.mdsal.binding.dom.adapter.test.util.BindingTestContext; -import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; +import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier; import org.opendaylight.mdsal.dom.api.DOMRpcProviderService; import org.opendaylight.mdsal.dom.api.DOMRpcResult; @@ -65,8 +65,8 @@ public class Mdsal500Test { testFactory.setExecutor(MoreExecutors.newDirectExecutorService()); testContext = testFactory.getTestContext(); - testContext.setSchemaModuleInfos(ImmutableSet.of( - BindingReflections.getModuleInfo(Mdsal500Service.class))); + testContext.setSchemaModuleInfos(Set.of( + BindingRuntimeHelpers.getYangModuleInfo(Mdsal500Service.class))); testContext.start(); baRpcProviderService = testContext.getBindingRpcProviderRegistry(); baRpcConsumerService = testContext.getBindingRpcConsumerRegistry(); diff --git a/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/reflect/BindingReflections.java b/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/reflect/BindingReflections.java index a1dec50ca2..91ea6cdc48 100644 --- a/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/reflect/BindingReflections.java +++ b/binding/mdsal-binding-spec-util/src/main/java/org/opendaylight/mdsal/binding/spec/reflect/BindingReflections.java @@ -138,7 +138,7 @@ public final class BindingReflections { * @param cls data object class * @return Instance of {@link YangModuleInfo} associated with model, from which this class was derived. */ - public static @NonNull YangModuleInfo getModuleInfo(final Class cls) { + private static @NonNull YangModuleInfo getModuleInfo(final Class cls) { final String packageName = Naming.getModelRootPackageName(cls.getPackage().getName()); final String potentialClassName = getModuleInfoClassName(packageName); final Class moduleInfoClass; -- 2.36.6