From 1386627cfa2ac840c46bb7f01118b62a6aefe8a2 Mon Sep 17 00:00:00 2001 From: Martin Bobak Date: Fri, 8 May 2015 13:04:14 +0200 Subject: [PATCH] Fix LOG: private static final Change-Id: Id153479e96cf97d17064e7f90b4661982dcf2da1 Signed-off-by: Martin Bobak --- .../ForwardingRulesManagerModule.java | 2 +- .../StatisticsManagerModule.java | 2 +- .../manager/impl/StatListenCommitQueue.java | 8 +++--- .../LLDPPacketPuntEnforcerModule.java | 2 +- .../topology/lldp/LLDPDiscoveryListener.java | 2 +- .../topology/lldp/LLDPDiscoveryProvider.java | 2 +- .../lldp/utils/LLDPDiscoveryUtils.java | 3 +-- .../manager/DataChangeListenerImpl.java | 2 +- .../manager/FlowCapableTopologyProvider.java | 2 +- .../manager/NodeChangeListenerImpl.java | 27 +++++++++---------- .../TerminationPointChangeListenerImpl.java | 2 +- .../droptestkaraf/DropTestProviderImpl.java | 2 +- .../common/wait/SimpleTaskRetryLooper.java | 2 +- .../impl/OpenFlowPluginProviderImpl.java | 2 +- .../impl/connection/HandshakeContextImpl.java | 2 +- .../impl/device/BarrierProcessor.java | 2 +- .../registry/flow/DeviceFlowRegistryImpl.java | 2 +- .../rev150327/OpenFlowProviderModule.java | 2 +- .../md/core/ThreadPoolLoggingExecutor.java | 14 +++++----- .../OFRpcFutureResultTransformFactory.java | 4 +-- .../md/core/session/PortFeaturesUtil.java | 2 +- .../md/core/session/RolePushTask.java | 2 +- .../translator/AbstractErrorTranslator.java | 3 +-- .../translator/ExperimenterTranslator.java | 3 +-- ...esV10ToNodeConnectorUpdatedTranslator.java | 5 ++-- .../translator/FlowRemovedTranslator.java | 2 +- ...artMessageDescToNodeUpdatedTranslator.java | 3 +-- ...yPortToNodeConnectorUpdatedTranslator.java | 3 +-- ...TableFeaturesToTableUpdatedTranslator.java | 2 +- .../core/translator/PacketInTranslator.java | 8 +++--- .../translator/PacketInV10Translator.java | 5 ++-- ...ssageToNodeConnectorUpdatedTranslator.java | 3 +-- .../md/queue/QueueKeeperFairImpl.java | 8 +++--- .../md/queue/QueueKeeperHarvester.java | 3 +-- .../md/queue/QueueProcessorLightImpl.java | 5 ++-- .../md/queue/TicketProcessorFactoryImpl.java | 2 +- .../openflow/md/queue/WrapperQueueImpl.java | 8 +++--- .../md/util/InventoryDataServiceUtil.java | 10 +++---- .../LearningSwitchManagerSimpleImpl.java | 2 +- .../multi/LearningSwitchManagerMultiImpl.java | 2 +- .../test/FlowEventListenerLoggingImpl.java | 6 ++--- .../test/NodeErrorListenerLoggingImpl.java | 5 ++-- ...penflowpluginGroupTestServiceProvider.java | 21 +++++++-------- ...penflowpluginMeterTestServiceProvider.java | 25 +++++++++-------- ...luginTableFeaturesTestServiceProvider.java | 17 ++++++------ .../OpenflowpluginTestServiceProvider.java | 25 +++++++++-------- 46 files changed, 121 insertions(+), 145 deletions(-) diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/config/yang/forwardingrules_manager/ForwardingRulesManagerModule.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/config/yang/forwardingrules_manager/ForwardingRulesManagerModule.java index 62b1a1a438..61a78bd668 100644 --- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/config/yang/forwardingrules_manager/ForwardingRulesManagerModule.java +++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/config/yang/forwardingrules_manager/ForwardingRulesManagerModule.java @@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory; public class ForwardingRulesManagerModule extends org.opendaylight.openflowplugin.applications.config.yang.forwardingrules_manager.AbstractForwardingRulesManagerModule { - private static Logger LOG = LoggerFactory.getLogger(ForwardingRulesManagerModule.class); + private static final Logger LOG = LoggerFactory.getLogger(ForwardingRulesManagerModule.class); public ForwardingRulesManagerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { super(identifier, dependencyResolver); diff --git a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/config/yang/statistics_manager/StatisticsManagerModule.java b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/config/yang/statistics_manager/StatisticsManagerModule.java index 1800daace1..0c81de8b28 100644 --- a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/config/yang/statistics_manager/StatisticsManagerModule.java +++ b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/config/yang/statistics_manager/StatisticsManagerModule.java @@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory; public class StatisticsManagerModule extends org.opendaylight.openflowplugin.applications.config.yang.statistics_manager.AbstractStatisticsManagerModule { - private final static Logger LOG = LoggerFactory.getLogger(StatisticsManagerModule.class); + private static final Logger LOG = LoggerFactory.getLogger(StatisticsManagerModule.class); private static final int MAX_NODES_FOR_COLLECTOR_DEFAULT = 16; private static final int MIN_REQUEST_NET_MONITOR_INTERVAL_DEFAULT = 3000; diff --git a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatListenCommitQueue.java b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatListenCommitQueue.java index 389d93809b..834939e6b6 100644 --- a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatListenCommitQueue.java +++ b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatListenCommitQueue.java @@ -8,12 +8,13 @@ package org.opendaylight.openflowplugin.applications.statistics.manager.impl; +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; - import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; @@ -46,9 +47,6 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; - /** * statistics-manager * org.opendaylight.openflowplugin.applications.statistics.manager.impl @@ -64,7 +62,7 @@ import com.google.common.base.Preconditions; public class StatListenCommitQueue extends StatAbstractListenCommit implements OpendaylightQueueStatisticsListener { - private final static Logger LOG = LoggerFactory.getLogger(StatListenCommitQueue.class); + private static final Logger LOG = LoggerFactory.getLogger(StatListenCommitQueue.class); public StatListenCommitQueue(final StatisticsManager manager, final DataBroker db, final NotificationProviderService nps) { diff --git a/applications/table-miss-enforcer/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/applications/table/miss/enforcer/rev140326/LLDPPacketPuntEnforcerModule.java b/applications/table-miss-enforcer/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/applications/table/miss/enforcer/rev140326/LLDPPacketPuntEnforcerModule.java index 39b506212e..488a63f3bb 100644 --- a/applications/table-miss-enforcer/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/applications/table/miss/enforcer/rev140326/LLDPPacketPuntEnforcerModule.java +++ b/applications/table-miss-enforcer/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/applications/table/miss/enforcer/rev140326/LLDPPacketPuntEnforcerModule.java @@ -18,7 +18,7 @@ import org.slf4j.LoggerFactory; public class LLDPPacketPuntEnforcerModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.applications.table.miss.enforcer.rev140326.AbstractLLDPPacketPuntEnforcerModule { private static final long STARTUP_LOOP_TICK = 500L; private static final int STARTUP_LOOP_MAX_RETRIES = 8; - private static Logger LOG = LoggerFactory.getLogger(LLDPPacketPuntEnforcerModule.class); + private static final Logger LOG = LoggerFactory.getLogger(LLDPPacketPuntEnforcerModule.class); public LLDPPacketPuntEnforcerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { super(identifier, dependencyResolver); diff --git a/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPDiscoveryListener.java b/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPDiscoveryListener.java index 1c976ec7c8..76afa09e31 100644 --- a/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPDiscoveryListener.java +++ b/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPDiscoveryListener.java @@ -18,7 +18,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; class LLDPDiscoveryListener implements PacketProcessingListener { - static Logger LOG = LoggerFactory.getLogger(LLDPDiscoveryListener.class); + private static final Logger LOG = LoggerFactory.getLogger(LLDPDiscoveryListener.class); private LLDPLinkAger lldpLinkAger; private NotificationProviderService notificationService; diff --git a/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPDiscoveryProvider.java b/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPDiscoveryProvider.java index 39aa4f8d46..c6203efec0 100644 --- a/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPDiscoveryProvider.java +++ b/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/LLDPDiscoveryProvider.java @@ -16,7 +16,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class LLDPDiscoveryProvider implements AutoCloseable { - private final static Logger LOG = LoggerFactory.getLogger(LLDPDiscoveryProvider.class); + private static final Logger LOG = LoggerFactory.getLogger(LLDPDiscoveryProvider.class); private DataProviderService dataService; private NotificationProviderService notificationService; diff --git a/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/utils/LLDPDiscoveryUtils.java b/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/utils/LLDPDiscoveryUtils.java index f18193c4df..443746e65e 100644 --- a/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/utils/LLDPDiscoveryUtils.java +++ b/applications/topology-lldp-discovery/src/main/java/org/opendaylight/openflowplugin/applications/topology/lldp/utils/LLDPDiscoveryUtils.java @@ -8,7 +8,6 @@ package org.opendaylight.openflowplugin.applications.topology.lldp.utils; import java.nio.charset.Charset; - import org.opendaylight.controller.liblldp.Ethernet; import org.opendaylight.controller.liblldp.LLDP; import org.opendaylight.controller.liblldp.LLDPTLV; @@ -26,7 +25,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class LLDPDiscoveryUtils { - static Logger LOG = LoggerFactory.getLogger(LLDPDiscoveryUtils.class); + private static final Logger LOG = LoggerFactory.getLogger(LLDPDiscoveryUtils.class); public static final Long LLDP_INTERVAL = (long) (1000*5); // Send LLDP every five seconds public static final Long LLDP_EXPIRATION_TIME = LLDP_INTERVAL*3; // Let up to three intervals pass before we decide we are expired. diff --git a/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/DataChangeListenerImpl.java b/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/DataChangeListenerImpl.java index 4f192133dd..a7713430f5 100644 --- a/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/DataChangeListenerImpl.java +++ b/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/DataChangeListenerImpl.java @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory; public abstract class DataChangeListenerImpl implements DataChangeListener, AutoCloseable { - private final static Logger LOG = LoggerFactory.getLogger(DataChangeListenerImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(DataChangeListenerImpl.class); private static final long STARTUP_LOOP_TICK = 500L; private static final int STARTUP_LOOP_MAX_RETRIES = 8; protected final ListenerRegistration dataChangeListenerRegistration; diff --git a/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyProvider.java b/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyProvider.java index 58ab7ff09d..9d29bc2346 100644 --- a/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyProvider.java +++ b/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyProvider.java @@ -27,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class FlowCapableTopologyProvider extends AbstractBindingAwareProvider implements AutoCloseable { - private final static Logger LOG = LoggerFactory.getLogger(FlowCapableTopologyProvider.class); + private static final Logger LOG = LoggerFactory.getLogger(FlowCapableTopologyProvider.class); private ListenerRegistration listenerRegistration; private Thread thread; private TerminationPointChangeListenerImpl terminationPointChangeListener; diff --git a/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/NodeChangeListenerImpl.java b/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/NodeChangeListenerImpl.java index f4482eda83..91d8c4960b 100644 --- a/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/NodeChangeListenerImpl.java +++ b/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/NodeChangeListenerImpl.java @@ -7,29 +7,28 @@ */ package org.opendaylight.openflowplugin.applications.topology.manager; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; +import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; +import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef; - +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.topology.inventory.rev131030.InventoryNode; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.topology.inventory.rev131030.InventoryNodeBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder; -import java.util.Set; -import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import java.util.Map.Entry; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import java.util.Map; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class NodeChangeListenerImpl extends DataChangeListenerImpl { - private final static Logger LOG = LoggerFactory.getLogger(NodeChangeListenerImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(NodeChangeListenerImpl.class); public NodeChangeListenerImpl(final DataBroker dataBroker, final OperationProcessor operationProcessor) { // TODO: listener on FlowCapableNode. what if node id in Node.class is changed (it won't be caught by this diff --git a/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/TerminationPointChangeListenerImpl.java b/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/TerminationPointChangeListenerImpl.java index aea7931235..3e765bc006 100644 --- a/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/TerminationPointChangeListenerImpl.java +++ b/applications/topology-manager/src/main/java/org/opendaylight/openflowplugin/applications/topology/manager/TerminationPointChangeListenerImpl.java @@ -35,7 +35,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class TerminationPointChangeListenerImpl extends DataChangeListenerImpl { - private final static Logger LOG = LoggerFactory.getLogger(TerminationPointChangeListenerImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(TerminationPointChangeListenerImpl.class); public TerminationPointChangeListenerImpl(final DataBroker dataBroker, final OperationProcessor operationProcessor) { super(operationProcessor, dataBroker, InstanceIdentifier.builder(Nodes.class).child(Node.class) diff --git a/drop-test-karaf/src/main/java/org/opendaylight/openflowplugin/droptestkaraf/DropTestProviderImpl.java b/drop-test-karaf/src/main/java/org/opendaylight/openflowplugin/droptestkaraf/DropTestProviderImpl.java index 86701e8cfb..828e8b3a4a 100644 --- a/drop-test-karaf/src/main/java/org/opendaylight/openflowplugin/droptestkaraf/DropTestProviderImpl.java +++ b/drop-test-karaf/src/main/java/org/opendaylight/openflowplugin/droptestkaraf/DropTestProviderImpl.java @@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory; */ public class DropTestProviderImpl implements AutoCloseable { - private static Logger LOG = LoggerFactory.getLogger(DropTestProviderImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(DropTestProviderImpl.class); private static DropTestDsProvider dropDsProvider = new DropTestDsProvider(); diff --git a/openflowplugin-common/src/main/java/org/opendaylight/openflowplugin/common/wait/SimpleTaskRetryLooper.java b/openflowplugin-common/src/main/java/org/opendaylight/openflowplugin/common/wait/SimpleTaskRetryLooper.java index 1f1e3afec2..4709ff8818 100644 --- a/openflowplugin-common/src/main/java/org/opendaylight/openflowplugin/common/wait/SimpleTaskRetryLooper.java +++ b/openflowplugin-common/src/main/java/org/opendaylight/openflowplugin/common/wait/SimpleTaskRetryLooper.java @@ -17,7 +17,7 @@ import org.slf4j.LoggerFactory; */ public class SimpleTaskRetryLooper { - private static Logger LOG = LoggerFactory.getLogger(SimpleTaskRetryLooper.class); + private static final Logger LOG = LoggerFactory.getLogger(SimpleTaskRetryLooper.class); private final long tick; private final int maxRetries; diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenFlowPluginProviderImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenFlowPluginProviderImpl.java index e272dfb9dc..f087fd0f0d 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenFlowPluginProviderImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/OpenFlowPluginProviderImpl.java @@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory; */ public class OpenFlowPluginProviderImpl implements OpenFlowPluginProvider, OpenFlowPluginExtensionRegistratorProvider { - protected static final Logger LOG = LoggerFactory.getLogger(OpenFlowPluginProviderImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(OpenFlowPluginProviderImpl.class); private DeviceManager deviceManager; private RpcManager rpcManager; diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/HandshakeContextImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/HandshakeContextImpl.java index c6f501b417..285b3cd954 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/HandshakeContextImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/connection/HandshakeContextImpl.java @@ -19,7 +19,7 @@ import org.slf4j.LoggerFactory; */ public class HandshakeContextImpl implements HandshakeContext { - private static Logger LOG = LoggerFactory.getLogger(HandshakeContextImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(HandshakeContextImpl.class); private ThreadPoolExecutor handshakePool; private HandshakeManager handshakeManager; diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/BarrierProcessor.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/BarrierProcessor.java index cdb2a79a77..3df81ee611 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/BarrierProcessor.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/device/BarrierProcessor.java @@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory; */ public class BarrierProcessor { - private static Logger LOG = LoggerFactory.getLogger(BarrierProcessor.class); + private static final Logger LOG = LoggerFactory.getLogger(BarrierProcessor.class); /** * for all requestContexts from deviceContext cache which are older than barrier (lower barrierXid value) we do:
diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/DeviceFlowRegistryImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/DeviceFlowRegistryImpl.java index 5a3c187d8d..c0c6f378f0 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/DeviceFlowRegistryImpl.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/registry/flow/DeviceFlowRegistryImpl.java @@ -28,7 +28,7 @@ public class DeviceFlowRegistryImpl implements DeviceFlowRegistry { private final Map flowRegistry = new HashMap<>(); private final List marks = new ArrayList(); - private final Logger LOG = LoggerFactory.getLogger(DeviceFlowRegistryImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(DeviceFlowRegistryImpl.class); @Override public FlowDescriptor retrieveIdForFlow(final FlowHash flowHash) throws FlowRegistryException { diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/config/openflow/plugin/impl/rev150327/OpenFlowProviderModule.java b/openflowplugin-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/config/openflow/plugin/impl/rev150327/OpenFlowProviderModule.java index 9f0456f037..bde4475ccf 100644 --- a/openflowplugin-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/config/openflow/plugin/impl/rev150327/OpenFlowProviderModule.java +++ b/openflowplugin-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/config/openflow/plugin/impl/rev150327/OpenFlowProviderModule.java @@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory; public class OpenFlowProviderModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.config.openflow.plugin.impl.rev150327.AbstractOpenFlowProviderModule { - private static Logger LOG = LoggerFactory.getLogger(OpenFlowProviderModule.class); + private static final Logger LOG = LoggerFactory.getLogger(OpenFlowProviderModule.class); public OpenFlowProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { super(identifier, dependencyResolver); diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ThreadPoolLoggingExecutor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ThreadPoolLoggingExecutor.java index b08bcc2027..481e4585fb 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ThreadPoolLoggingExecutor.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ThreadPoolLoggingExecutor.java @@ -1,27 +1,25 @@ /** * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * + * * This program and the accompanying materials are made available under the * 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.openflowplugin.openflow.md.core; +import com.google.common.util.concurrent.ThreadFactoryBuilder; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.util.concurrent.ThreadFactoryBuilder; - /** * threadPoolExecutor implementation logging exceptions thrown by threads */ public class ThreadPoolLoggingExecutor extends ThreadPoolExecutor { - - private static Logger LOG = LoggerFactory.getLogger(ThreadPoolLoggingExecutor.class); + + private static final Logger LOG = LoggerFactory.getLogger(ThreadPoolLoggingExecutor.class); /** * @param corePoolSize @@ -32,9 +30,9 @@ public class ThreadPoolLoggingExecutor extends ThreadPoolExecutor { * @param poolName thread name prefix */ public ThreadPoolLoggingExecutor(int corePoolSize, int maximumPoolSize, - long keepAliveTime, TimeUnit unit, BlockingQueue workQueue, + long keepAliveTime, TimeUnit unit, BlockingQueue workQueue, final String poolName) { - super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, + super(corePoolSize, maximumPoolSize, keepAliveTime, unit, workQueue, new ThreadFactoryBuilder().setNameFormat(poolName+"-%d").build()); } diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OFRpcFutureResultTransformFactory.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OFRpcFutureResultTransformFactory.java index dff14ae0ff..0c1dd5a645 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OFRpcFutureResultTransformFactory.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OFRpcFutureResultTransformFactory.java @@ -7,6 +7,7 @@ */ package org.opendaylight.openflowplugin.openflow.md.core.sal; +import com.google.common.base.Function; import java.util.Collection; import org.opendaylight.controller.sal.common.util.Rpcs; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.AddFlowOutput; @@ -28,7 +29,6 @@ import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Function; /** * collection of transformation functions dedicated to rpc future results @@ -36,7 +36,7 @@ import com.google.common.base.Function; public abstract class OFRpcFutureResultTransformFactory { private static final String MSG_ADD_FLOW_RPC = "Returning the Add Flow RPC result to MD-SAL"; - protected static Logger LOG = LoggerFactory + protected static final Logger LOG = LoggerFactory .getLogger(OFRpcFutureResultTransformFactory.class); /** diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/session/PortFeaturesUtil.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/session/PortFeaturesUtil.java index ba952ccb86..5a960e5802 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/session/PortFeaturesUtil.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/session/PortFeaturesUtil.java @@ -25,7 +25,7 @@ public class PortFeaturesUtil { private static PortFeaturesUtil instance = new PortFeaturesUtil(); private final Map portVersionBandwidth; - protected static final Logger LOG = LoggerFactory.getLogger(PortFeaturesUtil.class); + private static final Logger LOG = LoggerFactory.getLogger(PortFeaturesUtil.class); private PortFeaturesUtil() { this.portVersionBandwidth = new HashMap<>(); diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/session/RolePushTask.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/session/RolePushTask.java index feb663c838..978be609a5 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/session/RolePushTask.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/session/RolePushTask.java @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; */ final class RolePushTask implements Callable { - public static final Logger LOG = LoggerFactory + private static final Logger LOG = LoggerFactory .getLogger(RolePushTask.class); public static final long TIMEOUT = 2000; diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/AbstractErrorTranslator.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/AbstractErrorTranslator.java index cac1cc6ea6..cb346de03f 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/AbstractErrorTranslator.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/AbstractErrorTranslator.java @@ -10,7 +10,6 @@ package org.opendaylight.openflowplugin.openflow.md.core.translator; import java.util.Collections; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; - import org.opendaylight.openflowplugin.api.openflow.md.core.IMDMessageTranslator; import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher; import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionContext; @@ -29,7 +28,7 @@ import org.slf4j.LoggerFactory; */ public abstract class AbstractErrorTranslator implements IMDMessageTranslator> { - protected static final Logger LOG = LoggerFactory.getLogger(AbstractErrorTranslator.class); + private static final Logger LOG = LoggerFactory.getLogger(AbstractErrorTranslator.class); @Override public List translate(SwitchConnectionDistinguisher cookie, SessionContext sc, OfHeader msg) { diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/ExperimenterTranslator.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/ExperimenterTranslator.java index 4f5902be1a..f95079472c 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/ExperimenterTranslator.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/ExperimenterTranslator.java @@ -11,7 +11,6 @@ package org.opendaylight.openflowplugin.openflow.md.core.translator; import java.util.Collections; import java.util.List; - import org.opendaylight.openflowplugin.api.openflow.md.core.IMDMessageTranslator; import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher; import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionContext; @@ -23,7 +22,7 @@ import org.slf4j.LoggerFactory; public class ExperimenterTranslator implements IMDMessageTranslator> { - protected static final Logger LOG = LoggerFactory.getLogger(ExperimenterTranslator.class); + private static final Logger LOG = LoggerFactory.getLogger(ExperimenterTranslator.class); @Override public List translate(SwitchConnectionDistinguisher cookie, diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/FeaturesV10ToNodeConnectorUpdatedTranslator.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/FeaturesV10ToNodeConnectorUpdatedTranslator.java index 92b85c4b35..a7f1395e0e 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/FeaturesV10ToNodeConnectorUpdatedTranslator.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/FeaturesV10ToNodeConnectorUpdatedTranslator.java @@ -11,7 +11,6 @@ import java.math.BigInteger; import java.util.Collections; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; - import org.opendaylight.openflowplugin.api.openflow.md.core.IMDMessageTranslator; import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher; import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionContext; @@ -24,13 +23,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class FeaturesV10ToNodeConnectorUpdatedTranslator implements IMDMessageTranslator> { - protected static final Logger LOG = LoggerFactory + private static final Logger LOG = LoggerFactory .getLogger(FeaturesV10ToNodeConnectorUpdatedTranslator.class); @Override public List translate(SwitchConnectionDistinguisher cookie, SessionContext sc, OfHeader msg) { - if(msg instanceof GetFeaturesOutput) { + if (msg instanceof GetFeaturesOutput) { GetFeaturesOutput features = (GetFeaturesOutput) msg; List list = new CopyOnWriteArrayList(); BigInteger datapathId = sc.getFeatures().getDatapathId(); diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/FlowRemovedTranslator.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/FlowRemovedTranslator.java index 2f9da67873..0b7ee065cd 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/FlowRemovedTranslator.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/FlowRemovedTranslator.java @@ -159,7 +159,7 @@ import org.slf4j.LoggerFactory; public class FlowRemovedTranslator implements IMDMessageTranslator> { - protected static final Logger LOG = LoggerFactory.getLogger(FlowRemovedTranslator.class); + private static final Logger LOG = LoggerFactory.getLogger(FlowRemovedTranslator.class); private static final String PREFIX_SEPARATOR = "/"; @Override diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultiPartMessageDescToNodeUpdatedTranslator.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultiPartMessageDescToNodeUpdatedTranslator.java index 4c7491e8fd..7c0cce64e4 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultiPartMessageDescToNodeUpdatedTranslator.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultiPartMessageDescToNodeUpdatedTranslator.java @@ -11,7 +11,6 @@ import java.math.BigInteger; import java.util.Collections; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; - import org.opendaylight.openflowplugin.api.openflow.md.core.IMDMessageTranslator; import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher; import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionContext; @@ -31,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class MultiPartMessageDescToNodeUpdatedTranslator implements IMDMessageTranslator> { - protected static final Logger LOG = LoggerFactory.getLogger(MultiPartMessageDescToNodeUpdatedTranslator.class); + private static final Logger LOG = LoggerFactory.getLogger(MultiPartMessageDescToNodeUpdatedTranslator.class); @Override public List translate(SwitchConnectionDistinguisher cookie, SessionContext sc, OfHeader msg) { diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultiPartReplyPortToNodeConnectorUpdatedTranslator.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultiPartReplyPortToNodeConnectorUpdatedTranslator.java index 4148b532af..6f08409ec1 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultiPartReplyPortToNodeConnectorUpdatedTranslator.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultiPartReplyPortToNodeConnectorUpdatedTranslator.java @@ -11,7 +11,6 @@ import java.math.BigInteger; import java.util.Collections; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; - import org.opendaylight.openflowplugin.api.openflow.md.core.IMDMessageTranslator; import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher; import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionContext; @@ -28,7 +27,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class MultiPartReplyPortToNodeConnectorUpdatedTranslator implements IMDMessageTranslator> { - protected static final Logger LOG = LoggerFactory.getLogger(MultiPartReplyPortToNodeConnectorUpdatedTranslator.class); + private static final Logger LOG = LoggerFactory.getLogger(MultiPartReplyPortToNodeConnectorUpdatedTranslator.class); @Override public List translate(SwitchConnectionDistinguisher cookie, SessionContext sc, OfHeader msg) { diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTableFeaturesToTableUpdatedTranslator.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTableFeaturesToTableUpdatedTranslator.java index 7aabcb2589..ebfc9a6aaf 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTableFeaturesToTableUpdatedTranslator.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTableFeaturesToTableUpdatedTranslator.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; public class MultipartReplyTableFeaturesToTableUpdatedTranslator implements IMDMessageTranslator> { - protected static final Logger LOG = LoggerFactory + private static final Logger LOG = LoggerFactory .getLogger(MultipartReplyTableFeaturesToTableUpdatedTranslator.class); @Override diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/PacketInTranslator.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/PacketInTranslator.java index cca3ea91de..b5ff55f4f3 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/PacketInTranslator.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/PacketInTranslator.java @@ -7,6 +7,9 @@ */ package org.opendaylight.openflowplugin.openflow.md.core.translator; +import java.math.BigInteger; +import java.util.Collections; +import java.util.List; import org.opendaylight.openflowplugin.api.openflow.md.core.IMDMessageTranslator; import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher; import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionContext; @@ -31,16 +34,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.pa import org.opendaylight.yangtools.yang.binding.DataObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.math.BigInteger; -import java.util.Collections; -import java.util.List; /** * translates packetIn from OF-API model to MD-SAL model, supports OF-1.3 */ public class PacketInTranslator implements IMDMessageTranslator> { - protected static final Logger LOG = LoggerFactory + private static final Logger LOG = LoggerFactory .getLogger(PacketInTranslator.class); @Override diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/PacketInV10Translator.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/PacketInV10Translator.java index 4dea3e4381..978b202a83 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/PacketInV10Translator.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/PacketInV10Translator.java @@ -10,12 +10,11 @@ package org.opendaylight.openflowplugin.openflow.md.core.translator; import java.math.BigInteger; import java.util.Collections; import java.util.List; - import org.opendaylight.openflowplugin.api.openflow.md.core.IMDMessageTranslator; import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher; import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionContext; -import org.opendaylight.openflowplugin.openflow.md.util.InventoryDataServiceUtil; import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion; +import org.opendaylight.openflowplugin.openflow.md.util.InventoryDataServiceUtil; import org.opendaylight.openflowplugin.openflow.md.util.PacketInUtil; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; @@ -31,7 +30,7 @@ import org.slf4j.LoggerFactory; */ public class PacketInV10Translator implements IMDMessageTranslator> { - protected static final Logger LOG = LoggerFactory + private static final Logger LOG = LoggerFactory .getLogger(PacketInV10Translator.class); @Override public List translate(final SwitchConnectionDistinguisher cookie, diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/PortStatusMessageToNodeConnectorUpdatedTranslator.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/PortStatusMessageToNodeConnectorUpdatedTranslator.java index e061643c7c..46f66628ef 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/PortStatusMessageToNodeConnectorUpdatedTranslator.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/translator/PortStatusMessageToNodeConnectorUpdatedTranslator.java @@ -11,7 +11,6 @@ import java.math.BigInteger; import java.util.Collections; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; - import org.opendaylight.openflowplugin.api.openflow.md.core.IMDMessageTranslator; import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher; import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionContext; @@ -28,7 +27,7 @@ import org.slf4j.LoggerFactory; * supports OF-{1.0; 1.3} */ public class PortStatusMessageToNodeConnectorUpdatedTranslator implements IMDMessageTranslator> { - protected static final Logger LOG = LoggerFactory + private static final Logger LOG = LoggerFactory .getLogger(PortStatusMessageToNodeConnectorUpdatedTranslator.class); @Override diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/QueueKeeperFairImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/QueueKeeperFairImpl.java index b24ba9f749..f86dcd0dee 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/QueueKeeperFairImpl.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/QueueKeeperFairImpl.java @@ -1,16 +1,16 @@ /** * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * + * * This program and the accompanying materials are made available under the * 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.openflowplugin.openflow.md.queue; +import com.google.common.base.Preconditions; import java.util.Queue; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; - import org.opendaylight.openflowplugin.api.openflow.md.core.ConnectionConductor; import org.opendaylight.openflowplugin.api.openflow.md.queue.HarvesterHandle; import org.opendaylight.openflowplugin.api.openflow.md.queue.QueueItem; @@ -21,14 +21,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Preconditions; - /** * QueueKeeper implementation based on {@link OfHeader} */ public class QueueKeeperFairImpl implements QueueKeeper { - private static Logger LOG = LoggerFactory + private static final Logger LOG = LoggerFactory .getLogger(QueueKeeperFairImpl.class); private Queue> queueDefault; diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/QueueKeeperHarvester.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/QueueKeeperHarvester.java index 403422e481..2a82d335e0 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/QueueKeeperHarvester.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/QueueKeeperHarvester.java @@ -8,7 +8,6 @@ package org.opendaylight.openflowplugin.openflow.md.queue; import java.util.Collection; - import org.opendaylight.openflowplugin.api.openflow.md.queue.Enqueuer; import org.opendaylight.openflowplugin.api.openflow.md.queue.HarvesterHandle; import org.opendaylight.openflowplugin.api.openflow.md.queue.QueueItem; @@ -21,7 +20,7 @@ import org.slf4j.LoggerFactory; * */ public class QueueKeeperHarvester implements Runnable, HarvesterHandle { - private static Logger LOG = LoggerFactory.getLogger(QueueKeeperHarvester.class); + private static final Logger LOG = LoggerFactory.getLogger(QueueKeeperHarvester.class); private final Collection> messageSources; private final Enqueuer> enqueuer; diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/QueueProcessorLightImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/QueueProcessorLightImpl.java index 63fa440d6c..1c610a612b 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/QueueProcessorLightImpl.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/QueueProcessorLightImpl.java @@ -18,7 +18,7 @@ import java.util.concurrent.Future; import java.util.concurrent.RejectedExecutionHandler; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; - +import org.opendaylight.openflowplugin.api.openflow.md.core.IMDMessageTranslator; import org.opendaylight.openflowplugin.api.openflow.md.core.TranslatorKey; import org.opendaylight.openflowplugin.api.openflow.md.queue.HarvesterHandle; import org.opendaylight.openflowplugin.api.openflow.md.queue.PopListener; @@ -27,7 +27,6 @@ import org.opendaylight.openflowplugin.api.openflow.md.queue.QueueKeeper; import org.opendaylight.openflowplugin.api.openflow.md.queue.QueueProcessor; import org.opendaylight.openflowplugin.api.openflow.statistics.MessageSpy; import org.opendaylight.openflowplugin.api.openflow.statistics.MessageSpy.STATISTIC_GROUP; -import org.opendaylight.openflowplugin.api.openflow.md.core.IMDMessageTranslator; import org.opendaylight.openflowplugin.openflow.md.core.ThreadPoolLoggingExecutor; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; import org.opendaylight.yangtools.yang.binding.DataContainer; @@ -63,7 +62,7 @@ import org.slf4j.LoggerFactory; */ public class QueueProcessorLightImpl implements QueueProcessor { - protected static final Logger LOG = LoggerFactory + private static final Logger LOG = LoggerFactory .getLogger(QueueProcessorLightImpl.class); private BlockingQueue> ticketQueue; diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/TicketProcessorFactoryImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/TicketProcessorFactoryImpl.java index 11a5ffea46..8b869caf70 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/TicketProcessorFactoryImpl.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/TicketProcessorFactoryImpl.java @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; */ public class TicketProcessorFactoryImpl implements TicketProcessorFactory { - protected static final Logger LOG = LoggerFactory + private static final Logger LOG = LoggerFactory .getLogger(TicketProcessorFactoryImpl.class); protected Map>>> translatorMapping; diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/WrapperQueueImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/WrapperQueueImpl.java index 10b3b2c533..805b9dd00e 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/WrapperQueueImpl.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/WrapperQueueImpl.java @@ -1,19 +1,17 @@ package org.opendaylight.openflowplugin.openflow.md.queue; +import com.google.common.base.Preconditions; import java.util.Collection; import java.util.Iterator; import java.util.Queue; - import org.opendaylight.openflowplugin.api.openflow.md.queue.QueueItem; import org.opendaylight.openflowplugin.api.openflow.md.queue.WaterMarkListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Preconditions; - public class WrapperQueueImpl implements Queue { - protected static final Logger LOG = LoggerFactory + private static final Logger LOG = LoggerFactory .getLogger(WrapperQueueImpl.class); private int lowWaterMark; @@ -61,7 +59,7 @@ public class WrapperQueueImpl implements Queue { /** * poll {@link QueueItem} and call {@link #marking()} for check marks and * set autoRead if it need it - * + * * @return polled item */ public E poll() { diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/InventoryDataServiceUtil.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/InventoryDataServiceUtil.java index 6bd57583c1..907152686a 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/InventoryDataServiceUtil.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/InventoryDataServiceUtil.java @@ -15,8 +15,8 @@ import org.apache.commons.lang3.StringUtils; import org.opendaylight.controller.md.sal.binding.api.ReadTransaction; import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil; import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion; +import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorUpdatedBuilder; @@ -35,7 +35,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; public abstract class InventoryDataServiceUtil { - private final static Logger LOG = LoggerFactory.getLogger(InventoryDataServiceUtil.class); + private static final Logger LOG = LoggerFactory.getLogger(InventoryDataServiceUtil.class); public final static String OF_URI_PREFIX = "openflow:"; /* @@ -129,15 +129,15 @@ public abstract class InventoryDataServiceUtil { public static Long portNumberfromNodeConnectorId(OpenflowVersion ofVersion, NodeConnectorId ncId) { return portNumberfromNodeConnectorId(ofVersion, ncId.getValue()); } - + public static String portNoStringfromNodeConnectorID(String ncID) { String[] split = ncID.split(":"); // It can happen that token length will be just 1 i.e 2 or CONTROLLER // If the length is just one then this cannot be the new MD-SAL style node connector Id which // is of the form openflow:1:3. - - return split[split.length - 1]; + + return split[split.length - 1]; } public static Long portNumberfromNodeConnectorId(OpenflowVersion ofVersion, String ncId) { diff --git a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchManagerSimpleImpl.java b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchManagerSimpleImpl.java index cc70b2c99f..9b97e801eb 100644 --- a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchManagerSimpleImpl.java +++ b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchManagerSimpleImpl.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; public class LearningSwitchManagerSimpleImpl implements DataChangeListenerRegistrationHolder, LearningSwitchManager { - protected static final Logger LOG = LoggerFactory + private static final Logger LOG = LoggerFactory .getLogger(LearningSwitchManagerSimpleImpl.class); private NotificationService notificationService; diff --git a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/multi/LearningSwitchManagerMultiImpl.java b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/multi/LearningSwitchManagerMultiImpl.java index e2643ebcfc..e70303ce09 100644 --- a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/multi/LearningSwitchManagerMultiImpl.java +++ b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/multi/LearningSwitchManagerMultiImpl.java @@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory; public class LearningSwitchManagerMultiImpl implements DataChangeListenerRegistrationHolder, LearningSwitchManager { - protected static final Logger LOG = LoggerFactory + private static final Logger LOG = LoggerFactory .getLogger(LearningSwitchManagerMultiImpl.class); private NotificationService notificationService; diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/FlowEventListenerLoggingImpl.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/FlowEventListenerLoggingImpl.java index b915e29460..7fcfab3511 100644 --- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/FlowEventListenerLoggingImpl.java +++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/FlowEventListenerLoggingImpl.java @@ -1,6 +1,6 @@ /** * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * + * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -21,8 +21,8 @@ import org.slf4j.LoggerFactory; * dummy implementation flushing events into log */ public class FlowEventListenerLoggingImpl implements SalFlowListener { - - private static Logger LOG = LoggerFactory + + private static final Logger LOG = LoggerFactory .getLogger(FlowEventListenerLoggingImpl.class); @Override diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/NodeErrorListenerLoggingImpl.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/NodeErrorListenerLoggingImpl.java index 71085f8d9e..3f3bfd1132 100644 --- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/NodeErrorListenerLoggingImpl.java +++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/NodeErrorListenerLoggingImpl.java @@ -1,5 +1,6 @@ package org.opendaylight.openflowplugin.test; +import java.math.BigInteger; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.errors.rev131116.ErrorType; import org.opendaylight.yang.gen.v1.urn.opendaylight.node.error.service.rev140410.BadActionErrorNotification; import org.opendaylight.yang.gen.v1.urn.opendaylight.node.error.service.rev140410.BadInstructionErrorNotification; @@ -20,15 +21,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.node.error.service.rev14041 import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.math.BigInteger; - /** * dummy implementation flushing events into log * @author kramesha */ public class NodeErrorListenerLoggingImpl implements NodeErrorListener { - private static Logger LOG = LoggerFactory.getLogger(NodeErrorListenerLoggingImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(NodeErrorListenerLoggingImpl.class); @Override public void onBadActionErrorNotification(BadActionErrorNotification notification) { diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestServiceProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestServiceProvider.java index eb3f938458..3308b94b21 100644 --- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestServiceProvider.java +++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginGroupTestServiceProvider.java @@ -1,6 +1,6 @@ /** * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * + * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -9,7 +9,6 @@ package org.opendaylight.openflowplugin.test; import java.util.concurrent.Future; - import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; @@ -36,14 +35,14 @@ import org.slf4j.LoggerFactory; public class OpenflowpluginGroupTestServiceProvider implements AutoCloseable, SalGroupService { - private final static Logger LOG = LoggerFactory + private static final Logger LOG = LoggerFactory .getLogger(OpenflowpluginGroupTestServiceProvider.class); private RoutedRpcRegistration groupRegistration; private NotificationProviderService notificationService; /** * get group registration - * + * * @return {@link #groupRegistration} */ public RoutedRpcRegistration getGroupRegistration() { @@ -52,7 +51,7 @@ public class OpenflowpluginGroupTestServiceProvider implements AutoCloseable, /** * set {@link #groupRegistration} - * + * * @param groupRegistration */ public void setGroupRegistration( @@ -62,7 +61,7 @@ public class OpenflowpluginGroupTestServiceProvider implements AutoCloseable, /** * get notification service - * + * * @return {@link #notificationService} */ public NotificationProviderService getNotificationService() { @@ -71,7 +70,7 @@ public class OpenflowpluginGroupTestServiceProvider implements AutoCloseable, /** * set {@link #notificationService} - * + * * @param notificationService */ public void setNotificationService( @@ -86,7 +85,7 @@ public class OpenflowpluginGroupTestServiceProvider implements AutoCloseable, /* * (non-Javadoc) - * + * * @see java.lang.AutoCloseable#close() */ @Override @@ -98,7 +97,7 @@ public class OpenflowpluginGroupTestServiceProvider implements AutoCloseable, /* * (non-Javadoc) - * + * * @see * org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918 * .SalGroupService @@ -114,7 +113,7 @@ public class OpenflowpluginGroupTestServiceProvider implements AutoCloseable, /* * (non-Javadoc) - * + * * @see * org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918 * .SalGroupService @@ -131,7 +130,7 @@ public class OpenflowpluginGroupTestServiceProvider implements AutoCloseable, /* * (non-Javadoc) - * + * * @see * org.opendaylight.yang.gen.v1.urn.opendaylight.group.service.rev130918 * .SalGroupService diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestServiceProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestServiceProvider.java index c2feaf23d4..a560f657c7 100644 --- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestServiceProvider.java +++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginMeterTestServiceProvider.java @@ -1,6 +1,6 @@ /** * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * + * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -9,7 +9,6 @@ package org.opendaylight.openflowplugin.test; import java.util.concurrent.Future; - import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration; @@ -36,7 +35,7 @@ import org.slf4j.LoggerFactory; public class OpenflowpluginMeterTestServiceProvider implements AutoCloseable, SalMeterService { - private final static Logger LOG = LoggerFactory + private static final Logger LOG = LoggerFactory .getLogger(OpenflowpluginMeterTestServiceProvider.class); private DataBroker dataService; private RoutedRpcRegistration meterRegistration; @@ -44,7 +43,7 @@ public class OpenflowpluginMeterTestServiceProvider implements AutoCloseable, /** * get data service - * + * * @return {@link #dataService} */ public DataBroker getDataService() { @@ -53,7 +52,7 @@ public class OpenflowpluginMeterTestServiceProvider implements AutoCloseable, /** * set {@link #dataService} - * + * * @param dataService */ public void setDataService(final DataBroker dataService) { @@ -62,7 +61,7 @@ public class OpenflowpluginMeterTestServiceProvider implements AutoCloseable, /** * get meter registration - * + * * @return {@link #meterRegistration} */ public RoutedRpcRegistration getMeterRegistration() { @@ -71,7 +70,7 @@ public class OpenflowpluginMeterTestServiceProvider implements AutoCloseable, /** * set {@link #meterRegistration} - * + * * @param meterRegistration */ public void setMeterRegistration( @@ -81,7 +80,7 @@ public class OpenflowpluginMeterTestServiceProvider implements AutoCloseable, /** * get notification service - * + * * @return {@link #notificationService} */ public NotificationProviderService getNotificationService() { @@ -90,7 +89,7 @@ public class OpenflowpluginMeterTestServiceProvider implements AutoCloseable, /** * set {@link #notificationService} - * + * * @param notificationService */ public void setNotificationService( @@ -105,7 +104,7 @@ public class OpenflowpluginMeterTestServiceProvider implements AutoCloseable, /* * (non-Javadoc) - * + * * @see java.lang.AutoCloseable#close() */ public void close() { @@ -116,7 +115,7 @@ public class OpenflowpluginMeterTestServiceProvider implements AutoCloseable, /* * (non-Javadoc) - * + * * @see * org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918 * .SalMeterService @@ -131,7 +130,7 @@ public class OpenflowpluginMeterTestServiceProvider implements AutoCloseable, /* * (non-Javadoc) - * + * * @see * org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918 * .SalMeterService @@ -147,7 +146,7 @@ public class OpenflowpluginMeterTestServiceProvider implements AutoCloseable, /* * (non-Javadoc) - * + * * @see * org.opendaylight.yang.gen.v1.urn.opendaylight.meter.service.rev130918 * .SalMeterService diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTableFeaturesTestServiceProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTableFeaturesTestServiceProvider.java index 2d9df29857..261a29cba8 100644 --- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTableFeaturesTestServiceProvider.java +++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTableFeaturesTestServiceProvider.java @@ -1,6 +1,6 @@ /** * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * + * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -9,7 +9,6 @@ package org.opendaylight.openflowplugin.test; import java.util.concurrent.Future; - import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; @@ -32,14 +31,14 @@ import org.slf4j.LoggerFactory; public class OpenflowpluginTableFeaturesTestServiceProvider implements AutoCloseable, SalTableService { - private final static Logger LOG = LoggerFactory + private static final Logger LOG = LoggerFactory .getLogger(OpenflowpluginTableFeaturesTestServiceProvider.class); private RoutedRpcRegistration tableRegistration; private NotificationProviderService notificationService; /** * get table registration - * + * * @return {@link #tableRegistration} */ public RoutedRpcRegistration getTableRegistration() { @@ -48,7 +47,7 @@ public class OpenflowpluginTableFeaturesTestServiceProvider implements /** * set {@link #tableRegistration} - * + * * @param tableRegistration */ public void setTableRegistration( @@ -58,7 +57,7 @@ public class OpenflowpluginTableFeaturesTestServiceProvider implements /** * get notification service - * + * * @return {@link #notificationService} */ public NotificationProviderService getNotificationService() { @@ -67,7 +66,7 @@ public class OpenflowpluginTableFeaturesTestServiceProvider implements /** * set {@link #notificationService} - * + * * @param notificationService */ public void setNotificationService( @@ -82,7 +81,7 @@ public class OpenflowpluginTableFeaturesTestServiceProvider implements /* * (non-Javadoc) - * + * * @see java.lang.AutoCloseable#close() */ @Override @@ -94,7 +93,7 @@ public class OpenflowpluginTableFeaturesTestServiceProvider implements /* * (non-Javadoc) - * + * * @see * org.opendaylight.yang.gen.v1.urn.opendaylight.table.service.rev131026 * .SalTableService diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestServiceProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestServiceProvider.java index 0901b0ab27..ec67835b82 100644 --- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestServiceProvider.java +++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestServiceProvider.java @@ -1,6 +1,6 @@ /** * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * + * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -9,7 +9,6 @@ package org.opendaylight.openflowplugin.test; import java.util.concurrent.Future; - import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RoutedRpcRegistration; @@ -37,7 +36,7 @@ import org.slf4j.LoggerFactory; public class OpenflowpluginTestServiceProvider implements AutoCloseable, SalFlowService { - private final static Logger LOG = LoggerFactory + private static final Logger LOG = LoggerFactory .getLogger(OpenflowpluginTestServiceProvider.class); private DataBroker dataService; @@ -46,7 +45,7 @@ public class OpenflowpluginTestServiceProvider implements AutoCloseable, /** * get data service - * + * * @return {@link #dataService} */ public DataBroker getDataService() { @@ -55,7 +54,7 @@ public class OpenflowpluginTestServiceProvider implements AutoCloseable, /** * set {@link #dataService} - * + * * @param dataService */ public void setDataService(final DataBroker dataService) { @@ -64,7 +63,7 @@ public class OpenflowpluginTestServiceProvider implements AutoCloseable, /** * get flow registration - * + * * @return {@link #flowRegistration} */ public RoutedRpcRegistration getFlowRegistration() { @@ -73,7 +72,7 @@ public class OpenflowpluginTestServiceProvider implements AutoCloseable, /** * set {@link #flowRegistration} - * + * * @param flowRegistration */ public void setFlowRegistration( @@ -83,7 +82,7 @@ public class OpenflowpluginTestServiceProvider implements AutoCloseable, /** * get notification service - * + * * @return {@link #notificationProviderService} */ public NotificationProviderService getNotificationService() { @@ -92,7 +91,7 @@ public class OpenflowpluginTestServiceProvider implements AutoCloseable, /** * set {@link #notificationProviderService} - * + * * @param notificationProviderService */ public void setNotificationService( @@ -107,7 +106,7 @@ public class OpenflowpluginTestServiceProvider implements AutoCloseable, /* * (non-Javadoc) - * + * * @see java.lang.AutoCloseable#close() */ @Override @@ -119,7 +118,7 @@ public class OpenflowpluginTestServiceProvider implements AutoCloseable, /* * (non-Javadoc) - * + * * @see * org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819. * SalFlowService @@ -135,7 +134,7 @@ public class OpenflowpluginTestServiceProvider implements AutoCloseable, /* * (non-Javadoc) - * + * * @see * org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819. * SalFlowService @@ -151,7 +150,7 @@ public class OpenflowpluginTestServiceProvider implements AutoCloseable, /* * (non-Javadoc) - * + * * @see * org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819. * SalFlowService -- 2.36.6