From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 18 Jan 2024 14:52:06 +0000 (+0100)
Subject: Fix ModuleInfoSnapshotResolver
X-Git-Tag: v13.0.0~13
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=mdsal.git;a=commitdiff_plain;h=085a8cdd9efbe18a2a9f30a11a512c4e31bb5595

Fix ModuleInfoSnapshotResolver

Previous update missed the ModuleInfoSnapshotResolver update, leading to
broker OSGi functionality.

Update both callsites to directly derive root package name from the
advertized namespace.

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

diff --git a/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotBuilder.java b/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotBuilder.java
index 3aacf9929a..9349589196 100644
--- a/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotBuilder.java
+++ b/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotBuilder.java
@@ -109,10 +109,8 @@ public final class ModuleInfoSnapshotBuilder {
             final var source = ModuleInfoSnapshotResolver.toYangTextSource(info);
             mappedInfos.put(source.sourceId(), info);
 
-            final Class<?> infoClass = info.getClass();
-            final String infoRoot = Naming.getModelRootPackageName(infoClass.getPackage().getName())
-                .replace(Naming.SVC_PACKAGE_PREFIX, Naming.PACKAGE_PREFIX);
-            classLoaders.put(infoRoot, infoClass.getClassLoader());
+            final String infoRoot = Naming.getRootPackageName(info.getName().getModule());
+            classLoaders.put(infoRoot, info.getClass().getClassLoader());
             namespaces.put(infoRoot, info.getName().getModule());
 
             try {
diff --git a/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotResolver.java b/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotResolver.java
index d98becaaba..fd30bb6ac0 100644
--- a/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotResolver.java
+++ b/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotResolver.java
@@ -197,9 +197,7 @@ public final class ModuleInfoSnapshotResolver implements Mutable {
             final var reg = regs.get(0);
             final var info = reg.info;
             moduleInfos.put(source, info);
-            final var infoClass = info.getClass();
-            classLoaders.put(Naming.getModelRootPackageName(infoClass.getPackage().getName()),
-                infoClass.getClassLoader());
+            classLoaders.put(Naming.getRootPackageName(info.getName().getModule()), info.getClass().getClassLoader());
         }
 
         final var next = new DefaultModuleInfoSnapshot(modelContext, moduleInfos, classLoaders);