From aa8a8d377220d54d929ca59a5f26147d793e0e00 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 28 Mar 2015 18:48:33 +0100 Subject: [PATCH] Fix Jdk8 compatibility JDK8 has stricter javadoc rules, make sure we do not fail on them. Change-Id: I13ae2d0cc750faf66dc4f0c41a7982f9e9aae4cb Signed-off-by: Robert Varga --- .../frm/FlowNodeReconciliation.java | 4 +-- .../frm/ForwardingRulesCommiter.java | 18 ++++++----- .../frm/ForwardingRulesManager.java | 14 ++++---- .../manager/StatNodeRegistration.java | 8 ++--- .../statistics/manager/StatPermCollector.java | 10 +++--- .../statistics/manager/StatRpcMsgManager.java | 32 +++++++++---------- .../statistics/manager/StatisticsManager.java | 17 +++++----- .../impl/StatAbstractListenCommit.java | 2 +- .../impl/StatAbstractNotifyCommit.java | 12 +++---- .../manager/impl/StatisticsManagerImpl.java | 2 +- .../nx/NiciraExtensionsRegistrator.java | 5 ++- .../extension/api/GroupingLooseResolver.java | 3 +- .../extension/api/GroupingResolver.java | 4 +-- .../extension/ExtensionConverterProvider.java | 2 +- .../extension/api/path/ActionPath.java | 4 +++ .../compatibility/ToSalConversionsUtils.java | 2 +- .../api/openflow/OpenFlowPluginProvider.java | 2 +- .../connection/ConnectionContext.java | 4 +-- .../connection/ConnectionManager.java | 4 +-- .../api/openflow/device/DeviceContext.java | 4 +-- .../api/openflow/device/DeviceManager.java | 5 ++- .../api/openflow/device/DeviceState.java | 2 +- .../api/openflow/device/RequestContext.java | 4 +-- .../openflow/device/RequestFutureContext.java | 5 ++- .../api/openflow/device/Xid.java | 2 +- .../api/openflow/device/XidGenerator.java | 2 +- .../RequestQuotaExceededException.java | 2 +- .../handlers/DeviceConnectedHandler.java | 2 +- .../handlers/DeviceContextReadyHandler.java | 2 +- .../handlers/DeviceSynchronizedHandler.java | 2 +- .../device/handlers/MessageHandler.java | 2 +- .../openflow/md/core/ConnectionConductor.java | 2 +- .../api/openflow/md/queue/QueueKeeper.java | 3 +- .../api/openflow/md/queue/QueueProcessor.java | 3 +- .../api/openflow/md/util/OpenflowVersion.java | 2 +- .../md/util/PollableQueuesPriorityZipper.java | 5 ++- .../md/util/PollableQueuesZipper.java | 2 +- .../api/openflow/rpc/RpcContext.java | 4 +-- .../api/openflow/rpc/RpcManager.java | 6 ++-- .../statistics/StatisticsContext.java | 2 +- .../statistics/StatisticsManager.java | 2 +- .../impl/OpenflowPluginProviderImpl.java | 2 +- .../impl/services/RequestInputUtils.java | 2 +- .../impl/services/RpcResultConvertor.java | 2 +- .../md/core/HandshakeManagerImpl.java | 2 +- .../md/core/sal/OFRpcTaskFactory.java | 5 ++- .../openflow/md/core/sal/OFRpcTaskUtil.java | 2 -- .../md/core/sal/convertor/ActionUtil.java | 2 +- .../core/sal/convertor/IpConversionUtil.java | 2 +- .../md/queue/QueueKeeperHarvester.java | 3 +- .../md/queue/QueueProcessorLightImpl.java | 6 ++-- .../openflow/md/queue/WrapperQueueImpl.java | 1 - .../learningswitch/Activator.java | 2 +- .../InstanceIdentifierUtils.java | 8 ++--- .../learningswitch/LearningSwitchManager.java | 14 ++++---- .../OpenflowpluginTestCommandProvider.java | 2 +- 56 files changed, 131 insertions(+), 138 deletions(-) diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/FlowNodeReconciliation.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/FlowNodeReconciliation.java index ff46b45f2b..4b762c1a7f 100644 --- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/FlowNodeReconciliation.java +++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/FlowNodeReconciliation.java @@ -49,8 +49,8 @@ public interface FlowNodeReconciliation extends DataChangeListener, AutoCloseabl void flowNodeConnected(InstanceIdentifier connectedNode); /** - * Method contains functionality for registered Node {@FlowCapableNode} removing - * from {@Link ForwardingRulesManager} + * Method contains functionality for registered Node {@link FlowCapableNode} removing + * from {@link ForwardingRulesManager} * * @param disconnectedNode - {@link org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier} to removed Node */ diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/ForwardingRulesCommiter.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/ForwardingRulesCommiter.java index df7f6f4aff..34b6f40e3b 100644 --- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/ForwardingRulesCommiter.java +++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/ForwardingRulesCommiter.java @@ -32,9 +32,9 @@ public interface ForwardingRulesCommiter extends AutoClos * Method removes DataObject which is identified by InstanceIdentifier * from device. * - * @param InstanceIdentifier identifier - the whole path to DataObject - * @param DataObject remove - DataObject for removing - * @param InstanceIdentifier parent Node InstanceIdentifier + * @param identifier - the whole path to DataObject + * @param del - DataObject for removing + * @param nodeIdent Node InstanceIdentifier */ void remove(InstanceIdentifier identifier, D del, InstanceIdentifier nodeIdent); @@ -43,9 +43,10 @@ public interface ForwardingRulesCommiter extends AutoClos * Method updates the original DataObject to the update DataObject * in device. Both are identified by same InstanceIdentifier * - * @param InstanceIdentifier identifier - the whole path to DataObject - * @param DataObject original - original DataObject (for update) - * @param DataObject update - changed DataObject (contain updates) + * @param identifier - the whole path to DataObject + * @param original - original DataObject (for update) + * @param update - changed DataObject (contain updates) + * @param nodeIdent Node InstanceIdentifier */ void update(InstanceIdentifier identifier, D original, D update, InstanceIdentifier nodeIdent); @@ -54,8 +55,9 @@ public interface ForwardingRulesCommiter extends AutoClos * Method adds the DataObject which is identified by InstanceIdentifier * to device. * - * @param InstanceIdentifier identifier - the whole path to new DataObject - * @param DataObject add - new DataObject + * @param identifier - the whole path to new DataObject + * @param add - new DataObject + * @param nodeIdent Node InstanceIdentifier */ void add(InstanceIdentifier identifier, D add, InstanceIdentifier nodeIdent); diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/ForwardingRulesManager.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/ForwardingRulesManager.java index c6b63d1d48..4c695f2837 100644 --- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/ForwardingRulesManager.java +++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/ForwardingRulesManager.java @@ -39,8 +39,8 @@ public interface ForwardingRulesManager extends AutoCloseable { * Method returns information : * "is Node with send InstanceIdentifier connected"? * - * @param InstanceIdentifier ident - the key of the node - * @return boolean - is device connected + * @param ident - the key of the node + * @return boolean - true if device is connected */ public boolean isNodeActive(InstanceIdentifier ident); @@ -49,7 +49,7 @@ public interface ForwardingRulesManager extends AutoCloseable { * ActiveNodeHolder prevent unnecessary Operational/DS read for identify * pre-configure and serious Configure/DS transactions. * - * @param InstanceIdentifier ident - the key of the node + * @param ident - the key of the node */ public void registrateNewNode(InstanceIdentifier ident); @@ -58,7 +58,7 @@ public interface ForwardingRulesManager extends AutoCloseable { * Holder. And all next flows or groups or meters will stay in Config/DS * only. * - * @param InstanceIdentifier ident - the key of the node + * @param ident - the key of the node */ public void unregistrateNode(InstanceIdentifier ident); @@ -100,19 +100,19 @@ public interface ForwardingRulesManager extends AutoCloseable { /** * Content definition method and prevent code duplicity in Reconcil - * @return ForwardingRulesCommiter + * @return ForwardingRulesCommiter<Flow> */ public ForwardingRulesCommiter getFlowCommiter(); /** * Content definition method and prevent code duplicity in Reconcil - * @return ForwardingRulesCommiter + * @return ForwardingRulesCommiter<Group> */ public ForwardingRulesCommiter getGroupCommiter(); /** * Content definition method and prevent code duplicity - * @return ForwardingRulesCommiter + * @return ForwardingRulesCommiter<Meter> */ public ForwardingRulesCommiter getMeterCommiter(); diff --git a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/StatNodeRegistration.java b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/StatNodeRegistration.java index ffd8132cf3..178befea06 100644 --- a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/StatNodeRegistration.java +++ b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/StatNodeRegistration.java @@ -34,9 +34,9 @@ public interface StatNodeRegistration extends OpendaylightInventoryListener, Aut * as a prevention to use a validation check to the Operational/DS for identify * connected {@link org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode}. * - * @param InstanceIdentifier keyIdent - * @param FlowCapableNode data - * @param InstanceIdentifier nodeIdent + * @param keyIdent + * @param data + * @param nodeIdent */ void connectFlowCapableNode(InstanceIdentifier keyIdent, SwitchFeatures data, InstanceIdentifier nodeIdent); @@ -44,7 +44,7 @@ public interface StatNodeRegistration extends OpendaylightInventoryListener, Aut /** * Method cut {@link Node} registration for {@link StatPermCollector} * - * @param InstanceIdentifier keyIdent + * @param keyIdent */ void disconnectFlowCapableNode(InstanceIdentifier keyIdent); } diff --git a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/StatPermCollector.java b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/StatPermCollector.java index a57dbcf6e2..1f4432b5ec 100644 --- a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/StatPermCollector.java +++ b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/StatPermCollector.java @@ -73,7 +73,7 @@ public interface StatPermCollector extends Runnable, AutoCloseable { /** * Add new connected node for permanent statistics collecting process * - * @param flowNode + * @param nodeIdent * @param statTypes * @param nrOfSwitchTables * @return true/false if the {@link Node} added successful @@ -84,16 +84,16 @@ public interface StatPermCollector extends Runnable, AutoCloseable { /** * All disconnected Nodes need be removed from stat list Nodes * - * @param flowNode + * @param nodeIdent * @return true/false if the {@link Node} removed successful */ boolean disconnectedNodeUnregistration(InstanceIdentifier nodeIdent); /** * Method add new feature {@link StatCapabTypes} to Node identified by - * nodeIdent -> InstanceIdentifier + * nodeIdent -> InstanceIdentifier<Node> * - * @param flowNode + * @param nodeIdent * @return true/false if the {@link StatCapabTypes} add successful */ boolean registerAdditionalNodeFeature(InstanceIdentifier nodeIdent, StatCapabTypes statCapab); @@ -103,7 +103,7 @@ public interface StatPermCollector extends Runnable, AutoCloseable { * valid node registration in its internal {@link Node} map. * Otherwise return false. * - * @param flowNode + * @param nodeIdent * @return */ boolean isProvidedFlowNodeActive(InstanceIdentifier nodeIdent); diff --git a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/StatRpcMsgManager.java b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/StatRpcMsgManager.java index 984650c72f..d5532a0e33 100644 --- a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/StatRpcMsgManager.java +++ b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/StatRpcMsgManager.java @@ -46,9 +46,9 @@ public interface StatRpcMsgManager extends Runnable, AutoCloseable { * Transaction container is definition for Multipart transaction * join container for all Multipart msg with same TransactionId * Input {@link DataObject} is a possible light-weight DataObject - * which is used for identification (e.g. Flow-> Priority,Match,Cookie,FlowId) + * which is used for identification (e.g. Flow -> Priority,Match,Cookie,FlowId) * - * @param extends TransactionAware - + * @param */ interface TransactionCacheContainer { @@ -67,7 +67,7 @@ public interface StatRpcMsgManager extends Runnable, AutoCloseable { * Method is used for check a transaction registration * for multipart cache holder * - * @param TransactionId id + * @param id * @return true if the transaction has been correctly registered */ Future isExpectedStatistics(TransactionId id, NodeId nodeId); @@ -95,7 +95,7 @@ public interface StatRpcMsgManager extends Runnable, AutoCloseable { * and build all to TransactionCacheContainer Object to return. This process clean * all instances in Cache. * - * @param TransactionId id + * @param id * @return TransactionCacheContainer */ Future>> getTransactionCacheContainer(TransactionId id, NodeId nodeId); @@ -104,7 +104,7 @@ public interface StatRpcMsgManager extends Runnable, AutoCloseable { * Method wraps OpendaylightGroupStatisticsService.getAllGroupStatistics * and registers to Transaction Cache * - * @param NodeRef nodeRef + * @param nodeRef */ Future getAllGroupsStat(NodeRef nodeRef); @@ -112,7 +112,7 @@ public interface StatRpcMsgManager extends Runnable, AutoCloseable { * Method wraps OpendaylightGroupStatisticsService.getGroupDescription * and registers to Transaction Cache * - * @param NodeRef nodeRef + * @param nodeRef */ Future getAllGroupsConfStats(NodeRef nodeRef); @@ -120,7 +120,7 @@ public interface StatRpcMsgManager extends Runnable, AutoCloseable { * Method wraps OpendaylightMeterStatisticsService.getGroupFeatures * and registers to Transaction Cache * - * @param NodeRef nodeRef + * @param nodeRef */ void getGroupFeaturesStat(NodeRef nodeRef); @@ -128,7 +128,7 @@ public interface StatRpcMsgManager extends Runnable, AutoCloseable { * Method wraps OpendaylightMeterStatisticsService.getAllMeterStatistics * and registers to Transaction Cache * - * @param NodeRef nodeRef + * @param nodeRef */ Future getAllMetersStat(NodeRef nodeRef); @@ -136,7 +136,7 @@ public interface StatRpcMsgManager extends Runnable, AutoCloseable { * Method wraps OpendaylightMeterStatisticsService.getAllMeterConfigStatistics * and registers to Transaction Cache * - * @param NodeRef nodeRef + * @param nodeRef */ Future getAllMeterConfigStat(NodeRef nodeRef); @@ -144,7 +144,7 @@ public interface StatRpcMsgManager extends Runnable, AutoCloseable { * Method wraps OpendaylightMeterStatisticsService.getMeterFeatures * and registers to Transaction Cache * - * @param NodeRef nodeRef + * @param nodeRef */ void getMeterFeaturesStat(NodeRef nodeRef); @@ -152,7 +152,7 @@ public interface StatRpcMsgManager extends Runnable, AutoCloseable { * Method wraps OpendaylightFlowStatisticsService.getAllFlowsStatisticsFromAllFlowTables * and registers to Transaction Cache * - * @param NodeRef nodeRef + * @param nodeRef */ Future getAllFlowsStat(NodeRef nodeRef); @@ -160,8 +160,8 @@ public interface StatRpcMsgManager extends Runnable, AutoCloseable { * Method wraps OpendaylightFlowStatisticsService.getAggregateFlowStatisticsFromFlowTableForAllFlows * and registers to Transaction Cache * - * @param NodeRef nodeRef - * @param TableId tableId + * @param nodeRef + * @param tableId */ void getAggregateFlowStat(NodeRef nodeRef, TableId tableId); @@ -169,7 +169,7 @@ public interface StatRpcMsgManager extends Runnable, AutoCloseable { * Method wraps OpendaylightPortStatisticsService.getAllNodeConnectorsStatistics * and registers to Transaction Cache * - * @param NodeRef nodeRef + * @param nodeRef */ Future getAllPortsStat(NodeRef nodeRef); @@ -177,7 +177,7 @@ public interface StatRpcMsgManager extends Runnable, AutoCloseable { * Method wraps OpendaylightFlowTableStatisticsService.getFlowTablesStatistics * and registers to Transaction Cache * - * @param NodeRef nodeRef + * @param nodeRef */ Future getAllTablesStat(NodeRef nodeRef); @@ -185,7 +185,7 @@ public interface StatRpcMsgManager extends Runnable, AutoCloseable { * Method wraps OpendaylightQueueStatisticsService.getAllQueuesStatisticsFromAllPorts * and registers to Transaction Cache * - * @param NodeRef nodeRef + * @param nodeRef */ Future getAllQueueStat(NodeRef nodeRef); diff --git a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/StatisticsManager.java b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/StatisticsManager.java index 5862e717a3..e1c3fbc1ef 100644 --- a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/StatisticsManager.java +++ b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/StatisticsManager.java @@ -38,7 +38,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; * StatisticsManager * It represent a central point for whole module. Implementation * StatisticsManager registers all Operation/DS {@link StatNotifyCommiter} and - * Config/DS {@StatListeningCommiter}, as well as {@link StatPermCollector} + * Config/DS {@link StatListeningCommiter}, as well as {@link StatPermCollector} * for statistic collecting and {@link StatRpcMsgManager} as Device RPCs provider. * In next, StatisticsManager provides all DS contact Transaction services. * @@ -92,7 +92,7 @@ public interface StatisticsManager extends AutoCloseable, TransactionChainListen /** * Apply all read / write (put|merge) operation for DataStore * - * @param {@link ReadWriteTransaction} tx + * @param tx {@link ReadWriteTransaction} */ public abstract void applyOperation(ReadWriteTransaction tx); @@ -101,9 +101,8 @@ public interface StatisticsManager extends AutoCloseable, TransactionChainListen /** * Method starts whole StatisticManager functionality * - * @param {@link NotificationProviderService} notifService - * @param {@link RpcConsumerRegistry} rpcRegistry - * @param minReqNetMonitInt + * @param notifService + * @param rpcRegistry */ void start(final NotificationProviderService notifService, final RpcConsumerRegistry rpcRegistry); @@ -117,7 +116,7 @@ public interface StatisticsManager extends AutoCloseable, TransactionChainListen void enqueue(final StatDataStoreOperation inventoryOper); /** - * Method wraps {@link StatisticCollector}.isProvidedFlowNodeActive method + * Method wraps {@link StatisticsManager#isProvidedFlowNodeActive(InstanceIdentifier)} method * to provide parallel statCollection process for Set of Nodes. So it has to * identify correct Node Set by NodeIdentifier * @@ -177,14 +176,14 @@ public interface StatisticsManager extends AutoCloseable, TransactionChainListen /** * Define Method : {@link org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode} - * Operational/DS data change listener -> impl. target -> register FlowCapableNode to Statistic Collecting process + * Operational/DS data change listener -> impl. target -> register FlowCapableNode to Statistic Collecting process * @return {@link StatNodeRegistration} */ StatNodeRegistration getNodeRegistrator(); /** - * Define Method : Flow Config/DS data change listener -> impl. target -> - * -> make pair between Config/DS FlowId and Device Flow response Hash + * Define Method : Flow Config/DS data change listener -> impl. target -> + * -> make pair between Config/DS FlowId and Device Flow response Hash * @return */ StatListeningCommiter getFlowListenComit(); diff --git a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractListenCommit.java b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractListenCommit.java index cb20980b17..05315108b4 100644 --- a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractListenCommit.java +++ b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractListenCommit.java @@ -81,7 +81,7 @@ public abstract class StatAbstractListenCommit, DataObject> changeEvent) { Preconditions.checkNotNull(changeEvent,"Async ChangeEvent can not be null!"); /* - * If we have opened read transaction for configuraiton data store, + * If we have opened read transaction for configuration data store, * we will close and null it. * * Latest read transaction will be allocated on another read using readLatestConfiguration diff --git a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractNotifyCommit.java b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractNotifyCommit.java index 3ab5dbab42..ad866feb6d 100644 --- a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractNotifyCommit.java +++ b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractNotifyCommit.java @@ -77,10 +77,10 @@ public abstract class StatAbstractNotifyCommit i protected abstract N getStatNotificationListener(); /** - * PreConfigurationCheck - Node identified by input InstanceIdentifier + * PreConfigurationCheck - Node identified by input InstanceIdentifier<Node> * has to be registered in {@link org.opendaylight.openflowplugin.applications.statistics.manager.StatPermCollector} * - * @param InstanceIdentifier nodeIdent + * @param nodeIdent */ protected boolean preConfigurationCheck(final InstanceIdentifier nodeIdent) { Preconditions.checkNotNull(nodeIdent, "FlowCapableNode ident can not be null!"); @@ -97,8 +97,8 @@ public abstract class StatAbstractNotifyCommit i * getTransactionCacheContainer with 10sec TimeOut. * Method has returned {@link Optional} which could contains a {@link TransactionCacheContainer} * - * @param TransactionId transId - * @param NodeId nodeId + * @param transId + * @param nodeId * @return */ protected Optional> getTransactionCacheContainer(final TransactionId transId, final NodeId nodeId) { @@ -141,8 +141,8 @@ public abstract class StatAbstractNotifyCommit i * isExpectedStatistics with 10sec TimeOut. * Method has checked registration for provided {@link TransactionId} and {@link NodeId} * - * @param TransactionId transId - Transaction identification - * @param NodeId nodeId - Node identification + * @param transId - Transaction identification + * @param nodeId - Node identification * @return boolean */ protected boolean isExpectedStatistics(final TransactionId transId, final NodeId nodeId) { diff --git a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatisticsManagerImpl.java b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatisticsManagerImpl.java index 9d9446426e..347941518d 100644 --- a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatisticsManagerImpl.java +++ b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatisticsManagerImpl.java @@ -58,7 +58,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; * StatisticsManagerImpl * It represent a central point for whole module. Implementation * {@link StatisticsManager} registers all Operation/DS {@link StatNotifyCommiter} and -* Config/DS {@StatListeningCommiter}, as well as {@link StatPermCollector} +* Config/DS {@link StatListeningCommiter}, as well as {@link StatPermCollector} * for statistic collecting and {@link StatRpcMsgManager} as Device RPCs provider. * In next, StatisticsManager provides all DS contact Transaction services. * diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/NiciraExtensionsRegistrator.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/NiciraExtensionsRegistrator.java index 52c1cb0371..53abd822b9 100644 --- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/NiciraExtensionsRegistrator.java +++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/NiciraExtensionsRegistrator.java @@ -36,11 +36,10 @@ public class NiciraExtensionsRegistrator implements AutoCloseable { private final NiciraExtensionCodecRegistrator registrator; /** - * @param providers cannot be null + * @param registrator cannot be null */ public NiciraExtensionsRegistrator(NiciraExtensionCodecRegistrator registrator) { - Preconditions.checkNotNull(registrator); - this.registrator = registrator; + this.registrator = Preconditions.checkNotNull(registrator); } public void registerNiciraExtensions() { diff --git a/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/GroupingLooseResolver.java b/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/GroupingLooseResolver.java index 21fa53f406..18480befd8 100644 --- a/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/GroupingLooseResolver.java +++ b/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/GroupingLooseResolver.java @@ -20,7 +20,7 @@ import com.google.common.base.Preconditions; /** * Provides augmentation resolving upon given {@link Augmentable}. * Used {@link Augmentation}s do not share {@link Augmentable}. - *
+ *
* Usage: in case there are multiple {@link Augmentable} classes which might contain * corresponding {@link Augmentation}s (1:1..n binding). And those {@link Augmentation}s * are sharing the same grouping so that they could be processed in the same way. @@ -34,7 +34,6 @@ public class GroupingLooseResolver { /** * @param commonInterface - * @param common grouping Interface */ public GroupingLooseResolver(Class commonInterface) { this.commonInterface = commonInterface; diff --git a/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/GroupingResolver.java b/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/GroupingResolver.java index 77ac355056..c360637d3c 100644 --- a/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/GroupingResolver.java +++ b/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/GroupingResolver.java @@ -19,7 +19,7 @@ import com.google.common.base.Preconditions; /** * Provides augmentation resolving upon given {@link Augmentable}. * Used {@link #classes} share the same {@link Augmentable}. - *
+ *
* Usage: in case there is {@link Augmentable} which might contain * multiple {@link Augmentation}s depending on origin. And those {@link Augmentation}s * are sharing the same grouping so that they could be processed in the same way. @@ -74,4 +74,4 @@ public class GroupingResolver> { } return Optional.absent(); } -} \ No newline at end of file +} diff --git a/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/core/extension/ExtensionConverterProvider.java b/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/core/extension/ExtensionConverterProvider.java index 309c5625b1..466004c298 100644 --- a/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/core/extension/ExtensionConverterProvider.java +++ b/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/core/extension/ExtensionConverterProvider.java @@ -44,7 +44,7 @@ public interface ExtensionConverterProvider { ConvertorActionToOFJava getConverter(TypeVersionKey key); /** - * lookup converter
+ * lookup converter
* TODO: this method should be compatible with {@link #getConverter(MessageTypeKey)} after matches are migrated to similar structure * @param key * @return found converter diff --git a/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/path/ActionPath.java b/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/path/ActionPath.java index 16e12ff894..e299808943 100644 --- a/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/path/ActionPath.java +++ b/extension/openflowplugin-extension-api/src/main/java/org/opendaylight/openflowplugin/extension/api/path/ActionPath.java @@ -35,6 +35,8 @@ public enum ActionPath implements AugmentationPath {      */ NODES_NODE_TABLE_FLOW_INSTRUCTIONS_INSTRUCTION_WRITEACTIONSCASE_WRITEACTIONS_ACTION_ACTION_EXTENSIONLIST_EXTENSION(null), /** + * openflowplugin-extension-general.yang + * 
      * module: opendaylight-inventory
      *    +--rw nodes
      *       +--rw node* [id]
@@ -69,6 +71,8 @@ public enum ActionPath implements AugmentationPath {
      */
     FLOWSSTATISTICSUPDATE_FLOWANDSTATISTICSMAPLIST_INSTRUCTIONS_INSTRUCTION_INSTRUCTION_WRITEACTIONSCASE_WRITEACTIONS_ACTION_ACTION(null),
     /**
+     * openflowplugin-extension-general.yang
+     * 
      * module: opendaylight-flow-statistics
      * notifications:
      *    +---n flows-statistics-update             
diff --git a/legacy/sal-compatibility/src/main/java/org/opendaylight/openflowplugin/legacy/sal/compatibility/ToSalConversionsUtils.java b/legacy/sal-compatibility/src/main/java/org/opendaylight/openflowplugin/legacy/sal/compatibility/ToSalConversionsUtils.java
index b7ec91596c..4ee26637e1 100644
--- a/legacy/sal-compatibility/src/main/java/org/opendaylight/openflowplugin/legacy/sal/compatibility/ToSalConversionsUtils.java
+++ b/legacy/sal-compatibility/src/main/java/org/opendaylight/openflowplugin/legacy/sal/compatibility/ToSalConversionsUtils.java
@@ -372,7 +372,7 @@ public class ToSalConversionsUtils {
     }
 
     /**
-     * @param openflow nodeConnector uri
+     * @param uri openflow nodeConnector URI
      * @param node
      * @return assembled nodeConnector
      */
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/OpenFlowPluginProvider.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/OpenFlowPluginProvider.java
index 3368056332..62cbf0bdde 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/OpenFlowPluginProvider.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/OpenFlowPluginProvider.java
@@ -14,7 +14,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow
 import java.util.Collection;
 
 /**
- * Created by Martin Bobak  on 27.3.2015.
+ * Created by Martin Bobak <mbobak@cisco.com> on 27.3.2015.
  */
 public interface OpenFlowPluginProvider extends AutoCloseable {
 
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/connection/ConnectionContext.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/connection/ConnectionContext.java
index 4894f14590..921d1fe53d 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/connection/ConnectionContext.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/connection/ConnectionContext.java
@@ -15,8 +15,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 /**
  * Each OpenFlow session is tracked by a Connection Context. These attach to a particular Device Context in such a way,
  * that there is at most one primary session associated with a Device Context.
- * 

- * Created by Martin Bobak  on 25.2.2015.
+ * 

+ * Created by Martin Bobak <mbobak@cisco.com> on 25.2.2015.
  */
 public interface ConnectionContext extends MultiMsgCollector {
 
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/connection/ConnectionManager.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/connection/ConnectionManager.java
index 31ce201996..72589e7e92 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/connection/ConnectionManager.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/connection/ConnectionManager.java
@@ -16,8 +16,8 @@ import org.opendaylight.openflowplugin.api.openflow.device.handlers.MessageHandl
  * Connection manager manages connections with devices.
  * It instantiates and registers {@link ConnectionContext}
  * used for handling all communication with device when onSwitchConnected notification is processed.
- * 

- * Created by Martin Bobak  on 25.2.2015.
+ * 

+ * Created by Martin Bobak <mbobak@cisco.com> on 25.2.2015.
  */
 public interface ConnectionManager extends SwitchConnectionHandler {
 
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceContext.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceContext.java
index 8b7d3e69c6..b1923e127c 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceContext.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceContext.java
@@ -33,8 +33,8 @@ import org.opendaylight.yangtools.yang.common.RpcResult;
  * which is enforced by keeping a cap on the number of outstanding requests a particular Request
  * Context can have at any point in time. Should this quota be exceeded, any further attempt to make
  * a request to the switch will fail immediately, with proper error indication.
- * 

- * Created by Martin Bobak  on 25.2.2015.
+ * 

+ * Created by Martin Bobak <mbobak@cisco.com> on 25.2.2015.
  */
 public interface DeviceContext extends MessageHandler {
 
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceManager.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceManager.java
index 196ba7c1d3..c18375b064 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceManager.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceManager.java
@@ -16,9 +16,8 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
  * This interface is responsible for instantiating DeviceContext and
  * registering transaction chain for each DeviceContext. Each device
  * has its own device context managed by this manager.
- * 

- * 

- * Created by Martin Bobak  on 25.2.2015.
+ * 

+ * Created by Martin Bobak <mbobak@cisco.com> on 25.2.2015.
  */
 public interface DeviceManager extends DeviceConnectedHandler {
 
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceState.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceState.java
index d5e926d8d8..fd879ba67d 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceState.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/DeviceState.java
@@ -16,7 +16,7 @@ import java.util.Map;
 import java.util.Set;
 
 /**
- * Created by Martin Bobak  on 25.2.2015.
+ * Created by Martin Bobak <mbobak@cisco.com> on 25.2.2015.
  */
 public interface DeviceState {
 
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/RequestContext.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/RequestContext.java
index 2122997a72..269ab3dea4 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/RequestContext.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/RequestContext.java
@@ -13,8 +13,8 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 /**
  * Request context handles all requests on device. Number of requests is limited by request quota. When this quota is
  * exceeded all rpc's will end up with exception.
- * 

- * Created by Martin Bobak  on 25.2.2015.
+ * 

+ * Created by Martin Bobak <mbobak@cisco.com> on 25.2.2015.
  */
 public interface RequestContext extends RequestFutureContext, AutoCloseable {
 
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/RequestFutureContext.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/RequestFutureContext.java
index dac4ff32a6..caabf07d67 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/RequestFutureContext.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/RequestFutureContext.java
@@ -13,16 +13,15 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 
 /**
- * Created by Martin Bobak  on 25.3.2015.
+ * Created by Martin Bobak <mbobak@cisco.com> on 25.3.2015.
+ * @param 
  */
 public interface RequestFutureContext {
 
     /**
      * Method returns future to be used for handling device requests.
      *
-     * @param 
      * @return
      */
     SettableFuture> getFuture();
-
 }
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/Xid.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/Xid.java
index 3a6ee54363..efd99b536c 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/Xid.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/Xid.java
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.api.openflow.device;
 
 /**
- * Created by Martin Bobak  on 26.2.2015.
+ * Created by Martin Bobak <mbobak@cisco.com> on 26.2.2015.
  */
 public class Xid {
 
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/XidGenerator.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/XidGenerator.java
index dfb9802a42..b17ca8b983 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/XidGenerator.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/XidGenerator.java
@@ -11,7 +11,7 @@ package org.opendaylight.openflowplugin.api.openflow.device;
 import java.util.concurrent.atomic.AtomicLong;
 
 /**
- * Created by Martin Bobak  on 24.3.2015.
+ * Created by Martin Bobak <mbobak@cisco.com> on 24.3.2015.
  */
 public class XidGenerator {
 
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/exception/RequestQuotaExceededException.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/exception/RequestQuotaExceededException.java
index d6c1649064..cae8a85150 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/exception/RequestQuotaExceededException.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/exception/RequestQuotaExceededException.java
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.api.openflow.device.exception;
 
 /**
- * Created by Martin Bobak  on 25.2.2015.
+ * Created by Martin Bobak <mbobak@cisco.com> on 25.2.2015.
  */
 public class RequestQuotaExceededException extends Exception {
 }
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/handlers/DeviceConnectedHandler.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/handlers/DeviceConnectedHandler.java
index c10ab6813c..24b893f6fb 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/handlers/DeviceConnectedHandler.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/handlers/DeviceConnectedHandler.java
@@ -11,7 +11,7 @@ package org.opendaylight.openflowplugin.api.openflow.device.handlers;
 import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
 
 /**
- * Created by Martin Bobak  on 26.2.2015.
+ * Created by Martin Bobak <mbobak@cisco.com> on 26.2.2015.
  */
 public interface DeviceConnectedHandler {
 
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/handlers/DeviceContextReadyHandler.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/handlers/DeviceContextReadyHandler.java
index 007ab7d9d6..ef39b786d6 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/handlers/DeviceContextReadyHandler.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/handlers/DeviceContextReadyHandler.java
@@ -11,7 +11,7 @@ package org.opendaylight.openflowplugin.api.openflow.device.handlers;
 import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 
 /**
- * Created by Martin Bobak  on 27.2.2015.
+ * Created by Martin Bobak <mbobak@cisco.com> on 27.2.2015.
  */
 public interface DeviceContextReadyHandler {
     /**
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/handlers/DeviceSynchronizedHandler.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/handlers/DeviceSynchronizedHandler.java
index 970abc3133..bbcb122ede 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/handlers/DeviceSynchronizedHandler.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/handlers/DeviceSynchronizedHandler.java
@@ -12,7 +12,7 @@ package org.opendaylight.openflowplugin.api.openflow.device.handlers;
  * This handler does the same, but is not called in the same time as
  * RequestContextReadyHandler.
  *
- * Created by Martin Bobak  on 27.2.2015.
+ * Created by Martin Bobak <mbobak@cisco.com> on 27.2.2015.
  */
 
 public interface DeviceSynchronizedHandler extends DeviceContextReadyHandler {
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/handlers/MessageHandler.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/handlers/MessageHandler.java
index bb4d853bea..c21cb41fff 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/handlers/MessageHandler.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/device/handlers/MessageHandler.java
@@ -13,7 +13,7 @@ import org.opendaylight.yangtools.yang.binding.ChildOf;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 
 /**
- * Created by Martin Bobak  on 26.2.2015.
+ * Created by Martin Bobak <mbobak@cisco.com> on 26.2.2015.
  */
 public interface MessageHandler {
 
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/ConnectionConductor.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/ConnectionConductor.java
index 4a52c3b96d..a4a0abeda5 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/ConnectionConductor.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/ConnectionConductor.java
@@ -41,7 +41,7 @@ public interface ConnectionConductor {
     List versionOrder = Lists.newArrayList((short) 0x04, (short) 0x01);
 
     /**
-     * initialize wiring around {@link #connectionAdapter}
+     * initialize wiring around {@link ConnectionAdapter}
      */
     void init();
 
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/queue/QueueKeeper.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/queue/QueueKeeper.java
index 7eece60f71..8176a5fab3 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/queue/QueueKeeper.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/queue/QueueKeeper.java
@@ -13,14 +13,13 @@ import org.opendaylight.openflowplugin.api.openflow.md.core.ConnectionConductor;
  * This processing mechanism based on queue. Processing consists of 2 steps: translate and publish.
  * Proposed workflow (might slightly deviate in implementations):
  * 
    
- * 
  1. messages of input type are pushed in (via {@link QueueKeeper#push(Object, ConnectionConductor)} and similar)
    2. 
+ * 
  2. messages of input type are pushed in (via {@link QueueKeeper#push(Object, ConnectionConductor, QueueType)} and similar)
    3. 
  * 
  3. ticket (executable task) is build upon each pushed message and enqueued
    4. 
  * 
  4. ticket is translated using appropriate translator
    5. 
  * 
  5. ticket is dequeued and result is published by appropriate popListener
    6. 
  * 

  * Message order might be not important, e.g. when speed is of the essence
  * @param  source type (IN)
- * @param  result type (OUT)
  */
 public interface QueueKeeper extends AutoCloseable {
 
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/queue/QueueProcessor.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/queue/QueueProcessor.java
index 226ccba422..441bb9b0a2 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/queue/QueueProcessor.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/queue/QueueProcessor.java
@@ -11,7 +11,6 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
-import org.opendaylight.openflowplugin.api.openflow.md.core.ConnectionConductor;
 import org.opendaylight.openflowplugin.api.openflow.md.core.IMDMessageTranslator;
 import org.opendaylight.openflowplugin.api.openflow.md.core.TranslatorKey;
 
@@ -19,7 +18,7 @@ import org.opendaylight.openflowplugin.api.openflow.md.core.TranslatorKey;
  * This processing mechanism based on queue. Processing consists of 2 steps: translate and publish.
  * Proposed workflow (might slightly deviate in implementations):
  * 
    
- * 
  1. messages of input type are pushed in (via {@link QueueProcessor#push(Object, ConnectionConductor)} and similar)
    2. 
+ * 
  2. messages of input type are pushed in (via {@link QueueKeeper#push(Object, org.opendaylight.openflowplugin.api.openflow.md.core.ConnectionConductor, org.opendaylight.openflowplugin.api.openflow.md.queue.QueueKeeper.QueueType)} and similar)
    3. 
  * 
  3. ticket (executable task) is build upon each pushed message and enqueued
    4. 
  * 
  4. ticket is translated using appropriate translator
    5. 
  * 
  5. ticket is dequeued and result is published by appropriate popListener
    6. 
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/util/OpenflowVersion.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/util/OpenflowVersion.java
index 2547f8315d..7baa5a9d4d 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/util/OpenflowVersion.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/util/OpenflowVersion.java
@@ -1,7 +1,7 @@
 package org.opendaylight.openflowplugin.api.openflow.md.util;
 
 /** List of Openflow versions supported by the plugin
- *  Note: If you add a version here, make sure to update {@link OpenflowPortsUtil} as well.
+ *  Note: If you add a version here, make sure to update org.opendaylight.openflowplugin.openflow.md.util.OpenflowPortsUtil as well.
  * Created by kramesha on 5/2/14.
  */
 public enum OpenflowVersion {
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/util/PollableQueuesPriorityZipper.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/util/PollableQueuesPriorityZipper.java
index f28876eded..d853236cee 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/util/PollableQueuesPriorityZipper.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/util/PollableQueuesPriorityZipper.java
@@ -13,12 +13,11 @@ import java.util.Queue;
  * Zipper groups together a list of queues and exposes one poll method. Polling
  * iterates through all groups and returns first not-null result of poll method
  * on each queue. If after polling each grouped queue for one time there is
- * still null result, poll will return null. 
    
+ * still null result, poll will return null. 
    
  * Iterating keeps last position so this polling is supposed to be fairly
  * distributed.
  * 
- * @param 
- *            common item type of zipped queues
+ * @param  common item type of zipped queues
  */
 public class PollableQueuesPriorityZipper {
 
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/util/PollableQueuesZipper.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/util/PollableQueuesZipper.java
index c869c64ab0..4de64b31f3 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/util/PollableQueuesZipper.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/util/PollableQueuesZipper.java
@@ -18,7 +18,7 @@ import com.google.common.collect.Iterators;
  * Zipper groups together a list of queues and exposes one poll method. Polling iterates through
  * all groups and returns first not-null result of poll method on each queue. If after polling each 
  * grouped queue for one time there is still null result, poll will return null. 
- * 
    
+ * 
    
  * Iterating keeps last position so this polling is supposed to be fairly distributed.
  * 
  * @param  common item type of zipped queues
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/rpc/RpcContext.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/rpc/RpcContext.java
index 651fe6931d..8a3fc48c74 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/rpc/RpcContext.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/rpc/RpcContext.java
@@ -18,8 +18,8 @@ import org.opendaylight.yangtools.yang.common.RpcResult;
  * This context is registered with MD-SAL as a routed RPC provider for the inventory node backed by this switch and
  * tracks the state of any user requests and how they map onto protocol requests. It uses
  * {@link org.opendaylight.openflowplugin.api.openflow.device.RequestContext} to perform requests.
- * 
    
- * Created by Martin Bobak  on 25.2.2015.
+ * 
    
+ * Created by Martin Bobak <mbobak@cisco.com> on 25.2.2015.
  */
 public interface RpcContext extends AutoCloseable {
 
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/rpc/RpcManager.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/rpc/RpcManager.java
index 249184aac3..72fae2bb0b 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/rpc/RpcManager.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/rpc/RpcManager.java
@@ -12,10 +12,10 @@ import org.opendaylight.openflowplugin.api.openflow.device.handlers.DeviceSynchr
 
 /**
  * The RPC Manager will maintain an RPC Context for each online switch. RPC context for device is created when
- * {@link org.opendaylight.openflowplugin.api.openflow.device.handlers.DeviceSynchronizedHandler#deviceConnected(org.opendaylight.openflowplugin.api.openflow.device.RequestContext)}
+ * {@link org.opendaylight.openflowplugin.api.openflow.device.handlers.DeviceSynchronizedHandler#deviceConnected(org.opendaylight.openflowplugin.api.openflow.device.DeviceContext)}
  * is called.
- * 
    
- * Created by Martin Bobak  on 25.2.2015.
+ * 
    
+ * Created by Martin Bobak <mbobak@cisco.com> on 25.2.2015.
  */
 public interface RpcManager extends DeviceSynchronizedHandler {
 
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/StatisticsContext.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/StatisticsContext.java
index eeb55c65be..919e8d55ef 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/StatisticsContext.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/StatisticsContext.java
@@ -12,7 +12,7 @@ import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
 import org.opendaylight.openflowplugin.api.openflow.device.RequestContext;
 
 /**
- * Created by Martin Bobak  on 27.2.2015.
+ * Created by Martin Bobak <mbobak@cisco.com> on 27.2.2015.
  */
 public interface StatisticsContext {
 
diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/StatisticsManager.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/StatisticsManager.java
index 99dbcc9385..bf75a10fff 100644
--- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/StatisticsManager.java
+++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/StatisticsManager.java
@@ -11,7 +11,7 @@ package org.opendaylight.openflowplugin.api.openflow.statistics;
 import org.opendaylight.openflowplugin.api.openflow.device.handlers.DeviceContextReadyHandler;
 
 /**
- * Created by Martin Bobak  on 26.2.2015.
+ * Created by Martin Bobak <mbobak@cisco.com> on 26.2.2015.
  */
 public interface StatisticsManager extends DeviceContextReadyHandler {
 
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 3a17dee453..7b26982289 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
@@ -21,7 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow
 import java.util.Collection;
 
 /**
- * Created by Martin Bobak  on 27.3.2015.
+ * Created by Martin Bobak <mbobak@cisco.com> on 27.3.2015.
  */
 public class OpenflowPluginProviderImpl implements OpenFlowPluginProvider {
 
diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/RequestInputUtils.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/RequestInputUtils.java
index da097a5cd9..b8aa9949fe 100644
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/RequestInputUtils.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/RequestInputUtils.java
@@ -13,7 +13,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInputBuilder;
 
 /**
- * Created by Martin Bobak  on 26.3.2015.
+ * Created by Martin Bobak <mbobak@cisco.com> on 26.3.2015.
  */
 public final class RequestInputUtils {
 
diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/RpcResultConvertor.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/RpcResultConvertor.java
index 0429c055f4..abd4b2aee0 100644
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/RpcResultConvertor.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/RpcResultConvertor.java
@@ -20,7 +20,7 @@ import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 
 /**
- * Created by Martin Bobak  on 26.3.2015.
+ * Created by Martin Bobak <mbobak@cisco.com> on 26.3.2015.
  */
 public class RpcResultConvertor {
 
diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/HandshakeManagerImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/HandshakeManagerImpl.java
index a9f5a0d62e..b108d33638 100644
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/HandshakeManagerImpl.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/HandshakeManagerImpl.java
@@ -305,7 +305,7 @@ public class HandshakeManagerImpl implements HandshakeManager {
     /**
      * after handshake set features, register to session
      * @param proposedVersion
-     * @param xId
+     * @param xid
      * @throws Exception 
      */
     protected void postHandshake(Short proposedVersion, Long xid) throws Exception {
diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OFRpcTaskFactory.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OFRpcTaskFactory.java
index 371ed9e048..226562f2fd 100644
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OFRpcTaskFactory.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OFRpcTaskFactory.java
@@ -228,8 +228,8 @@ public abstract class OFRpcTaskFactory {
     }
 
     /**
-     * Recursive helper method for {@link OFRpcTaskFactory#createAddFlowTask()}
-     * and {@link OFRpcTaskFactory#createUpdateFlowTask()} to chain results
+     * Recursive helper method for {@link OFRpcTaskFactory#createAddFlowTask(OFRpcTaskContext, AddFlowInput, SwitchConnectionDistinguisher)}
+     * and {@link OFRpcTaskFactory#createUpdateFlowTask(OFRpcTaskContext, UpdateFlowInput, SwitchConnectionDistinguisher)} to chain results
      * of multiple flowmods.
      * The next flowmod gets executed if the earlier one is successful.
      * All the flowmods should have the same xid, in-order to cross-reference
@@ -357,7 +357,6 @@ public abstract class OFRpcTaskFactory {
 
 
     /**
-     * @param xId
      * @param input
      * @return
      */
diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OFRpcTaskUtil.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OFRpcTaskUtil.java
index aa59636598..1cd5d8a51a 100644
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OFRpcTaskUtil.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OFRpcTaskUtil.java
@@ -135,8 +135,6 @@ public abstract class OFRpcTaskUtil {
     /**
      * @param task of rpcl
      * @param originalResult
-     * @param notificationProviderService
-     * @param notificationComposer lazy notification composer
      * @return chained result with barrier
      */
     public static 
diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionUtil.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionUtil.java
index 49af9ea9f1..60fcc5da51 100644
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionUtil.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionUtil.java
@@ -9,7 +9,7 @@
 package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor;
 
 /**
- * Created by Martin Bobak  on 13.3.2015.
+ * Created by Martin Bobak <mbobak@cisco.com> on 13.3.2015.
  */
 public final class ActionUtil {
 
diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/IpConversionUtil.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/IpConversionUtil.java
index ea1948c2d3..d4b5f55358 100644
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/IpConversionUtil.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/IpConversionUtil.java
@@ -17,7 +17,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 import java.util.Iterator;
 
 /**
- * Created by Martin Bobak  on 5.3.2015.
+ * Created by Martin Bobak <mbobak@cisco.com> on 5.3.2015.
  */
 public final class IpConversionUtil {
 
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 6a25786d74..403422e481 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
@@ -32,7 +32,6 @@ public class QueueKeeperHarvester implements Runnable, HarvesterHandle {
     /**
      * @param enqueuer
      * @param messageSources
-     * @param harvestLock
      */
     public QueueKeeperHarvester(final Enqueuer> enqueuer,
             final Collection> messageSources) {
@@ -89,4 +88,4 @@ public class QueueKeeperHarvester implements Runnable, HarvesterHandle {
             }
         }
     }
-}
\ No newline at end of file
+}
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 2df8fb229e..63fa440d6c 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
@@ -38,15 +38,15 @@ import org.slf4j.LoggerFactory;
 
 /**
  * {@link org.opendaylight.openflowplugin.api.openflow.md.queue.QueueKeeper} implementation focused to keep order and use up mutiple threads for translation phase.
- * 
    
+ * 
    
  * There is internal thread pool of limited size ({@link QueueProcessorLightImpl#setProcessingPoolSize(int)})
  * dedicated to translation. Then there is singleThreadPool dedicated to publishing (via popListeners)
- * 
    
+ * 
    
  * Workflow:
  * 
      
  * 
    1. upon message push ticket is created and enqueued
      2. 
  * 
    2. available threads from internal pool translate the massage wrapped in ticket
      3. 
- * 
    3. when translation of particular message is finished, result is set in future result of wrapping ticket
      
+ * 
    4. when translation of particular message is finished, result is set in future result of wrapping ticket
      
  *     (order of tickets in queue is not touched during translate)
  * 
      5. 
  * 
    5. at the end of queue there is {@link TicketFinisher} running in singleThreadPool and for each ticket it does:
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 8a3404f923..10b3b2c533 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
@@ -27,7 +27,6 @@ public class WrapperQueueImpl implements Queue {
 
     /**
      * @param capacity
-     * @param queueZipper
      */
     public WrapperQueueImpl(int capacity, Queue queueDefault,
             WaterMarkListener queueListenerMark) {
diff --git a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/Activator.java b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/Activator.java
index 9ee9a1e681..cd308d59b2 100644
--- a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/Activator.java
+++ b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/Activator.java
@@ -19,7 +19,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  * learning switch activator
- * 
      
+ * 
      
  * Activator is derived from AbstractBindingAwareConsumer, which takes care
  * of looking up MD-SAL in Service Registry and registering consumer
  * when MD-SAL is present.
diff --git a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/InstanceIdentifierUtils.java b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/InstanceIdentifierUtils.java
index 18f71bb0fb..10ee47ab63 100644
--- a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/InstanceIdentifierUtils.java
+++ b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/InstanceIdentifierUtils.java
@@ -61,12 +61,12 @@ public class InstanceIdentifierUtils {
      * Creates a path for particular flow, by appending flow-specific information
      * to table path.
      * 
-     * @param flowId
-     * @param tablePathArg 
+     * @param tablePath
+     * @param flowKey
      * @return path to flow
      */
-    public static InstanceIdentifier createFlowPath(InstanceIdentifier table,FlowKey flowKey) {
-        return InstanceIdentifier.builder(table)
+    public static InstanceIdentifier createFlowPath(InstanceIdentifier
       tablePath, FlowKey flowKey) {
+        return InstanceIdentifier.builder(tablePath)
                 .child(Flow.class, flowKey)
                 .build();
     }
diff --git a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchManager.java b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchManager.java
index 0ba0ed22e9..56c577899f 100644
--- a/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchManager.java
+++ b/samples/learning-switch/src/main/java/org/opendaylight/openflowplugin/learningswitch/LearningSwitchManager.java
@@ -29,14 +29,14 @@ public interface LearningSwitchManager {
 
     /**
      * Set's Data Broker dependency.
-     * 
      
+     * 
      
      * Data Broker is used to access overal operational and configuration
      * tree.
-     * 
      
+     * 
      
      * In simple Learning Switch handler, data broker is used to listen
      * for changes in Openflow tables and to configure flows which will
      * be provisioned down to the Openflow switch.
-     * 
      
+     * 
      
      * inject {@link DataBroker}
      *
      * @param data
@@ -45,10 +45,10 @@ public interface LearningSwitchManager {
 
     /**
      * Set's Packet Processing dependency.
-     * 
      
+     * 
      
      * Packet Processing service is used to send packet Out on Openflow
      * switch.
-     * 
      
+     * 
      
      * inject {@link PacketProcessingService}
      *
      * @param packetProcessingService
@@ -58,10 +58,10 @@ public interface LearningSwitchManager {
 
     /**
      * Set's Notification service dependency.
-     * 
      
+     * 
      
      * Notification service is used to register for listening
      * packet-in notifications.
-     * 
      
+     * 
      
      * inject {@link NotificationService}
      *
      * @param notificationService
diff --git a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestCommandProvider.java b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestCommandProvider.java
index 5bbefe2048..908a2fe593 100644
--- a/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestCommandProvider.java
+++ b/test-provider/src/main/java/org/opendaylight/openflowplugin/test/OpenflowpluginTestCommandProvider.java
@@ -3257,7 +3257,7 @@ public class OpenflowpluginTestCommandProvider implements CommandProvider {
 
     /**
      * @param ci arguments: switchId flowType tableNum
-     *           
      
+     *           
      
      *           
            *                     e.g.: addMDFlow openflow:1 f1 42
      *                     
      
-- 
2.36.6