Remove hand-written ServiceLoader services

[bgpcep.git] / bgp / extensions / inet / src / main / java / org / opendaylight / protocol / bgp / inet / BGPActivator.java

diff --git a/bgp/extensions/inet/src/main/java/org/opendaylight/protocol/bgp/inet/BGPActivator.java b/bgp/extensions/inet/src/main/java/org/opendaylight/protocol/bgp/inet/BGPActivator.java
index a28069186dfec8cd057e6ff30eeed7814a0a1f04..aea81d913a70ef14e2e3164776a9df82f39a4180 100644 (file)
--- a/bgp/extensions/inet/src/main/java/org/opendaylight/protocol/bgp/inet/BGPActivator.java
+++ b/bgp/extensions/inet/src/main/java/org/opendaylight/protocol/bgp/inet/BGPActivator.java
@@ -7,14 +7,15 @@
  */
 package org.opendaylight.protocol.bgp.inet;
 
-import java.util.ArrayList;
 import java.util.List;
+import org.kohsuke.MetaInfServices;
 import org.opendaylight.protocol.bgp.inet.codec.Ipv4NlriParser;
 import org.opendaylight.protocol.bgp.inet.codec.Ipv6BgpPrefixSidParser;
 import org.opendaylight.protocol.bgp.inet.codec.Ipv6NlriParser;
 import org.opendaylight.protocol.bgp.inet.codec.nexthop.Ipv4NextHopParserSerializer;
 import org.opendaylight.protocol.bgp.inet.codec.nexthop.Ipv6NextHopParserSerializer;
 import org.opendaylight.protocol.bgp.parser.spi.AbstractBGPExtensionProviderActivator;
+import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderActivator;
 import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv4.routes.Ipv4Routes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329.ipv6.routes.Ipv6Routes;
@@ -26,27 +27,22 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.next.hop.c.next.hop.Ipv6NextHopCase;
 import org.opendaylight.yangtools.concepts.Registration;
 
+@MetaInfServices(value = BGPExtensionProviderActivator.class)
 public final class BGPActivator extends AbstractBGPExtensionProviderActivator {
-
     @Override
     protected List<Registration> startImpl(final BGPExtensionProviderContext context) {
-        final List<Registration> regs = new ArrayList<>(6);
-
-        final Ipv4NextHopParserSerializer ipv4NextHopParser = new Ipv4NextHopParserSerializer();
         final Ipv4NlriParser ipv4Codec = new Ipv4NlriParser();
-        regs.add(context.registerNlriParser(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class,
-                ipv4Codec, ipv4NextHopParser, Ipv4NextHopCase.class, Ipv6NextHopCase.class));
-        regs.add(context.registerNlriSerializer(Ipv4Routes.class, ipv4Codec));
-
-        final Ipv6NextHopParserSerializer ipv6NextHopParser = new Ipv6NextHopParserSerializer();
         final Ipv6NlriParser ipv6Codec = new Ipv6NlriParser();
-        regs.add(context.registerNlriParser(Ipv6AddressFamily.class, UnicastSubsequentAddressFamily.class, ipv6Codec,
-                ipv6NextHopParser, Ipv4NextHopCase.class, Ipv6NextHopCase.class));
-        regs.add(context.registerNlriSerializer(Ipv6Routes.class, ipv6Codec));
-
         final Ipv6BgpPrefixSidParser tlvHandler = new Ipv6BgpPrefixSidParser();
-        regs.add(context.registerBgpPrefixSidTlvParser(tlvHandler.getType(), tlvHandler));
-        regs.add(context.registerBgpPrefixSidTlvSerializer(Ipv6SidTlv.class, tlvHandler));
-        return regs;
+
+        return List.of(
+            context.registerNlriParser(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class,
+                ipv4Codec, new Ipv4NextHopParserSerializer(), Ipv4NextHopCase.class, Ipv6NextHopCase.class),
+            context.registerNlriParser(Ipv6AddressFamily.class, UnicastSubsequentAddressFamily.class, ipv6Codec,
+                new Ipv6NextHopParserSerializer(), Ipv4NextHopCase.class, Ipv6NextHopCase.class),
+            context.registerNlriSerializer(Ipv4Routes.class, ipv4Codec),
+            context.registerNlriSerializer(Ipv6Routes.class, ipv6Codec),
+            context.registerBgpPrefixSidTlvParser(tlvHandler.getType(), tlvHandler),
+            context.registerBgpPrefixSidTlvSerializer(Ipv6SidTlv.class, tlvHandler));
     }
 }