Remove BindingReflections.getModuleInfoClassName()

This is a trivial method, used only internally. Remove it by inlining it
into its sole user.

JIRA: MDSAL-781
Change-Id: Iaf39afde3ef7463744d06691e9cbcc2dc43de672
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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 0b1fb98bd794cd7df30cb888371ad8723199b600..b3c9be6eea0b641d86741833599666b8bc6b19a1 100644 (file)
--- 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
@@ -108,8 +108,8 @@ public final class BindingReflections {
      * @return Instance of {@link YangModuleInfo} associated with model, from which this class was derived.
      */
     private static @NonNull YangModuleInfo getModuleInfo(final Class<?> cls) {
-        final String packageName = Naming.getModelRootPackageName(cls.getPackage().getName());
-        final String potentialClassName = getModuleInfoClassName(packageName);
+        final String potentialClassName = Naming.getModelRootPackageName(cls.getPackage().getName()) + "."
+            + Naming.MODULE_INFO_CLASS_NAME;
         final Class<?> moduleInfoClass;
         try {
             moduleInfoClass = cls.getClassLoader().loadClass(potentialClassName);
@@ -128,10 +128,6 @@ public final class BindingReflections {
         return (YangModuleInfo) infoInstance;
     }
 
-    public static @NonNull String getModuleInfoClassName(final String packageName) {
-        return packageName + "." + Naming.MODULE_INFO_CLASS_NAME;
-    }
-
     /**
      * Check if supplied class is derived from YANG model.
      *

diff --git a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/reflect/BindingReflectionsTest.java b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/reflect/BindingReflectionsTest.java
index c225c170765915eebabc4c1f8659529136ea9e0d..066a293bece066cfa1094f53957179a2859df3e0 100644 (file)
--- a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/reflect/BindingReflectionsTest.java
+++ b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/reflect/BindingReflectionsTest.java
@@ -24,8 +24,6 @@ public class BindingReflectionsTest {
 
     @Test
     public void testBindingWithDummyObject() throws Exception {
-        assertEquals("ModuleInfoClassName should be equal to string", "test.$YangModuleInfoImpl",
-                BindingReflections.getModuleInfoClassName("test"));
         assertFalse("Should not be RpcType", BindingReflections.isRpcType(DataObject.class));
         assertTrue("Should be BindingClass", BindingReflections.isBindingClass(DataObject.class));
         assertFalse("Should not be Notification", BindingReflections.isNotification(DataObject.class));