Cleanup VersionMessageWrapper

Fields should really be final and the message buffer is not optional.

Change-Id: I2eda0fece1ac8ef1cb7337ff5f17f528455e2b4a
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageUdpWrapper.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageUdpWrapper.java
index c1625e5b073bcca538892527e4851f74f8bcf231..8f8d06413fb4f8ea19fd3744070651f01b8b83d6 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageUdpWrapper.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageUdpWrapper.java
@@ -9,7 +9,6 @@
 package org.opendaylight.openflowjava.protocol.impl.core;
 
 import io.netty.buffer.ByteBuf;
-
 import java.net.InetSocketAddress;
 
 /**
@@ -18,15 +17,14 @@ import java.net.InetSocketAddress;
  * @author michal.polkorab
  */
 public class VersionMessageUdpWrapper extends VersionMessageWrapper {
-
-    private InetSocketAddress address;
+    private final InetSocketAddress address;
 
     /**
      * @param version Openflow wire version
      * @param messageBuffer ByteBuf containing binary message
      * @param address sender address
      */
-    public VersionMessageUdpWrapper(short version, ByteBuf messageBuffer, InetSocketAddress address) {
+    public VersionMessageUdpWrapper(final short version, final ByteBuf messageBuffer, final InetSocketAddress address) {
         super(version, messageBuffer);
         this.address = address;
     }

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageWrapper.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageWrapper.java
index a61298de454f145cf1ff2115e97224ffa96dbc7c..cdbe419c92866c5d658e5757686ece3ea238b3c6 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageWrapper.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageWrapper.java
@@ -8,6 +8,7 @@
 
 package org.opendaylight.openflowjava.protocol.impl.core;
 
+import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 
 /**
@@ -15,18 +16,17 @@ import io.netty.buffer.ByteBuf;
  * @author michal.polkorab
  */
 public class VersionMessageWrapper {
-
-    private short version;
-    private ByteBuf messageBuffer;
+    private final short version;
+    private final ByteBuf messageBuffer;
 
     /**
      * Constructor
      * @param version version decoded in {@link OFVersionDetector}
      * @param messageBuffer message received from {@link OFFrameDecoder}
      */
-    public VersionMessageWrapper(short version, ByteBuf messageBuffer) {
+    public VersionMessageWrapper(final short version, final ByteBuf messageBuffer) {
         this.version = version;
-        this.messageBuffer = messageBuffer;
+        this.messageBuffer = Preconditions.checkNotNull(messageBuffer);
     }
 
     /**
@@ -42,6 +42,4 @@ public class VersionMessageWrapper {
     public ByteBuf getMessageBuffer() {
         return messageBuffer;
     }
-
-
 }