Fix raw type warnings in bgp/bmp

[bgpcep.git] / bmp / bmp-spi / src / test / java / org / opendaylight / protocol / bmp / spi / parser / AbstractBmpMessageWithTlvParserTest.java

diff --git a/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpMessageWithTlvParserTest.java b/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpMessageWithTlvParserTest.java
index 1e16c246f512490b5179969f9a559c1cca5865d9..bd88e18d32cda1b8e3dca6ff7bc514cc4bc6b5fd 100644 (file)
--- a/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpMessageWithTlvParserTest.java
+++ b/bmp/bmp-spi/src/test/java/org/opendaylight/protocol/bmp/spi/parser/AbstractBmpMessageWithTlvParserTest.java
@@ -12,6 +12,7 @@ import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -20,25 +21,25 @@ import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.protocol.bmp.spi.registry.SimpleBmpTlvRegistry;
 import org.opendaylight.protocol.util.ByteArray;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev150512.Tlv;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev150512.description.tlv.DescriptionTlv;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev150512.description.tlv.DescriptionTlvBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev150512.initiation.TlvsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev200120.Tlv;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev200120.description.tlv.DescriptionTlv;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev200120.description.tlv.DescriptionTlvBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev200120.initiation.TlvsBuilder;
 import org.opendaylight.yangtools.yang.binding.Notification;
 
 public class AbstractBmpMessageWithTlvParserTest {
 
     private final SimpleBmpTlvRegistry registry = new SimpleBmpTlvRegistry();
-    private final SimpleHandler parser = new SimpleHandler(this.registry);
-    private static final byte[] DATA = { 0, 1, 0, 4, 't', 'e', 's', 't' };
+    private final SimpleHandler parser = new SimpleHandler(registry);
+    private static final byte[] DATA = {0, 1, 0, 4, 't', 'e', 's', 't'};
     private static final int TYPE = 1;
 
-    public static final BmpTlvSerializer DESCRIPTION_TLV_SERIALIZER = (tlv, output) -> {
+    private static final BmpTlvSerializer DESCRIPTION_TLV_SERIALIZER = (tlv, output) -> {
         Preconditions.checkArgument(tlv instanceof DescriptionTlv, "DescriptionTlv is mandatory.");
         TlvUtil.formatTlvAscii(TYPE, ((DescriptionTlv) tlv).getDescription(), output);
     };
 
-    public static final BmpTlvParser DESCRIPTION_TLV_PARSER = buffer -> {
+    private static final BmpTlvParser DESCRIPTION_TLV_PARSER = buffer -> {
         if (buffer == null) {
             return null;
         }
@@ -47,18 +48,18 @@ public class AbstractBmpMessageWithTlvParserTest {
 
     @Before
     public void setUp() {
-        this.registry.registerBmpTlvParser(TYPE, DESCRIPTION_TLV_PARSER);
-        this.registry.registerBmpTlvSerializer(DescriptionTlv.class, DESCRIPTION_TLV_SERIALIZER);
+        registry.registerBmpTlvParser(TYPE, DESCRIPTION_TLV_PARSER);
+        registry.registerBmpTlvSerializer(DescriptionTlv.class, DESCRIPTION_TLV_SERIALIZER);
     }
 
     @Test
     public void testParseTlvs() throws BmpDeserializationException {
         final ByteBuf buffer = Unpooled.EMPTY_BUFFER;
         final TlvsBuilder builder = new TlvsBuilder();
-        this.parser.parseTlvs(builder, buffer);
+        parser.parseTlvs(builder, buffer);
         assertNull(builder.getDescriptionTlv());
 
-        this.parser.parseTlvs(builder, Unpooled.wrappedBuffer(DATA));
+        parser.parseTlvs(builder, Unpooled.wrappedBuffer(DATA));
         assertNotNull(builder.getDescriptionTlv());
         assertEquals("test", builder.getDescriptionTlv().getDescription());
     }
@@ -67,35 +68,40 @@ public class AbstractBmpMessageWithTlvParserTest {
     public void testSerializeTlv() {
         final ByteBuf output = Unpooled.buffer();
         final DescriptionTlvBuilder builder = new DescriptionTlvBuilder().setDescription("test");
-        this.parser.serializeTlv(builder.build(), output);
+        parser.serializeTlv(builder.build(), output);
         assertArrayEquals(DATA, ByteArray.getAllBytes(output));
     }
 
-    @Test(expected=BmpDeserializationException.class)
+    @Test(expected = BmpDeserializationException.class)
     public void testParseCorruptedTlv() throws BmpDeserializationException {
-        final byte[] wrongData = { 0, 1, 0, 10, 't', 'e', 's', 't' };
-        this.parser.parseTlvs(new TlvsBuilder(), Unpooled.wrappedBuffer(wrongData));
+        final byte[] wrongData = {0, 1, 0, 10, 't', 'e', 's', 't'};
+        parser.parseTlvs(new TlvsBuilder(), Unpooled.wrappedBuffer(wrongData));
     }
 
     private static final class SimpleHandler extends AbstractBmpMessageWithTlvParser<TlvsBuilder> {
-        public SimpleHandler(final BmpTlvRegistry tlvRegistry) {
+        SimpleHandler(final BmpTlvRegistry tlvRegistry) {
             super(tlvRegistry);
         }
+
         @Override
-        public void serializeMessageBody(final Notification message, final ByteBuf buffer) {
+        public void serializeMessageBody(final Notification<?> message, final ByteBuf buffer) {
+
         }
+
         @Override
-        public Notification parseMessageBody(final ByteBuf bytes) throws BmpDeserializationException {
+        public Notification<?> parseMessageBody(final ByteBuf bytes) throws BmpDeserializationException {
             return null;
         }
+
         @Override
         public int getBmpMessageType() {
             return 0;
         }
+
         @Override
         protected void addTlv(final TlvsBuilder builder, final Tlv tlv) {
-            if(tlv != null && tlv instanceof DescriptionTlv) {
-                builder.setDescriptionTlv((DescriptionTlv)tlv);
+            if (tlv instanceof DescriptionTlv) {
+                builder.setDescriptionTlv((DescriptionTlv) tlv);
             }
         }
     }