Remove invalid annotations

@Nullable on primitive 'int' or 'byte' is invalid, remove it.

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

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractConnectionAdapter.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractConnectionAdapter.java
index 7544368d5bcdbb0113fd3099da4e2a71fcfe0b29..e32013396c631e843ae260c1bcb627e2c68f5c84 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractConnectionAdapter.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/AbstractConnectionAdapter.java
@@ -99,8 +99,8 @@ abstract class AbstractConnectionAdapter implements ConnectionAdapter {
     protected Cache<RpcResponseKey, ResponseExpectedRpcListener<?>> responseCache;
 
 
-    AbstractConnectionAdapter(@NonNull final Channel channel, @Nullable final InetSocketAddress address,
-                              @Nullable final int channelOutboundQueueSize) {
+    AbstractConnectionAdapter(final @NonNull Channel channel, final @Nullable InetSocketAddress address,
+                              final int channelOutboundQueueSize) {
         this.channel = requireNonNull(channel);
         this.address = address;
 

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/common/IpConversionUtil.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/common/IpConversionUtil.java
index 7dc896f3633c88841f78f8a1259d1d76a44f8838..1706ae10ef5596c57ebeafdf2f8a366c00c183a0 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/common/IpConversionUtil.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/common/IpConversionUtil.java
@@ -703,9 +703,8 @@ public final class IpConversionUtil {
         return netmask;
     }
 
-    @Nullable
     @SuppressFBWarnings("PZLA_PREFER_ZERO_LENGTH_ARRAYS")
-    public static byte[] convertArbitraryMaskToByteArray(final DottedQuad mask) {
+    public static byte @Nullable[] convertArbitraryMaskToByteArray(final DottedQuad mask) {
         final String maskValue;
         if (mask != null && mask.getValue() != null) {
             maskValue = mask.getValue();
@@ -756,9 +755,8 @@ public final class IpConversionUtil {
         return false;
     }
 
-    @Nullable
     @SuppressFBWarnings("PZLA_PREFER_ZERO_LENGTH_ARRAYS")
-    public static byte[] convertIpv6ArbitraryMaskToByteArray(final Ipv6ArbitraryMask mask) {
+    public static byte @Nullable[] convertIpv6ArbitraryMaskToByteArray(final Ipv6ArbitraryMask mask) {
         final String maskValue;
         if (mask != null && mask.getValue() != null) {
             maskValue = mask.getValue();

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorUtil.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorUtil.java
index f3282242e36ef60f7327e42d86dae3e0a0b527c5..9d569b2476aed451794d9b177d1b33045e2c8490 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorUtil.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorUtil.java
@@ -70,9 +70,8 @@ public final class MatchConvertorUtil {
      * @param addressParts the address parts
      * @return the byte [ ]
      */
-    @Nullable
     @SuppressFBWarnings("PZLA_PREFER_ZERO_LENGTH_ARRAYS")
-    public static byte[] extractIpv4Mask(final Iterator<String> addressParts) {
+    public static byte @Nullable[] extractIpv4Mask(final Iterator<String> addressParts) {
         final int prefix;
         if (addressParts.hasNext()) {
             int potentionalPrefix = Integer.parseInt(addressParts.next());

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/ByteUtil.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/ByteUtil.java
index 3ae218095730ee2421de912f7e4a6c7220e36c4c..1cd7370244b7adcebf8920041e5b50b4e3a2fe13 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/ByteUtil.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/ByteUtil.java
@@ -53,9 +53,9 @@ public final class ByteUtil {
      * @param numBytes convert to number of bytes
      * @return byte array containing n * 8 bits.
      */
-    @Nullable
     @SuppressFBWarnings("PZLA_PREFER_ZERO_LENGTH_ARRAYS")
-    public static byte[] convertBigIntegerToNBytes(@Nullable final BigInteger bigInteger, final int numBytes) {
+    public static byte @Nullable[] convertBigIntegerToNBytes(final @Nullable BigInteger bigInteger,
+            final int numBytes) {
         if (bigInteger == null) {
             return null;
         }
@@ -80,9 +80,8 @@ public final class ByteUtil {
      * @param uint Unsigned long, potentially null.
      * @return byte array, or null if input was null.
      */
-    @Nullable
     @SuppressFBWarnings("PZLA_PREFER_ZERO_LENGTH_ARRAYS")
-    public static byte[] uint64toBytes(@Nullable final Uint64 uint) {
+    public static byte @Nullable[] uint64toBytes(@Nullable final Uint64 uint) {
         return uint == null ? null : Longs.toByteArray(uint.longValue());
     }