From ac1e6e9fa1bc7ee8758b6fdf711c48bd8e86258f Mon Sep 17 00:00:00 2001 From: "miroslav.macko" Date: Thu, 24 Aug 2017 15:22:41 +0200 Subject: [PATCH] Fix checkstyle warnings for impl/protocol test package See also: bug 8607 Change-Id: Icd8914faf38d0d6493dbe633b93cd2442e0bdfd4 Signed-off-by: miroslav.macko --- .../AbstractDeserializerTest.java | 33 ++++++++++++------- .../MessageDeserializerInjectorTest.java | 15 ++++++--- .../AbstractActionDeserializerTest.java | 2 +- .../CopyTtlInActionDeserializerTest.java | 5 ++- .../CopyTtlOutActionDeserializerTest.java | 5 ++- .../DecMplsTtlActionDeserializerTest.java | 5 ++- .../DecNwTtlActionDeserializerTest.java | 5 ++- .../action/GroupActionDeserializerTest.java | 5 ++- .../action/OutputActionDeserializerTest.java | 7 ++-- .../action/PopMplsActionDeserializerTest.java | 5 ++- .../action/PopPbbActionDeserializerTest.java | 5 ++- .../action/PopVlanActionDeserializerTest.java | 5 ++- .../PushMplsActionDeserializerTest.java | 5 ++- .../action/PushPbbActionDeserializerTest.java | 5 ++- .../PushVlanActionDeserializerTest.java | 5 ++- .../SetFieldActionDeserializerTest.java | 8 ++--- .../SetMplsTtlActionDeserializerTest.java | 5 ++- .../SetNwTtlActionDeserializerTest.java | 5 ++- .../SetQueueActionDeserializerTest.java | 5 ++- .../AbstractInstructionDeserializerTest.java | 2 +- ...plyActionsInstructionDeserializerTest.java | 11 ++++--- ...earActionsInstructionDeserializerTest.java | 5 ++- .../GoToTableInstructionDeserializerTest.java | 5 ++- .../MeterInstructionDeserializerTest.java | 5 ++- ...iteActionsInstructionDeserializerTest.java | 11 ++++--- ...teMetadataInstructionDeserializerTest.java | 26 +++++++-------- .../AbstractMatchEntryDeserializerTest.java | 2 ++ ...eHardwareAddressEntryDeserializerTest.java | 3 +- ...tHardwareAddressEntryDeserializerTest.java | 3 +- ...ernetDestinationEntryDeserializerTest.java | 3 +- .../EthernetSourceEntryDeserializerTest.java | 3 +- .../Ipv4DestinationEntryDeserializerTest.java | 3 +- .../Ipv4SourceEntryDeserializerTest.java | 3 +- .../Ipv6NdTargetEntryDeserializerTest.java | 7 ++-- .../match/MplsBosEntryDeserializerTest.java | 5 ++- .../match/MplsLabelEntryDeserializerTest.java | 5 ++- .../match/MplsTcEntryDeserializerTest.java | 5 ++- .../match/PbbEntryDeserializerTest.java | 5 ++- ...pDestinationPortEntryDeserializerTest.java | 3 +- .../SctpSourcePortEntryDeserializerTest.java | 3 +- ...pDestinationPortEntryDeserializerTest.java | 3 +- .../match/TcpFlagsEntryDeserializerTest.java | 5 ++- .../TcpSourcePortEntryDeserializerTest.java | 3 +- .../match/TunnelIdEntryDeserializerTest.java | 17 +++++----- ...pDestinationPortEntryDeserializerTest.java | 3 +- .../UdpSourcePortEntryDeserializerTest.java | 3 +- .../match/VlanVidEntryDeserializerTest.java | 2 +- .../messages/FlowMessageDeserializerTest.java | 5 ++- .../GroupMessageDeserializerTest.java | 5 ++- .../PacketInMessageDeserializerTest.java | 3 +- ...plyFlowAggregateStatsDeserializerTest.java | 4 +-- ...ltipartReplyFlowStatsDeserializerTest.java | 8 +++-- ...rtReplyFlowTableStatsDeserializerTest.java | 10 +++--- ...ltipartReplyGroupDescDeserializerTest.java | 8 +++-- ...artReplyGroupFeaturesDeserializerTest.java | 4 +-- ...tipartReplyGroupStatsDeserializerTest.java | 4 +-- ...MultipartReplyMessageDeserializerTest.java | 3 +- ...artReplyMeterFeaturesDeserializerTest.java | 2 +- ...tipartReplyMeterStatsDeserializerTest.java | 8 ++--- ...ultipartReplyPortDescDeserializerTest.java | 2 +- ...ltipartReplyPortStatsDeserializerTest.java | 27 +++++++-------- ...tipartReplyQueueStatsDeserializerTest.java | 6 ++-- ...artReplyTableFeaturesDeserializerTest.java | 14 ++++---- .../serialization/AbstractSerializerTest.java | 28 ++++++++-------- .../InstructionSerializerInjectorTest.java | 3 +- .../MessageSerializerInjectorTest.java | 3 +- .../actions/AbstractActionSerializerTest.java | 2 ++ .../AbstractInstructionSerializerTest.java | 2 ++ ...tExperimenterMatchEntrySerializerTest.java | 4 ++- .../AbstractMatchEntrySerializerTest.java | 6 +++- .../Ipv6DestinationEntrySerializerTest.java | 9 +++-- .../match/Ipv6NdSllEntrySerializerTest.java | 3 +- .../match/Ipv6NdTllEntrySerializerTest.java | 3 +- .../match/Ipv6SourceEntrySerializerTest.java | 9 +++-- .../match/VlanVidEntrySerializerTest.java | 2 +- .../messages/FlowMessageSerializerTest.java | 15 +++++---- .../messages/GroupMessageSerializerTest.java | 3 +- .../messages/MeterMessageSerializerTest.java | 11 ++++--- .../messages/PortMessageSerializerTest.java | 3 +- ...MultipartRequestMessageSerializerTest.java | 3 +- .../AbstractTablePropertySerializerTest.java | 1 + ...ctionsMissTablePropertySerializerTest.java | 4 +-- ...tfieldMissTablePropertySerializerTest.java | 4 +-- ...ctionsMissTablePropertySerializerTest.java | 4 +-- ...ctionsMissTablePropertySerializerTest.java | 4 +-- ...tfieldMissTablePropertySerializerTest.java | 4 +-- 86 files changed, 282 insertions(+), 250 deletions(-) diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/AbstractDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/AbstractDeserializerTest.java index 0555537ec7..6d15944550 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/AbstractDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/AbstractDeserializerTest.java @@ -70,7 +70,7 @@ public abstract class AbstractDeserializerTest { private final DeserializerRegistry registry; private final DeserializationFactory factory; - public DeserializerExtensionProviderImpl(final DeserializerRegistry registry, DeserializationFactory factory) { + DeserializerExtensionProviderImpl(final DeserializerRegistry registry, DeserializationFactory factory) { this.registry = registry; this.factory = factory; } @@ -86,53 +86,62 @@ public abstract class AbstractDeserializerTest { } @Override - public void registerActionDeserializer(ExperimenterActionDeserializerKey key, OFGeneralDeserializer deserializer) { + public void registerActionDeserializer(ExperimenterActionDeserializerKey key, + OFGeneralDeserializer deserializer) { } @Override - public void registerInstructionDeserializer(ExperimenterInstructionDeserializerKey key, OFGeneralDeserializer deserializer) { + public void registerInstructionDeserializer(ExperimenterInstructionDeserializerKey key, + OFGeneralDeserializer deserializer) { } @Override - public void registerMatchEntryDeserializer(MatchEntryDeserializerKey key, OFGeneralDeserializer deserializer) { + public void registerMatchEntryDeserializer(MatchEntryDeserializerKey key, + OFGeneralDeserializer deserializer) { } @Override - public void registerErrorDeserializer(ExperimenterIdDeserializerKey key, OFDeserializer deserializer) { + public void registerErrorDeserializer(ExperimenterIdDeserializerKey key, + OFDeserializer deserializer) { } @Override - public void registerExperimenterMessageDeserializer(ExperimenterIdDeserializerKey key, OFDeserializer deserializer) { + public void registerExperimenterMessageDeserializer(ExperimenterIdDeserializerKey key, + OFDeserializer deserializer) { } @Override - public void registerMultipartReplyMessageDeserializer(ExperimenterIdDeserializerKey key, OFDeserializer deserializer) { + public void registerMultipartReplyMessageDeserializer(ExperimenterIdDeserializerKey key, + OFDeserializer deserializer) { } @Override - public void registerMultipartReplyTFDeserializer(ExperimenterIdDeserializerKey key, OFGeneralDeserializer deserializer) { + public void registerMultipartReplyTFDeserializer(ExperimenterIdDeserializerKey key, + OFGeneralDeserializer deserializer) { } @Override - public void registerMeterBandDeserializer(ExperimenterIdDeserializerKey key, OFDeserializer deserializer) { + public void registerMeterBandDeserializer(ExperimenterIdDeserializerKey key, + OFDeserializer deserializer) { } @Override - public void registerQueuePropertyDeserializer(ExperimenterIdDeserializerKey key, OFDeserializer deserializer) { + public void registerQueuePropertyDeserializer(ExperimenterIdDeserializerKey key, + OFDeserializer deserializer) { } @Override - public void registerDeserializerMapping(TypeToClassKey typeToClassKey, Class aClass) { - factory.registerMapping(typeToClassKey, aClass); + public void registerDeserializerMapping(TypeToClassKey typeToClassKey, Class clazz) { + factory.registerMapping(typeToClassKey, clazz); } @Override diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MessageDeserializerInjectorTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MessageDeserializerInjectorTest.java index 1ad7eafb74..c63720d052 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MessageDeserializerInjectorTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/MessageDeserializerInjectorTest.java @@ -32,19 +32,24 @@ public class MessageDeserializerInjectorTest { @Mock private OFDeserializer ofDeserializer; - private Function, Consumer>>> injector; + private Function, Consumer>>> + injector; @Before public void setUp() throws Exception { - injector = MessageDeserializerInjector.createInjector(switchConnectionProvider, EncodeConstants.OF13_VERSION_ID); + injector = MessageDeserializerInjector.createInjector(switchConnectionProvider, EncodeConstants + .OF13_VERSION_ID); } @Test public void injectDeserializers() throws Exception { injector.apply(10).apply(OfHeader.class).accept(ofDeserializer); - verify(switchConnectionProvider).unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 10)); - verify(switchConnectionProvider).registerDeserializerMapping(new TypeToClassKey(EncodeConstants.OF13_VERSION_ID, 10), OfHeader.class); - verify(switchConnectionProvider).registerDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 10, OfHeader.class), ofDeserializer); + verify(switchConnectionProvider).unregisterDeserializerMapping(new TypeToClassKey(EncodeConstants + .OF13_VERSION_ID, 10)); + verify(switchConnectionProvider).registerDeserializerMapping(new TypeToClassKey(EncodeConstants + .OF13_VERSION_ID, 10), OfHeader.class); + verify(switchConnectionProvider).registerDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 10, + OfHeader.class), ofDeserializer); } } \ No newline at end of file diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/AbstractActionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/AbstractActionDeserializerTest.java index 216fd04e1c..fffe678e77 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/AbstractActionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/AbstractActionDeserializerTest.java @@ -9,7 +9,6 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.action; import io.netty.buffer.ByteBuf; - import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowplugin.api.openflow.protocol.deserialization.MessageCodeExperimenterKey; @@ -36,6 +35,7 @@ public abstract class AbstractActionDeserializerTest extends AbstractDeserialize } protected abstract short getType(); + protected abstract short getLength(); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/CopyTtlInActionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/CopyTtlInActionDeserializerTest.java index 395559d786..a50f1f1480 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/CopyTtlInActionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/CopyTtlInActionDeserializerTest.java @@ -11,14 +11,13 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.action; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlInCase; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class CopyTtlInActionDeserializerTest extends AbstractActionDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/CopyTtlOutActionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/CopyTtlOutActionDeserializerTest.java index 71d1e1384b..25544f8f52 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/CopyTtlOutActionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/CopyTtlOutActionDeserializerTest.java @@ -11,14 +11,13 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.action; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.CopyTtlOutCase; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class CopyTtlOutActionDeserializerTest extends AbstractActionDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/DecMplsTtlActionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/DecMplsTtlActionDeserializerTest.java index 5282be0285..13a8eae5e6 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/DecMplsTtlActionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/DecMplsTtlActionDeserializerTest.java @@ -11,14 +11,13 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.action; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.DecMplsTtlCase; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class DecMplsTtlActionDeserializerTest extends AbstractActionDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/DecNwTtlActionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/DecNwTtlActionDeserializerTest.java index dacaf003ef..cd1141be22 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/DecNwTtlActionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/DecNwTtlActionDeserializerTest.java @@ -11,14 +11,13 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.action; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.DecNwTtlCase; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class DecNwTtlActionDeserializerTest extends AbstractActionDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/GroupActionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/GroupActionDeserializerTest.java index 5282cff6eb..e0b71cc85d 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/GroupActionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/GroupActionDeserializerTest.java @@ -11,14 +11,13 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.action; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.GroupActionCase; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class GroupActionDeserializerTest extends AbstractActionDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/OutputActionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/OutputActionDeserializerTest.java index f20cfa281e..0eb2eb780e 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/OutputActionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/OutputActionDeserializerTest.java @@ -11,6 +11,8 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.action; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants; import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion; @@ -19,9 +21,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.acti import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.OutputActionCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.output.action._case.OutputAction; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class OutputActionDeserializerTest extends AbstractActionDeserializerTest { @Test @@ -39,7 +38,7 @@ public class OutputActionDeserializerTest extends AbstractActionDeserializerTest final OutputAction outputAction = OutputActionCase.class.cast(action).getOutputAction(); assertEquals(portNum, InventoryDataServiceUtil.portNumberfromNodeConnectorId( - OpenflowVersion.OF13, outputAction.getOutputNodeConnector().getValue()).intValue()); + OpenflowVersion.OF13, outputAction.getOutputNodeConnector().getValue()).intValue()); assertEquals(maxLength, outputAction.getMaxLength().shortValue()); assertEquals(0, in.readableBytes()); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PopMplsActionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PopMplsActionDeserializerTest.java index ca5287d1d9..b25ed21f47 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PopMplsActionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PopMplsActionDeserializerTest.java @@ -11,15 +11,14 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.action; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopMplsActionCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.pop.mpls.action._case.PopMplsAction; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class PopMplsActionDeserializerTest extends AbstractActionDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PopPbbActionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PopPbbActionDeserializerTest.java index 40ee87583f..e7f526326b 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PopPbbActionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PopPbbActionDeserializerTest.java @@ -11,14 +11,13 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.action; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopPbbActionCase; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class PopPbbActionDeserializerTest extends AbstractActionDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PopVlanActionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PopVlanActionDeserializerTest.java index 5bd30db962..c64334fa6d 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PopVlanActionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PopVlanActionDeserializerTest.java @@ -11,14 +11,13 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.action; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PopVlanActionCase; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class PopVlanActionDeserializerTest extends AbstractActionDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PushMplsActionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PushMplsActionDeserializerTest.java index 5e075afc2a..0b29e1ea2b 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PushMplsActionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PushMplsActionDeserializerTest.java @@ -11,14 +11,13 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.action; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushMplsActionCase; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class PushMplsActionDeserializerTest extends AbstractActionDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PushPbbActionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PushPbbActionDeserializerTest.java index 97b36f5a48..f3627b047c 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PushPbbActionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PushPbbActionDeserializerTest.java @@ -11,14 +11,13 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.action; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushPbbActionCase; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class PushPbbActionDeserializerTest extends AbstractActionDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PushVlanActionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PushVlanActionDeserializerTest.java index 7c5e65d026..9854425426 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PushVlanActionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PushVlanActionDeserializerTest.java @@ -11,14 +11,13 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.action; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.PushVlanActionCase; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class PushVlanActionDeserializerTest extends AbstractActionDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetFieldActionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetFieldActionDeserializerTest.java index 4155c95099..644aef2e40 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetFieldActionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetFieldActionDeserializerTest.java @@ -11,6 +11,8 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.action; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.util.BinContent; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; @@ -20,9 +22,6 @@ import org.opendaylight.openflowplugin.openflow.md.util.OpenflowPortsUtil; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetFieldCase; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class SetFieldActionDeserializerTest extends AbstractActionDeserializerTest { @Test @@ -39,7 +38,8 @@ public class SetFieldActionDeserializerTest extends AbstractActionDeserializerTe final Action action = deserializeAction(in); assertTrue(SetFieldCase.class.isInstance(action)); assertEquals( - OpenflowPortsUtil.getPortLogicalName(EncodeConstants.OF13_VERSION_ID, BinContent.intToUnsignedLong(portNum)), + OpenflowPortsUtil + .getPortLogicalName(EncodeConstants.OF13_VERSION_ID, BinContent.intToUnsignedLong(portNum)), SetFieldCase.class.cast(action).getSetField().getInPort().getValue()); assertEquals(0, in.readableBytes()); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetMplsTtlActionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetMplsTtlActionDeserializerTest.java index 2b4dfa61be..60f03194fd 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetMplsTtlActionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetMplsTtlActionDeserializerTest.java @@ -11,14 +11,13 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.action; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetMplsTtlActionCase; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class SetMplsTtlActionDeserializerTest extends AbstractActionDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetNwTtlActionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetNwTtlActionDeserializerTest.java index 95138ea138..598fe00a8a 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetNwTtlActionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetNwTtlActionDeserializerTest.java @@ -11,14 +11,13 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.action; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwTtlActionCase; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class SetNwTtlActionDeserializerTest extends AbstractActionDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetQueueActionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetQueueActionDeserializerTest.java index 5fe9c8844a..70f26f9ad6 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetQueueActionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/SetQueueActionDeserializerTest.java @@ -11,14 +11,13 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.action; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetQueueActionCase; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class SetQueueActionDeserializerTest extends AbstractActionDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/AbstractInstructionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/AbstractInstructionDeserializerTest.java index fc21cb044e..37330603a4 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/AbstractInstructionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/AbstractInstructionDeserializerTest.java @@ -9,7 +9,6 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.instruction; import io.netty.buffer.ByteBuf; - import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowplugin.api.openflow.protocol.deserialization.MessageCodeExperimenterKey; @@ -36,6 +35,7 @@ public abstract class AbstractInstructionDeserializerTest extends AbstractDeseri } protected abstract short getType(); + protected abstract short getLength(); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/ApplyActionsInstructionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/ApplyActionsInstructionDeserializerTest.java index 3db2597af2..3268c4f4ff 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/ApplyActionsInstructionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/ApplyActionsInstructionDeserializerTest.java @@ -10,6 +10,8 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.instructio import static org.junit.Assert.assertEquals; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; @@ -21,19 +23,18 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.acti import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.ApplyActionsCase; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class ApplyActionsInstructionDeserializerTest extends AbstractInstructionDeserializerTest { private OFDeserializer deserializer; @Override + @SuppressWarnings("checkstyle:LineLength") protected void init() { deserializer = getRegistry().getDeserializer( new MessageCodeActionExperimenterKey(EncodeConstants.OF13_VERSION_ID, getType(), Instruction.class, - ActionPath.NODES_NODE_TABLE_FLOW_INSTRUCTIONS_INSTRUCTION_APPLYACTIONSCASE_APPLYACTIONS_ACTION_ACTION_EXTENSIONLIST_EXTENSION, - null)); + ActionPath + .NODES_NODE_TABLE_FLOW_INSTRUCTIONS_INSTRUCTION_APPLYACTIONSCASE_APPLYACTIONS_ACTION_ACTION_EXTENSIONLIST_EXTENSION, + null)); } @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/ClearActionsInstructionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/ClearActionsInstructionDeserializerTest.java index ad4067ab49..c878af29a1 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/ClearActionsInstructionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/ClearActionsInstructionDeserializerTest.java @@ -10,14 +10,13 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.instructio import static org.junit.Assert.assertEquals; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.impl.util.InstructionConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.ClearActionsCase; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class ClearActionsInstructionDeserializerTest extends AbstractInstructionDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/GoToTableInstructionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/GoToTableInstructionDeserializerTest.java index a905a92284..09a2c29570 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/GoToTableInstructionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/GoToTableInstructionDeserializerTest.java @@ -10,14 +10,13 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.instructio import static org.junit.Assert.assertEquals; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.impl.util.InstructionConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.GoToTableCase; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class GoToTableInstructionDeserializerTest extends AbstractInstructionDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/MeterInstructionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/MeterInstructionDeserializerTest.java index efce9573ba..5255fca155 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/MeterInstructionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/MeterInstructionDeserializerTest.java @@ -10,14 +10,13 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.instructio import static org.junit.Assert.assertEquals; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.impl.util.InstructionConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.MeterCase; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class MeterInstructionDeserializerTest extends AbstractInstructionDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/WriteActionsInstructionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/WriteActionsInstructionDeserializerTest.java index 8998a1c347..1403efc9ab 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/WriteActionsInstructionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/WriteActionsInstructionDeserializerTest.java @@ -10,6 +10,8 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.instructio import static org.junit.Assert.assertEquals; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; @@ -21,19 +23,18 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.acti import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.WriteActionsCase; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class WriteActionsInstructionDeserializerTest extends AbstractInstructionDeserializerTest { private OFDeserializer deserializer; @Override + @SuppressWarnings("checkstyle:LineLength") protected void init() { deserializer = getRegistry().getDeserializer( new MessageCodeActionExperimenterKey(EncodeConstants.OF13_VERSION_ID, getType(), Instruction.class, - ActionPath.NODES_NODE_TABLE_FLOW_INSTRUCTIONS_INSTRUCTION_WRITEACTIONSCASE_WRITEACTIONS_ACTION_ACTION_EXTENSIONLIST_EXTENSION, - null)); + ActionPath + .NODES_NODE_TABLE_FLOW_INSTRUCTIONS_INSTRUCTION_WRITEACTIONSCASE_WRITEACTIONS_ACTION_ACTION_EXTENSIONLIST_EXTENSION, + null)); } @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/WriteMetadataInstructionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/WriteMetadataInstructionDeserializerTest.java index 5d435d778c..2b1bec2ffa 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/WriteMetadataInstructionDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/instruction/WriteMetadataInstructionDeserializerTest.java @@ -8,11 +8,12 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.instruction; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import java.math.BigInteger; - import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.impl.util.InstructionConstants; @@ -20,9 +21,6 @@ import org.opendaylight.openflowplugin.openflow.md.util.ByteUtil; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.Instruction; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.WriteMetadataCase; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class WriteMetadataInstructionDeserializerTest extends AbstractInstructionDeserializerTest { @Test @@ -39,16 +37,18 @@ public class WriteMetadataInstructionDeserializerTest extends AbstractInstructio assertEquals(WriteMetadataCase.class, instruction.getImplementedInterface()); assertArrayEquals( - ByteUtil - .convertBigIntegerToNBytes(metadata, EncodeConstants.SIZE_OF_LONG_IN_BYTES), - ByteUtil - .convertBigIntegerToNBytes(WriteMetadataCase.class.cast(instruction).getWriteMetadata().getMetadata(), EncodeConstants.SIZE_OF_LONG_IN_BYTES)); + ByteUtil + .convertBigIntegerToNBytes(metadata, EncodeConstants.SIZE_OF_LONG_IN_BYTES), + ByteUtil + .convertBigIntegerToNBytes(WriteMetadataCase.class.cast(instruction).getWriteMetadata() + .getMetadata(), EncodeConstants.SIZE_OF_LONG_IN_BYTES)); assertArrayEquals( - ByteUtil - .convertBigIntegerToNBytes(metadataMask, EncodeConstants.SIZE_OF_LONG_IN_BYTES), - ByteUtil - .convertBigIntegerToNBytes(WriteMetadataCase.class.cast(instruction).getWriteMetadata().getMetadataMask(), EncodeConstants.SIZE_OF_LONG_IN_BYTES)); + ByteUtil + .convertBigIntegerToNBytes(metadataMask, EncodeConstants.SIZE_OF_LONG_IN_BYTES), + ByteUtil + .convertBigIntegerToNBytes(WriteMetadataCase.class.cast(instruction).getWriteMetadata() + .getMetadataMask(), EncodeConstants.SIZE_OF_LONG_IN_BYTES)); assertEquals(0, in.readableBytes()); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/AbstractMatchEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/AbstractMatchEntryDeserializerTest.java index 893da22b93..5657582768 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/AbstractMatchEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/AbstractMatchEntryDeserializerTest.java @@ -87,7 +87,9 @@ public abstract class AbstractMatchEntryDeserializerTest extends AbstractDeseria } protected abstract int getOxmClassCode(); + protected abstract int getOxmFieldCode(); + protected abstract int getValueLength(); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/ArpSourceHardwareAddressEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/ArpSourceHardwareAddressEntryDeserializerTest.java index fa8f87d2a1..c3f29db1d7 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/ArpSourceHardwareAddressEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/ArpSourceHardwareAddressEntryDeserializerTest.java @@ -32,7 +32,8 @@ public class ArpSourceHardwareAddressEntryDeserializerTest extends AbstractMatch in.writeBytes(IetfYangUtil.INSTANCE.bytesFor(arpSourceHardwareAddress)); assertEquals(arpSourceHardwareAddress.getValue(), - ArpMatch.class.cast(deserialize(in).getLayer3Match()).getArpSourceHardwareAddress().getAddress().getValue()); + ArpMatch.class.cast(deserialize(in).getLayer3Match()).getArpSourceHardwareAddress().getAddress() + .getValue()); assertEquals(0, in.readableBytes()); writeHeader(in, true); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/ArpTargetHardwareAddressEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/ArpTargetHardwareAddressEntryDeserializerTest.java index 36ec142209..1188ade3b2 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/ArpTargetHardwareAddressEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/ArpTargetHardwareAddressEntryDeserializerTest.java @@ -32,7 +32,8 @@ public class ArpTargetHardwareAddressEntryDeserializerTest extends AbstractMatch in.writeBytes(IetfYangUtil.INSTANCE.bytesFor(arpTargetHardwareAddress)); assertEquals(arpTargetHardwareAddress.getValue(), - ArpMatch.class.cast(deserialize(in).getLayer3Match()).getArpTargetHardwareAddress().getAddress().getValue()); + ArpMatch.class.cast(deserialize(in).getLayer3Match()).getArpTargetHardwareAddress().getAddress() + .getValue()); assertEquals(0, in.readableBytes()); writeHeader(in, true); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/EthernetDestinationEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/EthernetDestinationEntryDeserializerTest.java index 41da2f7ced..1c488ec298 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/EthernetDestinationEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/EthernetDestinationEntryDeserializerTest.java @@ -30,7 +30,8 @@ public class EthernetDestinationEntryDeserializerTest extends AbstractMatchEntry writeHeader(in, false); in.writeBytes(IetfYangUtil.INSTANCE.bytesFor(ethernetDestinationAddress)); - assertEquals(ethernetDestinationAddress.getValue(), deserialize(in).getEthernetMatch().getEthernetDestination().getAddress().getValue()); + assertEquals(ethernetDestinationAddress.getValue(), deserialize(in).getEthernetMatch().getEthernetDestination() + .getAddress().getValue()); assertEquals(0, in.readableBytes()); writeHeader(in, true); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/EthernetSourceEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/EthernetSourceEntryDeserializerTest.java index 30c2534e6a..ed83b661ac 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/EthernetSourceEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/EthernetSourceEntryDeserializerTest.java @@ -30,7 +30,8 @@ public class EthernetSourceEntryDeserializerTest extends AbstractMatchEntryDeser writeHeader(in, false); in.writeBytes(IetfYangUtil.INSTANCE.bytesFor(ethernetSourceAddress)); - assertEquals(ethernetSourceAddress.getValue(), deserialize(in).getEthernetMatch().getEthernetSource().getAddress().getValue()); + assertEquals(ethernetSourceAddress.getValue(), + deserialize(in).getEthernetMatch().getEthernetSource().getAddress().getValue()); assertEquals(0, in.readableBytes()); writeHeader(in, true); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv4DestinationEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv4DestinationEntryDeserializerTest.java index 907a05a27f..5360d05ef2 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv4DestinationEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv4DestinationEntryDeserializerTest.java @@ -10,10 +10,9 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.match; import static org.junit.Assert.assertEquals; -import java.util.Iterator; - import io.netty.buffer.ByteBuf; import io.netty.buffer.UnpooledByteBufAllocator; +import java.util.Iterator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants; diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv4SourceEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv4SourceEntryDeserializerTest.java index aa7cfb8598..3f52d80e86 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv4SourceEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv4SourceEntryDeserializerTest.java @@ -10,10 +10,9 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.match; import static org.junit.Assert.assertEquals; -import java.util.Iterator; - import io.netty.buffer.ByteBuf; import io.netty.buffer.UnpooledByteBufAllocator; +import java.util.Iterator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants; diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv6NdTargetEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv6NdTargetEntryDeserializerTest.java index 8c65891ba0..cbd6d6225c 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv6NdTargetEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/Ipv6NdTargetEntryDeserializerTest.java @@ -8,9 +8,11 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.match; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants; @@ -18,9 +20,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types. import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv6Match; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class Ipv6NdTargetEntryDeserializerTest extends AbstractMatchEntryDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MplsBosEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MplsBosEntryDeserializerTest.java index 23eba5bd04..e9853d9e87 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MplsBosEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MplsBosEntryDeserializerTest.java @@ -10,14 +10,13 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.match; import static org.junit.Assert.assertEquals; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.ProtocolMatchFields; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class MplsBosEntryDeserializerTest extends AbstractMatchEntryDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MplsLabelEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MplsLabelEntryDeserializerTest.java index 25767acf97..e6d96d2d15 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MplsLabelEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MplsLabelEntryDeserializerTest.java @@ -10,14 +10,13 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.match; import static org.junit.Assert.assertEquals; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.ProtocolMatchFields; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class MplsLabelEntryDeserializerTest extends AbstractMatchEntryDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MplsTcEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MplsTcEntryDeserializerTest.java index 4ce947718f..bdba3a8b14 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MplsTcEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MplsTcEntryDeserializerTest.java @@ -10,14 +10,13 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.match; import static org.junit.Assert.assertEquals; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.ProtocolMatchFields; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class MplsTcEntryDeserializerTest extends AbstractMatchEntryDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/PbbEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/PbbEntryDeserializerTest.java index d149c97f81..57d5b52ee1 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/PbbEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/PbbEntryDeserializerTest.java @@ -10,14 +10,13 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.match; import static org.junit.Assert.assertEquals; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.ProtocolMatchFields; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class PbbEntryDeserializerTest extends AbstractMatchEntryDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/SctpDestinationPortEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/SctpDestinationPortEntryDeserializerTest.java index e2df9f5dc2..f470ad7314 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/SctpDestinationPortEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/SctpDestinationPortEntryDeserializerTest.java @@ -27,7 +27,8 @@ public class SctpDestinationPortEntryDeserializerTest extends AbstractMatchEntry writeHeader(in, false); in.writeShort(port); - assertEquals(port, SctpMatch.class.cast(deserialize(in).getLayer4Match()).getSctpDestinationPort().getValue().intValue()); + assertEquals(port, SctpMatch.class.cast(deserialize(in).getLayer4Match()).getSctpDestinationPort().getValue() + .intValue()); assertEquals(0, in.readableBytes()); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/SctpSourcePortEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/SctpSourcePortEntryDeserializerTest.java index b4681511e9..7133895525 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/SctpSourcePortEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/SctpSourcePortEntryDeserializerTest.java @@ -27,7 +27,8 @@ public class SctpSourcePortEntryDeserializerTest extends AbstractMatchEntryDeser writeHeader(in, false); in.writeShort(port); - assertEquals(port, SctpMatch.class.cast(deserialize(in).getLayer4Match()).getSctpSourcePort().getValue().intValue()); + assertEquals(port, SctpMatch.class.cast(deserialize(in).getLayer4Match()).getSctpSourcePort().getValue() + .intValue()); assertEquals(0, in.readableBytes()); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/TcpDestinationPortEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/TcpDestinationPortEntryDeserializerTest.java index 97521b9227..35d64f8046 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/TcpDestinationPortEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/TcpDestinationPortEntryDeserializerTest.java @@ -27,7 +27,8 @@ public class TcpDestinationPortEntryDeserializerTest extends AbstractMatchEntryD writeHeader(in, false); in.writeShort(port); - assertEquals(port, TcpMatch.class.cast(deserialize(in).getLayer4Match()).getTcpDestinationPort().getValue().intValue()); + assertEquals(port, TcpMatch.class.cast(deserialize(in).getLayer4Match()).getTcpDestinationPort().getValue() + .intValue()); assertEquals(0, in.readableBytes()); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/TcpFlagsEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/TcpFlagsEntryDeserializerTest.java index 020f30525a..5aef1bd0f0 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/TcpFlagsEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/TcpFlagsEntryDeserializerTest.java @@ -10,14 +10,13 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.match; import static org.junit.Assert.assertEquals; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.TcpFlagsMatch; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class TcpFlagsEntryDeserializerTest extends AbstractMatchEntryDeserializerTest { @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/TcpSourcePortEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/TcpSourcePortEntryDeserializerTest.java index fbb4bf16cd..f0b1725dfa 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/TcpSourcePortEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/TcpSourcePortEntryDeserializerTest.java @@ -27,7 +27,8 @@ public class TcpSourcePortEntryDeserializerTest extends AbstractMatchEntryDeseri writeHeader(in, false); in.writeShort(port); - assertEquals(port, TcpMatch.class.cast(deserialize(in).getLayer4Match()).getTcpSourcePort().getValue().intValue()); + assertEquals(port, TcpMatch.class.cast(deserialize(in).getLayer4Match()).getTcpSourcePort().getValue() + .intValue()); assertEquals(0, in.readableBytes()); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/TunnelIdEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/TunnelIdEntryDeserializerTest.java index b3432b2995..4b3f0e7a40 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/TunnelIdEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/TunnelIdEntryDeserializerTest.java @@ -11,6 +11,8 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.match; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import java.math.BigInteger; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; @@ -18,9 +20,6 @@ import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants; import org.opendaylight.openflowplugin.openflow.md.util.ByteUtil; import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.Tunnel; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class TunnelIdEntryDeserializerTest extends AbstractMatchEntryDeserializerTest { @Test @@ -34,8 +33,8 @@ public class TunnelIdEntryDeserializerTest extends AbstractMatchEntryDeserialize Tunnel match = deserialize(in).getTunnel(); assertArrayEquals( - ByteUtil.convertBigIntegerToNBytes(tunnelId, EncodeConstants.SIZE_OF_LONG_IN_BYTES), - ByteUtil.convertBigIntegerToNBytes(match.getTunnelId(), EncodeConstants.SIZE_OF_LONG_IN_BYTES)); + ByteUtil.convertBigIntegerToNBytes(tunnelId, EncodeConstants.SIZE_OF_LONG_IN_BYTES), + ByteUtil.convertBigIntegerToNBytes(match.getTunnelId(), EncodeConstants.SIZE_OF_LONG_IN_BYTES)); assertEquals(0, in.readableBytes()); @@ -45,11 +44,11 @@ public class TunnelIdEntryDeserializerTest extends AbstractMatchEntryDeserialize match = deserialize(in).getTunnel(); assertArrayEquals( - ByteUtil.convertBigIntegerToNBytes(tunnelId, EncodeConstants.SIZE_OF_LONG_IN_BYTES), - ByteUtil.convertBigIntegerToNBytes(match.getTunnelId(), EncodeConstants.SIZE_OF_LONG_IN_BYTES)); + ByteUtil.convertBigIntegerToNBytes(tunnelId, EncodeConstants.SIZE_OF_LONG_IN_BYTES), + ByteUtil.convertBigIntegerToNBytes(match.getTunnelId(), EncodeConstants.SIZE_OF_LONG_IN_BYTES)); assertArrayEquals( - ByteUtil.convertBigIntegerToNBytes(tunnelIdMask, EncodeConstants.SIZE_OF_LONG_IN_BYTES), - ByteUtil.convertBigIntegerToNBytes(match.getTunnelMask(), EncodeConstants.SIZE_OF_LONG_IN_BYTES)); + ByteUtil.convertBigIntegerToNBytes(tunnelIdMask, EncodeConstants.SIZE_OF_LONG_IN_BYTES), + ByteUtil.convertBigIntegerToNBytes(match.getTunnelMask(), EncodeConstants.SIZE_OF_LONG_IN_BYTES)); assertEquals(0, in.readableBytes()); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/UdpDestinationPortEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/UdpDestinationPortEntryDeserializerTest.java index 5120b6499f..5eb9c14ff2 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/UdpDestinationPortEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/UdpDestinationPortEntryDeserializerTest.java @@ -27,7 +27,8 @@ public class UdpDestinationPortEntryDeserializerTest extends AbstractMatchEntryD writeHeader(in, false); in.writeShort(port); - assertEquals(port, UdpMatch.class.cast(deserialize(in).getLayer4Match()).getUdpDestinationPort().getValue().intValue()); + assertEquals(port, UdpMatch.class.cast(deserialize(in).getLayer4Match()).getUdpDestinationPort().getValue() + .intValue()); assertEquals(0, in.readableBytes()); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/UdpSourcePortEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/UdpSourcePortEntryDeserializerTest.java index c323e92041..1145b9a1d4 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/UdpSourcePortEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/UdpSourcePortEntryDeserializerTest.java @@ -27,7 +27,8 @@ public class UdpSourcePortEntryDeserializerTest extends AbstractMatchEntryDeseri writeHeader(in, false); in.writeShort(port); - assertEquals(port, UdpMatch.class.cast(deserialize(in).getLayer4Match()).getUdpSourcePort().getValue().intValue()); + assertEquals(port, UdpMatch.class.cast(deserialize(in).getLayer4Match()).getUdpSourcePort().getValue() + .intValue()); assertEquals(0, in.readableBytes()); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/VlanVidEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/VlanVidEntryDeserializerTest.java index ba1d95e7ba..fd1d975204 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/VlanVidEntryDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/VlanVidEntryDeserializerTest.java @@ -25,7 +25,7 @@ public class VlanVidEntryDeserializerTest extends AbstractMatchEntryDeserializer public void deserializeEntry() throws Exception { final ByteBuf in = UnpooledByteBufAllocator.DEFAULT.buffer(); final int vlanVid = 8; - final byte[] vlanMask = new byte[] { 16, 0 }; + final byte[] vlanMask = new byte[]{16, 0}; writeHeader(in, false); in.writeShort(vlanVid | (1 << 12)); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializerTest.java index b25cd90ecf..89837a405e 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/FlowMessageDeserializerTest.java @@ -10,6 +10,8 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.messages; import static org.junit.Assert.assertEquals; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants; @@ -24,9 +26,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.ApplyActionsCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.FlowModCommand; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class FlowMessageDeserializerTest extends AbstractDeserializerTest { private static final byte PADDING = 2; diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/GroupMessageDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/GroupMessageDeserializerTest.java index fe15c4638c..3a24e8e130 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/GroupMessageDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/GroupMessageDeserializerTest.java @@ -10,6 +10,8 @@ package org.opendaylight.openflowplugin.impl.protocol.deserialization.messages; import static org.junit.Assert.assertEquals; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.UnpooledByteBufAllocator; import org.junit.Test; import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants; @@ -20,9 +22,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.Group import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.buckets.Bucket; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupModCommand; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.UnpooledByteBufAllocator; - public class GroupMessageDeserializerTest extends AbstractDeserializerTest { private static final byte PADDING = 1; diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PacketInMessageDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PacketInMessageDeserializerTest.java index 1e2275c1c2..a41db26db3 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PacketInMessageDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/messages/PacketInMessageDeserializerTest.java @@ -72,7 +72,8 @@ public class PacketInMessageDeserializerTest extends AbstractDeserializerTest { buffer.writeZero(PADDING_IN_PACKET_IN_HEADER); buffer.writeBytes(PAYLOAD); - final PacketInMessage message = (PacketInMessage) getFactory().deserialize(buffer, EncodeConstants.OF13_VERSION_ID); + final PacketInMessage message = + (PacketInMessage) getFactory().deserialize(buffer, EncodeConstants.OF13_VERSION_ID); assertEquals(XID, message.getXid().intValue()); assertEquals(PacketInUtil.getMdSalPacketInReason(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyFlowAggregateStatsDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyFlowAggregateStatsDeserializerTest.java index fce52a43c6..e1a36578d7 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyFlowAggregateStatsDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyFlowAggregateStatsDeserializerTest.java @@ -17,8 +17,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.m import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType; public class MultipartReplyFlowAggregateStatsDeserializerTest extends AbstractMultipartDeserializerTest { - private static final long PACKET_COUNT = 6l; - private static final long BYTE_COUNT = 256l; + private static final long PACKET_COUNT = 6L; + private static final long BYTE_COUNT = 256L; private static final int FLOW_COUNT = 3; private static final byte PADDING_IN_MULTIPART_REPLY_HEADER = 4; diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyFlowStatsDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyFlowStatsDeserializerTest.java index 963a54ebd0..8d40c5a248 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyFlowStatsDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyFlowStatsDeserializerTest.java @@ -29,7 +29,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.WriteActionsCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType; -public class MultipartReplyFlowStatsDeserializerTest extends AbstractMultipartDeserializerTest{ +public class MultipartReplyFlowStatsDeserializerTest extends AbstractMultipartDeserializerTest { private static final byte PADDING_IN_FLOW_STATS_HEADER_01 = 1; private static final byte PADDING_IN_FLOW_STATS_HEADER_02 = 4; @@ -144,7 +144,8 @@ public class MultipartReplyFlowStatsDeserializerTest extends AbstractMultipartDe assertEquals(2, flowAndStatisticsMapList.getInstructions().getInstruction().size()); - final Instruction instruction = flowAndStatisticsMapList.getInstructions().getInstruction().get(0).getInstruction(); + final Instruction instruction = + flowAndStatisticsMapList.getInstructions().getInstruction().get(0).getInstruction(); assertEquals(ApplyActionsCase.class, instruction.getImplementedInterface()); final ApplyActionsCase applyActions = ApplyActionsCase.class.cast(instruction); @@ -152,7 +153,8 @@ public class MultipartReplyFlowStatsDeserializerTest extends AbstractMultipartDe assertEquals(PopPbbActionCase.class, applyActions.getApplyActions().getAction().get(0) .getAction().getImplementedInterface()); - final Instruction instruction1 = flowAndStatisticsMapList.getInstructions().getInstruction().get(1).getInstruction(); + final Instruction instruction1 = + flowAndStatisticsMapList.getInstructions().getInstruction().get(1).getInstruction(); assertEquals(WriteActionsCase.class, instruction1.getImplementedInterface()); final WriteActionsCase writeActions = WriteActionsCase.class.cast(instruction1); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyFlowTableStatsDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyFlowTableStatsDeserializerTest.java index 83dde69f33..8613feb869 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyFlowTableStatsDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyFlowTableStatsDeserializerTest.java @@ -18,8 +18,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13 public class MultipartReplyFlowTableStatsDeserializerTest extends AbstractMultipartDeserializerTest { private static final byte TABLE_ID = 2; - private static final long PACKETS_LOOKEDUP = 1l; - private static final long PACKETS_MATCHED = 2l; + private static final long PACKETS_LOOKEDUP = 1L; + private static final long PACKETS_MATCHED = 2L; private static final int ACTIVE_FLOWS = 3; private static final byte PADDING_IN_TABLE_HEADER = 3; @@ -35,8 +35,10 @@ public class MultipartReplyFlowTableStatsDeserializerTest extends AbstractMultip final MultipartReplyFlowTableStats reply = (MultipartReplyFlowTableStats) deserializeMultipart(buffer); assertEquals(TABLE_ID, reply.getFlowTableAndStatisticsMap().get(0).getTableId().getValue().byteValue()); assertEquals(ACTIVE_FLOWS, reply.getFlowTableAndStatisticsMap().get(0).getActiveFlows().getValue().intValue()); - assertEquals(PACKETS_LOOKEDUP, reply.getFlowTableAndStatisticsMap().get(0).getPacketsLookedUp().getValue().longValue()); - assertEquals(PACKETS_MATCHED, reply.getFlowTableAndStatisticsMap().get(0).getPacketsMatched().getValue().longValue()); + assertEquals(PACKETS_LOOKEDUP, reply.getFlowTableAndStatisticsMap().get(0).getPacketsLookedUp().getValue() + .longValue()); + assertEquals(PACKETS_MATCHED, reply.getFlowTableAndStatisticsMap().get(0).getPacketsMatched().getValue() + .longValue()); assertEquals(0, buffer.readableBytes()); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupDescDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupDescDeserializerTest.java index f3b86dd1c4..a139ee2d40 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupDescDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupDescDeserializerTest.java @@ -18,7 +18,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111. import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupTypes; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType; -public class MultipartReplyGroupDescDeserializerTest extends AbstractMultipartDeserializerTest{ +public class MultipartReplyGroupDescDeserializerTest extends AbstractMultipartDeserializerTest { private static final byte PADDING_IN_GROUP_DESC_HEADER = 1; private static final byte PADDING_IN_BUCKETS_HEADER = 4; private static final short ITEM_LENGTH = 32; @@ -51,8 +51,10 @@ public class MultipartReplyGroupDescDeserializerTest extends AbstractMultipartDe assertEquals(GROUP_ID, reply.getGroupDescStats().get(0).getGroupId().getValue().intValue()); assertEquals(WEIGHT, reply.getGroupDescStats().get(0).getBuckets().getBucket().get(0).getWeight().intValue()); - assertEquals(WATCH_PORT, reply.getGroupDescStats().get(0).getBuckets().getBucket().get(0).getWatchPort().intValue()); - assertEquals(WATCH_GROUP, reply.getGroupDescStats().get(0).getBuckets().getBucket().get(0).getWatchGroup().intValue()); + assertEquals(WATCH_PORT, reply.getGroupDescStats().get(0).getBuckets().getBucket().get(0).getWatchPort() + .intValue()); + assertEquals(WATCH_GROUP, reply.getGroupDescStats().get(0).getBuckets().getBucket().get(0).getWatchGroup() + .intValue()); assertEquals(GROUP_TYPE, reply.getGroupDescStats().get(0).getGroupType().getIntValue()); assertEquals(0, buffer.readableBytes()); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupFeaturesDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupFeaturesDeserializerTest.java index e7fbb80e5c..1de6d0ca60 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupFeaturesDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupFeaturesDeserializerTest.java @@ -28,8 +28,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.Group import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType; public class MultipartReplyGroupFeaturesDeserializerTest extends AbstractMultipartDeserializerTest { - private static final List MAX_GROUPS_LIST = Arrays.asList(1l, 2l, 3l, 4l); - private static final List ACTIONS_LIST = Arrays.asList(5l, 6l, 7l, 8l); + private static final List MAX_GROUPS_LIST = Arrays.asList(1L, 2L, 3L, 4L); + private static final List ACTIONS_LIST = Arrays.asList(5L, 6L, 7L, 8L); private static final List GROUP_TYPES_SUPPORTED = Arrays.asList( GroupTypes.GroupAll, diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupStatsDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupStatsDeserializerTest.java index 367abcc026..bf7070873b 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupStatsDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupStatsDeserializerTest.java @@ -25,8 +25,8 @@ public class MultipartReplyGroupStatsDeserializerTest extends AbstractMultipartD private static final int REF_COUNT = 4; private static final int SECOND = 5; private static final int NANOSECOND = 6; - private static final long PACKET_COUNT = 1l; - private static final long BYTE_COUNT = 2l; + private static final long PACKET_COUNT = 1L; + private static final long BYTE_COUNT = 2L; @Test public void testDeserialize() throws Exception { diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMessageDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMessageDeserializerTest.java index 8a401ffda4..ff882a3405 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMessageDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMessageDeserializerTest.java @@ -148,7 +148,8 @@ public class MultipartReplyMessageDeserializerTest extends AbstractDeserializerT assertEquals(1, flowAndStatisticsMapList.getInstructions().getInstruction().size()); - final Instruction instruction = flowAndStatisticsMapList.getInstructions().getInstruction().get(0).getInstruction(); + final Instruction instruction = + flowAndStatisticsMapList.getInstructions().getInstruction().get(0).getInstruction(); assertEquals(ApplyActionsCase.class, instruction.getImplementedInterface()); final ApplyActionsCase applyActions = ApplyActionsCase.class.cast(instruction); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterFeaturesDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterFeaturesDeserializerTest.java index 5a97ca3f9a..e790b39532 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterFeaturesDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterFeaturesDeserializerTest.java @@ -26,7 +26,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.Meter import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.MeterStats; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType; -public class MultipartReplyMeterFeaturesDeserializerTest extends AbstractMultipartDeserializerTest{ +public class MultipartReplyMeterFeaturesDeserializerTest extends AbstractMultipartDeserializerTest { private static final int MAX_METER = 3; private static final List BANDS_SUPPORTED = Arrays.asList(MeterBandDrop.class); private static final List CAPABILITIES_SUPPORTED = Arrays.asList(MeterKbps.class, MeterBurst.class); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterStatsDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterStatsDeserializerTest.java index c3e0f386aa..1dc3e467b0 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterStatsDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMeterStatsDeserializerTest.java @@ -22,12 +22,12 @@ public class MultipartReplyMeterStatsDeserializerTest extends AbstractMultipartD private static final int METER_ID = 1; private static final short ITEM_LENGTH = 50; private static final int FLOW_COUNT = 2; - private static final long PACKET_IN_COUNT = 3l; - private static final long BYTE_IN_COUNT = 4l; + private static final long PACKET_IN_COUNT = 3L; + private static final long BYTE_IN_COUNT = 4L; private static final int SECOND = 5; private static final int NANOSECOND = 6; - private static final long PACKET_BAND_COUNT = 7l; - private static final long BYTE_BAND_COUNT = 8l; + private static final long PACKET_BAND_COUNT = 7L; + private static final long BYTE_BAND_COUNT = 8L; @Test public void deserialize() throws Exception { diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyPortDescDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyPortDescDeserializerTest.java index d01be07c96..47ea9c1f51 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyPortDescDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyPortDescDeserializerTest.java @@ -22,7 +22,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.P import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.multipart.reply.multipart.reply.body.MultipartReplyPortDesc; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType; -public class MultipartReplyPortDescDeserializerTest extends AbstractMultipartDeserializerTest{ +public class MultipartReplyPortDescDeserializerTest extends AbstractMultipartDeserializerTest { private static final byte PADDING_IN_PORT_DESC_HEADER_01 = 4; private static final byte PADDING_IN_PORT_DESC_HEADER_02 = 2; diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyPortStatsDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyPortStatsDeserializerTest.java index 6733b94d2a..9b5aec3660 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyPortStatsDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyPortStatsDeserializerTest.java @@ -20,18 +20,18 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.n public class MultipartReplyPortStatsDeserializerTest extends AbstractMultipartDeserializerTest { private static final byte PADDING_IN_PORT_STATS_HEADER = 4; private static final int PORT = 1; - private static final long PACKETS_RECEIVED = 2l; - private static final long PACKETS_TRANSMITTED = 3l; - private static final long BYTES_RECEIVED = 4l; - private static final long BYTES_TRANSMITTED = 5l; - private static final long RECEIVE_DROPS = 6l; - private static final long TRANSMIT_DROPS = 7l; - private static final long RECEIVE_ERRORS = 8l; - private static final long TRANSMIT_ERRORS = 9l; - private static final long RECEIVE_FRAME_ERROR = 10l; - private static final long RECEIVE_OVER_RUN_ERROR = 11l; - private static final long RECEIVE_CRC_ERROR = 12l; - private static final long COLLIESION_COUNT = 13l; + private static final long PACKETS_RECEIVED = 2L; + private static final long PACKETS_TRANSMITTED = 3L; + private static final long BYTES_RECEIVED = 4L; + private static final long BYTES_TRANSMITTED = 5L; + private static final long RECEIVE_DROPS = 6L; + private static final long TRANSMIT_DROPS = 7L; + private static final long RECEIVE_ERRORS = 8L; + private static final long TRANSMIT_ERRORS = 9L; + private static final long RECEIVE_FRAME_ERROR = 10L; + private static final long RECEIVE_OVER_RUN_ERROR = 11L; + private static final long RECEIVE_CRC_ERROR = 12L; + private static final long COLLIESION_COUNT = 13L; private static final int SECOND = 14; private static final int NANOSECOND = 15; @@ -57,7 +57,8 @@ public class MultipartReplyPortStatsDeserializerTest extends AbstractMultipartDe final MultipartReplyPortStats reply = (MultipartReplyPortStats) deserializeMultipart(buffer); - final NodeConnectorStatisticsAndPortNumberMap portStats = reply.getNodeConnectorStatisticsAndPortNumberMap().get(0); + final NodeConnectorStatisticsAndPortNumberMap portStats = + reply.getNodeConnectorStatisticsAndPortNumberMap().get(0); assertEquals(PACKETS_RECEIVED, portStats.getPackets().getReceived().longValue()); assertEquals(PACKETS_TRANSMITTED, portStats.getPackets().getTransmitted().longValue()); assertEquals(BYTES_RECEIVED, portStats.getBytes().getReceived().longValue()); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyQueueStatsDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyQueueStatsDeserializerTest.java index fbedf4cb7c..98efa83cfb 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyQueueStatsDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyQueueStatsDeserializerTest.java @@ -20,9 +20,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216. public class MultipartReplyQueueStatsDeserializerTest extends AbstractMultipartDeserializerTest { private static final int PORT = 1; private static final int QUEUE_ID = 1; - private static final long TRANSMITTED_BYTES = 5l; - private static final long TRANSMITTED_PACKETS = 3l; - private static final long TRANSMISSON_ERRORS = 9l; + private static final long TRANSMITTED_BYTES = 5L; + private static final long TRANSMITTED_PACKETS = 3L; + private static final long TRANSMISSON_ERRORS = 9L; private static final int SECOND = 14; private static final int NANOSECOND = 15; diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyTableFeaturesDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyTableFeaturesDeserializerTest.java index ab386259ec..943b517b1a 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyTableFeaturesDeserializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyTableFeaturesDeserializerTest.java @@ -42,8 +42,8 @@ public class MultipartReplyTableFeaturesDeserializerTest extends AbstractMultipa private static final byte TABLE_ID = 1; private static final long METADATA_MATCH = 2; private static final long METADATA_WRITE = 3; - private static final int TABLE_CONFIG= 3; - private static final int MAX_ENTRIES= 3; + private static final int TABLE_CONFIG = 3; + private static final int MAX_ENTRIES = 3; private static final int OFPTFPT_INSTRUCTIONS = 0; private static final int OFPTFPT_INSTRUCTIONS_MISS = 1; @@ -156,10 +156,8 @@ public class MultipartReplyTableFeaturesDeserializerTest extends AbstractMultipa } private void writeValues(ByteBuf buffer, int propertyType) { - TableFeaturesPropType propType = TableFeaturesPropType.forValue(propertyType); - buffer.clear(); - int replyIndex = buffer.readerIndex(); + final int replyIndex = buffer.readerIndex(); buffer.writeShort(EncodeConstants.EMPTY_LENGTH); buffer.writeByte(TABLE_ID); buffer.writeZero(PADDING_IN_MULTIPART_REPLY_TABLE_FEATURES); @@ -169,12 +167,14 @@ public class MultipartReplyTableFeaturesDeserializerTest extends AbstractMultipa buffer.writeInt(TABLE_CONFIG); buffer.writeInt(MAX_ENTRIES); - int propIndex = buffer.writerIndex(); + final int propIndex = buffer.writerIndex(); buffer.writeShort(propertyType); - int propLengthIndex = buffer.writerIndex(); + final int propLengthIndex = buffer.writerIndex(); buffer.writeShort(EncodeConstants.EMPTY_LENGTH); + TableFeaturesPropType propType = TableFeaturesPropType.forValue(propertyType); + switch (propType) { case OFPTFPTINSTRUCTIONS: case OFPTFPTINSTRUCTIONSMISS: diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/AbstractSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/AbstractSerializerTest.java index e39117f00b..b7e8412aeb 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/AbstractSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/AbstractSerializerTest.java @@ -60,7 +60,7 @@ public abstract class AbstractSerializerTest { @Override public void registerSerializer(MessageTypeKey messageTypeKey, OFGeneralSerializer ofGeneralSerializer) { - registry.registerSerializer(messageTypeKey, ofGeneralSerializer); + registry.registerSerializer(messageTypeKey, ofGeneralSerializer); } @Override @@ -70,43 +70,41 @@ public abstract class AbstractSerializerTest { @Override public void registerActionSerializer(ActionSerializerKey key, OFGeneralSerializer serializer) { - } @Override public void registerInstructionSerializer(InstructionSerializerKey key, OFGeneralSerializer serializer) { - } @Override - public void registerMatchEntrySerializer(MatchEntrySerializerKey key, OFGeneralSerializer serializer) { - + public void registerMatchEntrySerializer( + MatchEntrySerializerKey key, OFGeneralSerializer serializer) { } @Override - public void registerExperimenterMessageSerializer(ExperimenterIdSerializerKey key, OFSerializer serializer) { - + public void registerExperimenterMessageSerializer(ExperimenterIdSerializerKey key, OFSerializer serializer) { } @Override - public void registerMultipartRequestSerializer(ExperimenterIdSerializerKey key, OFSerializer serializer) { - + public void registerMultipartRequestSerializer(ExperimenterIdSerializerKey key, OFSerializer serializer) { } @Override - public void registerMultipartRequestTFSerializer(ExperimenterIdSerializerKey key, OFGeneralSerializer serializer) { - + public void registerMultipartRequestTFSerializer(ExperimenterIdSerializerKey key, + OFGeneralSerializer serializer) { } @Override - public void registerMeterBandSerializer(ExperimenterIdSerializerKey key, OFSerializer serializer) { + public void registerMeterBandSerializer(ExperimenterIdSerializerKey key, + OFSerializer serializer) { } @Override - public void registerMeterBandSerializer(ExperimenterIdMeterSubTypeSerializerKey key, OFSerializer serializer) { - + public void registerMeterBandSerializer(ExperimenterIdMeterSubTypeSerializerKey + key, OFSerializer serializer) { } } - } \ No newline at end of file diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/InstructionSerializerInjectorTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/InstructionSerializerInjectorTest.java index daa899539b..e1e24817cf 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/InstructionSerializerInjectorTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/InstructionSerializerInjectorTest.java @@ -37,7 +37,8 @@ public class InstructionSerializerInjectorTest { @Before public void setUp() throws Exception { - injector = InstructionSerializerInjector.createInjector(switchConnectionProvider, EncodeConstants.OF13_VERSION_ID); + injector = + InstructionSerializerInjector.createInjector(switchConnectionProvider, EncodeConstants.OF13_VERSION_ID); } @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MessageSerializerInjectorTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MessageSerializerInjectorTest.java index 473e01a8c2..879b91764d 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MessageSerializerInjectorTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/MessageSerializerInjectorTest.java @@ -42,6 +42,7 @@ public class MessageSerializerInjectorTest { @Test public void injectSerializers() throws Exception { injector.apply(OfHeader.class).accept(ofSerializer); - verify(switchConnectionProvider).registerSerializer(new MessageTypeKey<>(OFConstants.OFP_VERSION_1_3, OfHeader.class), ofSerializer); + verify(switchConnectionProvider) + .registerSerializer(new MessageTypeKey<>(OFConstants.OFP_VERSION_1_3, OfHeader.class), ofSerializer); } } \ No newline at end of file diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/AbstractActionSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/AbstractActionSerializerTest.java index 7c6b6d3418..32dbea23fc 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/AbstractActionSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/actions/AbstractActionSerializerTest.java @@ -49,7 +49,9 @@ public abstract class AbstractActionSerializerTest extends AbstractSerializerTes } protected abstract Class getClazz(); + protected abstract int getType(); + protected abstract int getLength(); } \ No newline at end of file diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/AbstractInstructionSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/AbstractInstructionSerializerTest.java index 9e05b6865d..66f6ac63e4 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/AbstractInstructionSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/AbstractInstructionSerializerTest.java @@ -49,6 +49,8 @@ public abstract class AbstractInstructionSerializerTest extends AbstractSerializ } protected abstract Class getClazz(); + protected abstract int getType(); + protected abstract int getLength(); } \ No newline at end of file diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/AbstractExperimenterMatchEntrySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/AbstractExperimenterMatchEntrySerializerTest.java index 21efbee0a5..71bcddef1c 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/AbstractExperimenterMatchEntrySerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/AbstractExperimenterMatchEntrySerializerTest.java @@ -18,7 +18,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026 public abstract class AbstractExperimenterMatchEntrySerializerTest extends AbstractMatchEntrySerializerTest { - protected void assertMatch(final Match match, final boolean hasMask, final Consumer assertBody) throws Exception { + protected void assertMatch(final Match match, + final boolean hasMask, + final Consumer assertBody) throws Exception { final ByteBuf buffer = UnpooledByteBufAllocator.DEFAULT.buffer(); getSerializer().serialize(match, buffer); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/AbstractMatchEntrySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/AbstractMatchEntrySerializerTest.java index 8815017613..69ba89747e 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/AbstractMatchEntrySerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/AbstractMatchEntrySerializerTest.java @@ -26,7 +26,9 @@ public abstract class AbstractMatchEntrySerializerTest extends AbstractSerialize serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, Match.class)); } - protected void assertMatch(final Match match, final boolean hasMask, final Consumer assertBody) throws Exception { + protected void assertMatch(final Match match, + final boolean hasMask, + final Consumer assertBody) throws Exception { final ByteBuf buffer = UnpooledByteBufAllocator.DEFAULT.buffer(); serializer.serialize(match, buffer); @@ -63,7 +65,9 @@ public abstract class AbstractMatchEntrySerializerTest extends AbstractSerialize } protected abstract int getOxmFieldCode(); + protected abstract int getOxmClassCode(); + protected abstract short getLength(); } \ No newline at end of file diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6DestinationEntrySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6DestinationEntrySerializerTest.java index fed3695008..719fc16e30 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6DestinationEntrySerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6DestinationEntrySerializerTest.java @@ -35,11 +35,13 @@ public class Ipv6DestinationEntrySerializerTest extends AbstractMatchEntrySerial assertMatch(ipv6abmMatch, true, (out) -> { byte[] address = new byte[16]; out.readBytes(address); - assertArrayEquals(address, IetfInetUtil.INSTANCE.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(ipv6Address))); + assertArrayEquals(address, + IetfInetUtil.INSTANCE.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(ipv6Address))); byte[] mask = new byte[16]; out.readBytes(mask); - assertArrayEquals(mask, IpConversionUtil.convertIpv6PrefixToByteArray(IpConversionUtil.extractIpv6Prefix(ipv6Address))); + assertArrayEquals(mask, + IpConversionUtil.convertIpv6PrefixToByteArray(IpConversionUtil.extractIpv6Prefix(ipv6Address))); }); } @@ -56,7 +58,8 @@ public class Ipv6DestinationEntrySerializerTest extends AbstractMatchEntrySerial assertMatch(ipv6abmMatch, false, (out) -> { byte[] address = new byte[16]; out.readBytes(address); - assertArrayEquals(address, IetfInetUtil.INSTANCE.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(ipv6Address))); + assertArrayEquals(address, + IetfInetUtil.INSTANCE.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(ipv6Address))); }); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6NdSllEntrySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6NdSllEntrySerializerTest.java index 96394d16e7..2fbc524c7b 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6NdSllEntrySerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6NdSllEntrySerializerTest.java @@ -34,7 +34,8 @@ public class Ipv6NdSllEntrySerializerTest extends AbstractMatchEntrySerializerTe assertMatch(ipv6NdSllMatch, false, (out) -> { byte[] addressBytes = new byte[6]; out.readBytes(addressBytes); - assertEquals(new MacAddress(ByteBufUtils.macAddressToString(addressBytes)).getValue(), ipv6NdSll.getValue()); + assertEquals(new MacAddress(ByteBufUtils.macAddressToString(addressBytes)).getValue(), + ipv6NdSll.getValue()); }); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6NdTllEntrySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6NdTllEntrySerializerTest.java index 4d50d6f932..f9fbc4937b 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6NdTllEntrySerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6NdTllEntrySerializerTest.java @@ -34,7 +34,8 @@ public class Ipv6NdTllEntrySerializerTest extends AbstractMatchEntrySerializerTe assertMatch(ipv6NdTllMatch, false, (out) -> { byte[] addressBytes = new byte[6]; out.readBytes(addressBytes); - assertEquals(new MacAddress(ByteBufUtils.macAddressToString(addressBytes)).getValue(), ipv6NdTll.getValue()); + assertEquals(new MacAddress(ByteBufUtils.macAddressToString(addressBytes)).getValue(), + ipv6NdTll.getValue()); }); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6SourceEntrySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6SourceEntrySerializerTest.java index 7bbfd77e6f..bac5c263e1 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6SourceEntrySerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/Ipv6SourceEntrySerializerTest.java @@ -35,11 +35,13 @@ public class Ipv6SourceEntrySerializerTest extends AbstractMatchEntrySerializerT assertMatch(ipv6abmMatch, true, (out) -> { byte[] address = new byte[16]; out.readBytes(address); - assertArrayEquals(address, IetfInetUtil.INSTANCE.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(ipv6Address))); + assertArrayEquals(address, + IetfInetUtil.INSTANCE.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(ipv6Address))); byte[] mask = new byte[16]; out.readBytes(mask); - assertArrayEquals(mask, IpConversionUtil.convertIpv6PrefixToByteArray(IpConversionUtil.extractIpv6Prefix(ipv6Address))); + assertArrayEquals(mask, + IpConversionUtil.convertIpv6PrefixToByteArray(IpConversionUtil.extractIpv6Prefix(ipv6Address))); }); } @@ -56,7 +58,8 @@ public class Ipv6SourceEntrySerializerTest extends AbstractMatchEntrySerializerT assertMatch(ipv6abmMatch, false, (out) -> { byte[] address = new byte[16]; out.readBytes(address); - assertArrayEquals(address, IetfInetUtil.INSTANCE.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(ipv6Address))); + assertArrayEquals(address, + IetfInetUtil.INSTANCE.ipv6AddressBytes(IpConversionUtil.extractIpv6Address(ipv6Address))); }); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/VlanVidEntrySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/VlanVidEntrySerializerTest.java index cfe0cf75e2..26180c5f5f 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/VlanVidEntrySerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/VlanVidEntrySerializerTest.java @@ -48,7 +48,7 @@ public class VlanVidEntrySerializerTest extends AbstractMatchEntrySerializerTest assertMatch(vlanMatchMaskOnly, true, out -> { assertEquals(out.readShort(), (1 << 12)); - byte mask[] = new byte[2]; + byte[] mask = new byte[2]; out.readBytes(mask); assertArrayEquals(mask, new byte[] { 16, 0 }); }); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/FlowMessageSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/FlowMessageSerializerTest.java index c4847f21fd..04fccd1447 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/FlowMessageSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/FlowMessageSerializerTest.java @@ -179,7 +179,8 @@ public class FlowMessageSerializerTest extends AbstractSerializerTest { @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, FlowMessage.class)); + serializer = getRegistry() + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, FlowMessage.class)); } @Test @@ -255,7 +256,7 @@ public class FlowMessageSerializerTest extends AbstractSerializerTest { // Set vlan id action int setVlanIdLength = 16; - int setVlanStartIndex = out.readerIndex(); + final int setVlanStartIndex = out.readerIndex(); assertEquals(out.readUnsignedShort(), ActionConstants.SET_FIELD_CODE); assertEquals(out.readUnsignedShort(), setVlanIdLength); assertEquals(out.readUnsignedShort(), OxmMatchConstants.OPENFLOW_BASIC_CLASS); @@ -276,7 +277,7 @@ public class FlowMessageSerializerTest extends AbstractSerializerTest { // Set tp src action int setTpSrcLength = 16; - int setTpSrcStartIndex = out.readerIndex(); + final int setTpSrcStartIndex = out.readerIndex(); assertEquals(out.readUnsignedShort(), ActionConstants.SET_FIELD_CODE); assertEquals(out.readUnsignedShort(), setTpSrcLength); assertEquals(out.readUnsignedShort(), OxmMatchConstants.OPENFLOW_BASIC_CLASS); @@ -297,7 +298,7 @@ public class FlowMessageSerializerTest extends AbstractSerializerTest { // Set tp dst action int setTpDstLength = 16; - int setTpDstStartIndex = out.readerIndex(); + final int setTpDstStartIndex = out.readerIndex(); assertEquals(out.readUnsignedShort(), ActionConstants.SET_FIELD_CODE); assertEquals(out.readUnsignedShort(), setTpDstLength); assertEquals(out.readUnsignedShort(), OxmMatchConstants.OPENFLOW_BASIC_CLASS); @@ -372,7 +373,7 @@ public class FlowMessageSerializerTest extends AbstractSerializerTest { // Set vlan id action int setVlanIdLength = 16; - int setVlanStartIndex = out.readerIndex(); + final int setVlanStartIndex = out.readerIndex(); assertEquals(out.readUnsignedShort(), ActionConstants.SET_FIELD_CODE); assertEquals(out.readUnsignedShort(), setVlanIdLength); assertEquals(out.readUnsignedShort(), OxmMatchConstants.OPENFLOW_BASIC_CLASS); @@ -393,7 +394,7 @@ public class FlowMessageSerializerTest extends AbstractSerializerTest { // Set tp src action int setTpSrcLength = 16; - int setTpSrcStartIndex = out.readerIndex(); + final int setTpSrcStartIndex = out.readerIndex(); assertEquals(out.readUnsignedShort(), ActionConstants.SET_FIELD_CODE); assertEquals(out.readUnsignedShort(), setTpSrcLength); assertEquals(out.readUnsignedShort(), OxmMatchConstants.OPENFLOW_BASIC_CLASS); @@ -414,7 +415,7 @@ public class FlowMessageSerializerTest extends AbstractSerializerTest { // Set tp dst action int setTpDstLength = 16; - int setTpDstStartIndex = out.readerIndex(); + final int setTpDstStartIndex = out.readerIndex(); assertEquals(out.readUnsignedShort(), ActionConstants.SET_FIELD_CODE); assertEquals(out.readUnsignedShort(), setTpDstLength); assertEquals(out.readUnsignedShort(), OxmMatchConstants.OPENFLOW_BASIC_CLASS); diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/GroupMessageSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/GroupMessageSerializerTest.java index 368461a515..f092579cda 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/GroupMessageSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/GroupMessageSerializerTest.java @@ -101,7 +101,8 @@ public class GroupMessageSerializerTest extends AbstractSerializerTest { @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, GroupMessage.class)); + serializer = getRegistry() + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, GroupMessage.class)); } @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/MeterMessageSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/MeterMessageSerializerTest.java index 5bf30a587c..16f417bad8 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/MeterMessageSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/MeterMessageSerializerTest.java @@ -73,8 +73,8 @@ public class MeterMessageSerializerTest extends AbstractSerializerTest { .setMeterBandHeader(Arrays.asList( new MeterBandHeaderBuilder() .setMeterBandTypes(new MeterBandTypesBuilder() - .setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918 - .MeterBandType(true, false, false)) + .setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight + .meter.types.rev130918.MeterBandType(true, false, false)) .build()) .setBandBurstSize(BAND_BURST_SIZE) .setBandId(new BandId(BAND_ID)) @@ -86,8 +86,8 @@ public class MeterMessageSerializerTest extends AbstractSerializerTest { .build(), new MeterBandHeaderBuilder() .setMeterBandTypes(new MeterBandTypesBuilder() - .setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918 - .MeterBandType(false, true, false)) + .setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight + .meter.types.rev130918.MeterBandType(false, true, false)) .build()) .setBandBurstSize(BAND_BURST_SIZE) .setBandId(new BandId(BAND_ID)) @@ -106,7 +106,8 @@ public class MeterMessageSerializerTest extends AbstractSerializerTest { @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, MeterMessage.class)) ; + serializer = getRegistry() + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, MeterMessage.class)) ; } @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/PortMessageSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/PortMessageSerializerTest.java index c3bcd5bdd2..9cb7c2a80a 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/PortMessageSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/PortMessageSerializerTest.java @@ -94,7 +94,8 @@ public class PortMessageSerializerTest extends AbstractSerializerTest { @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, PortMessage.class)); + serializer = getRegistry() + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, PortMessage.class)); } @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMessageSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMessageSerializerTest.java index 43ee847696..0338df7880 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMessageSerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestMessageSerializerTest.java @@ -52,7 +52,8 @@ public class MultipartRequestMessageSerializerTest extends AbstractSerializerTes @Override protected void init() { - serializer = getRegistry().getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, MultipartRequest.class)) ; + serializer = getRegistry() + .getSerializer(new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, MultipartRequest.class)); } @Test diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/AbstractTablePropertySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/AbstractTablePropertySerializerTest.java index 8f5f10cf62..bdf28470fc 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/AbstractTablePropertySerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/AbstractTablePropertySerializerTest.java @@ -51,5 +51,6 @@ public abstract class AbstractTablePropertySerializerTest extends AbstractSerial } protected abstract Class getClazz(); + protected abstract int getType(); } diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsMissTablePropertySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsMissTablePropertySerializerTest.java index 0452c2384c..bc1a922424 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsMissTablePropertySerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsMissTablePropertySerializerTest.java @@ -26,8 +26,8 @@ public class ApplyActionsMissTablePropertySerializerTest extends AbstractTablePr @Test public void testSerialize() throws Exception { final ApplyActionsMiss property = new ApplyActionsMissBuilder() - .setApplyActionsMiss(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature - .prop.type.table.feature.prop.type.apply.actions.miss + .setApplyActionsMiss(new org.opendaylight.yang.gen.v1.urn.opendaylight + .table.types.rev131026.table.feature.prop.type.table.feature.prop.type.apply.actions.miss .ApplyActionsMissBuilder() .setAction(Collections.singletonList(new ActionBuilder() .setOrder(0) diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldMissTablePropertySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldMissTablePropertySerializerTest.java index f05939303c..59562a6c8b 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldMissTablePropertySerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplySetfieldMissTablePropertySerializerTest.java @@ -27,8 +27,8 @@ public class ApplySetfieldMissTablePropertySerializerTest extends AbstractTableP @Test public void testSerialize() throws Exception { final ApplySetfieldMiss property = new ApplySetfieldMissBuilder() - .setApplySetfieldMiss(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature - .prop.type.table.feature.prop.type.apply.setfield.miss + .setApplySetfieldMiss(new org.opendaylight.yang.gen.v1.urn.opendaylight + .table.types.rev131026.table.feature.prop.type.table.feature.prop.type.apply.setfield.miss .ApplySetfieldMissBuilder() .setSetFieldMatch(ImmutableList .builder() diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsMissTablePropertySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsMissTablePropertySerializerTest.java index 50a5f102c9..85a30671a8 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsMissTablePropertySerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsMissTablePropertySerializerTest.java @@ -26,8 +26,8 @@ public class InstructionsMissTablePropertySerializerTest extends AbstractTablePr @Test public void testSerialize() throws Exception { final InstructionsMiss property = new InstructionsMissBuilder() - .setInstructionsMiss(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature - .prop.type.table.feature.prop.type.instructions.miss + .setInstructionsMiss(new org.opendaylight.yang.gen.v1.urn.opendaylight + .table.types.rev131026.table.feature.prop.type.table.feature.prop.type.instructions.miss .InstructionsMissBuilder() .setInstruction(Collections.singletonList(new InstructionBuilder() .setOrder(0) diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteActionsMissTablePropertySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteActionsMissTablePropertySerializerTest.java index d10a3482cd..bd62929d69 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteActionsMissTablePropertySerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteActionsMissTablePropertySerializerTest.java @@ -26,8 +26,8 @@ public class WriteActionsMissTablePropertySerializerTest extends AbstractTablePr @Test public void testSerialize() throws Exception { final WriteActionsMiss property = new WriteActionsMissBuilder() - .setWriteActionsMiss(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature - .prop.type.table.feature.prop.type.write.actions.miss + .setWriteActionsMiss(new org.opendaylight.yang.gen.v1.urn.opendaylight + .table.types.rev131026.table.feature.prop.type.table.feature.prop.type.write.actions.miss .WriteActionsMissBuilder() .setAction(Collections.singletonList(new ActionBuilder() .setOrder(0) diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldMissTablePropertySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldMissTablePropertySerializerTest.java index 35608bee51..29373965dc 100644 --- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldMissTablePropertySerializerTest.java +++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WriteSetfieldMissTablePropertySerializerTest.java @@ -27,8 +27,8 @@ public class WriteSetfieldMissTablePropertySerializerTest extends AbstractTableP @Test public void testSerialize() throws Exception { final WriteSetfieldMiss property = new WriteSetfieldMissBuilder() - .setWriteSetfieldMiss(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature - .prop.type.table.feature.prop.type.write.setfield.miss + .setWriteSetfieldMiss(new org.opendaylight.yang.gen.v1.urn.opendaylight + .table.types.rev131026.table.feature.prop.type.table.feature.prop.type.write.setfield.miss .WriteSetfieldMissBuilder() .setSetFieldMatch(ImmutableList .builder() -- 2.36.6