Merge "Bug 8535: Fix IPv6 OXMHeader Mask issue"

[openflowplugin.git] / applications / bulk-o-matic / src / main / java / org / opendaylight / openflowplugin / applications / bulk / o / matic / BulkOMaticUtils.java

diff --git a/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/BulkOMaticUtils.java b/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/BulkOMaticUtils.java
index 33e2f140bee52f554626d4948ef86df37ce717fc..8a750d56e397007ad085a199084f7d2f28d29302 100644 (file)
--- a/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/BulkOMaticUtils.java
+++ b/applications/bulk-o-matic/src/main/java/org/opendaylight/openflowplugin/applications/bulk/o/matic/BulkOMaticUtils.java
@@ -28,19 +28,23 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv4MatchBuilder;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-public class BulkOMaticUtils {
+public final class BulkOMaticUtils {
 
-    public final static int DEFUALT_STATUS = FlowCounter.OperationStatus.INIT.status();
-    public final static int DEFAULT_FLOW_COUNT = 0;
-    public final static long DEFAULT_COMPLETION_TIME = 0;
-    public final static String DEFAULT_UNITS = "ns";
-    public final static String DEVICE_TYPE_PREFIX = "openflow:";
+    public static final int DEFUALT_STATUS = FlowCounter.OperationStatus.INIT.status();
+    public static final int DEFAULT_FLOW_COUNT = 0;
+    public static final int DEFAULT_TABLE_COUNT = 0;
+    public static final long DEFAULT_COMPLETION_TIME = 0;
+    public static final String DEFAULT_UNITS = "ns";
+    public static final String DEVICE_TYPE_PREFIX = "openflow:";
+
+    private BulkOMaticUtils() {
+    }
 
     public static String ipIntToStr (int k) {
-        return new StringBuilder().append(((k >> 24) & 0xFF)).append(".")
-                .append(((k >> 16) & 0xFF)).append(".")
-                .append(((k >> 8) & 0xFF)).append(".")
-                .append((k & 0xFF)).append("/32").toString();
+        return new StringBuilder().append(k >> 24 & 0xFF).append(".")
+                .append(k >> 16 & 0xFF).append(".")
+                .append(k >> 8 & 0xFF).append(".")
+                .append(k & 0xFF).append("/32").toString();
     }
 
     public static Match getMatch(final Integer sourceIp){
@@ -85,7 +89,6 @@ public class BulkOMaticUtils {
                 .augmentation(FlowCapableNode.class)
                 .child(Table.class, new TableKey(tableId))
                 .build();
-
     }
 
     public static InstanceIdentifier<Flow> getFlowId(final InstanceIdentifier<Table> tablePath, final String flowId) {