From 4672d8989262238165119849a5874643276e1160 Mon Sep 17 00:00:00 2001 From: "matus.kubica" Date: Tue, 25 Apr 2017 14:38:20 +0200 Subject: [PATCH] Bug 8153: Enforce check-style rules for netconf - netconf-topology-singleton 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: I690d1d6c21f042874977f1030f216b08c4c21c45 Signed-off-by: matus.kubica --- netconf/netconf-topology-singleton/pom.xml | 11 ++++++ .../api/NetconfTopologySingletonService.java | 2 +- .../singleton/api/RemoteDeviceConnector.java | 6 ++-- .../singleton/impl/MasterSalFacade.java | 1 + .../singleton/impl/NetconfNodeManager.java | 7 ++-- .../impl/NetconfTopologyContext.java | 5 +-- .../impl/NetconfTopologyManager.java | 5 ++- .../singleton/impl/ProxyDOMDataBroker.java | 5 +++ .../singleton/impl/ProxyDOMRpcService.java | 16 ++++----- .../impl/RemoteDeviceConnectorImpl.java | 16 +++++---- .../singleton/impl/SlaveSalFacade.java | 1 + .../impl/actors/NetconfNodeActor.java | 1 + .../singleton/impl/actors/ReadAdapter.java | 3 +- .../singleton/impl/actors/WriteAdapter.java | 2 +- .../singleton/impl/tx/ProxyReadAdapter.java | 2 +- .../impl/tx/ProxyReadTransaction.java | 4 ++- .../impl/tx/ProxyReadWriteTransaction.java | 7 ++-- .../singleton/impl/tx/ProxyWriteAdapter.java | 1 + .../impl/tx/ProxyWriteTransaction.java | 5 ++- .../impl/utils/NetconfTopologyUtils.java | 18 +++++----- .../messages/RefreshSetupMasterActorData.java | 2 +- .../singleton/messages/SchemaPathMessage.java | 6 ++-- .../messages/rpc/InvokeRpcMessage.java | 3 +- .../messages/rpc/InvokeRpcMessageReply.java | 2 +- .../transactions/EmptyResultResponse.java | 2 +- .../transactions/SubmitFailedReply.java | 2 +- .../singleton/impl/NetconfNodeActorTest.java | 13 +++---- .../impl/RemoteDeviceConnectorImplTest.java | 2 +- .../impl/actors/ReadTransactionActorTest.java | 34 +++++++++---------- .../impl/tx/ReadWriteTransactionTest.java | 3 +- .../impl/tx/WriteOnlyTransactionTest.java | 3 +- .../impl/utils/NetconfTopologyUtilTest.java | 4 +-- 32 files changed, 118 insertions(+), 76 deletions(-) diff --git a/netconf/netconf-topology-singleton/pom.xml b/netconf/netconf-topology-singleton/pom.xml index 5508c24835..c4c540092c 100644 --- a/netconf/netconf-topology-singleton/pom.xml +++ b/netconf/netconf-topology-singleton/pom.xml @@ -84,4 +84,15 @@ + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + checkstyle.violationSeverity=error + + + + diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/api/NetconfTopologySingletonService.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/api/NetconfTopologySingletonService.java index 37095becdf..fe0f89759c 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/api/NetconfTopologySingletonService.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/api/NetconfTopologySingletonService.java @@ -9,7 +9,7 @@ package org.opendaylight.netconf.topology.singleton.api; /** - * Provides API for advertising services for blue print service + * Provides API for advertising services for blue print service. */ public interface NetconfTopologySingletonService { } diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/api/RemoteDeviceConnector.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/api/RemoteDeviceConnector.java index bb74b754b3..4e9cc8924e 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/api/RemoteDeviceConnector.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/api/RemoteDeviceConnector.java @@ -11,18 +11,18 @@ package org.opendaylight.netconf.topology.singleton.api; import akka.actor.ActorRef; /** - * Provides API for connection odl (master) with device + * Provides API for connection odl (master) with device. */ public interface RemoteDeviceConnector { /** - * Create device communicator and open device connection + * Create device communicator and open device connection. * @param masterActorRef master actor reference */ void startRemoteDeviceConnection(ActorRef masterActorRef); /** - * Stop device communicator + * Stop device communicator. */ void stopRemoteDeviceConnection(); } diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/MasterSalFacade.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/MasterSalFacade.java index 3b04d0fa95..2e683734da 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/MasterSalFacade.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/MasterSalFacade.java @@ -156,6 +156,7 @@ class MasterSalFacade implements AutoCloseable, RemoteDeviceHandler instanceIdentifier) { if (contexts.containsKey(instanceIdentifier)) { try { @@ -174,6 +175,7 @@ public class NetconfTopologyManager } } + @SuppressWarnings("checkstyle:IllegalCatch") @Override public void close() { if (dataChangeListenerRegistration != null) { @@ -220,7 +222,8 @@ public class NetconfTopologyManager NetconfTopologyUtils.createTopologyListPath(topologyId).child(Node.class)), this); } - private void initTopology(final WriteTransaction wtx, final LogicalDatastoreType datastoreType, final String topologyId) { + private void initTopology(final WriteTransaction wtx, final LogicalDatastoreType datastoreType, + final String topologyId) { final NetworkTopology networkTopology = new NetworkTopologyBuilder().build(); final InstanceIdentifier networkTopologyId = InstanceIdentifier.builder(NetworkTopology.class).build(); diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMDataBroker.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMDataBroker.java index d5c9c25a17..893782feb7 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMDataBroker.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMDataBroker.java @@ -48,6 +48,8 @@ public class ProxyDOMDataBroker implements DOMDataBroker { private final ActorSystem actorSystem; /** + * Constructor for {@code ProxyDOMDataBroker}. + * * @param actorSystem system * @param id id * @param masterNode {@link org.opendaylight.netconf.topology.singleton.impl.actors.NetconfNodeActor} ref @@ -61,6 +63,7 @@ public class ProxyDOMDataBroker implements DOMDataBroker { this.askTimeout = askTimeout; } + @SuppressWarnings("checkstyle:IllegalCatch") @Override public DOMDataReadOnlyTransaction newReadOnlyTransaction() { final Future txActorFuture = Patterns.ask(masterNode, new NewReadTransactionRequest(), askTimeout); @@ -77,6 +80,7 @@ public class ProxyDOMDataBroker implements DOMDataBroker { } } + @SuppressWarnings("checkstyle:IllegalCatch") @Override public DOMDataReadWriteTransaction newReadWriteTransaction() { final Future txActorFuture = Patterns.ask(masterNode, new NewReadWriteTransactionRequest(), askTimeout); @@ -93,6 +97,7 @@ public class ProxyDOMDataBroker implements DOMDataBroker { } } + @SuppressWarnings("checkstyle:IllegalCatch") @Override public DOMDataWriteTransaction newWriteOnlyTransaction() { final Future txActorFuture = Patterns.ask(masterNode, new NewWriteTransactionRequest(), askTimeout); diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMRpcService.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMRpcService.java index 4fcd296329..33fa7b96e7 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMRpcService.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMRpcService.java @@ -76,13 +76,13 @@ public class ProxyDOMRpcService implements DOMRpcService { final CheckedFuture checkedFuture = Futures.makeChecked(settableFuture, new Function() { - @Nullable - @Override - public DOMRpcException apply(@Nullable final Exception exception) { - return new ClusteringRpcException(id + ": Exception during remote rpc invocation.", - exception); - } - }); + @Nullable + @Override + public DOMRpcException apply(@Nullable final Exception exception) { + return new ClusteringRpcException(id + ": Exception during remote rpc invocation.", + exception); + } + }); scalaFuture.onComplete(new OnComplete() { @Override @@ -103,7 +103,7 @@ public class ProxyDOMRpcService implements DOMRpcService { final NormalizedNodeMessage normalizedNodeMessageResult = ((InvokeRpcMessageReply) success).getNormalizedNodeMessage(); final DOMRpcResult result; - if (normalizedNodeMessageResult == null ){ + if (normalizedNodeMessageResult == null) { result = new DefaultDOMRpcResult(errors); } else { if (errors == null) { diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImpl.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImpl.java index 02f9fe8aba..bc9b4e9933 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImpl.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImpl.java @@ -120,6 +120,7 @@ public class RemoteDeviceConnectorImpl implements RemoteDeviceConnector { }); } + @SuppressWarnings("checkstyle:IllegalCatch") @Override public void stopRemoteDeviceConnection() { Preconditions.checkNotNull(deviceCommunicatorDTO, remoteDeviceId + ": Device communicator was not created."); @@ -225,9 +226,9 @@ public class RemoteDeviceConnectorImpl implements RemoteDeviceConnector { //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()); if (node.getNonModuleCapabilities() != null) { capabilities.addAll(node.getNonModuleCapabilities().getCapability()); @@ -271,10 +272,13 @@ public class RemoteDeviceConnectorImpl implements RemoteDeviceConnector { 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(remoteDeviceId + ": Only login/password authentication is supported"); } diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/SlaveSalFacade.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/SlaveSalFacade.java index ed4a27530c..0abbdaa0ba 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/SlaveSalFacade.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/SlaveSalFacade.java @@ -56,6 +56,7 @@ public class SlaveSalFacade { salProvider.getMountInstance().onTopologyDeviceDisconnected(); } + @SuppressWarnings("checkstyle:IllegalCatch") public void close() { unregisterSlaveMountPoint(); try { diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfNodeActor.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfNodeActor.java index dd5e912927..4b47c9de17 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfNodeActor.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfNodeActor.java @@ -112,6 +112,7 @@ public class NetconfNodeActor extends UntypedActor { this.mountPointService = mountPointService; } + @SuppressWarnings("checkstyle:IllegalCatch") @Override public void onReceive(final Object message) throws Exception { if (message instanceof CreateInitialMasterActorData) { // master diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadAdapter.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadAdapter.java index 0ef08f0d2e..d36062459d 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadAdapter.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadAdapter.java @@ -28,10 +28,11 @@ class ReadAdapter { private final DOMDataReadTransaction tx; - public ReadAdapter(final DOMDataReadTransaction tx) { + ReadAdapter(final DOMDataReadTransaction tx) { this.tx = tx; } + @SuppressWarnings("checkstyle:IllegalThrows") public void handle(final Object message, final ActorRef sender, final ActorRef self) throws Throwable { if (message instanceof ReadRequest) { diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/WriteAdapter.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/WriteAdapter.java index 7e762bf264..4cf51eead2 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/WriteAdapter.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/WriteAdapter.java @@ -27,7 +27,7 @@ import org.opendaylight.netconf.topology.singleton.messages.transactions.SubmitR class WriteAdapter { private final DOMDataWriteTransaction tx; - public WriteAdapter(final DOMDataWriteTransaction tx) { + WriteAdapter(final DOMDataWriteTransaction tx) { this.tx = tx; } diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadAdapter.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadAdapter.java index b500e0d5c3..0f23c11f2e 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadAdapter.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadAdapter.java @@ -39,7 +39,7 @@ class ProxyReadAdapter { private final ActorSystem actorSystem; private final Timeout askTimeout; - public ProxyReadAdapter(final ActorRef masterTxActor, final RemoteDeviceId id, final ActorSystem actorSystem, + ProxyReadAdapter(final ActorRef masterTxActor, final RemoteDeviceId id, final ActorSystem actorSystem, final Timeout askTimeout) { this.masterTxActor = masterTxActor; this.id = id; diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadTransaction.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadTransaction.java index 9ef11bc63d..b73c9466e1 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadTransaction.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadTransaction.java @@ -29,10 +29,12 @@ public class ProxyReadTransaction implements DOMDataReadOnlyTransaction { private final ProxyReadAdapter delegate; /** + * Constructor for {@code ProxyReadTransaction}. + * * @param masterTxActor {@link org.opendaylight.netconf.topology.singleton.impl.actors.ReadTransactionActor} ref * @param id device id * @param actorSystem system - * @param askTimeout + * @param askTimeout timeout */ public ProxyReadTransaction(final ActorRef masterTxActor, final RemoteDeviceId id, final ActorSystem actorSystem, final Timeout askTimeout) { diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransaction.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransaction.java index 2791389c0e..2b2759ba0f 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransaction.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransaction.java @@ -34,10 +34,13 @@ public class ProxyReadWriteTransaction implements DOMDataReadWriteTransaction { private final ProxyWriteAdapter delegateWrite; /** - * @param masterTxActor {@link org.opendaylight.netconf.topology.singleton.impl.actors.ReadWriteTransactionActor} ref + * Constructor for {@code ProxyReadWriteTransaction}. + * + * @param masterTxActor + * {@link org.opendaylight.netconf.topology.singleton.impl.actors.ReadWriteTransactionActor} ref * @param id device id * @param actorSystem system - * @param askTimeout + * @param askTimeout timeout */ public ProxyReadWriteTransaction(final ActorRef masterTxActor, final RemoteDeviceId id, final ActorSystem actorSystem, final Timeout askTimeout) { diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyWriteAdapter.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyWriteAdapter.java index e9be9e7747..223e443cd5 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyWriteAdapter.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyWriteAdapter.java @@ -60,6 +60,7 @@ public class ProxyWriteAdapter { this.askTimeout = askTimeout; } + @SuppressWarnings("checkstyle:IllegalCatch") public boolean cancel() { if (!opened.compareAndSet(true, false)) { return false; diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyWriteTransaction.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyWriteTransaction.java index eb64eaf886..f8504c029c 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyWriteTransaction.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyWriteTransaction.java @@ -31,16 +31,19 @@ public class ProxyWriteTransaction implements DOMDataWriteTransaction { private final ProxyWriteAdapter proxyWriteAdapter; /** + * Constructor for {@code ProxyWriteTransaction}. + * * @param masterTxActor {@link org.opendaylight.netconf.topology.singleton.impl.actors.WriteTransactionActor} ref * @param id device id * @param actorSystem system - * @param askTimeout + * @param askTimeout timeout */ public ProxyWriteTransaction(final ActorRef masterTxActor, final RemoteDeviceId id, final ActorSystem actorSystem, final Timeout askTimeout) { proxyWriteAdapter = new ProxyWriteAdapter(masterTxActor, id, actorSystem, askTimeout); } + @SuppressWarnings("checkstyle:IllegalCatch") @Override public boolean cancel() { return proxyWriteAdapter.cancel(); diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/utils/NetconfTopologyUtils.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/utils/NetconfTopologyUtils.java index 39ac4dd718..1324e8ad44 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/utils/NetconfTopologyUtils.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/utils/NetconfTopologyUtils.java @@ -13,8 +13,8 @@ import java.io.File; import java.math.BigDecimal; import java.net.InetSocketAddress; import java.util.HashMap; -import org.opendaylight.controller.config.util.xml.DocumentedException; import java.util.Map; +import org.opendaylight.controller.config.util.xml.DocumentedException; import org.opendaylight.netconf.sal.connect.netconf.NetconfDevice; import org.opendaylight.netconf.sal.connect.netconf.NetconfStateSchemasResolverImpl; import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId; @@ -86,15 +86,15 @@ public class NetconfTopologyUtils { * 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())); DEFAULT_SCHEMA_REPOSITORY.registerSchemaSourceListener(DEFAULT_CACHE); @@ -117,17 +117,17 @@ public class NetconfTopologyUtils { if (!moduleSchemaCacheDirectory.equals(DEFAULT_CACHE_DIRECTORY)) { // Multiple modules may be created at once; synchronize to avoid issues with data consistency among // threads. - synchronized (schemaResourcesDTOs) { + synchronized (SCHEMA_RESOURCES_DTO_MAP) { // Look for the cached DTO to reuse SchemaRegistry and SchemaContextFactory variables if // they already exist - schemaResourcesDTO = schemaResourcesDTOs.get(moduleSchemaCacheDirectory); + schemaResourcesDTO = SCHEMA_RESOURCES_DTO_MAP.get(moduleSchemaCacheDirectory); if (schemaResourcesDTO == null) { schemaResourcesDTO = createSchemaResourcesDTO(moduleSchemaCacheDirectory); schemaResourcesDTO.getSchemaRegistry().registerSchemaSourceListener( TextToASTTransformer.create((SchemaRepository) schemaResourcesDTO.getSchemaRegistry(), schemaResourcesDTO.getSchemaRegistry()) ); - schemaResourcesDTOs.put(moduleSchemaCacheDirectory, schemaResourcesDTO); + SCHEMA_RESOURCES_DTO_MAP.put(moduleSchemaCacheDirectory, schemaResourcesDTO); } } LOG.info("{} : netconf connector will use schema cache directory {} instead of {}", @@ -136,8 +136,8 @@ public class NetconfTopologyUtils { } if (schemaResourcesDTO == null) { - synchronized (schemaResourcesDTOs) { - schemaResourcesDTO = schemaResourcesDTOs.get(DEFAULT_CACHE_DIRECTORY); + synchronized (SCHEMA_RESOURCES_DTO_MAP) { + schemaResourcesDTO = SCHEMA_RESOURCES_DTO_MAP.get(DEFAULT_CACHE_DIRECTORY); } LOG.info("{} : using the default directory {}", deviceId, QUALIFIED_DEFAULT_CACHE_DIRECTORY); diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/RefreshSetupMasterActorData.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/RefreshSetupMasterActorData.java index fbc43f7cf9..2f6e2e2506 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/RefreshSetupMasterActorData.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/RefreshSetupMasterActorData.java @@ -13,7 +13,7 @@ import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId; import org.opendaylight.netconf.topology.singleton.impl.utils.NetconfTopologySetup; /** - * Master sends this message to the own actor to refresh setup data + * Master sends this message to the own actor to refresh setup data. */ public class RefreshSetupMasterActorData implements Serializable { private static final long serialVersionUID = 1L; diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/SchemaPathMessage.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/SchemaPathMessage.java index 036f4e2a02..319b375340 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/SchemaPathMessage.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/SchemaPathMessage.java @@ -39,7 +39,7 @@ public class SchemaPathMessage implements Serializable { private SchemaPathMessage schemaPathMessage; - public Proxy() { + Proxy() { //due to Externalizable } @@ -51,8 +51,8 @@ public class SchemaPathMessage implements Serializable { public void writeExternal(final ObjectOutput out) throws IOException { out.writeInt(Iterables.size(schemaPathMessage.getSchemaPath().getPathTowardsRoot())); - for (final QName qName : schemaPathMessage.getSchemaPath().getPathTowardsRoot()) { - out.writeObject(qName); + for (final QName qualifiedName : schemaPathMessage.getSchemaPath().getPathTowardsRoot()) { + out.writeObject(qualifiedName); } out.writeBoolean(schemaPathMessage.getSchemaPath().isAbsolute()); diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/rpc/InvokeRpcMessage.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/rpc/InvokeRpcMessage.java index f52131e17b..9a0e5c35e5 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/rpc/InvokeRpcMessage.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/rpc/InvokeRpcMessage.java @@ -28,6 +28,7 @@ public class InvokeRpcMessage implements Serializable { this.schemaPathMessage = schemaPathMessage; this.normalizedNodeMessage = normalizedNodeMessage; } + private SchemaPathMessage getSchemaPathMessage() { return schemaPathMessage; } @@ -49,7 +50,7 @@ public class InvokeRpcMessage implements Serializable { private InvokeRpcMessage invokeRpcMessage; - public Proxy() { + Proxy() { //due to Externalizable } diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/rpc/InvokeRpcMessageReply.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/rpc/InvokeRpcMessageReply.java index 5c60ba03fb..ba658ba92f 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/rpc/InvokeRpcMessageReply.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/rpc/InvokeRpcMessageReply.java @@ -47,7 +47,7 @@ public class InvokeRpcMessageReply implements Serializable { private InvokeRpcMessageReply invokeRpcMessageReply; - public Proxy() { + Proxy() { //due to Externalizable } diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/transactions/EmptyResultResponse.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/transactions/EmptyResultResponse.java index 9d752b8059..718d85c624 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/transactions/EmptyResultResponse.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/transactions/EmptyResultResponse.java @@ -11,7 +11,7 @@ package org.opendaylight.netconf.topology.singleton.messages.transactions; import java.io.Serializable; /** - * Message is sended when RPC result does not exist or is empty + * Message is sended when RPC result does not exist or is empty. */ public class EmptyResultResponse implements Serializable { private static final long serialVersionUID = 1L; diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/transactions/SubmitFailedReply.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/transactions/SubmitFailedReply.java index fe077e2fb5..18e1f47393 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/transactions/SubmitFailedReply.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/transactions/SubmitFailedReply.java @@ -11,7 +11,7 @@ package org.opendaylight.netconf.topology.singleton.messages.transactions; import java.io.Serializable; /** - * Message sent from master back to the slave when submit is not performed, tx is closed + * Message sent from master back to the slave when submit is not performed, tx is closed. */ public class SubmitFailedReply implements Serializable { private static final long serialVersionUID = 1L; diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java index 88441a1b06..4e50b34943 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java @@ -110,8 +110,7 @@ public class NetconfNodeActorTest { @Before public void setup() { - initMocks - (this); + initMocks(this); remoteDeviceId = new RemoteDeviceId("netconf-topology", new InetSocketAddress(InetAddresses.forString("127.0.0.1"), 9999)); final NetconfTopologySetup setup = mock(NetconfTopologySetup.class); @@ -242,7 +241,8 @@ public class NetconfNodeActorTest { final YangTextSchemaSource yangTextSchemaSource = new YangTextSchemaSource(sourceIdentifier) { @Override - protected MoreObjects.ToStringHelper addToStringAttributes(final MoreObjects.ToStringHelper toStringHelper) { + protected MoreObjects.ToStringHelper addToStringAttributes( + final MoreObjects.ToStringHelper toStringHelper) { return null; } @@ -304,7 +304,8 @@ public class NetconfNodeActorTest { // test if slave get right identifiers from master - final ProxyDOMRpcService slaveDomRPCService = new ProxyDOMRpcService(system, masterRef, remoteDeviceId, TIMEOUT); + final ProxyDOMRpcService slaveDomRPCService = + new ProxyDOMRpcService(system, masterRef, remoteDeviceId, TIMEOUT); final SchemaPath schemaPath = SchemaPath.create(true, QName.create("TestQname")); final NormalizedNode outputNode = ImmutableContainerNodeBuilder.create() @@ -324,8 +325,8 @@ public class NetconfNodeActorTest { // InvokeRpcMessageReply message - doReturn(Futures.immediateCheckedFuture(new DefaultDOMRpcResult(outputNode))). - when(domRpcService).invokeRpc(any(), any()); + doReturn(Futures.immediateCheckedFuture(new DefaultDOMRpcResult(outputNode))) + .when(domRpcService).invokeRpc(any(), any()); final CheckedFuture resultFutureNn = slaveDomRPCService.invokeRpc(schemaPath, outputNode); diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImplTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImplTest.java index 3d1f5ec2b9..9745e87c2d 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImplTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImplTest.java @@ -150,7 +150,7 @@ public class RemoteDeviceConnectorImplTest { builder.setNode(node); - final NetconfDeviceCommunicator communicator = mock (NetconfDeviceCommunicator.class); + final NetconfDeviceCommunicator communicator = mock(NetconfDeviceCommunicator.class); final RemoteDeviceHandler salFacade = mock(RemoteDeviceHandler.class); final TestingRemoteDeviceConnectorImpl remoteDeviceConnection = diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActorTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActorTest.java index 3f52fd72b9..30d279aef4 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActorTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActorTest.java @@ -36,8 +36,8 @@ import org.opendaylight.yangtools.yang.data.impl.schema.Builders; public class ReadTransactionActorTest { - private static final YangInstanceIdentifier path = YangInstanceIdentifier.EMPTY; - private static final LogicalDatastoreType store = LogicalDatastoreType.CONFIGURATION; + private static final YangInstanceIdentifier PATH = YangInstanceIdentifier.EMPTY; + private static final LogicalDatastoreType STORE = LogicalDatastoreType.CONFIGURATION; @Mock private DOMDataReadOnlyTransaction deviceReadTx; @@ -63,43 +63,43 @@ public class ReadTransactionActorTest { final ContainerNode node = Builders.containerBuilder() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(QName.create("cont"))) .build(); - when(deviceReadTx.read(store, path)).thenReturn(Futures.immediateCheckedFuture(Optional.of(node))); - actorRef.tell(new ReadRequest(store, path), probe.ref()); - verify(deviceReadTx).read(store, path); + when(deviceReadTx.read(STORE, PATH)).thenReturn(Futures.immediateCheckedFuture(Optional.of(node))); + actorRef.tell(new ReadRequest(STORE, PATH), probe.ref()); + verify(deviceReadTx).read(STORE, PATH); probe.expectMsgClass(NormalizedNodeMessage.class); } @Test public void testReadEmpty() throws Exception { - when(deviceReadTx.read(store, path)).thenReturn(Futures.immediateCheckedFuture(Optional.absent())); - actorRef.tell(new ReadRequest(store, path), probe.ref()); - verify(deviceReadTx).read(store, path); + when(deviceReadTx.read(STORE, PATH)).thenReturn(Futures.immediateCheckedFuture(Optional.absent())); + actorRef.tell(new ReadRequest(STORE, PATH), probe.ref()); + verify(deviceReadTx).read(STORE, PATH); probe.expectMsgClass(EmptyReadResponse.class); } @Test public void testReadFailure() throws Exception { final ReadFailedException cause = new ReadFailedException("fail"); - when(deviceReadTx.read(store, path)).thenReturn(Futures.immediateFailedCheckedFuture(cause)); - actorRef.tell(new ReadRequest(store, path), probe.ref()); - verify(deviceReadTx).read(store, path); + when(deviceReadTx.read(STORE, PATH)).thenReturn(Futures.immediateFailedCheckedFuture(cause)); + actorRef.tell(new ReadRequest(STORE, PATH), probe.ref()); + verify(deviceReadTx).read(STORE, PATH); probe.expectMsg(cause); } @Test public void testExists() throws Exception { - when(deviceReadTx.exists(store, path)).thenReturn(Futures.immediateCheckedFuture(true)); - actorRef.tell(new ExistsRequest(store, path), probe.ref()); - verify(deviceReadTx).exists(store, path); + when(deviceReadTx.exists(STORE, PATH)).thenReturn(Futures.immediateCheckedFuture(true)); + actorRef.tell(new ExistsRequest(STORE, PATH), probe.ref()); + verify(deviceReadTx).exists(STORE, PATH); probe.expectMsg(true); } @Test public void testExistsFailure() throws Exception { final ReadFailedException cause = new ReadFailedException("fail"); - when(deviceReadTx.exists(store, path)).thenReturn(Futures.immediateFailedCheckedFuture(cause)); - actorRef.tell(new ExistsRequest(store, path), probe.ref()); - verify(deviceReadTx).exists(store, path); + when(deviceReadTx.exists(STORE, PATH)).thenReturn(Futures.immediateFailedCheckedFuture(cause)); + actorRef.tell(new ExistsRequest(STORE, PATH), probe.ref()); + verify(deviceReadTx).exists(STORE, PATH); probe.expectMsg(cause); } } \ No newline at end of file diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ReadWriteTransactionTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ReadWriteTransactionTest.java index c50cef45a5..ccf2d59660 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ReadWriteTransactionTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ReadWriteTransactionTest.java @@ -179,7 +179,8 @@ public class ReadWriteTransactionTest { @Test public void testSubmitWithOperation() throws Exception { - final CheckedFuture resultSubmitTx = Futures.immediateCheckedFuture(null); + final CheckedFuture resultSubmitTx = + Futures.immediateCheckedFuture(null); doReturn(resultSubmitTx).when(readWriteTx).submit(); // With Tx final DOMDataWriteTransaction wTx = slaveDataBroker.newReadWriteTransaction(); diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/WriteOnlyTransactionTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/WriteOnlyTransactionTest.java index 3457b309e2..6267e73dbc 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/WriteOnlyTransactionTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/WriteOnlyTransactionTest.java @@ -180,7 +180,8 @@ public class WriteOnlyTransactionTest { @Test public void testSubmitWithOperation() throws Exception { - final CheckedFuture resultSubmitTx = Futures.immediateCheckedFuture(null); + final CheckedFuture resultSubmitTx = + Futures.immediateCheckedFuture(null); doReturn(resultSubmitTx).when(writeTx).submit(); // With Tx final DOMDataWriteTransaction wTx = slaveDataBroker.newWriteOnlyTransaction(); diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/utils/NetconfTopologyUtilTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/utils/NetconfTopologyUtilTest.java index 9f8d153a87..d84ca38dc5 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/utils/NetconfTopologyUtilTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/utils/NetconfTopologyUtilTest.java @@ -52,8 +52,8 @@ public class NetconfTopologyUtilTest { assertEquals("nodeId", listPath.firstKeyOf(Node.class).getNodeId().getValue()); assertEquals("topologyId", listPath.firstKeyOf(Topology.class).getTopologyId().getValue()); - assertEquals("topologyId", NetconfTopologyUtils.createTopologyNodePath("topologyId"). - firstKeyOf(Topology.class).getTopologyId().getValue()); + assertEquals("topologyId", NetconfTopologyUtils.createTopologyNodePath("topologyId") + .firstKeyOf(Topology.class).getTopologyId().getValue()); } } -- 2.36.6