Remove trailing whitespace

Trailing whitespace generates a lot of warnings -- mass-remove it.

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

diff --git a/openflow-protocol-api/pom.xml b/openflow-protocol-api/pom.xml
index 6b580791587347184e4d6f47ae0146125fdcc692..894173aadd005abf870934c5ecd25b126903675d 100644 (file)
--- a/openflow-protocol-api/pom.xml
+++ b/openflow-protocol-api/pom.xml
@@ -60,7 +60,7 @@
         </plugins>
         <pluginManagement>
             <plugins>
         </plugins>
         <pluginManagement>
             <plugins>

-                <!--This plugin's configuration is used to store Eclipse 
+                <!--This plugin's configuration is used to store Eclipse

                     m2e settings only. It has no influence on the Maven build itself. -->
                 <plugin>
                     <groupId>org.eclipse.m2e</groupId>
                     m2e settings only. It has no influence on the Maven build itself. -->
                 <plugin>
                     <groupId>org.eclipse.m2e</groupId>

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/ConnectionAdapter.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/ConnectionAdapter.java
index 50a85fbc806d415b8caabd7d2f3fe2170b332509..82b7a89667245fbf996d0de0d0d03cee9fbddbec 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/ConnectionAdapter.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/ConnectionAdapter.java
@@ -27,12 +27,12 @@ public interface ConnectionAdapter extends OpenflowProtocolService {
      * @return future set to true, when disconnect completed
      */
     Future<Boolean> disconnect();
      * @return future set to true, when disconnect completed
      */
     Future<Boolean> disconnect();

-    
+

     /**
      * @return true, if connection to switch is alive
      */
     boolean isAlive();
     /**
      * @return true, if connection to switch is alive
      */
     boolean isAlive();

-    
+

     /**
      * @return address of the remote end - address of a switch if connected
      */
     /**
      * @return address of the remote end - address of a switch if connected
      */


@@ -41,7 +41,7 @@ public interface ConnectionAdapter extends OpenflowProtocolService {
      * @param messageListener here will be pushed all messages from switch
      */
     void setMessageListener(OpenflowProtocolListener messageListener);
      * @param messageListener here will be pushed all messages from switch
      */
     void setMessageListener(OpenflowProtocolListener messageListener);

-    
+

     /**
      * @param systemListener here will be pushed all system messages from library
      */
     /**
      * @param systemListener here will be pushed all system messages from library
      */


@@ -58,7 +58,7 @@ public interface ConnectionAdapter extends OpenflowProtocolService {
     void fireConnectionReadyNotification();
 
     /**
     void fireConnectionReadyNotification();
 
     /**

-     * set listener for connection became ready-to-use event  
+     * set listener for connection became ready-to-use event

      * @param connectionReadyListener
      */
     void setConnectionReadyListener(ConnectionReadyListener connectionReadyListener);
      * @param connectionReadyListener
      */
     void setConnectionReadyListener(ConnectionReadyListener connectionReadyListener);

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/ConnectionConfiguration.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/ConnectionConfiguration.java
index 243f2d93c1d847c84887a0f3b9621236f71163cd..cfb042938e78823f5d80d44b6dd7ff909734b007 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/ConnectionConfiguration.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/ConnectionConfiguration.java
@@ -23,32 +23,32 @@ public interface ConnectionConfiguration {
      * @return address to bind, if null, all available interfaces will be used
      */
     InetAddress getAddress();
      * @return address to bind, if null, all available interfaces will be used
      */
     InetAddress getAddress();

-    
+

     /**
      * @return port to bind
      */
     int getPort();
     /**
      * @return port to bind
      */
     int getPort();

-    
+

     /**
      * @return transport protocol to use
      */
     Object getTransferProtocol();
     /**
      * @return transport protocol to use
      */
     Object getTransferProtocol();

-    
+

     /**
      * @return TLS configuration object
      */
     TlsConfiguration getTlsConfiguration();
     /**
      * @return TLS configuration object
      */
     TlsConfiguration getTlsConfiguration();

-    
+

     /**
     /**

-     * @return silence time (in milliseconds) - after this time {@link SwitchIdleEvent} message is sent upstream 
+     * @return silence time (in milliseconds) - after this time {@link SwitchIdleEvent} message is sent upstream

      */
     long getSwitchIdleTimeout();
      */
     long getSwitchIdleTimeout();

-    
+

     /**
      * @return seed for {@link SSLEngine}
      */
     Object getSslContext();
     /**
      * @return seed for {@link SSLEngine}
      */
     Object getSslContext();

-    
+

     /**
      * @return thread numbers for TcpHandler's eventloopGroups
      */
     /**
      * @return thread numbers for TcpHandler's eventloopGroups
      */

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/ListeningStatusProvider.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/ListeningStatusProvider.java
index 6de6675b98323b213814b1256136d7d134f780dd..f54b7c2c0a5d2f2503269b88296053d3a6264931 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/ListeningStatusProvider.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/ListeningStatusProvider.java
@@ -17,7 +17,7 @@ import java.util.concurrent.Future;
 public interface ListeningStatusProvider {
 
     /**
 public interface ListeningStatusProvider {
 
     /**

-     * @return future holding startup result of all library instances under plugin's control 
+     * @return future holding startup result of all library instances under plugin's control

      */
     Future<Boolean> isOnline();
 
      */
     Future<Boolean> isOnline();
 

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/StatisticsConfiguration.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/StatisticsConfiguration.java
index e5b25d4075662d6de312170907f895c97efc0351..daf870690b0f174e005ef8449ff140c977645734 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/StatisticsConfiguration.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/StatisticsConfiguration.java
@@ -10,7 +10,7 @@ package org.opendaylight.openflowjava.protocol.api.connection;
 
 /**
  * Used for StatisticsCounter configuration
 
 /**
  * Used for StatisticsCounter configuration

- * 
+ *

  * @author madamjak
  */
 public interface StatisticsConfiguration {
  * @author madamjak
  */
 public interface StatisticsConfiguration {

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/SwitchConnectionHandler.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/SwitchConnectionHandler.java
index c5f26fc1985b2adc2a46dc018a0f3fe89e4f4156..363e324504c7a6e89f9a5e9d4081c0c1c45dbf7b 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/SwitchConnectionHandler.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/SwitchConnectionHandler.java
@@ -17,12 +17,12 @@ import java.net.InetAddress;
  *
  */
 public interface SwitchConnectionHandler {
  *
  */
 public interface SwitchConnectionHandler {

-    
+

     /**
      * @param connection to switch proving message sending/receiving, connection management
      */
     void onSwitchConnected(ConnectionAdapter connection);
     /**
      * @param connection to switch proving message sending/receiving, connection management
      */
     void onSwitchConnected(ConnectionAdapter connection);

-    
+

     /**
      * @param switchAddress
      * @return true, if connection from switch having given address shell be accepted; false otherwise
     /**
      * @param switchAddress
      * @return true, if connection from switch having given address shell be accepted; false otherwise

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/TlsConfiguration.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/TlsConfiguration.java
index 84eeab3ea1af8c7e94212d2f32732119fec487e4..6676dd02426796c316b17242c9f9a633a3b25e14 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/TlsConfiguration.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/connection/TlsConfiguration.java
@@ -22,17 +22,17 @@ public interface TlsConfiguration {
      * @return keystore location
      */
     String getTlsKeystore();
      * @return keystore location
      */
     String getTlsKeystore();

-    
+

     /**
      * @return keystore type
      */
     KeystoreType getTlsKeystoreType();
     /**
      * @return keystore type
      */
     KeystoreType getTlsKeystoreType();

-    
+

     /**
      * @return truststore location
      */
     String getTlsTruststore();
     /**
      * @return truststore location
      */
     String getTlsTruststore();

-    
+

     /**
      * @return truststore type
      */
     /**
      * @return truststore type
      */

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/DeserializerExtensionProvider.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/DeserializerExtensionProvider.java
index f8f3c1b31bbe2977473159e2bf216456dc9fe6c8..516113b8e7989dc81ef7f96ed71dea08350b351b 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/DeserializerExtensionProvider.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/DeserializerExtensionProvider.java
@@ -25,7 +25,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
  * instructions, match entries, ... ) which are differentiated by
  * vendor / experimenter subtype, vendor has to switch / choose between
  * these subtypes. <br />
  * instructions, match entries, ... ) which are differentiated by
  * vendor / experimenter subtype, vendor has to switch / choose between
  * these subtypes. <br />

- * 
+ *

  * This has to be done in this way because of experimenter headers, which
  * provide only vendor / experimenter ID. Subtype position may be different
  * for different vendors (or not present at all) - that's why vendor has to
  * This has to be done in this way because of experimenter headers, which
  * provide only vendor / experimenter ID. Subtype position may be different
  * for different vendors (or not present at all) - that's why vendor has to

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/DeserializerRegistry.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/DeserializerRegistry.java
index 3b647a4926f819b4a124fc9637ef216da97f33a7..aa92ea087e4d0a24f6c5d16240c95dbfacae3478 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/DeserializerRegistry.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/DeserializerRegistry.java
@@ -30,10 +30,10 @@ public interface DeserializerRegistry {
      * Registers deserializer.
      * Throws IllegalStateException when there is
      * a deserializer already registered under given key.
      * Registers deserializer.
      * Throws IllegalStateException when there is
      * a deserializer already registered under given key.

-     * 
+     *

      * If the deserializer implements {@link DeserializerRegistryInjector} interface,
      * the deserializer is injected with DeserializerRegistry instance.
      * If the deserializer implements {@link DeserializerRegistryInjector} interface,
      * the deserializer is injected with DeserializerRegistry instance.

-     * 
+     *

      * @param key used for deserializer lookup
      * @param deserializer deserializer instance
      */
      * @param key used for deserializer lookup
      * @param deserializer deserializer instance
      */

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKey.java
index c0f17c6a8f71d07a9479549020ba129c109eac58..1f98721807068dee4042ca434ad73c75438b07fe 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKey.java
@@ -35,7 +35,7 @@ public class EnhancedMessageTypeKey<E, F> extends MessageTypeKey<E> {
         result = prime * result + ((msgType2 == null) ? 0 : msgType2.hashCode());
         return result;
     }
         result = prime * result + ((msgType2 == null) ? 0 : msgType2.hashCode());
         return result;
     }

-    
+

     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/HeaderDeserializer.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/HeaderDeserializer.java
index 855b2f69c71db6fd47298e0630031bf4cbf19ad6..1d105f39c85ec19d375afa3f884161a2561b5034 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/HeaderDeserializer.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/HeaderDeserializer.java
@@ -13,13 +13,13 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 
 /**
  * @author michal.polkorab
 
 /**
  * @author michal.polkorab

- * @param <E> 
+ * @param <E>

  */
 public interface HeaderDeserializer<E extends DataObject> extends OFGeneralDeserializer {
 
     /**
      * Deserializes byte message headers
  */
 public interface HeaderDeserializer<E extends DataObject> extends OFGeneralDeserializer {
 
     /**
      * Deserializes byte message headers

-     * 
+     *

      * @param rawMessage message as bytes in ByteBuf
      * @return POJO/DTO
      */
      * @param rawMessage message as bytes in ByteBuf
      * @return POJO/DTO
      */

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageTypeKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageTypeKey.java
index 2e1d01890e084d1253bd1a637aa957f9dccb0655..bf45cd105112e557521eb18ccefdaa4d59146ef3 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageTypeKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageTypeKey.java
@@ -19,7 +19,7 @@ public class MessageTypeKey<E> {
 
     private final Class<? extends E> msgType;
     private final short msgVersion;
 
     private final Class<? extends E> msgType;
     private final short msgVersion;

-    
+

     /**
      * @param msgVersion protocol version
      * @param msgType type of message - class of serialized object
     /**
      * @param msgVersion protocol version
      * @param msgType type of message - class of serialized object


@@ -28,7 +28,7 @@ public class MessageTypeKey<E> {
         this.msgType = msgType;
         this.msgVersion = msgVersion;
     }
         this.msgType = msgType;
         this.msgVersion = msgVersion;
     }

-    
+

     @Override
     public String toString() {
         return "msgVersion: " + msgVersion + " objectType: " + msgType.getName();
     @Override
     public String toString() {
         return "msgVersion: " + msgVersion + " objectType: " + msgType.getName();

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/OFDeserializer.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/OFDeserializer.java
index 25a04ac312645a4471f71c86ef5796d9a3a78b57..a49d84c3a588cd58a319daf842cf7199a8bca18f 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/OFDeserializer.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/OFDeserializer.java
@@ -22,7 +22,7 @@ public interface OFDeserializer<E extends DataObject> extends OFGeneralDeseriali
 
     /**
      * Transforms byte message into POJO/DTO (of type E).
 
     /**
      * Transforms byte message into POJO/DTO (of type E).

-     * 
+     *

      * @param message message as bytes in ByteBuf
      * @return POJO/DTO
      */
      * @param message message as bytes in ByteBuf
      * @return POJO/DTO
      */

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/SerializerExtensionProvider.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/SerializerExtensionProvider.java
index b5bb0c2c49c6f423ed866b14e31f8b3dd419e163..f4325cff1af92b7d84f099d7e9a2f82e43aee0ce 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/SerializerExtensionProvider.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/SerializerExtensionProvider.java
@@ -27,7 +27,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
  * instructions, match entries, ... ) which are differentiated by
  * vendor / experimenter subtype, vendor has to switch / choose between
  * these subtypes. <br />
  * instructions, match entries, ... ) which are differentiated by
  * vendor / experimenter subtype, vendor has to switch / choose between
  * these subtypes. <br />

- * 
+ *

  * This has to be done in this way because of unknown augmentations
  * - that's why vendor has to handle it in his own implementations.
  * @author michal.polkorab
  * This has to be done in this way because of unknown augmentations
  * - that's why vendor has to handle it in his own implementations.
  * @author michal.polkorab

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/SerializerRegistry.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/SerializerRegistry.java
index 3014191158ad4109af4d59136bd34c6e3a0de117..eaa52c3d2f5a4efb9be1cc23934aebc5098c0c48 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/SerializerRegistry.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/extensibility/SerializerRegistry.java
@@ -11,7 +11,7 @@ package org.opendaylight.openflowjava.protocol.api.extensibility;
 
 
 /**
 
 
 /**

- * Stores and handles serializers 
+ * Stores and handles serializers

  * @author michal.polkorab
  *
  */
  * @author michal.polkorab
  *
  */


@@ -26,17 +26,17 @@ public interface SerializerRegistry {
      * @param msgTypeKey lookup key
      * @return serializer or NullPointerException if no serializer was found
      */
      * @param msgTypeKey lookup key
      * @return serializer or NullPointerException if no serializer was found
      */

-    <KEYTYPE, SERIALIZERTYPE extends OFGeneralSerializer> SERIALIZERTYPE 
+    <KEYTYPE, SERIALIZERTYPE extends OFGeneralSerializer> SERIALIZERTYPE

         getSerializer(MessageTypeKey<KEYTYPE> msgTypeKey);
 
     /**
      * Registers serializer
      * Throws IllegalStateException when there is
      * a serializer already registered under given key.
         getSerializer(MessageTypeKey<KEYTYPE> msgTypeKey);
 
     /**
      * Registers serializer
      * Throws IllegalStateException when there is
      * a serializer already registered under given key.

-     * 
+     *

      * If the serializer implements {@link SerializerRegistryInjector} interface,
      * the serializer is injected with SerializerRegistry instance.
      * If the serializer implements {@link SerializerRegistryInjector} interface,
      * the serializer is injected with SerializerRegistry instance.

-     * 
+     *

      * @param key used for serializer lookup
      * @param serializer serializer implementation
      */
      * @param key used for serializer lookup
      * @param serializer serializer implementation
      */

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKey.java
index f7ebcb3c25e86bdbbce4d56af6fd90fe7a22ad87..cb08cd92bbe53e4b5f3b855287b11bf942928bde 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKey.java
@@ -21,7 +21,7 @@ public class InstructionDeserializerKey extends MessageCodeKey {
     /**
      * @param version protocol wire version
      * @param type instruction type
     /**
      * @param version protocol wire version
      * @param type instruction type

-     * @param experimenterId 
+     * @param experimenterId

      */
     public InstructionDeserializerKey(short version, int type,
             Long experimenterId) {
      */
     public InstructionDeserializerKey(short version, int type,
             Long experimenterId) {

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionDeserializerKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionDeserializerKey.java
index 3b599b43430ea994a76d0a40ea531d21be33ef62..cbb236329a262e5ffc3e4bf3f538b136f906b51b 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionDeserializerKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionDeserializerKey.java
@@ -15,7 +15,7 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
  * @author michal.polkorab
  *
  */
  * @author michal.polkorab
  *
  */

-public final class ExperimenterActionDeserializerKey extends ActionDeserializerKey 
+public final class ExperimenterActionDeserializerKey extends ActionDeserializerKey

         implements ExperimenterDeserializerKey {
 
     /**
         implements ExperimenterDeserializerKey {
 
     /**

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKey.java
index e5c9c8063e8eb234521fd18e88915573490c9cdd..eef5f1065a69a89b4165f8a743fd1549c5e985cc 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKey.java
@@ -15,7 +15,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev1
 /**
  * @author michal.polkorab
  */
 /**
  * @author michal.polkorab
  */

-public final class ExperimenterActionSerializerKey extends ActionSerializerKey<Experimenter> 
+public final class ExperimenterActionSerializerKey extends ActionSerializerKey<Experimenter>

         implements ExperimenterSerializerKey {
 
     private Class<? extends ExperimenterActionSubType> actionSubType;
         implements ExperimenterSerializerKey {
 
     private Class<? extends ExperimenterActionSubType> actionSubType;

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdDeserializerKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdDeserializerKey.java
index cb00362e068c8d727235e58527a25d2345e54e8e..cafde3792d1f25b7296cf1c4baa7d3b6e8144695 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdDeserializerKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdDeserializerKey.java
@@ -16,7 +16,7 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
  * @author michal.polkorab
  *
  */
  * @author michal.polkorab
  *
  */

-public final class ExperimenterIdDeserializerKey extends MessageCodeKey 
+public final class ExperimenterIdDeserializerKey extends MessageCodeKey

         implements ExperimenterDeserializerKey {
 
     private Long experimenterId;
         implements ExperimenterDeserializerKey {
 
     private Long experimenterId;


@@ -32,7 +32,7 @@ public final class ExperimenterIdDeserializerKey extends MessageCodeKey
         this.experimenterId = experimenterId;
     }
 
         this.experimenterId = experimenterId;
     }
 

-    
+

     @Override
     public int hashCode() {
         final int prime = 31;
     @Override
     public int hashCode() {
         final int prime = 31;

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterInstructionDeserializerKey.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterInstructionDeserializerKey.java
index b15a11732f8b17bfb2f5b09d1b8b744339411189..5abe45ee920192b7b1fda6a94b0e17dbd02bfc08 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterInstructionDeserializerKey.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterInstructionDeserializerKey.java
@@ -20,7 +20,7 @@ public final class ExperimenterInstructionDeserializerKey extends InstructionDes
 
     /**
      * @param version protocol wire version
 
     /**
      * @param version protocol wire version

-     * @param experimenterId 
+     * @param experimenterId

      */
     public ExperimenterInstructionDeserializerKey(short version, Long experimenterId) {
         super(version, EncodeConstants.EXPERIMENTER_VALUE, experimenterId);
      */
     public ExperimenterInstructionDeserializerKey(short version, Long experimenterId) {
         super(version, EncodeConstants.EXPERIMENTER_VALUE, experimenterId);

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/util/BinContent.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/util/BinContent.java
index 171a684d2c237c84137c4e51965fd3a2f47ad87b..aa322f915815548ccc7e2f5d90611f7509ab07c4 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/util/BinContent.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/util/BinContent.java
@@ -21,7 +21,7 @@ public abstract class BinContent {
     public static long intToUnsignedLong(int value) {
         return value & 0x00000000ffffffffL;
     }
     public static long intToUnsignedLong(int value) {
         return value & 0x00000000ffffffffL;
     }

-    
+

     /**
      * @param value
      * @return long cut into int
     /**
      * @param value
      * @return long cut into int

diff --git a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/util/EncodeConstants.java b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/util/EncodeConstants.java
index bbd881e2a0ddd67f00c6a98f138242c6bc3754d8..cf857285ee8831ca660ea5eacbc35b412a3aac92 100644 (file)
--- a/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/util/EncodeConstants.java
+++ b/openflow-protocol-api/src/main/java/org/opendaylight/openflowjava/protocol/api/util/EncodeConstants.java
@@ -26,7 +26,7 @@ public abstract class EncodeConstants {
     public static final int OFHEADER_SIZE = 8;
     /** Zero length - used when the length is updated later */
     public static final int EMPTY_LENGTH = 0;
     public static final int OFHEADER_SIZE = 8;
     /** Zero length - used when the length is updated later */
     public static final int EMPTY_LENGTH = 0;

-    
+

     /** Length of mac address */
     public static final byte MAC_ADDRESS_LENGTH = 6;
     /** Number of groups in ipv4 address */
     /** Length of mac address */
     public static final byte MAC_ADDRESS_LENGTH = 6;
     /** Number of groups in ipv4 address */

diff --git a/openflow-protocol-api/src/main/yang/openflow-action.yang b/openflow-protocol-api/src/main/yang/openflow-action.yang
index 482c122803fc6d01193829351ecdc95efd56edf5..0f579fa0bbb984dc3d0f8de39034e14560e2ac02 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-action.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-action.yang
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

- 
+

  module openflow-action {
     namespace "urn:opendaylight:openflow:common:action";
     prefix "ofaction";
  module openflow-action {
     namespace "urn:opendaylight:openflow:common:action";
     prefix "ofaction";


@@ -92,7 +92,7 @@
     container actions-container {
         uses actions-grouping;
     }
     container actions-container {
         uses actions-grouping;
     }

-    
+

     grouping actions-grouping {
         list action {
             config false;
     grouping actions-grouping {
         list action {
             config false;


@@ -103,7 +103,7 @@
             }
         }
     }
             }
         }
     }

-    
+

     // OF1.0 structures
     identity set_vlan_vid {
         description "Set the 802.1q VLAN id (OF v1.0).";
     // OF1.0 structures
     identity set_vlan_vid {
         description "Set the 802.1q VLAN id (OF v1.0).";

diff --git a/openflow-protocol-api/src/main/yang/openflow-augments.yang b/openflow-protocol-api/src/main/yang/openflow-augments.yang
index 9a5454165f7df43254e7f109d4d1e9e44da6edee..229d5f5ab9444d05c416c86e48e9a50183e2c3a1 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-augments.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-augments.yang
@@ -5,11 +5,11 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

- 
+

  module openflow-augments {
     namespace "urn:opendaylight:openflow:augments";
     prefix "aug";
  module openflow-augments {
     namespace "urn:opendaylight:openflow:augments";
     prefix "aug";

-    
+

     import yang-ext {prefix ext;}
     import ietf-inet-types {prefix inet;}
     import ietf-yang-types {prefix yang;}
     import yang-ext {prefix ext;}
     import ietf-inet-types {prefix inet;}
     import ietf-yang-types {prefix yang;}


@@ -21,8 +21,8 @@
     import openflow-extensible-match {prefix oxm;}
 
     revision "2013-10-02" {
     import openflow-extensible-match {prefix oxm;}
 
     revision "2013-10-02" {

-        description "OpenFlow 1.3 - augments model. 
-                    Please visit 
+        description "OpenFlow 1.3 - augments model.
+                    Please visit

                     https://wiki.opendaylight.org/view/File:OpenFlow_Protocol_Library_-_Project_documentation.pdf
                      - Augmentation Tables chapter";
     }
                     https://wiki.opendaylight.org/view/File:OpenFlow_Protocol_Library_-_Project_documentation.pdf
                      - Augmentation Tables chapter";
     }


@@ -354,7 +354,7 @@
              type oft:experimenter-id;
          }
      }
              type oft:experimenter-id;
          }
      }

-     
+

 // OFP_QUEUE_PROP AUGMENTS
      augment "/ofproto:queue-prop-container/ofproto:queue-property" {
          ext:augment-identifier "rate-queue-property";
 // OFP_QUEUE_PROP AUGMENTS
      augment "/ofproto:queue-prop-container/ofproto:queue-property" {
          ext:augment-identifier "rate-queue-property";


@@ -368,7 +368,7 @@
              type oft:experimenter-id;
          }
      }
              type oft:experimenter-id;
          }
      }

-     
+

 // OFP_ERROR_AUGMENTS (only experimenter till OpenFlow v1.3)
      augment "/ofproto:error-message" {
          ext:augment-identifier "experimenter-id-error";
 // OFP_ERROR_AUGMENTS (only experimenter till OpenFlow v1.3)
      augment "/ofproto:error-message" {
          ext:augment-identifier "experimenter-id-error";

diff --git a/openflow-protocol-api/src/main/yang/openflow-configuration.yang b/openflow-protocol-api/src/main/yang/openflow-configuration.yang
index 38d8d58b26e2cd51acc651d922bc39c98c88a47c..790a151b6bae6cb6bdc56e0e93e4f2cdf43aaad8 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-configuration.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-configuration.yang
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

- 
+

  module openflow-configuration {
     namespace "urn:opendaylight:openflow:config";
     prefix "of-config";
  module openflow-configuration {
     namespace "urn:opendaylight:openflow:config";
     prefix "of-config";


@@ -17,11 +17,11 @@
     typedef path-type {
         type enumeration {
             enum CLASSPATH {
     typedef path-type {
         type enumeration {
             enum CLASSPATH {

-                value 0; 
+                value 0;

                 description "Keystore file is located on classpath.";
             }
             enum PATH {
                 description "Keystore file is located on classpath.";
             }
             enum PATH {

-                value 1; 
+                value 1;

                 description "Keystore file is located on absolute or relative path.";
             }
         }
                 description "Keystore file is located on absolute or relative path.";
             }
         }


@@ -30,11 +30,11 @@
     typedef keystore-type {
         type enumeration {
             enum JKS {
     typedef keystore-type {
         type enumeration {
             enum JKS {

-                value 0; 
+                value 0;

                 description "Keystore type - JKS.";
             }
             enum PKCS12 {
                 description "Keystore type - JKS.";
             }
             enum PKCS12 {

-                value 1; 
+                value 1;

                 description "Keystore type - PKCS12.";
             }
         }
                 description "Keystore type - PKCS12.";
             }
         }

diff --git a/openflow-protocol-api/src/main/yang/openflow-extensible-match.yang b/openflow-protocol-api/src/main/yang/openflow-extensible-match.yang
index e265eb0991ae43b4b7d90fc9f7b832fa60a99c51..e1f5514faf74c001962da2aa9856061a62fc3a53 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-extensible-match.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-extensible-match.yang
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

- 
+

  module openflow-extensible-match {
     namespace "urn:opendaylight:openflow:oxm";
     prefix "oxm";
  module openflow-extensible-match {
     namespace "urn:opendaylight:openflow:oxm";
     prefix "oxm";


@@ -19,12 +19,12 @@
     }
 
     identity oxm-match-type {
     }
 
     identity oxm-match-type {

-        description 
+        description

            "The OpenFlow Extensible Match type must be supported by all OpenFlow
             switches.";
         base oft:match-type-base;
     }
            "The OpenFlow Extensible Match type must be supported by all OpenFlow
             switches.";
         base oft:match-type-base;
     }

-    
+

     // oxm classes
         identity oxm-class-base {
             description "Base identity for OXM classes";
     // oxm classes
         identity oxm-class-base {
             description "Base identity for OXM classes";


@@ -43,7 +43,7 @@
             base oxm-class-base;
         }
         identity experimenter-class {
             base oxm-class-base;
         }
         identity experimenter-class {

-            description 
+            description

                 "Marks Experimenter match type class.
                 All experimenter match classes MUST use this class as a base.";
             base oxm-class-base;
                 "Marks Experimenter match type class.
                 All experimenter match classes MUST use this class as a base.";
             base oxm-class-base;


@@ -229,7 +229,7 @@
         container oxm-container {
             uses oxm-fields-grouping;
         }
         container oxm-container {
             uses oxm-fields-grouping;
         }

-        
+

         grouping oxm-fields-grouping {
             list match-entries {
                 description "OXM TLV-structures (Type Length Value)";
         grouping oxm-fields-grouping {
             list match-entries {
                 description "OXM TLV-structures (Type Length Value)";


@@ -246,7 +246,7 @@
                 }
                 leaf has-mask {
                     type boolean;
                 }
                 leaf has-mask {
                     type boolean;

-                } 
+                }

             }
         }
 
             }
         }
 


@@ -330,5 +330,5 @@
                 }
             }
         }
                 }
             }
         }

-        
+

 }
\ No newline at end of file
 }
\ No newline at end of file

diff --git a/openflow-protocol-api/src/main/yang/openflow-instruction.yang b/openflow-protocol-api/src/main/yang/openflow-instruction.yang
index 80f74a83be14b50e68af104e8bbd38ab3ae45d87..671556e104bc83a4e2503d31a2e4c3f62391049f 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-instruction.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-instruction.yang
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

- 
+

  module openflow-instruction {
     namespace "urn:opendaylight:openflow:common:instruction";
     prefix "ofinstruction";
  module openflow-instruction {
     namespace "urn:opendaylight:openflow:common:instruction";
     prefix "ofinstruction";

diff --git a/openflow-protocol-api/src/main/yang/openflow-protocol.yang b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
index 9330fac6fd5fbdd4f9f0305d7cbc8e5b33ca78a3..34f21818d6e55895b12dd0977a4b7d34d651d42d 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-protocol.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
@@ -5,13 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

- 
+

  module openflow-protocol {
     namespace "urn:opendaylight:openflow:protocol";
     prefix "ofproto";
 
     import ietf-yang-types {prefix yang;}
  module openflow-protocol {
     namespace "urn:opendaylight:openflow:protocol";
     prefix "ofproto";
 
     import ietf-yang-types {prefix yang;}

-    
+

     import openflow-types {prefix oft;}
     import openflow-extensible-match { prefix oxm;}
     import openflow-instruction { prefix ofinstruction;}
     import openflow-types {prefix oft;}
     import openflow-extensible-match { prefix oxm;}
     import openflow-instruction { prefix ofinstruction;}


@@ -55,7 +55,7 @@
             }
             leaf peer-features {
                 description "Features advertised by peer.";
             }
             leaf peer-features {
                 description "Features advertised by peer.";

-                type oft:port-features; 
+                type oft:port-features;

             }
             leaf curr-speed {
                 description "Current port bitrate in kbps.";
             }
             leaf curr-speed {
                 description "Current port bitrate in kbps.";


@@ -72,7 +72,7 @@
             leaf config-v10 {
                 type oft:port-config-v10;
             }
             leaf config-v10 {
                 type oft:port-config-v10;
             }

-            leaf state-v10 { 
+            leaf state-v10 {

                 type oft:port-state-v10;
             }
             leaf current-features-v10 {
                 type oft:port-state-v10;
             }
             leaf current-features-v10 {


@@ -87,9 +87,9 @@
                 description "Features supported by the port.";
                 type oft:port-features-v10;
             }
                 description "Features supported by the port.";
                 type oft:port-features-v10;
             }

-            leaf peer-features-v10 { 
+            leaf peer-features-v10 {

                 description "Features advertised by peer.";
                 description "Features advertised by peer.";

-                type oft:port-features-v10; 
+                type oft:port-features-v10;

             }
         }
 
             }
         }
 


@@ -121,7 +121,7 @@
 
                 uses ofaction:actions-grouping;
             }
 
                 uses ofaction:actions-grouping;
             }

-            
+

         container table-features-properties-container {
             uses table-features-properties-grouping;
         }
         container table-features-properties-container {
             uses table-features-properties-grouping;
         }


@@ -159,10 +159,10 @@
                 reference "OFPT_HELLO message in Openflow Switch 1.3 Spec";
                 /* Symmetric message */
                 uses ofHeader;
                 reference "OFPT_HELLO message in Openflow Switch 1.3 Spec";
                 /* Symmetric message */
                 uses ofHeader;

-                
+

                 list elements {
                     uses ofHelloElementHeader;
                 list elements {
                     uses ofHelloElementHeader;

-                    
+

                     leaf-list version-bitmap {
                         type boolean;
                     }
                     leaf-list version-bitmap {
                         type boolean;
                     }


@@ -172,7 +172,7 @@
                 reference "OFPT_ERROR message in Openflow Switch 1.3 Spec";
                 /* Symmetric message */
                 uses ofHeader;
                 reference "OFPT_ERROR message in Openflow Switch 1.3 Spec";
                 /* Symmetric message */
                 uses ofHeader;

-                
+

                 leaf type {
                     type uint16;
                 }
                 leaf type {
                     type uint16;
                 }


@@ -186,14 +186,14 @@
                     type string;
                 }
                 leaf data {
                     type string;
                 }
                 leaf data {

-                    type binary; 
+                    type binary;

                 }
             }
             grouping echo-request {
                 reference "OFPT_ECHO_REQUEST message in Openflow Switch 1.3 Spec";
                 /* Symmetric message */
                 uses ofHeader;
                 }
             }
             grouping echo-request {
                 reference "OFPT_ECHO_REQUEST message in Openflow Switch 1.3 Spec";
                 /* Symmetric message */
                 uses ofHeader;

-                
+

                 leaf data {
                     type binary;
                 }
                 leaf data {
                     type binary;
                 }


@@ -202,7 +202,7 @@
                 reference "OFPT_ECHO_REPLY message in Openflow Switch 1.3 Spec";
                 /* Symmetric message */
                 uses ofHeader;
                 reference "OFPT_ECHO_REPLY message in Openflow Switch 1.3 Spec";
                 /* Symmetric message */
                 uses ofHeader;

-                
+

                 leaf data {
                     type binary;
                 }
                 leaf data {
                     type binary;
                 }


@@ -211,7 +211,7 @@
                 reference "OFPT_EXPERIMENTER message in Openflow Switch 1.3 Spec";
                 /* Symmetric message */
                 uses ofHeader;
                 reference "OFPT_EXPERIMENTER message in Openflow Switch 1.3 Spec";
                 /* Symmetric message */
                 uses ofHeader;

-                
+

                 leaf experimenter {
                     type oft:experimenter-id;
                 }
                 leaf experimenter {
                     type oft:experimenter-id;
                 }


@@ -229,7 +229,7 @@
                 reference "OFPT_FEATURES_REPLY message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
                 uses ofHeader;
                 reference "OFPT_FEATURES_REPLY message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
                 uses ofHeader;

-                
+

                 leaf datapathId {
                     type uint64;
                 }
                 leaf datapathId {
                     type uint64;
                 }


@@ -268,7 +268,7 @@
                 reference "OFPT_GET_CONFIG_REPLY message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
                 uses ofHeader;
                 reference "OFPT_GET_CONFIG_REPLY message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
                 uses ofHeader;

-                
+

                 leaf flags {
                     type oft:switch-config-flag;
                 }
                 leaf flags {
                     type oft:switch-config-flag;
                 }


@@ -279,9 +279,9 @@
             grouping set-config {
                 reference "OFPT_SET_CONFIG message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
             grouping set-config {
                 reference "OFPT_SET_CONFIG message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */

-                
+

                 uses ofHeader;
                 uses ofHeader;

-                
+

                 leaf flags {
                     type oft:switch-config-flag;
                 }
                 leaf flags {
                     type oft:switch-config-flag;
                 }


@@ -293,9 +293,9 @@
             grouping packet-in {
                 reference "OFPT_PACKET_IN message in Openflow Switch 1.3 Spec";
                 /* Async message */
             grouping packet-in {
                 reference "OFPT_PACKET_IN message in Openflow Switch 1.3 Spec";
                 /* Async message */

-                
+

                 uses ofHeader;
                 uses ofHeader;

-                
+

                 leaf buffer-id {
                     // ID assigned by datapath.
                     type uint32;
                 leaf buffer-id {
                     // ID assigned by datapath.
                     type uint32;


@@ -305,7 +305,7 @@
                     type uint16;
                 }
                 leaf reason {
                     type uint16;
                 }
                 leaf reason {

-                    // Reason packet is being sent (one of OFPR_*) 
+                    // Reason packet is being sent (one of OFPR_*)

                     type oft:packet-in-reason;
                 }
                 leaf table-id {
                     type oft:packet-in-reason;
                 }
                 leaf table-id {


@@ -321,7 +321,7 @@
                 leaf data {
                     type binary;
                 }
                 leaf data {
                     type binary;
                 }

-                
+

                 // OF1.0 structures
                 leaf in-port {
                     type uint16;
                 // OF1.0 structures
                 leaf in-port {
                     type uint16;


@@ -331,7 +331,7 @@
                 reference "OFPT_FLOW_REMOVED message in Openflow Switch 1.3 Spec";
                 /* Async message */
                 uses ofHeader;
                 reference "OFPT_FLOW_REMOVED message in Openflow Switch 1.3 Spec";
                 /* Async message */
                 uses ofHeader;

-                
+

                 leaf cookie {
                     type uint64;
                 }
                 leaf cookie {
                     type uint64;
                 }


@@ -363,17 +363,17 @@
                     type uint64;
                 }
                 uses oxm:match-grouping;
                     type uint64;
                 }
                 uses oxm:match-grouping;

-                
+

                 // OF1.0 structures
                 uses oxm:match-v10-grouping;
                 // OF1.0 structures
                 uses oxm:match-v10-grouping;

-            } 
+            }

             grouping port-status {
                 reference "OFPT_PORT_STATUS message in Openflow Switch 1.3 Spec";
             grouping port-status {
                 reference "OFPT_PORT_STATUS message in Openflow Switch 1.3 Spec";

-                
+

                 uses ofHeader;
                 uses ofHeader;

-                
+

                 uses port-grouping;
                 uses port-grouping;

-                
+

                 leaf reason {
                     type oft:port-reason;
                 }
                 leaf reason {
                     type oft:port-reason;
                 }


@@ -382,11 +382,11 @@
             grouping packet-out {
                 reference "OFPT_PACKET_OUT message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
             grouping packet-out {
                 reference "OFPT_PACKET_OUT message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */

-                
+

                 uses ofHeader;
                 uses ofHeader;

-                
+

                 uses ofaction:actions-grouping;
                 uses ofaction:actions-grouping;

-                
+

                 leaf data {
                     type binary;
                 }
                 leaf data {
                     type binary;
                 }


@@ -396,13 +396,13 @@
                 leaf in-port {
                     type oft:port-number;
                 }
                 leaf in-port {
                     type oft:port-number;
                 }

-            } 
+            }

             grouping flow-mod {
                 reference "OFPT_FLOW_MOD message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
             grouping flow-mod {
                 reference "OFPT_FLOW_MOD message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */

-                
+

                 uses ofHeader;
                 uses ofHeader;

-                
+

                 leaf cookie {
                     type uint64;
                 }
                 leaf cookie {
                     type uint64;
                 }


@@ -437,22 +437,22 @@
                     type oft:flow-mod-flags;
                 }
                 uses oxm:match-grouping;
                     type oft:flow-mod-flags;
                 }
                 uses oxm:match-grouping;

-                
+

                 uses ofinstruction:instructions-grouping;
                 uses ofinstruction:instructions-grouping;

-                
+

                 // OF1.0 structures
                 leaf flags-v10 {
                     type oft:flow-mod-flags-v10;
                 }
                 uses oxm:match-v10-grouping;
                 uses ofaction:actions-grouping;
                 // OF1.0 structures
                 leaf flags-v10 {
                     type oft:flow-mod-flags-v10;
                 }
                 uses oxm:match-v10-grouping;
                 uses ofaction:actions-grouping;

-            } 
+            }

             grouping group-mod {
                 reference "OFPT_GROUP_MOD message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
             grouping group-mod {
                 reference "OFPT_GROUP_MOD message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */

-                
+

                 uses ofHeader;
                 uses ofHeader;

-                
+

                 leaf command {
                     type oft:group-mod-command;
                 }
                 leaf command {
                     type oft:group-mod-command;
                 }


@@ -462,25 +462,25 @@
                 leaf group-id {
                     type oft:group-id;
                 }
                 leaf group-id {
                     type oft:group-id;
                 }

-                
+

                 uses buckets-grouping;
             }
                 uses buckets-grouping;
             }

-            
+

             grouping port-mod {
                 reference "OFPT_PORT_MOD message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
 
                 uses ofHeader;
             grouping port-mod {
                 reference "OFPT_PORT_MOD message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
 
                 uses ofHeader;

-                
+

                 leaf port-no {
                     type oft:port-number;
                 }
                 leaf hw-address {
                     type yang:mac-address;
                 leaf port-no {
                     type oft:port-number;
                 }
                 leaf hw-address {
                     type yang:mac-address;

-                }       
+                }

                 leaf config {
                     type oft:port-config;
                 leaf config {
                     type oft:port-config;

-                }   
+                }

                 leaf mask {
                     type oft:port-config;
                 }
                 leaf mask {
                     type oft:port-config;
                 }


@@ -497,28 +497,28 @@
                 leaf advertise-v10 {
                     type oft:port-features-v10;
                 }
                 leaf advertise-v10 {
                     type oft:port-features-v10;
                 }

-            } 
+            }

             grouping table-mod {
                 reference "OFPT_TABLE_MOD message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
 
                 uses ofHeader;
             grouping table-mod {
                 reference "OFPT_TABLE_MOD message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
 
                 uses ofHeader;

-                
+

                 leaf table-id {
                     type oft:table-id;
                 }
                 leaf config {
                     type oft:table-config;
                 }
                 leaf table-id {
                     type oft:table-id;
                 }
                 leaf config {
                     type oft:table-config;
                 }

-            } 
-            
+            }
+

         /* Multipart messages. */
             grouping multipart-request {
                 reference "OFPT_MULTIPART_REQUEST message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
 
                 uses ofHeader;
         /* Multipart messages. */
             grouping multipart-request {
                 reference "OFPT_MULTIPART_REQUEST message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
 
                 uses ofHeader;

-                
+

                 leaf type {
                     type oft:multipart-type;
                 }
                 leaf type {
                     type oft:multipart-type;
                 }


@@ -551,7 +551,7 @@
                                 type uint64;
                             }
                             uses oxm:match-grouping;
                                 type uint64;
                             }
                             uses oxm:match-grouping;

-                            
+

                             // OF1.0 structures
                             uses oxm:match-v10-grouping;
                         }
                             // OF1.0 structures
                             uses oxm:match-v10-grouping;
                         }


@@ -574,7 +574,7 @@
                                 type uint64;
                             }
                             uses oxm:match-grouping;
                                 type uint64;
                             }
                             uses oxm:match-grouping;

-                            
+

                             // OF1.0 structures
                             uses oxm:match-v10-grouping;
                         }
                             // OF1.0 structures
                             uses oxm:match-v10-grouping;
                         }


@@ -683,13 +683,13 @@
                         }
                     }
                 }
                         }
                     }
                 }

-            } 
+            }

             grouping multipart-reply {
                 reference "OFPT_MULTIPART_REPLY message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
 
                 uses ofHeader;
             grouping multipart-reply {
                 reference "OFPT_MULTIPART_REPLY message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
 
                 uses ofHeader;

-                
+

                 leaf type {
                     type oft:multipart-type;
                 }
                 leaf type {
                     type oft:multipart-type;
                 }


@@ -750,9 +750,9 @@
                                     type uint64;
                                 }
                                 uses oxm:match-grouping;
                                     type uint64;
                                 }
                                 uses oxm:match-grouping;

-                                
+

                                 uses ofinstruction:instructions-grouping;
                                 uses ofinstruction:instructions-grouping;

-                                
+

                                 // OF1.0 structures
                                 uses oxm:match-v10-grouping;
                                 uses ofaction:actions-grouping;
                                 // OF1.0 structures
                                 uses oxm:match-v10-grouping;
                                 uses ofaction:actions-grouping;


@@ -787,7 +787,7 @@
                                 leaf matched-count {
                                     type uint64;
                                 }
                                 leaf matched-count {
                                     type uint64;
                                 }

-                                
+

                                 // OF1.0 structures
                                 leaf name {
                                     type string;
                                 // OF1.0 structures
                                 leaf name {
                                     type string;


@@ -1029,7 +1029,7 @@
                                 }
                                 leaf config {
                                     type oft:table-config;
                                 }
                                 leaf config {
                                     type oft:table-config;

-                                } 
+                                }

                                 leaf max-entries {
                                     type uint32;
                                 }
                                 leaf max-entries {
                                     type uint32;
                                 }


@@ -1050,35 +1050,35 @@
                         }
                     }
                 }
                         }
                     }
                 }

-            } 
+            }

             /* Barrier messages. */
             grouping barrier-request {
                 reference "OFPT_BARRIER_REQUEST message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
                 uses ofHeader;
             /* Barrier messages. */
             grouping barrier-request {
                 reference "OFPT_BARRIER_REQUEST message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
                 uses ofHeader;

-            } 
+            }

             grouping barrier-reply {
                 reference "OFPT_BARRIER_REPLY message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
                 uses ofHeader;
             grouping barrier-reply {
                 reference "OFPT_BARRIER_REPLY message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
                 uses ofHeader;

-            } 
+            }

         /* Queue Configuration messages. */
             grouping queue-get-config-request {
                 reference "OFPT_QUEUE_GET_CONFIG_REQUEST message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
         /* Queue Configuration messages. */
             grouping queue-get-config-request {
                 reference "OFPT_QUEUE_GET_CONFIG_REQUEST message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */

-                
+

                 uses ofHeader;
                 uses ofHeader;

-                
+

                 leaf port {
                     type oft:port-number;
                 }
                 leaf port {
                     type oft:port-number;
                 }

-            } 
+            }

             grouping queue-get-config-reply {
                 reference "OFPT_QUEUE_GET_CONFIG_REPLY message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
 
                 uses ofHeader;
             grouping queue-get-config-reply {
                 reference "OFPT_QUEUE_GET_CONFIG_REPLY message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
 
                 uses ofHeader;

-                
+

                 leaf port {
                     type oft:port-number;
                 }
                 leaf port {
                     type oft:port-number;
                 }


@@ -1110,51 +1110,51 @@
             grouping role-request {
                 reference "OFPT_ROLE_REQUEST message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
             grouping role-request {
                 reference "OFPT_ROLE_REQUEST message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */

-                
+

                 uses ofHeader;
                 uses ofHeader;

-                
+

                 leaf role {
                     type oft:controller-role;
                 }
                 leaf generation-id {
                     type uint64;
                 }
                 leaf role {
                     type oft:controller-role;
                 }
                 leaf generation-id {
                     type uint64;
                 }

-            } 
+            }

             grouping role-reply {
                 reference "OFPT_ROLE_REPLY message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
 
                 uses ofHeader;
             grouping role-reply {
                 reference "OFPT_ROLE_REPLY message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
 
                 uses ofHeader;

-                
+

                 leaf role {
                     type oft:controller-role;
                 }
                 leaf generation-id {
                     type uint64;
                 }
                 leaf role {
                     type oft:controller-role;
                 }
                 leaf generation-id {
                     type uint64;
                 }

-            } 
+            }

             /* Asynchronous message configuration. */
             grouping get-async-request {
                 reference "OFPT_GET_ASYNC_REQUEST message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
 
                 uses ofHeader;
             /* Asynchronous message configuration. */
             grouping get-async-request {
                 reference "OFPT_GET_ASYNC_REQUEST message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
 
                 uses ofHeader;

-            } 
+            }

             grouping get-async-reply {
                 reference "OFPT_GET_ASYNC_REPLY message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
 
                 uses ofHeader;
                 uses async-body-grouping;
             grouping get-async-reply {
                 reference "OFPT_GET_ASYNC_REPLY message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
 
                 uses ofHeader;
                 uses async-body-grouping;

-            } 
+            }

             grouping set-async {
                 reference "OFPT_SET_ASYNC message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */
             grouping set-async {
                 reference "OFPT_SET_ASYNC message in Openflow Switch 1.3 Spec";
                 /* Controller/switch message */

-                
+

                 uses ofHeader;
                 uses async-body-grouping;
             }
                 uses ofHeader;
                 uses async-body-grouping;
             }

-            
+

             grouping async-body-grouping {
                 list packet-in-mask {
                     leaf-list mask {
             grouping async-body-grouping {
                 list packet-in-mask {
                     leaf-list mask {


@@ -1178,10 +1178,10 @@
                 /* Controller/switch message */
 
                 uses ofHeader;
                 /* Controller/switch message */
 
                 uses ofHeader;

-                
+

                 leaf command {
                     type oft:meter-mod-command;
                 leaf command {
                     type oft:meter-mod-command;

-                } 
+                }

                 leaf flags {
                     type oft:meter-flags;
                 }
                 leaf flags {
                     type oft:meter-flags;
                 }


@@ -1192,7 +1192,7 @@
                     uses meter-band-header;
                 }
             }
                     uses meter-band-header;
                 }
             }

-            
+

             container meter-band-container {
                 uses meter-band-header;
             }
             container meter-band-container {
                 uses meter-band-header;
             }


@@ -1218,7 +1218,7 @@
                     }
                 }
             }
                     }
                 }
             }

-            
+

             grouping meter-band-commons {
                 leaf type {
                     type oft:meter-band-type;
             grouping meter-band-commons {
                 leaf type {
                     type oft:meter-band-type;


@@ -1235,19 +1235,19 @@
             notification hello-message {
                 uses hello;
                 reference "OFPT_HELLO message in Openflow Switch 1.3 Spec";
             notification hello-message {
                 uses hello;
                 reference "OFPT_HELLO message in Openflow Switch 1.3 Spec";

-                
+

                 /* Symmetric message */
             }
             notification error-message {
                 uses error;
                 reference "OFPT_ERROR message in Openflow Switch 1.3 Spec";
                 /* Symmetric message */
             }
             notification error-message {
                 uses error;
                 reference "OFPT_ERROR message in Openflow Switch 1.3 Spec";

-                
+

                 /* Symmetric message */
             }
             notification echo-request-message {
                 uses echo-request;
                 reference "OFPT_ECHO_REQUEST message in Openflow Switch 1.3 Spec";
                 /* Symmetric message */
             }
             notification echo-request-message {
                 uses echo-request;
                 reference "OFPT_ECHO_REQUEST message in Openflow Switch 1.3 Spec";

-                
+

                 /* Symmetric message */
             }
             notification experimenter-message {
                 /* Symmetric message */
             }
             notification experimenter-message {


@@ -1267,19 +1267,19 @@
                     uses echo-reply;
                 }
             }
                     uses echo-reply;
                 }
             }

-            
+

             rpc echo-reply {
                 input {
                     uses echo-reply;
                 }
             }
             rpc echo-reply {
                 input {
                     uses echo-reply;
                 }
             }

-            
+

             rpc hello {
                 input {
                     uses hello;
                 }
             }
             rpc hello {
                 input {
                     uses hello;
                 }
             }

-            
+

             rpc experimenter {
                 input {
                     uses experimenter;
             rpc experimenter {
                 input {
                     uses experimenter;


@@ -1296,7 +1296,7 @@
                     uses features-reply;
                 }
             }
                     uses features-reply;
                 }
             }

-            
+

             rpc get-config {
                 input {
                     uses get-config-request;
             rpc get-config {
                 input {
                     uses get-config-request;


@@ -1306,27 +1306,27 @@
                 }
                 /* Controller/switch message */
             }
                 }
                 /* Controller/switch message */
             }

-            
+

             rpc set-config {
                 input {
                     uses set-config;
             rpc set-config {
                 input {
                     uses set-config;

-                }   
+                }

                 /* Controller/switch message */
             }
         /* Asynchronous messages. */
             notification packet-in-message {
                 uses packet-in;
                 /* Controller/switch message */
             }
         /* Asynchronous messages. */
             notification packet-in-message {
                 uses packet-in;

-                
+

              /* Async message */
             }
             notification flow-removed-message {
                 uses flow-removed;
              /* Async message */
             }
             notification flow-removed-message {
                 uses flow-removed;

-                
+

                 /* Async message */
                 /* Async message */

-            } 
+            }

             notification port-status-message {
                 uses port-status;
             notification port-status-message {
                 uses port-status;

-                
+

             } /* Async message */
 
         /* Controller command messages. */
             } /* Async message */
 
         /* Controller command messages. */


@@ -1335,25 +1335,25 @@
                     uses packet-out;
                 }
                 /* Controller/switch message */
                     uses packet-out;
                 }
                 /* Controller/switch message */

-            } 
+            }

             rpc flow-mod {
                 input {
                     uses flow-mod;
                 }
                 /* Controller/switch message */
             rpc flow-mod {
                 input {
                     uses flow-mod;
                 }
                 /* Controller/switch message */

-            } 
+            }

             rpc group-mod {
                 input {
                     uses group-mod;
                 }
                 /* Controller/switch message */
             rpc group-mod {
                 input {
                     uses group-mod;
                 }
                 /* Controller/switch message */

-            } 
+            }

             rpc port-mod {
                 input {
                     uses port-mod;
                 }
             } /* Controller/switch message */
             rpc port-mod {
                 input {
                     uses port-mod;
                 }
             } /* Controller/switch message */

-            
+

             rpc table-mod {
                 input {
                     uses table-mod;
             rpc table-mod {
                 input {
                     uses table-mod;


@@ -1373,7 +1373,7 @@
                 uses multipart-reply;
                 // notification because of multiple following responses
             } /* Controller/switch message */
                 uses multipart-reply;
                 // notification because of multiple following responses
             } /* Controller/switch message */

-            
+

 
             /* Barrier messages. */
             rpc barrier {
 
             /* Barrier messages. */
             rpc barrier {


@@ -1392,7 +1392,7 @@
                 output {
                     uses queue-get-config-reply;
                 }
                 output {
                     uses queue-get-config-reply;
                 }

-            } 
+            }

 
         /* Controller role change request messages. */
             rpc role-request {
 
         /* Controller role change request messages. */
             rpc role-request {


@@ -1403,7 +1403,7 @@
                     uses role-reply;
                 }
             } /* Controller/switch message */
                     uses role-reply;
                 }
             } /* Controller/switch message */

-            
+

         /* Asynchronous message configuration. */
             rpc get-async {
                 input {
         /* Asynchronous message configuration. */
             rpc get-async {
                 input {


@@ -1412,14 +1412,14 @@
                 output {
                     uses get-async-reply;
                 }
                 output {
                     uses get-async-reply;
                 }

-            } 
+            }

              /* Controller/switch message */
             rpc set-async {
              /* Controller/switch message */
             rpc set-async {

-                input { 
+                input {

                     uses set-async;
                 }
                     uses set-async;
                 }

-                
-            } 
+
+            }

         /* Meters and rate limiters configuration messages. */
             rpc meter-mod {
                 input {
         /* Meters and rate limiters configuration messages. */
             rpc meter-mod {
                 input {

diff --git a/openflow-protocol-api/src/main/yang/openflow-types.yang b/openflow-protocol-api/src/main/yang/openflow-types.yang
index 1a0240896d57b0c12e9311a601fffb2a86c679d7..be0e9f5dd7bddf589ce1971962fc6277a0520bf1 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-types.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-types.yang
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

- 
+

  module openflow-types {
     namespace "urn:opendaylight:openflow:common:types";
     prefix "oft";
  module openflow-types {
     namespace "urn:opendaylight:openflow:common:types";
     prefix "oft";


@@ -19,7 +19,7 @@
          supports special / reserved values (in OF v1.3)";
         type uint32;
     }
          supports special / reserved values (in OF v1.3)";
         type uint32;
     }

-    
+

     typedef port-number-values {
         description "Reserved OpenFlow Port (fake output \"ports\") (OF v1.3).";
         type enumeration {
     typedef port-number-values {
         description "Reserved OpenFlow Port (fake output \"ports\") (OF v1.3).";
         type enumeration {


@@ -38,20 +38,20 @@
                 description "Submit the packet to the first flow table
                             NB: This destination port can only be
                             used in packet-out messages.";
                 description "Submit the packet to the first flow table
                             NB: This destination port can only be
                             used in packet-out messages.";

-                value -7; // 0xfffffff9 
+                value -7; // 0xfffffff9

             }
             enum NORMAL {
                 description "Process with normal L2/L3 switching.";
             }
             enum NORMAL {
                 description "Process with normal L2/L3 switching.";

-                value -6; // 0xfffffffa 
+                value -6; // 0xfffffffa

             }
             enum FLOOD {
                 description "All physical ports in VLAN, except input
                             port and those blocked or link down.";
             }
             enum FLOOD {
                 description "All physical ports in VLAN, except input
                             port and those blocked or link down.";

-                value -5; // 0xfffffffb 
+                value -5; // 0xfffffffb

             }
             enum ALL {
                 description "All physical ports except input port.";
             }
             enum ALL {
                 description "All physical ports except input port.";

-                value -4; // 0xfffffffc 
+                value -4; // 0xfffffffc

             }
             enum CONTROLLER {
                 description "Send to controller.";
             }
             enum CONTROLLER {
                 description "Send to controller.";


@@ -63,7 +63,7 @@
             }
             enum ANY {
                 description "Wildcard port used only for flow mod
             }
             enum ANY {
                 description "Wildcard port used only for flow mod

-                            (delete) and flow stats requests. Selects 
+                            (delete) and flow stats requests. Selects

                             all flows regardless of output port
                             (including flows with no output port).";
                 value -1; // 0xffffffff
                             all flows regardless of output port
                             (including flows with no output port).";
                 value -1; // 0xffffffff


@@ -74,67 +74,67 @@
     typedef port-features {
         description "Features of ports available in datapath.";
         type bits {
     typedef port-features {
         description "Features of ports available in datapath.";
         type bits {

-            bit _10mb_hd { 
+            bit _10mb_hd {

                 position 0;
                 description "10 Mb half-duplex rate support.";
             }
                 position 0;
                 description "10 Mb half-duplex rate support.";
             }

-            bit _10mb-fd { 
+            bit _10mb-fd {

                 position 1;
                 description "10 Mb full-duplex rate support.";
             }
                 position 1;
                 description "10 Mb full-duplex rate support.";
             }

-            bit _100mb-hd { 
+            bit _100mb-hd {

                 position 2;
                 description "100 Mb half-duplex rate support.";
             }
                 position 2;
                 description "100 Mb half-duplex rate support.";
             }

-            bit _100mb-fd { 
+            bit _100mb-fd {

                 position 3;
                 description "100 Mb full-duplex rate support.";
             }
                 position 3;
                 description "100 Mb full-duplex rate support.";
             }

-            bit _1gb-hd { 
+            bit _1gb-hd {

                 position 4;
                 description "1 Gb half-duplex rate support.";
             }
                 position 4;
                 description "1 Gb half-duplex rate support.";
             }

-            bit _1gb-fd { 
+            bit _1gb-fd {

                 position 5;
                 description "1 Gb full-duplex rate support.";
             }
                 position 5;
                 description "1 Gb full-duplex rate support.";
             }

-            bit _10gb-fd { 
+            bit _10gb-fd {

                 position 6;
                 description "10 Gb full-duplex rate support.";
             }
                 position 6;
                 description "10 Gb full-duplex rate support.";
             }

-            bit _40gb-fd { 
+            bit _40gb-fd {

                 position 7;
                 description "40 Gb full-duplex rate support.";
             }
                 position 7;
                 description "40 Gb full-duplex rate support.";
             }

-            bit _100gb-fd { 
+            bit _100gb-fd {

                 position 8;
                 description "100 Gb full-duplex rate support.";
             }
                 position 8;
                 description "100 Gb full-duplex rate support.";
             }

-            bit _1tb-fd { 
+            bit _1tb-fd {

                 position 9;
                 description "1 Tb full-duplex rate support.";
             }
                 position 9;
                 description "1 Tb full-duplex rate support.";
             }

-            bit other { 
+            bit other {

                 position 10;
                 description "Other rate, not in the list.";
             }
                 position 10;
                 description "Other rate, not in the list.";
             }

-            bit copper { 
+            bit copper {

                 position 11;
                 description "Copper medium.";
             }
                 position 11;
                 description "Copper medium.";
             }

-            bit fiber { 
+            bit fiber {

                 position 12;
                 description "Fiber medium.";
             }
                 position 12;
                 description "Fiber medium.";
             }

-            bit autoneg { 
+            bit autoneg {

                 position 13;
                 description "Auto-negotiation.";
             }
                 position 13;
                 description "Auto-negotiation.";
             }

-            bit pause { 
+            bit pause {

                 position 14;
                 description "Pause.";
             }
                 position 14;
                 description "Pause.";
             }

-            bit pause-asym { 
+            bit pause-asym {

                 position 15;
                 description "Asymmetric pause.";
             }
                 position 15;
                 description "Asymmetric pause.";
             }


@@ -142,24 +142,24 @@
     }
 
     typedef port-config {
     }
 
     typedef port-config {

-        description 
+        description

            "Flags to indicate behavior of the physical port. These flags are
            "Flags to indicate behavior of the physical port. These flags are

-            describe the current configuration and used port_mod message 
+            describe the current configuration and used port_mod message

             to configure the port's behavior.";
         type bits {
             to configure the port's behavior.";
         type bits {

-            bit port-down { 
+            bit port-down {

                 //description " Port is administratively down.";
                 position 0;
             }
                 //description " Port is administratively down.";
                 position 0;
             }

-            bit no-recv { 
+            bit no-recv {

                 //description " Drop all packets received by port.";
                 position 2;
             }
                 //description " Drop all packets received by port.";
                 position 2;
             }

-            bit no-fwd { 
+            bit no-fwd {

                 //description " Drop packets forwarded to port.";
                 position 5;
             }
                 //description " Drop packets forwarded to port.";
                 position 5;
             }

-            bit no-packet-in { 
+            bit no-packet-in {

                 //description "Do not send packet-in msgs for port.";
                 position 6;
             }
                 //description "Do not send packet-in msgs for port.";
                 position 6;
             }


@@ -167,7 +167,7 @@
     }
 
     typedef port-state {
     }
 
     typedef port-state {

-        description 
+        description

             "Current state of the physical port. These are not configurable from
             the controller.";
         type bits {
             "Current state of the physical port. These are not configurable from
             the controller.";
         type bits {


@@ -187,10 +187,10 @@
     }
 
     identity match-type-base {
     }
 
     identity match-type-base {

-        description 
+        description

            "The match type indicates the match structure (set of fields that compose the
             match) in use. The match type is placed in the type field at the beginning
            "The match type indicates the match structure (set of fields that compose the
             match) in use. The match type is placed in the type field at the beginning

-            of all match structures.Extensions that define match types may be 
+            of all match structures.Extensions that define match types may be

             published on the ONF wiki. Support for extensions is optional.";
     }
 
             published on the ONF wiki. Support for extensions is optional.";
     }
 


@@ -236,363 +236,363 @@
     typedef error-type {
         type enumeration {
             enum HELLO_FAILED {
     typedef error-type {
         type enumeration {
             enum HELLO_FAILED {

-                value 0; 
+                value 0;

                 description "Hello Protocol failed.";
             }
             enum BAD_REQUEST {
                 description "Hello Protocol failed.";
             }
             enum BAD_REQUEST {

-                value 1; 
+                value 1;

                 description "Request was not understood.";
             }
             enum BAD_ACTION {
                 description "Request was not understood.";
             }
             enum BAD_ACTION {

-                value 2; 
+                value 2;

                 description "Error in action description.";
             }
             enum BAD_INSTRUCTION {
                 description "Error in action description.";
             }
             enum BAD_INSTRUCTION {

-                value 3; 
+                value 3;

                 description "Error in instruction list.";
             }
             enum BAD_MATCH {
                 description "Error in instruction list.";
             }
             enum BAD_MATCH {

-                value 4; 
+                value 4;

                 description "Error in match.";
             }
             enum FLOW_MOD_FAILED {
                 description "Error in match.";
             }
             enum FLOW_MOD_FAILED {

-                value 5; 
+                value 5;

                 description "Problem modifying flow entry.";
             }
             enum GROUP_MOD_FAILED {
                 description "Problem modifying flow entry.";
             }
             enum GROUP_MOD_FAILED {

-                value 6; 
+                value 6;

                 description "Problem modifying group entry.";
             }
             enum PORT_MOD_FAILED {
                 description "Problem modifying group entry.";
             }
             enum PORT_MOD_FAILED {

-                value 7; 
+                value 7;

                 description "Port mod request failed.";
             }
             enum TABLE_MOD_FAILED {
                 description "Port mod request failed.";
             }
             enum TABLE_MOD_FAILED {

-                value 8; 
+                value 8;

                 description "Table mod request failed.";
             }
             enum QUEUE_OP_FAILED {
                 description "Table mod request failed.";
             }
             enum QUEUE_OP_FAILED {

-                value 9; 
+                value 9;

                 description "Queue operation failed.";
             }
             enum SWITCH_CONFIG_FAILED {
                 description "Queue operation failed.";
             }
             enum SWITCH_CONFIG_FAILED {

-                value 10; 
+                value 10;

                 description "Switch config request failed.";
             }
             enum ROLE_REQUEST_FAILED {
                 description "Switch config request failed.";
             }
             enum ROLE_REQUEST_FAILED {

-                value 11; 
+                value 11;

                 description "Controller Role request failed.";
             }
             enum METER_MOD_FAILED {
                 description "Controller Role request failed.";
             }
             enum METER_MOD_FAILED {

-                value 12; 
+                value 12;

                 description "Error in meter.";
             }
             enum TABLE_FEATURES_FAILED {
                 description "Error in meter.";
             }
             enum TABLE_FEATURES_FAILED {

-                value 13; 
+                value 13;

                 description "Setting table features failed.";
             }
             enum EXPERIMENTER {
                 description "Setting table features failed.";
             }
             enum EXPERIMENTER {

-                value 65535; //0xffff 
+                value 65535; //0xffff

                 description "Experimenter error messages.";
             }
         }
     }
                 description "Experimenter error messages.";
             }
         }
     }

-    
+

     typedef hello-failed-code {
         type enumeration {
             enum INCOMPATIBLE {
     typedef hello-failed-code {
         type enumeration {
             enum INCOMPATIBLE {

-                value 0; 
+                value 0;

                 description "Hello Protocol failed.";
             }
             enum EPERM {
                 description "Hello Protocol failed.";
             }
             enum EPERM {

-                value 1; 
+                value 1;

                 description "Request was not understood.";
             }
         }
     }
                 description "Request was not understood.";
             }
         }
     }

-    
+

     typedef bad-request-code {
         type enumeration {
             enum BAD_VERSION {
     typedef bad-request-code {
         type enumeration {
             enum BAD_VERSION {

-                value 0; 
+                value 0;

             }
             enum BAD_TYPE {
             }
             enum BAD_TYPE {

-                value 1; 
+                value 1;

             }
             enum BAD_MULTIPART {
             }
             enum BAD_MULTIPART {

-                value 2; 
+                value 2;

             }
             enum BAD_EXPERIMENTER {
             }
             enum BAD_EXPERIMENTER {

-                value 3; 
+                value 3;

             }
             enum BAD_EXP_TYPE {
             }
             enum BAD_EXP_TYPE {

-                value 4; 
+                value 4;

             }
             enum EPERM {
             }
             enum EPERM {

-                value 5; 
+                value 5;

             }
             enum BAD_LEN {
             }
             enum BAD_LEN {

-                value 6; 
+                value 6;

             }
             enum BUFFER_EMPTY {
             }
             enum BUFFER_EMPTY {

-                value 7; 
+                value 7;

             }
             enum BUFFER_UNKNOWN {
             }
             enum BUFFER_UNKNOWN {

-                value 8; 
+                value 8;

             }
             enum BAD_TABLE_ID {
             }
             enum BAD_TABLE_ID {

-                value 9; 
+                value 9;

             }
             enum IS_SLAVE {
             }
             enum IS_SLAVE {

-                value 10; 
+                value 10;

             }
             enum BAD_PORT {
             }
             enum BAD_PORT {

-                value 11; 
+                value 11;

             }
             enum BAD_PACKET {
             }
             enum BAD_PACKET {

-                value 12; 
+                value 12;

             }
             enum MULTIPART_BUFFER_OVERFLOW {
             }
             enum MULTIPART_BUFFER_OVERFLOW {

-                value 13; 
+                value 13;

             }
         }
     }
             }
         }
     }

-    
+

     typedef bad-action-code {
         type enumeration {
             enum BAD_TYPE {
     typedef bad-action-code {
         type enumeration {
             enum BAD_TYPE {

-                value 0; 
+                value 0;

             }
             enum BAD_LEN {
             }
             enum BAD_LEN {

-                value 1; 
+                value 1;

             }
             enum BAD_EXPERIMENTER {
             }
             enum BAD_EXPERIMENTER {

-                value 2; 
+                value 2;

             }
             enum BAD_EXP_TYPE {
             }
             enum BAD_EXP_TYPE {

-                value 3; 
+                value 3;

             }
             enum BAD_OUT_PORT {
             }
             enum BAD_OUT_PORT {

-                value 4; 
+                value 4;

             }
             enum BAD_ARGUMENT {
             }
             enum BAD_ARGUMENT {

-                value 5; 
+                value 5;

             }
             enum EPERM {
             }
             enum EPERM {

-                value 6; 
+                value 6;

             }
             enum TOO_MANY {
             }
             enum TOO_MANY {

-                value 7; 
+                value 7;

             }
             enum BAD_QUEUE {
             }
             enum BAD_QUEUE {

-                value 8; 
+                value 8;

             }
             enum BAD_OUT_GROUP {
             }
             enum BAD_OUT_GROUP {

-                value 9; 
+                value 9;

             }
             enum MATCH_INCONSISTENT {
             }
             enum MATCH_INCONSISTENT {

-                value 10; 
+                value 10;

             }
             enum UNSUPPORTED_ORDER {
             }
             enum UNSUPPORTED_ORDER {

-                value 11; 
+                value 11;

             }
             enum BAD_TAG {
             }
             enum BAD_TAG {

-                value 12; 
+                value 12;

             }
             enum BAD_SET_TYPE {
             }
             enum BAD_SET_TYPE {

-                value 13; 
+                value 13;

             }
             enum BAD_SET_LEN {
             }
             enum BAD_SET_LEN {

-                value 14; 
+                value 14;

             }
             enum BAD_SET_ARGUMENT {
             }
             enum BAD_SET_ARGUMENT {

-                value 15; 
+                value 15;

             }
         }
     }
             }
         }
     }

-    
+

     typedef bad-instruction-code {
         type enumeration {
             enum UNKNOWN_INST {
     typedef bad-instruction-code {
         type enumeration {
             enum UNKNOWN_INST {

-                value 0; 
+                value 0;

             }
             enum UNSUP_INST {
             }
             enum UNSUP_INST {

-                value 1; 
+                value 1;

             }
             enum BAD_TABLE_ID {
             }
             enum BAD_TABLE_ID {

-                value 2; 
+                value 2;

             }
             enum UNSUP_METADATA {
             }
             enum UNSUP_METADATA {

-                value 3; 
+                value 3;

             }
             enum UNSUP_METADATA_MASK {
             }
             enum UNSUP_METADATA_MASK {

-                value 4; 
+                value 4;

             }
             enum BAD_EXPERIMENTER {
             }
             enum BAD_EXPERIMENTER {

-                value 5; 
+                value 5;

             }
             enum BAD_EXP_TYPE {
             }
             enum BAD_EXP_TYPE {

-                value 6; 
+                value 6;

             }
             enum BAD_LEN {
             }
             enum BAD_LEN {

-                value 7; 
+                value 7;

             }
             enum EPERM {
             }
             enum EPERM {

-                value 8; 
+                value 8;

             }
         }
     }
             }
         }
     }

-    
+

     typedef bad-match-code {
         type enumeration {
             enum BAD_TYPE {
     typedef bad-match-code {
         type enumeration {
             enum BAD_TYPE {

-                value 0; 
+                value 0;

             }
             enum BAD_LEN {
             }
             enum BAD_LEN {

-                value 1; 
+                value 1;

             }
             enum BAD_TAG {
             }
             enum BAD_TAG {

-                value 2; 
+                value 2;

             }
             enum BAD_DL_ADDR_MASK {
             }
             enum BAD_DL_ADDR_MASK {

-                value 3; 
+                value 3;

             }
             enum BAD_NW_ADDR_MASK {
             }
             enum BAD_NW_ADDR_MASK {

-                value 4; 
+                value 4;

             }
             enum BAD_WILDCARDS {
             }
             enum BAD_WILDCARDS {

-                value 5; 
+                value 5;

             }
             enum BAD_FIELD {
             }
             enum BAD_FIELD {

-                value 6; 
+                value 6;

             }
             enum BAD_VALUE {
             }
             enum BAD_VALUE {

-                value 7; 
+                value 7;

             }
             enum BAD_MASK {
             }
             enum BAD_MASK {

-                value 8; 
+                value 8;

             }
             enum BAD_PREREQ {
             }
             enum BAD_PREREQ {

-                value 9; 
+                value 9;

             }
             enum DUP_FIELD {
             }
             enum DUP_FIELD {

-                value 10; 
+                value 10;

             }
             enum EPERM {
             }
             enum EPERM {

-                value 11; 
+                value 11;

             }
         }
     }
             }
         }
     }

-    
+

     typedef flow-mod-failed-code {
         type enumeration {
             enum UNKNOWN {
     typedef flow-mod-failed-code {
         type enumeration {
             enum UNKNOWN {

-                value 0; 
+                value 0;

             }
             enum TABLE_FULL {
             }
             enum TABLE_FULL {

-                value 1; 
+                value 1;

             }
             enum BAD_TABLE_ID {
             }
             enum BAD_TABLE_ID {

-                value 2; 
+                value 2;

             }
             enum OVERLAP {
             }
             enum OVERLAP {

-                value 3; 
+                value 3;

             }
             enum EPERM {
             }
             enum EPERM {

-                value 4; 
+                value 4;

             }
             enum BAD_TIMEOUT {
             }
             enum BAD_TIMEOUT {

-                value 5; 
+                value 5;

             }
             enum BAD_COMMAND {
             }
             enum BAD_COMMAND {

-                value 6; 
+                value 6;

             }
             enum BAD_FLAGS {
             }
             enum BAD_FLAGS {

-                value 7; 
+                value 7;

             }
         }
     }
             }
         }
     }

-    
+

     typedef group-mod-failed-code {
         type enumeration {
             enum GROUP_EXISTS {
     typedef group-mod-failed-code {
         type enumeration {
             enum GROUP_EXISTS {

-                value 0; 
+                value 0;

             }
             enum INVALID_GROUP {
             }
             enum INVALID_GROUP {

-                value 1; 
+                value 1;

             }
             enum WEIGHT_UNSUPPORTED {
             }
             enum WEIGHT_UNSUPPORTED {

-                value 2; 
+                value 2;

             }
             enum OUT_OF_GROUPS {
             }
             enum OUT_OF_GROUPS {

-                value 3; 
+                value 3;

             }
             enum OUT_OF_BUCKETS {
             }
             enum OUT_OF_BUCKETS {

-                value 4; 
+                value 4;

             }
             enum CHAINING_UNSUPPORTED {
             }
             enum CHAINING_UNSUPPORTED {

-                value 5; 
+                value 5;

             }
             enum WATCH_UNSUPPORTED {
             }
             enum WATCH_UNSUPPORTED {

-                value 6; 
+                value 6;

             }
             enum LOOP {
             }
             enum LOOP {

-                value 7; 
+                value 7;

             }
             enum UNKNOWN_GROUP {
             }
             enum UNKNOWN_GROUP {

-                value 8; 
+                value 8;

             }
             enum CHAINED_GROUP {
             }
             enum CHAINED_GROUP {

-                value 9; 
+                value 9;

             }
             enum BAD_TYPE {
             }
             enum BAD_TYPE {

-                value 10; 
+                value 10;

             }
             enum BAD_COMMAND {
             }
             enum BAD_COMMAND {

-                value 11; 
+                value 11;

             }
             enum BAD_BUCKET {
             }
             enum BAD_BUCKET {

-                value 12; 
+                value 12;

             }
             enum BAD_WATCH {
             }
             enum BAD_WATCH {

-                value 13; 
+                value 13;

             }
             enum EPERM {
             }
             enum EPERM {

-                value 14; 
+                value 14;

             }
         }
     }
             }
         }
     }

-    
+

     typedef port-mod-failed-code {
         type enumeration {
             enum BAD_PORT {
     typedef port-mod-failed-code {
         type enumeration {
             enum BAD_PORT {

-                value 0; 
+                value 0;

             }
             enum BAD_HW_ADDR {
             }
             enum BAD_HW_ADDR {

-                value 1; 
+                value 1;

             }
             enum BAD_CONFIG {
             }
             enum BAD_CONFIG {

-                value 2; 
+                value 2;

             }
             enum BAD_ADVERTISE {
             }
             enum BAD_ADVERTISE {

-                value 3; 
+                value 3;

             }
             enum EPERM {
             }
             enum EPERM {

-                value 4; 
+                value 4;

             }
         }
     }
             }
         }
     }

-    
+

     typedef table-mod-failed-code {
         type enumeration {
             enum BAD_TABLE {
     typedef table-mod-failed-code {
         type enumeration {
             enum BAD_TABLE {

-                value 0; 
+                value 0;

             }
             enum BAD_CONFIG {
             }
             enum BAD_CONFIG {

-                value 1; 
+                value 1;

             }
             enum EPERM {
             }
             enum EPERM {

-                value 2; 
+                value 2;

             }
         }
     }
             }
         }
     }


@@ -600,125 +600,125 @@
     typedef queue-op-failed-code {
         type enumeration {
             enum BAD_PORT {
     typedef queue-op-failed-code {
         type enumeration {
             enum BAD_PORT {

-                value 0; 
+                value 0;

             }
             enum BAD_QUEUE {
             }
             enum BAD_QUEUE {

-                value 1; 
+                value 1;

             }
             enum EPERM {
             }
             enum EPERM {

-                value 2; 
+                value 2;

             }
         }
     }
             }
         }
     }

-    
+

     typedef switch-config-failed-code {
         type enumeration {
             enum BAD_FLAGS {
     typedef switch-config-failed-code {
         type enumeration {
             enum BAD_FLAGS {

-                value 0; 
+                value 0;

             }
             enum BAD_LEN {
             }
             enum BAD_LEN {

-                value 1; 
+                value 1;

             }
             enum EPERM {
             }
             enum EPERM {

-                value 2; 
+                value 2;

             }
         }
     }
             }
         }
     }

-    
+

     typedef role-request-failed-code {
         type enumeration {
             enum STALE {
     typedef role-request-failed-code {
         type enumeration {
             enum STALE {

-                value 0; 
+                value 0;

             }
             enum UNSUP {
             }
             enum UNSUP {

-                value 1; 
+                value 1;

             }
             enum BAD_ROLE {
             }
             enum BAD_ROLE {

-                value 2; 
+                value 2;

             }
         }
     }
             }
         }
     }

-    
+

     typedef meter-mod-failed-code {
         type enumeration {
             enum UNKNOWN {
     typedef meter-mod-failed-code {
         type enumeration {
             enum UNKNOWN {

-                value 0; 
+                value 0;

             }
             enum METER_EXISTS {
             }
             enum METER_EXISTS {

-                value 1; 
+                value 1;

             }
             enum INVALID_METER {
             }
             enum INVALID_METER {

-                value 2; 
+                value 2;

             }
             enum UNKNOWN_METER {
             }
             enum UNKNOWN_METER {

-                value 3; 
+                value 3;

             }
             enum BAD_COMMAND {
             }
             enum BAD_COMMAND {

-                value 4; 
+                value 4;

             }
             enum BAD_FLAGS {
             }
             enum BAD_FLAGS {

-                value 5; 
+                value 5;

             }
             enum BAD_RATE {
             }
             enum BAD_RATE {

-                value 6; 
+                value 6;

             }
             enum BAD_BURST {
             }
             enum BAD_BURST {

-                value 7; 
+                value 7;

             }
             enum BAD_BAND {
             }
             enum BAD_BAND {

-                value 8; 
+                value 8;

             }
             enum BAD_BAND_VALUE {
             }
             enum BAD_BAND_VALUE {

-                value 9; 
+                value 9;

             }
             enum OUT_OF_METERS {
             }
             enum OUT_OF_METERS {

-                value 10; 
+                value 10;

             }
             enum OUT_OF_BANDS {
             }
             enum OUT_OF_BANDS {

-                value 11; 
+                value 11;

             }
         }
     }
             }
         }
     }

-    
+

     typedef table-features-failed-code {
         type enumeration {
             enum BAD_TABLE {
     typedef table-features-failed-code {
         type enumeration {
             enum BAD_TABLE {

-                value 0; 
+                value 0;

             }
             enum BAD_METADATA {
             }
             enum BAD_METADATA {

-                value 1; 
+                value 1;

             }
             enum BAD_TYPE {
             }
             enum BAD_TYPE {

-                value 2; 
+                value 2;

             }
             enum BAD_LEN {
             }
             enum BAD_LEN {

-                value 3; 
+                value 3;

             }
             enum BAD_ARGUMENT {
             }
             enum BAD_ARGUMENT {

-                value 4; 
+                value 4;

             }
             enum EPERM {
             }
             enum EPERM {

-                value 5; 
+                value 5;

             }
         }
     }
             }
         }
     }

-    
+

     typedef hello-element-type {
         type enumeration {
             enum VERSIONBITMAP {
     typedef hello-element-type {
         type enumeration {
             enum VERSIONBITMAP {

-                value 1; 
+                value 1;

                 description "Bitmap of version supported.";
             }
         }
     }
                 description "Bitmap of version supported.";
             }
         }
     }

-    
+

     typedef capabilities {
         description "Capabilities supported by the datapath.";
         type bits {
             bit OFPC_FLOW_STATS {
                 position 0;
                 /* Flow statistics. */
     typedef capabilities {
         description "Capabilities supported by the datapath.";
         type bits {
             bit OFPC_FLOW_STATS {
                 position 0;
                 /* Flow statistics. */

-            } 
+            }

             bit OFPC_TABLE_STATS {
                 position 1;
                 /* Table statistics. */
             bit OFPC_TABLE_STATS {
                 position 1;
                 /* Table statistics. */


@@ -750,19 +750,19 @@
         description " Handling of IP fragments. ";
         type enumeration {
             enum FRAG_NORMAL {
         description " Handling of IP fragments. ";
         type enumeration {
             enum FRAG_NORMAL {

-                value 0; 
+                value 0;

                 description "No special handling for fragments.";
             }
             enum OFPC_FRAG_DROP {
                 description "No special handling for fragments.";
             }
             enum OFPC_FRAG_DROP {

-                value 1; 
+                value 1;

                 description "Drop fragments.";
             }
             enum OFPC_FRAG_REASM {
                 description "Drop fragments.";
             }
             enum OFPC_FRAG_REASM {

-                value 2; 
+                value 2;

                 description "Reassemble (only if OFPC_IP_REASM set).";
             }
             enum OFPC_FRAG_MASK {
                 description "Reassemble (only if OFPC_IP_REASM set).";
             }
             enum OFPC_FRAG_MASK {

-                value 3; 
+                value 3;

             }
         }
     }
             }
         }
     }


@@ -908,7 +908,7 @@
             }
             enum OFPTT_ALL {
               value 255; // 0xff
             }
             enum OFPTT_ALL {
               value 255; // 0xff

-              description "Wildcard table used for table config, 
+              description "Wildcard table used for table config,

                            flow stats and flow deletes.";
             }
         }
                            flow stats and flow deletes.";
             }
         }


@@ -928,7 +928,7 @@
             }
             enum OFPG_ANY {
                 value -1; //0xffffffff
             }
             enum OFPG_ANY {
                 value -1; //0xffffffff

-                description "Wildcard group used only for flow stats requests. 
+                description "Wildcard group used only for flow stats requests.

                             Selects all flows regardless of group (including flows with no group)";
             }
         }
                             Selects all flows regardless of group (including flows with no group)";
             }
         }


@@ -1059,7 +1059,7 @@
                 description "Maximum datarate.";
             }
             enum OFPQT_EXPERIMENTER {
                 description "Maximum datarate.";
             }
             enum OFPQT_EXPERIMENTER {

-                value 65535; // 0xffff 
+                value 65535; // 0xffff

                 description "Experimenter defined property.";
             }
         }
                 description "Experimenter defined property.";
             }
         }


@@ -1104,7 +1104,7 @@
             }
         }
     }
             }
         }
     }

-    
+

     typedef action-type {
         /* ofp_action_type */
         type bits {
     typedef action-type {
         /* ofp_action_type */
         type bits {


@@ -1232,7 +1232,7 @@
             }
         }
     }
             }
         }
     }

-    
+

     typedef meter-band-type-bitmap {
         /* ofp_meter_band_type */
         type bits {
     typedef meter-band-type-bitmap {
         /* ofp_meter_band_type */
         type bits {


@@ -1283,67 +1283,67 @@
     typedef table-features-prop-type {
         type enumeration {
             enum OFPTFPT_INSTRUCTIONS {
     typedef table-features-prop-type {
         type enumeration {
             enum OFPTFPT_INSTRUCTIONS {

-                value 0; 
+                value 0;

                 description "Instructions property.";
             }
             enum OFPTFPT_INSTRUCTIONS_MISS {
                 description "Instructions property.";
             }
             enum OFPTFPT_INSTRUCTIONS_MISS {

-                value 1; 
+                value 1;

                 description "Instructions for table-miss.";
             }
             enum OFPTFPT_NEXT_TABLES {
                 description "Instructions for table-miss.";
             }
             enum OFPTFPT_NEXT_TABLES {

-                value 2; 
+                value 2;

                 description "Next Table property.";
             }
             enum OFPTFPT_NEXT_TABLES_MISS {
                 description "Next Table property.";
             }
             enum OFPTFPT_NEXT_TABLES_MISS {

-                value 3; 
+                value 3;

                 description "Next Table for table-miss.";
             }
             enum OFPTFPT_WRITE_ACTIONS {
                 description "Next Table for table-miss.";
             }
             enum OFPTFPT_WRITE_ACTIONS {

-                value 4; 
+                value 4;

                 description "Write Actions property.";
             }
             enum OFPTFPT_WRITE_ACTIONS_MISS {
                 description "Write Actions property.";
             }
             enum OFPTFPT_WRITE_ACTIONS_MISS {

-                value 5; 
+                value 5;

                 description "Write Actions for table-miss.";
             }
             enum OFPTFPT_APPLY_ACTIONS {
                 description "Write Actions for table-miss.";
             }
             enum OFPTFPT_APPLY_ACTIONS {

-                value 6; 
+                value 6;

                 description "Apply Actions property.";
             }
             enum OFPTFPT_APPLY_ACTIONS_MISS {
                 description "Apply Actions property.";
             }
             enum OFPTFPT_APPLY_ACTIONS_MISS {

-                value 7; 
+                value 7;

                 description "Apply Actions for table-miss.";
             }
             enum OFPTFPT_MATCH {
                 description "Apply Actions for table-miss.";
             }
             enum OFPTFPT_MATCH {

-                value 8; 
+                value 8;

                 description "Match property.";
             }
             enum OFPTFPT_WILDCARDS {
                 description "Match property.";
             }
             enum OFPTFPT_WILDCARDS {

-                value 10; 
+                value 10;

                 description "Wildcards property.";
             }
             enum OFPTFPT_WRITE_SETFIELD {
                 description "Wildcards property.";
             }
             enum OFPTFPT_WRITE_SETFIELD {

-                value 12; 
+                value 12;

                 description "Write Set-Field property.";
             }
             enum OFPTFPT_WRITE_SETFIELD_MISS {
                 description "Write Set-Field property.";
             }
             enum OFPTFPT_WRITE_SETFIELD_MISS {

-                value 13; 
+                value 13;

                 description "Write Set-Field for table-miss.";
             }
             enum OFPTFPT_APPLY_SETFIELD {
                 description "Write Set-Field for table-miss.";
             }
             enum OFPTFPT_APPLY_SETFIELD {

-                value 14; 
+                value 14;

                 description "Apply Set-Field property.";
             }
             enum OFPTFPT_APPLY_SETFIELD_MISS {
                 description "Apply Set-Field property.";
             }
             enum OFPTFPT_APPLY_SETFIELD_MISS {

-                value 15; 
+                value 15;

                 description "Apply Set-Field for table-miss.";
             }
             enum OFPTFPT_EXPERIMENTER {
                 description "Apply Set-Field for table-miss.";
             }
             enum OFPTFPT_EXPERIMENTER {

-                value 65534; 
+                value 65534;

                 description "Experimenter property.";
             }
             enum OFPTFPT_EXPERIMENTER_MISS {
                 description "Experimenter property.";
             }
             enum OFPTFPT_EXPERIMENTER_MISS {

-                value 65535; //0xffff 
+                value 65535; //0xffff

                 description "Experimenter for table-miss.";
             }
         }
                 description "Experimenter for table-miss.";
             }
         }


@@ -1392,7 +1392,7 @@
             }
         }
     }
             }
         }
     }

-    
+

     typedef ipv6-exthdr-flags {
         description "Bit definitions for IPv6 Extension Header pseudo-field.";
         type bits {
     typedef ipv6-exthdr-flags {
         description "Bit definitions for IPv6 Extension Header pseudo-field.";
         type bits {


@@ -1434,170 +1434,170 @@
             }
         }
     }
             }
         }
     }

-    
+

 // OPENFLOW v1.0 STRUCTURES
 // OPENFLOW v1.0 STRUCTURES

-    // Structures under this line are needed to support OpenFlow version 1.0 
+    // Structures under this line are needed to support OpenFlow version 1.0

     // wire protocol 0x01;
     // wire protocol 0x01;

-    
+

     typedef error-type-v10 {
         type enumeration {
             enum HELLO_FAILED {
     typedef error-type-v10 {
         type enumeration {
             enum HELLO_FAILED {

-                value 0; 
+                value 0;

                 description "Hello Protocol failed.";
             }
             enum BAD_REQUEST {
                 description "Hello Protocol failed.";
             }
             enum BAD_REQUEST {

-                value 1; 
+                value 1;

                 description "Request was not understood.";
             }
             enum BAD_ACTION {
                 description "Request was not understood.";
             }
             enum BAD_ACTION {

-                value 2; 
+                value 2;

                 description "Error in action description.";
             }
             enum FLOW_MOD_FAILED {
                 description "Error in action description.";
             }
             enum FLOW_MOD_FAILED {

-                value 3; 
+                value 3;

                 description "Problem modifying flow entry.";
             }
             enum PORT_MOD_FAILED {
                 description "Problem modifying flow entry.";
             }
             enum PORT_MOD_FAILED {

-                value 4; 
+                value 4;

                 description "Port mod request failed.";
             }
             enum QUEUE_OP_FAILED {
                 description "Port mod request failed.";
             }
             enum QUEUE_OP_FAILED {

-                value 5; 
+                value 5;

                 description "Queue operation failed.";
             }
         }
     }
                 description "Queue operation failed.";
             }
         }
     }

-    
+

     typedef hello-failed-code-v10 {
         type enumeration {
             enum INCOMPATIBLE {
     typedef hello-failed-code-v10 {
         type enumeration {
             enum INCOMPATIBLE {

-                value 0; 
+                value 0;

                 description "Hello Protocol failed.";
             }
             enum EPERM {
                 description "Hello Protocol failed.";
             }
             enum EPERM {

-                value 1; 
+                value 1;

                 description "Request was not understood.";
             }
         }
     }
                 description "Request was not understood.";
             }
         }
     }

-    
+

     typedef bad-request-code-v10 {
         type enumeration {
             enum BAD_VERSION {
     typedef bad-request-code-v10 {
         type enumeration {
             enum BAD_VERSION {

-                value 0; 
+                value 0;

             }
             enum BAD_TYPE {
             }
             enum BAD_TYPE {

-                value 1; 
+                value 1;

             }
             enum BAD_STAT {
             }
             enum BAD_STAT {

-                value 2; 
+                value 2;

             }
             enum BAD_VENDOR {
             }
             enum BAD_VENDOR {

-                value 3; 
+                value 3;

             }
             enum BAD_SUBTYPE {
             }
             enum BAD_SUBTYPE {

-                value 4; 
+                value 4;

             }
             enum EPERM {
             }
             enum EPERM {

-                value 5; 
+                value 5;

             }
             enum BAD_LEN {
             }
             enum BAD_LEN {

-                value 6; 
+                value 6;

             }
             enum BUFFER_EMPTY {
             }
             enum BUFFER_EMPTY {

-                value 7; 
+                value 7;

             }
             enum BUFFER_UNKNOWN {
             }
             enum BUFFER_UNKNOWN {

-                value 8; 
+                value 8;

             }
         }
     }
             }
         }
     }

-    
+

     typedef bad-action-code-v10 {
         type enumeration {
             enum BAD_TYPE {
     typedef bad-action-code-v10 {
         type enumeration {
             enum BAD_TYPE {

-                value 0; 
+                value 0;

             }
             enum BAD_LEN {
             }
             enum BAD_LEN {

-                value 1; 
+                value 1;

             }
             enum VENDOR {
             }
             enum VENDOR {

-                value 2; 
+                value 2;

             }
             enum BAD_VENDOR_TYPE {
             }
             enum BAD_VENDOR_TYPE {

-                value 3; 
+                value 3;

             }
             enum BAD_OUT_PORT {
             }
             enum BAD_OUT_PORT {

-                value 4; 
+                value 4;

             }
             enum BAD_ARGUMENT {
             }
             enum BAD_ARGUMENT {

-                value 5; 
+                value 5;

             }
             enum EPERM {
             }
             enum EPERM {

-                value 6; 
+                value 6;

             }
             enum TOO_MANY {
             }
             enum TOO_MANY {

-                value 7; 
+                value 7;

             }
             enum BAD_QUEUE {
             }
             enum BAD_QUEUE {

-                value 8; 
+                value 8;

             }
         }
     }
             }
         }
     }

-    
+

     typedef flow-mod-failed-code-v10 {
         type enumeration {
             enum ALL_TABLES_FULL {
     typedef flow-mod-failed-code-v10 {
         type enumeration {
             enum ALL_TABLES_FULL {

-                value 0; 
+                value 0;

             }
             enum OVERLAP {
             }
             enum OVERLAP {

-                value 1; 
+                value 1;

             }
             enum EPERM {
             }
             enum EPERM {

-                value 2; 
+                value 2;

             }
             enum BAD_EMERG_TIMEOUT {
             }
             enum BAD_EMERG_TIMEOUT {

-                value 3; 
+                value 3;

             }
             enum BAD_COMMAND {
             }
             enum BAD_COMMAND {

-                value 4; 
+                value 4;

             }
             enum UNSUPPORTED {
             }
             enum UNSUPPORTED {

-                value 5; 
+                value 5;

             }
         }
     }
             }
         }
     }

-    
+

     typedef port-mod-failed-code-v10 {
         type enumeration {
             enum BAD_PORT {
     typedef port-mod-failed-code-v10 {
         type enumeration {
             enum BAD_PORT {

-                value 0; 
+                value 0;

             }
             enum BAD_HW_ADDR {
             }
             enum BAD_HW_ADDR {

-                value 1; 
+                value 1;

             }
         }
     }
             }
         }
     }

-    
+

     typedef queue-op-failed-code-v10 {
         type enumeration {
             enum BAD_PORT {
     typedef queue-op-failed-code-v10 {
         type enumeration {
             enum BAD_PORT {

-                value 0; 
+                value 0;

             }
             enum BAD_QUEUE {
             }
             enum BAD_QUEUE {

-                value 1; 
+                value 1;

             }
             enum EPERM {
             }
             enum EPERM {

-                value 2; 
+                value 2;

             }
         }
     }
             }
         }
     }

-    
+

     typedef port-number-values-v10 {
         description "Port numbering. Physical ports are numbered starting from 1.";
         type enumeration {
             enum MAX {
     typedef port-number-values-v10 {
         description "Port numbering. Physical ports are numbered starting from 1.";
         type enumeration {
             enum MAX {

-                value 65280; // 0xff00 
+                value 65280; // 0xff00

             }
             enum IN_PORT {
                 description "Send the packet out the input port. This
             }
             enum IN_PORT {
                 description "Send the packet out the input port. This


@@ -1610,20 +1610,20 @@
                 description "Perform actions in flow table.
                             NB: This can only be the destination
                             port for packet-out messages.";
                 description "Perform actions in flow table.
                             NB: This can only be the destination
                             port for packet-out messages.";

-                value 65529; // 0xfff9 
+                value 65529; // 0xfff9

             }
             enum NORMAL {
                 description "Process with normal L2/L3 switching.";
             }
             enum NORMAL {
                 description "Process with normal L2/L3 switching.";

-                value 65530; // 0xfffa 
+                value 65530; // 0xfffa

             }
             enum FLOOD {
                 description "All physical ports except input port and
                             those disabled by STP.";
             }
             enum FLOOD {
                 description "All physical ports except input port and
                             those disabled by STP.";

-                value 65531; // 0xfffb 
+                value 65531; // 0xfffb

             }
             enum ALL {
                 description "All physical ports except input port.";
             }
             enum ALL {
                 description "All physical ports except input port.";

-                value 65532; // 0xfffc 
+                value 65532; // 0xfffc

             }
             enum CONTROLLER {
                 description "Send to controller.";
             }
             enum CONTROLLER {
                 description "Send to controller.";


@@ -1639,14 +1639,14 @@
             }
         }
     }
             }
         }
     }

-    
+

     typedef port-config-v10 {
     typedef port-config-v10 {

-        description 
+        description

            "Flags to indicate behavior of the physical port. These flags are
            "Flags to indicate behavior of the physical port. These flags are

-            describe the current configuration and used port_mod message 
+            describe the current configuration and used port_mod message

             to configure the port's behavior.";
         type bits {
             to configure the port's behavior.";
         type bits {

-            bit port-down { 
+            bit port-down {

                 description " Port is administratively down.";
                 position 0;
             }
                 description " Port is administratively down.";
                 position 0;
             }


@@ -1654,29 +1654,29 @@
                 description "Disable 802.1D spanning tree on port.";
                 position 1;
             }
                 description "Disable 802.1D spanning tree on port.";
                 position 1;
             }

-            bit no-recv { 
+            bit no-recv {

                 description " Drop all packets received by port.";
                 position 2;
             }
                 description " Drop all packets received by port.";
                 position 2;
             }

-            bit no-recv-stp { 
+            bit no-recv-stp {

                 description " Drop received 802.1D STP packets.";
                 position 3;
             }
                 description " Drop received 802.1D STP packets.";
                 position 3;
             }

-            bit no-flood { 
+            bit no-flood {

                 description " Do not include this port when flooding.";
                 position 4;
             }
                 description " Do not include this port when flooding.";
                 position 4;
             }

-            bit no-fwd { 
+            bit no-fwd {

                 description " Drop packets forwarded to port.";
                 position 5;
             }
                 description " Drop packets forwarded to port.";
                 position 5;
             }

-            bit no-packet-in { 
+            bit no-packet-in {

                 description "Do not send packet-in msgs for port.";
                 position 6;
             }
         }
     }
                 description "Do not send packet-in msgs for port.";
                 position 6;
             }
         }
     }

-    
+

     typedef port-state-v10 {
         description "Current state of the physical port. These are not configurable from
                     the controller.";
     typedef port-state-v10 {
         description "Current state of the physical port. These are not configurable from
                     the controller.";


@@ -1710,68 +1710,68 @@
             }
         }
     }
             }
         }
     }

-    
+

     typedef port-features-v10 {
         description "Features of ports available in datapath.";
         reference "ofp_port_features";
         type bits {
     typedef port-features-v10 {
         description "Features of ports available in datapath.";
         reference "ofp_port_features";
         type bits {

-            bit _10mb-hd { 
+            bit _10mb-hd {

                 position 0;
                 description "10 Mb half-duplex rate support.";
             }
                 position 0;
                 description "10 Mb half-duplex rate support.";
             }

-            bit _10mb-fd { 
+            bit _10mb-fd {

                 position 1;
                 description "10 Mb full-duplex rate support.";
             }
                 position 1;
                 description "10 Mb full-duplex rate support.";
             }

-            bit _100mb-hd { 
+            bit _100mb-hd {

                 position 2;
                 description "100 Mb half-duplex rate support.";
             }
                 position 2;
                 description "100 Mb half-duplex rate support.";
             }

-            bit _100mb-fd { 
+            bit _100mb-fd {

                 position 3;
                 description "100 Mb full-duplex rate support.";
             }
                 position 3;
                 description "100 Mb full-duplex rate support.";
             }

-            bit _1gb-hd { 
+            bit _1gb-hd {

                 position 4;
                 description "1 Gb half-duplex rate support.";
             }
                 position 4;
                 description "1 Gb half-duplex rate support.";
             }

-            bit _1gb-fd { 
+            bit _1gb-fd {

                 position 5;
                 description "1 Gb full-duplex rate support.";
             }
                 position 5;
                 description "1 Gb full-duplex rate support.";
             }

-            bit _10gb-fd { 
+            bit _10gb-fd {

                 position 6;
                 description "10 Gb full-duplex rate support.";
             }
                 position 6;
                 description "10 Gb full-duplex rate support.";
             }

-            bit copper { 
+            bit copper {

                 position 7;
                 description "Copper medium.";
             }
                 position 7;
                 description "Copper medium.";
             }

-            bit fiber { 
+            bit fiber {

                 position 8;
                 description "Fiber medium.";
             }
                 position 8;
                 description "Fiber medium.";
             }

-            bit autoneg { 
+            bit autoneg {

                 position 9;
                 description "Auto-negotiation.";
             }
                 position 9;
                 description "Auto-negotiation.";
             }

-            bit pause { 
+            bit pause {

                 position 10;
                 description "Pause.";
             }
                 position 10;
                 description "Pause.";
             }

-            bit pause-asym { 
+            bit pause-asym {

                 position 11;
                 description "Asymmetric pause.";
             }
         }
     }
                 position 11;
                 description "Asymmetric pause.";
             }
         }
     }

-    
+

     typedef capabilities-v10 {
         type bits {
             bit OFPC_FLOW_STATS {
                 position 0;
                 description "Flow statistics.";
     typedef capabilities-v10 {
         type bits {
             bit OFPC_FLOW_STATS {
                 position 0;
                 description "Flow statistics.";

-            } 
+            }

             bit OFPC_TABLE_STATS {
                 position 1;
                 description "Table statistics.";
             bit OFPC_TABLE_STATS {
                 position 1;
                 description "Table statistics.";


@@ -1802,7 +1802,7 @@
             }
         }
     }
             }
         }
     }

-    
+

     typedef flow-mod-flags-v10 {
         /* ofp_flow_mod_flags */
         type bits {
     typedef flow-mod-flags-v10 {
         /* ofp_flow_mod_flags */
         type bits {


@@ -1820,7 +1820,7 @@
             }
         }
     }
             }
         }
     }

-    
+

     typedef action-type-v10 {
         /* ofp_action_type */
         type bits {
     typedef action-type-v10 {
         /* ofp_action_type */
         type bits {


@@ -1878,7 +1878,7 @@
             }
         }
     }
             }
         }
     }

-    
+

     typedef flow-wildcards-v10 {
         /* ofp_flow_wildcards */
         description "Flow wildcards - NW_SRC_MASK & NW_DST_MASK are handled separately";
     typedef flow-wildcards-v10 {
         /* ofp_flow_wildcards */
         description "Flow wildcards - NW_SRC_MASK & NW_DST_MASK are handled separately";


@@ -1925,5 +1925,5 @@
             }
         }
     }
             }
         }
     }

-    
+

 }
 }

diff --git a/openflow-protocol-api/src/main/yang/system-notifications.yang b/openflow-protocol-api/src/main/yang/system-notifications.yang
index 4cbe17e7bff13847a970d96d487d35efaac8fd35..b31dd02b63e8c3af5b8d85cae0843ac233712605 100644 (file)
--- a/openflow-protocol-api/src/main/yang/system-notifications.yang
+++ b/openflow-protocol-api/src/main/yang/system-notifications.yang
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

- 
+

  module system-notifications {
     namespace "urn:opendaylight:openflow:system";
     prefix "ofs";
  module system-notifications {
     namespace "urn:opendaylight:openflow:system";
     prefix "ofs";

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageCodeKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageCodeKeyTest.java
index 82377828c6ccaeab741ca8ddb228e0c11f535602..edfa5721416a09f1309d96af361735f6eb136296 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageCodeKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageCodeKeyTest.java
@@ -47,7 +47,7 @@ public class EnhancedMessageCodeKeyTest {
         Assert.assertFalse("Wrong equals", key1.equals(key2));
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
     }
         Assert.assertFalse("Wrong equals", key1.equals(key2));
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
     }

-    
+

     /**
      * Test EnhancedMessageTypeKey equals - additional test
      */
     /**
      * Test EnhancedMessageTypeKey equals - additional test
      */


@@ -55,7 +55,7 @@ public class EnhancedMessageCodeKeyTest {
     public void testEquals() {
          EnhancedMessageCodeKey key1 =
                  new EnhancedMessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, 8, BarrierInput.class);
     public void testEquals() {
          EnhancedMessageCodeKey key1 =
                  new EnhancedMessageCodeKey(EncodeConstants.OF10_VERSION_ID, 4, 8, BarrierInput.class);

-         
+

          Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));
          Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));
     }
          Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));
          Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));
     }

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKeyTest.java
index 40ff08cc706a69a44fbd360d0f3584082882b548..483597c6da5348025df936a67b5c44e92261b6b0 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/EnhancedMessageTypeKeyTest.java
@@ -49,7 +49,7 @@ public class EnhancedMessageTypeKeyTest {
         Assert.assertFalse("Wrong equals", key1.equals(key2));
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
     }
         Assert.assertFalse("Wrong equals", key1.equals(key2));
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
     }

-    
+

     /**
      * Test EnhancedMessageTypeKey equals - additional test
      */
     /**
      * Test EnhancedMessageTypeKey equals - additional test
      */


@@ -59,10 +59,10 @@ public class EnhancedMessageTypeKeyTest {
         EnhancedMessageTypeKey<?,?> key2;
         key1 = new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Action.class, Output.class);
         key2 = new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Action.class, Output.class);
         EnhancedMessageTypeKey<?,?> key2;
         key1 = new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Action.class, Output.class);
         key2 = new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Action.class, Output.class);

-        
+

         Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));
         Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));
         Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));
         Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));

-        
+

         key1 = new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Action.class, null);
         Assert.assertFalse("Wrong equal by msgType2.", key1.equals(key2));
         key1 = new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Action.class, Output.class);
         key1 = new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Action.class, null);
         Assert.assertFalse("Wrong equal by msgType2.", key1.equals(key2));
         key1 = new EnhancedMessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Action.class, Output.class);

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageTypeKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageTypeKeyTest.java
index 83f426c4e126dd57038a88e3a4b6ab53a632bc7a..18a4a1e77661861cc9aa451e21be148950788ff7 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageTypeKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/extensibility/MessageTypeKeyTest.java
@@ -48,7 +48,7 @@ public class MessageTypeKeyTest {
     @Test
     public void testEquals() {
          MessageTypeKey<?> key1;
     @Test
     public void testEquals() {
          MessageTypeKey<?> key1;

-         MessageTypeKey<?> key2; 
+         MessageTypeKey<?> key2;

          key1 = new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, BarrierInput.class);
 
          Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));
          key1 = new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, BarrierInput.class);
 
          Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKeyTest.java
index 6ba052b79f2c7caae3e1fa64481d687d48031861..3b2be12c8917c6a339db92c22acbbebafaa3942b 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionDeserializerKeyTest.java
@@ -40,7 +40,7 @@ public class ActionDeserializerKeyTest {
         Assert.assertFalse("Wrong equals", key1.equals(key2));
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
     }
         Assert.assertFalse("Wrong equals", key1.equals(key2));
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
     }

-    
+

     /**
      * Test ActionDeserializerKey equals - additional test
      */
     /**
      * Test ActionDeserializerKey equals - additional test
      */

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionSerializerKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionSerializerKeyTest.java
index 043a3cfb1fe37e4d3006f6ae4c8a18d2cfb5c8fe..1a1021a1b9354a77879a6f262f0d8e7a09b7babf 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionSerializerKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/ActionSerializerKeyTest.java
@@ -47,7 +47,7 @@ public class ActionSerializerKeyTest {
         Assert.assertFalse("Wrong equals", key1.equals(key2));
         Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
     }
         Assert.assertFalse("Wrong equals", key1.equals(key2));
         Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
     }

-    
+

     /**
      * Test ActionSerializerKey equals - additional test
      */
     /**
      * Test ActionSerializerKey equals - additional test
      */


@@ -55,10 +55,10 @@ public class ActionSerializerKeyTest {
     public void testEquals(){
          ActionSerializerKey<?> key1 = new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, null, 42L);
          ActionSerializerKey<?> key2 = new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, CopyTtlIn.class, 42L);
     public void testEquals(){
          ActionSerializerKey<?> key1 = new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, null, 42L);
          ActionSerializerKey<?> key2 = new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, CopyTtlIn.class, 42L);

-         
+

          Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));
          Assert.assertFalse("Wrong equal by actionType", key1.equals(key2));
          Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));
          Assert.assertFalse("Wrong equal by actionType", key1.equals(key2));

-         
+

          key2 = new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, null, 42L);
          Assert.assertTrue("Wrong equal by action type", key1.equals(key2));
          key1 = new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID,  CopyTtlIn.class, null);
          key2 = new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID, null, 42L);
          Assert.assertTrue("Wrong equal by action type", key1.equals(key2));
          key1 = new ActionSerializerKey<>(EncodeConstants.OF10_VERSION_ID,  CopyTtlIn.class, null);

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKeyTest.java
index 208b4ff7fd7143984ea4e95115a4b8cb7001b414..6b501a1cf074d0c695d9ff4413c017062b9ff39f 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionDeserializerKeyTest.java
@@ -40,7 +40,7 @@ public class InstructionDeserializerKeyTest {
         Assert.assertFalse("Wrong equals", key1.equals(key2));
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
     }
         Assert.assertFalse("Wrong equals", key1.equals(key2));
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
     }

-    
+

     /**
      * Test InstructionDeserializerKey equals - additional test
      */
     /**
      * Test InstructionDeserializerKey equals - additional test
      */

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionSerializerKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionSerializerKeyTest.java
index 23aecd79f770219cbffe6b8933131cc749f0d8cb..a51a2d70e7150a32eaa890c61fdbdc6e9927f2fb 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionSerializerKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/InstructionSerializerKeyTest.java
@@ -47,7 +47,7 @@ public class InstructionSerializerKeyTest {
         Assert.assertFalse("Wrong equals", key1.equals(key2));
         Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
     }
         Assert.assertFalse("Wrong equals", key1.equals(key2));
         Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
     }

-    
+

     /**
      * Test InstructionSerializerKey equals  - additional test
      */
     /**
      * Test InstructionSerializerKey equals  - additional test
      */

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/KeysTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/KeysTest.java
index f270bd92d2653af918ed6da64a6e949bf9c068b2..927ec5d585a683ff26bb0b9c5720fb788ff97762 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/KeysTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/KeysTest.java
@@ -42,7 +42,7 @@ public class KeysTest {
                 EncodeConstants.OF13_VERSION_ID, 1L);
         Assert.assertEquals(instructionDeserializerKey, experimenterInstructionDeserializerKey);
         Assert.assertEquals(instructionDeserializerKey.hashCode(), experimenterInstructionDeserializerKey.hashCode());
                 EncodeConstants.OF13_VERSION_ID, 1L);
         Assert.assertEquals(instructionDeserializerKey, experimenterInstructionDeserializerKey);
         Assert.assertEquals(instructionDeserializerKey.hashCode(), experimenterInstructionDeserializerKey.hashCode());

-        
+

         MatchEntryDeserializerKey matchKey = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID,
                 OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ARP_OP);
         MatchEntryDeserializerKey matchKey2 = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID,
         MatchEntryDeserializerKey matchKey = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID,
                 OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ARP_OP);
         MatchEntryDeserializerKey matchKey2 = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID,


@@ -78,7 +78,7 @@ public class KeysTest {
         Assert.assertEquals(matchKey, matchKey2);
         Assert.assertEquals(matchKey.hashCode(), matchKey2.hashCode());
     }
         Assert.assertEquals(matchKey, matchKey2);
         Assert.assertEquals(matchKey.hashCode(), matchKey2.hashCode());
     }

-    
+

     private static class ExpSubType extends ExperimenterActionSubType {
         // empty class - only used in test for comparation
     }
     private static class ExpSubType extends ExperimenterActionSubType {
         // empty class - only used in test for comparation
     }

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKeyTest.java
index 5c69cc65d01f6cdc6e1b49e94bc9f564b8aba943..c3d9cf90f9eafa53c45227e6c5f1e31018243ae2 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntryDeserializerKeyTest.java
@@ -46,7 +46,7 @@ public class MatchEntryDeserializerKeyTest {
         Assert.assertTrue("Wrong equals", key1.equals(key2));
         Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode());
     }
         Assert.assertTrue("Wrong equals", key1.equals(key2));
         Assert.assertTrue("Wrong hashcode", key1.hashCode() == key2.hashCode());
     }

-    
+

     /**
      * Test MatchEntryDeserializerKey equals - additional test
      */
     /**
      * Test MatchEntryDeserializerKey equals - additional test
      */


@@ -54,16 +54,16 @@ public class MatchEntryDeserializerKeyTest {
     public void testEquals() {
          MatchEntryDeserializerKey key1 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42);
          MatchEntryDeserializerKey key2 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42);
     public void testEquals() {
          MatchEntryDeserializerKey key1 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42);
          MatchEntryDeserializerKey key2 = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42);

-         
+

          Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));
          Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));
          Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));
          Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));

-         
+

          Long expId1=123456L;
          Long expId2=654321L;
          key1.setExperimenterId(null);
          key2.setExperimenterId(expId2);
          Assert.assertFalse("Wrong equal by experimeterId.", key1.equals(key2));
          Long expId1=123456L;
          Long expId2=654321L;
          key1.setExperimenterId(null);
          key2.setExperimenterId(expId2);
          Assert.assertFalse("Wrong equal by experimeterId.", key1.equals(key2));

-         
+

          key1.setExperimenterId(expId1);
          Assert.assertFalse("Wrong equal by experimeterId.", key1.equals(key2));
          Assert.assertFalse("Wrong equals with different object class", key1.equals(key2));
          key1.setExperimenterId(expId1);
          Assert.assertFalse("Wrong equal by experimeterId.", key1.equals(key2));
          Assert.assertFalse("Wrong equals with different object class", key1.equals(key2));

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKeyTest.java
index 0863db37aeead4d153af4b83fb1de42ed30d734d..8bf98fdaea6f41e91bde14be2619023ec2a7b228 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/MatchEntrySerializerKeyTest.java
@@ -56,9 +56,9 @@ public class MatchEntrySerializerKeyTest {
         key2.setExperimenterId(42L);
         Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
     }
         key2.setExperimenterId(42L);
         Assert.assertFalse("Wrong hashCode", key1.hashCode() == key2.hashCode());
     }

-    
+

     /**
     /**

-     * Test MatchEntrySerializerKey equals - additional test 
+     * Test MatchEntrySerializerKey equals - additional test

      */
     @Test
     public void testEquals(){
      */
     @Test
     public void testEquals(){


@@ -68,10 +68,10 @@ public class MatchEntrySerializerKeyTest {
         key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, InPort.class);
         Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));
         Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));
         key2 = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, InPort.class);
         Assert.assertTrue("Wrong equal to identical object.", key1.equals(key1));
         Assert.assertFalse("Wrong equal to different class.", key1.equals(new Object()));

-        
+

         Long expId1 = 987654331L;
         Long expId2 = 123456789L;
         Long expId1 = 987654331L;
         Long expId2 = 123456789L;

-        
+

         key1.setExperimenterId(null);
         key2.setExperimenterId(expId2);
         Assert.assertFalse("Wrong equal by experimenterId", key1.equals(key2));
         key1.setExperimenterId(null);
         key2.setExperimenterId(expId2);
         Assert.assertFalse("Wrong equal by experimenterId", key1.equals(key2));

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKeyTest.java
index c8111fbda788ecfe332d3090223b527b59a109d2..f287d3a34c9481ff8e05609dc4e8aa782d2218c6 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKeyTest.java
@@ -60,7 +60,7 @@ public class ExperimenterActionSerializerKeyTest {
         Assert.assertFalse("Wrong equal by actionSubType.", key1.equals(key2));
     }
 
         Assert.assertFalse("Wrong equal by actionSubType.", key1.equals(key2));
     }
 

- 
+

     private static class TestSubType extends ExperimenterActionSubType {
         // empty class - only used in test for comparation
     }
     private static class TestSubType extends ExperimenterActionSubType {
         // empty class - only used in test for comparation
     }


@@ -68,6 +68,6 @@ public class ExperimenterActionSerializerKeyTest {
     private static class TestSubType2 extends ExperimenterActionSubType {
         // empty class - only used in test for comparation
     }
     private static class TestSubType2 extends ExperimenterActionSubType {
         // empty class - only used in test for comparation
     }

-    
+

 
 }
\ No newline at end of file
 
 }
\ No newline at end of file

diff --git a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdSerializerKeyTest.java b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdSerializerKeyTest.java
index 06f06cbfe7f1f8ccb802e53d2e1e4b6bd4f07416..e931d6a7410a220c886d290523f8477fd2c0826d 100644 (file)
--- a/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdSerializerKeyTest.java
+++ b/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterIdSerializerKeyTest.java
@@ -48,7 +48,7 @@ public class ExperimenterIdSerializerKeyTest {
         Assert.assertFalse("Wrong equals", key1.equals(key2));
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
     }
         Assert.assertFalse("Wrong equals", key1.equals(key2));
         Assert.assertFalse("Wrong hashcode", key1.hashCode() == key2.hashCode());
     }

-    
+

     /**
      * Test ExperimenterIdSerializerKey equals - additional test
      */
     /**
      * Test ExperimenterIdSerializerKey equals - additional test
      */


@@ -63,5 +63,5 @@ public class ExperimenterIdSerializerKeyTest {
                 new ExperimenterIdSerializerKey<>(EncodeConstants.OF10_VERSION_ID, 42L, ExperimenterMessage.class);
         Assert.assertFalse("Wrong equal by experimenterId.", key1.equals(key2));
     }
                 new ExperimenterIdSerializerKey<>(EncodeConstants.OF10_VERSION_ID, 42L, ExperimenterMessage.class);
         Assert.assertFalse("Wrong equal by experimenterId.", key1.equals(key2));
     }

-    
+

 }
\ No newline at end of file
 }
\ No newline at end of file

diff --git a/openflow-protocol-impl/pom.xml b/openflow-protocol-impl/pom.xml
index 8cc54c0938a20f052f1dfcfe750e6f2f5bc0e15a..ba83903a9e858c2e830d4b7b4fc8240c1fdcabe7 100644 (file)
--- a/openflow-protocol-impl/pom.xml
+++ b/openflow-protocol-impl/pom.xml
@@ -18,7 +18,7 @@
         <yangtools.generator.version>0.7.0-SNAPSHOT</yangtools.generator.version>
         <yangtools.binding.version>0.7.0-SNAPSHOT</yangtools.binding.version>
     </properties>
         <yangtools.generator.version>0.7.0-SNAPSHOT</yangtools.generator.version>
         <yangtools.binding.version>0.7.0-SNAPSHOT</yangtools.binding.version>
     </properties>

-    
+

     <build>
         <plugins>
             <plugin>
     <build>
         <plugins>
             <plugin>


@@ -98,7 +98,7 @@
             </plugin>
         </plugins>
     </build>
             </plugin>
         </plugins>
     </build>

-    
+

     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/ChannelInitializerFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/ChannelInitializerFactory.java
index 7328f8c76f12aed9ffefa070b973102f65a70b13..042d464081b28b05c2896d0167f204f4bb3c575f 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/ChannelInitializerFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/ChannelInitializerFactory.java
@@ -24,7 +24,7 @@ public class ChannelInitializerFactory {
     private SerializationFactory serializationFactory;
     private TlsConfiguration tlsConfig;
     private SwitchConnectionHandler switchConnectionHandler;
     private SerializationFactory serializationFactory;
     private TlsConfiguration tlsConfig;
     private SwitchConnectionHandler switchConnectionHandler;

-    
+

     /**
      * @return PublishingChannelInitializer that initializes new channels
      */
     /**
      * @return PublishingChannelInitializer that initializes new channels
      */

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketHandler.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketHandler.java
index 74e9c3a3287d286097ab373b8c9764da51dc967d..685985ec236178cf9475adb0d4d4a05afff15b3f 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketHandler.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/OFDatagramPacketHandler.java
@@ -79,7 +79,7 @@ public class OFDatagramPacketHandler extends MessageToMessageDecoder<DatagramPac
 
         int length = bb.getUnsignedShort(bb.readerIndex() + LENGTH_INDEX_IN_HEADER);
         LOGGER.debug("length of actual message: {}", length);
 
         int length = bb.getUnsignedShort(bb.readerIndex() + LENGTH_INDEX_IN_HEADER);
         LOGGER.debug("length of actual message: {}", length);

-        
+

         if (readableBytes < length) {
             if (LOGGER.isDebugEnabled()) {
                 LOGGER.debug("skipping bytebuf - too few bytes for msg: " +
         if (readableBytes < length) {
             if (LOGGER.isDebugEnabled()) {
                 LOGGER.debug("skipping bytebuf - too few bytes for msg: " +


@@ -90,7 +90,7 @@ public class OFDatagramPacketHandler extends MessageToMessageDecoder<DatagramPac
         }
         LOGGER.debug("OF Protocol message received, type:{}", bb.getByte(bb.readerIndex() + 1));
 
         }
         LOGGER.debug("OF Protocol message received, type:{}", bb.getByte(bb.readerIndex() + 1));
 

-        
+

         byte version = bb.readByte();
         if ((version == EncodeConstants.OF13_VERSION_ID) || (version == EncodeConstants.OF10_VERSION_ID)) {
             LOGGER.debug("detected version: " + version);
         byte version = bb.readByte();
         if ((version == EncodeConstants.OF13_VERSION_ID) || (version == EncodeConstants.OF10_VERSION_ID)) {
             LOGGER.debug("detected version: " + version);

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/OFEncoder.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/OFEncoder.java
index 5a739497c3703a7dbfb2416520f351a57323a1bb..075b99da2bb30bddaca8c1fc4707cdd18d44b1eb 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/OFEncoder.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/OFEncoder.java
@@ -31,7 +31,7 @@ public class OFEncoder extends MessageToByteEncoder<MessageListenerWrapper> {
     private static final Logger LOGGER = LoggerFactory.getLogger(OFEncoder.class);
     private SerializationFactory serializationFactory;
     private StatisticsCounters statisticsCounters;
     private static final Logger LOGGER = LoggerFactory.getLogger(OFEncoder.class);
     private SerializationFactory serializationFactory;
     private StatisticsCounters statisticsCounters;

-    
+

     /** Constructor of class */
     public OFEncoder() {
         statisticsCounters = StatisticsCounters.getInstance();
     /** Constructor of class */
     public OFEncoder() {
         statisticsCounters = StatisticsCounters.getInstance();

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/OFFrameDecoder.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/OFFrameDecoder.java
index 4bc5ce875df647d39f09d22605adc6674867d508..5c3b76167d70d5030ddfdf221a7c1f3340e90f79 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/OFFrameDecoder.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/OFFrameDecoder.java
@@ -72,10 +72,10 @@ public class OFFrameDecoder extends ByteToMessageDecoder {
             }
             return;
         }
             }
             return;
         }

-        
+

         int length = bb.getUnsignedShort(bb.readerIndex() + LENGTH_INDEX_IN_HEADER);
         LOGGER.debug("length of actual message: {}", length);
         int length = bb.getUnsignedShort(bb.readerIndex() + LENGTH_INDEX_IN_HEADER);
         LOGGER.debug("length of actual message: {}", length);

-        
+

         if (readableBytes < length) {
             if (LOGGER.isDebugEnabled()) {
                 LOGGER.debug("skipping bytebuf - too few bytes for msg: " +
         if (readableBytes < length) {
             if (LOGGER.isDebugEnabled()) {
                 LOGGER.debug("skipping bytebuf - too few bytes for msg: " +


@@ -85,7 +85,7 @@ public class OFFrameDecoder extends ByteToMessageDecoder {
             return;
         }
         LOGGER.debug("OF Protocol message received, type:{}", bb.getByte(bb.readerIndex() + 1));
             return;
         }
         LOGGER.debug("OF Protocol message received, type:{}", bb.getByte(bb.readerIndex() + 1));

-        
+

         ByteBuf messageBuffer = bb.slice(bb.readerIndex(), length);
         list.add(messageBuffer);
         messageBuffer.retain();
         ByteBuf messageBuffer = bb.slice(bb.readerIndex(), length);
         list.add(messageBuffer);
         messageBuffer.retain();

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/PipelineHandlers.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/PipelineHandlers.java
index 26dad6d1b8ad931e5df4edd76e8edb3428aaae52..51ac5482bb1fb95cd5573a370ffce5a4fda9003f 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/PipelineHandlers.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/PipelineHandlers.java
@@ -10,7 +10,7 @@ package org.opendaylight.openflowjava.protocol.impl.core;
 
 /**
  * Stores names of handlers used in pipeline.
 
 /**
  * Stores names of handlers used in pipeline.

- * 
+ *

  * @author michal.polkorab
  */
 public enum PipelineHandlers {
  * @author michal.polkorab
  */
 public enum PipelineHandlers {

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/ShutdownProvider.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/ShutdownProvider.java
index a3372ef8200e4c9c677e274b2c76210c10aa968d..15978def520e0cdbac50b30590a71b03576de436 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/ShutdownProvider.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/ShutdownProvider.java
@@ -18,7 +18,7 @@ import com.google.common.util.concurrent.ListenableFuture;
 public interface ShutdownProvider {
 
     /**
 public interface ShutdownProvider {
 
     /**

-     * @return shutdown future 
+     * @return shutdown future

      */
     ListenableFuture<Boolean> shutdown();
 
      */
     ListenableFuture<Boolean> shutdown();
 

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SslContextFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SslContextFactory.java
index 965cab3d79c44311ed0be84a7f1673731db5cf4c..b2c5a199f53d9f2da23c873d6fc1a2ede6f6db5c 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SslContextFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/SslContextFactory.java
@@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Class for setting up TLS connection.
 
 /**
  * Class for setting up TLS connection.

- * 
+ *

  * @author michal.polkorab
  */
 public class SslContextFactory {
  * @author michal.polkorab
  */
 public class SslContextFactory {

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/TcpChannelInitializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/TcpChannelInitializer.java
index 6b97482569e0248dd3664e16c975d3cb97ca0dd0..07aab35488884c0b46fc049656eeff364e784ee3 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/TcpChannelInitializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/TcpChannelInitializer.java
@@ -45,13 +45,13 @@ public class TcpChannelInitializer extends ProtocolChannelInitializer<SocketChan
 
     /**
      * Testing Constructor
 
     /**
      * Testing Constructor

-     * 
+     *

      */
     protected TcpChannelInitializer( DefaultChannelGroup channelGroup, ConnectionAdapterFactory connAdaptorFactory ) {
        allChannels = channelGroup ;
        connectionAdapterFactory = connAdaptorFactory ;
     }
      */
     protected TcpChannelInitializer( DefaultChannelGroup channelGroup, ConnectionAdapterFactory connAdaptorFactory ) {
        allChannels = channelGroup ;
        connectionAdapterFactory = connAdaptorFactory ;
     }

-    
+

     @Override
     protected void initChannel(final SocketChannel ch) {
         InetAddress switchAddress = ch.remoteAddress().getAddress();
     @Override
     protected void initChannel(final SocketChannel ch) {
         InetAddress switchAddress = ch.remoteAddress().getAddress();

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/UdpHandler.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/UdpHandler.java
index 0d7bb4e5b13783625d9dc138184e762f2c3e9143..3e6e384e66c83a408e52152f1b569a4a8b731a09 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/UdpHandler.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/UdpHandler.java
@@ -28,7 +28,7 @@ import com.google.common.util.concurrent.SettableFuture;
 
 /**
  * Class implementing server over UDP for handling incoming connections.
 
 /**
  * Class implementing server over UDP for handling incoming connections.

- * 
+ *

  * @author michal.polkorab
  */
 public final class UdpHandler implements ServerFacade {
  * @author michal.polkorab
  */
 public final class UdpHandler implements ServerFacade {

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 e9a8bf98b59a0860cd2045a47337a6f212561cff..c1625e5b073bcca538892527e4851f74f8bcf231 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
@@ -14,7 +14,7 @@ import java.net.InetSocketAddress;
 
 /**
  * Wraps received messages (includes version) and sender address
 
 /**
  * Wraps received messages (includes version) and sender address

- 
+

  * @author michal.polkorab
  */
 public class VersionMessageUdpWrapper extends VersionMessageWrapper {
  * @author michal.polkorab
  */
 public class VersionMessageUdpWrapper extends VersionMessageWrapper {

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 f04ae92d2c987d85b389f4f632e8773f9b651ddb..a61298de454f145cf1ff2115e97224ffa96dbc7c 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
@@ -18,7 +18,7 @@ public class VersionMessageWrapper {
 
     private short version;
     private ByteBuf messageBuffer;
 
     private short version;
     private ByteBuf messageBuffer;

-    
+

     /**
      * Constructor
      * @param version version decoded in {@link OFVersionDetector}
     /**
      * Constructor
      * @param version version decoded in {@link OFVersionDetector}


@@ -42,6 +42,6 @@ public class VersionMessageWrapper {
     public ByteBuf getMessageBuffer() {
         return messageBuffer;
     }
     public ByteBuf getMessageBuffer() {
         return messageBuffer;
     }

-    
-    
+
+

 }
 }

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ChannelOutboundQueue.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ChannelOutboundQueue.java
index 7a43db626923b06a0057d068ff64d2dbe065925f..65b9c6a6b9384900f94dd5c5d543af8cb775cc10 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ChannelOutboundQueue.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ChannelOutboundQueue.java
@@ -185,7 +185,7 @@ final class ChannelOutboundQueue extends ChannelInboundHandlerAdapter {
             }
 
             final GenericFutureListener<Future<Void>> l = h.takeListener();
             }
 
             final GenericFutureListener<Future<Void>> l = h.takeListener();

-            
+

             final ChannelFuture p;
             if (address == null) {
                 p = channel.write(new MessageListenerWrapper(h.takeMessage(), l));
             final ChannelFuture p;
             if (address == null) {
                 p = channel.write(new MessageListenerWrapper(h.takeMessage(), l));

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/MessageListenerWrapper.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/MessageListenerWrapper.java
index ec415b389a9d54548ada7b21f2a9795842022b9b..4b98fd8cfece67a7853356f8acc1a72dbfd357bf 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/MessageListenerWrapper.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/MessageListenerWrapper.java
@@ -16,7 +16,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 /**
  * Wraps outgoing message and includes listener attached to this message. This object
  * is sent to OFEncoder. When OFEncoder fails to serialize the message,
 /**
  * Wraps outgoing message and includes listener attached to this message. This object
  * is sent to OFEncoder. When OFEncoder fails to serialize the message,

- * listener is filled with exception. The exception is then delegated to upper ODL layers. 
+ * listener is filled with exception. The exception is then delegated to upper ODL layers.

  * @author michal.polkorab
  */
 public class MessageListenerWrapper {
  * @author michal.polkorab
  */
 public class MessageListenerWrapper {


@@ -40,7 +40,7 @@ public class MessageListenerWrapper {
         return msg;
     }
 
         return msg;
     }
 

-    
+

     /**
      * @return listener listening on message sending success / failure
      */
     /**
      * @return listener listening on message sending success / failure
      */

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/RpcResponseKey.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/RpcResponseKey.java
index 067c5603116ffbfcaaaf00d65416ef2c937ec451..2463f3f296dda26e5c440bbb6efc1a9dbd50b35d 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/RpcResponseKey.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/RpcResponseKey.java
@@ -15,7 +15,7 @@ package org.opendaylight.openflowjava.protocol.impl.core.connection;
  * @author mirehak
  */
 public class RpcResponseKey {
  * @author mirehak
  */
 public class RpcResponseKey {

-    
+

     private final long xid;
     private final String outputClazz;
     /**
     private final long xid;
     private final String outputClazz;
     /**


@@ -26,7 +26,7 @@ public class RpcResponseKey {
         this.xid = xid;
         this.outputClazz = outputClazz;
     }
         this.xid = xid;
         this.outputClazz = outputClazz;
     }

-    
+

     /**
      * @return the xid
      */
     /**
      * @return the xid
      */


@@ -40,7 +40,7 @@ public class RpcResponseKey {
     public String getOutputClazz() {
         return outputClazz;
     }
     public String getOutputClazz() {
         return outputClazz;
     }

-    
+

     @Override
     public int hashCode() {
         final int prime = 31;
     @Override
     public int hashCode() {
         final int prime = 31;

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/UdpMessageListenerWrapper.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/UdpMessageListenerWrapper.java
index a946cf5468be6a033272ff15c01d469e16a1d93a..e783dc42aee7ab706251d489f1305e6aabe09501 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/UdpMessageListenerWrapper.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/core/connection/UdpMessageListenerWrapper.java
@@ -18,7 +18,7 @@ import java.net.InetSocketAddress;
  * is sent to OFEncoder. When OFEncoder fails to serialize the message,
  * listener is filled with exception. The exception is then delegated to upper ODL layers.
  * This object is used for UDP communication - it also carries recipient address
  * is sent to OFEncoder. When OFEncoder fails to serialize the message,
  * listener is filled with exception. The exception is then delegated to upper ODL layers.
  * This object is used for UDP communication - it also carries recipient address

- 
+

  * @author michal.polkorab
  */
 public class UdpMessageListenerWrapper extends MessageListenerWrapper {
  * @author michal.polkorab
  */
 public class UdpMessageListenerWrapper extends MessageListenerWrapper {

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/ActionDeserializerInitializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/ActionDeserializerInitializer.java
index e946f30f19f5c759a2be8dd00e035cc4ec77fd5e..1c6c5d203763f1554bfb119b0decb9d2be6203cd 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/ActionDeserializerInitializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/ActionDeserializerInitializer.java
@@ -56,7 +56,7 @@ public final class ActionDeserializerInitializer {
      */
     public static void registerDeserializers(DeserializerRegistry registry) {
         // register OF v1.0 action deserializers
      */
     public static void registerDeserializers(DeserializerRegistry registry) {
         // register OF v1.0 action deserializers

-        ActionDeserializerRegistryHelper helper = 
+        ActionDeserializerRegistryHelper helper =

                 new ActionDeserializerRegistryHelper(EncodeConstants.OF10_VERSION_ID, registry);
         helper.registerDeserializer(0, new OF10OutputActionDeserializer());
         helper.registerDeserializer(1, new OF10SetVlanVidActionDeserializer());
                 new ActionDeserializerRegistryHelper(EncodeConstants.OF10_VERSION_ID, registry);
         helper.registerDeserializer(0, new OF10OutputActionDeserializer());
         helper.registerDeserializer(1, new OF10SetVlanVidActionDeserializer());

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassMapInitializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassMapInitializer.java
index b0b4d04777f61c5899658e58790434ddea2438e9..9ed52140e7ee489be17a38124983ea270137381d 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassMapInitializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassMapInitializer.java
@@ -44,7 +44,7 @@ public final class TypeToClassMapInitializer {
      */
     public static void initializeTypeToClassMap(Map<TypeToClassKey, Class<?>> messageClassMap) {
         // init OF v1.0 mapping
      */
     public static void initializeTypeToClassMap(Map<TypeToClassKey, Class<?>> messageClassMap) {
         // init OF v1.0 mapping

-        TypeToClassInitHelper helper = 
+        TypeToClassInitHelper helper =

                 new TypeToClassInitHelper(EncodeConstants.OF10_VERSION_ID, messageClassMap);
         helper.registerTypeToClass((short) 0, HelloMessage.class);
         helper.registerTypeToClass((short) 1, ErrorMessage.class);
                 new TypeToClassInitHelper(EncodeConstants.OF10_VERSION_ID, messageClassMap);
         helper.registerTypeToClass((short) 0, HelloMessage.class);
         helper.registerTypeToClass((short) 1, ErrorMessage.class);

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ErrorMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ErrorMessageFactory.java
index 8e341bd0444ce4c70904c94ceedd3e1c6c6a929c..daae36346d58ea860967695a699cba89ede61775 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ErrorMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ErrorMessageFactory.java
@@ -68,7 +68,7 @@ public class ErrorMessageFactory implements OFDeserializer<ErrorMessage>,
         }
         return builder.build();
     }
         }
         return builder.build();
     }

-    
+

     private static void decodeType(ErrorMessageBuilder builder, ErrorType type, int readValue) {
         if (type != null) {
             builder.setType(type.getIntValue());
     private static void decodeType(ErrorMessageBuilder builder, ErrorType type, int readValue) {
         if (type != null) {
             builder.setType(type.getIntValue());


@@ -232,12 +232,12 @@ public class ErrorMessageFactory implements OFDeserializer<ErrorMessage>,
             setUnknownCode(builder, code);
         }
     }
             setUnknownCode(builder, code);
         }
     }

-    
+

     private static void setUnknownCode(ErrorMessageBuilder builder, int readValue) {
         builder.setCode(readValue);
         builder.setCodeString(UNKNOWN_CODE);
     }
     private static void setUnknownCode(ErrorMessageBuilder builder, int readValue) {
         builder.setCode(readValue);
         builder.setCodeString(UNKNOWN_CODE);
     }

-    
+

     private static void setCode(ErrorMessageBuilder builder, int code, String codeString) {
         builder.setCode(code);
         builder.setCodeString(codeString);
     private static void setCode(ErrorMessageBuilder builder, int code, String codeString) {
         builder.setCode(code);
         builder.setCodeString(codeString);

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetAsyncReplyMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetAsyncReplyMessageFactory.java
index d565fa6344450b7571d5744a24d7b27fcc7efaa0..39d757cc784fdbbcbb304406dee605cb3620dda5 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetAsyncReplyMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetAsyncReplyMessageFactory.java
@@ -46,18 +46,18 @@ public class GetAsyncReplyMessageFactory implements OFDeserializer<GetAsyncOutpu
         builder.setFlowRemovedMask(decodeFlowRemovedMask(rawMessage));
         return builder.build();
     }
         builder.setFlowRemovedMask(decodeFlowRemovedMask(rawMessage));
         return builder.build();
     }

-    
+

     private static List<PacketInMask> decodePacketInMask(ByteBuf input) {
         List<PacketInMask> inMasks = new ArrayList<>();
         PacketInMaskBuilder maskBuilder;
         for (int i = 0; i < SEPARATE_ROLES; i++) {
             maskBuilder = new PacketInMaskBuilder();
             maskBuilder.setMask(decodePacketInReasons(input.readUnsignedInt()));
     private static List<PacketInMask> decodePacketInMask(ByteBuf input) {
         List<PacketInMask> inMasks = new ArrayList<>();
         PacketInMaskBuilder maskBuilder;
         for (int i = 0; i < SEPARATE_ROLES; i++) {
             maskBuilder = new PacketInMaskBuilder();
             maskBuilder.setMask(decodePacketInReasons(input.readUnsignedInt()));

-            inMasks.add(maskBuilder.build()); 
+            inMasks.add(maskBuilder.build());

         }
         return inMasks;
     }
         }
         return inMasks;
     }

-    
+

     private static List<PortStatusMask> decodePortStatusMask(ByteBuf input) {
         List<PortStatusMask> inMasks = new ArrayList<>();
         PortStatusMaskBuilder maskBuilder;
     private static List<PortStatusMask> decodePortStatusMask(ByteBuf input) {
         List<PortStatusMask> inMasks = new ArrayList<>();
         PortStatusMaskBuilder maskBuilder;


@@ -68,7 +68,7 @@ public class GetAsyncReplyMessageFactory implements OFDeserializer<GetAsyncOutpu
         }
         return inMasks;
     }
         }
         return inMasks;
     }

-    
+

     private static List<FlowRemovedMask> decodeFlowRemovedMask(ByteBuf input) {
         List<FlowRemovedMask> inMasks = new ArrayList<>();
         FlowRemovedMaskBuilder maskBuilder;
     private static List<FlowRemovedMask> decodeFlowRemovedMask(ByteBuf input) {
         List<FlowRemovedMask> inMasks = new ArrayList<>();
         FlowRemovedMaskBuilder maskBuilder;


@@ -79,7 +79,7 @@ public class GetAsyncReplyMessageFactory implements OFDeserializer<GetAsyncOutpu
         }
         return inMasks;
     }
         }
         return inMasks;
     }

-    
+

     private static List<PacketInReason> decodePacketInReasons(long input) {
         List<PacketInReason> reasons = new ArrayList<>();
         if ((input & (1 << 0)) != 0) {
     private static List<PacketInReason> decodePacketInReasons(long input) {
         List<PacketInReason> reasons = new ArrayList<>();
         if ((input & (1 << 0)) != 0) {


@@ -93,7 +93,7 @@ public class GetAsyncReplyMessageFactory implements OFDeserializer<GetAsyncOutpu
         }
         return reasons;
     }
         }
         return reasons;
     }

-    
+

     private static List<PortReason> decodePortReasons(long input) {
         List<PortReason> reasons = new ArrayList<>();
         if ((input & (1 << 0)) != 0) {
     private static List<PortReason> decodePortReasons(long input) {
         List<PortReason> reasons = new ArrayList<>();
         if ((input & (1 << 0)) != 0) {


@@ -107,7 +107,7 @@ public class GetAsyncReplyMessageFactory implements OFDeserializer<GetAsyncOutpu
         }
         return reasons;
     }
         }
         return reasons;
     }

-    
+

     private static List<FlowRemovedReason> decodeFlowRemovedReasons(long input) {
         List<FlowRemovedReason> reasons = new ArrayList<>();
         if ((input & (1 << 0)) != 0) {
     private static List<FlowRemovedReason> decodeFlowRemovedReasons(long input) {
         List<FlowRemovedReason> reasons = new ArrayList<>();
         if ((input & (1 << 0)) != 0) {

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/HelloMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/HelloMessageFactory.java
index 5fafb5e3b03b524a793a3c2d2c56dc319d13b0cd..ca0a79c8d2271809a4674da4363188ba030a181c 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/HelloMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/HelloMessageFactory.java
@@ -39,7 +39,7 @@ public class HelloMessageFactory implements OFDeserializer<HelloMessage> {
         }
         return builder.build();
     }
         }
         return builder.build();
     }

-    
+

     private static List<Elements> readElement(ByteBuf input) {
         List<Elements> elementsList = new ArrayList<>();
         while (input.readableBytes() > 0) {
     private static List<Elements> readElement(ByteBuf input) {
         List<Elements> elementsList = new ArrayList<>();
         while (input.readableBytes() > 0) {


@@ -64,7 +64,7 @@ public class HelloMessageFactory implements OFDeserializer<HelloMessage> {
         }
         return elementsList;
     }
         }
         return elementsList;
     }

-    
+

     private static List<Boolean> readVersionBitmap(int[] input){
         List<Boolean> versionBitmapList = new ArrayList<>();
         for (int i = 0; i < input.length; i++) {
     private static List<Boolean> readVersionBitmap(int[] input){
         List<Boolean> versionBitmapList = new ArrayList<>();
         for (int i = 0; i < input.length; i++) {

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java
index b27712f56bee7190edd192ee96b4362cc216dbc2..7d7f752427c4969936710dcc45dc5c66d9a16d5b 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java
@@ -196,11 +196,11 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         case OFPMPAGGREGATE:  builder.setMultipartReplyBody(setAggregate(rawMessage));
                  break;
         case OFPMPTABLE:  builder.setMultipartReplyBody(setTable(rawMessage));
         case OFPMPAGGREGATE:  builder.setMultipartReplyBody(setAggregate(rawMessage));
                  break;
         case OFPMPTABLE:  builder.setMultipartReplyBody(setTable(rawMessage));

-                 break;         
+                 break;

         case OFPMPPORTSTATS:  builder.setMultipartReplyBody(setPortStats(rawMessage));
                  break;
         case OFPMPQUEUE:  builder.setMultipartReplyBody(setQueue(rawMessage));
         case OFPMPPORTSTATS:  builder.setMultipartReplyBody(setPortStats(rawMessage));
                  break;
         case OFPMPQUEUE:  builder.setMultipartReplyBody(setQueue(rawMessage));

-                 break;         
+                 break;

         case OFPMPGROUP:  builder.setMultipartReplyBody(setGroup(rawMessage));
                  break;
         case OFPMPGROUPDESC:  builder.setMultipartReplyBody(setGroupDesc(rawMessage));
         case OFPMPGROUP:  builder.setMultipartReplyBody(setGroup(rawMessage));
                  break;
         case OFPMPGROUPDESC:  builder.setMultipartReplyBody(setGroupDesc(rawMessage));


@@ -219,13 +219,13 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
                  break;
         case OFPMPEXPERIMENTER: builder.setMultipartReplyBody(setExperimenter(rawMessage));
                  break;
                  break;
         case OFPMPEXPERIMENTER: builder.setMultipartReplyBody(setExperimenter(rawMessage));
                  break;

-        default: 
+        default:

                  break;
         }
                  break;
         }

-        
+

         return builder.build();
     }
         return builder.build();
     }

-    
+

     private static MultipartReplyDescCase setDesc(ByteBuf input) {
         MultipartReplyDescCaseBuilder caseBuilder = new MultipartReplyDescCaseBuilder();
         MultipartReplyDescBuilder descBuilder = new MultipartReplyDescBuilder();
     private static MultipartReplyDescCase setDesc(ByteBuf input) {
         MultipartReplyDescCaseBuilder caseBuilder = new MultipartReplyDescCaseBuilder();
         MultipartReplyDescBuilder descBuilder = new MultipartReplyDescBuilder();


@@ -252,7 +252,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         caseBuilder.setMultipartReplyDesc(descBuilder.build());
         return caseBuilder.build();
     }
         caseBuilder.setMultipartReplyDesc(descBuilder.build());
         return caseBuilder.build();
     }

-    
+

     private MultipartReplyFlowCase setFlow(ByteBuf input) {
         MultipartReplyFlowCaseBuilder caseBuilder = new MultipartReplyFlowCaseBuilder();
         MultipartReplyFlowBuilder flowBuilder = new MultipartReplyFlowBuilder();
     private MultipartReplyFlowCase setFlow(ByteBuf input) {
         MultipartReplyFlowCaseBuilder caseBuilder = new MultipartReplyFlowCaseBuilder();
         MultipartReplyFlowBuilder flowBuilder = new MultipartReplyFlowBuilder();


@@ -293,16 +293,16 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         caseBuilder.setMultipartReplyFlow(flowBuilder.build());
         return caseBuilder.build();
     }
         caseBuilder.setMultipartReplyFlow(flowBuilder.build());
         return caseBuilder.build();
     }

-    
+

     private static FlowModFlags createFlowModFlagsFromBitmap(int input){
         final Boolean fmfSENDFLOWREM = (input & (1 << 0)) != 0;
         final Boolean fmfCHECKOVERLAP = (input & (1 << 1)) != 0;
     private static FlowModFlags createFlowModFlagsFromBitmap(int input){
         final Boolean fmfSENDFLOWREM = (input & (1 << 0)) != 0;
         final Boolean fmfCHECKOVERLAP = (input & (1 << 1)) != 0;

-        final Boolean fmfRESETCOUNTS = (input & (1 << 2)) != 0; 
+        final Boolean fmfRESETCOUNTS = (input & (1 << 2)) != 0;

         final Boolean fmfNOPKTCOUNTS = (input & (1 << 3)) != 0;
         final Boolean fmfNOBYTCOUNTS = (input & (1 << 4)) != 0;
         return new FlowModFlags(fmfCHECKOVERLAP, fmfNOBYTCOUNTS, fmfNOPKTCOUNTS, fmfRESETCOUNTS, fmfSENDFLOWREM);
     }
         final Boolean fmfNOPKTCOUNTS = (input & (1 << 3)) != 0;
         final Boolean fmfNOBYTCOUNTS = (input & (1 << 4)) != 0;
         return new FlowModFlags(fmfCHECKOVERLAP, fmfNOBYTCOUNTS, fmfNOPKTCOUNTS, fmfRESETCOUNTS, fmfSENDFLOWREM);
     }

-    
+

     private static MultipartReplyAggregateCase setAggregate(ByteBuf input) {
         MultipartReplyAggregateCaseBuilder caseBuilder = new MultipartReplyAggregateCaseBuilder();
         MultipartReplyAggregateBuilder builder = new MultipartReplyAggregateBuilder();
     private static MultipartReplyAggregateCase setAggregate(ByteBuf input) {
         MultipartReplyAggregateCaseBuilder caseBuilder = new MultipartReplyAggregateCaseBuilder();
         MultipartReplyAggregateBuilder builder = new MultipartReplyAggregateBuilder();


@@ -317,7 +317,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         caseBuilder.setMultipartReplyAggregate(builder.build());
         return caseBuilder.build();
     }
         caseBuilder.setMultipartReplyAggregate(builder.build());
         return caseBuilder.build();
     }

-    
+

     private static MultipartReplyTableCase setTable(ByteBuf input) {
         MultipartReplyTableCaseBuilder caseBuilder = new MultipartReplyTableCaseBuilder();
         MultipartReplyTableBuilder builder = new MultipartReplyTableBuilder();
     private static MultipartReplyTableCase setTable(ByteBuf input) {
         MultipartReplyTableCaseBuilder caseBuilder = new MultipartReplyTableCaseBuilder();
         MultipartReplyTableBuilder builder = new MultipartReplyTableBuilder();


@@ -339,7 +339,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         caseBuilder.setMultipartReplyTable(builder.build());
         return caseBuilder.build();
     }
         caseBuilder.setMultipartReplyTable(builder.build());
         return caseBuilder.build();
     }

-    
+

     private MultipartReplyTableFeaturesCase setTableFeatures(ByteBuf input) {
         MultipartReplyTableFeaturesCaseBuilder caseBuilder = new MultipartReplyTableFeaturesCaseBuilder();
         MultipartReplyTableFeaturesBuilder builder = new MultipartReplyTableFeaturesBuilder();
     private MultipartReplyTableFeaturesCase setTableFeatures(ByteBuf input) {
         MultipartReplyTableFeaturesCaseBuilder caseBuilder = new MultipartReplyTableFeaturesCaseBuilder();
         MultipartReplyTableFeaturesBuilder builder = new MultipartReplyTableFeaturesBuilder();


@@ -358,7 +358,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
             featuresBuilder.setMetadataWrite(metadataWrite);
             featuresBuilder.setConfig(createTableConfig(input.readUnsignedInt()));
             featuresBuilder.setMaxEntries(input.readUnsignedInt());
             featuresBuilder.setMetadataWrite(metadataWrite);
             featuresBuilder.setConfig(createTableConfig(input.readUnsignedInt()));
             featuresBuilder.setMaxEntries(input.readUnsignedInt());

-            featuresBuilder.setTableFeatureProperties(createTableFeaturesProperties(input, 
+            featuresBuilder.setTableFeatureProperties(createTableFeaturesProperties(input,

                     length - MULTIPART_REPLY_TABLE_FEATURES_STRUCTURE_LENGTH));
             features.add(featuresBuilder.build());
         }
                     length - MULTIPART_REPLY_TABLE_FEATURES_STRUCTURE_LENGTH));
             features.add(featuresBuilder.build());
         }


@@ -366,12 +366,12 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         caseBuilder.setMultipartReplyTableFeatures(builder.build());
         return caseBuilder.build();
     }
         caseBuilder.setMultipartReplyTableFeatures(builder.build());
         return caseBuilder.build();
     }

-    
+

     private static TableConfig createTableConfig(long input) {
         boolean deprecated = (input & 3) != 0;
         return new TableConfig(deprecated);
     }
     private static TableConfig createTableConfig(long input) {
         boolean deprecated = (input & 3) != 0;
         return new TableConfig(deprecated);
     }

-    
+

     private List<TableFeatureProperties> createTableFeaturesProperties(ByteBuf input, int length) {
         List<TableFeatureProperties> properties = new ArrayList<>();
         int tableFeaturesLength = length;
     private List<TableFeatureProperties> createTableFeaturesProperties(ByteBuf input, int length) {
         List<TableFeatureProperties> properties = new ArrayList<>();
         int tableFeaturesLength = length;


@@ -446,7 +446,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         }
         return properties;
     }
         }
         return properties;
     }

-    
+

     private static MultipartReplyPortStatsCase setPortStats(ByteBuf input) {
         MultipartReplyPortStatsCaseBuilder caseBuilder = new MultipartReplyPortStatsCaseBuilder();
         MultipartReplyPortStatsBuilder builder = new MultipartReplyPortStatsBuilder();
     private static MultipartReplyPortStatsCase setPortStats(ByteBuf input) {
         MultipartReplyPortStatsCaseBuilder caseBuilder = new MultipartReplyPortStatsCaseBuilder();
         MultipartReplyPortStatsBuilder builder = new MultipartReplyPortStatsBuilder();


@@ -499,7 +499,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         caseBuilder.setMultipartReplyPortStats(builder.build());
         return caseBuilder.build();
     }
         caseBuilder.setMultipartReplyPortStats(builder.build());
         return caseBuilder.build();
     }

-    
+

     private static MultipartReplyQueueCase setQueue(ByteBuf input) {
        MultipartReplyQueueCaseBuilder caseBuilder = new MultipartReplyQueueCaseBuilder();
         MultipartReplyQueueBuilder builder = new MultipartReplyQueueBuilder();
     private static MultipartReplyQueueCase setQueue(ByteBuf input) {
        MultipartReplyQueueCaseBuilder caseBuilder = new MultipartReplyQueueCaseBuilder();
         MultipartReplyQueueBuilder builder = new MultipartReplyQueueBuilder();


@@ -525,7 +525,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         caseBuilder.setMultipartReplyQueue(builder.build());
         return caseBuilder.build();
     }
         caseBuilder.setMultipartReplyQueue(builder.build());
         return caseBuilder.build();
     }

-    
+

     private static MultipartReplyGroupCase setGroup(ByteBuf input) {
         MultipartReplyGroupCaseBuilder caseBuilder = new MultipartReplyGroupCaseBuilder();
         MultipartReplyGroupBuilder builder = new MultipartReplyGroupBuilder();
     private static MultipartReplyGroupCase setGroup(ByteBuf input) {
         MultipartReplyGroupCaseBuilder caseBuilder = new MultipartReplyGroupCaseBuilder();
         MultipartReplyGroupBuilder builder = new MultipartReplyGroupBuilder();


@@ -557,7 +557,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
                 bucketStatsBuilder.setByteCount(new BigInteger(1, byteCountBucket));
                 bucketStatsList.add(bucketStatsBuilder.build());
                 actualLength += BUCKET_COUNTER_LENGTH;
                 bucketStatsBuilder.setByteCount(new BigInteger(1, byteCountBucket));
                 bucketStatsList.add(bucketStatsBuilder.build());
                 actualLength += BUCKET_COUNTER_LENGTH;

-            } 
+            }

             groupStatsBuilder.setBucketStats(bucketStatsList);
             groupStatsList.add(groupStatsBuilder.build());
         }
             groupStatsBuilder.setBucketStats(bucketStatsList);
             groupStatsList.add(groupStatsBuilder.build());
         }


@@ -565,7 +565,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         caseBuilder.setMultipartReplyGroup(builder.build());
         return caseBuilder.build();
     }
         caseBuilder.setMultipartReplyGroup(builder.build());
         return caseBuilder.build();
     }

-    
+

     private static MultipartReplyMeterFeaturesCase setMeterFeatures(ByteBuf input) {
         MultipartReplyMeterFeaturesCaseBuilder caseBuilder = new MultipartReplyMeterFeaturesCaseBuilder();
         MultipartReplyMeterFeaturesBuilder builder = new MultipartReplyMeterFeaturesBuilder();
     private static MultipartReplyMeterFeaturesCase setMeterFeatures(ByteBuf input) {
         MultipartReplyMeterFeaturesCaseBuilder caseBuilder = new MultipartReplyMeterFeaturesCaseBuilder();
         MultipartReplyMeterFeaturesBuilder builder = new MultipartReplyMeterFeaturesBuilder();


@@ -578,7 +578,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         caseBuilder.setMultipartReplyMeterFeatures(builder.build());
         return caseBuilder.build();
     }
         caseBuilder.setMultipartReplyMeterFeatures(builder.build());
         return caseBuilder.build();
     }

-    
+

     private static MeterFlags createMeterFlags(long input){
         final Boolean mfKBPS = (input & (1 << 0)) != 0;
         final Boolean mfPKTPS = (input & (1 << 1)) != 0;
     private static MeterFlags createMeterFlags(long input){
         final Boolean mfKBPS = (input & (1 << 0)) != 0;
         final Boolean mfPKTPS = (input & (1 << 1)) != 0;


@@ -586,13 +586,13 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         final Boolean mfSTATS = (input & (1 << 3)) != 0;
         return new MeterFlags(mfBURST, mfKBPS, mfPKTPS, mfSTATS);
     }
         final Boolean mfSTATS = (input & (1 << 3)) != 0;
         return new MeterFlags(mfBURST, mfKBPS, mfPKTPS, mfSTATS);
     }

-    
+

     private static MeterBandTypeBitmap createMeterBandsBitmap(long input) {
         final Boolean mbtDROP = (input & (1 << 1)) != 0;
         final Boolean mbtDSCPREMARK = (input & (1 << 2)) != 0;
         return new MeterBandTypeBitmap(mbtDROP, mbtDSCPREMARK);
     }
     private static MeterBandTypeBitmap createMeterBandsBitmap(long input) {
         final Boolean mbtDROP = (input & (1 << 1)) != 0;
         final Boolean mbtDSCPREMARK = (input & (1 << 2)) != 0;
         return new MeterBandTypeBitmap(mbtDROP, mbtDSCPREMARK);
     }

-    
+

     private static MultipartReplyMeterCase setMeter(ByteBuf input) {
         MultipartReplyMeterCaseBuilder caseBuilder = new MultipartReplyMeterCaseBuilder();
         MultipartReplyMeterBuilder builder = new MultipartReplyMeterBuilder();
     private static MultipartReplyMeterCase setMeter(ByteBuf input) {
         MultipartReplyMeterCaseBuilder caseBuilder = new MultipartReplyMeterCaseBuilder();
         MultipartReplyMeterBuilder builder = new MultipartReplyMeterBuilder();


@@ -631,7 +631,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         caseBuilder.setMultipartReplyMeter(builder.build());
         return caseBuilder.build();
     }
         caseBuilder.setMultipartReplyMeter(builder.build());
         return caseBuilder.build();
     }

-    
+

     private MultipartReplyMeterConfigCase setMeterConfig(ByteBuf input) {
         MultipartReplyMeterConfigCaseBuilder caseBuilder = new MultipartReplyMeterConfigCaseBuilder();
         MultipartReplyMeterConfigBuilder builder = new MultipartReplyMeterConfigBuilder();
     private MultipartReplyMeterConfigCase setMeterConfig(ByteBuf input) {
         MultipartReplyMeterConfigCaseBuilder caseBuilder = new MultipartReplyMeterConfigCaseBuilder();
         MultipartReplyMeterConfigBuilder builder = new MultipartReplyMeterConfigBuilder();


@@ -692,12 +692,12 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         caseBuilder.setMultipartReplyMeterConfig(builder.build());
         return caseBuilder.build();
     }
         caseBuilder.setMultipartReplyMeterConfig(builder.build());
         return caseBuilder.build();
     }

-    
+

     private MultipartReplyExperimenterCase setExperimenter(ByteBuf input) {
         return registry.getDeserializer(ExperimenterDeserializerKeyFactory.createMultipartReplyMessageDeserializerKey(
                 EncodeConstants.OF13_VERSION_ID, input.readUnsignedInt()));
     }
     private MultipartReplyExperimenterCase setExperimenter(ByteBuf input) {
         return registry.getDeserializer(ExperimenterDeserializerKeyFactory.createMultipartReplyMessageDeserializerKey(
                 EncodeConstants.OF13_VERSION_ID, input.readUnsignedInt()));
     }

-    
+

     private static MultipartReplyPortDescCase setPortDesc(ByteBuf input) {
         MultipartReplyPortDescCaseBuilder caseBuilder = new MultipartReplyPortDescCaseBuilder();
         MultipartReplyPortDescBuilder builder = new MultipartReplyPortDescBuilder();
     private static MultipartReplyPortDescCase setPortDesc(ByteBuf input) {
         MultipartReplyPortDescCaseBuilder caseBuilder = new MultipartReplyPortDescCaseBuilder();
         MultipartReplyPortDescBuilder builder = new MultipartReplyPortDescBuilder();


@@ -725,7 +725,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         caseBuilder.setMultipartReplyPortDesc(builder.build());
         return caseBuilder.build();
     }
         caseBuilder.setMultipartReplyPortDesc(builder.build());
         return caseBuilder.build();
     }

-    
+

     private static PortConfig createPortConfig(long input){
         final Boolean pcPortDown   = ((input) & (1<<0)) != 0;
         final Boolean pcNRecv    = ((input) & (1<<2)) != 0;
     private static PortConfig createPortConfig(long input){
         final Boolean pcPortDown   = ((input) & (1<<0)) != 0;
         final Boolean pcNRecv    = ((input) & (1<<2)) != 0;


@@ -733,14 +733,14 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         final Boolean pcNPacketIn = ((input) & (1<<6)) != 0;
         return new PortConfig(pcNFwd, pcNPacketIn, pcNRecv, pcPortDown);
     }
         final Boolean pcNPacketIn = ((input) & (1<<6)) != 0;
         return new PortConfig(pcNFwd, pcNPacketIn, pcNRecv, pcPortDown);
     }

-    
+

     private static PortState createPortState(long input){
         final Boolean psLinkDown = ((input) & (1<<0)) != 0;
         final Boolean psBlocked  = ((input) & (1<<1)) != 0;
         final Boolean psLive     = ((input) & (1<<2)) != 0;
         return new PortState(psBlocked, psLinkDown, psLive);
     }
     private static PortState createPortState(long input){
         final Boolean psLinkDown = ((input) & (1<<0)) != 0;
         final Boolean psBlocked  = ((input) & (1<<1)) != 0;
         final Boolean psLive     = ((input) & (1<<2)) != 0;
         return new PortState(psBlocked, psLinkDown, psLive);
     }

-    
+

     private static PortFeatures createPortFeatures(long input){
         final Boolean pf10mbHd = ((input) & (1<<0)) != 0;
         final Boolean pf10mbFd = ((input) & (1<<1)) != 0;
     private static PortFeatures createPortFeatures(long input){
         final Boolean pf10mbHd = ((input) & (1<<0)) != 0;
         final Boolean pf10mbFd = ((input) & (1<<1)) != 0;


@@ -761,7 +761,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         return new PortFeatures(pf100gbFd, pf100mbFd, pf100mbHd, pf10gbFd, pf10mbFd, pf10mbHd, pf1gbFd,
                 pf1gbHd, pf1tbFd, pf40gbFd, pfAutoneg, pfCopper, pfFiber, pfOther, pfPause, pfPauseAsym);
     }
         return new PortFeatures(pf100gbFd, pf100mbFd, pf100mbHd, pf10gbFd, pf10mbFd, pf10mbHd, pf1gbFd,
                 pf1gbHd, pf1tbFd, pf40gbFd, pfAutoneg, pfCopper, pfFiber, pfOther, pfPause, pfPauseAsym);
     }

-    
+

     private static MultipartReplyGroupFeaturesCase setGroupFeatures(ByteBuf rawMessage) {
         MultipartReplyGroupFeaturesCaseBuilder caseBuilder = new MultipartReplyGroupFeaturesCaseBuilder();
         MultipartReplyGroupFeaturesBuilder featuresBuilder = new MultipartReplyGroupFeaturesBuilder();
     private static MultipartReplyGroupFeaturesCase setGroupFeatures(ByteBuf rawMessage) {
         MultipartReplyGroupFeaturesCaseBuilder caseBuilder = new MultipartReplyGroupFeaturesCaseBuilder();
         MultipartReplyGroupFeaturesBuilder featuresBuilder = new MultipartReplyGroupFeaturesBuilder();


@@ -780,7 +780,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         caseBuilder.setMultipartReplyGroupFeatures(featuresBuilder.build());
         return caseBuilder.build();
     }
         caseBuilder.setMultipartReplyGroupFeatures(featuresBuilder.build());
         return caseBuilder.build();
     }

-    
+

     private static ActionType createActionBitmap(long input) {
         final Boolean atOutput = ((input) & (1<<0)) != 0;
         final Boolean atCopyTTLout = ((input) & (1<<11)) != 0;
     private static ActionType createActionBitmap(long input) {
         final Boolean atOutput = ((input) & (1<<0)) != 0;
         final Boolean atCopyTTLout = ((input) & (1<<11)) != 0;


@@ -820,7 +820,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         final Boolean gtFF = ((input) & (1<<3)) != 0;
         return new GroupTypes(gtAll, gtFF, gtIndirect, gtSelect);
     }
         final Boolean gtFF = ((input) & (1<<3)) != 0;
         return new GroupTypes(gtAll, gtFF, gtIndirect, gtSelect);
     }

-    
+

     private MultipartReplyGroupDescCase setGroupDesc(ByteBuf input) {
         MultipartReplyGroupDescCaseBuilder caseBuilder = new MultipartReplyGroupDescCaseBuilder();
         MultipartReplyGroupDescBuilder builder = new MultipartReplyGroupDescBuilder();
     private MultipartReplyGroupDescCase setGroupDesc(ByteBuf input) {
         MultipartReplyGroupDescCaseBuilder caseBuilder = new MultipartReplyGroupDescCaseBuilder();
         MultipartReplyGroupDescBuilder builder = new MultipartReplyGroupDescBuilder();

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10ErrorMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10ErrorMessageFactory.java
index dda0fd36e01f4d7ba4458e48b71b857c358bf7ea..fb19113ed441413fadee39d82ba96e3dd0521e6d 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10ErrorMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10ErrorMessageFactory.java
@@ -45,7 +45,7 @@ public class OF10ErrorMessageFactory implements OFDeserializer<ErrorMessage> {
         }
         return builder.build();
     }
         }
         return builder.build();
     }

-    
+

     private static void decodeType(ErrorMessageBuilder builder, ErrorTypeV10 type, int readValue) {
         if (type != null) {
             builder.setType(type.getIntValue());
     private static void decodeType(ErrorMessageBuilder builder, ErrorTypeV10 type, int readValue) {
         if (type != null) {
             builder.setType(type.getIntValue());


@@ -129,12 +129,12 @@ public class OF10ErrorMessageFactory implements OFDeserializer<ErrorMessage> {
                setUnknownCode(builder, code);
        }
     }
                setUnknownCode(builder, code);
        }
     }

-    
+

     private static void setUnknownCode(ErrorMessageBuilder builder, int readValue) {
        builder.setCode(readValue);
                builder.setCodeString(UNKNOWN_CODE);
     }
     private static void setUnknownCode(ErrorMessageBuilder builder, int readValue) {
        builder.setCode(readValue);
                builder.setCodeString(UNKNOWN_CODE);
     }

-    
+

     private static void setCode(ErrorMessageBuilder builder, int code, String codeString) {
        builder.setCode(code);
                builder.setCodeString(codeString);
     private static void setCode(ErrorMessageBuilder builder, int code, String codeString) {
        builder.setCode(code);
                builder.setCodeString(codeString);

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactory.java
index f8f967e4637edddcf1d848f9247b031eaa64507b..469f920edfa50555233182dd0fa0d65f6ef9f78b 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactory.java
@@ -31,7 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
  * @author michal.polkorab
  */
 public class OF10FeaturesReplyMessageFactory implements OFDeserializer<GetFeaturesOutput> {
  * @author michal.polkorab
  */
 public class OF10FeaturesReplyMessageFactory implements OFDeserializer<GetFeaturesOutput> {

-    
+

     private static final byte PADDING_IN_FEATURES_REPLY_HEADER = 3;
 
     @Override
     private static final byte PADDING_IN_FEATURES_REPLY_HEADER = 3;
 
     @Override


@@ -67,7 +67,7 @@ public class OF10FeaturesReplyMessageFactory implements OFDeserializer<GetFeatur
         return new CapabilitiesV10(arpMatchIp, flowStats, ipReasm,
                 portStats, queueStats, reserved, stp, tableStats);
     }
         return new CapabilitiesV10(arpMatchIp, flowStats, ipReasm,
                 portStats, queueStats, reserved, stp, tableStats);
     }

-    
+

     private static ActionTypeV10 createActionsV10(long input) {
         final Boolean output = (input & (1 << 0)) != 0;
         final Boolean setVLANvid = (input & (1 << 1)) != 0;
     private static ActionTypeV10 createActionsV10(long input) {
         final Boolean output = (input & (1 << 0)) != 0;
         final Boolean setVLANvid = (input & (1 << 1)) != 0;

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactory.java
index eed4b104289de8cbe436feb5f56535faba018625..9c3b72e71cce1462fadc39f0402b20e4503239c9 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactory.java
@@ -29,7 +29,7 @@ public class OF10PortStatusMessageFactory implements OFDeserializer<PortStatusMe
 
     @Override
     public PortStatusMessage deserialize(ByteBuf rawMessage) {
 
     @Override
     public PortStatusMessage deserialize(ByteBuf rawMessage) {

-        PortStatusMessageBuilder builder = new PortStatusMessageBuilder(); 
+        PortStatusMessageBuilder builder = new PortStatusMessageBuilder();

         builder.setVersion((short) EncodeConstants.OF10_VERSION_ID);
         builder.setXid(rawMessage.readUnsignedInt());
         builder.setReason(PortReason.forValue(rawMessage.readUnsignedByte()));
         builder.setVersion((short) EncodeConstants.OF10_VERSION_ID);
         builder.setXid(rawMessage.readUnsignedInt());
         builder.setReason(PortReason.forValue(rawMessage.readUnsignedByte()));

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10QueueGetConfigReplyMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10QueueGetConfigReplyMessageFactory.java
index 51f058d3d6273b1d28257ae63e8ac5d9658ec619..e0110c40ea0fae26974f2e6f8fd01e2770442416 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10QueueGetConfigReplyMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10QueueGetConfigReplyMessageFactory.java
@@ -49,7 +49,7 @@ public class OF10QueueGetConfigReplyMessageFactory implements OFDeserializer<Get
         builder.setQueues(createQueuesList(rawMessage));
         return builder.build();
     }
         builder.setQueues(createQueuesList(rawMessage));
         return builder.build();
     }

-    
+

     private static List<Queues> createQueuesList(ByteBuf input){
         List<Queues> queuesList = new ArrayList<>();
         while (input.readableBytes() > 0) {
     private static List<Queues> createQueuesList(ByteBuf input){
         List<Queues> queuesList = new ArrayList<>();
         while (input.readableBytes() > 0) {


@@ -59,10 +59,10 @@ public class OF10QueueGetConfigReplyMessageFactory implements OFDeserializer<Get
             input.skipBytes(PADDING_IN_PACKET_QUEUE_HEADER);
             queueBuilder.setQueueProperty(createPropertiesList(input, length - PACKET_QUEUE_HEADER_LENGTH));
             queuesList.add(queueBuilder.build());
             input.skipBytes(PADDING_IN_PACKET_QUEUE_HEADER);
             queueBuilder.setQueueProperty(createPropertiesList(input, length - PACKET_QUEUE_HEADER_LENGTH));
             queuesList.add(queueBuilder.build());

-        } 
+        }

         return queuesList;
     }
         return queuesList;
     }

-    
+

     private static List<QueueProperty> createPropertiesList(ByteBuf input, int length){
         int propertiesLength = length;
         List<QueueProperty> propertiesList = new ArrayList<>();
     private static List<QueueProperty> createPropertiesList(ByteBuf input, int length){
         int propertiesLength = length;
         List<QueueProperty> propertiesList = new ArrayList<>();


@@ -82,4 +82,4 @@ public class OF10QueueGetConfigReplyMessageFactory implements OFDeserializer<Get
         }
         return propertiesList;
     }
         }
         return propertiesList;
     }

-} 
\ No newline at end of file
+}
\ No newline at end of file

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactory.java
index df7f6940b416bcf5232bea97b15d0b9d75cf5cd2..ccea543fa11a234a1df449a4ba9e443f4e901825 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactory.java
@@ -95,19 +95,19 @@ public class OF10StatsReplyMessageFactory implements OFDeserializer<MultipartRep
         case OFPMPAGGREGATE:  builder.setMultipartReplyBody(setAggregate(rawMessage));
             break;
         case OFPMPTABLE:  builder.setMultipartReplyBody(setTable(rawMessage));
         case OFPMPAGGREGATE:  builder.setMultipartReplyBody(setAggregate(rawMessage));
             break;
         case OFPMPTABLE:  builder.setMultipartReplyBody(setTable(rawMessage));

-            break;         
+            break;

         case OFPMPPORTSTATS:  builder.setMultipartReplyBody(setPortStats(rawMessage));
             break;
         case OFPMPQUEUE:  builder.setMultipartReplyBody(setQueue(rawMessage));
         case OFPMPPORTSTATS:  builder.setMultipartReplyBody(setPortStats(rawMessage));
             break;
         case OFPMPQUEUE:  builder.setMultipartReplyBody(setQueue(rawMessage));

-            break;         
+            break;

         case OFPMPEXPERIMENTER: builder.setMultipartReplyBody(setExperimenter(rawMessage));
             break;
         case OFPMPEXPERIMENTER: builder.setMultipartReplyBody(setExperimenter(rawMessage));
             break;

-        default: 
+        default:

             break;
         }
         return builder.build();
     }
             break;
         }
         return builder.build();
     }

-    
+

     private static MultipartReplyDescCase setDesc(ByteBuf input) {
         MultipartReplyDescCaseBuilder caseBuilder = new MultipartReplyDescCaseBuilder();
         MultipartReplyDescBuilder descBuilder = new MultipartReplyDescBuilder();
     private static MultipartReplyDescCase setDesc(ByteBuf input) {
         MultipartReplyDescCaseBuilder caseBuilder = new MultipartReplyDescCaseBuilder();
         MultipartReplyDescBuilder descBuilder = new MultipartReplyDescBuilder();


@@ -134,7 +134,7 @@ public class OF10StatsReplyMessageFactory implements OFDeserializer<MultipartRep
         caseBuilder.setMultipartReplyDesc(descBuilder.build());
         return caseBuilder.build();
     }
         caseBuilder.setMultipartReplyDesc(descBuilder.build());
         return caseBuilder.build();
     }

-    
+

     private MultipartReplyFlowCase setFlow(ByteBuf input) {
         MultipartReplyFlowCaseBuilder caseBuilder = new MultipartReplyFlowCaseBuilder();
         MultipartReplyFlowBuilder flowBuilder = new MultipartReplyFlowBuilder();
     private MultipartReplyFlowCase setFlow(ByteBuf input) {
         MultipartReplyFlowCaseBuilder caseBuilder = new MultipartReplyFlowCaseBuilder();
         MultipartReplyFlowBuilder flowBuilder = new MultipartReplyFlowBuilder();


@@ -172,7 +172,7 @@ public class OF10StatsReplyMessageFactory implements OFDeserializer<MultipartRep
         caseBuilder.setMultipartReplyFlow(flowBuilder.build());
         return caseBuilder.build();
     }
         caseBuilder.setMultipartReplyFlow(flowBuilder.build());
         return caseBuilder.build();
     }

-    
+

     private static MultipartReplyAggregateCase setAggregate(ByteBuf input) {
         MultipartReplyAggregateCaseBuilder caseBuilder = new MultipartReplyAggregateCaseBuilder();
         MultipartReplyAggregateBuilder builder = new MultipartReplyAggregateBuilder();
     private static MultipartReplyAggregateCase setAggregate(ByteBuf input) {
         MultipartReplyAggregateCaseBuilder caseBuilder = new MultipartReplyAggregateCaseBuilder();
         MultipartReplyAggregateBuilder builder = new MultipartReplyAggregateBuilder();


@@ -187,7 +187,7 @@ public class OF10StatsReplyMessageFactory implements OFDeserializer<MultipartRep
         caseBuilder.setMultipartReplyAggregate(builder.build());
         return caseBuilder.build();
     }
         caseBuilder.setMultipartReplyAggregate(builder.build());
         return caseBuilder.build();
     }

-    
+

     private static MultipartReplyTableCase setTable(ByteBuf input) {
         MultipartReplyTableCaseBuilder caseBuilder = new MultipartReplyTableCaseBuilder();
         MultipartReplyTableBuilder builder = new MultipartReplyTableBuilder();
     private static MultipartReplyTableCase setTable(ByteBuf input) {
         MultipartReplyTableCaseBuilder caseBuilder = new MultipartReplyTableCaseBuilder();
         MultipartReplyTableBuilder builder = new MultipartReplyTableBuilder();


@@ -217,7 +217,7 @@ public class OF10StatsReplyMessageFactory implements OFDeserializer<MultipartRep
         caseBuilder.setMultipartReplyTable(builder.build());
         return caseBuilder.build();
     }
         caseBuilder.setMultipartReplyTable(builder.build());
         return caseBuilder.build();
     }

-    
+

     private static MultipartReplyPortStatsCase setPortStats(ByteBuf input) {
         MultipartReplyPortStatsCaseBuilder caseBuilder = new MultipartReplyPortStatsCaseBuilder();
         MultipartReplyPortStatsBuilder builder = new MultipartReplyPortStatsBuilder();
     private static MultipartReplyPortStatsCase setPortStats(ByteBuf input) {
         MultipartReplyPortStatsCaseBuilder caseBuilder = new MultipartReplyPortStatsCaseBuilder();
         MultipartReplyPortStatsBuilder builder = new MultipartReplyPortStatsBuilder();


@@ -268,7 +268,7 @@ public class OF10StatsReplyMessageFactory implements OFDeserializer<MultipartRep
         caseBuilder.setMultipartReplyPortStats(builder.build());
         return caseBuilder.build();
     }
         caseBuilder.setMultipartReplyPortStats(builder.build());
         return caseBuilder.build();
     }

-    
+

     private static MultipartReplyQueueCase setQueue(ByteBuf input) {
         MultipartReplyQueueCaseBuilder caseBuilder = new MultipartReplyQueueCaseBuilder();
         MultipartReplyQueueBuilder builder = new MultipartReplyQueueBuilder();
     private static MultipartReplyQueueCase setQueue(ByteBuf input) {
         MultipartReplyQueueCaseBuilder caseBuilder = new MultipartReplyQueueCaseBuilder();
         MultipartReplyQueueBuilder builder = new MultipartReplyQueueBuilder();


@@ -293,7 +293,7 @@ public class OF10StatsReplyMessageFactory implements OFDeserializer<MultipartRep
         caseBuilder.setMultipartReplyQueue(builder.build());
         return caseBuilder.build();
     }
         caseBuilder.setMultipartReplyQueue(builder.build());
         return caseBuilder.build();
     }

-    
+

     private MultipartReplyExperimenterCase setExperimenter(ByteBuf input) {
         return registry.getDeserializer(ExperimenterDeserializerKeyFactory.createMultipartReplyMessageDeserializerKey(
                 EncodeConstants.OF10_VERSION_ID, input.readUnsignedInt()));
     private MultipartReplyExperimenterCase setExperimenter(ByteBuf input) {
         return registry.getDeserializer(ExperimenterDeserializerKeyFactory.createMultipartReplyMessageDeserializerKey(
                 EncodeConstants.OF10_VERSION_ID, input.readUnsignedInt()));

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactory.java
index 5bd9cb32b4670809468e087a2150edc344e5d248..fe3d7ac7bf4103a77ba722c247f262e745416897 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactory.java
@@ -34,7 +34,7 @@ public class PortStatusMessageFactory implements OFDeserializer<PortStatusMessag
 
     @Override
     public PortStatusMessage deserialize(ByteBuf rawMessage) {
 
     @Override
     public PortStatusMessage deserialize(ByteBuf rawMessage) {

-        PortStatusMessageBuilder builder = new PortStatusMessageBuilder(); 
+        PortStatusMessageBuilder builder = new PortStatusMessageBuilder();

         builder.setVersion((short) EncodeConstants.OF13_VERSION_ID);
         builder.setXid(rawMessage.readUnsignedInt());
         builder.setReason(PortReason.forValue(rawMessage.readUnsignedByte()));
         builder.setVersion((short) EncodeConstants.OF13_VERSION_ID);
         builder.setXid(rawMessage.readUnsignedInt());
         builder.setReason(PortReason.forValue(rawMessage.readUnsignedByte()));


@@ -77,14 +77,14 @@ public class PortStatusMessageFactory implements OFDeserializer<PortStatusMessag
         return new PortFeatures(pf100gbFd, pf100mbFd, pf100mbHd, pf10gbFd, pf10mbFd, pf10mbHd, pf1gbFd,
                 pf1gbHd, pf1tbFd, pf40gbFd, pfAutoneg, pfCopper, pfFiber, pfOther, pfPause, pfPauseAsym);
     }
         return new PortFeatures(pf100gbFd, pf100mbFd, pf100mbHd, pf10gbFd, pf10mbFd, pf10mbHd, pf1gbFd,
                 pf1gbHd, pf1tbFd, pf40gbFd, pfAutoneg, pfCopper, pfFiber, pfOther, pfPause, pfPauseAsym);
     }

-    
+

     private static PortState createPortState(long input){
         final Boolean psLinkDown = ((input) & (1<<0)) != 0;
         final Boolean psBblocked  = ((input) & (1<<1)) != 0;
         final Boolean psLive     = ((input) & (1<<2)) != 0;
         return new PortState(psBblocked, psLinkDown, psLive);
     }
     private static PortState createPortState(long input){
         final Boolean psLinkDown = ((input) & (1<<0)) != 0;
         final Boolean psBblocked  = ((input) & (1<<1)) != 0;
         final Boolean psLive     = ((input) & (1<<2)) != 0;
         return new PortState(psBblocked, psLinkDown, psLive);
     }

-    
+

     private static PortConfig createPortConfig(long input){
         final Boolean pcPortDown   = ((input) & (1<<0)) != 0;
         final Boolean pcNoRecv    = ((input) & (1<<2)) != 0;
     private static PortConfig createPortConfig(long input){
         final Boolean pcPortDown   = ((input) & (1<<0)) != 0;
         final Boolean pcNoRecv    = ((input) & (1<<2)) != 0;

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactory.java
index a85b996e3bd90761dd682f4e161332056cffea77..d6090a3254b0fede2a591eb79f8775be70409d42 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactory.java
@@ -55,7 +55,7 @@ public class QueueGetConfigReplyMessageFactory implements OFDeserializer<GetQueu
         builder.setQueues(createQueuesList(rawMessage));
         return builder.build();
     }
         builder.setQueues(createQueuesList(rawMessage));
         return builder.build();
     }

-    
+

     private List<Queues> createQueuesList(ByteBuf input){
         List<Queues> queuesList = new ArrayList<>();
         while (input.readableBytes() > 0) {
     private List<Queues> createQueuesList(ByteBuf input){
         List<Queues> queuesList = new ArrayList<>();
         while (input.readableBytes() > 0) {


@@ -66,10 +66,10 @@ public class QueueGetConfigReplyMessageFactory implements OFDeserializer<GetQueu
             input.skipBytes(PADDING_IN_PACKET_QUEUE_HEADER);
             queueBuilder.setQueueProperty(createPropertiesList(input, length - PACKET_QUEUE_LENGTH));
             queuesList.add(queueBuilder.build());
             input.skipBytes(PADDING_IN_PACKET_QUEUE_HEADER);
             queueBuilder.setQueueProperty(createPropertiesList(input, length - PACKET_QUEUE_LENGTH));
             queuesList.add(queueBuilder.build());

-        } 
+        }

         return queuesList;
     }
         return queuesList;
     }

-    
+

     private List<QueueProperty> createPropertiesList(ByteBuf input, int length){
         int propertiesLength = length;
         List<QueueProperty> propertiesList = new ArrayList<>();
     private List<QueueProperty> createPropertiesList(ByteBuf input, int length){
         int propertiesLength = length;
         List<QueueProperty> propertiesList = new ArrayList<>();

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/instruction/ClearActionsInstructionDeserializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/instruction/ClearActionsInstructionDeserializer.java
index 9fd7cec90981649cf87e51cae22f8e5425c5e3af..75bf6f501f730eb3683b851a9aeedef32dd15106 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/instruction/ClearActionsInstructionDeserializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/instruction/ClearActionsInstructionDeserializer.java
@@ -32,7 +32,7 @@ public class ClearActionsInstructionDeserializer extends AbstractInstructionDese
         InstructionBuilder builder = super.processHeader(input);
         input.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
         input.skipBytes(InstructionConstants.PADDING_IN_ACTIONS_INSTRUCTION);
         InstructionBuilder builder = super.processHeader(input);
         input.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
         input.skipBytes(InstructionConstants.PADDING_IN_ACTIONS_INSTRUCTION);

-        ActionsInstructionBuilder actionsBuilder = 
+        ActionsInstructionBuilder actionsBuilder =

                 new ActionsInstructionBuilder();
         List<Action> actions = new ArrayList<>();
         actionsBuilder.setAction(actions);
                 new ActionsInstructionBuilder();
         List<Action> actions = new ArrayList<>();
         actionsBuilder.setAction(actions);

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/AbstractOxmMatchEntryDeserializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/AbstractOxmMatchEntryDeserializer.java
index 1d737b093bfc57e1673d3108d8ba70548b37ac66..5b9c6ba51cb057c544cce053db94dfc132413477 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/AbstractOxmMatchEntryDeserializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/AbstractOxmMatchEntryDeserializer.java
@@ -40,7 +40,7 @@ public abstract class AbstractOxmMatchEntryDeserializer implements HeaderDeseria
 
     /**
      * Prepares match entry header - sets oxm_class, oxm_field, hasMask
 
     /**
      * Prepares match entry header - sets oxm_class, oxm_field, hasMask

-     *  + sets the buffer.readerIndex() to the end of match entry 
+     *  + sets the buffer.readerIndex() to the end of match entry

      *  - where augmentation starts
      * @param oxmClass oxm class type
      * @param oxmField oxm field type
      *  - where augmentation starts
      * @param oxmClass oxm class type
      * @param oxmField oxm field type


@@ -60,5 +60,5 @@ public abstract class AbstractOxmMatchEntryDeserializer implements HeaderDeseria
         input.skipBytes(EncodeConstants.SIZE_OF_BYTE_IN_BYTES);
         return builder;
     }
         input.skipBytes(EncodeConstants.SIZE_OF_BYTE_IN_BYTES);
         return builder;
     }

-    
+

 }
 }

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializationFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializationFactory.java
index e318c683069cf39bc0938c9ae834c94b7be83ab9..90cb34d729828cbbe71ea811a7aab0ea2723c6f9 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializationFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializationFactory.java
@@ -22,7 +22,7 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 public class SerializationFactory {
 
     private SerializerRegistry registry;
 public class SerializationFactory {
 
     private SerializerRegistry registry;

-    
+

     /**
      * Transforms POJO message into ByteBuf
      * @param version version used for encoding received message
     /**
      * Transforms POJO message into ByteBuf
      * @param version version used for encoding received message

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/action/OF13SetMplsTtlActionSerializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/action/OF13SetMplsTtlActionSerializer.java
index aacebf2f7c83b05f8a62ddbacb8a43fc703c4613..db740a4a5ee76c8bd38c41f470510c0bc2b50f67 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/action/OF13SetMplsTtlActionSerializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/action/OF13SetMplsTtlActionSerializer.java
@@ -21,7 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev1
 public class OF13SetMplsTtlActionSerializer extends AbstractActionSerializer {
 
 
 public class OF13SetMplsTtlActionSerializer extends AbstractActionSerializer {
 
 

-    
+

     @Override
     public void serialize(Action action, ByteBuf outBuffer) {
         super.serialize(action, outBuffer);
     @Override
     public void serialize(Action action, ByteBuf outBuffer) {
         super.serialize(action, outBuffer);

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/HelloInputMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/HelloInputMessageFactory.java
index 3d95646bd92921f36550babb9b23c7b846f72eb2..bd87e16f67e26a50717f0bbfd8eceaf690a3680d 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/HelloInputMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/HelloInputMessageFactory.java
@@ -46,7 +46,7 @@ public class HelloInputMessageFactory implements OFSerializer<HelloInput>{
                     output.writeZero(padding);
                     output.setShort(elementLengthIndex, output.writerIndex() - elementStartIndex);
                 }
                     output.writeZero(padding);
                     output.setShort(elementLengthIndex, output.writerIndex() - elementStartIndex);
                 }

-            } 
+            }

         }
     }
 
         }
     }
 

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10QueueGetConfigInputMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10QueueGetConfigInputMessageFactory.java
index 606a98c5a8c15684d97f8ef49f5b7efb1d4098ae..7afa4bc25c9058bad96f2d972d8f385a203d42d0 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10QueueGetConfigInputMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10QueueGetConfigInputMessageFactory.java
@@ -20,7 +20,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
  * @author michal.polkorab
  */
 public class OF10QueueGetConfigInputMessageFactory implements OFSerializer<GetQueueConfigInput> {
  * @author michal.polkorab
  */
 public class OF10QueueGetConfigInputMessageFactory implements OFSerializer<GetQueueConfigInput> {

-    
+

     private static final byte MESSAGE_TYPE = 20;
     private static final byte PADDING_IN_GET_QUEUE_CONFIG_MESSAGE = 2;
 
     private static final byte MESSAGE_TYPE = 20;
     private static final byte PADDING_IN_GET_QUEUE_CONFIG_MESSAGE = 2;
 

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetAsyncInputMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetAsyncInputMessageFactory.java
index 44a089d338d9e5da8ed44eb01ab32ed0911323af..65cb07e33ff880fce4edf468555dfa7102f10424 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetAsyncInputMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetAsyncInputMessageFactory.java
@@ -62,7 +62,7 @@ public class SetAsyncInputMessageFactory implements OFSerializer<SetAsyncInput>
             }
         }
     }
             }
         }
     }

-    
+

     private static void serializePortStatusMask(List<PortStatusMask> portStatusMask, ByteBuf outBuffer) {
         if (portStatusMask != null) {
             for (PortStatusMask currentPortStatusMask : portStatusMask) {
     private static void serializePortStatusMask(List<PortStatusMask> portStatusMask, ByteBuf outBuffer) {
         if (portStatusMask != null) {
             for (PortStatusMask currentPortStatusMask : portStatusMask) {


@@ -83,7 +83,7 @@ public class SetAsyncInputMessageFactory implements OFSerializer<SetAsyncInput>
             }
         }
     }
             }
         }
     }

-    
+

     private static void serializerFlowRemovedMask(List<FlowRemovedMask> flowRemovedMask, ByteBuf outBuffer) {
         if (flowRemovedMask != null) {
             for (FlowRemovedMask currentFlowRemovedMask : flowRemovedMask) {
     private static void serializerFlowRemovedMask(List<FlowRemovedMask> flowRemovedMask, ByteBuf outBuffer) {
         if (flowRemovedMask != null) {
             for (FlowRemovedMask currentFlowRemovedMask : flowRemovedMask) {

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/AbstractCodeKeyMaker.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/AbstractCodeKeyMaker.java
index 05812e8b3c20df0d04df1a96a5101279594a98c8..45f521e1756c90342000b23228c531b6e990053e 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/AbstractCodeKeyMaker.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/AbstractCodeKeyMaker.java
@@ -11,7 +11,7 @@ package org.opendaylight.openflowjava.protocol.impl.util;
 
 /**
  * @author michal.polkorab
 
 /**
  * @author michal.polkorab

- * @param <T> type the key maker is based on 
+ * @param <T> type the key maker is based on

  */
 public abstract class AbstractCodeKeyMaker implements CodeKeyMaker {
 
  */
 public abstract class AbstractCodeKeyMaker implements CodeKeyMaker {
 


@@ -22,7 +22,7 @@ public abstract class AbstractCodeKeyMaker implements CodeKeyMaker {
      */
     public AbstractCodeKeyMaker(short version) {
         this.version = version;
      */
     public AbstractCodeKeyMaker(short version) {
         this.version = version;

-        
+

     }
 
     /**
     }
 
     /**

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/AbstractTypeKeyMaker.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/AbstractTypeKeyMaker.java
index f2e736facf7f0a4ce893d3a655ac8b0c0186dda8..70c7a1551b6f2ae80c702b1831c1cbe4c0fd92fc 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/AbstractTypeKeyMaker.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/AbstractTypeKeyMaker.java
@@ -11,7 +11,7 @@ package org.opendaylight.openflowjava.protocol.impl.util;
 
 /**
  * @author michal.polkorab
 
 /**
  * @author michal.polkorab

- * @param <T> type the key maker is based on 
+ * @param <T> type the key maker is based on

  */
 public abstract class AbstractTypeKeyMaker<T> implements TypeKeyMaker<T> {
 
  */
 public abstract class AbstractTypeKeyMaker<T> implements TypeKeyMaker<T> {
 


@@ -22,7 +22,7 @@ public abstract class AbstractTypeKeyMaker<T> implements TypeKeyMaker<T> {
      */
     public AbstractTypeKeyMaker(short version) {
         this.version = version;
      */
     public AbstractTypeKeyMaker(short version) {
         this.version = version;

-        
+

     }
 
     /**
     }
 
     /**

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionSerializerRegistryHelper.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionSerializerRegistryHelper.java
index f89fd0a1a6d853c9c8c8dfc97c4464b1213b43bc..62e019ada721cf612cd344c96ffc6169fd21325d 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionSerializerRegistryHelper.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionSerializerRegistryHelper.java
@@ -31,7 +31,7 @@ public class InstructionSerializerRegistryHelper {
 
     /**
      * Registers given serializer
 
     /**
      * Registers given serializer

-     * @param instructionType 
+     * @param instructionType

      * @param serializer
      */
     public <TYPE extends InstructionBase> void registerSerializer(Class<TYPE> instructionType,
      * @param serializer
      */
     public <TYPE extends InstructionBase> void registerSerializer(Class<TYPE> instructionType,

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/ListSerializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/ListSerializer.java
index f085377f1bf80ff0e15a5e6e4ef29bef8e287124..f69c25b6e801e07fe1e6755f985a45d5957734f7 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/ListSerializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/ListSerializer.java
@@ -20,7 +20,7 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 /**
  * Serializes list items and their headers
  * @author michal.polkorab
 /**
  * Serializes list items and their headers
  * @author michal.polkorab

- * @param <E> 
+ * @param <E>

  */
 public abstract class ListSerializer {
 
  */
 public abstract class ListSerializer {
 

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchEntrySerializerRegistryHelper.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchEntrySerializerRegistryHelper.java
index e3f49e30661eb0e4be07420b660baca06810cd7a..e722a93e18bdc318e26ce7fa742dc7e74f2b42aa 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchEntrySerializerRegistryHelper.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchEntrySerializerRegistryHelper.java
@@ -37,8 +37,8 @@ public class MatchEntrySerializerRegistryHelper<OXM_CLASS extends OxmClassBase>
 
     /**
      * Registers given serializer
 
     /**
      * Registers given serializer

-     * @param specificClass 
-     * @param serializer 
+     * @param specificClass
+     * @param serializer

      */
     public <OXM_FIELD extends MatchField> void registerSerializer(
             Class<OXM_FIELD> specificClass, OFGeneralSerializer serializer) {
      */
     public <OXM_FIELD extends MatchField> void registerSerializer(
             Class<OXM_FIELD> specificClass, OFGeneralSerializer serializer) {

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializer.java
index ceb5963f18ea20f7a23491c58e81754d3d13a8c2..c5b075831a8856fa890cf74855b565b4a806aae2 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializer.java
@@ -76,7 +76,7 @@ public class OF13MatchSerializer implements OFSerializer<Match>, SerializerRegis
             return;
         }
         for (MatchEntries entry : matchEntries) {
             return;
         }
         for (MatchEntries entry : matchEntries) {

-            
+

             MatchEntrySerializerKey<?, ?> key = new MatchEntrySerializerKey<>(
                     EncodeConstants.OF13_VERSION_ID, entry.getOxmClass(), entry.getOxmMatchField());
             if (entry.getOxmClass().equals(ExperimenterClass.class)) {
             MatchEntrySerializerKey<?, ?> key = new MatchEntrySerializerKey<>(
                     EncodeConstants.OF13_VERSION_ID, entry.getOxmClass(), entry.getOxmMatchField());
             if (entry.getOxmClass().equals(ExperimenterClass.class)) {

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OpenflowUtils.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OpenflowUtils.java
index 9a608b2d103e8c246bdb2bff6ac73b3faaed057c..f865ac3d5075300615bbe4f5b3160f97c2a9a7cd 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OpenflowUtils.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/OpenflowUtils.java
@@ -14,7 +14,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13
 
 /**
  * Used for common structures translation / conversion
 
 /**
  * Used for common structures translation / conversion

- * 
+ *

  * @author michal.polkorab
  */
 public abstract class OpenflowUtils {
  * @author michal.polkorab
  */
 public abstract class OpenflowUtils {

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/TypeKeyMaker.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/TypeKeyMaker.java
index 02b0307b93959899dabb939f981360df573fe7bc..ad1b2f428fdada4351f31ea56e3afd58a15a16c5 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/TypeKeyMaker.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/TypeKeyMaker.java
@@ -12,13 +12,13 @@ import org.opendaylight.openflowjava.protocol.api.extensibility.MessageTypeKey;
 
 /**
  * @author michal.polkorab
 
 /**
  * @author michal.polkorab

- * @param <T> 
+ * @param <T>

  */
 public interface TypeKeyMaker<T> {
 
     /**
      * @param entry
  */
 public interface TypeKeyMaker<T> {
 
     /**
      * @param entry

-     * @return key that will be used for serializer lookup in 
+     * @return key that will be used for serializer lookup in

      * the serializer registry
      */
     abstract MessageTypeKey<?> make(T entry);
      * the serializer registry
      */
     abstract MessageTypeKey<?> make(T entry);

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/TypeToClassInitHelper.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/TypeToClassInitHelper.java
index 0484ea83c0c4bc8953686960cfce1c71b67f93bd..672cdea6afc37d60cae0810a27e90759e881711c 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/TypeToClassInitHelper.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/TypeToClassInitHelper.java
@@ -23,7 +23,7 @@ public class TypeToClassInitHelper {
      * @param version protocol wire version
      * @param messageClassMap map which stores type to class mapping
      */
      * @param version protocol wire version
      * @param messageClassMap map which stores type to class mapping
      */

-    public TypeToClassInitHelper(short version, Map<TypeToClassKey, 
+    public TypeToClassInitHelper(short version, Map<TypeToClassKey,

             Class<?>> messageClassMap) {
         this.version = version;
         this.messageClassMap = messageClassMap;
             Class<?>> messageClassMap) {
         this.version = version;
         this.messageClassMap = messageClassMap;

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/statistics/Counter.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/statistics/Counter.java
index aea5890e3483fd2e2925cac3d1edc8496f60984d..077bfe64b4c94c4901db341b26c421dc621e3fc2 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/statistics/Counter.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/statistics/Counter.java
@@ -11,7 +11,7 @@ package org.opendaylight.openflowjava.statistics;
 import java.util.concurrent.atomic.AtomicLong;
 /**
  * Counts statistics
 import java.util.concurrent.atomic.AtomicLong;
 /**
  * Counts statistics

- * 
+ *

  * @author madamjak
  */
 public class Counter {
  * @author madamjak
  */
 public class Counter {


@@ -35,7 +35,7 @@ public class Counter {
     }
 
     /**
     }
 
     /**

-     * return the last read value of counter. This value can be set during the reading of current counter value, 
+     * return the last read value of counter. This value can be set during the reading of current counter value,

      *      for detail see method getCounterValue(boolean modifyLastReadValue).
      * @return the counterLastReadValue
      */
      *      for detail see method getCounterValue(boolean modifyLastReadValue).
      * @return the counterLastReadValue
      */

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/statistics/StatisticsCounters.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/statistics/StatisticsCounters.java
index 951969ab254492f18bd977489dba90a638cca4bf..1f4d7ca34b4669c4d9b752271ddb2701ac7a9461 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/statistics/StatisticsCounters.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/statistics/StatisticsCounters.java
@@ -41,14 +41,14 @@ public final class StatisticsCounters implements StatisticsHandler {
     private boolean runCounting;
     // array to hold enabled counter types
     private CounterEventTypes[] enabledCounters = {
     private boolean runCounting;
     // array to hold enabled counter types
     private CounterEventTypes[] enabledCounters = {

-                    CounterEventTypes.DS_ENCODE_FAIL, 
+                    CounterEventTypes.DS_ENCODE_FAIL,

                     CounterEventTypes.DS_ENCODE_SUCCESS,
                     CounterEventTypes.DS_ENTERED_OFJAVA,
                     CounterEventTypes.DS_FLOW_MODS_ENTERED,
                     CounterEventTypes.DS_FLOW_MODS_SENT,
                     CounterEventTypes.DS_ENCODE_SUCCESS,
                     CounterEventTypes.DS_ENTERED_OFJAVA,
                     CounterEventTypes.DS_FLOW_MODS_ENTERED,
                     CounterEventTypes.DS_FLOW_MODS_SENT,

-                    CounterEventTypes.US_DECODE_FAIL, 
-                    CounterEventTypes.US_DECODE_SUCCESS, 
-                    CounterEventTypes.US_MESSAGE_PASS, 
+                    CounterEventTypes.US_DECODE_FAIL,
+                    CounterEventTypes.US_DECODE_SUCCESS,
+                    CounterEventTypes.US_MESSAGE_PASS,

                     CounterEventTypes.US_RECEIVED_IN_OFJAVA};
 
     /**
                     CounterEventTypes.US_RECEIVED_IN_OFJAVA};
 
     /**

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/_switch/connection/provider/impl/rev140328/SwitchConnectionProviderModule.java b/openflow-protocol-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/_switch/connection/provider/impl/rev140328/SwitchConnectionProviderModule.java
index fd5cf8aa2a9fcbf14c49ce7c8689745e591ea6a5..68edb2a3e9ed2529002c1550625d48595688d20d 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/_switch/connection/provider/impl/rev140328/SwitchConnectionProviderModule.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/_switch/connection/provider/impl/rev140328/SwitchConnectionProviderModule.java
@@ -29,7 +29,7 @@ import com.google.common.base.Objects;
 */
 public final class SwitchConnectionProviderModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow._switch.connection.provider.impl.rev140328.AbstractSwitchConnectionProviderModule
  {
 */
 public final class SwitchConnectionProviderModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow._switch.connection.provider.impl.rev140328.AbstractSwitchConnectionProviderModule
  {

-    
+

     private static Logger LOG = LoggerFactory
             .getLogger(SwitchConnectionProviderModule.class);
 
     private static Logger LOG = LoggerFactory
             .getLogger(SwitchConnectionProviderModule.class);
 


@@ -72,7 +72,7 @@ public final class SwitchConnectionProviderModule extends org.opendaylight.yang.
 
     /**
      * @return instance configuration object
 
     /**
      * @return instance configuration object

-     * @throws UnknownHostException 
+     * @throws UnknownHostException

      */
     private ConnectionConfiguration createConnectionConfiguration() throws UnknownHostException {
         final InetAddress address = extractIpAddressBin(getAddress());
      */
     private ConnectionConfiguration createConnectionConfiguration() throws UnknownHostException {
         final InetAddress address = extractIpAddressBin(getAddress());


@@ -154,12 +154,12 @@ public final class SwitchConnectionProviderModule extends org.opendaylight.yang.
                     return null;
                 }
                 return new ThreadConfiguration() {
                     return null;
                 }
                 return new ThreadConfiguration() {

-                    
+

                     @Override
                     public int getWorkerThreadCount() {
                         return threads.getWorkerThreads();
                     }
                     @Override
                     public int getWorkerThreadCount() {
                         return threads.getWorkerThreads();
                     }

-                    
+

                     @Override
                     public int getBossThreadCount() {
                         return threads.getBossThreads();
                     @Override
                     public int getBossThreadCount() {
                         return threads.getBossThreads();


@@ -172,7 +172,7 @@ public final class SwitchConnectionProviderModule extends org.opendaylight.yang.
     /**
      * @param address
      * @return
     /**
      * @param address
      * @return

-     * @throws UnknownHostException 
+     * @throws UnknownHostException

      */
     private static InetAddress extractIpAddressBin(IpAddress address) throws UnknownHostException {
         byte[] addressBin = null;
      */
     private static InetAddress extractIpAddressBin(IpAddress address) throws UnknownHostException {
         byte[] addressBin = null;


@@ -183,7 +183,7 @@ public final class SwitchConnectionProviderModule extends org.opendaylight.yang.
                 addressBin = address2bin(address.getIpv6Address().getValue());
             }
         }
                 addressBin = address2bin(address.getIpv6Address().getValue());
             }
         }

-        
+

         if (addressBin == null) {
             return null;
         } else {
         if (addressBin == null) {
             return null;
         } else {

diff --git a/openflow-protocol-impl/src/main/yang/openflow-switch-connection-provider-impl.yang b/openflow-protocol-impl/src/main/yang/openflow-switch-connection-provider-impl.yang
index cb714d6b5e27fe452778494bd19fce44d3afc139..2f80d9576d510551787157ba4b5141b884ac088d 100644 (file)
--- a/openflow-protocol-impl/src/main/yang/openflow-switch-connection-provider-impl.yang
+++ b/openflow-protocol-impl/src/main/yang/openflow-switch-connection-provider-impl.yang
@@ -146,7 +146,7 @@ module openflow-switch-connection-provider-impl {
     identity reset-ofjava-statistics-rpc;
 
     rpc print-ofjava-statistics {
     identity reset-ofjava-statistics-rpc;
 
     rpc print-ofjava-statistics {

-        description 
+        description

             "Shortcut JMX call to printOfjavaStatistics.";
         input {
             uses rpcx:rpc-context-ref {
             "Shortcut JMX call to printOfjavaStatistics.";
         input {
             uses rpcx:rpc-context-ref {


@@ -163,7 +163,7 @@ module openflow-switch-connection-provider-impl {
     }
 
     rpc reset-ofjava-statistics {
     }
 
     rpc reset-ofjava-statistics {

-        description 
+        description

             "Shortcut JMX call to resetOfjavaStatistics.";
         input {
             uses rpcx:rpc-context-ref {
             "Shortcut JMX call to resetOfjavaStatistics.";
         input {
             uses rpcx:rpc-context-ref {

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/DelegatingInboundHandlerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/DelegatingInboundHandlerTest.java
index 5e365b8633f09ae16d09885a89ca70138ad0ae5f..27aac9ce0ac00e6746f50c2ba77b032c8c8aac7b 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/DelegatingInboundHandlerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/DelegatingInboundHandlerTest.java
@@ -41,7 +41,7 @@ public class DelegatingInboundHandlerTest {
     }
 
     /**
     }
 
     /**

-     * 
+     *

      */
     @Test
     public void testChannelReadSuccess()   {
      */
     @Test
     public void testChannelReadSuccess()   {


@@ -51,7 +51,7 @@ public class DelegatingInboundHandlerTest {
         verify( mockMsgConsumer, times(1)).consume(mockDataObject);
     }
     /**
         verify( mockMsgConsumer, times(1)).consume(mockDataObject);
     }
     /**

-     * 
+     *

      */
     @Test
     public void testChannelInactive()   {
      */
     @Test
     public void testChannelInactive()   {

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/DummyDecoder.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/DummyDecoder.java
index d22196a92e007dcc08a493cf4bdcc8c4fce0198a..fcab98877775e3a3b18d04f49250f4848cb27254 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/DummyDecoder.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/DummyDecoder.java
@@ -25,7 +25,7 @@ public class DummyDecoder extends ByteToMessageDecoder {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(DummyDecoder.class);
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(DummyDecoder.class);

-    
+

     @Override
     protected void decode(ChannelHandlerContext ctx, ByteBuf in,
             List<Object> out) throws Exception {
     @Override
     protected void decode(ChannelHandlerContext ctx, ByteBuf in,
             List<Object> out) throws Exception {

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/IdleHandlerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/IdleHandlerTest.java
index aa08feb521d7d31bc393f78a9d6000e0578f410e..b3462e98eafe16cb6d3cd1676f8ff9130f934da2 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/IdleHandlerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/IdleHandlerTest.java
@@ -34,7 +34,7 @@ public class IdleHandlerTest {
 
     /**
      * Sets up test environment
 
     /**
      * Sets up test environment

-     * 
+     *

      */
     @Before
     public void setUp() {
      */
     @Before
     public void setUp() {


@@ -96,15 +96,15 @@ public class IdleHandlerTest {
         try {
             idleHandler.readTimedOut(mockChHndlrCtx);
             verify(mockChHndlrCtx, times(1)).fireChannelRead(any(Object.class)) ;
         try {
             idleHandler.readTimedOut(mockChHndlrCtx);
             verify(mockChHndlrCtx, times(1)).fireChannelRead(any(Object.class)) ;

-    
+

             idleHandler.channelRead(mockChHndlrCtx, new String() );
             verify(mockChHndlrCtx, times(2)).fireChannelRead(any(Object.class)) ;
             idleHandler.channelRead(mockChHndlrCtx, new String() );
             verify(mockChHndlrCtx, times(2)).fireChannelRead(any(Object.class)) ;

-    
+

             idleHandler.readTimedOut(mockChHndlrCtx);
             verify(mockChHndlrCtx, times(3)).fireChannelRead(any(Object.class)) ;
         } catch (Exception e) {
             Assert.fail();
         }
     }
             idleHandler.readTimedOut(mockChHndlrCtx);
             verify(mockChHndlrCtx, times(3)).fireChannelRead(any(Object.class)) ;
         } catch (Exception e) {
             Assert.fail();
         }
     }

-    
+

 }
 }

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderStatisticsTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderStatisticsTest.java
index 2b30d84656f43815ae2820734c002051015316f7..409e475d4603b6e07673e32dfa757c137fb14057 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderStatisticsTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderStatisticsTest.java
@@ -31,7 +31,7 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 /**
  * Test to count decoder events (counters US_DECODE_SUCCESS, US_DECODE_FAIL and
  * US_RECEIVED_IN_OFJAVA have to be enabled)
 /**
  * Test to count decoder events (counters US_DECODE_SUCCESS, US_DECODE_FAIL and
  * US_RECEIVED_IN_OFJAVA have to be enabled)

- * 
+ *

  * @author madamjak
  *
  */
  * @author madamjak
  *
  */


@@ -100,7 +100,7 @@ public class OFDecoderStatisticsTest {
         Assert.assertEquals(
                 "Wrong - different between RECEIVED_IN_OFJAVA and (US_DECODE_SUCCESS + US_DECODE_FAIL)",
                 statCounters.getCounter(CounterEventTypes.US_RECEIVED_IN_OFJAVA).getCounterValue(),
         Assert.assertEquals(
                 "Wrong - different between RECEIVED_IN_OFJAVA and (US_DECODE_SUCCESS + US_DECODE_FAIL)",
                 statCounters.getCounter(CounterEventTypes.US_RECEIVED_IN_OFJAVA).getCounterValue(),

-                statCounters.getCounter(CounterEventTypes.US_DECODE_SUCCESS).getCounterValue() 
+                statCounters.getCounter(CounterEventTypes.US_DECODE_SUCCESS).getCounterValue()

                 + statCounters.getCounter(CounterEventTypes.US_DECODE_FAIL).getCounterValue());
     }
 
                 + statCounters.getCounter(CounterEventTypes.US_DECODE_FAIL).getCounterValue());
     }
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderTest.java
index af8a0102e8fe4a2d0d28b7ff03e3a9753ddbf19b..917f9b920f30543a5405529c30c34210d2b0a7ec 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFDecoderTest.java
@@ -44,7 +44,7 @@ public class OFDecoderTest {
 
     /**
      * Sets up test environment
 
     /**
      * Sets up test environment

-     * 
+     *

      */
     @Before
     public void setUp() {
      */
     @Before
     public void setUp() {


@@ -57,7 +57,7 @@ public class OFDecoderTest {
     }
 
     /**
     }
 
     /**

-     * 
+     *

      */
     @Test
     public void testDecode() {
      */
     @Test
     public void testDecode() {


@@ -74,7 +74,7 @@ public class OFDecoderTest {
     }
 
     /**
     }
 
     /**

-     * 
+     *

      */
     @Test
     public void testDecodeDeserializeException() {
      */
     @Test
     public void testDecodeDeserializeException() {


@@ -93,7 +93,7 @@ public class OFDecoderTest {
     }
 
     /**
     }
 
     /**

-     * 
+     *

      */
     @Test
     public void testDecodeDeserializeNull() {
      */
     @Test
     public void testDecodeDeserializeNull() {

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFFrameDecoderTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFFrameDecoderTest.java
index 69fc393ed8d9096ae5e2117fdef6075fe7a15823..41d692c820820f0c49c22c6ece46d558174c8d8b 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFFrameDecoderTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFFrameDecoderTest.java
@@ -27,7 +27,7 @@ import org.opendaylight.openflowjava.util.ByteBufUtils;
 
 /**
  * Testing class of {@link OFFrameDecoder}
 
 /**
  * Testing class of {@link OFFrameDecoder}

- * 
+ *

  * @author michal.polkorab
  */
 @RunWith(MockitoJUnitRunner.class)
  * @author michal.polkorab
  */
 @RunWith(MockitoJUnitRunner.class)

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFVersionDetectorTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFVersionDetectorTest.java
index 1a3a3244c5292716421a8d658090394646165472..35b449771f6896b06e642545709f99af4c55fcb9 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFVersionDetectorTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/OFVersionDetectorTest.java
@@ -24,7 +24,7 @@ import org.mockito.runners.MockitoJUnitRunner;
 import org.opendaylight.openflowjava.util.ByteBufUtils;
 
 /**
 import org.opendaylight.openflowjava.util.ByteBufUtils;
 
 /**

- * 
+ *

  * @author michal.polkorab
  */
 @RunWith(MockitoJUnitRunner.class)
  * @author michal.polkorab
  */
 @RunWith(MockitoJUnitRunner.class)


@@ -49,7 +49,7 @@ public class OFVersionDetectorTest {
      * Test of decode
      * {@link OFVersionDetector#decode(io.netty.channel.ChannelHandlerContext, io.netty.buffer.ByteBuf, java.util.List)
      * }
      * Test of decode
      * {@link OFVersionDetector#decode(io.netty.channel.ChannelHandlerContext, io.netty.buffer.ByteBuf, java.util.List)
      * }

-     * 
+     *

      * @throws Exception
      */
     @Test
      * @throws Exception
      */
     @Test


@@ -94,12 +94,12 @@ public class OFVersionDetectorTest {
                assertEquals( 0, byteBuffer.refCnt() ) ;
                
     }
                assertEquals( 0, byteBuffer.refCnt() ) ;
                
     }

-    
+

     /**
      * Test of decode
      * {@link OFVersionDetector#decode(io.netty.channel.ChannelHandlerContext, io.netty.buffer.ByteBuf, java.util.List)
      * }
     /**
      * Test of decode
      * {@link OFVersionDetector#decode(io.netty.channel.ChannelHandlerContext, io.netty.buffer.ByteBuf, java.util.List)
      * }

-     * 
+     *

      * @throws Exception
      */
     @Test
      * @throws Exception
      */
     @Test

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/PublishingChannelInitializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/PublishingChannelInitializerTest.java
index aa7a6e4a0600ddc35b6b592634549b692d23c02a..3d8717c7d0f599ad6122e197efdc00a0009fbd8e 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/PublishingChannelInitializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/PublishingChannelInitializerTest.java
@@ -66,7 +66,7 @@ public class PublishingChannelInitializerTest {
 
     /**
      * Sets up test environment
 
     /**
      * Sets up test environment

-     * @throws Exception 
+     * @throws Exception

      */
     @Before
     public void setUp() throws Exception {
      */
     @Before
     public void setUp() throws Exception {


@@ -89,7 +89,7 @@ public class PublishingChannelInitializerTest {
         when(mockSocketCh.remoteAddress()).thenReturn(inetSockAddr) ;
         when(mockSwConnHandler.accept(eq(InetAddress.getLocalHost()))).thenReturn(true) ;
         when(mockSocketCh.pipeline()).thenReturn(mockChPipeline) ;
         when(mockSocketCh.remoteAddress()).thenReturn(inetSockAddr) ;
         when(mockSwConnHandler.accept(eq(InetAddress.getLocalHost()))).thenReturn(true) ;
         when(mockSocketCh.pipeline()).thenReturn(mockChPipeline) ;

-        
+

         tlsConfiguration = new TlsConfigurationImpl(KeystoreType.JKS, "/selfSignedSwitch", PathType.CLASSPATH,
                 KeystoreType.JKS, "/selfSignedController", PathType.CLASSPATH);
     }
         tlsConfiguration = new TlsConfigurationImpl(KeystoreType.JKS, "/selfSignedSwitch", PathType.CLASSPATH,
                 KeystoreType.JKS, "/selfSignedController", PathType.CLASSPATH);
     }

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/SslContextFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/SslContextFactoryTest.java
index 652e086cc9f8094676b56043b9891e1b6defe19a..a52f44c673b2a82274a1fb253047f9b460447695 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/SslContextFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/SslContextFactoryTest.java
@@ -41,7 +41,7 @@ public class SslContextFactoryTest {
     }
 
     /**
     }
 
     /**

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testGetServerContext() throws Exception {
      */
     @Test
     public void testGetServerContext() throws Exception {

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/SslKeyStoreTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/SslKeyStoreTest.java
index ca6826f00dfff26c100c11515560457232585326..c2a13df8a1b546f7adf242a7f3684d08aa7b351a 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/SslKeyStoreTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/SslKeyStoreTest.java
@@ -33,7 +33,7 @@ public class SslKeyStoreTest {
 
     /**
      * Test keystore file access - via classpath
 
     /**
      * Test keystore file access - via classpath

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testAsInputStream() throws Exception {
      */
     @Test
     public void testAsInputStream() throws Exception {


@@ -44,7 +44,7 @@ public class SslKeyStoreTest {
 
     /**
      * Test keystore file access - via relative path
 
     /**
      * Test keystore file access - via relative path

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testAsInputStream2() throws Exception {
      */
     @Test
     public void testAsInputStream2() throws Exception {

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageUdpWrapperTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageUdpWrapperTest.java
index 8cdca399f99e36f15d69ac094228b73afd250a2e..be61603037c0187bebba000022c82034ce3e3265 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageUdpWrapperTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/VersionMessageUdpWrapperTest.java
@@ -17,7 +17,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
 /**
 import org.mockito.MockitoAnnotations;
 
 /**

- * 
+ *

  * @author madamjak
  *
  */
  * @author madamjak
  *
  */


@@ -29,7 +29,7 @@ public class VersionMessageUdpWrapperTest {
     public void startUp(){
         MockitoAnnotations.initMocks(this);
     }
     public void startUp(){
         MockitoAnnotations.initMocks(this);
     }

-    
+

     @Test
     public void test(){
         short version = 35;
     @Test
     public void test(){
         short version = 35;

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ChannelOutboundQueue02Test.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ChannelOutboundQueue02Test.java
index 80a58df26ed8d37ef6f909b1154ce097eef214a2..ccc24e5547640c43cfc5a36e0264b75cef9a59e9 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ChannelOutboundQueue02Test.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ChannelOutboundQueue02Test.java
@@ -141,7 +141,7 @@ public class ChannelOutboundQueue02Test {
     }
 
     /**
     }
 
     /**

-     * Class for testing - channel can change state to read only or writable 
+     * Class for testing - channel can change state to read only or writable

      * @author madamjak
      *
      */
      * @author madamjak
      *
      */

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterFactoryImplTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterFactoryImplTest.java
index cf5796e74f98ea5d9c47acefa1781112f3106120..a7e9904efdf42127d1c7e71f92fec919d0b03994 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterFactoryImplTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterFactoryImplTest.java
@@ -21,14 +21,14 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 /**
 import org.junit.Before;
 import org.junit.Test;
 /**

- * 
+ *

  * @author madamjak
  *
  */
 public class ConnectionAdapterFactoryImplTest {
 
     @Mock ChannelPipeline channnelPipe;
  * @author madamjak
  *
  */
 public class ConnectionAdapterFactoryImplTest {
 
     @Mock ChannelPipeline channnelPipe;

-    @Mock Channel channel; 
+    @Mock Channel channel;

     @Mock InetSocketAddress address;
 
     @Before
     @Mock InetSocketAddress address;
 
     @Before

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImp02lTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImp02lTest.java
index 0e561fdc74803ceb739c9d87df66fa5b13b235a6..7088bc09076b3cc44b89e45a25cee74147df56a5 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImp02lTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionAdapterImp02lTest.java
@@ -105,7 +105,7 @@ public class ConnectionAdapterImp02lTest {
         }
     }
     /**
         }
     }
     /**

-     * Test Rpc Calls 
+     * Test Rpc Calls

      */
     @Test
     public void testRcp() {
      */
     @Test
     public void testRcp() {

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionConfigurationImpl.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionConfigurationImpl.java
index 6f1993284f1807ce317025838763d6741049cc4e..76936754ee2315be10a96f7c4c2c9591f09cb3d4 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionConfigurationImpl.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/ConnectionConfigurationImpl.java
@@ -30,9 +30,9 @@ public class ConnectionConfigurationImpl implements ConnectionConfiguration {
 
     /**
      * Creates {@link ConnectionConfigurationImpl}
 
     /**
      * Creates {@link ConnectionConfigurationImpl}

-     * @param address 
+     * @param address

      * @param port
      * @param port

-     * @param tlsConfig 
+     * @param tlsConfig

      * @param switchIdleTimeout
      */
     public ConnectionConfigurationImpl(InetAddress address, int port, TlsConfiguration tlsConfig, long switchIdleTimeout) {
      * @param switchIdleTimeout
      */
     public ConnectionConfigurationImpl(InetAddress address, int port, TlsConfiguration tlsConfig, long switchIdleTimeout) {

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/RpcResponseKeyTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/RpcResponseKeyTest.java
index 62b4613d34ce52c48c88a8bbdd1384581ce599a1..0b816c25714a492342f07071034f15250fdd978b 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/RpcResponseKeyTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/RpcResponseKeyTest.java
@@ -13,7 +13,7 @@ import org.junit.Assert;
 import org.opendaylight.openflowjava.protocol.impl.core.connection.RpcResponseKey;
 
 /**
 import org.opendaylight.openflowjava.protocol.impl.core.connection.RpcResponseKey;
 
 /**

- * 
+ *

  * @author madamjak
  *
  */
  * @author madamjak
  *
  */


@@ -24,7 +24,7 @@ public class RpcResponseKeyTest {
      */
     @Test
     public void testEquals(){
      */
     @Test
     public void testEquals(){

-        
+

         long xid1 = 12L;
         long xid2 = 66L;
         String outputClazz1 = "Clazz01";
         long xid1 = 12L;
         long xid2 = 66L;
         String outputClazz1 = "Clazz01";


@@ -48,7 +48,7 @@ public class RpcResponseKeyTest {
      */
     @Test
     public void testGetters(){
      */
     @Test
     public void testGetters(){

-        
+

         long xid1 = 12L;
         String outputClazz1 = "Clazz01";
         RpcResponseKey key1 = new RpcResponseKey(xid1, outputClazz1);
         long xid1 = 12L;
         String outputClazz1 = "Clazz01";
         RpcResponseKey key1 = new RpcResponseKey(xid1, outputClazz1);

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImpl02Test.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImpl02Test.java
index 282087c41e612b915cd40e0612d5c190c0e62fc5..2a82ddf0208ecc78fcfe883e03eedf9148ddd77c 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImpl02Test.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImpl02Test.java
@@ -100,10 +100,10 @@ public class SwitchConnectionProviderImpl02Test {
         config = new ConnectionConfigurationImpl(startupAddress, 0, tlsConfiguration, SWITCH_IDLE_TIMEOUT);
         config.setTransferProtocol(protocol);
     }
         config = new ConnectionConfigurationImpl(startupAddress, 0, tlsConfiguration, SWITCH_IDLE_TIMEOUT);
         config.setTransferProtocol(protocol);
     }

-    
+

 
     /**
 
     /**

-     * Test getServerFacade 
+     * Test getServerFacade

      */
     @Test
     public void testServerFacade(){
      */
     @Test
     public void testServerFacade(){


@@ -129,7 +129,7 @@ public class SwitchConnectionProviderImpl02Test {
     public void testUnregisterWrongKeys(){
         startUp(TransportProtocol.TCP);
         provider.setConfiguration(config);
     public void testUnregisterWrongKeys(){
         startUp(TransportProtocol.TCP);
         provider.setConfiguration(config);

-        ExperimenterInstructionSerializerKey testSerKey 
+        ExperimenterInstructionSerializerKey testSerKey

             = new ExperimenterInstructionSerializerKey(EncodeConstants.OF10_VERSION_ID,42L);
         Assert.assertFalse("Wrong -- unregisterSerializer",provider.unregisterSerializer(testSerKey));
         ExperimenterInstructionDeserializerKey tesDeserKey
             = new ExperimenterInstructionSerializerKey(EncodeConstants.OF10_VERSION_ID,42L);
         Assert.assertFalse("Wrong -- unregisterSerializer",provider.unregisterSerializer(testSerKey));
         ExperimenterInstructionDeserializerKey tesDeserKey


@@ -140,36 +140,36 @@ public class SwitchConnectionProviderImpl02Test {
     /**
      * Test register and unregister method
      */
     /**
      * Test register and unregister method
      */

-    @Test 
+    @Test

     public void testUnregisterExistingKeys(){
         startUp(TransportProtocol.TCP);
         provider.setConfiguration(config);
         // -- registerActionSerializer
     public void testUnregisterExistingKeys(){
         startUp(TransportProtocol.TCP);
         provider.setConfiguration(config);
         // -- registerActionSerializer

-        ExperimenterActionSerializerKey key1 
+        ExperimenterActionSerializerKey key1

             = new ExperimenterActionSerializerKey(EncodeConstants.OF10_VERSION_ID, 42L, TestSubType.class);
         provider.registerActionSerializer(key1, serializer);
         Assert.assertTrue("Wrong -- unregister ActionSerializer", provider.unregisterSerializer(key1));
         Assert.assertFalse("Wrong -- unregister ActionSerializer by not existing key", provider.unregisterSerializer(key1));
         // -- registerActionDeserializer
             = new ExperimenterActionSerializerKey(EncodeConstants.OF10_VERSION_ID, 42L, TestSubType.class);
         provider.registerActionSerializer(key1, serializer);
         Assert.assertTrue("Wrong -- unregister ActionSerializer", provider.unregisterSerializer(key1));
         Assert.assertFalse("Wrong -- unregister ActionSerializer by not existing key", provider.unregisterSerializer(key1));
         // -- registerActionDeserializer

-        ExperimenterActionDeserializerKey key2 
+        ExperimenterActionDeserializerKey key2

             = new ExperimenterActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L);
         provider.registerActionDeserializer(key2, deserializer);
         Assert.assertTrue("Wrong -- unregister ActionDeserializer", provider.unregisterDeserializer(key2));
         Assert.assertFalse("Wrong -- unregister ActionDeserializer by not existing key", provider.unregisterDeserializer(key2));
         // -- registerInstructionSerializer
             = new ExperimenterActionDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L);
         provider.registerActionDeserializer(key2, deserializer);
         Assert.assertTrue("Wrong -- unregister ActionDeserializer", provider.unregisterDeserializer(key2));
         Assert.assertFalse("Wrong -- unregister ActionDeserializer by not existing key", provider.unregisterDeserializer(key2));
         // -- registerInstructionSerializer

-        ExperimenterInstructionSerializerKey key3 
+        ExperimenterInstructionSerializerKey key3

             = new ExperimenterInstructionSerializerKey(EncodeConstants.OF10_VERSION_ID,42L);
         provider.registerInstructionSerializer(key3, serializer);
         Assert.assertTrue("Wrong -- unregister InstructionSerializer", provider.unregisterSerializer(key3));
         Assert.assertFalse("Wrong -- unregister InstructionSerializer by not existing key", provider.unregisterSerializer(key3));
         // -- registerInstructionDeserializer
             = new ExperimenterInstructionSerializerKey(EncodeConstants.OF10_VERSION_ID,42L);
         provider.registerInstructionSerializer(key3, serializer);
         Assert.assertTrue("Wrong -- unregister InstructionSerializer", provider.unregisterSerializer(key3));
         Assert.assertFalse("Wrong -- unregister InstructionSerializer by not existing key", provider.unregisterSerializer(key3));
         // -- registerInstructionDeserializer

-        ExperimenterInstructionDeserializerKey key4 
+        ExperimenterInstructionDeserializerKey key4

             = new ExperimenterInstructionDeserializerKey(EncodeConstants.OF10_VERSION_ID,42L);
         provider.registerInstructionDeserializer(key4, deserializer);
         Assert.assertTrue("Wrong -- unregister InstructionDeserializer", provider.unregisterDeserializer(key4));
         Assert.assertFalse("Wrong -- unregister InstructionDeserializer by not existing key", provider.unregisterDeserializer(key4));
         // -- registerMatchEntryDeserializer
             = new ExperimenterInstructionDeserializerKey(EncodeConstants.OF10_VERSION_ID,42L);
         provider.registerInstructionDeserializer(key4, deserializer);
         Assert.assertTrue("Wrong -- unregister InstructionDeserializer", provider.unregisterDeserializer(key4));
         Assert.assertFalse("Wrong -- unregister InstructionDeserializer by not existing key", provider.unregisterDeserializer(key4));
         // -- registerMatchEntryDeserializer

-        MatchEntryDeserializerKey key5 
+        MatchEntryDeserializerKey key5

             = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42);
         provider.registerMatchEntryDeserializer(key5, deserializer);
         Assert.assertTrue("Wrong -- unregister MatchEntryDeserializer", provider.unregisterDeserializer(key5));
             = new MatchEntryDeserializerKey(EncodeConstants.OF10_VERSION_ID, 0x8000, 42);
         provider.registerMatchEntryDeserializer(key5, deserializer);
         Assert.assertTrue("Wrong -- unregister MatchEntryDeserializer", provider.unregisterDeserializer(key5));


@@ -205,7 +205,7 @@ public class SwitchConnectionProviderImpl02Test {
         Assert.assertTrue("Wrong -- unregister QueuePropertyDeserializer", provider.unregisterDeserializer(key10));
         Assert.assertFalse("Wrong -- unregister QueuePropertyDeserializer by not existing key", provider.unregisterDeserializer(key10));
         // -- registerMeterBandDeserializer
         Assert.assertTrue("Wrong -- unregister QueuePropertyDeserializer", provider.unregisterDeserializer(key10));
         Assert.assertFalse("Wrong -- unregister QueuePropertyDeserializer by not existing key", provider.unregisterDeserializer(key10));
         // -- registerMeterBandDeserializer

-        ExperimenterIdDeserializerKey key11 
+        ExperimenterIdDeserializerKey key11

             = new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L, MeterBandExperimenterCase.class);
         provider.registerMeterBandDeserializer(key11, deserializerMeterBandExpCase);
         Assert.assertTrue("Wrong -- unregister MeterBandDeserializer", provider.unregisterDeserializer(key11));
             = new ExperimenterIdDeserializerKey(EncodeConstants.OF10_VERSION_ID, 42L, MeterBandExperimenterCase.class);
         provider.registerMeterBandDeserializer(key11, deserializerMeterBandExpCase);
         Assert.assertTrue("Wrong -- unregister MeterBandDeserializer", provider.unregisterDeserializer(key11));


@@ -235,7 +235,7 @@ public class SwitchConnectionProviderImpl02Test {
         Assert.assertTrue("Wrong -- unregister MeterBandSerializer", provider.unregisterSerializer(key15));
         Assert.assertFalse("Wrong -- unregister MeterBandSerializer by not existing key", provider.unregisterSerializer(key15));
         // -- registerMatchEntrySerializer
         Assert.assertTrue("Wrong -- unregister MeterBandSerializer", provider.unregisterSerializer(key15));
         Assert.assertFalse("Wrong -- unregister MeterBandSerializer by not existing key", provider.unregisterSerializer(key15));
         // -- registerMatchEntrySerializer

-        MatchEntrySerializerKey<OpenflowBasicClass, InPort> key16 
+        MatchEntrySerializerKey<OpenflowBasicClass, InPort> key16

             = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, InPort.class);
         provider.registerMatchEntrySerializer(key16, serializer);
         Assert.assertTrue("Wrong -- unregister MatchEntrySerializer", provider.unregisterSerializer(key16));
             = new MatchEntrySerializerKey<>(EncodeConstants.OF13_VERSION_ID, OpenflowBasicClass.class, InPort.class);
         provider.registerMatchEntrySerializer(key16, serializer);
         Assert.assertTrue("Wrong -- unregister MatchEntrySerializer", provider.unregisterSerializer(key16));

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/UdpMessageListenerWrapperTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/UdpMessageListenerWrapperTest.java
index 0bf7901735e3716c5c967469d08490850d23b4fd..df4c7e980a7543b851c29b81b494c4acba014820 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/UdpMessageListenerWrapperTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/UdpMessageListenerWrapperTest.java
@@ -22,7 +22,7 @@ import org.opendaylight.openflowjava.protocol.impl.core.connection.UdpMessageLis
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
 
 /**
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader;
 
 /**

- * 
+ *

  * @author madamjak
  *
  */
  * @author madamjak
  *
  */


@@ -30,7 +30,7 @@ public class UdpMessageListenerWrapperTest {
 
     @Mock GenericFutureListener<Future<Void>> listener;
     @Mock OfHeader msg;
 
     @Mock GenericFutureListener<Future<Void>> listener;
     @Mock OfHeader msg;

-    
+

     @Before
     public void startUp(){
         MockitoAnnotations.initMocks(this);
     @Before
     public void startUp(){
         MockitoAnnotations.initMocks(this);

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DeserializerRegistryImplTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DeserializerRegistryImplTest.java
index aec3df43b68cc839eae40f77395ed3faa5b9f546..49e41fc8704a6866330aa2223089fdec044b36bf 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DeserializerRegistryImplTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/DeserializerRegistryImplTest.java
@@ -15,7 +15,7 @@ import org.opendaylight.openflowjava.protocol.impl.util.MatchDeserializer;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.match.grouping.Match;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.match.v10.grouping.MatchV10;
 /**
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.match.grouping.Match;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.match.v10.grouping.MatchV10;
 /**

- * 
+ *

  * @author madamjak
  *
  */
  * @author madamjak
  *
  */

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageTypeCodeKeyTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageTypeCodeKeyTest.java
index 337d3d36d839ced41eeb0cf0096e205e1c270075..165d613bc8a5da6ee3fce97566f01394e3332d46 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageTypeCodeKeyTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/MessageTypeCodeKeyTest.java
@@ -13,7 +13,7 @@ import org.junit.Test;
 
 
 /**
 
 
 /**

- * 
+ *

  * @author madamjak
  *
  */
  * @author madamjak
  *
  */

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassKeyTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassKeyTest.java
index 08cd1a4f5c04e1eeca3ba41c812a008d93f2f8f9..a9ebcf4313ee66985509c42e8b69bae08492f445 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassKeyTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/TypeToClassKeyTest.java
@@ -13,7 +13,7 @@ import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.util.TypeToClassKey;
 /**
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.util.TypeToClassKey;
 /**

- * 
+ *

  * @author madamjak
  *
  */
  * @author madamjak
  *
  */

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/EchoReplyMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/EchoReplyMessageFactoryTest.java
index abd1d1d5288737fd8b94ee34bbc9dff54bd2fb64..801d47a6466894d337959d376aceac84d9fad3e7 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/EchoReplyMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/EchoReplyMessageFactoryTest.java
@@ -50,7 +50,7 @@ public class EchoReplyMessageFactoryTest {
 
         BufferHelper.checkHeaderV13(builtByFactory);
     }
 
         BufferHelper.checkHeaderV13(builtByFactory);
     }

-    
+

     /**
      * Testing {@link EchoReplyMessageFactory} for correct translation into POJO
      */
     /**
      * Testing {@link EchoReplyMessageFactory} for correct translation into POJO
      */


@@ -59,7 +59,7 @@ public class EchoReplyMessageFactoryTest {
         byte[] data = new byte[]{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07};
         ByteBuf bb = BufferHelper.buildBuffer(data);
         EchoOutput builtByFactory = BufferHelper.deserialize(echoFactory, bb);
         byte[] data = new byte[]{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07};
         ByteBuf bb = BufferHelper.buildBuffer(data);
         EchoOutput builtByFactory = BufferHelper.deserialize(echoFactory, bb);

-        
+

         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertArrayEquals("Wrong data", data, builtByFactory.getData());
     }
         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertArrayEquals("Wrong data", data, builtByFactory.getData());
     }

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/EchoRequestMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/EchoRequestMessageFactoryTest.java
index 04fa4ddb4c30103b2df3ad04c5edba2177bcd285..8aff8b7553e3348f129fda7c71284f8e6f942653 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/EchoRequestMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/EchoRequestMessageFactoryTest.java
@@ -50,7 +50,7 @@ public class EchoRequestMessageFactoryTest {
 
         BufferHelper.checkHeaderV13(builtByFactory);
     }
 
         BufferHelper.checkHeaderV13(builtByFactory);
     }

-    
+

     /**
      * Testing {@link EchoRequestMessageFactory} for correct translation into POJO
      */
     /**
      * Testing {@link EchoRequestMessageFactory} for correct translation into POJO
      */

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ErrorMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ErrorMessageFactoryTest.java
index 367062f5f0d13758bbf576efe273df91c689a536..55a90b8117c83de4e4617e005b123285edf32568 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ErrorMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ErrorMessageFactoryTest.java
@@ -351,7 +351,7 @@ public class ErrorMessageFactoryTest {
         Assert.assertEquals("Wrong code string", "EPERM", builtByFactory.getCodeString());
         Assert.assertArrayEquals("Wrong data", new byte[]{0x00, 0x01, 0x02, 0x03}, builtByFactory.getData());
     }
         Assert.assertEquals("Wrong code string", "EPERM", builtByFactory.getCodeString());
         Assert.assertArrayEquals("Wrong data", new byte[]{0x00, 0x01, 0x02, 0x03}, builtByFactory.getData());
     }

-    
+

     /**
      * Test of {@link ErrorMessageFactory} for correct translation into POJO
      */
     /**
      * Test of {@link ErrorMessageFactory} for correct translation into POJO
      */


@@ -367,7 +367,7 @@ public class ErrorMessageFactoryTest {
         Assert.assertEquals("Wrong code string", "UNKNOWN_CODE", builtByFactory.getCodeString());
         Assert.assertArrayEquals("Wrong data", new byte[]{0x00, 0x01, 0x02, 0x03}, builtByFactory.getData());
     }
         Assert.assertEquals("Wrong code string", "UNKNOWN_CODE", builtByFactory.getCodeString());
         Assert.assertArrayEquals("Wrong data", new byte[]{0x00, 0x01, 0x02, 0x03}, builtByFactory.getData());
     }

-    
+

     /**
      * Test of {@link ErrorMessageFactory} for correct translation into POJO
      */
     /**
      * Test of {@link ErrorMessageFactory} for correct translation into POJO
      */

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ExperimenterMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ExperimenterMessageFactoryTest.java
index b05730f288b142100a02b006eb22276adf55a15a..3b71c37e5f25e5bc278a5a44e9c7ee62fa0d3749 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ExperimenterMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/ExperimenterMessageFactoryTest.java
@@ -48,7 +48,7 @@ public class ExperimenterMessageFactoryTest {
     public void test() {
         when(registry.getDeserializer(any(ExperimenterIdDeserializerKey.class))).thenReturn(deserializer);
         when(deserializer.deserialize(any(ByteBuf.class))).thenReturn(message);
     public void test() {
         when(registry.getDeserializer(any(ExperimenterIdDeserializerKey.class))).thenReturn(deserializer);
         when(deserializer.deserialize(any(ByteBuf.class))).thenReturn(message);

-        
+

         ByteBuf buffer = ByteBufUtils.hexStringToByteBuf("00 01 02 03 00 00 00 10");
         ExperimenterMessageFactory factory = new ExperimenterMessageFactory();
         factory.injectDeserializerRegistry(registry);
         ByteBuf buffer = ByteBufUtils.hexStringToByteBuf("00 01 02 03 00 00 00 10");
         ExperimenterMessageFactory factory = new ExperimenterMessageFactory();
         factory.injectDeserializerRegistry(registry);

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowRemovedMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowRemovedMessageFactoryTest.java
index 22b7df56d7a38a085eea66c36a8de2abfdab93c7..cc0f35d836e6fadcfa1e312ae48cad85b116aa4b 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowRemovedMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/FlowRemovedMessageFactoryTest.java
@@ -51,7 +51,7 @@ public class FlowRemovedMessageFactoryTest {
         FlowRemovedMessage builtByFactory = BufferHelper.deserialize(flowFactory, bb);
 
         BufferHelper.checkHeaderV13(builtByFactory);
         FlowRemovedMessage builtByFactory = BufferHelper.deserialize(flowFactory, bb);
 
         BufferHelper.checkHeaderV13(builtByFactory);

-        
+

         Assert.assertTrue(builtByFactory.getCookie().longValue() == 0x0001020304050607L);
         Assert.assertTrue(builtByFactory.getPriority() == 0x03);
         Assert.assertEquals("Wrong reason", 0x02, builtByFactory.getReason().getIntValue());
         Assert.assertTrue(builtByFactory.getCookie().longValue() == 0x0001020304050607L);
         Assert.assertTrue(builtByFactory.getPriority() == 0x03);
         Assert.assertEquals("Wrong reason", 0x02, builtByFactory.getReason().getIntValue());


@@ -63,5 +63,5 @@ public class FlowRemovedMessageFactoryTest {
         Assert.assertEquals("Wrong packetCount", 0x0001020304050607L, builtByFactory.getPacketCount().longValue());
         Assert.assertEquals("Wrong byteCount", 0x0001020304050607L, builtByFactory.getByteCount().longValue());
     }
         Assert.assertEquals("Wrong packetCount", 0x0001020304050607L, builtByFactory.getPacketCount().longValue());
         Assert.assertEquals("Wrong byteCount", 0x0001020304050607L, builtByFactory.getByteCount().longValue());
     }

-    
+

 }
 }

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetAsyncReplyMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetAsyncReplyMessageFactoryTest.java
index 937f7d8c1f54460937f051cb3e78b2dbe920d1ae..c9dabd87cc51d9cde3983d753841c770468cab0d 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetAsyncReplyMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetAsyncReplyMessageFactoryTest.java
@@ -57,7 +57,7 @@ public class GetAsyncReplyMessageFactoryTest {
      */
     @Test
     public void testGetAsyncReplyMessage() {
      */
     @Test
     public void testGetAsyncReplyMessage() {

-        ByteBuf bb = BufferHelper.buildBuffer("00 00 00 07 "+ 
+        ByteBuf bb = BufferHelper.buildBuffer("00 00 00 07 "+

                                               "00 00 00 00 "+
                                               "00 00 00 07 "+
                                               "00 00 00 00 "+
                                               "00 00 00 00 "+
                                               "00 00 00 07 "+
                                               "00 00 00 00 "+

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetConfigReplyMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetConfigReplyMessageFactoryTest.java
index e30fb02cc25ab6f5c2156c78336c923d7b83d6b8..16826620848b9dcd3cdea886a2e306fe319d7869 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetConfigReplyMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetConfigReplyMessageFactoryTest.java
@@ -49,8 +49,8 @@ public class GetConfigReplyMessageFactoryTest {
         GetConfigOutput builtByFactory = BufferHelper.deserialize(configFactory, bb);
 
         BufferHelper.checkHeaderV13(builtByFactory);
         GetConfigOutput builtByFactory = BufferHelper.deserialize(configFactory, bb);
 
         BufferHelper.checkHeaderV13(builtByFactory);

-        Assert.assertEquals("Wrong switchConfigFlag", 0x01, builtByFactory.getFlags().getIntValue()); 
+        Assert.assertEquals("Wrong switchConfigFlag", 0x01, builtByFactory.getFlags().getIntValue());

         Assert.assertEquals("Wrong missSendLen", 0x03, builtByFactory.getMissSendLen().intValue());
     }
         Assert.assertEquals("Wrong missSendLen", 0x03, builtByFactory.getMissSendLen().intValue());
     }

-    
+

 }
 }

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/HelloMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/HelloMessageFactoryTest.java
index 89f10225cd3dcb308fa1bc43ad3b480c1db73c09..47bd8ddf0cd7e7dc3164944b62e7a5e575ed8a19 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/HelloMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/HelloMessageFactoryTest.java
@@ -80,7 +80,7 @@ public class HelloMessageFactoryTest {
         Assert.assertEquals("Wrong type", element.get(0).getType(), builtByFactory.getElements().get(0).getType());
         Assert.assertEquals("Wrong versionBitmap", element.get(0).getVersionBitmap(), builtByFactory.getElements().get(0).getVersionBitmap());
     }
         Assert.assertEquals("Wrong type", element.get(0).getType(), builtByFactory.getElements().get(0).getType());
         Assert.assertEquals("Wrong versionBitmap", element.get(0).getVersionBitmap(), builtByFactory.getElements().get(0).getVersionBitmap());
     }

- 
+

     /**
      * Testing {@link HelloMessageFactory} if incorrect version is set
      */
     /**
      * Testing {@link HelloMessageFactory} if incorrect version is set
      */

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactoryTest.java
index 11322641c7ac7087cb9035955601f77c9e3693dc..ded6a32663da9cf3433f64b89fff40311dd75576 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactoryTest.java
@@ -96,7 +96,7 @@ public class MultipartReplyMessageFactoryTest {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(MultipartReplyMessageFactoryTest.class);
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(MultipartReplyMessageFactoryTest.class);

-    
+

     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      */
     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      */


@@ -105,39 +105,39 @@ public class MultipartReplyMessageFactoryTest {
         final int DESC_STR_LEN = 256;
         final int SERIAL_NUM_LEN = 32;
         ByteBuf bb = BufferHelper.buildBuffer("00 00 00 01 00 00 00 00");
         final int DESC_STR_LEN = 256;
         final int SERIAL_NUM_LEN = 32;
         ByteBuf bb = BufferHelper.buildBuffer("00 00 00 01 00 00 00 00");

-        
+

         String mfrDesc = "Manufacturer description";
         byte[] mfrDescBytes = new byte[256];
         mfrDescBytes = mfrDesc.getBytes();
         bb.writeBytes(mfrDescBytes);
         bb.writeZero(DESC_STR_LEN - mfrDescBytes.length);
         String mfrDesc = "Manufacturer description";
         byte[] mfrDescBytes = new byte[256];
         mfrDescBytes = mfrDesc.getBytes();
         bb.writeBytes(mfrDescBytes);
         bb.writeZero(DESC_STR_LEN - mfrDescBytes.length);

-        
+

         String hwDesc = "Hardware description";
         byte[] hwDescBytes = new byte[256];
         hwDescBytes = hwDesc.getBytes();
         bb.writeBytes(hwDescBytes);
         bb.writeZero(DESC_STR_LEN - hwDescBytes.length);
         String hwDesc = "Hardware description";
         byte[] hwDescBytes = new byte[256];
         hwDescBytes = hwDesc.getBytes();
         bb.writeBytes(hwDescBytes);
         bb.writeZero(DESC_STR_LEN - hwDescBytes.length);

-        
+

         String swDesc = "Software description";
         byte[] swDescBytes = new byte[256];
         swDescBytes = swDesc.getBytes();
         bb.writeBytes(swDescBytes);
         bb.writeZero(DESC_STR_LEN - swDescBytes.length);
         String swDesc = "Software description";
         byte[] swDescBytes = new byte[256];
         swDescBytes = swDesc.getBytes();
         bb.writeBytes(swDescBytes);
         bb.writeZero(DESC_STR_LEN - swDescBytes.length);

-        
+

         String serialNum = "SN0123456789";
         byte[] serialNumBytes = new byte[32];
         serialNumBytes = serialNum.getBytes();
         bb.writeBytes(serialNumBytes);
         bb.writeZero(SERIAL_NUM_LEN - serialNumBytes.length);
         String serialNum = "SN0123456789";
         byte[] serialNumBytes = new byte[32];
         serialNumBytes = serialNum.getBytes();
         bb.writeBytes(serialNumBytes);
         bb.writeZero(SERIAL_NUM_LEN - serialNumBytes.length);

-        
+

         String dpDesc = "switch3 in room 3120";
         byte[] dpDescBytes = new byte[256];
         dpDescBytes = dpDesc.getBytes();
         bb.writeBytes(dpDescBytes);
         bb.writeZero(DESC_STR_LEN - dpDescBytes.length);
         String dpDesc = "switch3 in room 3120";
         byte[] dpDescBytes = new byte[256];
         dpDescBytes = dpDesc.getBytes();
         bb.writeBytes(dpDescBytes);
         bb.writeZero(DESC_STR_LEN - dpDescBytes.length);

-        
+

         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);

-        
+

         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 0x00, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 0x00, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());


@@ -161,25 +161,25 @@ public class MultipartReplyMessageFactoryTest {
                                               "00 00 00 08 "+//flowCount
                                               "00 00 00 00"//pad
                                               );
                                               "00 00 00 08 "+//flowCount
                                               "00 00 00 00"//pad
                                               );

-        
+

         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);

-        
+

         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 0x02, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         MultipartReplyAggregateCase messageCase = (MultipartReplyAggregateCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyAggregate message = messageCase.getMultipartReplyAggregate();
         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 0x02, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         MultipartReplyAggregateCase messageCase = (MultipartReplyAggregateCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyAggregate message = messageCase.getMultipartReplyAggregate();

-        Assert.assertEquals("Wrong packetCount", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong packetCount",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getPacketCount());
                 message.getPacketCount());

-        Assert.assertEquals("Wrong byteCount", 
-                new BigInteger(1, new byte[]{(byte) 0x0F, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong byteCount",
+                new BigInteger(1, new byte[]{(byte) 0x0F, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getByteCount());
                 message.getByteCount());

-        Assert.assertEquals("Wrong flowCount", 
-                8, 
+        Assert.assertEquals("Wrong flowCount",
+                8,

                 message.getFlowCount().intValue());
     }
                 message.getFlowCount().intValue());
     }

-    
+

     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      */
     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      */


@@ -192,25 +192,25 @@ public class MultipartReplyMessageFactoryTest {
                                               "FF 01 01 01 01 01 01 01 "+//lookupCount
                                               "AF 01 01 01 01 01 01 01"//matchedCount
                                               );
                                               "FF 01 01 01 01 01 01 01 "+//lookupCount
                                               "AF 01 01 01 01 01 01 01"//matchedCount
                                               );

-        
+

         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);

-        
+

         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 0x03, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 0x03, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());

-        
+

         MultipartReplyTableCase messageCase = (MultipartReplyTableCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyTable message = messageCase.getMultipartReplyTable();
         Assert.assertEquals("Wrong tableId", 8, message.getTableStats().get(0).getTableId().intValue());
         Assert.assertEquals("Wrong activeCount", 16, message.getTableStats().get(0).getActiveCount().longValue());
         MultipartReplyTableCase messageCase = (MultipartReplyTableCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyTable message = messageCase.getMultipartReplyTable();
         Assert.assertEquals("Wrong tableId", 8, message.getTableStats().get(0).getTableId().intValue());
         Assert.assertEquals("Wrong activeCount", 16, message.getTableStats().get(0).getActiveCount().longValue());

-        Assert.assertEquals("Wrong lookupCount", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong lookupCount",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getTableStats().get(0).getLookupCount());
                 message.getTableStats().get(0).getLookupCount());

-        Assert.assertEquals("Wrong matchedCount", 
-                new BigInteger(1, new byte[]{(byte) 0xAF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong matchedCount",
+                new BigInteger(1, new byte[]{(byte) 0xAF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getTableStats().get(0).getMatchedCount());
     }
                 message.getTableStats().get(0).getMatchedCount());
     }

-    
+

     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      */
     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      */


@@ -234,55 +234,55 @@ public class MultipartReplyMessageFactoryTest {
                                               "00 00 00 02 "+//durationSec
                                               "00 00 00 04"//durationNsec
                                               );
                                               "00 00 00 02 "+//durationSec
                                               "00 00 00 04"//durationNsec
                                               );

-        
+

         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);

-        
+

         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 0x04, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         MultipartReplyPortStatsCase messageCase = (MultipartReplyPortStatsCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyPortStats message = messageCase.getMultipartReplyPortStats();
         Assert.assertEquals("Wrong portNo", 255, message.getPortStats().get(0).getPortNo().intValue());
         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 0x04, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         MultipartReplyPortStatsCase messageCase = (MultipartReplyPortStatsCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyPortStats message = messageCase.getMultipartReplyPortStats();
         Assert.assertEquals("Wrong portNo", 255, message.getPortStats().get(0).getPortNo().intValue());

-        Assert.assertEquals("Wrong rxPackets", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong rxPackets",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getPortStats().get(0).getRxPackets());
                 message.getPortStats().get(0).getRxPackets());

-        Assert.assertEquals("Wrong txPackets", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), 
+        Assert.assertEquals("Wrong txPackets",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}),

                 message.getPortStats().get(0).getTxPackets());
                 message.getPortStats().get(0).getTxPackets());

-        Assert.assertEquals("Wrong rxBytes", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong rxBytes",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getPortStats().get(0).getRxBytes());
                 message.getPortStats().get(0).getRxBytes());

-        Assert.assertEquals("Wrong txBytes", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong txBytes",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getPortStats().get(0).getTxBytes());
                 message.getPortStats().get(0).getTxBytes());

-        Assert.assertEquals("Wrong rxDropped", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong rxDropped",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getPortStats().get(0).getRxDropped());
                 message.getPortStats().get(0).getRxDropped());

-        Assert.assertEquals("Wrong txDropped", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong txDropped",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getPortStats().get(0).getTxDropped());
                 message.getPortStats().get(0).getTxDropped());

-        Assert.assertEquals("Wrong rxErrors", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong rxErrors",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getPortStats().get(0).getRxErrors());
                 message.getPortStats().get(0).getRxErrors());

-        Assert.assertEquals("Wrong txErrors", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong txErrors",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getPortStats().get(0).getTxErrors());
                 message.getPortStats().get(0).getTxErrors());

-        Assert.assertEquals("Wrong rxFrameErr", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong rxFrameErr",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getPortStats().get(0).getRxFrameErr());
                 message.getPortStats().get(0).getRxFrameErr());

-        Assert.assertEquals("Wrong rxOverErr", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong rxOverErr",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getPortStats().get(0).getRxOverErr());
                 message.getPortStats().get(0).getRxOverErr());

-        Assert.assertEquals("Wrong rxCrcErr", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong rxCrcErr",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getPortStats().get(0).getRxCrcErr());
                 message.getPortStats().get(0).getRxCrcErr());

-        Assert.assertEquals("Wrong collisions", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong collisions",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getPortStats().get(0).getCollisions());
         Assert.assertEquals("Wrong durationSec", 2, message.getPortStats().get(0).getDurationSec().intValue());
         Assert.assertEquals("Wrong durationNsec", 4, message.getPortStats().get(0).getDurationNsec().intValue());
     }
                 message.getPortStats().get(0).getCollisions());
         Assert.assertEquals("Wrong durationSec", 2, message.getPortStats().get(0).getDurationSec().intValue());
         Assert.assertEquals("Wrong durationNsec", 4, message.getPortStats().get(0).getDurationNsec().intValue());
     }

-    
+

     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      */
     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      */


@@ -297,9 +297,9 @@ public class MultipartReplyMessageFactoryTest {
                                               "00 00 00 02 "+//durationSec
                                               "00 00 00 04"//durationNsec
                                               );
                                               "00 00 00 02 "+//durationSec
                                               "00 00 00 04"//durationNsec
                                               );

-        
+

         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);

-        
+

         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 0x05, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 0x05, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());


@@ -307,19 +307,19 @@ public class MultipartReplyMessageFactoryTest {
         MultipartReplyQueue message = messageCase.getMultipartReplyQueue();
         Assert.assertEquals("Wrong portNo", 255, message.getQueueStats().get(0).getPortNo().intValue());
         Assert.assertEquals("Wrong queueId", 16, message.getQueueStats().get(0).getQueueId().intValue());
         MultipartReplyQueue message = messageCase.getMultipartReplyQueue();
         Assert.assertEquals("Wrong portNo", 255, message.getQueueStats().get(0).getPortNo().intValue());
         Assert.assertEquals("Wrong queueId", 16, message.getQueueStats().get(0).getQueueId().intValue());

-        Assert.assertEquals("Wrong txBytes", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong txBytes",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getQueueStats().get(0).getTxBytes());
                 message.getQueueStats().get(0).getTxBytes());

-        Assert.assertEquals("Wrong txPackets", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), 
+        Assert.assertEquals("Wrong txPackets",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}),

                 message.getQueueStats().get(0).getTxPackets());
                 message.getQueueStats().get(0).getTxPackets());

-        Assert.assertEquals("Wrong txErrors", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong txErrors",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getQueueStats().get(0).getTxErrors());
         Assert.assertEquals("Wrong durationSec", 2, message.getQueueStats().get(0).getDurationSec().intValue());
         Assert.assertEquals("Wrong durationNsec", 4, message.getQueueStats().get(0).getDurationNsec().intValue());
     }
                 message.getQueueStats().get(0).getTxErrors());
         Assert.assertEquals("Wrong durationSec", 2, message.getQueueStats().get(0).getDurationSec().intValue());
         Assert.assertEquals("Wrong durationNsec", 4, message.getQueueStats().get(0).getDurationNsec().intValue());
     }

-    
+

     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      */
     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      */


@@ -353,9 +353,9 @@ public class MultipartReplyMessageFactoryTest {
                                               "FF 02 02 02 02 02 02 02 "+//packetCountBucket_2.2
                                               "FF 02 02 02 02 02 02 02"//byteCountBucket_2.2
                                               );
                                               "FF 02 02 02 02 02 02 02 "+//packetCountBucket_2.2
                                               "FF 02 02 02 02 02 02 02"//byteCountBucket_2.2
                                               );

-        
+

         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);

-        
+

         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 0x06, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 0x06, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());


@@ -363,48 +363,48 @@ public class MultipartReplyMessageFactoryTest {
         MultipartReplyGroup message = messageCase.getMultipartReplyGroup();
         Assert.assertEquals("Wrong groupId", 16, message.getGroupStats().get(0).getGroupId().getValue().intValue());
         Assert.assertEquals("Wrong refCount", 18, message.getGroupStats().get(0).getRefCount().intValue());
         MultipartReplyGroup message = messageCase.getMultipartReplyGroup();
         Assert.assertEquals("Wrong groupId", 16, message.getGroupStats().get(0).getGroupId().getValue().intValue());
         Assert.assertEquals("Wrong refCount", 18, message.getGroupStats().get(0).getRefCount().intValue());

-        Assert.assertEquals("Wrong packetCount", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong packetCount",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getGroupStats().get(0).getPacketCount());
                 message.getGroupStats().get(0).getPacketCount());

-        Assert.assertEquals("Wrong byteCount", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong byteCount",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getGroupStats().get(0).getByteCount());
         Assert.assertEquals("Wrong durationSec", 8, message.getGroupStats().get(0).getDurationSec().intValue());
         Assert.assertEquals("Wrong durationNsec", 9, message.getGroupStats().get(0).getDurationNsec().intValue());
                 message.getGroupStats().get(0).getByteCount());
         Assert.assertEquals("Wrong durationSec", 8, message.getGroupStats().get(0).getDurationSec().intValue());
         Assert.assertEquals("Wrong durationNsec", 9, message.getGroupStats().get(0).getDurationNsec().intValue());

-        Assert.assertEquals("Wrong packetCountBucket", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong packetCountBucket",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getGroupStats().get(0).getBucketStats().get(0).getPacketCount());
                 message.getGroupStats().get(0).getBucketStats().get(0).getPacketCount());

-        Assert.assertEquals("Wrong byteCountBucket", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong byteCountBucket",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getGroupStats().get(0).getBucketStats().get(0).getByteCount());
                 message.getGroupStats().get(0).getBucketStats().get(0).getByteCount());

-        Assert.assertEquals("Wrong packetCountBucket_2", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), 
+        Assert.assertEquals("Wrong packetCountBucket_2",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}),

                 message.getGroupStats().get(0).getBucketStats().get(1).getPacketCount());
                 message.getGroupStats().get(0).getBucketStats().get(1).getPacketCount());

-        Assert.assertEquals("Wrong byteCountBucket_2", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), 
+        Assert.assertEquals("Wrong byteCountBucket_2",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}),

                 message.getGroupStats().get(0).getBucketStats().get(1).getByteCount());
                 message.getGroupStats().get(0).getBucketStats().get(1).getByteCount());

-        
+

         Assert.assertEquals("Wrong groupId_2", 16, message.getGroupStats().get(1).getGroupId().getValue().intValue());
         Assert.assertEquals("Wrong refCount_2", 18, message.getGroupStats().get(1).getRefCount().intValue());
         Assert.assertEquals("Wrong groupId_2", 16, message.getGroupStats().get(1).getGroupId().getValue().intValue());
         Assert.assertEquals("Wrong refCount_2", 18, message.getGroupStats().get(1).getRefCount().intValue());

-        Assert.assertEquals("Wrong packetCount_2", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong packetCount_2",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getGroupStats().get(1).getPacketCount());
                 message.getGroupStats().get(1).getPacketCount());

-        Assert.assertEquals("Wrong byteCount_2", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong byteCount_2",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getGroupStats().get(1).getByteCount());
         Assert.assertEquals("Wrong durationSec_2", 8, message.getGroupStats().get(1).getDurationSec().intValue());
         Assert.assertEquals("Wrong durationNsec_2", 9, message.getGroupStats().get(1).getDurationNsec().intValue());
                 message.getGroupStats().get(1).getByteCount());
         Assert.assertEquals("Wrong durationSec_2", 8, message.getGroupStats().get(1).getDurationSec().intValue());
         Assert.assertEquals("Wrong durationNsec_2", 9, message.getGroupStats().get(1).getDurationNsec().intValue());

-        Assert.assertEquals("Wrong packetCountBucket_1.2", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong packetCountBucket_1.2",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getGroupStats().get(1).getBucketStats().get(0).getPacketCount());
                 message.getGroupStats().get(1).getBucketStats().get(0).getPacketCount());

-        Assert.assertEquals("Wrong byteCountBucket_1.2", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong byteCountBucket_1.2",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getGroupStats().get(1).getBucketStats().get(0).getByteCount());
                 message.getGroupStats().get(1).getBucketStats().get(0).getByteCount());

-        Assert.assertEquals("Wrong packetCountBucket_2.2", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), 
+        Assert.assertEquals("Wrong packetCountBucket_2.2",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}),

                 message.getGroupStats().get(1).getBucketStats().get(1).getPacketCount());
                 message.getGroupStats().get(1).getBucketStats().get(1).getPacketCount());

-        Assert.assertEquals("Wrong byteCountBucket_2.2", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), 
+        Assert.assertEquals("Wrong byteCountBucket_2.2",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}),

                 message.getGroupStats().get(1).getBucketStats().get(1).getByteCount());
     }
 
                 message.getGroupStats().get(1).getBucketStats().get(1).getByteCount());
     }
 


@@ -429,48 +429,48 @@ public class MultipartReplyMessageFactoryTest {
                                               "FF 03 03 03 03 03 03 03 "+//packetBandCount_03
                                               "FF 03 03 03 03 03 03 03"//byteBandCount_03
                                               );
                                               "FF 03 03 03 03 03 03 03 "+//packetBandCount_03
                                               "FF 03 03 03 03 03 03 03"//byteBandCount_03
                                               );

-        
+

         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);

-        
+

         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 9, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         MultipartReplyMeterCase messageCase = (MultipartReplyMeterCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyMeter message = messageCase.getMultipartReplyMeter();
         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 9, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         MultipartReplyMeterCase messageCase = (MultipartReplyMeterCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyMeter message = messageCase.getMultipartReplyMeter();

-        Assert.assertEquals("Wrong meterId", 9, 
+        Assert.assertEquals("Wrong meterId", 9,

                              message.getMeterStats().get(0).getMeterId().getValue().intValue());
                              message.getMeterStats().get(0).getMeterId().getValue().intValue());

-        Assert.assertEquals("Wrong flowCount", 7, 
+        Assert.assertEquals("Wrong flowCount", 7,

                             message.getMeterStats().get(0).getFlowCount().intValue());
                             message.getMeterStats().get(0).getFlowCount().intValue());

-        Assert.assertEquals("Wrong packetInCount", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong packetInCount",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getMeterStats().get(0).getPacketInCount());
                 message.getMeterStats().get(0).getPacketInCount());

-        Assert.assertEquals("Wrong byteInCount", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong byteInCount",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getMeterStats().get(0).getByteInCount());
                 message.getMeterStats().get(0).getByteInCount());

-        Assert.assertEquals("Wrong durationSec", 5, 
+        Assert.assertEquals("Wrong durationSec", 5,

                 message.getMeterStats().get(0).getDurationSec().intValue());
                 message.getMeterStats().get(0).getDurationSec().intValue());

-        Assert.assertEquals("Wrong durationNsec", 5, 
+        Assert.assertEquals("Wrong durationNsec", 5,

                 message.getMeterStats().get(0).getDurationNsec().intValue());
                 message.getMeterStats().get(0).getDurationNsec().intValue());

-        Assert.assertEquals("Wrong packetBandCount_01", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong packetBandCount_01",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getMeterStats().get(0).getMeterBandStats().get(0).getPacketBandCount());
                 message.getMeterStats().get(0).getMeterBandStats().get(0).getPacketBandCount());

-        Assert.assertEquals("Wrong byteBandCount_01", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong byteBandCount_01",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getMeterStats().get(0).getMeterBandStats().get(0).getByteBandCount());
                 message.getMeterStats().get(0).getMeterBandStats().get(0).getByteBandCount());

-        Assert.assertEquals("Wrong packetBandCount_02", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), 
+        Assert.assertEquals("Wrong packetBandCount_02",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}),

                 message.getMeterStats().get(0).getMeterBandStats().get(1).getPacketBandCount());
                 message.getMeterStats().get(0).getMeterBandStats().get(1).getPacketBandCount());

-        Assert.assertEquals("Wrong byteBandCount_02", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), 
+        Assert.assertEquals("Wrong byteBandCount_02",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}),

                 message.getMeterStats().get(0).getMeterBandStats().get(1).getByteBandCount());
                 message.getMeterStats().get(0).getMeterBandStats().get(1).getByteBandCount());

-        Assert.assertEquals("Wrong packetBandCount_03", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), 
+        Assert.assertEquals("Wrong packetBandCount_03",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}),

                 message.getMeterStats().get(0).getMeterBandStats().get(2).getPacketBandCount());
                 message.getMeterStats().get(0).getMeterBandStats().get(2).getPacketBandCount());

-        Assert.assertEquals("Wrong byteBandCount_03", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), 
+        Assert.assertEquals("Wrong byteBandCount_03",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}),

                 message.getMeterStats().get(0).getMeterBandStats().get(2).getByteBandCount());
     }
                 message.getMeterStats().get(0).getMeterBandStats().get(2).getByteBandCount());
     }

-    
+

     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      */
     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      */


@@ -506,81 +506,81 @@ public class MultipartReplyMessageFactoryTest {
                                               "FF 03 03 03 03 03 03 03 "+//packetBandCount_13
                                               "FF 03 03 03 03 03 03 03"//byteBandCount_13
                                               );
                                               "FF 03 03 03 03 03 03 03 "+//packetBandCount_13
                                               "FF 03 03 03 03 03 03 03"//byteBandCount_13
                                               );

-        
+

         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);

-        
+

         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 9, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         MultipartReplyMeterCase messageCase = (MultipartReplyMeterCase) builtByFactory.getMultipartReplyBody();
         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 9, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         MultipartReplyMeterCase messageCase = (MultipartReplyMeterCase) builtByFactory.getMultipartReplyBody();

-        MultipartReplyMeter message = messageCase.getMultipartReplyMeter();        
-        Assert.assertEquals("Wrong meterId", 9, 
+        MultipartReplyMeter message = messageCase.getMultipartReplyMeter();
+        Assert.assertEquals("Wrong meterId", 9,

                              message.getMeterStats().get(0).getMeterId().getValue().intValue());
                              message.getMeterStats().get(0).getMeterId().getValue().intValue());

-        Assert.assertEquals("Wrong flowCount", 7, 
+        Assert.assertEquals("Wrong flowCount", 7,

                             message.getMeterStats().get(0).getFlowCount().intValue());
                             message.getMeterStats().get(0).getFlowCount().intValue());

-        Assert.assertEquals("Wrong packetInCount", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong packetInCount",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getMeterStats().get(0).getPacketInCount());
                 message.getMeterStats().get(0).getPacketInCount());

-        Assert.assertEquals("Wrong byteInCount", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong byteInCount",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getMeterStats().get(0).getByteInCount());
                 message.getMeterStats().get(0).getByteInCount());

-        Assert.assertEquals("Wrong durationSec", 5, 
+        Assert.assertEquals("Wrong durationSec", 5,

                 message.getMeterStats().get(0).getDurationSec().intValue());
                 message.getMeterStats().get(0).getDurationSec().intValue());

-        Assert.assertEquals("Wrong durationNsec", 5, 
+        Assert.assertEquals("Wrong durationNsec", 5,

                 message.getMeterStats().get(0).getDurationNsec().intValue());
                 message.getMeterStats().get(0).getDurationNsec().intValue());

-        Assert.assertEquals("Wrong packetBandCount_01", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong packetBandCount_01",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getMeterStats().get(0).getMeterBandStats().get(0).getPacketBandCount());
                 message.getMeterStats().get(0).getMeterBandStats().get(0).getPacketBandCount());

-        Assert.assertEquals("Wrong byteBandCount_01", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong byteBandCount_01",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getMeterStats().get(0).getMeterBandStats().get(0).getByteBandCount());
                 message.getMeterStats().get(0).getMeterBandStats().get(0).getByteBandCount());

-        Assert.assertEquals("Wrong packetBandCount_02", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), 
+        Assert.assertEquals("Wrong packetBandCount_02",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}),

                 message.getMeterStats().get(0).getMeterBandStats().get(1).getPacketBandCount());
                 message.getMeterStats().get(0).getMeterBandStats().get(1).getPacketBandCount());

-        Assert.assertEquals("Wrong byteBandCount_02", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), 
+        Assert.assertEquals("Wrong byteBandCount_02",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}),

                 message.getMeterStats().get(0).getMeterBandStats().get(1).getByteBandCount());
                 message.getMeterStats().get(0).getMeterBandStats().get(1).getByteBandCount());

-        Assert.assertEquals("Wrong packetBandCount_03", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), 
+        Assert.assertEquals("Wrong packetBandCount_03",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}),

                 message.getMeterStats().get(0).getMeterBandStats().get(2).getPacketBandCount());
                 message.getMeterStats().get(0).getMeterBandStats().get(2).getPacketBandCount());

-        Assert.assertEquals("Wrong byteBandCount_03", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), 
+        Assert.assertEquals("Wrong byteBandCount_03",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}),

                 message.getMeterStats().get(0).getMeterBandStats().get(2).getByteBandCount());
                 message.getMeterStats().get(0).getMeterBandStats().get(2).getByteBandCount());

-        
-        Assert.assertEquals("Wrong meterId", 8, 
+
+        Assert.assertEquals("Wrong meterId", 8,

                 message.getMeterStats().get(1).getMeterId().getValue().intValue());
                 message.getMeterStats().get(1).getMeterId().getValue().intValue());

-        Assert.assertEquals("Wrong flowCount", 7, 
+        Assert.assertEquals("Wrong flowCount", 7,

                 message.getMeterStats().get(1).getFlowCount().intValue());
                 message.getMeterStats().get(1).getFlowCount().intValue());

-        Assert.assertEquals("Wrong packetInCount", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong packetInCount",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getMeterStats().get(1).getPacketInCount());
                 message.getMeterStats().get(1).getPacketInCount());

-        Assert.assertEquals("Wrong byteInCount", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong byteInCount",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getMeterStats().get(1).getByteInCount());
                 message.getMeterStats().get(1).getByteInCount());

-        Assert.assertEquals("Wrong durationSec", 5, 
+        Assert.assertEquals("Wrong durationSec", 5,

                 message.getMeterStats().get(1).getDurationSec().intValue());
                 message.getMeterStats().get(1).getDurationSec().intValue());

-        Assert.assertEquals("Wrong durationNsec", 5, 
+        Assert.assertEquals("Wrong durationNsec", 5,

                 message.getMeterStats().get(1).getDurationNsec().intValue());
                 message.getMeterStats().get(1).getDurationNsec().intValue());

-        Assert.assertEquals("Wrong packetBandCount_01", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong packetBandCount_01",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getMeterStats().get(1).getMeterBandStats().get(0).getPacketBandCount());
                 message.getMeterStats().get(1).getMeterBandStats().get(0).getPacketBandCount());

-        Assert.assertEquals("Wrong byteBandCount_01", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong byteBandCount_01",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getMeterStats().get(1).getMeterBandStats().get(0).getByteBandCount());
                 message.getMeterStats().get(1).getMeterBandStats().get(0).getByteBandCount());

-        Assert.assertEquals("Wrong packetBandCount_02", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), 
+        Assert.assertEquals("Wrong packetBandCount_02",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}),

                 message.getMeterStats().get(1).getMeterBandStats().get(1).getPacketBandCount());
                 message.getMeterStats().get(1).getMeterBandStats().get(1).getPacketBandCount());

-        Assert.assertEquals("Wrong byteBandCount_02", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), 
+        Assert.assertEquals("Wrong byteBandCount_02",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}),

                 message.getMeterStats().get(1).getMeterBandStats().get(1).getByteBandCount());
                 message.getMeterStats().get(1).getMeterBandStats().get(1).getByteBandCount());

-        Assert.assertEquals("Wrong packetBandCount_03", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), 
+        Assert.assertEquals("Wrong packetBandCount_03",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}),

                 message.getMeterStats().get(1).getMeterBandStats().get(2).getPacketBandCount());
                 message.getMeterStats().get(1).getMeterBandStats().get(2).getPacketBandCount());

-        Assert.assertEquals("Wrong byteBandCount_03", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), 
+        Assert.assertEquals("Wrong byteBandCount_03",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}),

                 message.getMeterStats().get(1).getMeterBandStats().get(2).getByteBandCount());
     }
                 message.getMeterStats().get(1).getMeterBandStats().get(2).getByteBandCount());
     }

-    
+

     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      */
     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      */


@@ -601,33 +601,33 @@ public class MultipartReplyMessageFactoryTest {
                                               "00 00 00 20 "+//meterBandDscp.burstSize
                                               "04 "+//meterBandDscp.precLevel
                                               "00 00 00");//meterBandDscp.pad
                                               "00 00 00 20 "+//meterBandDscp.burstSize
                                               "04 "+//meterBandDscp.precLevel
                                               "00 00 00");//meterBandDscp.pad

-        
+

         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);

-        
+

         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 10, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         MultipartReplyMeterConfigCase messageCase = (MultipartReplyMeterConfigCase) builtByFactory.getMultipartReplyBody();
         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 10, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         MultipartReplyMeterConfigCase messageCase = (MultipartReplyMeterConfigCase) builtByFactory.getMultipartReplyBody();

-        MultipartReplyMeterConfig message = messageCase.getMultipartReplyMeterConfig();        
+        MultipartReplyMeterConfig message = messageCase.getMultipartReplyMeterConfig();

         Assert.assertEquals("Wrong flags", new MeterFlags(false, false, true, true),
                              message.getMeterConfig().get(0).getFlags());
         Assert.assertEquals("Wrong flags", new MeterFlags(false, false, true, true),
                              message.getMeterConfig().get(0).getFlags());

-        Assert.assertEquals("Wrong meterId", 9, 
+        Assert.assertEquals("Wrong meterId", 9,

                              message.getMeterConfig().get(0).getMeterId().getValue().intValue());
                              message.getMeterConfig().get(0).getMeterId().getValue().intValue());

-        
-        MeterBandDropCase dropCase = (MeterBandDropCase) message.getMeterConfig().get(0).getBands().get(0).getMeterBand(); 
+
+        MeterBandDropCase dropCase = (MeterBandDropCase) message.getMeterConfig().get(0).getBands().get(0).getMeterBand();

         MeterBandDrop meterBandDrop = dropCase.getMeterBandDrop();
         MeterBandDrop meterBandDrop = dropCase.getMeterBandDrop();

-        Assert.assertEquals("Wrong meterBandDrop.type", 1, meterBandDrop.getType().getIntValue()); 
+        Assert.assertEquals("Wrong meterBandDrop.type", 1, meterBandDrop.getType().getIntValue());

         Assert.assertEquals("Wrong meterBandDrop.rate", 17, meterBandDrop.getRate().intValue());
         Assert.assertEquals("Wrong meterBandDrop.burstSize", 32, meterBandDrop.getBurstSize().intValue());
         Assert.assertEquals("Wrong meterBandDrop.rate", 17, meterBandDrop.getRate().intValue());
         Assert.assertEquals("Wrong meterBandDrop.burstSize", 32, meterBandDrop.getBurstSize().intValue());

-        
-        MeterBandDscpRemarkCase dscpCase = (MeterBandDscpRemarkCase) message.getMeterConfig().get(0).getBands().get(1).getMeterBand(); 
+
+        MeterBandDscpRemarkCase dscpCase = (MeterBandDscpRemarkCase) message.getMeterConfig().get(0).getBands().get(1).getMeterBand();

         MeterBandDscpRemark meterBandDscp = dscpCase.getMeterBandDscpRemark();
         MeterBandDscpRemark meterBandDscp = dscpCase.getMeterBandDscpRemark();

-        Assert.assertEquals("Wrong meterBandDscp.type", 2, meterBandDscp.getType().getIntValue()); 
+        Assert.assertEquals("Wrong meterBandDscp.type", 2, meterBandDscp.getType().getIntValue());

         Assert.assertEquals("Wrong meterBandDscp.rate", 17, meterBandDscp.getRate().intValue());
         Assert.assertEquals("Wrong meterBandDscp.burstSize", 32, meterBandDscp.getBurstSize().intValue());
         Assert.assertEquals("Wrong meterBandDscp.precLevel", 4, meterBandDscp.getPrecLevel().intValue());
     }
         Assert.assertEquals("Wrong meterBandDscp.rate", 17, meterBandDscp.getRate().intValue());
         Assert.assertEquals("Wrong meterBandDscp.burstSize", 32, meterBandDscp.getBurstSize().intValue());
         Assert.assertEquals("Wrong meterBandDscp.precLevel", 4, meterBandDscp.getPrecLevel().intValue());
     }

-    
+

     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      */
     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      */


@@ -648,7 +648,7 @@ public class MultipartReplyMessageFactoryTest {
                                               "00 00 00 20 "+//meterBandDscp.burstSize
                                               "04 "+//meterBandDscp.precLevel
                                               "00 00 00 "+//meterBandDscp.pad
                                               "00 00 00 20 "+//meterBandDscp.burstSize
                                               "04 "+//meterBandDscp.precLevel
                                               "00 00 00 "+//meterBandDscp.pad

-                                              
+

                                               "00 18 "+//len01
                                               "00 03 "+//flags01
                                               "00 00 00 07 "+//meterId01
                                               "00 18 "+//len01
                                               "00 03 "+//flags01
                                               "00 00 00 07 "+//meterId01


@@ -659,45 +659,45 @@ public class MultipartReplyMessageFactoryTest {
                                               "04 "+//meterBandDscp01.precLevel
                                               "00 00 00"//meterBandDscp01.pad
                                               );
                                               "04 "+//meterBandDscp01.precLevel
                                               "00 00 00"//meterBandDscp01.pad
                                               );

-        
+

         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);

-        
+

         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 10, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         MultipartReplyMeterConfigCase messageCase = (MultipartReplyMeterConfigCase) builtByFactory.getMultipartReplyBody();
         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 10, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         MultipartReplyMeterConfigCase messageCase = (MultipartReplyMeterConfigCase) builtByFactory.getMultipartReplyBody();

-        MultipartReplyMeterConfig message = messageCase.getMultipartReplyMeterConfig();        
-        Assert.assertEquals("Wrong flags", new MeterFlags(true, false, true, false), 
+        MultipartReplyMeterConfig message = messageCase.getMultipartReplyMeterConfig();
+        Assert.assertEquals("Wrong flags", new MeterFlags(true, false, true, false),

                              message.getMeterConfig().get(0).getFlags());
                              message.getMeterConfig().get(0).getFlags());

-        Assert.assertEquals("Wrong meterId", 9, 
+        Assert.assertEquals("Wrong meterId", 9,

                              message.getMeterConfig().get(0).getMeterId().getValue().intValue());
                              message.getMeterConfig().get(0).getMeterId().getValue().intValue());

-        
-        MeterBandDropCase dropCase = (MeterBandDropCase) message.getMeterConfig().get(0).getBands().get(0).getMeterBand(); 
-        MeterBandDrop meterBandDrop = dropCase.getMeterBandDrop(); 
-        Assert.assertEquals("Wrong meterBandDrop.type", 1, meterBandDrop.getType().getIntValue()); 
+
+        MeterBandDropCase dropCase = (MeterBandDropCase) message.getMeterConfig().get(0).getBands().get(0).getMeterBand();
+        MeterBandDrop meterBandDrop = dropCase.getMeterBandDrop();
+        Assert.assertEquals("Wrong meterBandDrop.type", 1, meterBandDrop.getType().getIntValue());

         Assert.assertEquals("Wrong meterBandDrop.rate", 17, meterBandDrop.getRate().intValue());
         Assert.assertEquals("Wrong meterBandDrop.burstSize", 32, meterBandDrop.getBurstSize().intValue());
         Assert.assertEquals("Wrong meterBandDrop.rate", 17, meterBandDrop.getRate().intValue());
         Assert.assertEquals("Wrong meterBandDrop.burstSize", 32, meterBandDrop.getBurstSize().intValue());

-        
-        MeterBandDscpRemarkCase dscpCase = (MeterBandDscpRemarkCase) message.getMeterConfig().get(0).getBands().get(1).getMeterBand(); 
+
+        MeterBandDscpRemarkCase dscpCase = (MeterBandDscpRemarkCase) message.getMeterConfig().get(0).getBands().get(1).getMeterBand();

         MeterBandDscpRemark meterBandDscp = dscpCase.getMeterBandDscpRemark();
         MeterBandDscpRemark meterBandDscp = dscpCase.getMeterBandDscpRemark();

-        Assert.assertEquals("Wrong meterBandDscp.type", 2, meterBandDscp.getType().getIntValue()); 
+        Assert.assertEquals("Wrong meterBandDscp.type", 2, meterBandDscp.getType().getIntValue());

         Assert.assertEquals("Wrong meterBandDscp.rate", 17, meterBandDscp.getRate().intValue());
         Assert.assertEquals("Wrong meterBandDscp.burstSize", 32, meterBandDscp.getBurstSize().intValue());
         Assert.assertEquals("Wrong meterBandDscp.precLevel", 4, meterBandDscp.getPrecLevel().intValue());
         Assert.assertEquals("Wrong meterBandDscp.rate", 17, meterBandDscp.getRate().intValue());
         Assert.assertEquals("Wrong meterBandDscp.burstSize", 32, meterBandDscp.getBurstSize().intValue());
         Assert.assertEquals("Wrong meterBandDscp.precLevel", 4, meterBandDscp.getPrecLevel().intValue());

-        
+

         LOGGER.info(message.getMeterConfig().get(0).getFlags().toString());
         Assert.assertEquals("Wrong flags01", new MeterFlags(false, true, true, false),
                              message.getMeterConfig().get(1).getFlags());
         LOGGER.info(message.getMeterConfig().get(0).getFlags().toString());
         Assert.assertEquals("Wrong flags01", new MeterFlags(false, true, true, false),
                              message.getMeterConfig().get(1).getFlags());

-        Assert.assertEquals("Wrong meterId01", 7, 
+        Assert.assertEquals("Wrong meterId01", 7,

                              message.getMeterConfig().get(1).getMeterId().getValue().intValue());
                              message.getMeterConfig().get(1).getMeterId().getValue().intValue());

-        
-        MeterBandDscpRemarkCase dscpCase01 = (MeterBandDscpRemarkCase) message.getMeterConfig().get(1).getBands().get(0).getMeterBand(); 
+
+        MeterBandDscpRemarkCase dscpCase01 = (MeterBandDscpRemarkCase) message.getMeterConfig().get(1).getBands().get(0).getMeterBand();

         MeterBandDscpRemark meterBandDscp01 = dscpCase01.getMeterBandDscpRemark();
         MeterBandDscpRemark meterBandDscp01 = dscpCase01.getMeterBandDscpRemark();

-        Assert.assertEquals("Wrong meterBandDscp01.type", 2, meterBandDscp01.getType().getIntValue()); 
+        Assert.assertEquals("Wrong meterBandDscp01.type", 2, meterBandDscp01.getType().getIntValue());

         Assert.assertEquals("Wrong meterBandDscp01.rate", 17, meterBandDscp01.getRate().intValue());
         Assert.assertEquals("Wrong meterBandDscp01.burstSize", 32, meterBandDscp01.getBurstSize().intValue());
         Assert.assertEquals("Wrong meterBandDscp01.precLevel", 4, meterBandDscp01.getPrecLevel().intValue());
         Assert.assertEquals("Wrong meterBandDscp01.rate", 17, meterBandDscp01.getRate().intValue());
         Assert.assertEquals("Wrong meterBandDscp01.burstSize", 32, meterBandDscp01.getBurstSize().intValue());
         Assert.assertEquals("Wrong meterBandDscp01.precLevel", 4, meterBandDscp01.getPrecLevel().intValue());

-        
+

     }
 
     /**
     }
 
     /**


@@ -729,47 +729,47 @@ public class MultipartReplyMessageFactoryTest {
                                               "00 00 00 00"//copyTTLInPad
                                               );
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);
                                               "00 00 00 00"//copyTTLInPad
                                               );
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);

-        
+

         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 7, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         MultipartReplyGroupDescCase messageCase = (MultipartReplyGroupDescCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyGroupDesc message = messageCase.getMultipartReplyGroupDesc();
         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 7, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         MultipartReplyGroupDescCase messageCase = (MultipartReplyGroupDescCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyGroupDesc message = messageCase.getMultipartReplyGroupDesc();

-        Assert.assertEquals("Wrong type", 1, 
+        Assert.assertEquals("Wrong type", 1,

                              message.getGroupDesc().get(0).getType().getIntValue());
                              message.getGroupDesc().get(0).getType().getIntValue());

-        Assert.assertEquals("Wrong groupId", 8, 
+        Assert.assertEquals("Wrong groupId", 8,

                              message.getGroupDesc().get(0).getGroupId().getValue().intValue());
                              message.getGroupDesc().get(0).getGroupId().getValue().intValue());

-        Assert.assertEquals("Wrong bucketWeight", 6, 
+        Assert.assertEquals("Wrong bucketWeight", 6,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getWeight().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getWeight().intValue());

-        Assert.assertEquals("Wrong bucketWatchPort", 5, 
+        Assert.assertEquals("Wrong bucketWatchPort", 5,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getWatchPort().
                                                                         getValue().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getWatchPort().
                                                                         getValue().intValue());

-        Assert.assertEquals("Wrong bucketWatchGroup", 4, 
+        Assert.assertEquals("Wrong bucketWatchGroup", 4,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getWatchGroup().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getWatchGroup().intValue());

-        
-        Assert.assertEquals("Wrong outputType", Output.class, 
+
+        Assert.assertEquals("Wrong outputType", Output.class,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0)
                 .getType());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0)
                 .getType());

-        
-        Assert.assertEquals("Wrong outputPort", 4351, 
+
+        Assert.assertEquals("Wrong outputPort", 4351,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0)
                 .getAugmentation(PortAction.class).
                 getPort().getValue().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0)
                 .getAugmentation(PortAction.class).
                 getPort().getValue().intValue());

-        
-        Assert.assertEquals("Wrong outputMaxLen", 65535, 
+
+        Assert.assertEquals("Wrong outputMaxLen", 65535,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0)
                 .getAugmentation(MaxLengthAction.class).
                 getMaxLength().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0)
                 .getAugmentation(MaxLengthAction.class).
                 getMaxLength().intValue());

-        
-        Assert.assertEquals("Wrong copyTtlOutType", CopyTtlOut.class, 
+
+        Assert.assertEquals("Wrong copyTtlOutType", CopyTtlOut.class,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1)
                 .getType());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1)
                 .getType());

-        
-        Assert.assertEquals("Wrong copyTtlInType", CopyTtlIn.class, 
+
+        Assert.assertEquals("Wrong copyTtlInType", CopyTtlIn.class,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(2)
                 .getType());
     }
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(2)
                 .getType());
     }

-    
+

     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      * Test covers bodies of actions Set MPLS TTL , Dec MPLS TTL, Push VLAN. Push MPLS, Push PBB
     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      * Test covers bodies of actions Set MPLS TTL , Dec MPLS TTL, Push VLAN. Push MPLS, Push PBB


@@ -806,57 +806,57 @@ public class MultipartReplyMessageFactoryTest {
                                               "0F FF "+//pushPbbEthertype
                                               "00 00"//pushPbbPad
                                               );
                                               "0F FF "+//pushPbbEthertype
                                               "00 00"//pushPbbPad
                                               );

-        
+

         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);

-        
+

         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 7, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         MultipartReplyGroupDescCase messageCase = (MultipartReplyGroupDescCase) builtByFactory.getMultipartReplyBody();
         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 7, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         MultipartReplyGroupDescCase messageCase = (MultipartReplyGroupDescCase) builtByFactory.getMultipartReplyBody();

-        MultipartReplyGroupDesc message = messageCase.getMultipartReplyGroupDesc();        
-        Assert.assertEquals("Wrong type", 1, 
+        MultipartReplyGroupDesc message = messageCase.getMultipartReplyGroupDesc();
+        Assert.assertEquals("Wrong type", 1,

                              message.getGroupDesc().get(0).getType().getIntValue());
                              message.getGroupDesc().get(0).getType().getIntValue());

-        Assert.assertEquals("Wrong groupId", 8, 
+        Assert.assertEquals("Wrong groupId", 8,

                              message.getGroupDesc().get(0).getGroupId().getValue().intValue());
                              message.getGroupDesc().get(0).getGroupId().getValue().intValue());

-        Assert.assertEquals("Wrong bucketWeight", 6, 
+        Assert.assertEquals("Wrong bucketWeight", 6,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getWeight().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getWeight().intValue());

-        Assert.assertEquals("Wrong bucketWatchPort", 5, 
+        Assert.assertEquals("Wrong bucketWatchPort", 5,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getWatchPort().getValue().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getWatchPort().getValue().intValue());

-        Assert.assertEquals("Wrong bucketWatchGroup", 4, 
+        Assert.assertEquals("Wrong bucketWatchGroup", 4,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getWatchGroup().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getWatchGroup().intValue());

-        Assert.assertEquals("Wrong setMplsTtlType", SetMplsTtl.class, 
+        Assert.assertEquals("Wrong setMplsTtlType", SetMplsTtl.class,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0)
                 .getType());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0)
                 .getType());

-        Assert.assertEquals("Wrong setMplsTtlMPLS_TTL", 9, 
+        Assert.assertEquals("Wrong setMplsTtlMPLS_TTL", 9,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0)
                 .getAugmentation(MplsTtlAction.class).
                 getMplsTtl().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0)
                 .getAugmentation(MplsTtlAction.class).
                 getMplsTtl().intValue());

-        Assert.assertEquals("Wrong decMplsTtlType", DecMplsTtl.class, 
+        Assert.assertEquals("Wrong decMplsTtlType", DecMplsTtl.class,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1)
                 .getType());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1)
                 .getType());

-        Assert.assertEquals("Wrong pushVlanType", PushVlan.class, 
+        Assert.assertEquals("Wrong pushVlanType", PushVlan.class,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(2)
                 .getType());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(2)
                 .getType());

-        Assert.assertEquals("Wrong pushVlanEthertype", 32, 
+        Assert.assertEquals("Wrong pushVlanEthertype", 32,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(2)
                 .getAugmentation(EthertypeAction.class).
                 getEthertype().getValue().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(2)
                 .getAugmentation(EthertypeAction.class).
                 getEthertype().getValue().intValue());

-        Assert.assertEquals("Wrong pushMplsType", PushMpls.class, 
+        Assert.assertEquals("Wrong pushMplsType", PushMpls.class,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(3)
                 .getType());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(3)
                 .getType());

-        Assert.assertEquals("Wrong pushMplsEthertype", 255, 
+        Assert.assertEquals("Wrong pushMplsEthertype", 255,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(3).
                 getAugmentation(EthertypeAction.class).
                 getEthertype().getValue().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(3).
                 getAugmentation(EthertypeAction.class).
                 getEthertype().getValue().intValue());

-        Assert.assertEquals("Wrong pushPbbType", PushPbb.class, 
+        Assert.assertEquals("Wrong pushPbbType", PushPbb.class,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(4)
                 .getType());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(4)
                 .getType());

-        Assert.assertEquals("Wrong pushPbbEthertype", 4095, 
+        Assert.assertEquals("Wrong pushPbbEthertype", 4095,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(4)
                 .getAugmentation(EthertypeAction.class).
                 getEthertype().getValue().intValue());
     }
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(4)
                 .getAugmentation(EthertypeAction.class).
                 getEthertype().getValue().intValue());
     }

-    
+

     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      * Test covers bodies of actions Pop VLAN, Pop PBB, Pop MPLS, Group, Dec NW TTL
     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      * Test covers bodies of actions Pop VLAN, Pop PBB, Pop MPLS, Group, Dec NW TTL


@@ -893,54 +893,54 @@ public class MultipartReplyMessageFactoryTest {
                                               "00 08 "+//decNwTtlLen
                                               "00 00 00 00"//decNwTtlPad
                                               );
                                               "00 08 "+//decNwTtlLen
                                               "00 00 00 00"//decNwTtlPad
                                               );

-        
+

         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);

-        
+

         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 7, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         MultipartReplyGroupDescCase messageCase = (MultipartReplyGroupDescCase) builtByFactory.getMultipartReplyBody();
         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 7, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         MultipartReplyGroupDescCase messageCase = (MultipartReplyGroupDescCase) builtByFactory.getMultipartReplyBody();

-        MultipartReplyGroupDesc message = messageCase.getMultipartReplyGroupDesc();        
+        MultipartReplyGroupDesc message = messageCase.getMultipartReplyGroupDesc();

         Assert.assertEquals("Wrong type", 1, message.getGroupDesc().get(0).getType().getIntValue());
         Assert.assertEquals("Wrong groupId", 8, message.getGroupDesc().get(0).getGroupId().getValue().intValue());
         Assert.assertEquals("Wrong type", 1, message.getGroupDesc().get(0).getType().getIntValue());
         Assert.assertEquals("Wrong groupId", 8, message.getGroupDesc().get(0).getGroupId().getValue().intValue());

-        Assert.assertEquals("Wrong bucketWeight", 6, 
+        Assert.assertEquals("Wrong bucketWeight", 6,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getWeight().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getWeight().intValue());

-        Assert.assertEquals("Wrong bucketWatchPort", 5, 
+        Assert.assertEquals("Wrong bucketWatchPort", 5,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getWatchPort().getValue().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getWatchPort().getValue().intValue());

-        Assert.assertEquals("Wrong bucketWatchGroup", 4, 
+        Assert.assertEquals("Wrong bucketWatchGroup", 4,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getWatchGroup().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getWatchGroup().intValue());

-        Assert.assertEquals("Wrong popVlanType", PopVlan.class, 
+        Assert.assertEquals("Wrong popVlanType", PopVlan.class,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0)
                 .getType());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0)
                 .getType());

-        Assert.assertEquals("Wrong popPbbType", PopPbb.class, 
+        Assert.assertEquals("Wrong popPbbType", PopPbb.class,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1)
                 .getType());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1)
                 .getType());

-        Assert.assertEquals("Wrong popMplsType", PopMpls.class, 
+        Assert.assertEquals("Wrong popMplsType", PopMpls.class,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(2)
                 .getType());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(2)
                 .getType());

-        Assert.assertEquals("Wrong popMplsEthertype", 207, 
+        Assert.assertEquals("Wrong popMplsEthertype", 207,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(2)
                 .getAugmentation(EthertypeAction.class).
                 getEthertype().getValue().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(2)
                 .getAugmentation(EthertypeAction.class).
                 getEthertype().getValue().intValue());

-        Assert.assertEquals("Wrong setQueueType", SetQueue.class, 
+        Assert.assertEquals("Wrong setQueueType", SetQueue.class,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(3)
                 .getType());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(3)
                 .getType());

-        Assert.assertEquals("Wrong setQueueQueueId", 13565952, 
+        Assert.assertEquals("Wrong setQueueQueueId", 13565952,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(3)
                 .getAugmentation(QueueIdAction.class).
                 getQueueId().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(3)
                 .getAugmentation(QueueIdAction.class).
                 getQueueId().intValue());

-        Assert.assertEquals("Wrong groupType", Group.class, 
+        Assert.assertEquals("Wrong groupType", Group.class,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(4)
                 .getType());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(4)
                 .getType());

-        Assert.assertEquals("Wrong groupGroupId", 13565952, 
+        Assert.assertEquals("Wrong groupGroupId", 13565952,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(4)
                 .getAugmentation(GroupIdAction.class).
                 getGroupId().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(4)
                 .getAugmentation(GroupIdAction.class).
                 getGroupId().intValue());

-        Assert.assertEquals("Wrong decNwTtlType", DecNwTtl.class, 
+        Assert.assertEquals("Wrong decNwTtlType", DecNwTtl.class,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(5)
                 .getType());
     }
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(5)
                 .getType());
     }

-    
+

     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      * Test covers bodies of actions NW TTL, Experimenter
     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
      * Test covers bodies of actions NW TTL, Experimenter


@@ -969,47 +969,47 @@ public class MultipartReplyMessageFactoryTest {
                                               "00 00 00 FF "+ //setFieldPort
                                               "00 00 00 00"
                 );
                                               "00 00 00 FF "+ //setFieldPort
                                               "00 00 00 00"
                 );

-        
+

         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb);

-        
+

         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 7, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         MultipartReplyGroupDescCase messageCase = (MultipartReplyGroupDescCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyGroupDesc message = messageCase.getMultipartReplyGroupDesc();
         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 7, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
         MultipartReplyGroupDescCase messageCase = (MultipartReplyGroupDescCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyGroupDesc message = messageCase.getMultipartReplyGroupDesc();

-        Assert.assertEquals("Wrong type", 1, 
+        Assert.assertEquals("Wrong type", 1,

                              message.getGroupDesc().get(0).getType().getIntValue());
                              message.getGroupDesc().get(0).getType().getIntValue());

-        Assert.assertEquals("Wrong groupId", 8, 
+        Assert.assertEquals("Wrong groupId", 8,

                              message.getGroupDesc().get(0).getGroupId().getValue().intValue());
                              message.getGroupDesc().get(0).getGroupId().getValue().intValue());

-        Assert.assertEquals("Wrong bucketWeight", 6, 
+        Assert.assertEquals("Wrong bucketWeight", 6,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getWeight().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getWeight().intValue());

-        Assert.assertEquals("Wrong bucketWatchPort", 5, 
+        Assert.assertEquals("Wrong bucketWatchPort", 5,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getWatchPort().
                                                                         getValue().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getWatchPort().
                                                                         getValue().intValue());

-        Assert.assertEquals("Wrong bucketWatchGroup", 4, 
+        Assert.assertEquals("Wrong bucketWatchGroup", 4,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getWatchGroup().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getWatchGroup().intValue());

-        
-        Assert.assertEquals("Wrong nwTTlType", SetNwTtl.class, 
+
+        Assert.assertEquals("Wrong nwTTlType", SetNwTtl.class,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0)
                 .getType());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0)
                 .getType());

-        
-        Assert.assertEquals("Wrong nwTTlnwTTL", 14, 
+
+        Assert.assertEquals("Wrong nwTTlnwTTL", 14,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0)
                 .getAugmentation(NwTtlAction.class).getNwTtl().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0)
                 .getAugmentation(NwTtlAction.class).getNwTtl().intValue());

-        
-        Assert.assertEquals("Wrong setFieldType", SetField.class, 
+
+        Assert.assertEquals("Wrong setFieldType", SetField.class,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1)
                 .getType());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1)
                 .getType());

-        
-        Assert.assertEquals("Wrong setFieldOXMClass", OpenflowBasicClass.class, 
+
+        Assert.assertEquals("Wrong setFieldOXMClass", OpenflowBasicClass.class,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1)
                 .getAugmentation(OxmFieldsAction.class).getMatchEntries().get(0).getOxmClass());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1)
                 .getAugmentation(OxmFieldsAction.class).getMatchEntries().get(0).getOxmClass());

-        
-        Assert.assertEquals("Wrong setFieldOXMField", InPort.class, 
+
+        Assert.assertEquals("Wrong setFieldOXMField", InPort.class,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1)
                 .getAugmentation(OxmFieldsAction.class).getMatchEntries().get(0).getOxmMatchField());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1)
                 .getAugmentation(OxmFieldsAction.class).getMatchEntries().get(0).getOxmMatchField());

-        
-        Assert.assertEquals("Wrong setFieldOXMValue", 255, 
+
+        Assert.assertEquals("Wrong setFieldOXMValue", 255,

                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1)
                 .getAugmentation(OxmFieldsAction.class).getMatchEntries().get(0).
                 getAugmentation(PortNumberMatchEntry.class).getPortNumber().getValue().intValue());
                 message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1)
                 .getAugmentation(OxmFieldsAction.class).getMatchEntries().get(0).
                 getAugmentation(PortNumberMatchEntry.class).getPortNumber().getValue().intValue());

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10EchoReplyMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10EchoReplyMessageFactoryTest.java
index 92197425a2d806894ddf37d40bc217849d350189..336710d548eb8094cf01e6899ea9197473eef41f 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10EchoReplyMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10EchoReplyMessageFactoryTest.java
@@ -50,7 +50,7 @@ public class OF10EchoReplyMessageFactoryTest {
 
         BufferHelper.checkHeaderV10(builtByFactory);
     }
 
         BufferHelper.checkHeaderV10(builtByFactory);
     }

-    
+

     /**
      * Testing {@link OF10EchoReplyMessageFactory} for correct translation into POJO
      */
     /**
      * Testing {@link OF10EchoReplyMessageFactory} for correct translation into POJO
      */


@@ -59,7 +59,7 @@ public class OF10EchoReplyMessageFactoryTest {
         byte[] data = new byte[]{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07};
         ByteBuf bb = BufferHelper.buildBuffer(data);
         EchoOutput builtByFactory = BufferHelper.deserialize(echoFactory, bb);
         byte[] data = new byte[]{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07};
         ByteBuf bb = BufferHelper.buildBuffer(data);
         EchoOutput builtByFactory = BufferHelper.deserialize(echoFactory, bb);

-        
+

         BufferHelper.checkHeaderV10(builtByFactory);
         Assert.assertArrayEquals("Wrong data", data, builtByFactory.getData());
     }
         BufferHelper.checkHeaderV10(builtByFactory);
         Assert.assertArrayEquals("Wrong data", data, builtByFactory.getData());
     }

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10EchoRequestMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10EchoRequestMessageFactoryTest.java
index 96fd03350f8321c12c8bcf7d58ac3bdf1fa648d4..7684e850a6a5d250988910f3b0ef7024d923592e 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10EchoRequestMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10EchoRequestMessageFactoryTest.java
@@ -50,7 +50,7 @@ public class OF10EchoRequestMessageFactoryTest {
 
         BufferHelper.checkHeaderV10(builtByFactory);
     }
 
         BufferHelper.checkHeaderV10(builtByFactory);
     }

-    
+

     /**
      * Testing {@link OF10EchoReplyMessageFactoryTest} for correct translation into POJO
      */
     /**
      * Testing {@link OF10EchoReplyMessageFactoryTest} for correct translation into POJO
      */

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactoryTest.java
index 9530eabafe3df6407c37dad454260d20d207f3da..f5ec8f232f7edc10704a466573db0d6543cb5a38 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10FeaturesReplyMessageFactoryTest.java
@@ -83,7 +83,7 @@ public class OF10FeaturesReplyMessageFactoryTest {
         Assert.assertEquals("Wrong port - peer", new PortFeaturesV10(true, false, false, false, false, false, false,
                 false, true, false, false, true), port.getPeerFeaturesV10());
     }
         Assert.assertEquals("Wrong port - peer", new PortFeaturesV10(true, false, false, false, false, false, false,
                 false, true, false, false, true), port.getPeerFeaturesV10());
     }

-    
+

     /**
      * Testing {@link OF10FeaturesReplyMessageFactory} for correct translation into POJO
      */
     /**
      * Testing {@link OF10FeaturesReplyMessageFactory} for correct translation into POJO
      */

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10GetConfigReplyMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10GetConfigReplyMessageFactoryTest.java
index c0d795a641b07e4018e02346d7e8113d51b9e151..fc63e70c29f5e0704c2f98d75e90651a63293f9c 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10GetConfigReplyMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10GetConfigReplyMessageFactoryTest.java
@@ -49,8 +49,8 @@ public class OF10GetConfigReplyMessageFactoryTest {
         GetConfigOutput builtByFactory = BufferHelper.deserialize(configFactory, bb);
 
         BufferHelper.checkHeaderV10(builtByFactory);
         GetConfigOutput builtByFactory = BufferHelper.deserialize(configFactory, bb);
 
         BufferHelper.checkHeaderV10(builtByFactory);

-        Assert.assertEquals("Wrong switchConfigFlag", 0x01, builtByFactory.getFlags().getIntValue()); 
+        Assert.assertEquals("Wrong switchConfigFlag", 0x01, builtByFactory.getFlags().getIntValue());

         Assert.assertEquals("Wrong missSendLen", 0x03, builtByFactory.getMissSendLen().intValue());
     }
         Assert.assertEquals("Wrong missSendLen", 0x03, builtByFactory.getMissSendLen().intValue());
     }

-    
+

 }
 }

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PacketInMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PacketInMessageFactoryTest.java
index 6238780614f17d2096f74e1a58cf87fb0aa19698..57d73cb78494156a55a75258c7b6e404f55d9e7d 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PacketInMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PacketInMessageFactoryTest.java
@@ -46,8 +46,8 @@ public class OF10PacketInMessageFactoryTest {
     @Test
     public void test(){
         ByteBuf bb = BufferHelper.buildBuffer("00 01 02 03 01 02 01 02 00 00 01 02 03 04");
     @Test
     public void test(){
         ByteBuf bb = BufferHelper.buildBuffer("00 01 02 03 01 02 01 02 00 00 01 02 03 04");

-        PacketInMessage builtByFactory = BufferHelper.deserialize(packetInFactory, bb); 
-        
+        PacketInMessage builtByFactory = BufferHelper.deserialize(packetInFactory, bb);
+

         BufferHelper.checkHeaderV10(builtByFactory);
         Assert.assertEquals("Wrong bufferID", 0x00010203L, builtByFactory.getBufferId().longValue());
         Assert.assertEquals("Wrong totalLength", 0x0102, builtByFactory.getTotalLen().intValue());
         BufferHelper.checkHeaderV10(builtByFactory);
         Assert.assertEquals("Wrong bufferID", 0x00010203L, builtByFactory.getBufferId().longValue());
         Assert.assertEquals("Wrong totalLength", 0x0102, builtByFactory.getTotalLen().intValue());


@@ -62,7 +62,7 @@ public class OF10PacketInMessageFactoryTest {
     @Test
     public void testWithNoAdditionalData(){
         ByteBuf bb = BufferHelper.buildBuffer("00 01 02 03 01 02 01 02 00 00");
     @Test
     public void testWithNoAdditionalData(){
         ByteBuf bb = BufferHelper.buildBuffer("00 01 02 03 01 02 01 02 00 00");

-        PacketInMessage builtByFactory = BufferHelper.deserialize(packetInFactory, bb); 
+        PacketInMessage builtByFactory = BufferHelper.deserialize(packetInFactory, bb);

 
         Assert.assertNull("Wrong data", builtByFactory.getData());
     }
 
         Assert.assertNull("Wrong data", builtByFactory.getData());
     }

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactoryTest.java
index 6b45187208c4c8605125576929f1435399324c97..0d63752211cb46f59b72e0c8f47225508d46255b 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10PortStatusMessageFactoryTest.java
@@ -54,7 +54,7 @@ public class OF10PortStatusMessageFactoryTest {
                 + "00 10 01 01 05 01 04 02 41 4C 4F 48 41 00 00 00 00 00 00 00 00 00 00 "
                 + "00 00 00 00 15 00 00 00 01 00 00 00 31 00 00 04 42 00 00 03 0C 00 00 08 88");
         PortStatusMessage builtByFactory = BufferHelper.deserialize(statusFactory, bb);
                 + "00 10 01 01 05 01 04 02 41 4C 4F 48 41 00 00 00 00 00 00 00 00 00 00 "
                 + "00 00 00 00 15 00 00 00 01 00 00 00 31 00 00 04 42 00 00 03 0C 00 00 08 88");
         PortStatusMessage builtByFactory = BufferHelper.deserialize(statusFactory, bb);

-        
+

         BufferHelper.checkHeaderV10(builtByFactory);
         Assert.assertEquals("Wrong reason", PortReason.OFPPRADD, builtByFactory.getReason());
         Assert.assertEquals("Wrong port - port-no", 16, builtByFactory.getPortNo().intValue());
         BufferHelper.checkHeaderV10(builtByFactory);
         Assert.assertEquals("Wrong reason", PortReason.OFPPRADD, builtByFactory.getReason());
         Assert.assertEquals("Wrong port - port-no", 16, builtByFactory.getPortNo().intValue());

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactoryTest.java
index 0e8813eafc9fd70f37e8b8b15482bf22b40ebd28..a4740621efa4d2b6322db796f90b069939988a03 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/OF10StatsReplyMessageFactoryTest.java
@@ -68,39 +68,39 @@ public class OF10StatsReplyMessageFactoryTest {
         final int DESC_STR_LEN = 256;
         final int SERIAL_NUM_LEN = 32;
         ByteBuf bb = BufferHelper.buildBuffer("00 00 00 00");
         final int DESC_STR_LEN = 256;
         final int SERIAL_NUM_LEN = 32;
         ByteBuf bb = BufferHelper.buildBuffer("00 00 00 00");

-        
+

         String mfrDesc = "Manufacturer description";
         byte[] mfrDescBytes = new byte[256];
         mfrDescBytes = mfrDesc.getBytes();
         bb.writeBytes(mfrDescBytes);
         bb.writeZero(DESC_STR_LEN - mfrDescBytes.length);
         String mfrDesc = "Manufacturer description";
         byte[] mfrDescBytes = new byte[256];
         mfrDescBytes = mfrDesc.getBytes();
         bb.writeBytes(mfrDescBytes);
         bb.writeZero(DESC_STR_LEN - mfrDescBytes.length);

-        
+

         String hwDesc = "Hardware description";
         byte[] hwDescBytes = new byte[256];
         hwDescBytes = hwDesc.getBytes();
         bb.writeBytes(hwDescBytes);
         bb.writeZero(DESC_STR_LEN - hwDescBytes.length);
         String hwDesc = "Hardware description";
         byte[] hwDescBytes = new byte[256];
         hwDescBytes = hwDesc.getBytes();
         bb.writeBytes(hwDescBytes);
         bb.writeZero(DESC_STR_LEN - hwDescBytes.length);

-        
+

         String swDesc = "Software description";
         byte[] swDescBytes = new byte[256];
         swDescBytes = swDesc.getBytes();
         bb.writeBytes(swDescBytes);
         bb.writeZero(DESC_STR_LEN - swDescBytes.length);
         String swDesc = "Software description";
         byte[] swDescBytes = new byte[256];
         swDescBytes = swDesc.getBytes();
         bb.writeBytes(swDescBytes);
         bb.writeZero(DESC_STR_LEN - swDescBytes.length);

-        
+

         String serialNum = "SN0123456789";
         byte[] serialNumBytes = new byte[32];
         serialNumBytes = serialNum.getBytes();
         bb.writeBytes(serialNumBytes);
         bb.writeZero(SERIAL_NUM_LEN - serialNumBytes.length);
         String serialNum = "SN0123456789";
         byte[] serialNumBytes = new byte[32];
         serialNumBytes = serialNum.getBytes();
         bb.writeBytes(serialNumBytes);
         bb.writeZero(SERIAL_NUM_LEN - serialNumBytes.length);

-        
+

         String dpDesc = "switch3 in room 3120";
         byte[] dpDescBytes = new byte[256];
         dpDescBytes = dpDesc.getBytes();
         bb.writeBytes(dpDescBytes);
         bb.writeZero(DESC_STR_LEN - dpDescBytes.length);
         String dpDesc = "switch3 in room 3120";
         byte[] dpDescBytes = new byte[256];
         dpDescBytes = dpDesc.getBytes();
         bb.writeBytes(dpDescBytes);
         bb.writeZero(DESC_STR_LEN - dpDescBytes.length);

-        
+

         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(statsFactory, bb);
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(statsFactory, bb);

-        
+

         BufferHelper.checkHeaderV10(builtByFactory);
         Assert.assertEquals("Wrong type", 0, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", false, builtByFactory.getFlags().isOFPMPFREQMORE().booleanValue());
         BufferHelper.checkHeaderV10(builtByFactory);
         Assert.assertEquals("Wrong type", 0, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", false, builtByFactory.getFlags().isOFPMPFREQMORE().booleanValue());


@@ -113,7 +113,7 @@ public class OF10StatsReplyMessageFactoryTest {
         Assert.assertEquals("Wrong dpDesc", "switch3 in room 3120", message.getDpDesc());
         Assert.assertTrue("Unread data", bb.readableBytes() == 0);
     }
         Assert.assertEquals("Wrong dpDesc", "switch3 in room 3120", message.getDpDesc());
         Assert.assertTrue("Unread data", bb.readableBytes() == 0);
     }

-    
+

     /**
      * Testing OF10StatsReplyMessageFactory (Flow) for correct deserialization
      */
     /**
      * Testing OF10StatsReplyMessageFactory (Flow) for correct deserialization
      */


@@ -125,7 +125,7 @@ public class OF10StatsReplyMessageFactoryTest {
                 + "00 00 00 02 00 00 00 03 00 04 00 05 00 06 00 00 00 00 00 00 "
                 + "FF 01 02 03 04 05 06 07 FF 01 02 03 04 05 06 07 FF 00 00 00 00 00 00 20 "
                 + "00 00 00 08 00 01 00 02 00 01 00 08 00 03 00 00");
                 + "00 00 00 02 00 00 00 03 00 04 00 05 00 06 00 00 00 00 00 00 "
                 + "FF 01 02 03 04 05 06 07 FF 01 02 03 04 05 06 07 FF 00 00 00 00 00 00 20 "
                 + "00 00 00 08 00 01 00 02 00 01 00 08 00 03 00 00");

-        
+

         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(statsFactory, bb);
 
         BufferHelper.checkHeaderV10(builtByFactory);
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(statsFactory, bb);
 
         BufferHelper.checkHeaderV10(builtByFactory);


@@ -140,13 +140,13 @@ public class OF10StatsReplyMessageFactoryTest {
         Assert.assertEquals("Wrong idleTimeOut", 5, message.getFlowStats().get(0).getIdleTimeout().intValue());
         Assert.assertEquals("Wrong hardTimeOut", 6, message.getFlowStats().get(0).getHardTimeout().intValue());
         Assert.assertEquals("Wrong cookie",
         Assert.assertEquals("Wrong idleTimeOut", 5, message.getFlowStats().get(0).getIdleTimeout().intValue());
         Assert.assertEquals("Wrong hardTimeOut", 6, message.getFlowStats().get(0).getHardTimeout().intValue());
         Assert.assertEquals("Wrong cookie",

-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}), 
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}),

                 message.getFlowStats().get(0).getCookie());
         Assert.assertEquals("Wrong packetCount",
                 message.getFlowStats().get(0).getCookie());
         Assert.assertEquals("Wrong packetCount",

-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}), 
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}),

                 message.getFlowStats().get(0).getPacketCount());
         Assert.assertEquals("Wrong byteCount",
                 message.getFlowStats().get(0).getPacketCount());
         Assert.assertEquals("Wrong byteCount",

-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20}), 
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20}),

                 message.getFlowStats().get(0).getByteCount());
         Action action1 = message.getFlowStats().get(0).getAction().get(0);
         Assert.assertEquals("Wrong action type", Output.class, action1.getType());
                 message.getFlowStats().get(0).getByteCount());
         Action action1 = message.getFlowStats().get(0).getAction().get(0);
         Assert.assertEquals("Wrong action type", Output.class, action1.getType());


@@ -160,7 +160,7 @@ public class OF10StatsReplyMessageFactoryTest {
                 .getVlanVid().intValue());
         Assert.assertTrue("Unread data", bb.readableBytes() == 0);
     }
                 .getVlanVid().intValue());
         Assert.assertTrue("Unread data", bb.readableBytes() == 0);
     }

-    
+

     /**
      * Testing OF10StatsReplyMessageFactory (Aggregate) for correct deserialization
      */
     /**
      * Testing OF10StatsReplyMessageFactory (Aggregate) for correct deserialization
      */


@@ -168,7 +168,7 @@ public class OF10StatsReplyMessageFactoryTest {
     public void testAggregate() {
         ByteBuf bb = BufferHelper.buildBuffer("00 02 00 01 "
                 + "FF 01 02 03 04 05 06 07 FF 00 00 00 00 00 00 20 00 00 00 30 00 00 00 00");
     public void testAggregate() {
         ByteBuf bb = BufferHelper.buildBuffer("00 02 00 01 "
                 + "FF 01 02 03 04 05 06 07 FF 00 00 00 00 00 00 20 00 00 00 30 00 00 00 00");

-        
+

         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(statsFactory, bb);
 
         BufferHelper.checkHeaderV10(builtByFactory);
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(statsFactory, bb);
 
         BufferHelper.checkHeaderV10(builtByFactory);


@@ -177,15 +177,15 @@ public class OF10StatsReplyMessageFactoryTest {
         MultipartReplyAggregateCase messageCase = (MultipartReplyAggregateCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyAggregate message = messageCase.getMultipartReplyAggregate();
         Assert.assertEquals("Wrong packet-count",
         MultipartReplyAggregateCase messageCase = (MultipartReplyAggregateCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyAggregate message = messageCase.getMultipartReplyAggregate();
         Assert.assertEquals("Wrong packet-count",

-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}), 
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}),

                 message.getPacketCount());
         Assert.assertEquals("Wrong byte-count",
                 message.getPacketCount());
         Assert.assertEquals("Wrong byte-count",

-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20}), 
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20}),

                 message.getByteCount());
         Assert.assertEquals("Wrong flow-count", 48, message.getFlowCount().intValue());
         Assert.assertTrue("Unread data", bb.readableBytes() == 0);
     }
                 message.getByteCount());
         Assert.assertEquals("Wrong flow-count", 48, message.getFlowCount().intValue());
         Assert.assertTrue("Unread data", bb.readableBytes() == 0);
     }

-    
+

     /**
      * Testing OF10StatsReplyMessageFactory (Table) for correct deserialization
      */
     /**
      * Testing OF10StatsReplyMessageFactory (Table) for correct deserialization
      */


@@ -212,15 +212,15 @@ public class OF10StatsReplyMessageFactoryTest {
         Assert.assertEquals("Wrong dst-mask", 32, message.getTableStats().get(0).getNwDstMask().intValue());
         Assert.assertEquals("Wrong max-entries", 48, message.getTableStats().get(0).getMaxEntries().longValue());
         Assert.assertEquals("Wrong activeCount", 16, message.getTableStats().get(0).getActiveCount().longValue());
         Assert.assertEquals("Wrong dst-mask", 32, message.getTableStats().get(0).getNwDstMask().intValue());
         Assert.assertEquals("Wrong max-entries", 48, message.getTableStats().get(0).getMaxEntries().longValue());
         Assert.assertEquals("Wrong activeCount", 16, message.getTableStats().get(0).getActiveCount().longValue());

-        Assert.assertEquals("Wrong lookupCount", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong lookupCount",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getTableStats().get(0).getLookupCount());
                 message.getTableStats().get(0).getLookupCount());

-        Assert.assertEquals("Wrong matchedCount", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00}), 
+        Assert.assertEquals("Wrong matchedCount",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00}),

                 message.getTableStats().get(0).getMatchedCount());
         Assert.assertTrue("Unread data", bb.readableBytes() == 0);
     }
                 message.getTableStats().get(0).getMatchedCount());
         Assert.assertTrue("Unread data", bb.readableBytes() == 0);
     }

-    
+

     /**
      * Testing OF10StatsReplyMessageFactory (Port) for correct deserialization
      */
     /**
      * Testing OF10StatsReplyMessageFactory (Port) for correct deserialization
      */


@@ -243,45 +243,45 @@ public class OF10StatsReplyMessageFactoryTest {
         MultipartReplyPortStatsCase messageCase = (MultipartReplyPortStatsCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyPortStats message = messageCase.getMultipartReplyPortStats();
         Assert.assertEquals("Wrong portNo", 255, message.getPortStats().get(0).getPortNo().intValue());
         MultipartReplyPortStatsCase messageCase = (MultipartReplyPortStatsCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyPortStats message = messageCase.getMultipartReplyPortStats();
         Assert.assertEquals("Wrong portNo", 255, message.getPortStats().get(0).getPortNo().intValue());

-        Assert.assertEquals("Wrong rxPackets", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), 
+        Assert.assertEquals("Wrong rxPackets",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}),

                 message.getPortStats().get(0).getRxPackets());
                 message.getPortStats().get(0).getRxPackets());

-        Assert.assertEquals("Wrong txPackets", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), 
+        Assert.assertEquals("Wrong txPackets",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}),

                 message.getPortStats().get(0).getTxPackets());
                 message.getPortStats().get(0).getTxPackets());

-        Assert.assertEquals("Wrong rxBytes", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong rxBytes",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getPortStats().get(0).getRxBytes());
                 message.getPortStats().get(0).getRxBytes());

-        Assert.assertEquals("Wrong txBytes", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong txBytes",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getPortStats().get(0).getTxBytes());
                 message.getPortStats().get(0).getTxBytes());

-        Assert.assertEquals("Wrong rxDropped", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong rxDropped",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getPortStats().get(0).getRxDropped());
                 message.getPortStats().get(0).getRxDropped());

-        Assert.assertEquals("Wrong txDropped", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong txDropped",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getPortStats().get(0).getTxDropped());
                 message.getPortStats().get(0).getTxDropped());

-        Assert.assertEquals("Wrong rxErrors", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong rxErrors",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getPortStats().get(0).getRxErrors());
                 message.getPortStats().get(0).getRxErrors());

-        Assert.assertEquals("Wrong txErrors", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong txErrors",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getPortStats().get(0).getTxErrors());
                 message.getPortStats().get(0).getTxErrors());

-        Assert.assertEquals("Wrong rxFrameErr", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong rxFrameErr",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getPortStats().get(0).getRxFrameErr());
                 message.getPortStats().get(0).getRxFrameErr());

-        Assert.assertEquals("Wrong rxOverErr", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong rxOverErr",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getPortStats().get(0).getRxOverErr());
                 message.getPortStats().get(0).getRxOverErr());

-        Assert.assertEquals("Wrong rxCrcErr", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong rxCrcErr",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getPortStats().get(0).getRxCrcErr());
                 message.getPortStats().get(0).getRxCrcErr());

-        Assert.assertEquals("Wrong collisions", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong collisions",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getPortStats().get(0).getCollisions());
         Assert.assertTrue("Unread data", bb.readableBytes() == 0);
     }
                 message.getPortStats().get(0).getCollisions());
         Assert.assertTrue("Unread data", bb.readableBytes() == 0);
     }

-    
+

     /**
      * Testing OF10StatsReplyMessageFactory (Queue) for correct deserialization
      */
     /**
      * Testing OF10StatsReplyMessageFactory (Queue) for correct deserialization
      */


@@ -302,14 +302,14 @@ public class OF10StatsReplyMessageFactoryTest {
         MultipartReplyQueue message = messageCase.getMultipartReplyQueue();
         Assert.assertEquals("Wrong portNo", 255, message.getQueueStats().get(0).getPortNo().intValue());
         Assert.assertEquals("Wrong queueId", 16, message.getQueueStats().get(0).getQueueId().intValue());
         MultipartReplyQueue message = messageCase.getMultipartReplyQueue();
         Assert.assertEquals("Wrong portNo", 255, message.getQueueStats().get(0).getPortNo().intValue());
         Assert.assertEquals("Wrong queueId", 16, message.getQueueStats().get(0).getQueueId().intValue());

-        Assert.assertEquals("Wrong txBytes", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong txBytes",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getQueueStats().get(0).getTxBytes());
                 message.getQueueStats().get(0).getTxBytes());

-        Assert.assertEquals("Wrong txPackets", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), 
+        Assert.assertEquals("Wrong txPackets",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}),

                 message.getQueueStats().get(0).getTxPackets());
                 message.getQueueStats().get(0).getTxPackets());

-        Assert.assertEquals("Wrong txErrors", 
-                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), 
+        Assert.assertEquals("Wrong txErrors",
+                new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}),

                 message.getQueueStats().get(0).getTxErrors());
         Assert.assertTrue("Unread data", bb.readableBytes() == 0);
     }
                 message.getQueueStats().get(0).getTxErrors());
         Assert.assertTrue("Unread data", bb.readableBytes() == 0);
     }

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketInMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketInMessageFactoryTest.java
index a154ad4b51a81fa076ca706baa456cfbcfccd453..b30df2f8df8b4913f7935b1789a726fb41bc20da 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketInMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PacketInMessageFactoryTest.java
@@ -50,10 +50,10 @@ public class PacketInMessageFactoryTest {
     public void test(){
         ByteBuf bb = BufferHelper.buildBuffer("00 01 02 03 01 02 01 04 00 01 02 03 04 05 06 07 00 01 00 0C"
                 + " 80 00 02 04 00 00 00 01 00 00 00 00 00 00 01 02 03 04");
     public void test(){
         ByteBuf bb = BufferHelper.buildBuffer("00 01 02 03 01 02 01 04 00 01 02 03 04 05 06 07 00 01 00 0C"
                 + " 80 00 02 04 00 00 00 01 00 00 00 00 00 00 01 02 03 04");

-        PacketInMessage builtByFactory = BufferHelper.deserialize(packetInFactory, bb); 
-        
+        PacketInMessage builtByFactory = BufferHelper.deserialize(packetInFactory, bb);
+

         BufferHelper.checkHeaderV13(builtByFactory);
         BufferHelper.checkHeaderV13(builtByFactory);

-        
+

         Assert.assertEquals("Wrong bufferID", 0x00010203L, builtByFactory.getBufferId().longValue());
         Assert.assertEquals("Wrong totalLength", 0x0102, builtByFactory.getTotalLen().intValue());
         Assert.assertEquals("Wrong reason", PacketInReason.OFPRACTION, builtByFactory.getReason());
         Assert.assertEquals("Wrong bufferID", 0x00010203L, builtByFactory.getBufferId().longValue());
         Assert.assertEquals("Wrong totalLength", 0x0102, builtByFactory.getTotalLen().intValue());
         Assert.assertEquals("Wrong reason", PacketInReason.OFPRACTION, builtByFactory.getReason());

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactoryTest.java
index cf0499ae95af6590735a4e86d19a7f890a824847..79ee3fd9e7d1f8af0712e0f1c8aaff8e28700b39 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactoryTest.java
@@ -50,7 +50,7 @@ public class PortStatusMessageFactoryTest {
      */
     @Test
     public void test(){
      */
     @Test
     public void test(){

-        ByteBuf bb = BufferHelper.buildBuffer("01 " + //reason 
+        ByteBuf bb = BufferHelper.buildBuffer("01 " + //reason

                                               "00 00 00 00 00 00 00 " + //padding
                                               "00 01 02 03 " + //port no
                                               "00 00 00 00 " + //padding in ofp_port1
                                               "00 00 00 00 00 00 00 " + //padding
                                               "00 01 02 03 " + //port no
                                               "00 00 00 00 " + //padding in ofp_port1


@@ -66,9 +66,9 @@ public class PortStatusMessageFactoryTest {
                                               "00 00 00 81 " + //curr speed
                                               "00 00 00 80" //max speed
                                               );
                                               "00 00 00 81 " + //curr speed
                                               "00 00 00 80" //max speed
                                               );

-        
+

         PortStatusMessage builtByFactory = BufferHelper.deserialize(statusFactory, bb);
         PortStatusMessage builtByFactory = BufferHelper.deserialize(statusFactory, bb);

-        
+

         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong reason", 0x01, builtByFactory.getReason().getIntValue());
         Assert.assertEquals("Wrong portNumber", 66051L, builtByFactory.getPortNo().longValue());
         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong reason", 0x01, builtByFactory.getReason().getIntValue());
         Assert.assertEquals("Wrong portNumber", 66051L, builtByFactory.getPortNo().longValue());

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryTest.java
index ab4ef3a6c193a6deed04dc41343ce14805326542..cc2f4eabcf4f6df5edc87a21f336ca21043b6ac5 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactoryTest.java
@@ -63,7 +63,7 @@ public class QueueGetConfigReplyMessageFactoryTest {
         Assert.assertEquals("Wrong port", 3L, builtByFactory.getPort().getValue().longValue());
         Assert.assertEquals("Wrong queues", builtByFactory.getQueues(), createQueuesList());
     }
         Assert.assertEquals("Wrong port", 3L, builtByFactory.getPort().getValue().longValue());
         Assert.assertEquals("Wrong queues", builtByFactory.getQueues(), createQueuesList());
     }

-    
+

     private static List<Queues> createQueuesList(){
         List<Queues> queuesList = new ArrayList<>();
         QueuesBuilder qb = new QueuesBuilder();
     private static List<Queues> createQueuesList(){
         List<Queues> queuesList = new ArrayList<>();
         QueuesBuilder qb = new QueuesBuilder();


@@ -71,10 +71,10 @@ public class QueueGetConfigReplyMessageFactoryTest {
         qb.setPort(new PortNumber(3L));
         qb.setQueueProperty(createPropertiesList());
         queuesList.add(qb.build());
         qb.setPort(new PortNumber(3L));
         qb.setQueueProperty(createPropertiesList());
         queuesList.add(qb.build());

-        
+

         return queuesList;
     }
         return queuesList;
     }

-    
+

     private static List<QueueProperty> createPropertiesList(){
         List<QueueProperty> propertiesList = new ArrayList<>();
         QueuePropertyBuilder pb = new QueuePropertyBuilder();
     private static List<QueueProperty> createPropertiesList(){
         List<QueueProperty> propertiesList = new ArrayList<>();
         QueuePropertyBuilder pb = new QueuePropertyBuilder();

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/RoleReplyMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/RoleReplyMessageFactoryTest.java
index e41e53b628deb51c7bafcde688edfee059d87e35..2f7a81d8155fd3113f55fee22b539f2471dee484 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/RoleReplyMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/RoleReplyMessageFactoryTest.java
@@ -49,7 +49,7 @@ public class RoleReplyMessageFactoryTest {
         RoleRequestOutput builtByFactory = BufferHelper.deserialize(roleFactory, bb);
 
         BufferHelper.checkHeaderV13(builtByFactory);
         RoleRequestOutput builtByFactory = BufferHelper.deserialize(roleFactory, bb);
 
         BufferHelper.checkHeaderV13(builtByFactory);

-       
+

         Assert.assertEquals("Wrong role", 0x02, builtByFactory.getRole().getIntValue());
         Assert.assertEquals("Wrong generationId", 0x01020304050607L, builtByFactory.getGenerationId().longValue());
     }
         Assert.assertEquals("Wrong role", 0x02, builtByFactory.getRole().getIntValue());
         Assert.assertEquals("Wrong generationId", 0x01020304050607L, builtByFactory.getGenerationId().longValue());
     }

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6FlabelDeserializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6FlabelDeserializerTest.java
index 2c29dce18e7a8a4ef0c13c447f62504eb7ff7e00..17bc3abd708efa89c1a110edb1f21ffe591fc8b4 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6FlabelDeserializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6FlabelDeserializerTest.java
@@ -38,7 +38,7 @@ public class OxmIpv6FlabelDeserializerTest {
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry.getOxmClass());
         Assert.assertEquals("Wrong entry field", Ipv6Flabel.class, entry.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", false, entry.isHasMask());
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry.getOxmClass());
         Assert.assertEquals("Wrong entry field", Ipv6Flabel.class, entry.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", false, entry.isHasMask());

-        Assert.assertEquals("Wrong entry value", 2, 
+        Assert.assertEquals("Wrong entry value", 2,

                 entry.getAugmentation(Ipv6FlabelMatchEntry.class).getIpv6Flabel().getValue().intValue());
     }
 }
\ No newline at end of file
                 entry.getAugmentation(Ipv6FlabelMatchEntry.class).getIpv6Flabel().getValue().intValue());
     }
 }
\ No newline at end of file

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMetadataDeserializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMetadataDeserializerTest.java
index d0983876460a026d46661ca102262fdce12bda5f..c2f6184036719c3af689d4737fd385d00ccadcd1 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMetadataDeserializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMetadataDeserializerTest.java
@@ -39,7 +39,7 @@ public class OxmMetadataDeserializerTest {
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry.getOxmClass());
         Assert.assertEquals("Wrong entry field", Metadata.class, entry.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", false, entry.isHasMask());
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry.getOxmClass());
         Assert.assertEquals("Wrong entry field", Metadata.class, entry.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", false, entry.isHasMask());

-        Assert.assertArrayEquals("Wrong entry value", ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 03"), 
+        Assert.assertArrayEquals("Wrong entry value", ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 03"),

                 entry.getAugmentation(MetadataMatchEntry.class).getMetadata());
     }
 }
\ No newline at end of file
                 entry.getAugmentation(MetadataMatchEntry.class).getMetadata());
     }
 }
\ No newline at end of file

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmVlanVidDeserializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmVlanVidDeserializerTest.java
index e765ba65a2635fe4e1c1ebcfe3d21a5d099d339a..5962ac37e00355c65126c14531ed237a1277de21 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmVlanVidDeserializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmVlanVidDeserializerTest.java
@@ -40,7 +40,7 @@ public class OxmVlanVidDeserializerTest {
         Assert.assertEquals("Wrong entry hasMask", false, entry.isHasMask());
         Assert.assertEquals("Wrong entry value", 10,
                 entry.getAugmentation(VlanVidMatchEntry.class).getVlanVid().intValue());
         Assert.assertEquals("Wrong entry hasMask", false, entry.isHasMask());
         Assert.assertEquals("Wrong entry value", 10,
                 entry.getAugmentation(VlanVidMatchEntry.class).getVlanVid().intValue());

-        Assert.assertEquals("Wrong entry value", false, 
+        Assert.assertEquals("Wrong entry value", false,

                 entry.getAugmentation(VlanVidMatchEntry.class).isCfiBit());
     }
 }
\ No newline at end of file
                 entry.getAugmentation(VlanVidMatchEntry.class).isCfiBit());
     }
 }
\ No newline at end of file

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializerRegistryImplTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializerRegistryImplTest.java
index c398e47d6640ff6cb0545b9b32deb8beba56b7e7..df7e83bfcc0af5f4c853f9f47018e868385f7a2d 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializerRegistryImplTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializerRegistryImplTest.java
@@ -15,12 +15,12 @@ import org.opendaylight.openflowjava.protocol.impl.util.OF13MatchSerializer;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.match.grouping.Match;
 
 /**
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.match.grouping.Match;
 
 /**

- * 
+ *

  * @author madamjak
  *
  */
 public class SerializerRegistryImplTest {
  * @author madamjak
  *
  */
 public class SerializerRegistryImplTest {

-    
+

     private static final short OF13 = EncodeConstants.OF13_VERSION_ID;
     private static final short OF10 = EncodeConstants.OF10_VERSION_ID;
 
     private static final short OF13 = EncodeConstants.OF13_VERSION_ID;
     private static final short OF10 = EncodeConstants.OF10_VERSION_ID;
 


@@ -46,7 +46,7 @@ public class SerializerRegistryImplTest {
     }
 
     /**
     }
 
     /**

-     * Test - unregister serializer 
+     * Test - unregister serializer

      */
     @Test
     public void testUnRegisterSerializer(){
      */
     @Test
     public void testUnRegisterSerializer(){

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/BarrierInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/BarrierInputMessageFactoryTest.java
index 9584bf62ed5cc751735ce8d505babee763ad418a..1e5f475ca35cd6195b60ed15d8cf4eb8fd8ee8da 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/BarrierInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/BarrierInputMessageFactoryTest.java
@@ -45,17 +45,17 @@ public class BarrierInputMessageFactoryTest {
 
     /**
      * Testing of {@link BarrierInputMessageFactory} for correct translation from POJO
 
     /**
      * Testing of {@link BarrierInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void test() throws Exception {
         BarrierInputBuilder bib = new BarrierInputBuilder();
         BufferHelper.setupHeader(bib, EncodeConstants.OF13_VERSION_ID);
         BarrierInput bi = bib.build();
      */
     @Test
     public void test() throws Exception {
         BarrierInputBuilder bib = new BarrierInputBuilder();
         BufferHelper.setupHeader(bib, EncodeConstants.OF13_VERSION_ID);
         BarrierInput bi = bib.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         barrierFactory.serialize(bi, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         barrierFactory.serialize(bi, out);

-        
+

         BufferHelper.checkHeaderV13(out, BARRIER_REQUEST_MESSAGE_CODE_TYPE, 8);
     }
 
         BufferHelper.checkHeaderV13(out, BARRIER_REQUEST_MESSAGE_CODE_TYPE, 8);
     }
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoInputMessageFactoryTest.java
index f9df80d2c891eaaed9511be5039b625bcd1a9def..cf00e1c286820dd4a72503b6a76e46b785c9ae78 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoInputMessageFactoryTest.java
@@ -46,7 +46,7 @@ public class EchoInputMessageFactoryTest {
 
     /**
      * Testing of {@link EchoInputMessageFactory} for correct translation from POJO
 
     /**
      * Testing of {@link EchoInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testV13() throws Exception {
      */
     @Test
     public void testV13() throws Exception {


@@ -57,10 +57,10 @@ public class EchoInputMessageFactoryTest {
         echoFactory.serialize(ei, out);
         BufferHelper.checkHeaderV13(out, ECHO_REQUEST_MESSAGE_CODE_TYPE, 8);
     }
         echoFactory.serialize(ei, out);
         BufferHelper.checkHeaderV13(out, ECHO_REQUEST_MESSAGE_CODE_TYPE, 8);
     }

-    
+

     /**
      * Testing of {@link EchoInputMessageFactory} for correct translation from POJO
     /**
      * Testing of {@link EchoInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testV10() throws Exception {
      */
     @Test
     public void testV10() throws Exception {


@@ -74,7 +74,7 @@ public class EchoInputMessageFactoryTest {
 
     /**
      * Testing of {@link EchoInputMessageFactory} for correct data serialization
 
     /**
      * Testing of {@link EchoInputMessageFactory} for correct data serialization

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testData() throws Exception{
      */
     @Test
     public void testData() throws Exception{

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoReplyInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoReplyInputMessageFactoryTest.java
index 64a5f0785d56467821641ae5d57515e7711d7bc5..be4130a0685cffaa4429ca31a5a76212332ac8ee 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoReplyInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/EchoReplyInputMessageFactoryTest.java
@@ -45,7 +45,7 @@ public class EchoReplyInputMessageFactoryTest {
 
     /**
      * Testing of {@link EchoReplyInputMessageFactory} for correct translation from POJO
 
     /**
      * Testing of {@link EchoReplyInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testV13() throws Exception {
      */
     @Test
     public void testV13() throws Exception {


@@ -56,10 +56,10 @@ public class EchoReplyInputMessageFactoryTest {
         echoFactory.serialize(eri, out);
         BufferHelper.checkHeaderV13(out, ECHO_REPLY_MESSAGE_CODE_TYPE, 8);
     }
         echoFactory.serialize(eri, out);
         BufferHelper.checkHeaderV13(out, ECHO_REPLY_MESSAGE_CODE_TYPE, 8);
     }

-    
+

     /**
      * Testing of {@link EchoReplyInputMessageFactory} for correct translation from POJO
     /**
      * Testing of {@link EchoReplyInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testV10() throws Exception {
      */
     @Test
     public void testV10() throws Exception {

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/ExperimenterInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/ExperimenterInputMessageFactoryTest.java
index 77cc5c32d2e88eb9e69669ba80fabb938c0d88ba..4723559588342a5f53d259c4660078833ff2cbed 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/ExperimenterInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/ExperimenterInputMessageFactoryTest.java
@@ -56,7 +56,7 @@ public class ExperimenterInputMessageFactoryTest {
     /**
      * Testing of {@link ExperimenterInputMessageFactory} for correct serializer
      * lookup and serialization
     /**
      * Testing of {@link ExperimenterInputMessageFactory} for correct serializer
      * lookup and serialization

-     * @throws Exception 
+     * @throws Exception

      */
     @Test(expected=IllegalStateException.class)
     public void testV10Real() throws Exception {
      */
     @Test(expected=IllegalStateException.class)
     public void testV10Real() throws Exception {


@@ -65,7 +65,7 @@ public class ExperimenterInputMessageFactoryTest {
         BufferHelper.setupHeader(builder, EncodeConstants.OF10_VERSION_ID);
         builder.setExperimenter(new ExperimenterId(42L));
         ExperimenterInput input = builder.build();
         BufferHelper.setupHeader(builder, EncodeConstants.OF10_VERSION_ID);
         builder.setExperimenter(new ExperimenterId(42L));
         ExperimenterInput input = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         expFactory.serialize(input, out);
     }
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         expFactory.serialize(input, out);
     }


@@ -73,7 +73,7 @@ public class ExperimenterInputMessageFactoryTest {
     /**
      * Testing of {@link ExperimenterInputMessageFactory} for correct serializer
      * lookup and serialization
     /**
      * Testing of {@link ExperimenterInputMessageFactory} for correct serializer
      * lookup and serialization

-     * @throws Exception 
+     * @throws Exception

      */
     @Test(expected=IllegalStateException.class)
     public void testV13Real() throws Exception {
      */
     @Test(expected=IllegalStateException.class)
     public void testV13Real() throws Exception {


@@ -82,7 +82,7 @@ public class ExperimenterInputMessageFactoryTest {
         BufferHelper.setupHeader(builder, EncodeConstants.OF13_VERSION_ID);
         builder.setExperimenter(new ExperimenterId(42L));
         ExperimenterInput input = builder.build();
         BufferHelper.setupHeader(builder, EncodeConstants.OF13_VERSION_ID);
         builder.setExperimenter(new ExperimenterId(42L));
         ExperimenterInput input = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         expFactory.serialize(input, out);
     }
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         expFactory.serialize(input, out);
     }


@@ -90,7 +90,7 @@ public class ExperimenterInputMessageFactoryTest {
     /**
      * Testing of {@link ExperimenterInputMessageFactory} for correct serializer
      * lookup and serialization
     /**
      * Testing of {@link ExperimenterInputMessageFactory} for correct serializer
      * lookup and serialization

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testV10() throws Exception {
      */
     @Test
     public void testV10() throws Exception {


@@ -110,7 +110,7 @@ public class ExperimenterInputMessageFactoryTest {
     /**
      * Testing of {@link ExperimenterInputMessageFactory} for correct serializer
      * lookup and serialization
     /**
      * Testing of {@link ExperimenterInputMessageFactory} for correct serializer
      * lookup and serialization

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testV13() throws Exception {
      */
     @Test
     public void testV13() throws Exception {

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowModInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowModInputMessageFactoryTest.java
index 3c5ba034151ec18fa1023e47ef21d75f9210a577..bfa5985751fba27ba3e79e4ef6d9e1cee8b35d9f 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowModInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/FlowModInputMessageFactoryTest.java
@@ -81,7 +81,7 @@ public class FlowModInputMessageFactoryTest {
     }
 
     /**
     }
 
     /**

-     * @throws Exception 
+     * @throws Exception

      * Testing of {@link FlowModInputMessageFactory} for correct translation from POJO
      */
     @Test
      * Testing of {@link FlowModInputMessageFactory} for correct translation from POJO
      */
     @Test


@@ -211,11 +211,11 @@ public class FlowModInputMessageFactoryTest {
         out.skipBytes(6);
         Assert.assertTrue("Unread data", out.readableBytes() == 0);
     }
         out.skipBytes(6);
         Assert.assertTrue("Unread data", out.readableBytes() == 0);
     }

-    
+

     private static FlowModFlags createFlowModFlagsFromBitmap(int input){
         final Boolean _oFPFFSENDFLOWREM = (input & (1 << 0)) > 0;
         final Boolean _oFPFFCHECKOVERLAP = (input & (1 << 1)) > 0;
     private static FlowModFlags createFlowModFlagsFromBitmap(int input){
         final Boolean _oFPFFSENDFLOWREM = (input & (1 << 0)) > 0;
         final Boolean _oFPFFCHECKOVERLAP = (input & (1 << 1)) > 0;

-        final Boolean _oFPFFRESETCOUNTS = (input & (1 << 2)) > 0; 
+        final Boolean _oFPFFRESETCOUNTS = (input & (1 << 2)) > 0;

         final Boolean _oFPFFNOPKTCOUNTS = (input & (1 << 3)) > 0;
         final Boolean _oFPFFNOBYTCOUNTS = (input & (1 << 4)) > 0;
         return new FlowModFlags(_oFPFFCHECKOVERLAP, _oFPFFNOBYTCOUNTS, _oFPFFNOPKTCOUNTS, _oFPFFRESETCOUNTS, _oFPFFSENDFLOWREM);
         final Boolean _oFPFFNOPKTCOUNTS = (input & (1 << 3)) > 0;
         final Boolean _oFPFFNOBYTCOUNTS = (input & (1 << 4)) > 0;
         return new FlowModFlags(_oFPFFCHECKOVERLAP, _oFPFFNOBYTCOUNTS, _oFPFFNOPKTCOUNTS, _oFPFFRESETCOUNTS, _oFPFFSENDFLOWREM);

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetConfigInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetConfigInputMessageFactoryTest.java
index bf5a3c3607a83f5550af4b0436117a8d0594d7c5..a050b29948ad862de260d74e1b5511f38cd3a93e 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetConfigInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetConfigInputMessageFactoryTest.java
@@ -45,33 +45,33 @@ public class GetConfigInputMessageFactoryTest {
 
     /**
      * Testing of {@link GetConfigInputMessageFactory} for correct translation from POJO
 
     /**
      * Testing of {@link GetConfigInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testV13() throws Exception {
         GetConfigInputBuilder gcib = new GetConfigInputBuilder();
         BufferHelper.setupHeader(gcib, EncodeConstants.OF13_VERSION_ID);
         GetConfigInput gci = gcib.build();
      */
     @Test
     public void testV13() throws Exception {
         GetConfigInputBuilder gcib = new GetConfigInputBuilder();
         BufferHelper.setupHeader(gcib, EncodeConstants.OF13_VERSION_ID);
         GetConfigInput gci = gcib.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         getConfigFactory.serialize(gci, out);
 
         BufferHelper.checkHeaderV13(out, GET_CONFIG_REQUEST_MESSAGE_CODE_TYPE, 8);
     }
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         getConfigFactory.serialize(gci, out);
 
         BufferHelper.checkHeaderV13(out, GET_CONFIG_REQUEST_MESSAGE_CODE_TYPE, 8);
     }

-    
+

     /**
      * Testing of {@link GetConfigInputMessageFactory} for correct translation from POJO
     /**
      * Testing of {@link GetConfigInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testV10() throws Exception {
         GetConfigInputBuilder gcib = new GetConfigInputBuilder();
         BufferHelper.setupHeader(gcib, EncodeConstants.OF10_VERSION_ID);
         GetConfigInput gci = gcib.build();
      */
     @Test
     public void testV10() throws Exception {
         GetConfigInputBuilder gcib = new GetConfigInputBuilder();
         BufferHelper.setupHeader(gcib, EncodeConstants.OF10_VERSION_ID);
         GetConfigInput gci = gcib.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         getConfigFactory.serialize(gci, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         getConfigFactory.serialize(gci, out);

-        
+

         BufferHelper.checkHeaderV10(out, GET_CONFIG_REQUEST_MESSAGE_CODE_TYPE, 8);
     }
 
         BufferHelper.checkHeaderV10(out, GET_CONFIG_REQUEST_MESSAGE_CODE_TYPE, 8);
     }
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetFeaturesInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetFeaturesInputMessageFactoryTest.java
index 62ab4bf1f72c8992e8a2cde90ee488669df68fb9..1f4a400f1e5ea5c80bdb080d0d23f6351be85354 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetFeaturesInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetFeaturesInputMessageFactoryTest.java
@@ -45,14 +45,14 @@ public class GetFeaturesInputMessageFactoryTest {
 
     /**
      * Testing of {@link GetFeaturesInputMessageFactory} for correct translation from POJO
 
     /**
      * Testing of {@link GetFeaturesInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testV13() throws Exception {
         GetFeaturesInputBuilder gfib = new GetFeaturesInputBuilder();
         BufferHelper.setupHeader(gfib, EncodeConstants.OF13_VERSION_ID);
         GetFeaturesInput gfi = gfib.build();
      */
     @Test
     public void testV13() throws Exception {
         GetFeaturesInputBuilder gfib = new GetFeaturesInputBuilder();
         BufferHelper.setupHeader(gfib, EncodeConstants.OF13_VERSION_ID);
         GetFeaturesInput gfi = gfib.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         featuresFactory.serialize(gfi, out);
 
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         featuresFactory.serialize(gfi, out);
 


@@ -61,14 +61,14 @@ public class GetFeaturesInputMessageFactoryTest {
 
     /**
      * Testing of {@link GetFeaturesInputMessageFactory} for correct translation from POJO
 
     /**
      * Testing of {@link GetFeaturesInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testV10() throws Exception {
         GetFeaturesInputBuilder gfib = new GetFeaturesInputBuilder();
         BufferHelper.setupHeader(gfib, EncodeConstants.OF10_VERSION_ID);
         GetFeaturesInput gfi = gfib.build();
      */
     @Test
     public void testV10() throws Exception {
         GetFeaturesInputBuilder gfib = new GetFeaturesInputBuilder();
         BufferHelper.setupHeader(gfib, EncodeConstants.OF10_VERSION_ID);
         GetFeaturesInput gfi = gfib.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         featuresFactory.serialize(gfi, out);
 
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         featuresFactory.serialize(gfi, out);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetQueueConfigInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetQueueConfigInputMessageFactoryTest.java
index f1da495aaee46d495570769340a7b076df58af57..0d94cf6b73e5fb0ac82fdaa6f594b21b0a6273c3 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetQueueConfigInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetQueueConfigInputMessageFactoryTest.java
@@ -46,7 +46,7 @@ public class GetQueueConfigInputMessageFactoryTest {
 
     /**
      * Testing of {@link GetQueueConfigInputMessageFactory} for correct translation from POJO
 
     /**
      * Testing of {@link GetQueueConfigInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testGetQueueConfigInputMessage() throws Exception {
      */
     @Test
     public void testGetQueueConfigInputMessage() throws Exception {


@@ -54,7 +54,7 @@ public class GetQueueConfigInputMessageFactoryTest {
         BufferHelper.setupHeader(builder, EncodeConstants.OF13_VERSION_ID);
         builder.setPort(new PortNumber(0x00010203L));
         GetQueueConfigInput message = builder.build();
         BufferHelper.setupHeader(builder, EncodeConstants.OF13_VERSION_ID);
         builder.setPort(new PortNumber(0x00010203L));
         GetQueueConfigInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         getQueueFactory.serialize(message, out);
 
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         getQueueFactory.serialize(message, out);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetaAsyncRequestMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetaAsyncRequestMessageFactoryTest.java
index 5cc956ac4dd03f89eb8aa97c05dd8e472e3ebb8f..a660f37c1334ce7b40881eef3c8b92a2853eb652 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetaAsyncRequestMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetaAsyncRequestMessageFactoryTest.java
@@ -45,17 +45,17 @@ public class GetaAsyncRequestMessageFactoryTest {
 
     /**
      * Testing of {@link GetAsyncRequestMessageFactory} for correct translation from POJO
 
     /**
      * Testing of {@link GetAsyncRequestMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testGetAsyncReques() throws Exception {
         GetAsyncInputBuilder builder = new GetAsyncInputBuilder();
         BufferHelper.setupHeader(builder, EncodeConstants.OF13_VERSION_ID);
         GetAsyncInput message = builder.build();
      */
     @Test
     public void testGetAsyncReques() throws Exception {
         GetAsyncInputBuilder builder = new GetAsyncInputBuilder();
         BufferHelper.setupHeader(builder, EncodeConstants.OF13_VERSION_ID);
         GetAsyncInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         getAsyncFactory.serialize(message, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         getAsyncFactory.serialize(message, out);

-        
+

         BufferHelper.checkHeaderV13(out, MESSAGE_TYPE, MESSAGE_LENGTH);
     }
 }
         BufferHelper.checkHeaderV13(out, MESSAGE_TYPE, MESSAGE_LENGTH);
     }
 }

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactoryTest.java
index c5d41114c2cd36341af27b9e21d055c7419b170c..c158b7067c51ec0d266d1d35553e61b1b8d6c8c2 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactoryTest.java
@@ -67,7 +67,7 @@ public class GroupModInputMessageFactoryTest {
         List<BucketsList> exp = createBucketsList();
         builder.setBucketsList(exp);
         GroupModInput message = builder.build();
         List<BucketsList> exp = createBucketsList();
         builder.setBucketsList(exp);
         GroupModInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         groupModFactory.serialize(message, out);
 
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         groupModFactory.serialize(message, out);
 


@@ -79,7 +79,7 @@ public class GroupModInputMessageFactoryTest {
         List<BucketsList> rec = createBucketsListFromBufer(out);
         Assert.assertArrayEquals("Wrong bucketList", exp.toArray(), rec.toArray());
     }
         List<BucketsList> rec = createBucketsListFromBufer(out);
         Assert.assertArrayEquals("Wrong bucketList", exp.toArray(), rec.toArray());
     }

-    
+

     private static List<BucketsList> createBucketsList(){
         List<BucketsList> bucketsList = new ArrayList<>();
         BucketsListBuilder bucketsBuilder = new BucketsListBuilder();
     private static List<BucketsList> createBucketsList(){
         List<BucketsList> bucketsList = new ArrayList<>();
         BucketsListBuilder bucketsBuilder = new BucketsListBuilder();


@@ -91,7 +91,7 @@ public class GroupModInputMessageFactoryTest {
         bucketsList.add(bucket);
         return bucketsList;
     }
         bucketsList.add(bucket);
         return bucketsList;
     }

-    
+

     private static List<BucketsList> createBucketsListFromBufer(ByteBuf out){
         List<BucketsList> bucketsList = new ArrayList<>();
         BucketsListBuilder bucketsBuilder = new BucketsListBuilder();
     private static List<BucketsList> createBucketsListFromBufer(ByteBuf out){
         List<BucketsList> bucketsList = new ArrayList<>();
         BucketsListBuilder bucketsBuilder = new BucketsListBuilder();

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/HelloInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/HelloInputMessageFactoryTest.java
index f971c0266b544d1637fcb2b57e34e65ada2cb04b..e2ea0f86b39a323502d223b42312ed61835d2fe2 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/HelloInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/HelloInputMessageFactoryTest.java
@@ -55,23 +55,23 @@ public class HelloInputMessageFactoryTest {
 
     /**
      * Testing of {@link HelloInputMessageFactory} for correct translation from POJO
 
     /**
      * Testing of {@link HelloInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testWithoutElementsSet() throws Exception {
         HelloInputBuilder hib = new HelloInputBuilder();
         BufferHelper.setupHeader(hib, EncodeConstants.OF13_VERSION_ID);
         HelloInput hi = hib.build();
      */
     @Test
     public void testWithoutElementsSet() throws Exception {
         HelloInputBuilder hib = new HelloInputBuilder();
         BufferHelper.setupHeader(hib, EncodeConstants.OF13_VERSION_ID);
         HelloInput hi = hib.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         helloFactory.serialize(hi, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         helloFactory.serialize(hi, out);

-        
+

         BufferHelper.checkHeaderV13(out,(byte) 0, EncodeConstants.OFHEADER_SIZE);
     }
         BufferHelper.checkHeaderV13(out,(byte) 0, EncodeConstants.OFHEADER_SIZE);
     }

-    
+

     /**
      * Testing of {@link HelloInputMessageFactory} for correct translation from POJO
     /**
      * Testing of {@link HelloInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testWith4BitVersionBitmap() throws Exception {
      */
     @Test
     public void testWith4BitVersionBitmap() throws Exception {


@@ -81,21 +81,21 @@ public class HelloInputMessageFactoryTest {
         List<Elements> expectedElement = createElement(lengthOfBitmap);
         builder.setElements(expectedElement);
         HelloInput message = builder.build();
         List<Elements> expectedElement = createElement(lengthOfBitmap);
         builder.setElements(expectedElement);
         HelloInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         helloFactory.serialize(message, out);
         LOGGER.debug("bytebuf: " + ByteBufUtils.byteBufToHexString(out));
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         helloFactory.serialize(message, out);
         LOGGER.debug("bytebuf: " + ByteBufUtils.byteBufToHexString(out));

-        
+

         BufferHelper.checkHeaderV13(out, (byte) 0, 16);
         Elements element = readElement(out).get(0);
         Assert.assertEquals("Wrong element type", expectedElement.get(0).getType(), element.getType());
         Elements comparation = createComparationElement(lengthOfBitmap).get(0);
         Assert.assertArrayEquals("Wrong element bitmap", comparation.getVersionBitmap().toArray(), element.getVersionBitmap().toArray());
     }
         BufferHelper.checkHeaderV13(out, (byte) 0, 16);
         Elements element = readElement(out).get(0);
         Assert.assertEquals("Wrong element type", expectedElement.get(0).getType(), element.getType());
         Elements comparation = createComparationElement(lengthOfBitmap).get(0);
         Assert.assertArrayEquals("Wrong element bitmap", comparation.getVersionBitmap().toArray(), element.getVersionBitmap().toArray());
     }

-    
+

     /**
      * Testing of {@link HelloInputMessageFactory} for correct translation from POJO
     /**
      * Testing of {@link HelloInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testWith64BitVersionBitmap() throws Exception {
      */
     @Test
     public void testWith64BitVersionBitmap() throws Exception {


@@ -105,18 +105,18 @@ public class HelloInputMessageFactoryTest {
         List<Elements> expectedElement = createElement(lengthOfBitmap);
         builder.setElements(expectedElement);
         HelloInput message = builder.build();
         List<Elements> expectedElement = createElement(lengthOfBitmap);
         builder.setElements(expectedElement);
         HelloInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         helloFactory.serialize(message, out);
         LOGGER.debug("bytebuf: " + ByteBufUtils.byteBufToHexString(out));
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         helloFactory.serialize(message, out);
         LOGGER.debug("bytebuf: " + ByteBufUtils.byteBufToHexString(out));

-        
+

         BufferHelper.checkHeaderV13(out, (byte) 0, 24);
         Elements element = readElement(out).get(0);
         Assert.assertEquals("Wrong element type", expectedElement.get(0).getType(), element.getType());
         Elements comparation = createComparationElement(lengthOfBitmap).get(0);
         Assert.assertArrayEquals("Wrong element bitmap", comparation.getVersionBitmap().toArray(), element.getVersionBitmap().toArray());
     }
         BufferHelper.checkHeaderV13(out, (byte) 0, 24);
         Elements element = readElement(out).get(0);
         Assert.assertEquals("Wrong element type", expectedElement.get(0).getType(), element.getType());
         Elements comparation = createComparationElement(lengthOfBitmap).get(0);
         Assert.assertArrayEquals("Wrong element bitmap", comparation.getVersionBitmap().toArray(), element.getVersionBitmap().toArray());
     }

-    
+

     private static List<Elements> createElement(int lengthOfBitmap) {
         ElementsBuilder elementsBuilder = new ElementsBuilder();
         List<Elements> elementsList = new ArrayList<>();
     private static List<Elements> createElement(int lengthOfBitmap) {
         ElementsBuilder elementsBuilder = new ElementsBuilder();
         List<Elements> elementsList = new ArrayList<>();


@@ -129,7 +129,7 @@ public class HelloInputMessageFactoryTest {
         elementsList.add(elementsBuilder.build());
         return elementsList;
     }
         elementsList.add(elementsBuilder.build());
         return elementsList;
     }

-    
+

     private static List<Elements> createComparationElement(int lengthOfBitmap) {
         ElementsBuilder elementsBuilder = new ElementsBuilder();
         List<Elements> elementsList = new ArrayList<>();
     private static List<Elements> createComparationElement(int lengthOfBitmap) {
         ElementsBuilder elementsBuilder = new ElementsBuilder();
         List<Elements> elementsList = new ArrayList<>();


@@ -148,7 +148,7 @@ public class HelloInputMessageFactoryTest {
         elementsList.add(elementsBuilder.build());
         return elementsList;
     }
         elementsList.add(elementsBuilder.build());
         return elementsList;
     }

-    
+

     private static List<Elements> readElement(ByteBuf input) {
         List<Elements> elementsList = new ArrayList<>();
         while (input.readableBytes() > 0) {
     private static List<Elements> readElement(ByteBuf input) {
         List<Elements> elementsList = new ArrayList<>();
         while (input.readableBytes() > 0) {


@@ -171,7 +171,7 @@ public class HelloInputMessageFactoryTest {
         }
         return elementsList;
     }
         }
         return elementsList;
     }

-    
+

     private static List<Boolean> readVersionBitmap(int[] input){
         List<Boolean> versionBitmapList = new ArrayList<>();
         for (int i = 0; i < input.length; i++) {
     private static List<Boolean> readVersionBitmap(int[] input){
         List<Boolean> versionBitmapList = new ArrayList<>();
         for (int i = 0; i < input.length; i++) {

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java
index 7ac417a4a54f4ea236a3cf1272d67af87c1c2e1f..4884643bf29a506af9e685bbbf8aa804c8508a35 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java
@@ -57,7 +57,7 @@ public class MeterModInputMessageFactoryTest {
     }
 
     /**
     }
 
     /**

-     * @throws Exception 
+     * @throws Exception

      * Testing of {@link MeterModInputMessageFactory} for correct translation from POJO
      */
     @Test
      * Testing of {@link MeterModInputMessageFactory} for correct translation from POJO
      */
     @Test


@@ -69,25 +69,25 @@ public class MeterModInputMessageFactoryTest {
         builder.setMeterId(new MeterId(2248L));
         builder.setBands(createBandsList());
         MeterModInput message = builder.build();
         builder.setMeterId(new MeterId(2248L));
         builder.setBands(createBandsList());
         MeterModInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         meterModFactory.serialize(message, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         meterModFactory.serialize(message, out);

-        
+

         BufferHelper.checkHeaderV13(out, (byte) 29, 48);
         Assert.assertEquals("Wrong meterModCommand", message.getCommand().getIntValue(), out.readUnsignedShort());
         Assert.assertEquals("Wrong meterFlags", message.getFlags(), decodeMeterModFlags(out.readShort()));
         Assert.assertEquals("Wrong meterId", message.getMeterId().getValue().intValue(), out.readUnsignedInt());
         Assert.assertEquals("Wrong bands", message.getBands(), decodeBandsList(out));
     }
         BufferHelper.checkHeaderV13(out, (byte) 29, 48);
         Assert.assertEquals("Wrong meterModCommand", message.getCommand().getIntValue(), out.readUnsignedShort());
         Assert.assertEquals("Wrong meterFlags", message.getFlags(), decodeMeterModFlags(out.readShort()));
         Assert.assertEquals("Wrong meterId", message.getMeterId().getValue().intValue(), out.readUnsignedInt());
         Assert.assertEquals("Wrong bands", message.getBands(), decodeBandsList(out));
     }

-    
+

     private static MeterFlags decodeMeterModFlags(short input){
         final Boolean _oFPMFKBPS = (input & (1 << 0)) > 0;
         final Boolean _oFPMFPKTPS = (input & (1 << 1)) > 0;
     private static MeterFlags decodeMeterModFlags(short input){
         final Boolean _oFPMFKBPS = (input & (1 << 0)) > 0;
         final Boolean _oFPMFPKTPS = (input & (1 << 1)) > 0;

-        final Boolean _oFPMFBURST = (input & (1 << 2)) > 0; 
+        final Boolean _oFPMFBURST = (input & (1 << 2)) > 0;

         final Boolean _oFPMFSTATS = (input & (1 << 3)) > 0;
         return new MeterFlags(_oFPMFBURST, _oFPMFKBPS, _oFPMFPKTPS, _oFPMFSTATS);
     }
         final Boolean _oFPMFSTATS = (input & (1 << 3)) > 0;
         return new MeterFlags(_oFPMFBURST, _oFPMFKBPS, _oFPMFPKTPS, _oFPMFSTATS);
     }

-    
+

     private static List<Bands> createBandsList(){
         List<Bands> bandsList = new ArrayList<>();
         BandsBuilder bandsBuilder = new BandsBuilder();
     private static List<Bands> createBandsList(){
         List<Bands> bandsList = new ArrayList<>();
         BandsBuilder bandsBuilder = new BandsBuilder();


@@ -108,7 +108,7 @@ public class MeterModInputMessageFactoryTest {
         bandsList.add(bandsBuilder.setMeterBand(dscpCaseBuilder.build()).build());
         return bandsList;
     }
         bandsList.add(bandsBuilder.setMeterBand(dscpCaseBuilder.build()).build());
         return bandsList;
     }

-    
+

     private static List<Bands> decodeBandsList(ByteBuf input){
         List<Bands> bandsList = new ArrayList<>();
         BandsBuilder bandsBuilder = new BandsBuilder();
     private static List<Bands> decodeBandsList(ByteBuf input){
         List<Bands> bandsList = new ArrayList<>();
         BandsBuilder bandsBuilder = new BandsBuilder();


@@ -135,7 +135,7 @@ public class MeterModInputMessageFactoryTest {
     }
 
     /**
     }
 
     /**

-     * @throws Exception 
+     * @throws Exception

      * Testing of {@link MeterModInputMessageFactory} for correct translation from POJO
      */
     @Test
      * Testing of {@link MeterModInputMessageFactory} for correct translation from POJO
      */
     @Test


@@ -147,10 +147,10 @@ public class MeterModInputMessageFactoryTest {
         builder.setMeterId(new MeterId(2248L));
         builder.setBands(null);
         MeterModInput message = builder.build();
         builder.setMeterId(new MeterId(2248L));
         builder.setBands(null);
         MeterModInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         meterModFactory.serialize(message, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         meterModFactory.serialize(message, out);

-        
+

         BufferHelper.checkHeaderV13(out, (byte) 29, 16);
         Assert.assertEquals("Wrong meterModCommand", message.getCommand().getIntValue(), out.readUnsignedShort());
         Assert.assertEquals("Wrong meterFlags", message.getFlags(), decodeMeterModFlags(out.readShort()));
         BufferHelper.checkHeaderV13(out, (byte) 29, 16);
         Assert.assertEquals("Wrong meterModCommand", message.getCommand().getIntValue(), out.readUnsignedShort());
         Assert.assertEquals("Wrong meterFlags", message.getFlags(), decodeMeterModFlags(out.readShort()));

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10BarrierInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10BarrierInputMessageFactoryTest.java
index 4ddb02cc0d175d59787b684ab25dba7d8fe684a8..ae752b6a875658dc5289c133dbd7101b4ad21fd6 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10BarrierInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10BarrierInputMessageFactoryTest.java
@@ -44,17 +44,17 @@ public class OF10BarrierInputMessageFactoryTest {
 
     /**
      * Testing of {@link OF10BarrierInputMessageFactory} for correct translation from POJO
 
     /**
      * Testing of {@link OF10BarrierInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void test() throws Exception {
         BarrierInputBuilder bib = new BarrierInputBuilder();
         BufferHelper.setupHeader(bib, EncodeConstants.OF10_VERSION_ID);
         BarrierInput bi = bib.build();
      */
     @Test
     public void test() throws Exception {
         BarrierInputBuilder bib = new BarrierInputBuilder();
         BufferHelper.setupHeader(bib, EncodeConstants.OF10_VERSION_ID);
         BarrierInput bi = bib.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         barrierFactory.serialize(bi, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         barrierFactory.serialize(bi, out);

-        
+

         BufferHelper.checkHeaderV10(out, (byte) 18, 8);
     }
 
         BufferHelper.checkHeaderV10(out, (byte) 18, 8);
     }
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowModInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowModInputMessageFactoryTest.java
index 24449825c9107ad0a0ed1fea8ee2d2cbb19ad0f8..e4b3af1b4066fa14d19568725338b9739decac48 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowModInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10FlowModInputMessageFactoryTest.java
@@ -64,7 +64,7 @@ public class OF10FlowModInputMessageFactoryTest {
     }
 
     /**
     }
 
     /**

-     * @throws Exception 
+     * @throws Exception

      * Testing of {@link OF10FlowModInputMessageFactory} for correct translation from POJO
      */
     @Test
      * Testing of {@link OF10FlowModInputMessageFactory} for correct translation from POJO
      */
     @Test


@@ -112,10 +112,10 @@ public class OF10FlowModInputMessageFactoryTest {
         actions.add(actionBuilder.build());
         builder.setAction(actions);
         FlowModInput message = builder.build();
         actions.add(actionBuilder.build());
         builder.setAction(actions);
         FlowModInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         flowModFactory.serialize(message, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         flowModFactory.serialize(message, out);

-        
+

         BufferHelper.checkHeaderV10(out, (byte) 14, 88);
         Assert.assertEquals("Wrong wildcards", 3678463, out.readUnsignedInt());
         Assert.assertEquals("Wrong inPort", 58, out.readUnsignedShort());
         BufferHelper.checkHeaderV10(out, (byte) 14, 88);
         Assert.assertEquals("Wrong wildcards", 3678463, out.readUnsignedInt());
         Assert.assertEquals("Wrong inPort", 58, out.readUnsignedShort());

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10HelloInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10HelloInputMessageFactoryTest.java
index c4807192a4fc57140ab26ec7ce6a73cb9cbe3d4e..e8591d4a86817fb57c74419df5316a07a9f6f0f5 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10HelloInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10HelloInputMessageFactoryTest.java
@@ -44,17 +44,17 @@ public class OF10HelloInputMessageFactoryTest {
 
     /**
      * Testing of {@link OF10HelloInputMessageFactory} for correct translation from POJO
 
     /**
      * Testing of {@link OF10HelloInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testWithoutElementsSet() throws Exception {
         HelloInputBuilder hib = new HelloInputBuilder();
         BufferHelper.setupHeader(hib, EncodeConstants.OF10_VERSION_ID);
         HelloInput hi = hib.build();
      */
     @Test
     public void testWithoutElementsSet() throws Exception {
         HelloInputBuilder hib = new HelloInputBuilder();
         BufferHelper.setupHeader(hib, EncodeConstants.OF10_VERSION_ID);
         HelloInput hi = hib.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         helloFactory.serialize(hi, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         helloFactory.serialize(hi, out);

-        
+

         BufferHelper.checkHeaderV10(out, (byte) 0, 8);
     }
 
         BufferHelper.checkHeaderV10(out, (byte) 0, 8);
     }
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PacketOutInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PacketOutInputMessageFactoryTest.java
index d98a836447b9ea68227050379f59aa3c5f1cb17d..791d5681c1d2b3fd89d4139fd0adee2e81bb4a33 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PacketOutInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PacketOutInputMessageFactoryTest.java
@@ -58,7 +58,7 @@ public class OF10PacketOutInputMessageFactoryTest {
 
     /**
      * Testing of {@link OF10PacketOutInputMessageFactory} for correct translation from POJO
 
     /**
      * Testing of {@link OF10PacketOutInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testPacketOutInputMessage() throws Exception {
      */
     @Test
     public void testPacketOutInputMessage() throws Exception {


@@ -83,10 +83,10 @@ public class OF10PacketOutInputMessageFactoryTest {
         builder.setAction(actions);
         builder.setData(ByteBufUtils.hexStringToBytes("00 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14"));
         PacketOutInput message = builder.build();
         builder.setAction(actions);
         builder.setData(ByteBufUtils.hexStringToBytes("00 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14"));
         PacketOutInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         packetOutFactory.serialize(message, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         packetOutFactory.serialize(message, out);

-        
+

         BufferHelper.checkHeaderV10(out, (byte) 13, 48);
         Assert.assertEquals("Wrong BufferId", 256, out.readUnsignedInt());
         Assert.assertEquals("Wrong PortNumber", 257, out.readUnsignedShort());
         BufferHelper.checkHeaderV10(out, (byte) 13, 48);
         Assert.assertEquals("Wrong BufferId", 256, out.readUnsignedInt());
         Assert.assertEquals("Wrong PortNumber", 257, out.readUnsignedShort());


@@ -104,7 +104,7 @@ public class OF10PacketOutInputMessageFactoryTest {
 
     /**
      * Testing of {@link OF10PacketOutInputMessageFactory} for correct translation from POJO
 
     /**
      * Testing of {@link OF10PacketOutInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testPacketOutInputWithNoData() throws Exception {
      */
     @Test
     public void testPacketOutInputWithNoData() throws Exception {

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PortModInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PortModInputMessageFactoryTest.java
index b64d6c5cdefbaef933eac9ef976d9fe10d1c14fc..39276ba3a0d4b0500c0995f0fa657debe592f9d1 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PortModInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10PortModInputMessageFactoryTest.java
@@ -49,7 +49,7 @@ public class OF10PortModInputMessageFactoryTest {
 
     /**
      * Testing of {@link OF10PortModInputMessageFactory} for correct translation from POJO
 
     /**
      * Testing of {@link OF10PortModInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testPortModInput() throws Exception {
      */
     @Test
     public void testPortModInput() throws Exception {


@@ -62,10 +62,10 @@ public class OF10PortModInputMessageFactoryTest {
         builder.setAdvertiseV10(new PortFeaturesV10(true, true, false, false, false, false,
                 false, true, true, false, false, false));
         PortModInput message = builder.build();
         builder.setAdvertiseV10(new PortFeaturesV10(true, true, false, false, false, false,
                 false, true, true, false, false, false));
         PortModInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         portModFactory.serialize(message, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         portModFactory.serialize(message, out);

-        
+

         BufferHelper.checkHeaderV10(out, (byte) 15, 32);
         Assert.assertEquals("Wrong PortNo", message.getPortNo().getValue().longValue(), out.readUnsignedShort());
         byte[] address = new byte[6];
         BufferHelper.checkHeaderV10(out, (byte) 15, 32);
         Assert.assertEquals("Wrong PortNo", message.getPortNo().getValue().longValue(), out.readUnsignedShort());
         byte[] address = new byte[6];

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10QueueGetConfigInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10QueueGetConfigInputMessageFactoryTest.java
index c8a41d2cf694080404521693da9421069010e465..91a08cbbb40a97e529ab9e6c5969908703fb9945 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10QueueGetConfigInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10QueueGetConfigInputMessageFactoryTest.java
@@ -45,7 +45,7 @@ public class OF10QueueGetConfigInputMessageFactoryTest {
 
     /**
      * Testing of {@link OF10QueueGetConfigInputMessageFactory} for correct translation from POJO
 
     /**
      * Testing of {@link OF10QueueGetConfigInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void test() throws Exception {
      */
     @Test
     public void test() throws Exception {


@@ -53,10 +53,10 @@ public class OF10QueueGetConfigInputMessageFactoryTest {
         BufferHelper.setupHeader(builder, EncodeConstants.OF10_VERSION_ID);
         builder.setPort(new PortNumber(6653L));
         GetQueueConfigInput message = builder.build();
         BufferHelper.setupHeader(builder, EncodeConstants.OF10_VERSION_ID);
         builder.setPort(new PortNumber(6653L));
         GetQueueConfigInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         queueFactory.serialize(message, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         queueFactory.serialize(message, out);

-        
+

         BufferHelper.checkHeaderV10(out, (byte) 20, 12);
         Assert.assertEquals("Wrong port", 6653L, out.readUnsignedShort());
         out.skipBytes(2);
         BufferHelper.checkHeaderV10(out, (byte) 20, 12);
         Assert.assertEquals("Wrong port", 6653L, out.readUnsignedShort());
         out.skipBytes(2);

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10StatsRequestInputFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10StatsRequestInputFactoryTest.java
index cfb64acce1ced6282a762d6901612a21b1248484..f7171223204d4e9c8ec72ae4ee76d718f41a5bae 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10StatsRequestInputFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10StatsRequestInputFactoryTest.java
@@ -74,16 +74,16 @@ public class OF10StatsRequestInputFactoryTest {
         caseBuilder.setMultipartRequestDesc(descBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();
         caseBuilder.setMultipartRequestDesc(descBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         multipartFactory.serialize(message, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         multipartFactory.serialize(message, out);

-        
+

         BufferHelper.checkHeaderV10(out, (byte) 16, 12);
         Assert.assertEquals("Wrong type", 0, out.readUnsignedShort());
         Assert.assertEquals("Wrong flags", 0, out.readUnsignedShort());
         Assert.assertTrue("Unread data", out.readableBytes() == 0);
     }
         BufferHelper.checkHeaderV10(out, (byte) 16, 12);
         Assert.assertEquals("Wrong type", 0, out.readUnsignedShort());
         Assert.assertEquals("Wrong flags", 0, out.readUnsignedShort());
         Assert.assertTrue("Unread data", out.readableBytes() == 0);
     }

-    
+

     /**
      * Testing OF10StatsRequestInputFactory (Flow) for correct serialization
      * @throws Exception
     /**
      * Testing OF10StatsRequestInputFactory (Flow) for correct serialization
      * @throws Exception


@@ -119,10 +119,10 @@ public class OF10StatsRequestInputFactoryTest {
         caseBuilder.setMultipartRequestFlow(flowBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();
         caseBuilder.setMultipartRequestFlow(flowBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         multipartFactory.serialize(message, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         multipartFactory.serialize(message, out);

-        
+

         BufferHelper.checkHeaderV10(out, (byte) 16, 56);
         Assert.assertEquals("Wrong type", 1, out.readUnsignedShort());
         Assert.assertEquals("Wrong flags", 0, out.readUnsignedShort());
         BufferHelper.checkHeaderV10(out, (byte) 16, 56);
         Assert.assertEquals("Wrong type", 1, out.readUnsignedShort());
         Assert.assertEquals("Wrong flags", 0, out.readUnsignedShort());


@@ -150,7 +150,7 @@ public class OF10StatsRequestInputFactoryTest {
         Assert.assertEquals("Wrong out-port", 42, out.readUnsignedShort());
         Assert.assertTrue("Unread data", out.readableBytes() == 0);
     }
         Assert.assertEquals("Wrong out-port", 42, out.readUnsignedShort());
         Assert.assertTrue("Unread data", out.readableBytes() == 0);
     }

-    
+

     /**
      * Testing OF10StatsRequestInputFactory (Aggregate) for correct serialization
      * @throws Exception
     /**
      * Testing OF10StatsRequestInputFactory (Aggregate) for correct serialization
      * @throws Exception


@@ -186,10 +186,10 @@ public class OF10StatsRequestInputFactoryTest {
         caseBuilder.setMultipartRequestFlow(flowBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();
         caseBuilder.setMultipartRequestFlow(flowBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         multipartFactory.serialize(message, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         multipartFactory.serialize(message, out);

-        
+

         BufferHelper.checkHeaderV10(out, (byte) 16, 56);
         Assert.assertEquals("Wrong type", 2, out.readUnsignedShort());
         Assert.assertEquals("Wrong flags", 0, out.readUnsignedShort());
         BufferHelper.checkHeaderV10(out, (byte) 16, 56);
         Assert.assertEquals("Wrong type", 2, out.readUnsignedShort());
         Assert.assertEquals("Wrong flags", 0, out.readUnsignedShort());


@@ -217,7 +217,7 @@ public class OF10StatsRequestInputFactoryTest {
         Assert.assertEquals("Wrong out-port", 6653, out.readUnsignedShort());
         Assert.assertTrue("Unread data", out.readableBytes() == 0);
     }
         Assert.assertEquals("Wrong out-port", 6653, out.readUnsignedShort());
         Assert.assertTrue("Unread data", out.readableBytes() == 0);
     }

-    
+

     /**
      * Testing OF10StatsRequestInputFactory (Table) for correct serialization
      * @throws Exception
     /**
      * Testing OF10StatsRequestInputFactory (Table) for correct serialization
      * @throws Exception


@@ -233,16 +233,16 @@ public class OF10StatsRequestInputFactoryTest {
         caseBuilder.setMultipartRequestTable(tableBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();
         caseBuilder.setMultipartRequestTable(tableBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         multipartFactory.serialize(message, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         multipartFactory.serialize(message, out);

-        
+

         BufferHelper.checkHeaderV10(out, (byte) 16, 12);
         Assert.assertEquals("Wrong type", 3, out.readUnsignedShort());
         Assert.assertEquals("Wrong flags", 0, out.readUnsignedShort());
         Assert.assertTrue("Unread data", out.readableBytes() == 0);
     }
         BufferHelper.checkHeaderV10(out, (byte) 16, 12);
         Assert.assertEquals("Wrong type", 3, out.readUnsignedShort());
         Assert.assertEquals("Wrong flags", 0, out.readUnsignedShort());
         Assert.assertTrue("Unread data", out.readableBytes() == 0);
     }

-    
+

     /**
      * Testing OF10StatsRequestInputFactory (Port) for correct serialization
      * @throws Exception
     /**
      * Testing OF10StatsRequestInputFactory (Port) for correct serialization
      * @throws Exception


@@ -259,10 +259,10 @@ public class OF10StatsRequestInputFactoryTest {
         caseBuilder.setMultipartRequestPortStats(portBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();
         caseBuilder.setMultipartRequestPortStats(portBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         multipartFactory.serialize(message, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         multipartFactory.serialize(message, out);

-        
+

         BufferHelper.checkHeaderV10(out, (byte) 16, 20);
         Assert.assertEquals("Wrong type", 4, out.readUnsignedShort());
         Assert.assertEquals("Wrong flags", 0, out.readUnsignedShort());
         BufferHelper.checkHeaderV10(out, (byte) 16, 20);
         Assert.assertEquals("Wrong type", 4, out.readUnsignedShort());
         Assert.assertEquals("Wrong flags", 0, out.readUnsignedShort());


@@ -288,10 +288,10 @@ public class OF10StatsRequestInputFactoryTest {
         caseBuilder.setMultipartRequestQueue(queueBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();
         caseBuilder.setMultipartRequestQueue(queueBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         multipartFactory.serialize(message, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         multipartFactory.serialize(message, out);

-        
+

         BufferHelper.checkHeaderV10(out, (byte) 16, 20);
         Assert.assertEquals("Wrong type", 5, out.readUnsignedShort());
         Assert.assertEquals("Wrong flags", 0, out.readUnsignedShort());
         BufferHelper.checkHeaderV10(out, (byte) 16, 20);
         Assert.assertEquals("Wrong type", 5, out.readUnsignedShort());
         Assert.assertEquals("Wrong flags", 0, out.readUnsignedShort());

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PacketOutInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PacketOutInputMessageFactoryTest.java
index 8cc92e2a7423fbf2f09ac1c1b11c658f6768956e..5da3a53d8ed62f84ff5be28b911851cbe27462d2 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PacketOutInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PacketOutInputMessageFactoryTest.java
@@ -59,7 +59,7 @@ public class PacketOutInputMessageFactoryTest {
 
     /**
      * Testing of {@link PacketOutInputMessageFactory} for correct translation from POJO
 
     /**
      * Testing of {@link PacketOutInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testPacketOutInputMessage() throws Exception {
      */
     @Test
     public void testPacketOutInputMessage() throws Exception {


@@ -80,10 +80,10 @@ public class PacketOutInputMessageFactoryTest {
         builder.setAction(actions);
         builder.setData(ByteBufUtils.hexStringToBytes("00 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14"));
         PacketOutInput message = builder.build();
         builder.setAction(actions);
         builder.setData(ByteBufUtils.hexStringToBytes("00 00 01 02 03 04 05 06 07 08 09 10 11 12 13 14"));
         PacketOutInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         packetOutFactory.serialize(message, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         packetOutFactory.serialize(message, out);

-        
+

         BufferHelper.checkHeaderV13(out, MESSAGE_TYPE, 56);
         Assert.assertEquals("Wrong BufferId", message.getBufferId().longValue(), out.readUnsignedInt());
         Assert.assertEquals("Wrong PortNumber", message.getInPort().getValue().longValue(), out.readUnsignedInt());
         BufferHelper.checkHeaderV13(out, MESSAGE_TYPE, 56);
         Assert.assertEquals("Wrong BufferId", message.getBufferId().longValue(), out.readUnsignedInt());
         Assert.assertEquals("Wrong PortNumber", message.getInPort().getValue().longValue(), out.readUnsignedInt());


@@ -101,7 +101,7 @@ public class PacketOutInputMessageFactoryTest {
 
     /**
      * Testing of {@link PacketOutInputMessageFactory} for correct translation from POJO
 
     /**
      * Testing of {@link PacketOutInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testPacketOutInputWithNoData() throws Exception {
      */
     @Test
     public void testPacketOutInputWithNoData() throws Exception {

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PortModInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PortModInputMessageFactoryTest.java
index ce2265352d48cfe79c1f8d53e267272a876e3a82..fd4f4ca8fc31e5245d0e9d8843f7e76ec5d5d322 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PortModInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/PortModInputMessageFactoryTest.java
@@ -53,7 +53,7 @@ public class PortModInputMessageFactoryTest {
 
     /**
      * Testing of {@link PortModInputMessageFactory} for correct translation from POJO
 
     /**
      * Testing of {@link PortModInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testPortModInput() throws Exception {
      */
     @Test
     public void testPortModInput() throws Exception {


@@ -64,14 +64,14 @@ public class PortModInputMessageFactoryTest {
         builder.setConfig(new PortConfig(true, false, true, false));
         builder.setMask(new PortConfig(false, true, false, true));
         builder.setAdvertise(new PortFeatures(true, false, false, false,
         builder.setConfig(new PortConfig(true, false, true, false));
         builder.setMask(new PortConfig(false, true, false, true));
         builder.setAdvertise(new PortFeatures(true, false, false, false,

-                                              false, false, false, true, 
-                                              false, false, false, false, 
+                                              false, false, false, true,
+                                              false, false, false, false,

                                               false, false, false, false));
         PortModInput message = builder.build();
                                               false, false, false, false));
         PortModInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         portModFactory.serialize(message, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         portModFactory.serialize(message, out);

-        
+

         BufferHelper.checkHeaderV13(out, MESSAGE_TYPE, MESSAGE_LENGTH);
         Assert.assertEquals("Wrong PortNo", message.getPortNo().getValue().longValue(), out.readUnsignedInt());
         out.skipBytes(PADDING_IN_PORT_MOD_MESSAGE_01);
         BufferHelper.checkHeaderV13(out, MESSAGE_TYPE, MESSAGE_LENGTH);
         Assert.assertEquals("Wrong PortNo", message.getPortNo().getValue().longValue(), out.readUnsignedInt());
         out.skipBytes(PADDING_IN_PORT_MOD_MESSAGE_01);


@@ -93,7 +93,7 @@ public class PortModInputMessageFactoryTest {
         final Boolean _noPacketIn = ((input) & (1<<6)) > 0;
         return new PortConfig(_noFwd, _noPacketIn, _noRecv, _portDown);
     }
         final Boolean _noPacketIn = ((input) & (1<<6)) > 0;
         return new PortConfig(_noFwd, _noPacketIn, _noRecv, _portDown);
     }

-    
+

     private static PortFeatures createPortFeatures(long input){
         final Boolean _10mbHd = ((input) & (1<<0)) > 0;
         final Boolean _10mbFd = ((input) & (1<<1)) > 0;
     private static PortFeatures createPortFeatures(long input){
         final Boolean _10mbHd = ((input) & (1<<0)) > 0;
         final Boolean _10mbFd = ((input) & (1<<1)) > 0;


@@ -111,8 +111,8 @@ public class PortModInputMessageFactoryTest {
         final Boolean _autoneg = ((input) & (1<<13)) > 0;
         final Boolean _pause = ((input) & (1<<14)) > 0;
         final Boolean _pauseAsym = ((input) & (1<<15)) > 0;
         final Boolean _autoneg = ((input) & (1<<13)) > 0;
         final Boolean _pause = ((input) & (1<<14)) > 0;
         final Boolean _pauseAsym = ((input) & (1<<15)) > 0;

-        return new PortFeatures(_100gbFd, _100mbFd,  _100mbHd, _10gbFd, _10mbFd, _10mbHd, 
+        return new PortFeatures(_100gbFd, _100mbFd,  _100mbHd, _10gbFd, _10mbFd, _10mbHd,

                 _1gbFd, _1gbHd, _1tbFd, _40gbFd, _autoneg, _copper, _fiber, _other, _pause, _pauseAsym);
     }
                 _1gbFd, _1gbHd, _1tbFd, _40gbFd, _autoneg, _copper, _fiber, _other, _pause, _pauseAsym);
     }

-    
+

 }
 }

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/RoleRequestInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/RoleRequestInputMessageFactoryTest.java
index a67b2a4858c4ba94d9bcfd5724e0172a18cff90a..5f21f65bc671b6ffe26b99e90fd4fe527475bcbd 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/RoleRequestInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/RoleRequestInputMessageFactoryTest.java
@@ -50,7 +50,7 @@ public class RoleRequestInputMessageFactoryTest {
 
     /**
      * Testing of {@link RoleRequestInputMessageFactory} for correct translation from POJO
 
     /**
      * Testing of {@link RoleRequestInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testRoleRequestInputMessage() throws Exception {
      */
     @Test
     public void testRoleRequestInputMessage() throws Exception {


@@ -60,10 +60,10 @@ public class RoleRequestInputMessageFactoryTest {
         byte[] generationId = new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01};
         builder.setGenerationId(new BigInteger(1, generationId));
         RoleRequestInput message = builder.build();
         byte[] generationId = new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01};
         builder.setGenerationId(new BigInteger(1, generationId));
         RoleRequestInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         roleFactory.serialize(message, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         roleFactory.serialize(message, out);

-        
+

         BufferHelper.checkHeaderV13(out, MESSAGE_TYPE, MESSAGE_LENGTH);
         Assert.assertEquals("Wrong role", message.getRole().getIntValue(), ControllerRole.forValue((int) out.readUnsignedInt()).getIntValue());
         out.skipBytes(PADDING_IN_ROLE_REQUEST_MESSAGE);
         BufferHelper.checkHeaderV13(out, MESSAGE_TYPE, MESSAGE_LENGTH);
         Assert.assertEquals("Wrong role", message.getRole().getIntValue(), ControllerRole.forValue((int) out.readUnsignedInt()).getIntValue());
         out.skipBytes(PADDING_IN_ROLE_REQUEST_MESSAGE);

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetAsyncInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetAsyncInputMessageFactoryTest.java
index c9ed91e34eec477abf50c48e0844dc3936d5dc5e..d31a117ad8079d9b8bd024cba0d443696ba72b05 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetAsyncInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetAsyncInputMessageFactoryTest.java
@@ -56,7 +56,7 @@ public class SetAsyncInputMessageFactoryTest {
     }
 
     /**
     }
 
     /**

-     * @throws Exception 
+     * @throws Exception

      * Testing of {@link SetAsyncInputMessageFactory} for correct translation from POJO
      */
     @Test
      * Testing of {@link SetAsyncInputMessageFactory} for correct translation from POJO
      */
     @Test


@@ -78,7 +78,7 @@ public class SetAsyncInputMessageFactoryTest {
         Assert.assertEquals("Wrong portStatusMask", 0, out.readUnsignedInt());
         Assert.assertEquals("Wrong flowRemovedMask", 15, out.readUnsignedInt());
         Assert.assertEquals("Wrong flowRemovedMask", 0, out.readUnsignedInt());
         Assert.assertEquals("Wrong portStatusMask", 0, out.readUnsignedInt());
         Assert.assertEquals("Wrong flowRemovedMask", 15, out.readUnsignedInt());
         Assert.assertEquals("Wrong flowRemovedMask", 0, out.readUnsignedInt());

-        
+

     }
 
     private static List<PacketInMask> createPacketInMask() {
     }
 
     private static List<PacketInMask> createPacketInMask() {


@@ -140,7 +140,7 @@ public class SetAsyncInputMessageFactoryTest {
     }
 
     /**
     }
 
     /**

-     * @throws Exception 
+     * @throws Exception

      * Testing of {@link SetAsyncInputMessageFactory} for correct translation from POJO
      */
     @Test
      * Testing of {@link SetAsyncInputMessageFactory} for correct translation from POJO
      */
     @Test

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetConfigMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetConfigMessageFactoryTest.java
index bd41db6ee10433015dceddbff8fcdcba8646e9f8..c188b593d4a5b0ceac5915653d2a5e59cd3f2312 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetConfigMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/SetConfigMessageFactoryTest.java
@@ -47,7 +47,7 @@ public class SetConfigMessageFactoryTest {
 
     /**
      * Testing of {@link SetConfigMessageFactory} for correct translation from POJO
 
     /**
      * Testing of {@link SetConfigMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testSetConfigMessageV13() throws Exception {
      */
     @Test
     public void testSetConfigMessageV13() throws Exception {


@@ -57,18 +57,18 @@ public class SetConfigMessageFactoryTest {
         builder.setFlags(flag);
         builder.setMissSendLen(10);
         SetConfigInput message = builder.build();
         builder.setFlags(flag);
         builder.setMissSendLen(10);
         SetConfigInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         setConfigFactory.serialize(message, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         setConfigFactory.serialize(message, out);

-        
+

         BufferHelper.checkHeaderV13(out, MESSAGE_TYPE, MESSAGE_LENGTH);
         Assert.assertEquals("Wrong flags", SwitchConfigFlag.FRAGNORMAL.getIntValue(), out.readUnsignedShort());
         Assert.assertEquals("Wrong missSendLen", 10, out.readUnsignedShort());
     }
         BufferHelper.checkHeaderV13(out, MESSAGE_TYPE, MESSAGE_LENGTH);
         Assert.assertEquals("Wrong flags", SwitchConfigFlag.FRAGNORMAL.getIntValue(), out.readUnsignedShort());
         Assert.assertEquals("Wrong missSendLen", 10, out.readUnsignedShort());
     }

-    
+

     /**
      * Testing of {@link SetConfigMessageFactory} for correct translation from POJO
     /**
      * Testing of {@link SetConfigMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testSetConfigMessageV10() throws Exception {
      */
     @Test
     public void testSetConfigMessageV10() throws Exception {


@@ -78,10 +78,10 @@ public class SetConfigMessageFactoryTest {
         builder.setFlags(flag);
         builder.setMissSendLen(85);
         SetConfigInput message = builder.build();
         builder.setFlags(flag);
         builder.setMissSendLen(85);
         SetConfigInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         setConfigFactory.serialize(message, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         setConfigFactory.serialize(message, out);

-        
+

         BufferHelper.checkHeaderV10(out, MESSAGE_TYPE, MESSAGE_LENGTH);
         Assert.assertEquals("Wrong flags", SwitchConfigFlag.OFPCFRAGDROP.getIntValue(), out.readUnsignedShort());
         Assert.assertEquals("Wrong missSendLen", 85, out.readUnsignedShort());
         BufferHelper.checkHeaderV10(out, MESSAGE_TYPE, MESSAGE_LENGTH);
         Assert.assertEquals("Wrong flags", SwitchConfigFlag.OFPCFRAGDROP.getIntValue(), out.readUnsignedShort());
         Assert.assertEquals("Wrong missSendLen", 85, out.readUnsignedShort());

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/TableModInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/TableModInputMessageFactoryTest.java
index d547f064285c8509c0899b7f26c89a7df456b02b..6423a3262328e45420053878fbd7a619d7f035ef 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/TableModInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/TableModInputMessageFactoryTest.java
@@ -47,7 +47,7 @@ public class TableModInputMessageFactoryTest {
 
     /**
      * Testing of {@link TableModInputMessageFactory} for correct translation from POJO
 
     /**
      * Testing of {@link TableModInputMessageFactory} for correct translation from POJO

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testTableModInput() throws Exception {
      */
     @Test
     public void testTableModInput() throws Exception {


@@ -56,14 +56,14 @@ public class TableModInputMessageFactoryTest {
         builder.setTableId(new TableId(9L));
         builder.setConfig(new TableConfig(true));
         TableModInput message = builder.build();
         builder.setTableId(new TableId(9L));
         builder.setConfig(new TableConfig(true));
         TableModInput message = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         tableModFactory.serialize(message, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         tableModFactory.serialize(message, out);

-        
+

         BufferHelper.checkHeaderV13(out, MESSAGE_TYPE, 16);
         Assert.assertEquals("Wrong TableID", message.getTableId().getValue().intValue(), out.readUnsignedByte());
         out.skipBytes(PADDING_IN_TABLE_MOD_MESSAGE);
         Assert.assertEquals("Wrong TableConfig", 8, out.readUnsignedInt());
     }
         BufferHelper.checkHeaderV13(out, MESSAGE_TYPE, 16);
         Assert.assertEquals("Wrong TableID", message.getTableId().getValue().intValue(), out.readUnsignedByte());
         out.skipBytes(PADDING_IN_TABLE_MOD_MESSAGE);
         Assert.assertEquals("Wrong TableConfig", 8, out.readUnsignedInt());
     }

-    
+

 }
 }

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupDescTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupDescTest.java
index b747e3e7abd9cafc27438051be225a981010b9c5..f5c8cad64e76d025cd7457faa30ec4205b49ddd5 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupDescTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupDescTest.java
@@ -50,7 +50,7 @@ public class MultipartRequestGroupDescTest {
 
     /**
      * Tests {@link MultipartRequestInputFactory} - GroupDesc case
 
     /**
      * Tests {@link MultipartRequestInputFactory} - GroupDesc case

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void test() throws Exception {
      */
     @Test
     public void test() throws Exception {

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupFeaturesTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupFeaturesTest.java
index ff0012e0c8b0c81f28474c85a380016155f5a8c1..630deca72155f1dac7db01b6c18184eae0cf4dd1 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupFeaturesTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupFeaturesTest.java
@@ -50,7 +50,7 @@ public class MultipartRequestGroupFeaturesTest {
 
     /**
      * Tests {@link MultipartRequestInputFactory} - GroupFeatures case
 
     /**
      * Tests {@link MultipartRequestInputFactory} - GroupFeatures case

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void test() throws Exception {
      */
     @Test
     public void test() throws Exception {

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestMeterFeaturesTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestMeterFeaturesTest.java
index 7f04ba49ef13bf4a75d1f8500c36633e841c2b7d..9106a580eaa56fec00fa22c4cb7f2c6fc89c8a2b 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestMeterFeaturesTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestMeterFeaturesTest.java
@@ -50,7 +50,7 @@ public class MultipartRequestMeterFeaturesTest {
 
     /**
      * Tests {@link MultipartRequestInputFactory} - MeterFeatures case
 
     /**
      * Tests {@link MultipartRequestInputFactory} - MeterFeatures case

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void test() throws Exception {
      */
     @Test
     public void test() throws Exception {

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestPortDescTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestPortDescTest.java
index fd8365d211990773c56565c8f7e4245476d3d5c2..be5b244a23773d7d0963335a9214a6fa35e2819f 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestPortDescTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestPortDescTest.java
@@ -50,7 +50,7 @@ public class MultipartRequestPortDescTest {
 
     /**
      * Tests {@link MultipartRequestInputFactory} - PortDesc case
 
     /**
      * Tests {@link MultipartRequestInputFactory} - PortDesc case

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void test() throws Exception {
      */
     @Test
     public void test() throws Exception {

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestTableTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestTableTest.java
index 724b55e5e65575d276a8998838d5a2961957b765..11383b9f012932eb25ac67af26ba41d71a995556 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestTableTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestTableTest.java
@@ -50,7 +50,7 @@ public class MultipartRequestTableTest {
 
     /**
      * Tests {@link MultipartRequestInputFactory} - Table case
 
     /**
      * Tests {@link MultipartRequestInputFactory} - Table case

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void test() throws Exception {
      */
     @Test
     public void test() throws Exception {

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/OF10StatsRequestAggregateTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/OF10StatsRequestAggregateTest.java
index 2831e6d5987721454eb6c1cb274550484e3e63de..711c0d4558d2643c81f70cb492f790d90ba7bc98 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/OF10StatsRequestAggregateTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/OF10StatsRequestAggregateTest.java
@@ -54,7 +54,7 @@ public class OF10StatsRequestAggregateTest {
 
     /**
      * Tests {@link OF10StatsRequestInputFactory} for correct serialization
 
     /**
      * Tests {@link OF10StatsRequestInputFactory} for correct serialization

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void test() throws Exception {
      */
     @Test
     public void test() throws Exception {

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpOpSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpOpSerializerTest.java
index 1f1c8bf88305363faec106f423c69637543ea8cb..ab564ee0e35b5af0727b1c7324c24851955f5515 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpOpSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpOpSerializerTest.java
@@ -36,7 +36,7 @@ public class OxmArpOpSerializerTest {
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareArpOpMatchEntry(1402);
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareArpOpMatchEntry(1402);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -51,7 +51,7 @@ public class OxmArpOpSerializerTest {
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareArpOpHeader(false);
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareArpOpHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpShaSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpShaSerializerTest.java
index b0dc9276a7dd2bce3c7afb37b2d660f7b7ac19cd..3cd8d886d7f84789440718b72e6770f5b5f7eb1f 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpShaSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpShaSerializerTest.java
@@ -40,7 +40,7 @@ public class OxmArpShaSerializerTest {
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, "00:01:02:03:04:05");
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, "00:01:02:03:04:05");

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -57,12 +57,12 @@ public class OxmArpShaSerializerTest {
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(true, "00:01:02:03:04:0A");
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(true, "00:01:02:03:04:0A");

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         checkHeader(buffer, true);
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         checkHeader(buffer, true);

-        
+

         byte[] address = new byte[6];
         buffer.readBytes(address);
         Assert.assertArrayEquals("Wrong address", new byte[]{0, 1, 2, 3, 4, 10}, address);
         byte[] address = new byte[6];
         buffer.readBytes(address);
         Assert.assertArrayEquals("Wrong address", new byte[]{0, 1, 2, 3, 4, 10}, address);


@@ -78,7 +78,7 @@ public class OxmArpShaSerializerTest {
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareHeader(false);
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 


@@ -92,7 +92,7 @@ public class OxmArpShaSerializerTest {
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareHeader(true);
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareHeader(true);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpSpaSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpSpaSerializerTest.java
index 83d6afe7b0c8ae3db9dfbc4509f7c6d8a0028aa8..8f60a449dcf6c728e49f1a4c21516083f32745d9 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpSpaSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpSpaSerializerTest.java
@@ -40,7 +40,7 @@ public class OxmArpSpaSerializerTest {
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, "10.0.0.1");
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, "10.0.0.1");

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -57,12 +57,12 @@ public class OxmArpSpaSerializerTest {
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(true, "120.121.122.0");
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(true, "120.121.122.0");

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         checkHeader(buffer, true);
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         checkHeader(buffer, true);

-        
+

         byte[] address = new byte[4];
         buffer.readBytes(address);
         Assert.assertArrayEquals("Wrong address", new byte[]{120, 121, 122, 0}, address);
         byte[] address = new byte[4];
         buffer.readBytes(address);
         Assert.assertArrayEquals("Wrong address", new byte[]{120, 121, 122, 0}, address);


@@ -78,7 +78,7 @@ public class OxmArpSpaSerializerTest {
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareHeader(false);
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 


@@ -92,7 +92,7 @@ public class OxmArpSpaSerializerTest {
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareHeader(true);
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareHeader(true);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpThaSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpThaSerializerTest.java
index cc0f5d4c4cbd39d485bd8aed4012fb1ba1908c0b..1bd15a7b2106886b7b76ca3fde03059dc97c1585 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpThaSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpThaSerializerTest.java
@@ -40,7 +40,7 @@ public class OxmArpThaSerializerTest {
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, "00:01:02:03:04:05");
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, "00:01:02:03:04:05");

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -57,12 +57,12 @@ public class OxmArpThaSerializerTest {
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(true, "00:01:02:03:04:0A");
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(true, "00:01:02:03:04:0A");

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         checkHeader(buffer, true);
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         checkHeader(buffer, true);

-        
+

         byte[] address = new byte[6];
         buffer.readBytes(address);
         Assert.assertArrayEquals("Wrong address", new byte[]{0, 1, 2, 3, 4, 10}, address);
         byte[] address = new byte[6];
         buffer.readBytes(address);
         Assert.assertArrayEquals("Wrong address", new byte[]{0, 1, 2, 3, 4, 10}, address);


@@ -78,7 +78,7 @@ public class OxmArpThaSerializerTest {
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareHeader(false);
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 


@@ -92,7 +92,7 @@ public class OxmArpThaSerializerTest {
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareHeader(true);
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareHeader(true);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpTpaSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpTpaSerializerTest.java
index 90b5139547d65f389f4991cb4ad57b7d6332ed76..5122e8229e176c88a573b59c1b20676f28ec9890 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpTpaSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmArpTpaSerializerTest.java
@@ -40,7 +40,7 @@ public class OxmArpTpaSerializerTest {
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, "10.0.0.1");
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, "10.0.0.1");

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -57,12 +57,12 @@ public class OxmArpTpaSerializerTest {
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(true, "120.121.122.0");
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(true, "120.121.122.0");

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         checkHeader(buffer, true);
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         checkHeader(buffer, true);

-        
+

         byte[] address = new byte[4];
         buffer.readBytes(address);
         Assert.assertArrayEquals("Wrong address", new byte[]{120, 121, 122, 0}, address);
         byte[] address = new byte[4];
         buffer.readBytes(address);
         Assert.assertArrayEquals("Wrong address", new byte[]{120, 121, 122, 0}, address);


@@ -78,7 +78,7 @@ public class OxmArpTpaSerializerTest {
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareHeader(false);
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 


@@ -92,7 +92,7 @@ public class OxmArpTpaSerializerTest {
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareHeader(true);
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareHeader(true);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthDstSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthDstSerializerTest.java
index 3a34fdde2059c2bf9c8b610d64e408e610e2973e..03116abd91a8bce49bba86321319f9294475f308 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthDstSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthDstSerializerTest.java
@@ -40,7 +40,7 @@ public class OxmEthDstSerializerTest {
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, "00:01:02:03:04:05");
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, "00:01:02:03:04:05");

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -57,12 +57,12 @@ public class OxmEthDstSerializerTest {
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(true, "00:01:02:03:04:0A");
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(true, "00:01:02:03:04:0A");

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         checkHeader(buffer, true);
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         checkHeader(buffer, true);

-        
+

         byte[] address = new byte[6];
         buffer.readBytes(address);
         Assert.assertArrayEquals("Wrong address", new byte[]{0, 1, 2, 3, 4, 10}, address);
         byte[] address = new byte[6];
         buffer.readBytes(address);
         Assert.assertArrayEquals("Wrong address", new byte[]{0, 1, 2, 3, 4, 10}, address);


@@ -78,7 +78,7 @@ public class OxmEthDstSerializerTest {
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareHeader(false);
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 


@@ -92,7 +92,7 @@ public class OxmEthDstSerializerTest {
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareHeader(true);
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareHeader(true);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthSrcSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthSrcSerializerTest.java
index 984899c1f229ab6f3e06e73b5908462c5d179456..6f143277609df2e8bba94d6a5da5e0dbc427c61d 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthSrcSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthSrcSerializerTest.java
@@ -40,7 +40,7 @@ public class OxmEthSrcSerializerTest {
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, "00:01:02:03:04:05");
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, "00:01:02:03:04:05");

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -57,12 +57,12 @@ public class OxmEthSrcSerializerTest {
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(true, "00:01:02:03:04:0A");
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(true, "00:01:02:03:04:0A");

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         checkHeader(buffer, true);
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         checkHeader(buffer, true);

-        
+

         byte[] address = new byte[6];
         buffer.readBytes(address);
         Assert.assertArrayEquals("Wrong address", new byte[]{0, 1, 2, 3, 4, 10}, address);
         byte[] address = new byte[6];
         buffer.readBytes(address);
         Assert.assertArrayEquals("Wrong address", new byte[]{0, 1, 2, 3, 4, 10}, address);


@@ -78,7 +78,7 @@ public class OxmEthSrcSerializerTest {
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareHeader(false);
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 


@@ -92,7 +92,7 @@ public class OxmEthSrcSerializerTest {
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareHeader(true);
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareHeader(true);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthTypeSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthTypeSerializerTest.java
index ae82abc926cf66dc7cb299879ba90a4a221b8ff0..7850358f24e75175c3133107f15b1dc2d7c0af25 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthTypeSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmEthTypeSerializerTest.java
@@ -37,7 +37,7 @@ public class OxmEthTypeSerializerTest {
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareEthTypeMatchEntry(65535);
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareEthTypeMatchEntry(65535);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -52,7 +52,7 @@ public class OxmEthTypeSerializerTest {
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareEthTypeHeader(false);
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareEthTypeHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 


@@ -84,7 +84,7 @@ public class OxmEthTypeSerializerTest {
         assertEquals("Wrong value length", EncodeConstants.SIZE_OF_SHORT_IN_BYTES, serializer.getValueLength());
     }
 
         assertEquals("Wrong value length", EncodeConstants.SIZE_OF_SHORT_IN_BYTES, serializer.getValueLength());
     }
 

-    
+

     private static MatchEntriesBuilder prepareEthTypeMatchEntry(int type) {
         MatchEntriesBuilder builder = prepareEthTypeHeader(false);
         EthTypeMatchEntryBuilder typeBuilder = new EthTypeMatchEntryBuilder();
     private static MatchEntriesBuilder prepareEthTypeMatchEntry(int type) {
         MatchEntriesBuilder builder = prepareEthTypeHeader(false);
         EthTypeMatchEntryBuilder typeBuilder = new EthTypeMatchEntryBuilder();

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv4CodeSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv4CodeSerializerTest.java
index ec559978f5b954cedc0756c8ef6a4f7813f31a68..8afa0c1cbbe42f2c7322babe32f1f77613f0a3e7 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv4CodeSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv4CodeSerializerTest.java
@@ -36,7 +36,7 @@ public class OxmIcmpv4CodeSerializerTest {
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareIcmpv4CodeMatchEntry((short) 200);
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareIcmpv4CodeMatchEntry((short) 200);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -51,7 +51,7 @@ public class OxmIcmpv4CodeSerializerTest {
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareIcmpv4CodeHeader(false);
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareIcmpv4CodeHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 


@@ -83,7 +83,7 @@ public class OxmIcmpv4CodeSerializerTest {
         assertEquals("Wrong value length", EncodeConstants.SIZE_OF_BYTE_IN_BYTES, serializer.getValueLength());
     }
 
         assertEquals("Wrong value length", EncodeConstants.SIZE_OF_BYTE_IN_BYTES, serializer.getValueLength());
     }
 

-    
+

     private static MatchEntriesBuilder prepareIcmpv4CodeMatchEntry(short value) {
         MatchEntriesBuilder builder = prepareIcmpv4CodeHeader(false);
         Icmpv4CodeMatchEntryBuilder icmpv4Builder = new Icmpv4CodeMatchEntryBuilder();
     private static MatchEntriesBuilder prepareIcmpv4CodeMatchEntry(short value) {
         MatchEntriesBuilder builder = prepareIcmpv4CodeHeader(false);
         Icmpv4CodeMatchEntryBuilder icmpv4Builder = new Icmpv4CodeMatchEntryBuilder();

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv4TypeSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv4TypeSerializerTest.java
index 1c0c08ba7ac7c46385804ede5f4243b73bdaf483..23df28c810af4046fc56b0f5dc212fcea5f2186a 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv4TypeSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv4TypeSerializerTest.java
@@ -36,7 +36,7 @@ public class OxmIcmpv4TypeSerializerTest {
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareIcmpv4TypeMatchEntry((short) 128);
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareIcmpv4TypeMatchEntry((short) 128);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -51,7 +51,7 @@ public class OxmIcmpv4TypeSerializerTest {
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareIcmpv4TypeHeader(false);
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareIcmpv4TypeHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 


@@ -83,7 +83,7 @@ public class OxmIcmpv4TypeSerializerTest {
         assertEquals("Wrong value length", EncodeConstants.SIZE_OF_BYTE_IN_BYTES, serializer.getValueLength());
     }
 
         assertEquals("Wrong value length", EncodeConstants.SIZE_OF_BYTE_IN_BYTES, serializer.getValueLength());
     }
 

-    
+

     private static MatchEntriesBuilder prepareIcmpv4TypeMatchEntry(short value) {
         MatchEntriesBuilder builder = prepareIcmpv4TypeHeader(false);
         Icmpv4TypeMatchEntryBuilder icmpv4Builder = new Icmpv4TypeMatchEntryBuilder();
     private static MatchEntriesBuilder prepareIcmpv4TypeMatchEntry(short value) {
         MatchEntriesBuilder builder = prepareIcmpv4TypeHeader(false);
         Icmpv4TypeMatchEntryBuilder icmpv4Builder = new Icmpv4TypeMatchEntryBuilder();

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv6CodeSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv6CodeSerializerTest.java
index f45254417333a6eaf7bf969e0b036586518aaaf5..410fa4aa9ef6948d92a6a3b66ee9dcb3a323378c 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv6CodeSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv6CodeSerializerTest.java
@@ -36,7 +36,7 @@ public class OxmIcmpv6CodeSerializerTest {
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareIcmpv6CodeMatchEntry((short) 101);
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareIcmpv6CodeMatchEntry((short) 101);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -51,7 +51,7 @@ public class OxmIcmpv6CodeSerializerTest {
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareIcmpv6CodeHeader(false);
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareIcmpv6CodeHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv6TypeSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv6TypeSerializerTest.java
index 1c4240ad3b206419ecfa6b92d123775717961802..c97a7d4261f56ee6d830ccc69979771abe04b7a9 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv6TypeSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIcmpv6TypeSerializerTest.java
@@ -36,7 +36,7 @@ public class OxmIcmpv6TypeSerializerTest {
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareIcmpv6TypeMatchEntry((short) 123);
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareIcmpv6TypeMatchEntry((short) 123);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -51,7 +51,7 @@ public class OxmIcmpv6TypeSerializerTest {
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareIcmpv6TypeHeader(false);
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareIcmpv6TypeHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 


@@ -83,7 +83,7 @@ public class OxmIcmpv6TypeSerializerTest {
         assertEquals("Wrong value length", EncodeConstants.SIZE_OF_BYTE_IN_BYTES, serializer.getValueLength());
     }
 
         assertEquals("Wrong value length", EncodeConstants.SIZE_OF_BYTE_IN_BYTES, serializer.getValueLength());
     }
 

-    
+

     private static MatchEntriesBuilder prepareIcmpv6TypeMatchEntry(short value) {
         MatchEntriesBuilder builder = prepareIcmpv6TypeHeader(false);
         Icmpv6TypeMatchEntryBuilder icmpv6Builder = new Icmpv6TypeMatchEntryBuilder();
     private static MatchEntriesBuilder prepareIcmpv6TypeMatchEntry(short value) {
         MatchEntriesBuilder builder = prepareIcmpv6TypeHeader(false);
         Icmpv6TypeMatchEntryBuilder icmpv6Builder = new Icmpv6TypeMatchEntryBuilder();

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpDscpSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpDscpSerializerTest.java
index 0373589c5bd49abba8a37a40f0f27bce33a4ed35..9fdd7dda2a2aaf776a2103b577267ce8c4556660 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpDscpSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpDscpSerializerTest.java
@@ -37,7 +37,7 @@ public class OxmIpDscpSerializerTest {
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareIpDscpMatchEntry((short) 58);
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareIpDscpMatchEntry((short) 58);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -52,7 +52,7 @@ public class OxmIpDscpSerializerTest {
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareIpDscpHeader(false);
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareIpDscpHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpProtoSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpProtoSerializerTest.java
index 2672e8070efe1ad216d858389a755beb77615aeb..21e2deafa0f576ac735a724c36494a5b33de33de 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpProtoSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpProtoSerializerTest.java
@@ -36,7 +36,7 @@ public class OxmIpProtoSerializerTest {
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMatchEntry((short) 123);
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMatchEntry((short) 123);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -51,7 +51,7 @@ public class OxmIpProtoSerializerTest {
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareHeader(false);
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv4DstSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv4DstSerializerTest.java
index 69499578c286f3465896d8321b5e36597df83f09..7cb8db66b9421b0201263e28bb17b8a451864e0f 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv4DstSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv4DstSerializerTest.java
@@ -40,7 +40,7 @@ public class OxmIpv4DstSerializerTest {
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, "10.0.0.1");
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, "10.0.0.1");

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -57,12 +57,12 @@ public class OxmIpv4DstSerializerTest {
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(true, "120.121.122.0");
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(true, "120.121.122.0");

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         checkHeader(buffer, true);
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         checkHeader(buffer, true);

-        
+

         byte[] address = new byte[4];
         buffer.readBytes(address);
         Assert.assertArrayEquals("Wrong address", new byte[]{120, 121, 122, 0}, address);
         byte[] address = new byte[4];
         buffer.readBytes(address);
         Assert.assertArrayEquals("Wrong address", new byte[]{120, 121, 122, 0}, address);


@@ -78,7 +78,7 @@ public class OxmIpv4DstSerializerTest {
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareHeader(false);
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 


@@ -92,7 +92,7 @@ public class OxmIpv4DstSerializerTest {
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareHeader(true);
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareHeader(true);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv4SrcSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv4SrcSerializerTest.java
index 69866caa3a264e675ce6b2f7bc97129224459df7..6ea93c2a2f9865fee9cdc9c6b1c4af9372e74727 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv4SrcSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv4SrcSerializerTest.java
@@ -40,7 +40,7 @@ public class OxmIpv4SrcSerializerTest {
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, "10.0.0.1");
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, "10.0.0.1");

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -57,12 +57,12 @@ public class OxmIpv4SrcSerializerTest {
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(true, "120.121.122.0");
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(true, "120.121.122.0");

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         checkHeader(buffer, true);
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         checkHeader(buffer, true);

-        
+

         byte[] address = new byte[4];
         buffer.readBytes(address);
         Assert.assertArrayEquals("Wrong address", new byte[]{120, 121, 122, 0}, address);
         byte[] address = new byte[4];
         buffer.readBytes(address);
         Assert.assertArrayEquals("Wrong address", new byte[]{120, 121, 122, 0}, address);


@@ -78,7 +78,7 @@ public class OxmIpv4SrcSerializerTest {
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareHeader(false);
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 


@@ -92,7 +92,7 @@ public class OxmIpv4SrcSerializerTest {
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareHeader(true);
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareHeader(true);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6ExtHdrSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6ExtHdrSerializerTest.java
index 0924f100062a7ba6c5252c40a8902c09133f606b..eb8d3644509acf14fc6dd7b89135db0b61c67fb0 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6ExtHdrSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6ExtHdrSerializerTest.java
@@ -41,7 +41,7 @@ public class OxmIpv6ExtHdrSerializerTest {
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareIpv6ExtHdrMatchEntry(false,
                 new Ipv6ExthdrFlags(true, false, true, false, true, false, true, false, true));
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareIpv6ExtHdrMatchEntry(false,
                 new Ipv6ExthdrFlags(true, false, true, false, true, false, true, false, true));

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -57,7 +57,7 @@ public class OxmIpv6ExtHdrSerializerTest {
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareIpv6ExtHdrMatchEntry(true,
                 new Ipv6ExthdrFlags(false, true, false, true, false, true, false, true, false));
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareIpv6ExtHdrMatchEntry(true,
                 new Ipv6ExthdrFlags(false, true, false, true, false, true, false, true, false));

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -75,7 +75,7 @@ public class OxmIpv6ExtHdrSerializerTest {
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareIpv6ExtHdrHeader(false);
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareIpv6ExtHdrHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 


@@ -89,7 +89,7 @@ public class OxmIpv6ExtHdrSerializerTest {
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareIpv6ExtHdrHeader(true);
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareIpv6ExtHdrHeader(true);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 


@@ -121,7 +121,7 @@ public class OxmIpv6ExtHdrSerializerTest {
         assertEquals("Wrong value length", EncodeConstants.SIZE_OF_SHORT_IN_BYTES, serializer.getValueLength());
     }
 
         assertEquals("Wrong value length", EncodeConstants.SIZE_OF_SHORT_IN_BYTES, serializer.getValueLength());
     }
 

-    
+

     private static MatchEntriesBuilder prepareIpv6ExtHdrMatchEntry(boolean hasMask, Ipv6ExthdrFlags flags) {
         MatchEntriesBuilder builder = prepareIpv6ExtHdrHeader(hasMask);
         if (hasMask) {
     private static MatchEntriesBuilder prepareIpv6ExtHdrMatchEntry(boolean hasMask, Ipv6ExthdrFlags flags) {
         MatchEntriesBuilder builder = prepareIpv6ExtHdrHeader(hasMask);
         if (hasMask) {

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6NdSllSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6NdSllSerializerTest.java
index 52df5db11f89eac82b480c54327a8e361b595ab5..3e9dce5d952279c4dca3be0554c4186c79701dc9 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6NdSllSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6NdSllSerializerTest.java
@@ -40,7 +40,7 @@ public class OxmIpv6NdSllSerializerTest {
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, "00:01:02:03:04:05");
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, "00:01:02:03:04:05");

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -57,7 +57,7 @@ public class OxmIpv6NdSllSerializerTest {
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareHeader(false);
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6NdTllSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6NdTllSerializerTest.java
index 6c6e8d311daf47f3fe3265d4107451d5f9eed054..29585d9bbdf983d47abc4fdb7ef7e56f9b66a5d5 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6NdTllSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmIpv6NdTllSerializerTest.java
@@ -40,7 +40,7 @@ public class OxmIpv6NdTllSerializerTest {
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, "00:01:02:03:04:05");
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, "00:01:02:03:04:05");

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -57,7 +57,7 @@ public class OxmIpv6NdTllSerializerTest {
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareHeader(false);
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMetadataSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMetadataSerializerTest.java
index fbe202dc721d4559dedc585110f869c21bb51408..b790e1335b5b4e1f085b6ba5aabd9f2a92d2f250 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMetadataSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMetadataSerializerTest.java
@@ -39,7 +39,7 @@ public class OxmMetadataSerializerTest {
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, new byte[]{0, 1, 2, 3, 4, 5, 6, 7});
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, new byte[]{0, 1, 2, 3, 4, 5, 6, 7});

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -56,12 +56,12 @@ public class OxmMetadataSerializerTest {
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(true, new byte[]{8, 9, 10, 11, 12, 13, 14, 15});
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(true, new byte[]{8, 9, 10, 11, 12, 13, 14, 15});

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         checkHeader(buffer, true);
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         checkHeader(buffer, true);

-        
+

         byte[] address = new byte[8];
         buffer.readBytes(address);
         Assert.assertArrayEquals("Wrong address", new byte[]{8, 9, 10, 11, 12, 13, 14, 15}, address);
         byte[] address = new byte[8];
         buffer.readBytes(address);
         Assert.assertArrayEquals("Wrong address", new byte[]{8, 9, 10, 11, 12, 13, 14, 15}, address);


@@ -77,7 +77,7 @@ public class OxmMetadataSerializerTest {
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareHeader(false);
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 


@@ -91,7 +91,7 @@ public class OxmMetadataSerializerTest {
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareHeader(true);
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareHeader(true);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsBosSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsBosSerializerTest.java
index 6c22ec4ae5a57789f4bbea9f5e8b3c2862bab974..0bc77dbc8e29b5a870be863e08e6521e6884d7f7 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsBosSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsBosSerializerTest.java
@@ -36,7 +36,7 @@ public class OxmMplsBosSerializerTest {
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMplsBosMatchEntry(true);
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMplsBosMatchEntry(true);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -51,7 +51,7 @@ public class OxmMplsBosSerializerTest {
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareMplsBosHeader(false);
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareMplsBosHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 


@@ -83,7 +83,7 @@ public class OxmMplsBosSerializerTest {
         assertEquals("Wrong value length", EncodeConstants.SIZE_OF_BYTE_IN_BYTES, serializer.getValueLength());
     }
 
         assertEquals("Wrong value length", EncodeConstants.SIZE_OF_BYTE_IN_BYTES, serializer.getValueLength());
     }
 

-    
+

     private static MatchEntriesBuilder prepareMplsBosMatchEntry(boolean bos) {
         MatchEntriesBuilder builder = prepareMplsBosHeader(false);
         BosMatchEntryBuilder bosBuilder = new BosMatchEntryBuilder();
     private static MatchEntriesBuilder prepareMplsBosMatchEntry(boolean bos) {
         MatchEntriesBuilder builder = prepareMplsBosHeader(false);
         BosMatchEntryBuilder bosBuilder = new BosMatchEntryBuilder();

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsLabelSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsLabelSerializerTest.java
index c20890b93820fc937c5897afaf5db13d66b3b8ed..742001f73078c4e6ee491a16fa8be90eb830d6d6 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsLabelSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsLabelSerializerTest.java
@@ -36,7 +36,7 @@ public class OxmMplsLabelSerializerTest {
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMplsLabelMatchEntry(168535);
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMplsLabelMatchEntry(168535);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -51,7 +51,7 @@ public class OxmMplsLabelSerializerTest {
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareMplsLabelHeader(false);
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareMplsLabelHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsTcSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsTcSerializerTest.java
index d851b755866566a4e990ec39881c40dbf1b7ed65..737eba0af46a757eb25d9d6a538ebcd7b8dcc688 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsTcSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmMplsTcSerializerTest.java
@@ -36,7 +36,7 @@ public class OxmMplsTcSerializerTest {
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMplsTcMatchEntry((short) 16);
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMplsTcMatchEntry((short) 16);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -51,7 +51,7 @@ public class OxmMplsTcSerializerTest {
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareMplsTcHeader(false);
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareMplsTcHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmPbbIsidSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmPbbIsidSerializerTest.java
index f2cbf8976fe35054be196556d0719b634d29b5c1..02742e880d9989a4655798e72ebf4cfefe7c5622 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmPbbIsidSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmPbbIsidSerializerTest.java
@@ -39,7 +39,7 @@ public class OxmPbbIsidSerializerTest {
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = preparePbbIsidMatchEntry(false, 12345);
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = preparePbbIsidMatchEntry(false, 12345);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -54,7 +54,7 @@ public class OxmPbbIsidSerializerTest {
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = preparePbbIsidMatchEntry(true, 6789);
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = preparePbbIsidMatchEntry(true, 6789);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -72,7 +72,7 @@ public class OxmPbbIsidSerializerTest {
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = preparePbbIsidHeader(false);
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = preparePbbIsidHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 


@@ -86,7 +86,7 @@ public class OxmPbbIsidSerializerTest {
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = preparePbbIsidHeader(true);
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = preparePbbIsidHeader(true);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 


@@ -118,7 +118,7 @@ public class OxmPbbIsidSerializerTest {
         assertEquals("Wrong value length", EncodeConstants.SIZE_OF_3_BYTES, serializer.getValueLength());
     }
 
         assertEquals("Wrong value length", EncodeConstants.SIZE_OF_3_BYTES, serializer.getValueLength());
     }
 

-    
+

     private static MatchEntriesBuilder preparePbbIsidMatchEntry(boolean hasMask, long value) {
         MatchEntriesBuilder builder = preparePbbIsidHeader(hasMask);
         if (hasMask) {
     private static MatchEntriesBuilder preparePbbIsidMatchEntry(boolean hasMask, long value) {
         MatchEntriesBuilder builder = preparePbbIsidHeader(hasMask);
         if (hasMask) {

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmSctpDstSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmSctpDstSerializerTest.java
index e56c5c0d849b5ac8350a0d83406f50d41a0bc918..9bf4e07bc31850dbe5143bd9a484e448c4028319 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmSctpDstSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmSctpDstSerializerTest.java
@@ -37,7 +37,7 @@ public class OxmSctpDstSerializerTest {
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMatchEntry(4096);
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMatchEntry(4096);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -52,7 +52,7 @@ public class OxmSctpDstSerializerTest {
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareHeader(false);
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmSctpSrcSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmSctpSrcSerializerTest.java
index 6c3890c46a5890a8838e325fd507f0321061f904..91d3099f6d740b6bed3f9b2697321585f50cdbdb 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmSctpSrcSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmSctpSrcSerializerTest.java
@@ -37,7 +37,7 @@ public class OxmSctpSrcSerializerTest {
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMatchEntry(4096);
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMatchEntry(4096);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -52,7 +52,7 @@ public class OxmSctpSrcSerializerTest {
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareHeader(false);
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTcpDstSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTcpDstSerializerTest.java
index b912aed3d2d1b95e6a1513a373b0e3092ec0f35b..431725ae7e1b3f127f9913333a2d37ca05f78c31 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTcpDstSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTcpDstSerializerTest.java
@@ -37,7 +37,7 @@ public class OxmTcpDstSerializerTest {
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMatchEntry(4096);
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMatchEntry(4096);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -52,7 +52,7 @@ public class OxmTcpDstSerializerTest {
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareHeader(false);
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTcpSrcSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTcpSrcSerializerTest.java
index c156b2f5106f1adf85bb1fdd058e274146e5b251..3cdd17e36ac1d63b9c9c39f8ca0956c651ee83f8 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTcpSrcSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTcpSrcSerializerTest.java
@@ -37,7 +37,7 @@ public class OxmTcpSrcSerializerTest {
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMatchEntry(512);
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMatchEntry(512);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -52,7 +52,7 @@ public class OxmTcpSrcSerializerTest {
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareHeader(false);
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTunnelIdSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTunnelIdSerializerTest.java
index 35f2986e84d8dcb3d31a83638720fe2232134e5d..73cc676abf391b014f0cd6e7c53df9fcba083721 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTunnelIdSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmTunnelIdSerializerTest.java
@@ -39,7 +39,7 @@ public class OxmTunnelIdSerializerTest {
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, new byte[]{0, 1, 2, 3, 4, 5, 6, 7});
     @Test
     public void testSerializeWithoutMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(false, new byte[]{0, 1, 2, 3, 4, 5, 6, 7});

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -56,12 +56,12 @@ public class OxmTunnelIdSerializerTest {
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(true, new byte[]{8, 9, 10, 11, 12, 13, 14, 15});
     @Test
     public void testSerializeWithMask() {
         MatchEntriesBuilder builder = prepareMatchEntry(true, new byte[]{8, 9, 10, 11, 12, 13, 14, 15});

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         checkHeader(buffer, true);
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         checkHeader(buffer, true);

-        
+

         byte[] address = new byte[8];
         buffer.readBytes(address);
         Assert.assertArrayEquals("Wrong address", new byte[]{8, 9, 10, 11, 12, 13, 14, 15}, address);
         byte[] address = new byte[8];
         buffer.readBytes(address);
         Assert.assertArrayEquals("Wrong address", new byte[]{8, 9, 10, 11, 12, 13, 14, 15}, address);


@@ -77,7 +77,7 @@ public class OxmTunnelIdSerializerTest {
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareHeader(false);
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 


@@ -91,7 +91,7 @@ public class OxmTunnelIdSerializerTest {
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareHeader(true);
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareHeader(true);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmUdpDstSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmUdpDstSerializerTest.java
index 1cafb4919d5a17c644a0b705282534ba97cabca9..35318d8fb0ee0e3ee4c2709326573c25e156061e 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmUdpDstSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmUdpDstSerializerTest.java
@@ -37,7 +37,7 @@ public class OxmUdpDstSerializerTest {
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMatchEntry(2048);
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMatchEntry(2048);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -52,7 +52,7 @@ public class OxmUdpDstSerializerTest {
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareHeader(false);
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmUdpSrcSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmUdpSrcSerializerTest.java
index d4989830efa84727faf86aef9f1fb29a70966dfc..7cb4d0abeebc27d27f9b6af8d1997b21c07240fa 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmUdpSrcSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmUdpSrcSerializerTest.java
@@ -37,7 +37,7 @@ public class OxmUdpSrcSerializerTest {
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMatchEntry(1024);
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareMatchEntry(1024);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -52,7 +52,7 @@ public class OxmUdpSrcSerializerTest {
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareHeader(false);
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmVlanPcpSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmVlanPcpSerializerTest.java
index ba08ad08ee2147fd1e44b31dcdc31807a88b1785..b96e0d7694796abd4e9429f02485a7401dc5c338 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmVlanPcpSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmVlanPcpSerializerTest.java
@@ -36,7 +36,7 @@ public class OxmVlanPcpSerializerTest {
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareVlanPcpMatchEntry((short) 42);
     @Test
     public void testSerialize() {
         MatchEntriesBuilder builder = prepareVlanPcpMatchEntry((short) 42);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -51,7 +51,7 @@ public class OxmVlanPcpSerializerTest {
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareVlanPcpHeader(false);
     @Test
     public void testSerializeHeader() {
         MatchEntriesBuilder builder = prepareVlanPcpHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmVlanVidSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmVlanVidSerializerTest.java
index f0ae6dea9a3982ac8541096aed1c43a2f7bcd82c..a22e6c812fa2cc5f77eb983b3cc79a27551dca33 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmVlanVidSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/OxmVlanVidSerializerTest.java
@@ -39,7 +39,7 @@ public class OxmVlanVidSerializerTest {
     @Test
     public void testSerializeWithCfiBitSet() {
         MatchEntriesBuilder builder = prepareVlanVidMatchEntry(false, true);
     @Test
     public void testSerializeWithCfiBitSet() {
         MatchEntriesBuilder builder = prepareVlanVidMatchEntry(false, true);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -54,7 +54,7 @@ public class OxmVlanVidSerializerTest {
     @Test
     public void testSerializeWithoutCfiBitSet() {
         MatchEntriesBuilder builder = prepareVlanVidMatchEntry(true, false);
     @Test
     public void testSerializeWithoutCfiBitSet() {
         MatchEntriesBuilder builder = prepareVlanVidMatchEntry(true, false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serialize(builder.build(), buffer);
 


@@ -72,7 +72,7 @@ public class OxmVlanVidSerializerTest {
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareVlanVidHeader(false);
     @Test
     public void testSerializeHeaderWithoutMask() {
         MatchEntriesBuilder builder = prepareVlanVidHeader(false);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 


@@ -86,7 +86,7 @@ public class OxmVlanVidSerializerTest {
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareVlanVidHeader(true);
     @Test
     public void testSerializeHeaderWithMask() {
         MatchEntriesBuilder builder = prepareVlanVidHeader(true);

-        
+

         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 
         ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         serializer.serializeHeader(builder.build(), buffer);
 

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/ActionsDeserializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/ActionsDeserializerTest.java
index d7d29d842fcd675424f67d48fe445993b437af45..e9f98b7c932ec23b4f775cef8f728d5f150c7351 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/ActionsDeserializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/ActionsDeserializerTest.java
@@ -72,10 +72,10 @@ public class ActionsDeserializerTest {
                 + "00 19 00 10 80 00 02 04 00 00 00 0B 00 00 00 00 "
                 + "00 1A 00 08 00 0A 00 00 "
                 + "00 1B 00 08 00 00 00 00");
                 + "00 19 00 10 80 00 02 04 00 00 00 0B 00 00 00 00 "
                 + "00 1A 00 08 00 0A 00 00 "
                 + "00 1B 00 08 00 00 00 00");

-        
+

         message.skipBytes(4); // skip XID
         LOGGER.info("bytes: " + message.readableBytes());
         message.skipBytes(4); // skip XID
         LOGGER.info("bytes: " + message.readableBytes());

-        
+

         CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF13_VERSION_ID);
         List<Action> actions = ListDeserializer.deserializeList(EncodeConstants.OF13_VERSION_ID,
                 message.readableBytes(), message, keyMaker, registry);
         CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF13_VERSION_ID);
         List<Action> actions = ListDeserializer.deserializeList(EncodeConstants.OF13_VERSION_ID,
                 message.readableBytes(), message, keyMaker, registry);


@@ -132,7 +132,7 @@ public class ActionsDeserializerTest {
         Assert.assertEquals("Wrong match entry field", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow."
                 + "oxm.rev130731.InPhyPort", entries.get(0).getOxmMatchField().getName());
         Assert.assertEquals("Wrong match entry mask", false, entries.get(0).isHasMask());
         Assert.assertEquals("Wrong match entry field", "org.opendaylight.yang.gen.v1.urn.opendaylight.openflow."
                 + "oxm.rev130731.InPhyPort", entries.get(0).getOxmMatchField().getName());
         Assert.assertEquals("Wrong match entry mask", false, entries.get(0).isHasMask());

-        Assert.assertEquals("Wrong match entry value", 11, 
+        Assert.assertEquals("Wrong match entry value", 11,

                 entries.get(0).getAugmentation(PortNumberMatchEntry.class).getPortNumber().getValue().intValue());
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight."
                 + "openflow.common.action.rev130731.PushPbb", actions.get(14).getType().getName());
                 entries.get(0).getAugmentation(PortNumberMatchEntry.class).getPortNumber().getValue().intValue());
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight."
                 + "openflow.common.action.rev130731.PushPbb", actions.get(14).getType().getName());

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/BufferHelper.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/BufferHelper.java
index 6a85763919e913a4fef9151ece0606b775ec2ab7..dcdbec18f86051706a456de058bd3373d9fde549 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/BufferHelper.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/BufferHelper.java
@@ -23,12 +23,12 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 
 /**
  * @author michal.polkorab
 
 /**
  * @author michal.polkorab

- * 
+ *

  */
 public abstract class BufferHelper {
 
     /**
  */
 public abstract class BufferHelper {
 
     /**

-     * 
+     *

      */
     public static final Long DEFAULT_XID = 0x01020304L;
     private static final byte[] XID = new byte[] { 0x01, 0x02, 0x03, 0x04 };
      */
     public static final Long DEFAULT_XID = 0x01020304L;
     private static final byte[] XID = new byte[] { 0x01, 0x02, 0x03, 0x04 };


@@ -44,7 +44,7 @@ public abstract class BufferHelper {
         bb.writeBytes(payload);
         return bb;
     }
         bb.writeBytes(payload);
         return bb;
     }

-    
+

     /**
      * @param payload String in hex format
      * @return ByteBuf filled with OpenFlow protocol message without first 4
     /**
      * @param payload String in hex format
      * @return ByteBuf filled with OpenFlow protocol message without first 4


@@ -53,7 +53,7 @@ public abstract class BufferHelper {
     public static ByteBuf buildBuffer(String payload) {
         return buildBuffer(ByteBufUtils.hexStringToBytes(payload));
     }
     public static ByteBuf buildBuffer(String payload) {
         return buildBuffer(ByteBufUtils.hexStringToBytes(payload));
     }

-    
+

     /**
      * @return ByteBuf filled with OpenFlow protocol header message without first 4
      *         bytes
     /**
      * @return ByteBuf filled with OpenFlow protocol header message without first 4
      *         bytes


@@ -74,7 +74,7 @@ public abstract class BufferHelper {
     public static void checkHeaderV13(ByteBuf input, byte msgType, int length) {
         checkHeader(input, msgType, length, (short) EncodeConstants.OF13_VERSION_ID);
     }
     public static void checkHeaderV13(ByteBuf input, byte msgType, int length) {
         checkHeader(input, msgType, length, (short) EncodeConstants.OF13_VERSION_ID);
     }

-    
+

     /**
      * Use version 1.0 for encoded message
      * @param input ByteBuf to be checked for correct OpenFlow Protocol header
     /**
      * Use version 1.0 for encoded message
      * @param input ByteBuf to be checked for correct OpenFlow Protocol header


@@ -84,14 +84,14 @@ public abstract class BufferHelper {
     public static void checkHeaderV10(ByteBuf input, byte msgType, int length) {
         checkHeader(input, msgType, length, (short) EncodeConstants.OF10_VERSION_ID);
     }
     public static void checkHeaderV10(ByteBuf input, byte msgType, int length) {
         checkHeader(input, msgType, length, (short) EncodeConstants.OF10_VERSION_ID);
     }

-    
+

     private static void checkHeader(ByteBuf input, byte msgType, int length, Short version) {
         Assert.assertEquals("Wrong version", version, Short.valueOf(input.readByte()));
         Assert.assertEquals("Wrong type", msgType, input.readByte());
         Assert.assertEquals("Wrong length", length, input.readUnsignedShort());
         Assert.assertEquals("Wrong Xid", DEFAULT_XID, Long.valueOf(input.readUnsignedInt()));
     }
     private static void checkHeader(ByteBuf input, byte msgType, int length, Short version) {
         Assert.assertEquals("Wrong version", version, Short.valueOf(input.readByte()));
         Assert.assertEquals("Wrong type", msgType, input.readByte());
         Assert.assertEquals("Wrong length", length, input.readUnsignedShort());
         Assert.assertEquals("Wrong Xid", DEFAULT_XID, Long.valueOf(input.readUnsignedInt()));
     }

-    
+

 
     /**
      * @param ofHeader OpenFlow protocol header
 
     /**
      * @param ofHeader OpenFlow protocol header


@@ -99,19 +99,19 @@ public abstract class BufferHelper {
     public static void checkHeaderV13(OfHeader ofHeader) {
         checkHeader(ofHeader, (short) EncodeConstants.OF13_VERSION_ID);
     }
     public static void checkHeaderV13(OfHeader ofHeader) {
         checkHeader(ofHeader, (short) EncodeConstants.OF13_VERSION_ID);
     }

-    
+

     /**
      * @param ofHeader OpenFlow protocol header
      */
     public static void checkHeaderV10(OfHeader ofHeader) {
         checkHeader(ofHeader, (short) EncodeConstants.OF10_VERSION_ID);
     }
     /**
      * @param ofHeader OpenFlow protocol header
      */
     public static void checkHeaderV10(OfHeader ofHeader) {
         checkHeader(ofHeader, (short) EncodeConstants.OF10_VERSION_ID);
     }

-    
+

     private static void checkHeader(OfHeader ofHeader, Short version) {
         Assert.assertEquals("Wrong version", version, ofHeader.getVersion());
         Assert.assertEquals("Wrong Xid", DEFAULT_XID, ofHeader.getXid());
     }
     private static void checkHeader(OfHeader ofHeader, Short version) {
         Assert.assertEquals("Wrong version", version, ofHeader.getVersion());
         Assert.assertEquals("Wrong Xid", DEFAULT_XID, ofHeader.getXid());
     }

-    
+

     /**
      * @param builder
      * @param version wire protocol number used
     /**
      * @param builder
      * @param version wire protocol number used

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionsDeserializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionsDeserializerTest.java
index adb6941ee89c9ae389d26607c8c4927c22634635..39452dccbebd7158c5dd5ee67d9b51cfe5269ac2 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionsDeserializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/InstructionsDeserializerTest.java
@@ -57,9 +57,9 @@ public class InstructionsDeserializerTest {
                 + "00 00 00 00 00 00 00 20 00 00 00 00 00 00 00 30 00 05 00 08 00 00 00 00 00 06 00 08 "
                 + "00 01 02 03 00 03 00 20 00 00 00 00 00 00 00 10 00 00 00 25 00 35 00 00 00 00 00 00 "
                 + "00 16 00 08 00 00 00 50 00 04 00 18 00 00 00 00 00 15 00 08 00 00 00 25 00 0F 00 08 05 00 00 00");
                 + "00 00 00 00 00 00 00 20 00 00 00 00 00 00 00 30 00 05 00 08 00 00 00 00 00 06 00 08 "
                 + "00 01 02 03 00 03 00 20 00 00 00 00 00 00 00 10 00 00 00 25 00 35 00 00 00 00 00 00 "
                 + "00 16 00 08 00 00 00 50 00 04 00 18 00 00 00 00 00 15 00 08 00 00 00 25 00 0F 00 08 05 00 00 00");

-        
+

         message.skipBytes(4); // skip XID
         message.skipBytes(4); // skip XID

-        
+

         CodeKeyMaker keyMaker = CodeKeyMakerFactory.createInstructionsKeyMaker(EncodeConstants.OF13_VERSION_ID);
         List<Instruction> instructions = ListDeserializer.deserializeList(EncodeConstants.OF13_VERSION_ID,
                 message.readableBytes(), message, keyMaker, registry);
         CodeKeyMaker keyMaker = CodeKeyMakerFactory.createInstructionsKeyMaker(EncodeConstants.OF13_VERSION_ID);
         List<Instruction> instructions = ListDeserializer.deserializeList(EncodeConstants.OF13_VERSION_ID,
                 message.readableBytes(), message, keyMaker, registry);

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/MatchDeserializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/MatchDeserializerTest.java
index a3ad2abbdbfa02d807c65fa91f58260e7a1b87db..e325baffec87cc2cc00c2da60f0fae67f2dd0e49 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/MatchDeserializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/MatchDeserializerTest.java
@@ -132,14 +132,14 @@ public class MatchDeserializerTest {
         Assert.assertEquals("Wrong Ipv4 address format", new Ipv4Address("0.1.2.3"),
                 entry.getAugmentation(Ipv4AddressMatchEntry.class).getIpv4Address());
     }
         Assert.assertEquals("Wrong Ipv4 address format", new Ipv4Address("0.1.2.3"),
                 entry.getAugmentation(Ipv4AddressMatchEntry.class).getIpv4Address());
     }

-    
+

     /**
      * Testing Ipv6 address deserialization
      */
     @Test
     public void testIpv6Address() {
         ByteBuf buffer = ByteBufUtils.hexStringToByteBuf("80 00 34 10 00 00 00 01 00 02 00 03 00 04 00 05 00 06 0F 07");
     /**
      * Testing Ipv6 address deserialization
      */
     @Test
     public void testIpv6Address() {
         ByteBuf buffer = ByteBufUtils.hexStringToByteBuf("80 00 34 10 00 00 00 01 00 02 00 03 00 04 00 05 00 06 0F 07");

-        
+

         MatchEntryDeserializerKey key = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID,
                 0x8000, 26);
         key.setExperimenterId(null);
         MatchEntryDeserializerKey key = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID,
                 0x8000, 26);
         key.setExperimenterId(null);


@@ -148,7 +148,7 @@ public class MatchDeserializerTest {
         Assert.assertEquals("Wrong Ipv6 address format", new Ipv6Address("0000:0001:0002:0003:0004:0005:0006:0F07"),
                 entry.getAugmentation(Ipv6AddressMatchEntry.class).getIpv6Address());
     }
         Assert.assertEquals("Wrong Ipv6 address format", new Ipv6Address("0000:0001:0002:0003:0004:0005:0006:0F07"),
                 entry.getAugmentation(Ipv6AddressMatchEntry.class).getIpv6Address());
     }

-    
+

     /**
      * Testing match deserialization
      */
     /**
      * Testing match deserialization
      */


@@ -219,25 +219,25 @@ public class MatchDeserializerTest {
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry2.getOxmClass());
         Assert.assertEquals("Wrong entry field", Metadata.class, entry2.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", true, entry2.isHasMask());
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry2.getOxmClass());
         Assert.assertEquals("Wrong entry field", Metadata.class, entry2.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", true, entry2.isHasMask());

-        Assert.assertArrayEquals("Wrong entry value", ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 03"), 
+        Assert.assertArrayEquals("Wrong entry value", ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 03"),

                 entry2.getAugmentation(MetadataMatchEntry.class).getMetadata());
                 entry2.getAugmentation(MetadataMatchEntry.class).getMetadata());

-        Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 04"), 
+        Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 04"),

                 entry2.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry3 = entries.get(3);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry3.getOxmClass());
         Assert.assertEquals("Wrong entry field", EthDst.class, entry3.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", true, entry3.isHasMask());
                 entry2.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry3 = entries.get(3);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry3.getOxmClass());
         Assert.assertEquals("Wrong entry field", EthDst.class, entry3.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", true, entry3.isHasMask());

-        Assert.assertEquals("Wrong entry value", new MacAddress("00:00:00:00:00:05"), 
+        Assert.assertEquals("Wrong entry value", new MacAddress("00:00:00:00:00:05"),

                 entry3.getAugmentation(MacAddressMatchEntry.class).getMacAddress());
                 entry3.getAugmentation(MacAddressMatchEntry.class).getMacAddress());

-        Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 06"), 
+        Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 06"),

                 entry3.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry4 = entries.get(4);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry4.getOxmClass());
         Assert.assertEquals("Wrong entry field", EthSrc.class, entry4.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", true, entry4.isHasMask());
                 entry3.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry4 = entries.get(4);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry4.getOxmClass());
         Assert.assertEquals("Wrong entry field", EthSrc.class, entry4.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", true, entry4.isHasMask());

-        Assert.assertEquals("Wrong entry value", new MacAddress("00:00:00:00:00:07"), 
+        Assert.assertEquals("Wrong entry value", new MacAddress("00:00:00:00:00:07"),

                 entry4.getAugmentation(MacAddressMatchEntry.class).getMacAddress());
                 entry4.getAugmentation(MacAddressMatchEntry.class).getMacAddress());

-        Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 08"), 
+        Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 08"),

                 entry4.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry5 = entries.get(5);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry5.getOxmClass());
                 entry4.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry5 = entries.get(5);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry5.getOxmClass());


@@ -251,9 +251,9 @@ public class MatchDeserializerTest {
         Assert.assertEquals("Wrong entry hasMask", true, entry6.isHasMask());
         Assert.assertEquals("Wrong entry value", 10,
                 entry6.getAugmentation(VlanVidMatchEntry.class).getVlanVid().intValue());
         Assert.assertEquals("Wrong entry hasMask", true, entry6.isHasMask());
         Assert.assertEquals("Wrong entry value", 10,
                 entry6.getAugmentation(VlanVidMatchEntry.class).getVlanVid().intValue());

-        Assert.assertEquals("Wrong entry value", false, 
+        Assert.assertEquals("Wrong entry value", false,

                 entry6.getAugmentation(VlanVidMatchEntry.class).isCfiBit());
                 entry6.getAugmentation(VlanVidMatchEntry.class).isCfiBit());

-        Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 0B"), 
+        Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 0B"),

                 entry6.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry7 = entries.get(7);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry7.getOxmClass());
                 entry6.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry7 = entries.get(7);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry7.getOxmClass());


@@ -285,7 +285,7 @@ public class MatchDeserializerTest {
         Assert.assertEquals("Wrong entry hasMask", true, entry11.isHasMask());
         Assert.assertEquals("Wrong entry value", new Ipv4Address("10.0.0.1"),
                 entry11.getAugmentation(Ipv4AddressMatchEntry.class).getIpv4Address());
         Assert.assertEquals("Wrong entry hasMask", true, entry11.isHasMask());
         Assert.assertEquals("Wrong entry value", new Ipv4Address("10.0.0.1"),
                 entry11.getAugmentation(Ipv4AddressMatchEntry.class).getIpv4Address());

-        Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 FF 00"), 
+        Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 FF 00"),

                 entry11.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry12 = entries.get(12);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry12.getOxmClass());
                 entry11.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry12 = entries.get(12);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry12.getOxmClass());


@@ -293,7 +293,7 @@ public class MatchDeserializerTest {
         Assert.assertEquals("Wrong entry hasMask", true, entry12.isHasMask());
         Assert.assertEquals("Wrong entry value", new Ipv4Address("10.0.0.2"),
                 entry12.getAugmentation(Ipv4AddressMatchEntry.class).getIpv4Address());
         Assert.assertEquals("Wrong entry hasMask", true, entry12.isHasMask());
         Assert.assertEquals("Wrong entry value", new Ipv4Address("10.0.0.2"),
                 entry12.getAugmentation(Ipv4AddressMatchEntry.class).getIpv4Address());

-        Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 FF"), 
+        Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 FF"),

                 entry12.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry13 = entries.get(13);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry13.getOxmClass());
                 entry12.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry13 = entries.get(13);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry13.getOxmClass());


@@ -355,7 +355,7 @@ public class MatchDeserializerTest {
         Assert.assertEquals("Wrong entry hasMask", true, entry22.isHasMask());
         Assert.assertEquals("Wrong entry value", new Ipv4Address("10.0.0.9"),
                 entry22.getAugmentation(Ipv4AddressMatchEntry.class).getIpv4Address());
         Assert.assertEquals("Wrong entry hasMask", true, entry22.isHasMask());
         Assert.assertEquals("Wrong entry value", new Ipv4Address("10.0.0.9"),
                 entry22.getAugmentation(Ipv4AddressMatchEntry.class).getIpv4Address());

-        Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 FF 00"), 
+        Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 FF 00"),

                 entry22.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry23 = entries.get(23);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry23.getOxmClass());
                 entry22.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry23 = entries.get(23);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry23.getOxmClass());


@@ -363,47 +363,47 @@ public class MatchDeserializerTest {
         Assert.assertEquals("Wrong entry hasMask", true, entry23.isHasMask());
         Assert.assertEquals("Wrong entry value", new Ipv4Address("10.0.0.10"),
                 entry23.getAugmentation(Ipv4AddressMatchEntry.class).getIpv4Address());
         Assert.assertEquals("Wrong entry hasMask", true, entry23.isHasMask());
         Assert.assertEquals("Wrong entry value", new Ipv4Address("10.0.0.10"),
                 entry23.getAugmentation(Ipv4AddressMatchEntry.class).getIpv4Address());

-        Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 FF"), 
+        Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 FF"),

                 entry23.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry24 = entries.get(24);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry24.getOxmClass());
         Assert.assertEquals("Wrong entry field", ArpSha.class, entry24.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", true, entry24.isHasMask());
                 entry23.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry24 = entries.get(24);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry24.getOxmClass());
         Assert.assertEquals("Wrong entry field", ArpSha.class, entry24.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", true, entry24.isHasMask());

-        Assert.assertEquals("Wrong entry value", new MacAddress("00:00:00:00:00:01"), 
+        Assert.assertEquals("Wrong entry value", new MacAddress("00:00:00:00:00:01"),

                 entry24.getAugmentation(MacAddressMatchEntry.class).getMacAddress());
                 entry24.getAugmentation(MacAddressMatchEntry.class).getMacAddress());

-        Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 03"), 
+        Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 03"),

                 entry24.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry25 = entries.get(25);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry25.getOxmClass());
         Assert.assertEquals("Wrong entry field", ArpTha.class, entry25.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", true, entry25.isHasMask());
                 entry24.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry25 = entries.get(25);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry25.getOxmClass());
         Assert.assertEquals("Wrong entry field", ArpTha.class, entry25.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", true, entry25.isHasMask());

-        Assert.assertEquals("Wrong entry value", new MacAddress("00:00:00:00:00:02"), 
+        Assert.assertEquals("Wrong entry value", new MacAddress("00:00:00:00:00:02"),

                 entry25.getAugmentation(MacAddressMatchEntry.class).getMacAddress());
                 entry25.getAugmentation(MacAddressMatchEntry.class).getMacAddress());

-        Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 04"), 
+        Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 00 00 04"),

                 entry25.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry26 = entries.get(26);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry26.getOxmClass());
         Assert.assertEquals("Wrong entry field", Ipv6Src.class, entry26.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", true, entry26.isHasMask());
                 entry25.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry26 = entries.get(26);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry26.getOxmClass());
         Assert.assertEquals("Wrong entry field", Ipv6Src.class, entry26.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", true, entry26.isHasMask());

-        Assert.assertEquals("Wrong entry value", new Ipv6Address("0000:0000:0000:0000:0000:0000:0000:0015"), 
+        Assert.assertEquals("Wrong entry value", new Ipv6Address("0000:0000:0000:0000:0000:0000:0000:0015"),

                 entry26.getAugmentation(Ipv6AddressMatchEntry.class).getIpv6Address());
         Assert.assertArrayEquals("Wrong entry mask",
                 entry26.getAugmentation(Ipv6AddressMatchEntry.class).getIpv6Address());
         Assert.assertArrayEquals("Wrong entry mask",

-                ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 16"), 
+                ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 16"),

                 entry26.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry27 = entries.get(27);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry27.getOxmClass());
         Assert.assertEquals("Wrong entry field", Ipv6Dst.class, entry27.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", true, entry27.isHasMask());
                 entry26.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry27 = entries.get(27);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry27.getOxmClass());
         Assert.assertEquals("Wrong entry field", Ipv6Dst.class, entry27.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", true, entry27.isHasMask());

-        Assert.assertEquals("Wrong entry value", new Ipv6Address("0000:0000:0000:0000:0000:0000:0000:0017"), 
+        Assert.assertEquals("Wrong entry value", new Ipv6Address("0000:0000:0000:0000:0000:0000:0000:0017"),

                 entry27.getAugmentation(Ipv6AddressMatchEntry.class).getIpv6Address());
         Assert.assertArrayEquals("Wrong entry mask",
                 entry27.getAugmentation(Ipv6AddressMatchEntry.class).getIpv6Address());
         Assert.assertArrayEquals("Wrong entry mask",

-                ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 18"), 
+                ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 18"),

                 entry27.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry28 = entries.get(28);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry28.getOxmClass());
         Assert.assertEquals("Wrong entry field", Ipv6Flabel.class, entry28.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", true, entry28.isHasMask());
                 entry27.getAugmentation(MaskMatchEntry.class).getMask());
         MatchEntries entry28 = entries.get(28);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry28.getOxmClass());
         Assert.assertEquals("Wrong entry field", Ipv6Flabel.class, entry28.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", true, entry28.isHasMask());

-        Assert.assertEquals("Wrong entry value", 2, 
+        Assert.assertEquals("Wrong entry value", 2,

                 entry28.getAugmentation(Ipv6FlabelMatchEntry.class).getIpv6Flabel().getValue().intValue());
         Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 03"),
                 entry28.getAugmentation(MaskMatchEntry.class).getMask());
                 entry28.getAugmentation(Ipv6FlabelMatchEntry.class).getIpv6Flabel().getValue().intValue());
         Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("00 00 00 03"),
                 entry28.getAugmentation(MaskMatchEntry.class).getMask());


@@ -411,25 +411,25 @@ public class MatchDeserializerTest {
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry29.getOxmClass());
         Assert.assertEquals("Wrong entry field", Icmpv6Type.class, entry29.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", false, entry29.isHasMask());
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry29.getOxmClass());
         Assert.assertEquals("Wrong entry field", Icmpv6Type.class, entry29.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", false, entry29.isHasMask());

-        Assert.assertEquals("Wrong entry value", 21, 
+        Assert.assertEquals("Wrong entry value", 21,

                 entry29.getAugmentation(Icmpv6TypeMatchEntry.class).getIcmpv6Type().intValue());
         MatchEntries entry30 = entries.get(30);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry30.getOxmClass());
         Assert.assertEquals("Wrong entry field", Icmpv6Code.class, entry30.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", false, entry30.isHasMask());
                 entry29.getAugmentation(Icmpv6TypeMatchEntry.class).getIcmpv6Type().intValue());
         MatchEntries entry30 = entries.get(30);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry30.getOxmClass());
         Assert.assertEquals("Wrong entry field", Icmpv6Code.class, entry30.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", false, entry30.isHasMask());

-        Assert.assertEquals("Wrong entry value", 23, 
+        Assert.assertEquals("Wrong entry value", 23,

                 entry30.getAugmentation(Icmpv6CodeMatchEntry.class).getIcmpv6Code().intValue());
         MatchEntries entry31 = entries.get(31);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry31.getOxmClass());
         Assert.assertEquals("Wrong entry field", Ipv6NdTarget.class, entry31.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", false, entry31.isHasMask());
                 entry30.getAugmentation(Icmpv6CodeMatchEntry.class).getIcmpv6Code().intValue());
         MatchEntries entry31 = entries.get(31);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry31.getOxmClass());
         Assert.assertEquals("Wrong entry field", Ipv6NdTarget.class, entry31.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", false, entry31.isHasMask());

-        Assert.assertEquals("Wrong entry value", new Ipv6Address("0000:0000:0000:0000:0000:0000:0000:0020"), 
+        Assert.assertEquals("Wrong entry value", new Ipv6Address("0000:0000:0000:0000:0000:0000:0000:0020"),

                 entry31.getAugmentation(Ipv6AddressMatchEntry.class).getIpv6Address());
         MatchEntries entry32 = entries.get(32);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry32.getOxmClass());
         Assert.assertEquals("Wrong entry field", Ipv6NdSll.class, entry32.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", false, entry32.isHasMask());
                 entry31.getAugmentation(Ipv6AddressMatchEntry.class).getIpv6Address());
         MatchEntries entry32 = entries.get(32);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry32.getOxmClass());
         Assert.assertEquals("Wrong entry field", Ipv6NdSll.class, entry32.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", false, entry32.isHasMask());

-        Assert.assertEquals("Wrong entry value", new MacAddress("00:05:00:00:00:01"), 
+        Assert.assertEquals("Wrong entry value", new MacAddress("00:05:00:00:00:01"),

                 entry32.getAugmentation(MacAddressMatchEntry.class).getMacAddress());
         MatchEntries entry33 = entries.get(33);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry33.getOxmClass());
                 entry32.getAugmentation(MacAddressMatchEntry.class).getMacAddress());
         MatchEntries entry33 = entries.get(33);
         Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry33.getOxmClass());

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsDeserializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsDeserializerTest.java
index 3e83bf4b6ef85651f8331af002dc8a2edf248c75..2dd21e82b12b05220eb692515c9ca3653e27f5ef 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsDeserializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsDeserializerTest.java
@@ -63,7 +63,7 @@ public class OF10ActionsDeserializerTest {
                 + "00 09 00 08 00 02 00 00 "
                 + "00 0A 00 08 00 03 00 00 "
                 + "00 0B 00 10 00 04 00 00 00 00 00 00 00 00 00 30");
                 + "00 09 00 08 00 02 00 00 "
                 + "00 0A 00 08 00 03 00 00 "
                 + "00 0B 00 10 00 04 00 00 00 00 00 00 00 00 00 30");

-        
+

         message.skipBytes(4); // skip XID
         CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF10_VERSION_ID);
         List<Action> actions = ListDeserializer.deserializeList(EncodeConstants.OF10_VERSION_ID,
         message.skipBytes(4); // skip XID
         CodeKeyMaker keyMaker = CodeKeyMakerFactory.createActionsKeyMaker(EncodeConstants.OF10_VERSION_ID);
         List<Action> actions = ListDeserializer.deserializeList(EncodeConstants.OF10_VERSION_ID,


@@ -97,7 +97,7 @@ public class OF10ActionsDeserializerTest {
         Action action6 = actions.get(5);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight"
                 + ".openflow.common.action.rev130731.SetDlDst", action6.getType().getName());
         Action action6 = actions.get(5);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight"
                 + ".openflow.common.action.rev130731.SetDlDst", action6.getType().getName());

-        Assert.assertArrayEquals("Wrong dl-dst", ByteBufUtils.macAddressToBytes("02:03:04:05:06:07"), 
+        Assert.assertArrayEquals("Wrong dl-dst", ByteBufUtils.macAddressToBytes("02:03:04:05:06:07"),

                 ByteBufUtils.macAddressToBytes(action6.getAugmentation(DlAddressAction.class).getDlAddress().getValue()));
         Action action7 = actions.get(6);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight"
                 ByteBufUtils.macAddressToBytes(action6.getAugmentation(DlAddressAction.class).getDlAddress().getValue()));
         Action action7 = actions.get(6);
         Assert.assertEquals("Wrong action type", "org.opendaylight.yang.gen.v1.urn.opendaylight"

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsSerializerTest.java
index 3b72cb4d1b05218cfb284477a421fbe90d653bc9..ad9f0c1496b7ba53a56b27de1f341352f89f37b3 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsSerializerTest.java
@@ -72,7 +72,7 @@ public class OF10ActionsSerializerTest {
     }
 
     /**
     }
 
     /**

-     * Testing correct serialization of actions (OF v1.0) 
+     * Testing correct serialization of actions (OF v1.0)

      */
     @Test
     public void test() {
      */
     @Test
     public void test() {


@@ -152,11 +152,11 @@ public class OF10ActionsSerializerTest {
         queueBuilder.setQueueId(400L);
         actionBuilder.addAugmentation(QueueIdAction.class, queueBuilder.build());
         actions.add(actionBuilder.build());
         queueBuilder.setQueueId(400L);
         actionBuilder.addAugmentation(QueueIdAction.class, queueBuilder.build());
         actions.add(actionBuilder.build());

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         ListSerializer.serializeList(actions, TypeKeyMakerFactory
                 .createActionKeyMaker(EncodeConstants.OF10_VERSION_ID), registry, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         ListSerializer.serializeList(actions, TypeKeyMakerFactory
                 .createActionKeyMaker(EncodeConstants.OF10_VERSION_ID), registry, out);

-        
+

         Assert.assertEquals("Wrong action type", 0, out.readUnsignedShort());
         Assert.assertEquals("Wrong action length", 8, out.readUnsignedShort());
         Assert.assertEquals("Wrong port", 42, out.readUnsignedShort());
         Assert.assertEquals("Wrong action type", 0, out.readUnsignedShort());
         Assert.assertEquals("Wrong action length", 8, out.readUnsignedShort());
         Assert.assertEquals("Wrong port", 42, out.readUnsignedShort());


@@ -215,5 +215,5 @@ public class OF10ActionsSerializerTest {
         Assert.assertEquals("Wrong queue-id", 400, out.readUnsignedInt());
         Assert.assertTrue("Written more bytes than needed", out.readableBytes() == 0);
     }
         Assert.assertEquals("Wrong queue-id", 400, out.readUnsignedInt());
         Assert.assertTrue("Written more bytes than needed", out.readableBytes() == 0);
     }

-    
+

 }
\ No newline at end of file
 }
\ No newline at end of file

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchDeserializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchDeserializerTest.java
index 262be94b0077a844cdb33c4cc5eb412485e8653f..0201f609feef90c97c55ad22de9bd3c4b6300653 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchDeserializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchDeserializerTest.java
@@ -69,7 +69,7 @@ public class OF10MatchDeserializerTest {
         Assert.assertEquals("Wrong tp-src", 20560, match.getTpSrc().shortValue());
         Assert.assertEquals("Wrong tp-dst", 8224, match.getTpDst().shortValue());
     }
         Assert.assertEquals("Wrong tp-src", 20560, match.getTpSrc().shortValue());
         Assert.assertEquals("Wrong tp-dst", 8224, match.getTpDst().shortValue());
     }

-    
+

     /**
      * Testing correct deserialization of ofp_match
      */
     /**
      * Testing correct deserialization of ofp_match
      */

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchSerializerTest.java
index ca295ea183dcb03f1457c16af6bc067520aba8b3..e19ede8ceaf5f8f23e0b96055f441e1f010db7a0 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10MatchSerializerTest.java
@@ -70,7 +70,7 @@ public class OF10MatchSerializerTest {
         builder.setTpDst(4096);
         MatchV10 match = builder.build();
         matchSerializer.serialize(match, out);
         builder.setTpDst(4096);
         MatchV10 match = builder.build();
         matchSerializer.serialize(match, out);

-        
+

         Assert.assertEquals("Wrong wildcards", 2361553, out.readUnsignedInt());
         Assert.assertEquals("Wrong in-port", 6653, out.readUnsignedShort());
         byte[] dlSrc = new byte[6];
         Assert.assertEquals("Wrong wildcards", 2361553, out.readUnsignedInt());
         Assert.assertEquals("Wrong in-port", 6653, out.readUnsignedShort());
         byte[] dlSrc = new byte[6];


@@ -91,7 +91,7 @@ public class OF10MatchSerializerTest {
         Assert.assertEquals("Wrong tp-src", 2048, out.readUnsignedShort());
         Assert.assertEquals("Wrong tp-dst", 4096, out.readUnsignedShort());
     }
         Assert.assertEquals("Wrong tp-src", 2048, out.readUnsignedShort());
         Assert.assertEquals("Wrong tp-dst", 4096, out.readUnsignedShort());
     }

-    
+

     /**
      * Testing correct serialization of ofp_match
      */
     /**
      * Testing correct serialization of ofp_match
      */


@@ -117,7 +117,7 @@ public class OF10MatchSerializerTest {
         builder.setTpDst(4096);
         MatchV10 match = builder.build();
         matchSerializer.serialize(match, out);
         builder.setTpDst(4096);
         MatchV10 match = builder.build();
         matchSerializer.serialize(match, out);

-        
+

         Assert.assertEquals("Wrong wildcards", 3678463, out.readUnsignedInt());
         Assert.assertEquals("Wrong in-port", 6653, out.readUnsignedShort());
         byte[] dlSrc = new byte[6];
         Assert.assertEquals("Wrong wildcards", 3678463, out.readUnsignedInt());
         Assert.assertEquals("Wrong in-port", 6653, out.readUnsignedShort());
         byte[] dlSrc = new byte[6];

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13ActionsSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13ActionsSerializerTest.java
index 4f01fd20c832d56da540b79f746ded049c1f2d91..ed47b0141be9fd18a4450276d97966a0330f2d3f 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13ActionsSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13ActionsSerializerTest.java
@@ -64,7 +64,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.
 
 /**
  * @author michal.polkorab
 
 /**
  * @author michal.polkorab

- * 
+ *

  */
 public class OF13ActionsSerializerTest {
 
  */
 public class OF13ActionsSerializerTest {
 


@@ -175,11 +175,11 @@ public class OF13ActionsSerializerTest {
         actionBuilder = new ActionBuilder();
         actionBuilder.setType(PopPbb.class);
         actions.add(actionBuilder.build());
         actionBuilder = new ActionBuilder();
         actionBuilder.setType(PopPbb.class);
         actions.add(actionBuilder.build());

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         ListSerializer.serializeList(actions, TypeKeyMakerFactory
                 .createActionKeyMaker(EncodeConstants.OF13_VERSION_ID), registry, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         ListSerializer.serializeList(actions, TypeKeyMakerFactory
                 .createActionKeyMaker(EncodeConstants.OF13_VERSION_ID), registry, out);

-        
+

         Assert.assertEquals("Wrong action type", 0, out.readUnsignedShort());
         Assert.assertEquals("Wrong action length", 16, out.readUnsignedShort());
         Assert.assertEquals("Wrong action port", 42, out.readUnsignedInt());
         Assert.assertEquals("Wrong action type", 0, out.readUnsignedShort());
         Assert.assertEquals("Wrong action length", 16, out.readUnsignedShort());
         Assert.assertEquals("Wrong action port", 42, out.readUnsignedInt());

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13InstructionsSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13InstructionsSerializerTest.java
index 68fe7510699f15cbab71a5d751cf3ad8d857352f..6e972f829116481a22ae183394d76e4abf26e751 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13InstructionsSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13InstructionsSerializerTest.java
@@ -142,11 +142,11 @@ public class OF13InstructionsSerializerTest {
         actionsBuilder.setAction(actions);
         builder.addAugmentation(ActionsInstruction.class, actionsBuilder.build());
         instructions.add(builder.build());
         actionsBuilder.setAction(actions);
         builder.addAugmentation(ActionsInstruction.class, actionsBuilder.build());
         instructions.add(builder.build());

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         ListSerializer.serializeList(instructions, TypeKeyMakerFactory
                 .createInstructionKeyMaker(EncodeConstants.OF13_VERSION_ID), registry, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         ListSerializer.serializeList(instructions, TypeKeyMakerFactory
                 .createInstructionKeyMaker(EncodeConstants.OF13_VERSION_ID), registry, out);

-        
+

         Assert.assertEquals("Wrong instruction type", 1, out.readUnsignedShort());
         Assert.assertEquals("Wrong instruction length", 8, out.readUnsignedShort());
         Assert.assertEquals("Wrong instruction table-id", 5, out.readUnsignedByte());
         Assert.assertEquals("Wrong instruction type", 1, out.readUnsignedShort());
         Assert.assertEquals("Wrong instruction length", 8, out.readUnsignedShort());
         Assert.assertEquals("Wrong instruction table-id", 5, out.readUnsignedByte());

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializer02Test.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializer02Test.java
index e607d0fce8ff1f187c6737b573ec429cb568d9a0..a29b8437463b561cf85bb0e93ebb9c255023fae5 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializer02Test.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializer02Test.java
@@ -152,15 +152,15 @@ public class OF13MatchSerializer02Test {
         MatchBuilder builder = new MatchBuilder();
         builder.setType(OxmMatchType.class);
         Match match = builder.build();
         MatchBuilder builder = new MatchBuilder();
         builder.setType(OxmMatchType.class);
         Match match = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         matchSerializer.serialize(match, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         matchSerializer.serialize(match, out);

-        
+

         Assert.assertEquals("Wrong match type", 1, out.readUnsignedShort());
         Assert.assertEquals("Wrong match length", 4, out.readUnsignedShort());
         Assert.assertTrue("Wrong padding", out.readableBytes() == 4);
     }
         Assert.assertEquals("Wrong match type", 1, out.readUnsignedShort());
         Assert.assertEquals("Wrong match length", 4, out.readUnsignedShort());
         Assert.assertTrue("Wrong padding", out.readableBytes() == 4);
     }

-    
+

     /**
      * Testing serialization of match
      */
     /**
      * Testing serialization of match
      */


@@ -510,7 +510,7 @@ public class OF13MatchSerializer02Test {
         bosBuilder.setBos(true);
         entryBuilder.addAugmentation(BosMatchEntry.class, bosBuilder.build());
         entries.add(entryBuilder.build());
         bosBuilder.setBos(true);
         entryBuilder.addAugmentation(BosMatchEntry.class, bosBuilder.build());
         entries.add(entryBuilder.build());

-        
+

         entryBuilder = new MatchEntriesBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(PbbIsid.class);
         entryBuilder = new MatchEntriesBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(PbbIsid.class);


@@ -522,7 +522,7 @@ public class OF13MatchSerializer02Test {
         maskBuilder.setMask(new byte[]{0,1,2});
         entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
         entries.add(entryBuilder.build());
         maskBuilder.setMask(new byte[]{0,1,2});
         entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
         entries.add(entryBuilder.build());

-        
+

         entryBuilder = new MatchEntriesBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(TunnelId.class);
         entryBuilder = new MatchEntriesBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(TunnelId.class);


@@ -534,7 +534,7 @@ public class OF13MatchSerializer02Test {
         maskBuilder.setMask(new byte[]{0,0,0,0,0,0,0,2});
         entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
         entries.add(entryBuilder.build());
         maskBuilder.setMask(new byte[]{0,0,0,0,0,0,0,2});
         entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
         entries.add(entryBuilder.build());

-        
+

         entryBuilder = new MatchEntriesBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(Ipv6Exthdr.class);
         entryBuilder = new MatchEntriesBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(Ipv6Exthdr.class);


@@ -546,15 +546,15 @@ public class OF13MatchSerializer02Test {
         maskBuilder.setMask(new byte[]{0,2});
         entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
         entries.add(entryBuilder.build());
         maskBuilder.setMask(new byte[]{0,2});
         entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
         entries.add(entryBuilder.build());

-        
-        
-        
+
+
+

         builder.setMatchEntries(entries);
         Match match = builder.build();
         builder.setMatchEntries(entries);
         Match match = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         matchSerializer.serialize(match, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         matchSerializer.serialize(match, out);

-        
+

         Assert.assertEquals("Wrong match type", 1, out.readUnsignedShort());
         Assert.assertEquals("Wrong match length", 428, out.readUnsignedShort());
         Assert.assertEquals("Wrong match entry class", 0x8000, out.readUnsignedShort());
         Assert.assertEquals("Wrong match type", 1, out.readUnsignedShort());
         Assert.assertEquals("Wrong match length", 428, out.readUnsignedShort());
         Assert.assertEquals("Wrong match entry class", 0x8000, out.readUnsignedShort());

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializerTest.java
index ca39e1a7dc4bf3e1fed7158cf598f2bcb08f6e28..6b82e9e6734d89e5eba184ad82274a7f59467da6 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializerTest.java
@@ -94,10 +94,10 @@ public class OF13MatchSerializerTest {
         entries.add(entriesBuilder.build());
         builder.setMatchEntries(entries);
         Match match = builder.build();
         entries.add(entriesBuilder.build());
         builder.setMatchEntries(entries);
         Match match = builder.build();

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         matchSerializer.serialize(match, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         matchSerializer.serialize(match, out);

-        
+

         Assert.assertEquals("Wrong type", 1, out.readUnsignedShort());
         out.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
         Assert.assertEquals("Wrong class", 0x8000, out.readUnsignedShort());
         Assert.assertEquals("Wrong type", 1, out.readUnsignedShort());
         out.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
         Assert.assertEquals("Wrong class", 0x8000, out.readUnsignedShort());


@@ -108,7 +108,7 @@ public class OF13MatchSerializerTest {
         Assert.assertEquals("Wrong ip address (third number)", 3, out.readUnsignedByte());
         Assert.assertEquals("Wrong ip address (fourth number)", 4, out.readUnsignedByte());
     }
         Assert.assertEquals("Wrong ip address (third number)", 3, out.readUnsignedByte());
         Assert.assertEquals("Wrong ip address (fourth number)", 4, out.readUnsignedByte());
     }

-    
+

     /**
      * Test for correct serialization of Ipv6Address match entry
      */
     /**
      * Test for correct serialization of Ipv6Address match entry
      */


@@ -166,7 +166,7 @@ public class OF13MatchSerializerTest {
         Match match = builder.build();
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         matchSerializer.serialize(match, out);
         Match match = builder.build();
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         matchSerializer.serialize(match, out);

-        
+

         Assert.assertEquals("Wrong type", 1, out.readUnsignedShort());
         out.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
         Assert.assertEquals("Wrong class", 0x8000, out.readUnsignedShort());
         Assert.assertEquals("Wrong type", 1, out.readUnsignedShort());
         out.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
         Assert.assertEquals("Wrong class", 0x8000, out.readUnsignedShort());


@@ -255,10 +255,10 @@ public class OF13MatchSerializerTest {
     @Test
     public void testIpv6Flabel() {
         Match match = buildIpv6FLabelMatch(0x0f9e8dL, false, null);
     @Test
     public void testIpv6Flabel() {
         Match match = buildIpv6FLabelMatch(0x0f9e8dL, false, null);

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         matchSerializer.serialize(match, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         matchSerializer.serialize(match, out);

-        
+

         Assert.assertEquals("Wrong type", 1, out.readUnsignedShort());
         out.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
         Assert.assertEquals("Wrong class", 0x8000, out.readUnsignedShort());
         Assert.assertEquals("Wrong type", 1, out.readUnsignedShort());
         out.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
         Assert.assertEquals("Wrong class", 0x8000, out.readUnsignedShort());


@@ -266,21 +266,21 @@ public class OF13MatchSerializerTest {
         out.skipBytes(EncodeConstants.SIZE_OF_BYTE_IN_BYTES);
         byte[] label = new byte[4];
         out.readBytes(label);
         out.skipBytes(EncodeConstants.SIZE_OF_BYTE_IN_BYTES);
         byte[] label = new byte[4];
         out.readBytes(label);

-        
+

         LOG.debug("label: "+ ByteBufUtils.bytesToHexString(label));
         Assert.assertArrayEquals("Wrong ipv6FLabel", new byte[]{0, 0x0f, (byte) 0x9e, (byte) 0x8d}, label);
     }
         LOG.debug("label: "+ ByteBufUtils.bytesToHexString(label));
         Assert.assertArrayEquals("Wrong ipv6FLabel", new byte[]{0, 0x0f, (byte) 0x9e, (byte) 0x8d}, label);
     }

-    
+

     /**
      * Test for correct serialization of Ipv4Address match entry with mask
      */
     @Test
     public void testIpv6FlabelWithMask() {
         Match match = buildIpv6FLabelMatch(0x0f9e8dL, true, new byte[]{0, 0x0c, 0x7b, 0x6a});
     /**
      * Test for correct serialization of Ipv4Address match entry with mask
      */
     @Test
     public void testIpv6FlabelWithMask() {
         Match match = buildIpv6FLabelMatch(0x0f9e8dL, true, new byte[]{0, 0x0c, 0x7b, 0x6a});

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         matchSerializer.serialize(match, out);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         matchSerializer.serialize(match, out);

-        
+

         Assert.assertEquals("Wrong type", 1, out.readUnsignedShort());
         out.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
         Assert.assertEquals("Wrong class", 0x8000, out.readUnsignedShort());
         Assert.assertEquals("Wrong type", 1, out.readUnsignedShort());
         out.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
         Assert.assertEquals("Wrong class", 0x8000, out.readUnsignedShort());


@@ -288,20 +288,20 @@ public class OF13MatchSerializerTest {
         out.skipBytes(EncodeConstants.SIZE_OF_BYTE_IN_BYTES);
         byte[] labelAndMask = new byte[8];
         out.readBytes(labelAndMask);
         out.skipBytes(EncodeConstants.SIZE_OF_BYTE_IN_BYTES);
         byte[] labelAndMask = new byte[8];
         out.readBytes(labelAndMask);

-        
+

         LOG.debug("label: "+ByteBufUtils.bytesToHexString(labelAndMask));
         Assert.assertArrayEquals("Wrong ipv6FLabel", new byte[]{0, 0x0f, (byte) 0x9e, (byte) 0x8d, 0, 0x0c, 0x7b, 0x6a}, labelAndMask);
     }
         LOG.debug("label: "+ByteBufUtils.bytesToHexString(labelAndMask));
         Assert.assertArrayEquals("Wrong ipv6FLabel", new byte[]{0, 0x0f, (byte) 0x9e, (byte) 0x8d, 0, 0x0c, 0x7b, 0x6a}, labelAndMask);
     }

-    
+

     /**
      * Test for correct serialization of Ipv4Address match entry with wrong mask
      */
     @Test
     public void testIpv6FlabelWithMaskBad() {
         Match match = buildIpv6FLabelMatch(0x0f9e8dL, true, new byte[]{0x0c, 0x7b, 0x6a});
     /**
      * Test for correct serialization of Ipv4Address match entry with wrong mask
      */
     @Test
     public void testIpv6FlabelWithMaskBad() {
         Match match = buildIpv6FLabelMatch(0x0f9e8dL, true, new byte[]{0x0c, 0x7b, 0x6a});

-        
+

         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();

-        
+

         try {
             matchSerializer.serialize(match, out);
             Assert.fail("incorrect length of mask ignored");
         try {
             matchSerializer.serialize(match, out);
             Assert.fail("incorrect length of mask ignored");

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/statistics/StatisticsCountersTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/statistics/StatisticsCountersTest.java
index d922d590e99717b13bd5cfce46862d45b5870206..fbe48b17e7ff472496693fa9bf5f9f6808446751 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/statistics/StatisticsCountersTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/statistics/StatisticsCountersTest.java
@@ -15,7 +15,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
 import org.slf4j.LoggerFactory;
 
 /**

- * General tests for StatisticsCounters class 
+ * General tests for StatisticsCounters class

  * @author madamjak
  *
  */
  * @author madamjak
  *
  */


@@ -54,7 +54,7 @@ public class StatisticsCountersTest {
             } else {
                 Assert.assertNull("Wrong - not enabled counter give not null value", statCounters.getCounter(cet));
             }
             } else {
                 Assert.assertNull("Wrong - not enabled counter give not null value", statCounters.getCounter(cet));
             }

-            
+

         }
         statCounters.resetCounters();
         for(CounterEventTypes cet : CounterEventTypes.values()){
         }
         statCounters.resetCounters();
         for(CounterEventTypes cet : CounterEventTypes.values()){

diff --git a/openflow-protocol-it/pom.xml b/openflow-protocol-it/pom.xml
index 4ef8ec36bab8c4b7fbfce041ade13fde4dbf6bba..2751cc9f1c394070450d2b50e6e6bc50a599574a 100644 (file)
--- a/openflow-protocol-it/pom.xml
+++ b/openflow-protocol-it/pom.xml
@@ -12,7 +12,7 @@
         <url>https://wiki.opendaylight.org/view/Openflow_Protocol_Library:Main</url>
       <tag>HEAD</tag>
   </scm>
         <url>https://wiki.opendaylight.org/view/Openflow_Protocol_Library:Main</url>
       <tag>HEAD</tag>
   </scm>

-    
+

     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/openflow-protocol-it/src/test/java/org/opendaylight/openflowjava/protocol/it/integration/IntegrationTest.java b/openflow-protocol-it/src/test/java/org/opendaylight/openflowjava/protocol/it/integration/IntegrationTest.java
index a1440961f86f17d9ec20b32f1e384cba62fa5768..411bc5ea2c5cd23465fd68a2ca42bc65ea38bb6a 100644 (file)
--- a/openflow-protocol-it/src/test/java/org/opendaylight/openflowjava/protocol/it/integration/IntegrationTest.java
+++ b/openflow-protocol-it/src/test/java/org/opendaylight/openflowjava/protocol/it/integration/IntegrationTest.java
@@ -47,7 +47,7 @@ public class IntegrationTest {
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(IntegrationTest.class);
 
     private static final Logger LOGGER = LoggerFactory
             .getLogger(IntegrationTest.class);

-    
+

     private static int port;
     private TlsConfiguration tlsConfiguration;
     private static final int SWITCH_IDLE_TIMEOUT = 2000;
     private static int port;
     private TlsConfiguration tlsConfiguration;
     private static final int SWITCH_IDLE_TIMEOUT = 2000;


@@ -63,7 +63,7 @@ public class IntegrationTest {
      */
     public void setUp(TransportProtocol protocol) throws Exception {
         LOGGER.debug("\n starting test -------------------------------");
      */
     public void setUp(TransportProtocol protocol) throws Exception {
         LOGGER.debug("\n starting test -------------------------------");

-        
+

         String currentDir = System.getProperty("user.dir");
         LOGGER.debug("Current dir using System:" +currentDir);
         startupAddress = InetAddress.getLocalHost();
         String currentDir = System.getProperty("user.dir");
         LOGGER.debug("Current dir using System:" +currentDir);
         startupAddress = InetAddress.getLocalHost();


@@ -76,7 +76,7 @@ public class IntegrationTest {
         connConfig = new ConnectionConfigurationImpl(startupAddress, 0, tlsConfiguration, SWITCH_IDLE_TIMEOUT);
         connConfig.setTransferProtocol(protocol);
         mockPlugin = new MockPlugin();
         connConfig = new ConnectionConfigurationImpl(startupAddress, 0, tlsConfiguration, SWITCH_IDLE_TIMEOUT);
         connConfig.setTransferProtocol(protocol);
         mockPlugin = new MockPlugin();

-        
+

         switchConnectionProvider = new SwitchConnectionProviderImpl();
         switchConnectionProvider.setSwitchConnectionHandler(mockPlugin);
         switchConnectionProvider.setConfiguration(connConfig);
         switchConnectionProvider = new SwitchConnectionProviderImpl();
         switchConnectionProvider.setSwitchConnectionHandler(mockPlugin);
         switchConnectionProvider.setConfiguration(connConfig);


@@ -101,7 +101,7 @@ public class IntegrationTest {
 
     /**
      * Library integration and communication test with handshake
 
     /**
      * Library integration and communication test with handshake

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testHandshake() throws Exception {
      */
     @Test
     public void testHandshake() throws Exception {


@@ -113,13 +113,13 @@ public class IntegrationTest {
         OFClient firstClient = clients.get(0);
         firstClient.getScenarioDone().get();
         Thread.sleep(1000);
         OFClient firstClient = clients.get(0);
         firstClient.getScenarioDone().get();
         Thread.sleep(1000);

-        
+

         LOGGER.debug("testHandshake() Finished") ;
     }
 
     /**
      * Library integration and secured communication test with handshake
         LOGGER.debug("testHandshake() Finished") ;
     }
 
     /**
      * Library integration and secured communication test with handshake

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testTlsHandshake() throws Exception {
      */
     @Test
     public void testTlsHandshake() throws Exception {


@@ -131,13 +131,13 @@ public class IntegrationTest {
         OFClient firstClient = clients.get(0);
         firstClient.getScenarioDone().get();
         Thread.sleep(1000);
         OFClient firstClient = clients.get(0);
         firstClient.getScenarioDone().get();
         Thread.sleep(1000);

-        
+

         LOGGER.debug("testTlsHandshake() Finished") ;
     }
 
     /**
      * Library integration and communication test with handshake + echo exchange
         LOGGER.debug("testTlsHandshake() Finished") ;
     }
 
     /**
      * Library integration and communication test with handshake + echo exchange

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testHandshakeAndEcho() throws Exception {
      */
     @Test
     public void testHandshakeAndEcho() throws Exception {


@@ -158,7 +158,7 @@ public class IntegrationTest {
 
     /**
      * Library integration and secured communication test with handshake + echo exchange
 
     /**
      * Library integration and secured communication test with handshake + echo exchange

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testTlsHandshakeAndEcho() throws Exception {
      */
     @Test
     public void testTlsHandshakeAndEcho() throws Exception {


@@ -179,7 +179,7 @@ public class IntegrationTest {
 
     /**
      * Library udp integration and communication test with handshake + echo exchange
 
     /**
      * Library udp integration and communication test with handshake + echo exchange

-     * @throws Exception 
+     * @throws Exception

      */
     @Test
     public void testUdpHandshakeAndEcho() throws Exception {
      */
     @Test
     public void testUdpHandshakeAndEcho() throws Exception {


@@ -208,7 +208,7 @@ public class IntegrationTest {
     }
 
     /**
     }
 
     /**

-     * @param amountOfCLients 
+     * @param amountOfCLients

      * @param protocol true if encrypted connection should be used
      * @return new clients up and running
      * @throws ExecutionException if some client could not start
      * @param protocol true if encrypted connection should be used
      * @return new clients up and running
      * @throws ExecutionException if some client could not start

diff --git a/openflow-protocol-it/src/test/java/org/opendaylight/openflowjava/protocol/it/integration/MockPlugin.java b/openflow-protocol-it/src/test/java/org/opendaylight/openflowjava/protocol/it/integration/MockPlugin.java
index b4f69bb021d054ab9eb65a78cbba8cdee49e457c..f8298bbf966c12d16c552966796dd3ffd67987e2 100644 (file)
--- a/openflow-protocol-it/src/test/java/org/opendaylight/openflowjava/protocol/it/integration/MockPlugin.java
+++ b/openflow-protocol-it/src/test/java/org/opendaylight/openflowjava/protocol/it/integration/MockPlugin.java
@@ -48,7 +48,7 @@ import com.google.common.util.concurrent.SettableFuture;
  * @author michal.polkorab
  *
  */
  * @author michal.polkorab
  *
  */

-public class MockPlugin implements OpenflowProtocolListener, SwitchConnectionHandler, 
+public class MockPlugin implements OpenflowProtocolListener, SwitchConnectionHandler,

         SystemNotificationsListener, ConnectionReadyListener {
 
     protected static final Logger LOGGER = LoggerFactory.getLogger(MockPlugin.class);
         SystemNotificationsListener, ConnectionReadyListener {
 
     protected static final Logger LOGGER = LoggerFactory.getLogger(MockPlugin.class);


@@ -62,7 +62,7 @@ public class MockPlugin implements OpenflowProtocolListener, SwitchConnectionHan
         finishedFuture = SettableFuture.create();
         LOGGER.debug("mockPlugin: "+System.identityHashCode(this));
     }
         finishedFuture = SettableFuture.create();
         LOGGER.debug("mockPlugin: "+System.identityHashCode(this));
     }

-    
+

     @Override
     public void onSwitchConnected(ConnectionAdapter connection) {
         LOGGER.debug("onSwitchConnected: " + connection);
     @Override
     public void onSwitchConnected(ConnectionAdapter connection) {
         LOGGER.debug("onSwitchConnected: " + connection);


@@ -100,19 +100,19 @@ public class MockPlugin implements OpenflowProtocolListener, SwitchConnectionHan
     @Override
     public void onErrorMessage(ErrorMessage notification) {
         LOGGER.debug("Error message received");
     @Override
     public void onErrorMessage(ErrorMessage notification) {
         LOGGER.debug("Error message received");

-        
+

     }
 
     @Override
     public void onExperimenterMessage(ExperimenterMessage notification) {
         LOGGER.debug("Experimenter message received");
     }
 
     @Override
     public void onExperimenterMessage(ExperimenterMessage notification) {
         LOGGER.debug("Experimenter message received");

-        
+

     }
 
     @Override
     public void onFlowRemovedMessage(FlowRemovedMessage notification) {
         LOGGER.debug("FlowRemoved message received");
     }
 
     @Override
     public void onFlowRemovedMessage(FlowRemovedMessage notification) {
         LOGGER.debug("FlowRemoved message received");

-        
+

     }
 
     @Override
     }
 
     @Override


@@ -137,7 +137,7 @@ public class MockPlugin implements OpenflowProtocolListener, SwitchConnectionHan
         }).start();
 
     }
         }).start();
 
     }

-    
+

     protected void getSwitchFeatures() {
         GetFeaturesInputBuilder featuresBuilder = new GetFeaturesInputBuilder();
         featuresBuilder.setVersion((short) 4);
     protected void getSwitchFeatures() {
         GetFeaturesInputBuilder featuresBuilder = new GetFeaturesInputBuilder();
         featuresBuilder.setVersion((short) 4);


@@ -169,7 +169,7 @@ public class MockPlugin implements OpenflowProtocolListener, SwitchConnectionHan
                 Future<Boolean> disconnect = adapter.disconnect();
                 disconnect.get();
                 LOGGER.debug("MockPlugin.shutdown() Disconnected");
                 Future<Boolean> disconnect = adapter.disconnect();
                 disconnect.get();
                 LOGGER.debug("MockPlugin.shutdown() Disconnected");

-            } 
+            }

         } catch (Exception e) {
             LOGGER.error("MockPlugin.shutdown() exception caught: ", e.getMessage(), e);
         }
         } catch (Exception e) {
             LOGGER.error("MockPlugin.shutdown() exception caught: ", e.getMessage(), e);
         }


@@ -179,7 +179,7 @@ public class MockPlugin implements OpenflowProtocolListener, SwitchConnectionHan
     @Override
     public void onMultipartReplyMessage(MultipartReplyMessage notification) {
         LOGGER.debug("MultipartReply message received");
     @Override
     public void onMultipartReplyMessage(MultipartReplyMessage notification) {
         LOGGER.debug("MultipartReply message received");

-        
+

     }
 
     @Override
     }
 
     @Override


@@ -198,7 +198,7 @@ public class MockPlugin implements OpenflowProtocolListener, SwitchConnectionHan
     @Override
     public void onPortStatusMessage(PortStatusMessage notification) {
         LOGGER.debug("MockPlugin.onPortStatusMessage() message received");
     @Override
     public void onPortStatusMessage(PortStatusMessage notification) {
         LOGGER.debug("MockPlugin.onPortStatusMessage() message received");

-        
+

     }
 
     @Override
     }
 
     @Override


@@ -225,7 +225,7 @@ public class MockPlugin implements OpenflowProtocolListener, SwitchConnectionHan
     public int getIdleCounter() {
         return idleCounter;
     }
     public int getIdleCounter() {
         return idleCounter;
     }

-    
+

     @Override
     public void onConnectionReady() {
         LOGGER.trace("MockPlugin().onConnectionReady()");
     @Override
     public void onConnectionReady() {
         LOGGER.trace("MockPlugin().onConnectionReady()");

diff --git a/openflow-protocol-spi/pom.xml b/openflow-protocol-spi/pom.xml
index 6cef4f39e3f5f7baa670ced2b5efbc6305083b39..18369f5e21de80c6ddf4a2dc32c5e1b17e6dfe05 100644 (file)
--- a/openflow-protocol-spi/pom.xml
+++ b/openflow-protocol-spi/pom.xml
@@ -7,13 +7,13 @@
     </parent>
     <artifactId>openflow-protocol-spi</artifactId>
     <packaging>bundle</packaging>
     </parent>
     <artifactId>openflow-protocol-spi</artifactId>
     <packaging>bundle</packaging>

-    
+

     <name>Openflow Protocol Library - SPI</name>
     <scm>
         <url>https://wiki.opendaylight.org/view/Openflow_Protocol_Library:Main</url>
       <tag>HEAD</tag>
   </scm>
     <name>Openflow Protocol Library - SPI</name>
     <scm>
         <url>https://wiki.opendaylight.org/view/Openflow_Protocol_Library:Main</url>
       <tag>HEAD</tag>
   </scm>

-  
+

   <build>
         <plugins>
             <plugin>
   <build>
         <plugins>
             <plugin>


@@ -81,7 +81,7 @@
             </plugin>
         </plugins>
     </build>
             </plugin>
         </plugins>
     </build>

-    
+

     <dependencies>
        <dependency>
            <groupId>${project.groupId}</groupId>
     <dependencies>
        <dependency>
            <groupId>${project.groupId}</groupId>

diff --git a/openflow-protocol-spi/src/main/java/org/opendaylight/openflowjava/protocol/spi/connection/SwitchConnectionProvider.java b/openflow-protocol-spi/src/main/java/org/opendaylight/openflowjava/protocol/spi/connection/SwitchConnectionProvider.java
index 69d08fbb8c4be6f8f3cdc1bddb7a372dc57b25c0..b57500b478f34de3bc58b401b86b300b540f5294 100644 (file)
--- a/openflow-protocol-spi/src/main/java/org/opendaylight/openflowjava/protocol/spi/connection/SwitchConnectionProvider.java
+++ b/openflow-protocol-spi/src/main/java/org/opendaylight/openflowjava/protocol/spi/connection/SwitchConnectionProvider.java
@@ -28,20 +28,20 @@ public interface SwitchConnectionProvider extends AutoCloseable,
      * @param configuration [protocol, port, address and supported features]
      */
     void setConfiguration(ConnectionConfiguration configuration);
      * @param configuration [protocol, port, address and supported features]
      */
     void setConfiguration(ConnectionConfiguration configuration);

-    
+

     /**
      * start listening to switches, but please don't forget to do
      * {@link #setSwitchConnectionHandler(SwitchConnectionHandler)} first
      * @return future, triggered to true, when listening channel is up and running
      */
     ListenableFuture<Boolean> startup();
     /**
      * start listening to switches, but please don't forget to do
      * {@link #setSwitchConnectionHandler(SwitchConnectionHandler)} first
      * @return future, triggered to true, when listening channel is up and running
      */
     ListenableFuture<Boolean> startup();

-    
+

     /**
      * stop listening to switches
      * @return future, triggered to true, when all listening channels are down
      */
     ListenableFuture<Boolean> shutdown();
     /**
      * stop listening to switches
      * @return future, triggered to true, when all listening channels are down
      */
     ListenableFuture<Boolean> shutdown();

-    
+

     /**
      * @param switchConHandler instance being informed when new switch connects
      */
     /**
      * @param switchConHandler instance being informed when new switch connects
      */

diff --git a/openflow-protocol-spi/src/main/java/org/opendaylight/openflowjava/protocol/spi/statistics/StatisticsHandler.java b/openflow-protocol-spi/src/main/java/org/opendaylight/openflowjava/protocol/spi/statistics/StatisticsHandler.java
index 1d2c580b9d5665fc1ed00b10f9e3880ca72ad4b8..3779a5ebe3b3f2218495b455b3ebff35ba1d6272 100644 (file)
--- a/openflow-protocol-spi/src/main/java/org/opendaylight/openflowjava/protocol/spi/statistics/StatisticsHandler.java
+++ b/openflow-protocol-spi/src/main/java/org/opendaylight/openflowjava/protocol/spi/statistics/StatisticsHandler.java
@@ -10,7 +10,7 @@ package org.opendaylight.openflowjava.protocol.spi.statistics;
 
 /**
  * Used for JConsole service
 
 /**
  * Used for JConsole service

- * 
+ *

  * @author michal.polkorab
  */
 public interface StatisticsHandler {
  * @author michal.polkorab
  */
 public interface StatisticsHandler {

diff --git a/openflowjava-config/pom.xml b/openflowjava-config/pom.xml
index 91edd9e86c5da7628d8debc774cbc43d2718b580..deeade0dd0fd8a47a90b06417011d1bbb7d3eeae 100644 (file)
--- a/openflowjava-config/pom.xml
+++ b/openflowjava-config/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. 
-    This program and the accompanying materials are made available under the 
-    terms of the Eclipse Public License v1.0 which accompanies this distribution, 
+<!-- Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved.
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v1.0 which accompanies this distribution,

     and is available at http://www.eclipse.org/legal/epl-v10.html -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     and is available at http://www.eclipse.org/legal/epl-v10.html -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

diff --git a/pom.xml b/pom.xml
index 71becad68b399a91a01f9e05cd650a28f0ff18a3..67148ce6b609735784b50fda4ee55f12e63bda7a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
         <ietf.model.version>2010.09.24.7-SNAPSHOT</ietf.model.version>
         <yang.ext.version>2013.09.07.7-SNAPSHOT</yang.ext.version>
         <maven.bundle.version>2.4.0</maven.bundle.version>
         <ietf.model.version>2010.09.24.7-SNAPSHOT</ietf.model.version>
         <yang.ext.version>2013.09.07.7-SNAPSHOT</yang.ext.version>
         <maven.bundle.version>2.4.0</maven.bundle.version>

-        <guava.version>14.0.1</guava.version> 
+        <guava.version>14.0.1</guava.version>

         <netty.version>4.0.23.Final</netty.version>
         <releaseplugin.version>2.3.2</releaseplugin.version>
         <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
         <netty.version>4.0.23.Final</netty.version>
         <releaseplugin.version>2.3.2</releaseplugin.version>
         <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>


@@ -266,7 +266,7 @@
                         <phase>deploy</phase>
                         <goals>
                             <goal>jar-no-fork</goal>
                         <phase>deploy</phase>
                         <goals>
                             <goal>jar-no-fork</goal>

-                        </goals> 
+                        </goals>

                     </execution>
                 </executions>
             </plugin>
                     </execution>
                 </executions>
             </plugin>

diff --git a/simple-client/pom.xml b/simple-client/pom.xml
index e73c7624c889775cf77ed1d54a72c33650c65d4c..a68633e1d92120a5daed4290f54fe00383838069 100644 (file)
--- a/simple-client/pom.xml
+++ b/simple-client/pom.xml
@@ -12,7 +12,7 @@
         <url>https://wiki.opendaylight.org/view/Openflow_Protocol_Library:Main</url>
       <tag>HEAD</tag>
   </scm>
         <url>https://wiki.opendaylight.org/view/Openflow_Protocol_Library:Main</url>
       <tag>HEAD</tag>
   </scm>

-    
+

     <build>
         <plugins>
             <plugin>
     <build>
         <plugins>
             <plugin>


@@ -26,7 +26,7 @@
             </plugin>
         </plugins>
     </build>
             </plugin>
         </plugins>
     </build>

-    
+

     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientSslContextFactory.java b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientSslContextFactory.java
index a6d93abac30843d01f405c1e2f6946dd46219ac8..9b46d6c01f0f0f1299b05e64f305b496853fe1a1 100644 (file)
--- a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientSslContextFactory.java
+++ b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ClientSslContextFactory.java
@@ -45,14 +45,14 @@ public final class ClientSslContextFactory {
 
             KeyManagerFactory kmf = KeyManagerFactory.getInstance(algorithm);
             kmf.init(ks, ClientSslKeyStore.getCertificatePassword());
 
             KeyManagerFactory kmf = KeyManagerFactory.getInstance(algorithm);
             kmf.init(ks, ClientSslKeyStore.getCertificatePassword());

-            
+

             KeyStore ts = KeyStore.getInstance("JKS");
             ts.load(ClientSslTrustStore.asInputStream(),
                     ClientSslTrustStore.getKeyStorePassword());
             KeyStore ts = KeyStore.getInstance("JKS");
             ts.load(ClientSslTrustStore.asInputStream(),
                     ClientSslTrustStore.getKeyStorePassword());

-            
+

             TrustManagerFactory tmf = TrustManagerFactory.getInstance(algorithm);
             tmf.init(ts);
             TrustManagerFactory tmf = TrustManagerFactory.getInstance(algorithm);
             tmf.init(ts);

-            
+

             clientContext = SSLContext.getInstance(PROTOCOL);
             clientContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
         } catch (Exception e) {
             clientContext = SSLContext.getInstance(PROTOCOL);
             clientContext.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null);
         } catch (Exception e) {

diff --git a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/OFClient.java b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/OFClient.java
index 02a2199a5e527b243e1e358410884a1b7341a299..169395c6fbd52b92ebe4b3550d73ef6164fc82e4 100644 (file)
--- a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/OFClient.java
+++ b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/OFClient.java
@@ -12,7 +12,7 @@ import com.google.common.util.concurrent.SettableFuture;
 
 /**
  * Unifying interface for simple clients / switch simulators
 
 /**
  * Unifying interface for simple clients / switch simulators

- * 
+ *

  * @author michal.polkorab
  */
 public interface OFClient extends Runnable {
  * @author michal.polkorab
  */
 public interface OFClient extends Runnable {

diff --git a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioFactory.java b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioFactory.java
index 264bedfd6651e9b033abe26844a1a5eb0bf4a455..a6afb6a503a9dcce21aba53d2f7077f8f4122f53 100644 (file)
--- a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioFactory.java
+++ b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioFactory.java
@@ -14,7 +14,7 @@ import org.opendaylight.openflowjava.util.ByteBufUtils;
 
 /**
  * Class for providing prepared handshake scenario
 
 /**
  * Class for providing prepared handshake scenario

- * 
+ *

  * @author michal.polkorab
  */
 public final class ScenarioFactory {
  * @author michal.polkorab
  */
 public final class ScenarioFactory {

diff --git a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioHandler.java b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioHandler.java
index 61333f87272b3902b34550cb973990a138e8903b..075c65681930f2d20f76601783b5e51ceaadf0fb 100644 (file)
--- a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioHandler.java
+++ b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/ScenarioHandler.java
@@ -19,7 +19,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
 import org.slf4j.LoggerFactory;
 
 /**

- * 
+ *

  * @author michal.polkorab
  *
  */
  * @author michal.polkorab
  *
  */


@@ -33,7 +33,7 @@ public class ScenarioHandler extends Thread {
     private boolean scenarioFinished = false;
 
     /**
     private boolean scenarioFinished = false;
 
     /**

-     * 
+     *

      * @param scenario
      */
     public ScenarioHandler(Stack<ClientEvent> scenario) {
      * @param scenario
      */
     public ScenarioHandler(Stack<ClientEvent> scenario) {


@@ -84,7 +84,7 @@ public class ScenarioHandler extends Thread {
             this.notify();
         }
     }
             this.notify();
         }
     }

-    
+

     /**
      * @return true if scenario is done / empty
      */
     /**
      * @return true if scenario is done / empty
      */

diff --git a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SendEvent.java b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SendEvent.java
index db339eb24fb5224e40a863fe826f1590265ba03a..c57652724a03d3c3a012d99eec1043c1fac4b7c0 100644 (file)
--- a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SendEvent.java
+++ b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SendEvent.java
@@ -17,7 +17,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Class representing sending message event
 
 /**
  * Class representing sending message event

- * 
+ *

  * @author michal.polkorab
  */
 public class SendEvent implements ClientEvent {
  * @author michal.polkorab
  */
 public class SendEvent implements ClientEvent {

diff --git a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClient.java b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClient.java
index 89854c7eff0a1a9a3ed5327203d3c8e21b403066..b097b1d16cf8f422f0b9b6e1a485a5f791a02d60 100644 (file)
--- a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClient.java
+++ b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClient.java
@@ -37,7 +37,7 @@ public class SimpleClient implements OFClient {
     private SettableFuture<Boolean> isOnlineFuture;
     private SettableFuture<Boolean> scenarioDone;
     private ScenarioHandler scenarioHandler;
     private SettableFuture<Boolean> isOnlineFuture;
     private SettableFuture<Boolean> scenarioDone;
     private ScenarioHandler scenarioHandler;

-    
+

     /**
      * Constructor of class
      *
     /**
      * Constructor of class
      *


@@ -54,7 +54,7 @@ public class SimpleClient implements OFClient {
         isOnlineFuture = SettableFuture.create();
         scenarioDone = SettableFuture.create();
     }
         isOnlineFuture = SettableFuture.create();
         scenarioDone = SettableFuture.create();
     }

-    
+

     /**
      * Starting class of {@link SimpleClient}
      */
     /**
      * Starting class of {@link SimpleClient}
      */

diff --git a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClientHandler.java b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClientHandler.java
index 1c8880675e392c1c85369f14803401855ff1a516..01e114bf15aabbbd5281e1131a121c464af9b6c6 100644 (file)
--- a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClientHandler.java
+++ b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClientHandler.java
@@ -62,7 +62,7 @@ public class SimpleClientHandler extends ChannelInboundHandlerAdapter {
         }
         scenarioHandler.setCtx(ctx);
         scenarioHandler.start();
         }
         scenarioHandler.setCtx(ctx);
         scenarioHandler.start();

-        
+

     }
 
     /**
     }
 
     /**

diff --git a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClientInitializer.java b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClientInitializer.java
index c44a660cd08de933c82a95ac4b5cc647f1d80de0..a2fe3a117ae359de4a6b7652d17a65af5600fe98 100644 (file)
--- a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClientInitializer.java
+++ b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SimpleClientInitializer.java
@@ -19,11 +19,11 @@ import javax.net.ssl.SSLEngine;
 import com.google.common.util.concurrent.SettableFuture;
 
 /** Initializes secured {@link SimpleClient} pipeline
 import com.google.common.util.concurrent.SettableFuture;
 
 /** Initializes secured {@link SimpleClient} pipeline

- * 
+ *

  * @author michal.polkorab
  */
 public class SimpleClientInitializer extends ChannelInitializer<NioSocketChannel> {
  * @author michal.polkorab
  */
 public class SimpleClientInitializer extends ChannelInitializer<NioSocketChannel> {

-    
+

     private SettableFuture<Boolean> isOnlineFuture;
     private boolean secured;
     private ScenarioHandler scenarioHandler;
     private SettableFuture<Boolean> isOnlineFuture;
     private boolean secured;
     private ScenarioHandler scenarioHandler;

diff --git a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SleepEvent.java b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SleepEvent.java
index 25ed0d460a7f46fea3deebae8e61b612aed17824..b1e1a50c64f5e5ebda864be74763050a440ea58d 100644 (file)
--- a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SleepEvent.java
+++ b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/SleepEvent.java
@@ -13,7 +13,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Class representing sleep (wait) event
 
 /**
  * Class representing sleep (wait) event

- * 
+ *

  * @author michal.polkorab
  */
 public class SleepEvent implements ClientEvent {
  * @author michal.polkorab
  */
 public class SleepEvent implements ClientEvent {


@@ -22,7 +22,7 @@ public class SleepEvent implements ClientEvent {
     private long sleepTime;
 
     /**
     private long sleepTime;
 
     /**

-     * 
+     *

      * @param sleepTime time of {@link Thread#sleep(long)} in milliseconds
      */
     public SleepEvent(long sleepTime) {
      * @param sleepTime time of {@link Thread#sleep(long)} in milliseconds
      */
     public SleepEvent(long sleepTime) {

diff --git a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/UdpSimpleClient.java b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/UdpSimpleClient.java
index 92e88672614c701b74c979fdb52e5b0ef1b24ae1..e9d69da1224d056312f442eeb9e5ae46dadf34bb 100644 (file)
--- a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/UdpSimpleClient.java
+++ b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/UdpSimpleClient.java
@@ -37,7 +37,7 @@ public class UdpSimpleClient implements OFClient {
     private SettableFuture<Boolean> isOnlineFuture;
     private SettableFuture<Boolean> scenarioDone;
     private ScenarioHandler scenarioHandler;
     private SettableFuture<Boolean> isOnlineFuture;
     private SettableFuture<Boolean> scenarioDone;
     private ScenarioHandler scenarioHandler;

-    
+

     /**
      * Constructor of class
      *
     /**
      * Constructor of class
      *


@@ -54,7 +54,7 @@ public class UdpSimpleClient implements OFClient {
         isOnlineFuture = SettableFuture.create();
         scenarioDone = SettableFuture.create();
     }
         isOnlineFuture = SettableFuture.create();
         scenarioDone = SettableFuture.create();
     }

-    
+

     /**
      * Starting class of {@link UdpSimpleClient}
      */
     /**
      * Starting class of {@link UdpSimpleClient}
      */


@@ -125,7 +125,7 @@ public class UdpSimpleClient implements OFClient {
             sc = new UdpSimpleClient(host, port);
         }
         sc.run();
             sc = new UdpSimpleClient(host, port);
         }
         sc.run();

-        
+

     }
 
     @Override
     }
 
     @Override

diff --git a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/UdpSimpleClientInitializer.java b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/UdpSimpleClientInitializer.java
index cd7a8a8a08eb465fd0bf8121ff4fe5d1ef2cb28a..11444427f0712026cafcc5eefad03904cddc7c00 100644 (file)
--- a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/UdpSimpleClientInitializer.java
+++ b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/UdpSimpleClientInitializer.java
@@ -16,11 +16,11 @@ import io.netty.channel.socket.nio.NioDatagramChannel;
 import com.google.common.util.concurrent.SettableFuture;
 
 /** Initializes udp pipeline
 import com.google.common.util.concurrent.SettableFuture;
 
 /** Initializes udp pipeline

- * 
+ *

  * @author michal.polkorab
  */
 public class UdpSimpleClientInitializer extends ChannelInitializer<NioDatagramChannel> {
  * @author michal.polkorab
  */
 public class UdpSimpleClientInitializer extends ChannelInitializer<NioDatagramChannel> {

-    
+

     private SettableFuture<Boolean> isOnlineFuture;
     private ScenarioHandler scenarioHandler;
 
     private SettableFuture<Boolean> isOnlineFuture;
     private ScenarioHandler scenarioHandler;
 

diff --git a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/WaitForMessageEvent.java b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/WaitForMessageEvent.java
index c4c786c64ebf4f8ab997ecf0fe25895bd49d02aa..bcf696e95b6e3b96d5ae60dca71e2e0be6d2dabe 100644 (file)
--- a/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/WaitForMessageEvent.java
+++ b/simple-client/src/main/java/org/opendaylight/openflowjava/protocol/impl/clients/WaitForMessageEvent.java
@@ -19,7 +19,7 @@ import org.slf4j.LoggerFactory;
  * @author michal.polkorab
  */
 public class WaitForMessageEvent implements ClientEvent {
  * @author michal.polkorab
  */
 public class WaitForMessageEvent implements ClientEvent {

-    
+

     private static final Logger LOGGER = LoggerFactory.getLogger(WaitForMessageEvent.class);
     private byte[] headerExpected;
     private byte[] headerReceived;
     private static final Logger LOGGER = LoggerFactory.getLogger(WaitForMessageEvent.class);
     private byte[] headerExpected;
     private byte[] headerReceived;

diff --git a/util/src/test/java/org/opendaylight/openflowjava/util/ByteBufUtilsTest.java b/util/src/test/java/org/opendaylight/openflowjava/util/ByteBufUtilsTest.java
index 9bbb0d743b874c43c45ba4bd736ea50603556e50..7113eb06a5d564cf8307aff011fe917e5a51cfaa 100644 (file)
--- a/util/src/test/java/org/opendaylight/openflowjava/util/ByteBufUtilsTest.java
+++ b/util/src/test/java/org/opendaylight/openflowjava/util/ByteBufUtilsTest.java
@@ -31,7 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 public class ByteBufUtilsTest {
 
     private byte[] expected = new byte[]{0x01, 0x02, 0x03, 0x04, 0x05, (byte) 0xff};
 public class ByteBufUtilsTest {
 
     private byte[] expected = new byte[]{0x01, 0x02, 0x03, 0x04, 0x05, (byte) 0xff};

-    
+

     /**
      * Test of {@link org.opendaylight.openflowjava.util.ByteBufUtils#hexStringToBytes(String)}
      */
     /**
      * Test of {@link org.opendaylight.openflowjava.util.ByteBufUtils#hexStringToBytes(String)}
      */


@@ -58,10 +58,10 @@ public class ByteBufUtilsTest {
     @Test
     public void testHexStringToByteBuf() {
         ByteBuf bb = ByteBufUtils.hexStringToByteBuf("01 02 03 04 05 ff");
     @Test
     public void testHexStringToByteBuf() {
         ByteBuf bb = ByteBufUtils.hexStringToByteBuf("01 02 03 04 05 ff");

-        
+

         Assert.assertArrayEquals(expected, byteBufToByteArray(bb));
     }
         Assert.assertArrayEquals(expected, byteBufToByteArray(bb));
     }

-    
+

     /**
      * Test of {@link ByteBufUtils#hexStringToByteBuf(String, ByteBuf)}
      */
     /**
      * Test of {@link ByteBufUtils#hexStringToByteBuf(String, ByteBuf)}
      */


@@ -72,13 +72,13 @@ public class ByteBufUtilsTest {
 
         Assert.assertArrayEquals(expected, byteBufToByteArray(buffer));
     }
 
         Assert.assertArrayEquals(expected, byteBufToByteArray(buffer));
     }

-    
+

     private static byte[] byteBufToByteArray(ByteBuf bb) {
         byte[] result = new byte[bb.readableBytes()];
         bb.readBytes(result);
         return result;
     }
     private static byte[] byteBufToByteArray(ByteBuf bb) {
         byte[] result = new byte[bb.readableBytes()];
         bb.readBytes(result);
         return result;
     }

-    
+

     /**
      * Test of {@link ByteBufUtils#fillBitMaskFromMap(java.util.Map)}
      */
     /**
      * Test of {@link ByteBufUtils#fillBitMaskFromMap(java.util.Map)}
      */


@@ -87,15 +87,15 @@ public class ByteBufUtilsTest {
         Map<Integer, Boolean> emptyMap = new HashMap<>();
         String expectedBinaryString = "00000000000000000000000000000000";
         String bitmaskInBinaryString = toBinaryString(emptyMap, 32);
         Map<Integer, Boolean> emptyMap = new HashMap<>();
         String expectedBinaryString = "00000000000000000000000000000000";
         String bitmaskInBinaryString = toBinaryString(emptyMap, 32);

-        
+

         Assert.assertEquals("Not null string", expectedBinaryString, bitmaskInBinaryString);
     }
 
     private static String toBinaryString(Map<Integer, Boolean> emptyMap, int length) {
         Assert.assertEquals("Not null string", expectedBinaryString, bitmaskInBinaryString);
     }
 
     private static String toBinaryString(Map<Integer, Boolean> emptyMap, int length) {

-        String binaryString = Integer.toBinaryString(ByteBufUtils.fillBitMaskFromMap(emptyMap)); 
+        String binaryString = Integer.toBinaryString(ByteBufUtils.fillBitMaskFromMap(emptyMap));

         return String.format("%"+length+"s", binaryString).replaceAll(" ", "0");
     }
         return String.format("%"+length+"s", binaryString).replaceAll(" ", "0");
     }

-    
+

     /**
      * Test of {@link ByteBufUtils#fillBitMaskFromMap(java.util.Map)}
      */
     /**
      * Test of {@link ByteBufUtils#fillBitMaskFromMap(java.util.Map)}
      */


@@ -110,7 +110,7 @@ public class ByteBufUtilsTest {
         bitmaskValueInBinarySytring = toBinaryString(fullMap, 32);
         Assert.assertEquals("Strings does not match", expectedBinaryString, bitmaskValueInBinarySytring);
     }
         bitmaskValueInBinarySytring = toBinaryString(fullMap, 32);
         Assert.assertEquals("Strings does not match", expectedBinaryString, bitmaskValueInBinarySytring);
     }

-    
+

     /**
      * Test of {@link ByteBufUtils#fillBitMaskFromMap(java.util.Map)}
      */
     /**
      * Test of {@link ByteBufUtils#fillBitMaskFromMap(java.util.Map)}
      */


@@ -125,7 +125,7 @@ public class ByteBufUtilsTest {
         bitmaskValueInBinarySytring = toBinaryString(zeroMap, 32);
         Assert.assertEquals("Strings does not match", expectedBinaryString, bitmaskValueInBinarySytring);
     }
         bitmaskValueInBinarySytring = toBinaryString(zeroMap, 32);
         Assert.assertEquals("Strings does not match", expectedBinaryString, bitmaskValueInBinarySytring);
     }

-    
+

     /**
      * Test of {@link ByteBufUtils#fillBitMaskFromMap(java.util.Map)}
      */
     /**
      * Test of {@link ByteBufUtils#fillBitMaskFromMap(java.util.Map)}
      */


@@ -145,7 +145,7 @@ public class ByteBufUtilsTest {
         bitmaskValueInBinarySytring = toBinaryString(randomMap, 32);
         Assert.assertEquals("Strings does not match", expectedBinaryString, bitmaskValueInBinarySytring);
     }
         bitmaskValueInBinarySytring = toBinaryString(randomMap, 32);
         Assert.assertEquals("Strings does not match", expectedBinaryString, bitmaskValueInBinarySytring);
     }

-    
+

     /**
      * Test of {@link ByteBufUtils#fillBitMaskFromList(List)}
      */
     /**
      * Test of {@link ByteBufUtils#fillBitMaskFromList(List)}
      */


@@ -155,17 +155,17 @@ public class ByteBufUtilsTest {
         emptyList.add(null);
         String expectedBinaryString = "00000000000000000000000000000000";
         String bitmaskInBinaryString = listToBinaryString(emptyList, 32);
         emptyList.add(null);
         String expectedBinaryString = "00000000000000000000000000000000";
         String bitmaskInBinaryString = listToBinaryString(emptyList, 32);

-        
+

         Assert.assertEquals("Not null string", expectedBinaryString, bitmaskInBinaryString);
     }
 
     private static String listToBinaryString(List<Boolean> emptyList, int length) {
         int[] bitMaskArray;
         bitMaskArray = ByteBufUtils.fillBitMaskFromList(emptyList);
         Assert.assertEquals("Not null string", expectedBinaryString, bitmaskInBinaryString);
     }
 
     private static String listToBinaryString(List<Boolean> emptyList, int length) {
         int[] bitMaskArray;
         bitMaskArray = ByteBufUtils.fillBitMaskFromList(emptyList);

-        String binaryString = Integer.toBinaryString(bitMaskArray[0]); 
+        String binaryString = Integer.toBinaryString(bitMaskArray[0]);

         return String.format("%"+length+"s", binaryString).replaceAll(" ", "0");
     }
         return String.format("%"+length+"s", binaryString).replaceAll(" ", "0");
     }

-    
+

     /**
      * Test of {@link ByteBufUtils#fillBitMaskFromList(List)}
      */
     /**
      * Test of {@link ByteBufUtils#fillBitMaskFromList(List)}
      */


@@ -180,7 +180,7 @@ public class ByteBufUtilsTest {
         bitmaskValueInBinarySytring = listToBinaryString(fullList, 32);
         Assert.assertEquals("Strings does not match", expectedBinaryString, bitmaskValueInBinarySytring);
     }
         bitmaskValueInBinarySytring = listToBinaryString(fullList, 32);
         Assert.assertEquals("Strings does not match", expectedBinaryString, bitmaskValueInBinarySytring);
     }

-    
+

     /**
      * Test of {@link ByteBufUtils#fillBitMaskFromList(List)}
      */
     /**
      * Test of {@link ByteBufUtils#fillBitMaskFromList(List)}
      */


@@ -195,7 +195,7 @@ public class ByteBufUtilsTest {
         bitmaskValueInBinarySytring = listToBinaryString(zeroList, 32);
         Assert.assertEquals("Strings does not match", expectedBinaryString, bitmaskValueInBinarySytring);
     }
         bitmaskValueInBinarySytring = listToBinaryString(zeroList, 32);
         Assert.assertEquals("Strings does not match", expectedBinaryString, bitmaskValueInBinarySytring);
     }

-    
+

     /**
      * Test of {@link ByteBufUtils#fillBitMaskFromList(List)}
      */
     /**
      * Test of {@link ByteBufUtils#fillBitMaskFromList(List)}
      */


@@ -323,7 +323,7 @@ public class ByteBufUtilsTest {
     public void testDecodeString() {
         ByteBuf buf = ByteBufUtils.hexStringToByteBuf("4A 41 4D 45 53 20 42 4F 4E 44 00 00 00 00 00 00");
         Assert.assertEquals("Wrong string decoded", "JAMES BOND", ByteBufUtils.decodeNullTerminatedString(buf, 16));
     public void testDecodeString() {
         ByteBuf buf = ByteBufUtils.hexStringToByteBuf("4A 41 4D 45 53 20 42 4F 4E 44 00 00 00 00 00 00");
         Assert.assertEquals("Wrong string decoded", "JAMES BOND", ByteBufUtils.decodeNullTerminatedString(buf, 16));

-        
+

         ByteBuf buf2 = ByteBufUtils.hexStringToByteBuf("53 50 49 44 45 52 4D 41 4E 00 00 00 00 00 00");
         Assert.assertEquals("Wrong string decoded", "SPIDERMAN", ByteBufUtils.decodeNullTerminatedString(buf2, 15));
     }
         ByteBuf buf2 = ByteBufUtils.hexStringToByteBuf("53 50 49 44 45 52 4D 41 4E 00 00 00 00 00 00");
         Assert.assertEquals("Wrong string decoded", "SPIDERMAN", ByteBufUtils.decodeNullTerminatedString(buf2, 15));
     }


@@ -409,7 +409,7 @@ public class ByteBufUtilsTest {
         String ipv4Address = ByteBufUtils.readIpv4Address(buffer);
         Assert.assertEquals("Wrong conversion", "10.20.30.40", ipv4Address);
         Assert.assertTrue("Unexpected data", buffer.readableBytes() == 0);
         String ipv4Address = ByteBufUtils.readIpv4Address(buffer);
         Assert.assertEquals("Wrong conversion", "10.20.30.40", ipv4Address);
         Assert.assertTrue("Unexpected data", buffer.readableBytes() == 0);

-        
+

         ByteBuf buffer2 = PooledByteBufAllocator.DEFAULT.buffer();
         buffer.writeByte(10);
         ipv4Address = ByteBufUtils.readIpv4Address(buffer2);
         ByteBuf buffer2 = PooledByteBufAllocator.DEFAULT.buffer();
         buffer.writeByte(10);
         ipv4Address = ByteBufUtils.readIpv4Address(buffer2);


@@ -432,7 +432,7 @@ public class ByteBufUtilsTest {
         String ipv4Address = ByteBufUtils.readIpv6Address(buffer);
         Assert.assertEquals("Wrong conversion", "000A:FFFF:1000:0000:0400:002A:0A08:B279", ipv4Address);
         Assert.assertTrue("Unexpected data", buffer.readableBytes() == 0);
         String ipv4Address = ByteBufUtils.readIpv6Address(buffer);
         Assert.assertEquals("Wrong conversion", "000A:FFFF:1000:0000:0400:002A:0A08:B279", ipv4Address);
         Assert.assertTrue("Unexpected data", buffer.readableBytes() == 0);

-        
+

         ByteBuf buffer2 = PooledByteBufAllocator.DEFAULT.buffer();
         buffer.writeShort(10);
         ipv4Address = ByteBufUtils.readIpv6Address(buffer2);
         ByteBuf buffer2 = PooledByteBufAllocator.DEFAULT.buffer();
         buffer.writeShort(10);
         ipv4Address = ByteBufUtils.readIpv6Address(buffer2);