From fae2b5f4908bc1c769ba012b19272b3cb7a7a7d9 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 4 Jul 2023 19:31:02 +0200 Subject: [PATCH] Drop unused services NetconfTopologyManager does not use DOMActionProviderService nor DOMRpcProviderService. Drop them from dependencies. Change-Id: If94076805de7672462cc0844030828921c993d55 Signed-off-by: Robert Varga --- .../impl/NetconfTopologyManager.java | 10 ------ .../impl/utils/NetconfTopologySetup.java | 35 ------------------- .../blueprint/netconf-topology-singleton.xml | 6 ---- .../impl/MountPointEndToEndTest.java | 16 ++++----- .../impl/NetconfTopologyManagerTest.java | 11 ++---- 5 files changed, 9 insertions(+), 69 deletions(-) diff --git a/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyManager.java b/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyManager.java index 1568e43c60..b673644af7 100644 --- a/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyManager.java +++ b/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyManager.java @@ -34,9 +34,7 @@ import org.opendaylight.mdsal.binding.api.RpcProviderService; import org.opendaylight.mdsal.binding.api.WriteTransaction; import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; -import org.opendaylight.mdsal.dom.api.DOMActionProviderService; import org.opendaylight.mdsal.dom.api.DOMMountPointService; -import org.opendaylight.mdsal.dom.api.DOMRpcProviderService; import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider; import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration; import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier; @@ -79,8 +77,6 @@ public class NetconfTopologyManager private final BaseNetconfSchemas baseSchemas; private final DataBroker dataBroker; - private final DOMRpcProviderService rpcProviderRegistry; - private final DOMActionProviderService actionProviderRegistry; private final ClusterSingletonServiceProvider clusterSingletonServiceProvider; private final ScheduledExecutorService keepaliveExecutorService; private final Executor processingExecutorService; @@ -101,8 +97,6 @@ public class NetconfTopologyManager public NetconfTopologyManager(final BaseNetconfSchemas baseSchemas, final DataBroker dataBroker, - final DOMRpcProviderService rpcProviderRegistry, - final DOMActionProviderService actionProviderService, final ClusterSingletonServiceProvider clusterSingletonServiceProvider, final ScheduledThreadPool keepaliveExecutor, final ThreadPool processingExecutor, final ActorSystemProvider actorSystemProvider, @@ -116,8 +110,6 @@ public class NetconfTopologyManager final NetconfClientConfigurationBuilderFactory builderFactory) { this.baseSchemas = requireNonNull(baseSchemas); this.dataBroker = requireNonNull(dataBroker); - this.rpcProviderRegistry = requireNonNull(rpcProviderRegistry); - actionProviderRegistry = requireNonNull(actionProviderService); this.clusterSingletonServiceProvider = requireNonNull(clusterSingletonServiceProvider); keepaliveExecutorService = keepaliveExecutor.getExecutor(); processingExecutorService = processingExecutor.getExecutor(); @@ -291,8 +283,6 @@ public class NetconfTopologyManager .setBaseSchemas(baseSchemas) .setDataBroker(dataBroker) .setInstanceIdentifier(instanceIdentifier) - .setRpcProviderRegistry(rpcProviderRegistry) - .setActionProviderRegistry(actionProviderRegistry) .setNode(node) .setActorSystem(actorSystem) .setEventExecutor(eventExecutor) diff --git a/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/utils/NetconfTopologySetup.java b/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/utils/NetconfTopologySetup.java index ecc8239cb3..1aaf469af9 100644 --- a/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/utils/NetconfTopologySetup.java +++ b/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/utils/NetconfTopologySetup.java @@ -15,8 +15,6 @@ import java.time.Duration; import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; import org.opendaylight.mdsal.binding.api.DataBroker; -import org.opendaylight.mdsal.dom.api.DOMActionProviderService; -import org.opendaylight.mdsal.dom.api.DOMRpcProviderService; import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider; import org.opendaylight.netconf.client.NetconfClientDispatcher; import org.opendaylight.netconf.client.mdsal.NetconfDevice; @@ -26,8 +24,6 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class NetconfTopologySetup { private final ClusterSingletonServiceProvider clusterSingletonServiceProvider; - private final DOMRpcProviderService rpcProviderRegistry; - private final DOMActionProviderService actionProviderRegistry; private final DataBroker dataBroker; private final InstanceIdentifier instanceIdentifier; private final Node node; @@ -43,8 +39,6 @@ public class NetconfTopologySetup { NetconfTopologySetup(final NetconfTopologySetupBuilder builder) { clusterSingletonServiceProvider = builder.getClusterSingletonServiceProvider(); - rpcProviderRegistry = builder.getRpcProviderRegistry(); - actionProviderRegistry = builder.getActionProviderRegistry(); dataBroker = builder.getDataBroker(); instanceIdentifier = builder.getInstanceIdentifier(); node = builder.getNode(); @@ -63,14 +57,6 @@ public class NetconfTopologySetup { return clusterSingletonServiceProvider; } - public DOMRpcProviderService getRpcProviderRegistry() { - return rpcProviderRegistry; - } - - public DOMActionProviderService getActionProviderRegistry() { - return actionProviderRegistry; - } - public DataBroker getDataBroker() { return dataBroker; } @@ -121,8 +107,6 @@ public class NetconfTopologySetup { public static class NetconfTopologySetupBuilder { private ClusterSingletonServiceProvider clusterSingletonServiceProvider; - private DOMRpcProviderService rpcProviderRegistry; - private DOMActionProviderService actionProviderRegistry; private DataBroker dataBroker; private InstanceIdentifier instanceIdentifier; private Node node; @@ -159,25 +143,6 @@ public class NetconfTopologySetup { return this; } - DOMRpcProviderService getRpcProviderRegistry() { - return rpcProviderRegistry; - } - - public NetconfTopologySetupBuilder setRpcProviderRegistry(final DOMRpcProviderService rpcProviderRegistry) { - this.rpcProviderRegistry = rpcProviderRegistry; - return this; - } - - DOMActionProviderService getActionProviderRegistry() { - return actionProviderRegistry; - } - - public NetconfTopologySetupBuilder setActionProviderRegistry( - final DOMActionProviderService actionProviderRegistry) { - this.actionProviderRegistry = actionProviderRegistry; - return this; - } - DataBroker getDataBroker() { return dataBroker; } diff --git a/apps/netconf-topology-singleton/src/main/resources/OSGI-INF/blueprint/netconf-topology-singleton.xml b/apps/netconf-topology-singleton/src/main/resources/OSGI-INF/blueprint/netconf-topology-singleton.xml index 5fd6eeb440..9127aed4eb 100644 --- a/apps/netconf-topology-singleton/src/main/resources/OSGI-INF/blueprint/netconf-topology-singleton.xml +++ b/apps/netconf-topology-singleton/src/main/resources/OSGI-INF/blueprint/netconf-topology-singleton.xml @@ -15,10 +15,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html interface="org.opendaylight.mdsal.binding.api.DataBroker"/> - - - - diff --git a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java index 5b94b55533..ce90b82c2a 100644 --- a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java +++ b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java @@ -72,7 +72,6 @@ import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractConcurrentDataBro import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer; import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; -import org.opendaylight.mdsal.dom.api.DOMActionProviderService; import org.opendaylight.mdsal.dom.api.DOMActionService; import org.opendaylight.mdsal.dom.api.DOMDataBroker; import org.opendaylight.mdsal.dom.api.DOMDataTreeReadOperations; @@ -84,7 +83,6 @@ import org.opendaylight.mdsal.dom.api.DOMMountPointService; import org.opendaylight.mdsal.dom.api.DOMRpcAvailabilityListener; import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier; import org.opendaylight.mdsal.dom.api.DOMRpcImplementation; -import org.opendaylight.mdsal.dom.api.DOMRpcProviderService; import org.opendaylight.mdsal.dom.api.DOMRpcResult; import org.opendaylight.mdsal.dom.api.DOMRpcService; import org.opendaylight.mdsal.dom.api.DOMService; @@ -189,9 +187,7 @@ public class MountPointEndToEndTest extends AbstractBaseSchemasTest { private static final String TEST_ROOT_DIRECTORY = "test-cache-root"; private static final String TEST_DEFAULT_SUBDIR = "test-schema"; - @Mock private DOMRpcProviderService mockRpcProviderRegistry; @Mock private RpcProviderService mockRpcProviderService; - @Mock private DOMActionProviderService mockActionProviderRegistry; @Mock private NetconfClientDispatcher mockClientDispatcher; @Mock private AAAEncryptionService mockEncryptionService; @Mock private ThreadPool mockThreadPool; @@ -319,10 +315,10 @@ public class MountPointEndToEndTest extends AbstractBaseSchemasTest { YangTextSchemaSource.class, 1)); masterNetconfTopologyManager = new NetconfTopologyManager(BASE_SCHEMAS, masterDataBroker, - mockRpcProviderRegistry, mockActionProviderRegistry, masterClusterSingletonServiceProvider, - mockKeepaliveExecutor, mockThreadPool, mockMasterActorSystemProvider, eventExecutor, - mockClientDispatcher, TOPOLOGY_ID, config, masterMountPointService, mockEncryptionService, - mockRpcProviderService, deviceActionFactory, resourceManager, builderFactory) { + masterClusterSingletonServiceProvider, mockKeepaliveExecutor, mockThreadPool, + mockMasterActorSystemProvider, eventExecutor, mockClientDispatcher, TOPOLOGY_ID, config, + masterMountPointService, mockEncryptionService, mockRpcProviderService, deviceActionFactory, + resourceManager, builderFactory) { @Override protected NetconfTopologyContext newNetconfTopologyContext(final NetconfTopologySetup setup, final ServiceGroupIdentifier serviceGroupIdent, final Timeout actorResponseWaitTime, @@ -359,8 +355,8 @@ public class MountPointEndToEndTest extends AbstractBaseSchemasTest { doReturn(mockSlaveClusterSingletonServiceReg).when(mockSlaveClusterSingletonServiceProvider) .registerClusterSingletonService(any()); - slaveNetconfTopologyManager = new NetconfTopologyManager(BASE_SCHEMAS, slaveDataBroker, mockRpcProviderRegistry, - mockActionProviderRegistry, mockSlaveClusterSingletonServiceProvider, mockKeepaliveExecutor, mockThreadPool, + slaveNetconfTopologyManager = new NetconfTopologyManager(BASE_SCHEMAS, slaveDataBroker, + mockSlaveClusterSingletonServiceProvider, mockKeepaliveExecutor, mockThreadPool, mockSlaveActorSystemProvider, eventExecutor, mockClientDispatcher, TOPOLOGY_ID, config, slaveMountPointService, mockEncryptionService, mockRpcProviderService, deviceActionFactory, resourceManager, builderFactory) { diff --git a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyManagerTest.java b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyManagerTest.java index 96680841f5..68f2d7c01f 100644 --- a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyManagerTest.java +++ b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfTopologyManagerTest.java @@ -52,9 +52,7 @@ import org.opendaylight.mdsal.binding.api.RpcProviderService; import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataBrokerTest; import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; -import org.opendaylight.mdsal.dom.api.DOMActionProviderService; import org.opendaylight.mdsal.dom.api.DOMMountPointService; -import org.opendaylight.mdsal.dom.api.DOMRpcProviderService; import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider; import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegistration; import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier; @@ -113,9 +111,7 @@ public class NetconfTopologyManagerTest extends AbstractBaseSchemasTest { dataBrokerTest.setup(); dataBroker = spy(dataBrokerTest.getDataBroker()); - final DOMRpcProviderService rpcProviderRegistry = mock(DOMRpcProviderService.class); final ScheduledThreadPool keepaliveExecutor = mock(ScheduledThreadPool.class); - final DOMActionProviderService actionProviderRegistry = mock(DOMActionProviderService.class); final ThreadPool processingThreadPool = mock(ThreadPool.class); final ExecutorService processingService = mock(ExecutorService.class); doReturn(processingService).when(processingThreadPool).getExecutor(); @@ -130,10 +126,9 @@ public class NetconfTopologyManagerTest extends AbstractBaseSchemasTest { mock(NetconfClientConfigurationBuilderFactory.class); final Config config = new ConfigBuilder().setWriteTransactionIdleTimeout(Uint16.ZERO).build(); - netconfTopologyManager = new NetconfTopologyManager(BASE_SCHEMAS, dataBroker, rpcProviderRegistry, - actionProviderRegistry, clusterSingletonServiceProvider, keepaliveExecutor, processingThreadPool, - actorSystemProvider, eventExecutor, clientDispatcher, TOPOLOGY_ID, config, - mountPointService, encryptionService, rpcProviderService, deviceActionFactory, + netconfTopologyManager = new NetconfTopologyManager(BASE_SCHEMAS, dataBroker, clusterSingletonServiceProvider, + keepaliveExecutor, processingThreadPool, actorSystemProvider, eventExecutor, clientDispatcher, + TOPOLOGY_ID, config, mountPointService, encryptionService, rpcProviderService, deviceActionFactory, new DefaultSchemaResourceManager(new DefaultYangParserFactory()), builderFactory) { @Override protected NetconfTopologyContext newNetconfTopologyContext(final NetconfTopologySetup setup, -- 2.36.6