Bug 2245 Fixed Avoid cycle between java packages

[openflowjava.git] / openflow-protocol-impl / src / test / java / org / opendaylight / openflowjava / protocol / impl / util / OF13MatchSerializer02Test.java

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..de60195a0433e05166ef31822dcf742cf8ae9157 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
@@ -16,9 +16,9 @@ import java.util.List;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.openflowjava.protocol.api.extensibility.MessageTypeKey;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFSerializer;
 import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry;
+import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.serialization.SerializerRegistryImpl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Dscp;
@@ -152,15 +152,15 @@ public class OF13MatchSerializer02Test {
         MatchBuilder builder = new MatchBuilder();
         builder.setType(OxmMatchType.class);
         Match match = builder.build();
-        
+
         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);
     }
-    
+
     /**
      * Testing serialization of match
      */
@@ -510,7 +510,7 @@ public class OF13MatchSerializer02Test {
         bosBuilder.setBos(true);
         entryBuilder.addAugmentation(BosMatchEntry.class, bosBuilder.build());
         entries.add(entryBuilder.build());
-        
+
         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());
-        
+
         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());
-        
+
         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());
-        
-        
-        
+
+
+
         builder.setMatchEntries(entries);
         Match match = builder.build();
-        
+
         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());