Enforce modernizer in openflowjava-extension-nicira

We have just a few violations, fix them and flip enforcement on.

Change-Id: I3ee63fa565b6b5c8bfa0a63d2596947806433d7a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/extension/openflowjava-extension-nicira/pom.xml b/extension/openflowjava-extension-nicira/pom.xml
index f1c47e6c262728f05e5fbfc748cc3e0e5b156661..da691fdcaa9835e0ab79d1010688984a97e40ec8 100644 (file)
--- a/extension/openflowjava-extension-nicira/pom.xml
+++ b/extension/openflowjava-extension-nicira/pom.xml
@@ -10,11 +10,6 @@
     <artifactId>openflowjava-extension-nicira</artifactId>
     <packaging>bundle</packaging>
 
-    <properties>
-        <!-- FIXME: Remove this -->
-        <odlparent.modernizer.enforce>false</odlparent.modernizer.enforce>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}.openflowjava</groupId>

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 e42df116520b0c7d1afd6aa35363ddac65adfd07..37552873dadb001b9f49dc5e25b9699686038a3a 100644 (file)
--- 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
@@ -5,10 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowjava.nx;
 
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import org.opendaylight.openflowjava.nx.api.NiciraExtensionCodecRegistrator;
 import org.opendaylight.openflowjava.nx.codec.action.ConntrackCodec;
 import org.opendaylight.openflowjava.nx.codec.action.CtClearCodec;
@@ -71,8 +71,8 @@ import org.opendaylight.openflowjava.nx.codec.match.UdpSrcCodec;
 public class NiciraExtensionsRegistrator implements AutoCloseable {
     private final NiciraExtensionCodecRegistrator registrator;
 
-    public NiciraExtensionsRegistrator(NiciraExtensionCodecRegistrator registrator) {
-        this.registrator = Preconditions.checkNotNull(registrator);
+    public NiciraExtensionsRegistrator(final NiciraExtensionCodecRegistrator registrator) {
+        this.registrator = requireNonNull(registrator);
 
         registrator.registerActionDeserializer(RegLoadCodec.DESERIALIZER_KEY, NiciraActionCodecs.REG_LOAD_CODEC);
         registrator.registerActionSerializer(RegLoadCodec.SERIALIZER_KEY, NiciraActionCodecs.REG_LOAD_CODEC);

diff --git a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NxmHeader.java b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NxmHeader.java
index 3e91ba81c7b5c823040420ac83c47fc2085fbcc9..13452259deb9b7e4760b40e51511ec140dad3ee0 100644 (file)
--- a/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NxmHeader.java
+++ b/extension/openflowjava-extension-nicira/src/main/java/org/opendaylight/openflowjava/nx/codec/match/NxmHeader.java
@@ -8,7 +8,6 @@
 package org.opendaylight.openflowjava.nx.codec.match;
 
 import com.google.common.base.MoreObjects;
-import com.google.common.primitives.Ints;
 import java.math.BigInteger;
 import java.util.Objects;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
@@ -41,7 +40,7 @@ public class NxmHeader {
      * @param header the header as {@code BigInteger}.
      * @see NxmHeader#NxmHeader(long)
      */
-    public NxmHeader(Uint64 header) {
+    public NxmHeader(final Uint64 header) {
         this.headerAsLong = header.longValue();
         if (isExperimenter(header)) {
             this.experimenterId = (int) this.headerAsLong;
@@ -52,10 +51,14 @@ public class NxmHeader {
         }
 
         this.header = header;
-        this.oxmClass = Ints.checkedCast(extractSub(this.shortHeader, 16, 16));
-        this.nxmField = Ints.checkedCast(extractSub(this.shortHeader, 7, 9));
-        this.hasMask = extractSub(this.shortHeader, 1, 8) == 1;
-        this.length = Ints.checkedCast(extractSub(this.shortHeader, 8, 0));
+        try {
+            this.oxmClass = Math.toIntExact(extractSub(this.shortHeader, 16, 16));
+            this.nxmField = Math.toIntExact(extractSub(this.shortHeader, 7, 9));
+            this.hasMask = extractSub(this.shortHeader, 1, 8) == 1;
+            this.length = Math.toIntExact(extractSub(this.shortHeader, 8, 0));
+        } catch (ArithmeticException e) {
+            throw new IllegalArgumentException(e);
+        }
     }
 
     /**
@@ -67,7 +70,7 @@ public class NxmHeader {
      *
      * @param header the header as a {@code long}.
      */
-    public NxmHeader(long header) {
+    public NxmHeader(final long header) {
         this(Uint64.fromLongBits(header));
     }
 
@@ -79,7 +82,7 @@ public class NxmHeader {
      * @param hasMask the hasMask field.
      * @param length the length field.
      */
-    public NxmHeader(int oxmClass, int nxmField, boolean hasMask, int length) {
+    public NxmHeader(final int oxmClass, final int nxmField, final boolean hasMask, final int length) {
         this(oxmClass, nxmField, hasMask, length, -1);
     }
 
@@ -92,11 +95,12 @@ public class NxmHeader {
      * @param length the length field.
      * @param experimenterId the esperimenter id field.
      */
-    public NxmHeader(int nxmField, boolean hasMask, int length, long experimenterId) {
+    public NxmHeader(final int nxmField, final boolean hasMask, final int length, final long experimenterId) {
         this(EncodeConstants.EXPERIMENTER_VALUE, nxmField, hasMask, length, experimenterId);
     }
 
-    private NxmHeader(int oxmClass, int nxmField, boolean hasMask, int length, long experimenterId) {
+    private NxmHeader(final int oxmClass, final int nxmField, final boolean hasMask, final int length,
+            final long experimenterId) {
         this.oxmClass = oxmClass;
         this.nxmField = nxmField;
         this.hasMask = hasMask;
@@ -161,7 +165,7 @@ public class NxmHeader {
         return oxmClass == EncodeConstants.EXPERIMENTER_VALUE;
     }
 
-    public static boolean isExperimenter(Uint64 uint) {
+    public static boolean isExperimenter(final Uint64 uint) {
         return uint.longValue() >>> 48 == EncodeConstants.EXPERIMENTER_VALUE;
     }
 
@@ -171,7 +175,7 @@ public class NxmHeader {
     }
 
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (this == obj) {
             return true;
         }