Fix odlparent 3 Checkstyle issues

[groupbasedpolicy.git] / neutron-ovsdb / src / main / java / org / opendaylight / groupbasedpolicy / neutron / ovsdb / TerminationPointDataChangeListener.java

diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/TerminationPointDataChangeListener.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/TerminationPointDataChangeListener.java
index cb287fc2ce1c3fb16274a9901fd0613d9cad9e87..2cf2b78dfd96d2367b493c7c89e1109dc4e4e867 100755 (executable)
--- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/TerminationPointDataChangeListener.java
+++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/TerminationPointDataChangeListener.java
@@ -97,7 +97,7 @@ public class TerminationPointDataChangeListener implements DataTreeChangeListene
      * When vSwitch is deleted, we loose data in operational DS to determine Iid of
      * corresponding NodeId.
      */
-    private static final Map<InstanceIdentifier<OvsdbTerminationPointAugmentation>, NodeId> nodeIdByTerminPoint =
+    private static final Map<InstanceIdentifier<OvsdbTerminationPointAugmentation>, NodeId> NODE_ID_BY_TERMIN_POINT =
             new HashMap<>();
 
     @Override
@@ -112,14 +112,14 @@ public class TerminationPointDataChangeListener implements DataTreeChangeListene
                     OvsdbTerminationPointAugmentation updatedOvsdbTp = rootNode.getDataAfter();
                     OvsdbBridgeAugmentation ovsdbBridge = getOvsdbBridgeFromTerminationPoint(ovsdbTpIid, dataBroker);
                     if (origOvsdbTp == null) {
-                        nodeIdByTerminPoint.put(ovsdbTpIid,
+                        NODE_ID_BY_TERMIN_POINT.put(ovsdbTpIid,
                                 new NodeId(getInventoryNodeIdString(ovsdbBridge, ovsdbTpIid, dataBroker)));
                     }
 
                     processOvsdbBridge(ovsdbBridge, updatedOvsdbTp, ovsdbTpIid);
                     break;
                 case DELETE:
-                    processRemovedTp(nodeIdByTerminPoint.get(ovsdbTpIid), origOvsdbTp, ovsdbTpIid);
+                    processRemovedTp(NODE_ID_BY_TERMIN_POINT.get(ovsdbTpIid), origOvsdbTp, ovsdbTpIid);
                     break;
                 default:
                     break;
@@ -173,9 +173,8 @@ public class TerminationPointDataChangeListener implements DataTreeChangeListene
             ReadOnlyTransaction transaction = dataBroker.newReadOnlyTransaction();
             ep = lookupEndpoint(epKey, transaction);
             if (ep == null) {
-                LOG.warn(
-                        "TerminationPoint {} with external ID {} is in Neutron Map, but corresponding Endpoint {} isn't in Endpoint Repository",
-                        ovsdbTp, externalId, epKey);
+                LOG.warn("TerminationPoint {} with external ID {} is in Neutron Map, "
+                    + "but corresponding Endpoint {} isn't in Endpoint Repository", ovsdbTp, externalId, epKey);
                 return;
             }
             /*
@@ -191,7 +190,7 @@ public class TerminationPointDataChangeListener implements DataTreeChangeListene
                  * Check to see if we need to create a
                  * tunnel port on the parent node
                  */
-                createTunnelPorts(nodeIid, dataBroker);
+                createTunnelPorts(nodeIid);
             }
         } else {
             LOG.debug("TerminationPoint {} had no external ID, not processing for external ID.", ovsdbTp);
@@ -215,8 +214,8 @@ public class TerminationPointDataChangeListener implements DataTreeChangeListene
 
     /**
      * If removed termination point was a tunnel port,
-     * removes attached tunnels (namely Vxlan-type) from OVSDB bridge;
-     * else removes location info from TP
+     * removes attached tunnels (namely Vxlan-type) from OVSDB bridge,
+     * else removes location info from TP.
      *
      * @param nodeId {@link NodeId}
      * @param ovsdbTp {@link OvsdbTerminationPointAugmentation}
@@ -232,7 +231,7 @@ public class TerminationPointDataChangeListener implements DataTreeChangeListene
     }
 
     /**
-     * Delete location on EP for given TP
+     * Delete location on EP for given TP.
      *
      * @param ovsdbTp {@link OvsdbTerminationPointAugmentation}
      */
@@ -248,9 +247,8 @@ public class TerminationPointDataChangeListener implements DataTreeChangeListene
             Endpoint ep = lookupEndpoint(epKey, readOnlyTransaction);
             readOnlyTransaction.close();
             if (ep == null) {
-                LOG.warn(
-                        "TerminationPoint {} with external ID {} is in Neutron Map, but corresponding Endpoint {} isn't in Endpoint Repository.",
-                        ovsdbTp, externalId, epKey);
+                LOG.warn("TerminationPoint {} with external ID {} is in Neutron Map,"
+                    + " but corresponding Endpoint {} isn't in Endpoint Repository.", ovsdbTp, externalId, epKey);
                 return;
             }
             updateEndpointRemoveLocation(ep, dataBroker.newReadWriteTransaction());
@@ -288,7 +286,7 @@ public class TerminationPointDataChangeListener implements DataTreeChangeListene
      *
      * @return true if it's a required tunnel port, false if it isn't
      */
-    private boolean isTunnelPort(OvsdbTerminationPointAugmentation ovsdbTp,
+    private static boolean isTunnelPort(OvsdbTerminationPointAugmentation ovsdbTp,
             List<AbstractTunnelType> requiredTunnelTypes) {
         if (ovsdbTp.getInterfaceType() != null) {
             for (AbstractTunnelType tunnelType : requiredTunnelTypes) {
@@ -327,9 +325,8 @@ public class TerminationPointDataChangeListener implements DataTreeChangeListene
      * create them.
      *
      * @param nodeIid {@link InstanceIdentifier}
-     * @param dataBroker {@link DataBroker}
      */
-    private void createTunnelPorts(InstanceIdentifier<Node> nodeIid, DataBroker dataBroker) {
+    private void createTunnelPorts(InstanceIdentifier<Node> nodeIid) {
 
         Node node = getTopologyNode(nodeIid, dataBroker);
         checkNotNull(node);