Fix some FRM checkstyle violations

- whitespace around generic arguments
- unneeded public modifiers
- line length

Change-Id: I3febf13cf3f01e043f2406b20b57f9e37a6103b4
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/FlowCapableNodeConnectorCommitter.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/FlowCapableNodeConnectorCommitter.java
index 18c0f9ea3065eaff2705e8d22c14d4f93b2908d3..b52e9bfd243aef069d2ce3abb6021831e0169921 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/FlowCapableNodeConnectorCommitter.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/FlowCapableNodeConnectorCommitter.java
@@ -13,7 +13,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.Fl
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-public interface FlowCapableNodeConnectorCommitter <D extends DataObject> extends AutoCloseable, DataTreeChangeListener<D> {
+public interface FlowCapableNodeConnectorCommitter<D extends DataObject> extends AutoCloseable,
+        DataTreeChangeListener<D> {
     /**
      * Method removes DataObject which is identified by InstanceIdentifier
      * from device.

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/FlowNodeConnectorInventoryTranslator.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/FlowNodeConnectorInventoryTranslator.java
index 04a4ea1fb82aa31f66c442e1ae8b6225a0335c3d..27abe339cac7b7f59b3c0a72d4b5a29bc3919f8b 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/FlowNodeConnectorInventoryTranslator.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/FlowNodeConnectorInventoryTranslator.java
@@ -12,5 +12,5 @@ import java.math.BigInteger;
 
 public interface FlowNodeConnectorInventoryTranslator {
 
-    public boolean isNodeConnectorUpdated(BigInteger dpId, String portName);
+    boolean isNodeConnectorUpdated(BigInteger dpId, String portName);
 }

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 348df22af9401ea88fd9f604000e1e227a238ac3..7f9916b186b2341b1c0907c0c305bacfa24a54a5 100644 (file)
--- 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
@@ -24,7 +24,8 @@ import org.opendaylight.yangtools.yang.common.RpcResult;
  * SalRpcService for device. Every implementation has to be registered for
  * Configurational/DS tree path.
  */
-public interface ForwardingRulesCommiter <D extends DataObject> extends AutoCloseable, ClusteredDataTreeChangeListener<D> {
+public interface ForwardingRulesCommiter<D extends DataObject> extends AutoCloseable,
+        ClusteredDataTreeChangeListener<D> {
 
     /**
      * Method removes DataObject which is identified by InstanceIdentifier
@@ -59,7 +60,7 @@ public interface ForwardingRulesCommiter <D extends DataObject> extends AutoClos
      * @return A future associated with RPC task. {@code null} is set to the
      *         future if this method does not invoke RPC.
      */
-    Future<? extends RpcResult> add(InstanceIdentifier<D> identifier, D add,
+    Future<? extends RpcResult<?>> add(InstanceIdentifier<D> identifier, D add,
             InstanceIdentifier<FlowCapableNode> nodeIdent);
 
 
@@ -76,7 +77,7 @@ public interface ForwardingRulesCommiter <D extends DataObject> extends AutoClos
 
 
 
-    Future<? extends RpcResult> removeWithResult(InstanceIdentifier<D> identifier, D del,
+    Future<? extends RpcResult<?>> removeWithResult(InstanceIdentifier<D> identifier, D del,
                                                InstanceIdentifier<FlowCapableNode> 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 d6916d18e004c9fb080a6fd43f7e994b843a5abc..6f86d9495e58b2659b2554f87ba6304d533e8397 100644 (file)
--- 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
@@ -27,7 +27,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  * org.opendaylight.openflowplugin.applications.frm
  *
  * ForwardingRulesManager
- * It represent a central point for whole modul. Implementation
+ * It represents a central point for whole module. Implementation
  * Flow Provider registers the link FlowChangeListener} and it holds all needed
  * services for link FlowChangeListener}.
  *
@@ -37,7 +37,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
  */
 public interface ForwardingRulesManager extends AutoCloseable {
 
-    public void start();
+    void start();
 
     /**
      * Method returns information :
@@ -46,7 +46,7 @@ public interface ForwardingRulesManager extends AutoCloseable {
      * @param ident - the key of the node
      * @return boolean - true if device is connected
      */
-    public boolean isNodeActive(InstanceIdentifier<FlowCapableNode> ident);
+    boolean isNodeActive(InstanceIdentifier<FlowCapableNode> ident);
 
     /**
      * Method returns information :
@@ -55,7 +55,7 @@ public interface ForwardingRulesManager extends AutoCloseable {
      * @param ident - the key of the node
      * @return boolean - true if device is present in operational data store
      */
-    public boolean checkNodeInOperationalDataStore(InstanceIdentifier<FlowCapableNode> ident);
+    boolean checkNodeInOperationalDataStore(InstanceIdentifier<FlowCapableNode> ident);
 
     /**
      * Method add new {@link FlowCapableNode} to active Node Holder.
@@ -64,7 +64,7 @@ public interface ForwardingRulesManager extends AutoCloseable {
      *
      * @param ident - the key of the node
      */
-    public void registrateNewNode(InstanceIdentifier<FlowCapableNode> ident);
+    void registrateNewNode(InstanceIdentifier<FlowCapableNode> ident);
 
     /**
      * Method remove disconnected {@link FlowCapableNode} from active Node
@@ -73,7 +73,7 @@ public interface ForwardingRulesManager extends AutoCloseable {
      *
      * @param ident - the key of the node
      */
-    public void unregistrateNode(InstanceIdentifier<FlowCapableNode> ident);
+    void unregistrateNode(InstanceIdentifier<FlowCapableNode> ident);
 
     /**
      * Method returns generated transaction ID, which is unique for
@@ -81,21 +81,21 @@ public interface ForwardingRulesManager extends AutoCloseable {
      *
      * @return String transactionID for RPC transaction identification
      */
-    public String getNewTransactionId();
+    String getNewTransactionId();
 
     /**
      * Method returns Read Transacion. It is need for Node reconciliation only.
      *
      * @return ReadOnlyTransaction
      */
-    public ReadOnlyTransaction getReadTranaction();
+    ReadOnlyTransaction getReadTranaction();
 
     /**
      * Flow RPC service
      *
      * @return
      */
-    public SalFlowService getSalFlowService();
+    SalFlowService getSalFlowService();
 
     /**
      * Group RPC service
@@ -109,63 +109,63 @@ public interface ForwardingRulesManager extends AutoCloseable {
      *
      * @return
      */
-    public SalMeterService getSalMeterService();
+    SalMeterService getSalMeterService();
 
     /**
      * Table RPC service
      *
      * @return
      */
-    public SalTableService getSalTableService();
+    SalTableService getSalTableService();
 
     /**
      * Content definition method and prevent code duplicity in Reconcil
      * @return ForwardingRulesCommiter&lt;Flow&gt;
      */
-    public ForwardingRulesCommiter<Flow> getFlowCommiter();
+    ForwardingRulesCommiter<Flow> getFlowCommiter();
 
     /**
      * Content definition method and prevent code duplicity in Reconcil
      * @return ForwardingRulesCommiter&lt;Group&gt;
      */
-    public ForwardingRulesCommiter<Group> getGroupCommiter();
+    ForwardingRulesCommiter<Group> getGroupCommiter();
 
     /**
      * Content definition method and prevent code duplicity
      * @return ForwardingRulesCommiter&lt;Meter&gt;
      */
-    public ForwardingRulesCommiter<Meter> getMeterCommiter();
+    ForwardingRulesCommiter<Meter> getMeterCommiter();
 
     /**
      * Content definition method and prevent code duplicity
      * @return ForwardingRulesCommiter&lt;Table&gt;
      */
-    public ForwardingRulesCommiter<TableFeatures> getTableFeaturesCommiter();
+    ForwardingRulesCommiter<TableFeatures> getTableFeaturesCommiter();
 
     /**
      * Content definition method
      * @return FlowNodeReconciliation
      */
-    public FlowNodeReconciliation getFlowNodeReconciliation();
+    FlowNodeReconciliation getFlowNodeReconciliation();
 
     /**
      * Returns the config-subsystem/fallback configuration of FRM
      * @return ForwardingRulesManagerConfig
      */
-    public ForwardingRulesManagerConfig getConfiguration();
+    ForwardingRulesManagerConfig getConfiguration();
 
     /**
      * Method checks if *this* instance of openflowplugin is owner of
      * the given openflow node.
      * @return True if owner, else false
      */
-    public boolean isNodeOwner(InstanceIdentifier<FlowCapableNode> ident);
+    boolean isNodeOwner(InstanceIdentifier<FlowCapableNode> ident);
 
     /**
      * Content definition method and prevent code duplicity
      * @return FlowNodeConnectorInventoryTranslatorImpl
      */
-    public FlowNodeConnectorInventoryTranslatorImpl getFlowNodeConnectorInventoryTranslatorImpl();
+    FlowNodeConnectorInventoryTranslatorImpl getFlowNodeConnectorInventoryTranslatorImpl();
 
 }
 

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/TableForwarder.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/TableForwarder.java
index 91603cb6df0f67153d48764ad212a2edbc13e7d4..4b25dd618ab2c20c3034a1f5c127a88fa0bd534b 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/TableForwarder.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/TableForwarder.java
@@ -117,7 +117,7 @@ public class TableForwarder extends AbstractListeningCommiter<TableFeatures> {
     }
 
     @Override
-    public Future<? extends RpcResult> add(
+    public Future<? extends RpcResult<?>> add(
         final InstanceIdentifier<TableFeatures> identifier,
         final TableFeatures addDataObj,
         final InstanceIdentifier<FlowCapableNode> nodeIdent) {
@@ -125,13 +125,15 @@ public class TableForwarder extends AbstractListeningCommiter<TableFeatures> {
     }
 
     @Override
-    public void createStaleMarkEntity(InstanceIdentifier<TableFeatures> identifier, TableFeatures del, InstanceIdentifier<FlowCapableNode> nodeIdent) {
+    public void createStaleMarkEntity(InstanceIdentifier<TableFeatures> identifier, TableFeatures del,
+            InstanceIdentifier<FlowCapableNode> nodeIdent) {
         LOG.debug("NO-OP");
 
     }
 
     @Override
-    public Future<? extends RpcResult> removeWithResult(InstanceIdentifier<TableFeatures> identifier, TableFeatures del, InstanceIdentifier<FlowCapableNode> nodeIdent) {
+    public Future<? extends RpcResult<?>> removeWithResult(InstanceIdentifier<TableFeatures> identifier,
+            TableFeatures del, InstanceIdentifier<FlowCapableNode> nodeIdent) {
         return null;
     }