From 34ac460306476555d7f67b74008b3b5c5ae14851 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 8 Nov 2022 22:09:01 +0100 Subject: [PATCH] Clean up instantiation a bit Remove weird method names and use a simple constructor. Change-Id: Ie569b82d7de7dcc3b4e1ce228843ea33bd25644c Signed-off-by: Robert Varga --- .../test/tool/NetconfDeviceSimulator.java | 7 +++--- .../operations/DefaultOperationsCreator.java | 11 ++------- .../tool/operations/OperationsProvider.java | 24 +++++++------------ 3 files changed, 14 insertions(+), 28 deletions(-) diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java index c60f5116c8..6f1ba7a0e7 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java @@ -7,6 +7,8 @@ */ package org.opendaylight.netconf.test.tool; +import static java.util.Objects.requireNonNullElseGet; + import com.google.common.collect.Collections2; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ThreadFactoryBuilder; @@ -145,11 +147,10 @@ public class NetconfDeviceSimulator implements Closeable { } else { LOG.info("using OperationsProvider."); operationProvider = new OperationsProvider(idProvider, transformedCapabilities, - configuration.getOperationsCreator() != null ? configuration.getOperationsCreator() - : DefaultOperationsCreator.getDefaultOperationServiceCreator(idProvider.getCurrentSessionId())); + requireNonNullElseGet(configuration.getOperationsCreator(), + () -> new DefaultOperationsCreator(idProvider.getCurrentSessionId()))); } - final NetconfMonitoringOperationServiceFactory monitoringService = new NetconfMonitoringOperationServiceFactory( new NetconfMonitoringOperationService(monitoringService1)); diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/DefaultOperationsCreator.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/DefaultOperationsCreator.java index 07f8727609..ec27852a15 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/DefaultOperationsCreator.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/DefaultOperationsCreator.java @@ -25,26 +25,19 @@ import org.opendaylight.netconf.test.tool.rpc.SimulatedLock; import org.opendaylight.netconf.test.tool.rpc.SimulatedUnLock; public final class DefaultOperationsCreator implements OperationsCreator { - private final SimulatedOperationService simulatedOperationService; - private DefaultOperationsCreator(final long currentSessionId) { + public DefaultOperationsCreator(final long currentSessionId) { simulatedOperationService = new SimulatedOperationService(currentSessionId); } @Override public NetconfOperationService getNetconfOperationService(final Set caps, - final SessionIdProvider idProvider, - final String netconfSessionIdForReporting) { + final SessionIdProvider idProvider, final String netconfSessionIdForReporting) { return simulatedOperationService; } - public static DefaultOperationsCreator getDefaultOperationServiceCreator(final long currentSessionId) { - return new DefaultOperationsCreator(currentSessionId); - } - static class SimulatedOperationService implements NetconfOperationService { - private final long currentSessionId; SimulatedOperationService(final long currentSessionId) { diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsProvider.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsProvider.java index 15ae253007..9c46c40bbc 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsProvider.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsProvider.java @@ -5,10 +5,8 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.test.tool.operations; -import java.util.Collections; import java.util.Set; import org.opendaylight.netconf.api.capability.Capability; import org.opendaylight.netconf.api.monitoring.CapabilityListener; @@ -18,19 +16,16 @@ import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; public class OperationsProvider implements NetconfOperationServiceFactory { - private final Set caps; private final SessionIdProvider idProvider; private final OperationsCreator operationsCreator; - public OperationsProvider(final SessionIdProvider idProvider, - final Set caps) { - this(idProvider, caps, - DefaultOperationsCreator.getDefaultOperationServiceCreator(idProvider.getCurrentSessionId())); + public OperationsProvider(final SessionIdProvider idProvider, final Set caps) { + this(idProvider, caps, new DefaultOperationsCreator(idProvider.getCurrentSessionId())); } - public OperationsProvider(final SessionIdProvider idProvider, - final Set caps, OperationsCreator operationsCreator) { + public OperationsProvider(final SessionIdProvider idProvider, final Set caps, + final OperationsCreator operationsCreator) { this.caps = caps; this.idProvider = idProvider; this.operationsCreator = operationsCreator; @@ -42,16 +37,13 @@ public class OperationsProvider implements NetconfOperationServiceFactory { } @Override - public AutoCloseable registerCapabilityListener( - final CapabilityListener listener) { - listener.onCapabilitiesChanged(caps, Collections.emptySet()); - return () -> { - }; + public AutoCloseable registerCapabilityListener(final CapabilityListener listener) { + listener.onCapabilitiesChanged(caps, Set.of()); + return () -> { }; } @Override - public NetconfOperationService createService( - final String netconfSessionIdForReporting) { + public NetconfOperationService createService(final String netconfSessionIdForReporting) { return operationsCreator.getNetconfOperationService(caps, idProvider, netconfSessionIdForReporting); } } -- 2.36.6