Merge "Fix minor issues regarding checkstyle" into stable/boron

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 37f9899546ca769683ab814a9c20a2b44fca7ef6..8c80b15b03653c6d7c03a5e22f1d4d0e0ccaab3b 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,9 +28,7 @@ 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 {
-
-    private BulkOMaticUtils () { }
+public final class BulkOMaticUtils {
 
     public static final int DEFUALT_STATUS = FlowCounter.OperationStatus.INIT.status();
     public static final int DEFAULT_FLOW_COUNT = 0;
@@ -38,11 +36,14 @@ public class BulkOMaticUtils {
     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){
@@ -87,7 +88,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) {