From c43370e57f2e2fa29549c20aa706945fb1cf5bb7 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 21 Jun 2023 14:35:52 +0200 Subject: [PATCH] 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 --- .../mdsal/binding/spec/reflect/BindingReflections.java | 8 ++------ .../binding/spec/reflect/BindingReflectionsTest.java | 2 -- 2 files changed, 2 insertions(+), 8 deletions(-) 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 0b1fb98bd7..b3c9be6eea 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 @@ -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 c225c17076..066a293bec 100644 --- 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)); -- 2.36.6