Refactor OpenTest

Use ServiceLoader to find extensions and take advantage of newer Java
utilities.

Change-Id: I6ed1c19ffbf85c484e0326942650256e80335222
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/OpenTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/OpenTest.java
index 0d8c17cfb50590f21b91a541e56b623a62f40683..5d181feab7f66df98805b3a17cf6485964e13d10 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/OpenTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/OpenTest.java
@@ -9,16 +9,17 @@ package org.opendaylight.protocol.bgp.parser.impl;
 
 import static org.junit.Assert.assertEquals;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.ServiceLoader;
 import org.junit.Test;
 import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
 import org.opendaylight.protocol.bgp.parser.impl.message.BGPOpenMessageParser;
-import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
+import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionConsumerContext;
+import org.opendaylight.protocol.bgp.parser.spi.ParameterRegistry;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
@@ -39,6 +40,8 @@ import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.common.Uint8;
 
 public class OpenTest {
+    private final ParameterRegistry registry = ServiceLoader.load(BGPExtensionConsumerContext.class).findFirst()
+        .orElseThrow().getParameterRegistry();
 
     @Test
     public void testSerializeOpen() throws BGPDocumentedException {
@@ -47,8 +50,8 @@ public class OpenTest {
                 .setMyAsNumber(Uint16.valueOf(30))
                 .setHoldTimer(Uint16.valueOf(3))
                 .setVersion(new ProtocolVersion(Uint8.valueOf(4)))
-                .setBgpParameters(ImmutableList.of(new BgpParametersBuilder()
-                    .setOptionalCapabilities(ImmutableList.of(new OptionalCapabilitiesBuilder()
+                .setBgpParameters(List.of(new BgpParametersBuilder()
+                    .setOptionalCapabilities(List.of(new OptionalCapabilitiesBuilder()
                         .setCParameters(new CParametersBuilder()
                             .setAs4BytesCapability(new As4BytesCapabilityBuilder()
                                 .setAsNumber(new AsNumber(Uint32.valueOf(1000))).build())
@@ -56,17 +59,16 @@ public class OpenTest {
                                 .setGracefulRestartCapability(new GracefulRestartCapabilityBuilder()
                                     .setRestartFlags(new GracefulRestartCapability.RestartFlags(false))
                                     .setRestartTime(Uint16.ZERO)
-                                    .setTables(ImmutableMap.of()).build())
+                                    .setTables(Map.of()).build())
                                 .build())
                             .build())
                         .build())).build()))
                 .build();
         final ByteBuf msg = Unpooled.buffer();
-        new BGPOpenMessageParser(ServiceLoaderBGPExtensionProviderContext.getSingletonInstance().getParameterRegistry())
-            .serializeMessage(open, msg);
+        new BGPOpenMessageParser(registry).serializeMessage(open, msg);
         final byte[] temp = ByteArray.cutBytes(ByteArray.getAllBytes(msg), 19);
-        final Open openResult = new BGPOpenMessageParser(ServiceLoaderBGPExtensionProviderContext.getSingletonInstance()
-            .getParameterRegistry()).parseMessageBody(Unpooled.copiedBuffer(temp), temp.length, null);
+        final Open openResult = new BGPOpenMessageParser(registry)
+            .parseMessageBody(Unpooled.copiedBuffer(temp), temp.length, null);
 
         assertEquals(open.getBgpIdentifier(),openResult.getBgpIdentifier());
         assertEquals(open.getHoldTimer(), openResult.getHoldTimer());
@@ -104,19 +106,17 @@ public class OpenTest {
                 .setMyAsNumber(Uint16.valueOf(30))
                 .setHoldTimer(Uint16.valueOf(3))
                 .setVersion(new ProtocolVersion(Uint8.valueOf(4)))
-                .setBgpParameters(ImmutableList.of(
-                    new BgpParametersBuilder().setOptionalCapabilities(capabilities).build()))
+                .setBgpParameters(List.of(new BgpParametersBuilder().setOptionalCapabilities(capabilities).build()))
                 .build();
 
         final ByteBuf msg = Unpooled.buffer();
-        new BGPOpenMessageParser(ServiceLoaderBGPExtensionProviderContext.getSingletonInstance().getParameterRegistry())
-            .serializeMessage(open, msg);
+        new BGPOpenMessageParser(registry).serializeMessage(open, msg);
 
         assertEquals(1235, msg.readableBytes());
 
         final byte[] temp = ByteArray.cutBytes(ByteArray.getAllBytes(msg), 19);
-        final Open openResult = new BGPOpenMessageParser(ServiceLoaderBGPExtensionProviderContext.getSingletonInstance()
-            .getParameterRegistry()).parseMessageBody(Unpooled.copiedBuffer(temp), temp.length, null);
+        final Open openResult = new BGPOpenMessageParser(registry)
+            .parseMessageBody(Unpooled.copiedBuffer(temp), temp.length, null);
 
         assertEquals(200, openResult.getBgpParameters().get(0).getOptionalCapabilities().size());
     }