From e7a21881a7db61fb7c386b48075a120f0ffb6c08 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 28 Dec 2023 21:18:13 +0100 Subject: [PATCH] Use constructor injection in OSGiRemoteOpsProvider We have a simple component here, use constructor injection to preempty upgraded SpotBugs issuing errors on it. Change-Id: Id65f63b374497aabccb98ebe06b52195f76f8099 Signed-off-by: Robert Varga --- .../remote/rpc/OSGiRemoteOpsProvider.java | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/OSGiRemoteOpsProvider.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/OSGiRemoteOpsProvider.java index 605337111c..9de0152be0 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/OSGiRemoteOpsProvider.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/OSGiRemoteOpsProvider.java @@ -25,7 +25,7 @@ import org.osgi.service.metatype.annotations.ObjectClassDefinition; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Component(immediate = true, configurationPid = "org.opendaylight.controller.remoterpc") +@Component(configurationPid = "org.opendaylight.controller.remoterpc") @Designate(ocd = OSGiRemoteOpsProvider.Config.class) public final class OSGiRemoteOpsProvider { @ObjectClassDefinition() @@ -38,21 +38,13 @@ public final class OSGiRemoteOpsProvider { private static final Logger LOG = LoggerFactory.getLogger(OSGiRemoteOpsProvider.class); - @Reference - ActorSystemProvider actorSystemProvider = null; - @Reference - DOMRpcProviderService rpcProviderService = null; - @Reference - DOMRpcService rpcService = null; - @Reference - DOMActionProviderService actionProviderService = null; - @Reference - DOMActionService actionService = null; - private ActorRef opsManager; @Activate - void activate(final Config config) { + public OSGiRemoteOpsProvider(@Reference final ActorSystemProvider actorSystemProvider, + @Reference final DOMRpcProviderService rpcProviderService, @Reference final DOMRpcService rpcService, + @Reference final DOMActionProviderService actionProviderService, + @Reference final DOMActionService actionService, final Config config) { LOG.info("Remote Operations service starting"); final ActorSystem actorSystem = actorSystemProvider.getActorSystem(); final RemoteOpsProviderConfig opsConfig = RemoteOpsProviderConfig.newInstance(actorSystem.name(), -- 2.36.6