From 57d2a366160965279304fbc24df0f946b09ea9ac Mon Sep 17 00:00:00 2001 From: "matus.kubica" Date: Tue, 25 Apr 2017 14:04:09 +0200 Subject: [PATCH] Bug 8153: Enforce check-style rules for netconf - netconf-topology Organize Imports for Checkstyle compliance. Checkstyle compliance: line length. Checkstyle compliance: various types of small changes. Checkstyle compliant Exception handling. Checkstyle final clean up & enforcement. Add the fail on violation flag into the pom.xml . Change-Id: I448131bc4ad3138d65762f31872e458e8f46f0cc Signed-off-by: matus.kubica --- netconf/netconf-topology/pom.xml | 12 ++ .../topology/AbstractNetconfTopology.java | 144 ++++++++++-------- .../topology/api/NetconfConnectorFactory.java | 22 +-- .../api/SchemaRepositoryProvider.java | 2 +- .../impl/NetconfConnectorFactoryImpl.java | 7 +- .../topology/impl/NetconfTopologyImpl.java | 23 ++- .../netconf/topology/impl/TopologyUtil.java | 2 +- .../impl/NetconfTopologyImplTest.java | 31 ++-- 8 files changed, 147 insertions(+), 96 deletions(-) diff --git a/netconf/netconf-topology/pom.xml b/netconf/netconf-topology/pom.xml index e11ac1c23f..21e9b36108 100644 --- a/netconf/netconf-topology/pom.xml +++ b/netconf/netconf-topology/pom.xml @@ -70,4 +70,16 @@ yang-model-api + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + checkstyle.violationSeverity=error + + + + diff --git a/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/AbstractNetconfTopology.java b/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/AbstractNetconfTopology.java index 68a6f11f9f..ad4bfa9029 100644 --- a/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/AbstractNetconfTopology.java +++ b/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/AbstractNetconfTopology.java @@ -96,17 +96,18 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { private static final String CACHE_DIRECTORY = "cache"; /** - * The default cache directory relative to CACHE_DIRECTORY + * The default cache directory relative to CACHE_DIRECTORY. */ private static final String DEFAULT_CACHE_DIRECTORY = "schema"; /** - * The qualified schema cache directory cache/schema + * The qualified schema cache directory cache/schema. */ - private static final String QUALIFIED_DEFAULT_CACHE_DIRECTORY = CACHE_DIRECTORY + File.separator+ DEFAULT_CACHE_DIRECTORY; + private static final String QUALIFIED_DEFAULT_CACHE_DIRECTORY = + CACHE_DIRECTORY + File.separator + DEFAULT_CACHE_DIRECTORY; /** - * The name for the default schema repository + * The name for the default schema repository. */ private static final String DEFAULT_SCHEMA_REPOSITORY_NAME = "sal-netconf-connector"; @@ -134,15 +135,15 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { * of the schema cache directory, and the value is a corresponding SchemaResourcesDTO. The * SchemaResourcesDTO is essentially a container that allows for the extraction of the * SchemaRegistry and SchemaContextFactory which should be used for a particular - * Netconf mount. Access to schemaResourcesDTOs should be surrounded by appropriate + * Netconf mount. Access to SCHEMA_RESOURCES_DTO_MAP should be surrounded by appropriate * synchronization locks. */ - private static final Map schemaResourcesDTOs = new HashMap<>(); + private static final Map SCHEMA_RESOURCES_DTO_MAP = new HashMap<>(); // Initializes default constant instances for the case when the default schema repository // directory cache/schema is used. static { - schemaResourcesDTOs.put(DEFAULT_CACHE_DIRECTORY, + SCHEMA_RESOURCES_DTO_MAP.put(DEFAULT_CACHE_DIRECTORY, new NetconfDevice.SchemaResourcesDTO(DEFAULT_SCHEMA_REPOSITORY, DEFAULT_SCHEMA_REPOSITORY, DEFAULT_SCHEMA_CONTEXT_FACTORY, new NetconfStateSchemasResolverImpl())); @@ -168,7 +169,8 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { protected AbstractNetconfTopology(final String topologyId, final NetconfClientDispatcher clientDispatcher, final EventExecutor eventExecutor, final ScheduledThreadPool keepaliveExecutor, - final ThreadPool processingExecutor, final SchemaRepositoryProvider schemaRepositoryProvider, + final ThreadPool processingExecutor, + final SchemaRepositoryProvider schemaRepositoryProvider, final DataBroker dataBroker, final DOMMountPointService mountPointService) { this.topologyId = topologyId; this.clientDispatcher = clientDispatcher; @@ -198,7 +200,8 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { public ListenableFuture disconnectNode(final NodeId nodeId) { LOG.debug("Disconnecting RemoteDevice{{}}", nodeId.getValue()); if (!activeConnectors.containsKey(nodeId)) { - return Futures.immediateFailedFuture(new IllegalStateException("Unable to disconnect device that is not connected")); + return Futures.immediateFailedFuture( + new IllegalStateException("Unable to disconnect device that is not connected")); } // retrieve connection, and disconnect it @@ -219,8 +222,10 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { final NetconfConnectorDTO deviceCommunicatorDTO = createDeviceCommunicator(nodeId, netconfNode); final NetconfDeviceCommunicator deviceCommunicator = deviceCommunicatorDTO.getCommunicator(); final NetconfClientSessionListener netconfClientSessionListener = deviceCommunicatorDTO.getSessionListener(); - final NetconfReconnectingClientConfiguration clientConfig = getClientConfig(netconfClientSessionListener, netconfNode); - final ListenableFuture future = deviceCommunicator.initializeRemoteConnection(clientDispatcher, clientConfig); + final NetconfReconnectingClientConfiguration clientConfig = + getClientConfig(netconfClientSessionListener, netconfNode); + final ListenableFuture future = + deviceCommunicator.initializeRemoteConnection(clientDispatcher, clientConfig); activeConnectors.put(nodeId, deviceCommunicatorDTO); @@ -231,7 +236,7 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { } @Override - public void onFailure(final Throwable t) { + public void onFailure(final Throwable throwable) { LOG.error("Connector for : " + nodeId.getValue() + " failed"); // remove this node from active connectors? } @@ -243,13 +248,16 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { protected NetconfConnectorDTO createDeviceCommunicator(final NodeId nodeId, final NetconfNode node) { //setup default values since default value is not supported in mdsal - final Long defaultRequestTimeoutMillis = node.getDefaultRequestTimeoutMillis() == null ? DEFAULT_REQUEST_TIMEOUT_MILLIS : node.getDefaultRequestTimeoutMillis(); - final Long keepaliveDelay = node.getKeepaliveDelay() == null ? DEFAULT_KEEPALIVE_DELAY : node.getKeepaliveDelay(); - final Boolean reconnectOnChangedSchema = node.isReconnectOnChangedSchema() == null ? DEFAULT_RECONNECT_ON_CHANGED_SCHEMA : node.isReconnectOnChangedSchema(); + final Long defaultRequestTimeoutMillis = node.getDefaultRequestTimeoutMillis() == null + ? DEFAULT_REQUEST_TIMEOUT_MILLIS : node.getDefaultRequestTimeoutMillis(); + final Long keepaliveDelay = node.getKeepaliveDelay() == null + ? DEFAULT_KEEPALIVE_DELAY : node.getKeepaliveDelay(); + final Boolean reconnectOnChangedSchema = node.isReconnectOnChangedSchema() == null + ? DEFAULT_RECONNECT_ON_CHANGED_SCHEMA : node.isReconnectOnChangedSchema(); final IpAddress ipAddress = node.getHost().getIpAddress(); - final InetSocketAddress address = new InetSocketAddress(ipAddress.getIpv4Address() != null ? - ipAddress.getIpv4Address().getValue() : ipAddress.getIpv6Address().getValue(), + final InetSocketAddress address = new InetSocketAddress(ipAddress.getIpv4Address() != null + ? ipAddress.getIpv4Address().getValue() : ipAddress.getIpv6Address().getValue(), node.getPort().getValue()); final RemoteDeviceId remoteDeviceId = new RemoteDeviceId(nodeId.getValue(), address); @@ -258,7 +266,8 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { if (keepaliveDelay > 0) { LOG.warn("Adding keepalive facade, for device {}", nodeId); - salFacade = new KeepaliveSalFacade(remoteDeviceId, salFacade, keepaliveExecutor.getExecutor(), keepaliveDelay, defaultRequestTimeoutMillis); + salFacade = new KeepaliveSalFacade(remoteDeviceId, salFacade, keepaliveExecutor.getExecutor(), + keepaliveDelay, defaultRequestTimeoutMillis); } // pre register yang library sources as fallback schemas to schema registry @@ -269,20 +278,21 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { final String yangLigPassword = node.getYangLibrary().getPassword(); final LibraryModulesSchemas libraryModulesSchemas; - if(yangLibURL != null) { - if(yangLibUsername != null && yangLigPassword != null) { + if (yangLibURL != null) { + if (yangLibUsername != null && yangLigPassword != null) { libraryModulesSchemas = LibraryModulesSchemas.create(yangLibURL, yangLibUsername, yangLigPassword); } else { libraryModulesSchemas = LibraryModulesSchemas.create(yangLibURL); } - for (final Map.Entry sourceIdentifierURLEntry : libraryModulesSchemas.getAvailableModels().entrySet()) { - registeredYangLibSources. - add(schemaRegistry.registerSchemaSource( - new YangLibrarySchemaYangSourceProvider(remoteDeviceId, libraryModulesSchemas.getAvailableModels()), - PotentialSchemaSource - .create(sourceIdentifierURLEntry.getKey(), YangTextSchemaSource.class, - PotentialSchemaSource.Costs.REMOTE_IO.getValue()))); + for (final Map.Entry sourceIdentifierURLEntry + : libraryModulesSchemas.getAvailableModels().entrySet()) { + registeredYangLibSources + .add(schemaRegistry.registerSchemaSource( + new YangLibrarySchemaYangSourceProvider(remoteDeviceId, + libraryModulesSchemas.getAvailableModels()), + PotentialSchemaSource.create(sourceIdentifierURLEntry.getKey(), + YangTextSchemaSource.class, PotentialSchemaSource.Costs.REMOTE_IO.getValue()))); } } } @@ -318,22 +328,25 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { // Setup information related to the SchemaRegistry, SchemaResourceFactory, etc. NetconfDevice.SchemaResourcesDTO schemaResourcesDTO = null; final String moduleSchemaCacheDirectory = node.getSchemaCacheDirectory(); - // Only checks to ensure the String is not empty or null; further checks related to directory accessibility and file permissions - // are handled during the FilesystemSchemaSourceCache initialization. + // Only checks to ensure the String is not empty or null; further checks related to directory + // accessibility and file permissionsare handled during the FilesystemSchemaSourceCache initialization. if (!Strings.isNullOrEmpty(moduleSchemaCacheDirectory)) { - // If a custom schema cache directory is specified, create the backing DTO; otherwise, the SchemaRegistry and - // SchemaContextFactory remain the default values. + // If a custom schema cache directory is specified, create the backing DTO; otherwise, + // the SchemaRegistry and SchemaContextFactory remain the default values. if (!moduleSchemaCacheDirectory.equals(DEFAULT_CACHE_DIRECTORY)) { - // Multiple modules may be created at once; synchronize to avoid issues with data consistency among threads. - synchronized(schemaResourcesDTOs) { - // Look for the cached DTO to reuse SchemaRegistry and SchemaContextFactory variables if they already exist - schemaResourcesDTO = schemaResourcesDTOs.get(moduleSchemaCacheDirectory); + // Multiple modules may be created at once; + // synchronize to avoid issues with data consistency among threads. + synchronized (SCHEMA_RESOURCES_DTO_MAP) { + // Look for the cached DTO to reuse SchemaRegistry and SchemaContextFactory variables + // if they already exist + schemaResourcesDTO = SCHEMA_RESOURCES_DTO_MAP.get(moduleSchemaCacheDirectory); if (schemaResourcesDTO == null) { schemaResourcesDTO = createSchemaResourcesDTO(moduleSchemaCacheDirectory); schemaResourcesDTO.getSchemaRegistry().registerSchemaSourceListener( - TextToASTTransformer.create((SchemaRepository) schemaResourcesDTO.getSchemaRegistry(), schemaResourcesDTO.getSchemaRegistry()) + TextToASTTransformer.create((SchemaRepository) schemaResourcesDTO.getSchemaRegistry(), + schemaResourcesDTO.getSchemaRegistry()) ); - schemaResourcesDTOs.put(moduleSchemaCacheDirectory, schemaResourcesDTO); + SCHEMA_RESOURCES_DTO_MAP.put(moduleSchemaCacheDirectory, schemaResourcesDTO); } } LOG.info("Netconf connector for device {} will use schema cache directory {} instead of {}", @@ -345,8 +358,8 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { } if (schemaResourcesDTO == null) { - schemaResourcesDTO = new NetconfDevice.SchemaResourcesDTO(schemaRegistry, schemaRepository, schemaContextFactory, - new NetconfStateSchemasResolverImpl()); + schemaResourcesDTO = new NetconfDevice.SchemaResourcesDTO(schemaRegistry, schemaRepository, + schemaContextFactory, new NetconfStateSchemasResolverImpl()); } return schemaResourcesDTO; @@ -377,17 +390,23 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { * @param schemaCacheDirectory The custom cache directory relative to "cache" * @return A FilesystemSchemaSourceCache for the custom schema cache directory */ - private FilesystemSchemaSourceCache createDeviceFilesystemCache(final String schemaCacheDirectory) { + private FilesystemSchemaSourceCache createDeviceFilesystemCache( + final String schemaCacheDirectory) { final String relativeSchemaCacheDirectory = CACHE_DIRECTORY + File.separator + schemaCacheDirectory; - return new FilesystemSchemaSourceCache<>(schemaRegistry, YangTextSchemaSource.class, new File(relativeSchemaCacheDirectory)); + return new FilesystemSchemaSourceCache<>(schemaRegistry, YangTextSchemaSource.class, + new File(relativeSchemaCacheDirectory)); } - public NetconfReconnectingClientConfiguration getClientConfig(final NetconfClientSessionListener listener, final NetconfNode node) { + public NetconfReconnectingClientConfiguration getClientConfig(final NetconfClientSessionListener listener, + final NetconfNode node) { //setup default values since default value is not supported in mdsal - final long clientConnectionTimeoutMillis = node.getConnectionTimeoutMillis() == null ? DEFAULT_CONNECTION_TIMEOUT_MILLIS : node.getConnectionTimeoutMillis(); - final long maxConnectionAttempts = node.getMaxConnectionAttempts() == null ? DEFAULT_MAX_CONNECTION_ATTEMPTS : node.getMaxConnectionAttempts(); - final int betweenAttemptsTimeoutMillis = node.getBetweenAttemptsTimeoutMillis() == null ? DEFAULT_BETWEEN_ATTEMPTS_TIMEOUT_MILLIS : node.getBetweenAttemptsTimeoutMillis(); + final long clientConnectionTimeoutMillis = node.getConnectionTimeoutMillis() == null + ? DEFAULT_CONNECTION_TIMEOUT_MILLIS : node.getConnectionTimeoutMillis(); + final long maxConnectionAttempts = node.getMaxConnectionAttempts() == null + ? DEFAULT_MAX_CONNECTION_ATTEMPTS : node.getMaxConnectionAttempts(); + final int betweenAttemptsTimeoutMillis = node.getBetweenAttemptsTimeoutMillis() == null + ? DEFAULT_BETWEEN_ATTEMPTS_TIMEOUT_MILLIS : node.getBetweenAttemptsTimeoutMillis(); final BigDecimal sleepFactor = node.getSleepFactor() == null ? DEFAULT_SLEEP_FACTOR : node.getSleepFactor(); final InetSocketAddress socketAddress = getSocketAddress(node.getHost(), node.getPort().getValue()); @@ -398,10 +417,13 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { final AuthenticationHandler authHandler; final Credentials credentials = node.getCredentials(); - if (credentials instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.credentials.LoginPassword) { + if (credentials instanceof org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114 + .netconf.node.credentials.credentials.LoginPassword) { authHandler = new LoginPassword( - ((org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.credentials.LoginPassword) credentials).getUsername(), - ((org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.credentials.LoginPassword) credentials).getPassword()); + ((org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114 + .netconf.node.credentials.credentials.LoginPassword) credentials).getUsername(), + ((org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114 + .netconf.node.credentials.credentials.LoginPassword) credentials).getPassword()); } else { throw new IllegalStateException("Only login/password authentification is supported"); } @@ -411,22 +433,22 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { .withConnectionTimeoutMillis(clientConnectionTimeoutMillis) .withReconnectStrategy(strategy) .withAuthHandler(authHandler) - .withProtocol(node.isTcpOnly() ? - NetconfClientConfiguration.NetconfClientProtocol.TCP : + .withProtocol(node.isTcpOnly() ? NetconfClientConfiguration.NetconfClientProtocol.TCP : NetconfClientConfiguration.NetconfClientProtocol.SSH) .withConnectStrategyFactory(sf) .withSessionListener(listener) .build(); } - protected abstract RemoteDeviceHandler createSalFacade(final RemoteDeviceId id); + protected abstract RemoteDeviceHandler createSalFacade(RemoteDeviceId id); private InetSocketAddress getSocketAddress(final Host host, final int port) { - if(host.getDomainName() != null) { + if (host.getDomainName() != null) { return new InetSocketAddress(host.getDomainName().getValue(), port); } else { final IpAddress ipAddress = host.getIpAddress(); - final String ip = ipAddress.getIpv4Address() != null ? ipAddress.getIpv4Address().getValue() : ipAddress.getIpv6Address().getValue(); + final String ip = ipAddress.getIpv4Address() != null + ? ipAddress.getIpv4Address().getValue() : ipAddress.getIpv6Address().getValue(); return new InetSocketAddress(ip, port); } } @@ -448,9 +470,9 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { //non-module capabilities should not exist in yang module capabilities final NetconfSessionPreferences netconfSessionPreferences = NetconfSessionPreferences.fromStrings(capabilities); - Preconditions.checkState(netconfSessionPreferences.getNonModuleCaps().isEmpty(), "List yang-module-capabilities/capability " + - "should contain only module based capabilities. Non-module capabilities used: " + - netconfSessionPreferences.getNonModuleCaps()); + Preconditions.checkState(netconfSessionPreferences.getNonModuleCaps().isEmpty(), + "List yang-module-capabilities/capability should contain only module based capabilities. " + + "Non-module capabilities used: " + netconfSessionPreferences.getNonModuleCaps()); boolean overrideNonModuleCaps = false; if (node.getNonModuleCapabilities() != null) { @@ -458,8 +480,8 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { overrideNonModuleCaps = node.getNonModuleCapabilities().isOverride(); } - return Optional.of(new UserPreferences(NetconfSessionPreferences.fromStrings(capabilities, CapabilityOrigin.UserDefined), - overrideYangModuleCaps, overrideNonModuleCaps)); + return Optional.of(new UserPreferences(NetconfSessionPreferences + .fromStrings(capabilities, CapabilityOrigin.UserDefined), overrideYangModuleCaps, overrideNonModuleCaps)); } private static final class TimedReconnectStrategyFactory implements ReconnectStrategyFactory { @@ -468,7 +490,8 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { private final double sleepFactor; private final int minSleep; - TimedReconnectStrategyFactory(final EventExecutor executor, final Long maxConnectionAttempts, final int minSleep, final BigDecimal sleepFactor) { + TimedReconnectStrategyFactory(final EventExecutor executor, final Long maxConnectionAttempts, + final int minSleep, final BigDecimal sleepFactor) { if (maxConnectionAttempts != null && maxConnectionAttempts > 0) { connectionAttempts = maxConnectionAttempts; } else { @@ -495,7 +518,8 @@ public abstract class AbstractNetconfTopology implements NetconfTopology { private final NetconfDeviceCommunicator communicator; private final RemoteDeviceHandler facade; - public NetconfConnectorDTO(final NetconfDeviceCommunicator communicator, final RemoteDeviceHandler facade) { + public NetconfConnectorDTO(final NetconfDeviceCommunicator communicator, + final RemoteDeviceHandler facade) { this.communicator = communicator; this.facade = facade; } diff --git a/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/api/NetconfConnectorFactory.java b/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/api/NetconfConnectorFactory.java index 632c2f9e59..0f99262b70 100644 --- a/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/api/NetconfConnectorFactory.java +++ b/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/api/NetconfConnectorFactory.java @@ -18,9 +18,11 @@ public interface NetconfConnectorFactory { /** * Create a new netconf connector with default values. + * *

- * This method will create a {@link Node} and a {@link NetconfNode} that will be added as an augmentation to the - * {@link Node}. Afterward, that {@link Node} will be written in the MDSAL datastore under the {@link NetconfTopology}. + * This method will create a {@link Node} and a {@link NetconfNode} + * that will be added as an augmentation to the {@link Node}. + * Afterward, that {@link Node} will be written in the MDSAL datastore under the {@link NetconfTopology}. * Listeners of that subtree located within network-topology bundle will setup the session. * * @param dataBroker Instance of the {@link DataBroker} @@ -33,12 +35,12 @@ public interface NetconfConnectorFactory { * @param reconnectOnSchemaChange Whether to enable ietf-netconf-monitoring and register the NETCONF stream. * @return The created {@link Node} */ - Node newInstance(final DataBroker dataBroker, - final String instanceName, - final String address, - final Integer port, - final String username, - final String password, - final Boolean tcpOnly, - final Boolean reconnectOnSchemaChange); + Node newInstance(DataBroker dataBroker, + String instanceName, + String address, + Integer port, + String username, + String password, + Boolean tcpOnly, + Boolean reconnectOnSchemaChange); } diff --git a/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/api/SchemaRepositoryProvider.java b/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/api/SchemaRepositoryProvider.java index 2ceee2bd07..cb3e2d06d8 100644 --- a/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/api/SchemaRepositoryProvider.java +++ b/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/api/SchemaRepositoryProvider.java @@ -10,7 +10,7 @@ package org.opendaylight.netconf.topology.api; import org.opendaylight.yangtools.yang.parser.repo.SharedSchemaRepository; -public interface SchemaRepositoryProvider{ +public interface SchemaRepositoryProvider { SharedSchemaRepository getSharedSchemaRepository(); } diff --git a/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/impl/NetconfConnectorFactoryImpl.java b/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/impl/NetconfConnectorFactoryImpl.java index dc5649f49a..c925a8828f 100644 --- a/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/impl/NetconfConnectorFactoryImpl.java +++ b/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/impl/NetconfConnectorFactoryImpl.java @@ -45,9 +45,6 @@ public class NetconfConnectorFactoryImpl implements NetconfConnectorFactory { private static final InstanceIdentifier TOPOLOGY_PATH = InstanceIdentifier.create(NetworkTopology.class) .child(Topology.class, new TopologyKey(new TopologyId("topology-netconf"))); - /** - * {@inheritDoc} - */ @Override public Node newInstance(final DataBroker dataBroker, final String instanceName, @@ -90,8 +87,8 @@ public class NetconfConnectorFactoryImpl implements NetconfConnectorFactory { } @Override - public void onFailure(final Throwable t) { - LOG.error("Node {} creation failed: {}", instanceName, t); + public void onFailure(final Throwable throwable) { + LOG.error("Node {} creation failed: {}", instanceName, throwable); } }); return node; diff --git a/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/impl/NetconfTopologyImpl.java b/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/impl/NetconfTopologyImpl.java index 243f09a77f..97bf00a5fd 100644 --- a/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/impl/NetconfTopologyImpl.java +++ b/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/impl/NetconfTopologyImpl.java @@ -42,7 +42,8 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class NetconfTopologyImpl extends AbstractNetconfTopology implements DataTreeChangeListener, AutoCloseable { +public class NetconfTopologyImpl extends AbstractNetconfTopology + implements DataTreeChangeListener, AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(NetconfTopologyImpl.class); @@ -50,7 +51,8 @@ public class NetconfTopologyImpl extends AbstractNetconfTopology implements Data public NetconfTopologyImpl(final String topologyId, final NetconfClientDispatcher clientDispatcher, final EventExecutor eventExecutor, final ScheduledThreadPool keepaliveExecutor, - final ThreadPool processingExecutor, final SchemaRepositoryProvider schemaRepositoryProvider, + final ThreadPool processingExecutor, + final SchemaRepositoryProvider schemaRepositoryProvider, final DataBroker dataBroker, final DOMMountPointService mountPointService) { super(topologyId, clientDispatcher, eventExecutor, keepaliveExecutor, processingExecutor, schemaRepositoryProvider, dataBroker, mountPointService); @@ -76,7 +78,7 @@ public class NetconfTopologyImpl extends AbstractNetconfTopology implements Data } /** - * Invoke by blueprint + * Invoked by blueprint. */ public void init() { final WriteTransaction wtx = dataBroker.newWriteOnlyTransaction(); @@ -89,8 +91,8 @@ public class NetconfTopologyImpl extends AbstractNetconfTopology implements Data } @Override - public void onFailure(final Throwable t) { - LOG.error("Unable to initialize netconf-topology, {}", t); + public void onFailure(final Throwable throwable) { + LOG.error("Unable to initialize netconf-topology, {}", throwable); } }); @@ -116,7 +118,8 @@ public class NetconfTopologyImpl extends AbstractNetconfTopology implements Data case WRITE: LOG.debug("Config for node {} created", TopologyUtil.getNodeId(rootNode.getIdentifier())); if (activeConnectors.containsKey(TopologyUtil.getNodeId(rootNode.getIdentifier()))) { - LOG.warn("RemoteDevice{{}} was already configured, reconfiguring..", TopologyUtil.getNodeId(rootNode.getIdentifier())); + LOG.warn("RemoteDevice{{}} was already configured, reconfiguring..", + TopologyUtil.getNodeId(rootNode.getIdentifier())); disconnectNode(TopologyUtil.getNodeId(rootNode.getIdentifier())); } connectNode(TopologyUtil.getNodeId(rootNode.getIdentifier()), rootNode.getDataAfter()); @@ -125,16 +128,20 @@ public class NetconfTopologyImpl extends AbstractNetconfTopology implements Data LOG.debug("Config for node {} deleted", TopologyUtil.getNodeId(rootNode.getIdentifier())); disconnectNode(TopologyUtil.getNodeId(rootNode.getIdentifier())); break; + default: + LOG.debug("Unsupported modification type: {}.", rootNode.getModificationType()); } } } private void initTopology(final WriteTransaction wtx, final LogicalDatastoreType datastoreType) { final NetworkTopology networkTopology = new NetworkTopologyBuilder().build(); - final InstanceIdentifier networkTopologyId = InstanceIdentifier.builder(NetworkTopology.class).build(); + final InstanceIdentifier networkTopologyId = + InstanceIdentifier.builder(NetworkTopology.class).build(); wtx.merge(datastoreType, networkTopologyId, networkTopology); final Topology topology = new TopologyBuilder().setTopologyId(new TopologyId(topologyId)).build(); - wtx.merge(datastoreType, networkTopologyId.child(Topology.class, new TopologyKey(new TopologyId(topologyId))), topology); + wtx.merge(datastoreType, + networkTopologyId.child(Topology.class, new TopologyKey(new TopologyId(topologyId))), topology); } } diff --git a/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/impl/TopologyUtil.java b/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/impl/TopologyUtil.java index 082d868fb1..1a58dbee7d 100644 --- a/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/impl/TopologyUtil.java +++ b/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/impl/TopologyUtil.java @@ -35,7 +35,7 @@ public final class TopologyUtil { if (pathArgument instanceof InstanceIdentifier.IdentifiableItem) { final Identifier key = ((InstanceIdentifier.IdentifiableItem) pathArgument).getKey(); - if(key instanceof NodeKey) { + if (key instanceof NodeKey) { return ((NodeKey) key).getNodeId(); } } diff --git a/netconf/netconf-topology/src/test/java/org/opendaylight/netconf/topology/impl/NetconfTopologyImplTest.java b/netconf/netconf-topology/src/test/java/org/opendaylight/netconf/topology/impl/NetconfTopologyImplTest.java index 235086f4cf..5227291635 100644 --- a/netconf/netconf-topology/src/test/java/org/opendaylight/netconf/topology/impl/NetconfTopologyImplTest.java +++ b/netconf/netconf-topology/src/test/java/org/opendaylight/netconf/topology/impl/NetconfTopologyImplTest.java @@ -96,10 +96,12 @@ public class NetconfTopologyImplTest { public void setUp() { MockitoAnnotations.initMocks(this); - when(mockedSchemaRepositoryProvider.getSharedSchemaRepository()).thenReturn(new SharedSchemaRepository("testingSharedSchemaRepo")); + when(mockedSchemaRepositoryProvider.getSharedSchemaRepository()) + .thenReturn(new SharedSchemaRepository("testingSharedSchemaRepo")); when(mockedProcessingExecutor.getExecutor()).thenReturn(MoreExecutors.newDirectExecutorService()); final Future future = new SucceededFuture(ImmediateEventExecutor.INSTANCE, new NetconfDeviceCapabilities()); - when(mockedClientDispatcher.createReconnectingClient(any(NetconfReconnectingClientConfiguration.class))).thenReturn(future); + when(mockedClientDispatcher.createReconnectingClient(any(NetconfReconnectingClientConfiguration.class))) + .thenReturn(future); topology = new TestingNetconfTopologyImpl(TOPOLOGY_ID, mockedClientDispatcher, mockedEventExecutor, mockedKeepaliveExecutor, mockedProcessingExecutor, mockedSchemaRepositoryProvider, @@ -112,18 +114,22 @@ public class NetconfTopologyImplTest { public void testInit() { final WriteTransaction wtx = mock(WriteTransaction.class); when(dataBroker.newWriteOnlyTransaction()).thenReturn(wtx); - doNothing().when(wtx).merge(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(DataObject.class)); + doNothing().when(wtx) + .merge(any(LogicalDatastoreType.class), any(InstanceIdentifier.class), any(DataObject.class)); when(wtx.submit()).thenReturn(Futures.immediateCheckedFuture(null)); topology.init(); //verify initialization of topology - final InstanceIdentifier networkTopologyId = InstanceIdentifier.builder(NetworkTopology.class).build(); + final InstanceIdentifier networkTopologyId = + InstanceIdentifier.builder(NetworkTopology.class).build(); final Topology topo = new TopologyBuilder().setTopologyId(new TopologyId(TOPOLOGY_ID)).build(); final NetworkTopology networkTopology = new NetworkTopologyBuilder().build(); verify(wtx).merge(LogicalDatastoreType.CONFIGURATION, networkTopologyId, networkTopology); verify(wtx).merge(LogicalDatastoreType.OPERATIONAL, networkTopologyId, networkTopology); - verify(wtx).merge(LogicalDatastoreType.CONFIGURATION, networkTopologyId.child(Topology.class, new TopologyKey(new TopologyId(TOPOLOGY_ID))), topo); - verify(wtx).merge(LogicalDatastoreType.OPERATIONAL, networkTopologyId.child(Topology.class, new TopologyKey(new TopologyId(TOPOLOGY_ID))), topo); + verify(wtx).merge(LogicalDatastoreType.CONFIGURATION, + networkTopologyId.child(Topology.class, new TopologyKey(new TopologyId(TOPOLOGY_ID))), topo); + verify(wtx).merge(LogicalDatastoreType.OPERATIONAL, + networkTopologyId.child(Topology.class, new TopologyKey(new TopologyId(TOPOLOGY_ID))), topo); } @Test @@ -134,7 +140,9 @@ public class NetconfTopologyImplTest { InstanceIdentifier.PathArgument pa = null; - for (final InstanceIdentifier.PathArgument p : TopologyUtil.createTopologyListPath(TOPOLOGY_ID).child(Node.class, new NodeKey(NODE_ID)).getPathArguments()) { + for (final InstanceIdentifier.PathArgument p + : TopologyUtil.createTopologyListPath(TOPOLOGY_ID) + .child(Node.class, new NodeKey(NODE_ID)).getPathArguments()) { pa = p; } @@ -180,10 +188,11 @@ public class NetconfTopologyImplTest { public static class TestingNetconfTopologyImpl extends NetconfTopologyImpl { - public TestingNetconfTopologyImpl(final String topologyId, final NetconfClientDispatcher clientDispatcher, - final EventExecutor eventExecutor, final ScheduledThreadPool keepaliveExecutor, - final ThreadPool processingExecutor, final SchemaRepositoryProvider schemaRepositoryProvider, - final DataBroker dataBroker, final DOMMountPointService mountPointService) { + public TestingNetconfTopologyImpl( + final String topologyId, final NetconfClientDispatcher clientDispatcher, + final EventExecutor eventExecutor, final ScheduledThreadPool keepaliveExecutor, + final ThreadPool processingExecutor, final SchemaRepositoryProvider schemaRepositoryProvider, + final DataBroker dataBroker, final DOMMountPointService mountPointService) { super(topologyId, clientDispatcher, eventExecutor, keepaliveExecutor, processingExecutor, schemaRepositoryProvider, dataBroker, mountPointService); } -- 2.36.6