From b8172337ffd25c5e2a1cb090f43b3c70d7f6611d Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 20 Sep 2021 16:47:51 +0200 Subject: [PATCH] Fix raw Component{Factory,Instance} references These interfaces are now properly generic, bind them to their corresponding component. Change-Id: Ib03ec6cfeee4c10fbbfc5e6e0950d1dd035cecfe Signed-off-by: Robert Varga --- .../mdsal/dom/schema/osgi/impl/OSGiModelRuntime.java | 2 +- .../schema/osgi/impl/RegularYangModuleInfoRegistry.java | 9 +++++---- .../dom/schema/osgi/impl/YangModuleInfoRegistry.java | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dom/mdsal-dom-schema-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/osgi/impl/OSGiModelRuntime.java b/dom/mdsal-dom-schema-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/osgi/impl/OSGiModelRuntime.java index af0cc25008..6e54af51f4 100644 --- a/dom/mdsal-dom-schema-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/osgi/impl/OSGiModelRuntime.java +++ b/dom/mdsal-dom-schema-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/osgi/impl/OSGiModelRuntime.java @@ -24,7 +24,7 @@ public final class OSGiModelRuntime { @Reference YangParserFactory parserFactory = null; @Reference(target = "(component.factory=" + OSGiModuleInfoSnapshotImpl.FACTORY_NAME + ")") - ComponentFactory contextFactory = null; + ComponentFactory contextFactory = null; private YangModuleInfoScanner bundleTracker = null; private YangModuleInfoRegistry moduleRegistry = null; diff --git a/dom/mdsal-dom-schema-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/osgi/impl/RegularYangModuleInfoRegistry.java b/dom/mdsal-dom-schema-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/osgi/impl/RegularYangModuleInfoRegistry.java index 244fddd641..7f0e2835be 100644 --- a/dom/mdsal-dom-schema-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/osgi/impl/RegularYangModuleInfoRegistry.java +++ b/dom/mdsal-dom-schema-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/osgi/impl/RegularYangModuleInfoRegistry.java @@ -29,11 +29,11 @@ import org.slf4j.LoggerFactory; final class RegularYangModuleInfoRegistry extends YangModuleInfoRegistry { private static final Logger LOG = LoggerFactory.getLogger(RegularYangModuleInfoRegistry.class); - private final ComponentFactory contextFactory; + private final ComponentFactory contextFactory; private final ModuleInfoSnapshotResolver moduleInfoRegistry; @GuardedBy("this") - private ComponentInstance currentInstance; + private ComponentInstance currentInstance; @GuardedBy("this") private ModuleInfoSnapshot currentSnapshot; @GuardedBy("this") @@ -41,7 +41,8 @@ final class RegularYangModuleInfoRegistry extends YangModuleInfoRegistry { private volatile boolean ignoreScanner = true; - RegularYangModuleInfoRegistry(final ComponentFactory contextFactory, final YangParserFactory factory) { + RegularYangModuleInfoRegistry(final ComponentFactory contextFactory, + final YangParserFactory factory) { this.contextFactory = requireNonNull(contextFactory); moduleInfoRegistry = new ModuleInfoSnapshotResolver("binding-dom-codec", factory); } @@ -96,7 +97,7 @@ final class RegularYangModuleInfoRegistry extends YangModuleInfoRegistry { } - final ComponentInstance newInstance = contextFactory.newInstance( + final ComponentInstance newInstance = contextFactory.newInstance( OSGiModuleInfoSnapshotImpl.props(nextGeneration(), newSnapshot)); if (currentInstance != null) { currentInstance.dispose(); diff --git a/dom/mdsal-dom-schema-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/osgi/impl/YangModuleInfoRegistry.java b/dom/mdsal-dom-schema-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/osgi/impl/YangModuleInfoRegistry.java index 6a4d1e1320..d4d5b4f179 100644 --- a/dom/mdsal-dom-schema-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/osgi/impl/YangModuleInfoRegistry.java +++ b/dom/mdsal-dom-schema-osgi/src/main/java/org/opendaylight/mdsal/dom/schema/osgi/impl/YangModuleInfoRegistry.java @@ -19,8 +19,8 @@ import org.osgi.service.component.ComponentFactory; * Update SchemaContext service in Service Registry each time new YangModuleInfo is added or removed. */ abstract class YangModuleInfoRegistry { - static @NonNull YangModuleInfoRegistry create(final BundleContext ctx, final ComponentFactory contextFactory, - final YangParserFactory factory) { + static @NonNull YangModuleInfoRegistry create(final BundleContext ctx, + final ComponentFactory contextFactory, final YangParserFactory factory) { return KarafFeaturesSupport.wrap(ctx, new RegularYangModuleInfoRegistry(contextFactory, factory)); } -- 2.36.6