Wire SimpleEsiTypeRegistry statically

This is an implementation detail, wire the registry statically.
We can optimize it afterwards.

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

diff --git a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/BGPActivator.java b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/BGPActivator.java
index 4151197855d02bf5edb2f19ae61977af2b6adde8..4e932e0122f0485915409b5bdea7e68548b23711 100644 (file)
--- a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/BGPActivator.java
+++ b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/BGPActivator.java
@@ -13,7 +13,6 @@ import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.kohsuke.MetaInfServices;
-import org.opendaylight.protocol.bgp.evpn.impl.esi.types.ESIActivator;
 import org.opendaylight.protocol.bgp.evpn.impl.extended.communities.DefaultGatewayExtCom;
 import org.opendaylight.protocol.bgp.evpn.impl.extended.communities.ESILabelExtCom;
 import org.opendaylight.protocol.bgp.evpn.impl.extended.communities.ESImpRouteTargetExtCom;
@@ -61,7 +60,6 @@ public final class BGPActivator extends AbstractBGPExtensionProviderActivator {
 
         registerNlriHandler(context, regs);
         registerExtendedCommunities(context, regs);
-        ESIActivator.registerEsiTypeParsers(regs);
 
         return regs;
     }

diff --git a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/ESIActivator.java b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/ESIActivator.java
deleted file mode 100644 (file)
index 3b2f974..0000000
--- a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/ESIActivator.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.bgp.evpn.impl.esi.types;
-
-import java.util.List;
-import org.opendaylight.protocol.bgp.evpn.spi.pojo.SimpleEsiTypeRegistry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.ArbitraryCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.AsGeneratedCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.LacpAutoGeneratedCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.LanAutoGeneratedCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.MacAutoGeneratedCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.RouterIdGeneratedCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.arbitrary._case.Arbitrary;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.as.generated._case.AsGenerated;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.lacp.auto.generated._case.LacpAutoGenerated;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.lan.auto.generated._case.LanAutoGenerated;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.mac.auto.generated._case.MacAutoGenerated;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.router.id.generated._case.RouterIdGenerated;
-import org.opendaylight.yangtools.concepts.Registration;
-
-public final class ESIActivator {
-    private ESIActivator() {
-        // Hidden on purpose
-    }
-
-    public static void registerEsiTypeParsers(final List<Registration> regs) {
-        final SimpleEsiTypeRegistry esiRegistry = SimpleEsiTypeRegistry.getInstance();
-
-        final ArbitraryParser t0Parser = new ArbitraryParser();
-        regs.add(esiRegistry.registerEsiParser(t0Parser.getType(), t0Parser));
-        regs.add(esiRegistry.registerEsiSerializer(ArbitraryCase.class, t0Parser));
-        regs.add(esiRegistry.registerEsiModelSerializer(Arbitrary.QNAME, t0Parser));
-
-        final LacpParser t1Parser = new LacpParser();
-        regs.add(esiRegistry.registerEsiParser(t1Parser.getType(), t1Parser));
-        regs.add(esiRegistry.registerEsiSerializer(LacpAutoGeneratedCase.class, t1Parser));
-        regs.add(esiRegistry.registerEsiModelSerializer(LacpAutoGenerated.QNAME, t1Parser));
-
-        final LanParser t2Parser = new LanParser();
-        regs.add(esiRegistry.registerEsiParser(t2Parser.getType(), t2Parser));
-        regs.add(esiRegistry.registerEsiSerializer(LanAutoGeneratedCase.class, t2Parser));
-        regs.add(esiRegistry.registerEsiModelSerializer(LanAutoGenerated.QNAME, t2Parser));
-
-        final MacParser t3Parser = new MacParser();
-        regs.add(esiRegistry.registerEsiParser(t3Parser.getType(), t3Parser));
-        regs.add(esiRegistry.registerEsiSerializer(MacAutoGeneratedCase.class, t3Parser));
-        regs.add(esiRegistry.registerEsiModelSerializer(MacAutoGenerated.QNAME, t3Parser));
-
-        final RouterIdParser t4Parser = new RouterIdParser();
-        regs.add(esiRegistry.registerEsiParser(t4Parser.getType(), t4Parser));
-        regs.add(esiRegistry.registerEsiSerializer(RouterIdGeneratedCase.class, t4Parser));
-        regs.add(esiRegistry.registerEsiModelSerializer(RouterIdGenerated.QNAME, t4Parser));
-
-        final ASGenParser t5Parser = new ASGenParser();
-        regs.add(esiRegistry.registerEsiParser(t5Parser.getType(), t5Parser));
-        regs.add(esiRegistry.registerEsiSerializer(AsGeneratedCase.class, t5Parser));
-        regs.add(esiRegistry.registerEsiModelSerializer(AsGenerated.QNAME, t5Parser));
-    }
-}

diff --git a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEsiTypeRegistry.java b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/SimpleEsiTypeRegistry.java
similarity index 50%
rename from bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEsiTypeRegistry.java
rename to bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/SimpleEsiTypeRegistry.java
index abb89cdd0f4a73b7cef2bf87b5ff9e8152863547..fb538df610d101f492b1b74cc6b7504d89c36cd2 100644 (file)
--- a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEsiTypeRegistry.java
+++ b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/esi/types/SimpleEsiTypeRegistry.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.protocol.bgp.evpn.spi.pojo;
+package org.opendaylight.protocol.bgp.evpn.impl.esi.types;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
@@ -13,6 +13,7 @@ import com.google.common.collect.Iterables;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.netty.buffer.ByteBuf;
 import java.util.Collection;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.protocol.bgp.evpn.spi.EsiParser;
 import org.opendaylight.protocol.bgp.evpn.spi.EsiRegistry;
 import org.opendaylight.protocol.bgp.evpn.spi.EsiSerializer;
@@ -20,7 +21,18 @@ import org.opendaylight.protocol.concepts.HandlerRegistry;
 import org.opendaylight.protocol.concepts.MultiRegistry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.EsiType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.Esi;
-import org.opendaylight.yangtools.concepts.Registration;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.ArbitraryCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.AsGeneratedCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.LacpAutoGeneratedCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.LanAutoGeneratedCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.MacAutoGeneratedCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.RouterIdGeneratedCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.arbitrary._case.Arbitrary;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.as.generated._case.AsGenerated;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.lacp.auto.generated._case.LacpAutoGenerated;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.lan.auto.generated._case.LanAutoGenerated;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.mac.auto.generated._case.MacAutoGenerated;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.esi.router.id.generated._case.RouterIdGenerated;
 import org.opendaylight.yangtools.yang.binding.DataContainer;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
@@ -32,29 +44,55 @@ import org.slf4j.LoggerFactory;
 
 public final class SimpleEsiTypeRegistry implements EsiRegistry {
     private static final Logger LOG = LoggerFactory.getLogger(SimpleEsiTypeRegistry.class);
-    private static final SimpleEsiTypeRegistry SINGLETON = new SimpleEsiTypeRegistry();
+    private static final @NonNull SimpleEsiTypeRegistry INSTANCE = new SimpleEsiTypeRegistry();
     private static final int CONTENT_LENGTH = 10;
     private static final int ESI_LENGTH = 9;
+
     private final HandlerRegistry<DataContainer, EsiParser, EsiSerializer> handlers = new HandlerRegistry<>();
     private final MultiRegistry<NodeIdentifier, EsiSerializer> modelHandlers = new MultiRegistry<>();
 
     private SimpleEsiTypeRegistry() {
-    }
+        final ArbitraryParser t0Parser = new ArbitraryParser();
+        registerEsiParser(t0Parser.getType(), t0Parser);
+        handlers.registerSerializer(ArbitraryCase.class, t0Parser);
+        registerEsiModelSerializer(Arbitrary.QNAME, t0Parser);
+
+        final LacpParser t1Parser = new LacpParser();
+        registerEsiParser(t1Parser.getType(), t1Parser);
+        handlers.registerSerializer(LacpAutoGeneratedCase.class, t1Parser);
+        registerEsiModelSerializer(LacpAutoGenerated.QNAME, t1Parser);
+
+        final LanParser t2Parser = new LanParser();
+        registerEsiParser(t2Parser.getType(), t2Parser);
+        handlers.registerSerializer(LanAutoGeneratedCase.class, t2Parser);
+        registerEsiModelSerializer(LanAutoGenerated.QNAME, t2Parser);
+
+        final MacParser t3Parser = new MacParser();
+        registerEsiParser(t3Parser.getType(), t3Parser);
+        handlers.registerSerializer(MacAutoGeneratedCase.class, t3Parser);
+        registerEsiModelSerializer(MacAutoGenerated.QNAME, t3Parser);
+
+        final RouterIdParser t4Parser = new RouterIdParser();
+        registerEsiParser(t4Parser.getType(), t4Parser);
+        handlers.registerSerializer(RouterIdGeneratedCase.class, t4Parser);
+        registerEsiModelSerializer(RouterIdGenerated.QNAME, t4Parser);
 
-    public static SimpleEsiTypeRegistry getInstance() {
-        return SINGLETON;
+        final ASGenParser t5Parser = new ASGenParser();
+        registerEsiParser(t5Parser.getType(), t5Parser);
+        handlers.registerSerializer(AsGeneratedCase.class, t5Parser);
+        registerEsiModelSerializer(AsGenerated.QNAME, t5Parser);
     }
 
-    public Registration registerEsiParser(final EsiType esiType, final EsiParser parser) {
-        return this.handlers.registerParser(esiType.getIntValue(), parser);
+    public static @NonNull SimpleEsiTypeRegistry getInstance() {
+        return INSTANCE;
     }
 
-    public Registration registerEsiSerializer(final Class<? extends Esi> esiType, final EsiSerializer serializer) {
-        return this.handlers.registerSerializer(esiType, serializer);
+    private void registerEsiParser(final EsiType esiType, final EsiParser parser) {
+        handlers.registerParser(esiType.getIntValue(), parser);
     }
 
-    public Registration registerEsiModelSerializer(final QName qname, final EsiSerializer serializer) {
-        return this.modelHandlers.register(new NodeIdentifier(qname), serializer);
+    private void registerEsiModelSerializer(final QName qname, final EsiSerializer serializer) {
+        modelHandlers.register(NodeIdentifier.create(qname), serializer);
     }
 
     @Override

diff --git a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/AbstractEvpnNlri.java b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/AbstractEvpnNlri.java
index e2446067ef178e5170112a156c64f00ca0ff88fd..9dbcafe724faef5bd81518d3ea9eff004b258812 100644 (file)
--- a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/AbstractEvpnNlri.java
+++ b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/AbstractEvpnNlri.java
@@ -9,9 +9,9 @@ package org.opendaylight.protocol.bgp.evpn.impl.nlri;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
+import org.opendaylight.protocol.bgp.evpn.impl.esi.types.SimpleEsiTypeRegistry;
 import org.opendaylight.protocol.bgp.evpn.spi.EvpnParser;
 import org.opendaylight.protocol.bgp.evpn.spi.EvpnSerializer;
-import org.opendaylight.protocol.bgp.evpn.spi.pojo.SimpleEsiTypeRegistry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.NlriType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.Esi;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.evpn.EvpnChoice;

diff --git a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthADRParser.java b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthADRParser.java
index 6a00d3b2dff72e7d771ea05efaf4ee5fd8f02e01..a66f1f02ad0dd7a0917f2dcba3064f9a2912da0a 100644 (file)
--- a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthADRParser.java
+++ b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthADRParser.java
@@ -16,7 +16,7 @@ import static org.opendaylight.protocol.util.MplsLabelUtil.mplsLabelForByteBuf;
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import org.opendaylight.protocol.bgp.evpn.spi.pojo.SimpleEsiTypeRegistry;
+import org.opendaylight.protocol.bgp.evpn.impl.esi.types.SimpleEsiTypeRegistry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.NlriType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.Esi;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.ethernet.a.d.route.EthernetADRoute;

diff --git a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthSegRParser.java b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthSegRParser.java
index 3cceb6725218d7ec789e4b0f67f6a7f9557013fd..00e62477dbabfd33238bca3977ae96c1415fb555 100644 (file)
--- a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthSegRParser.java
+++ b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthSegRParser.java
@@ -13,7 +13,7 @@ import static org.opendaylight.protocol.bgp.evpn.impl.nlri.NlriModelUtil.extract
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import org.opendaylight.bgp.concepts.IpAddressUtil;
-import org.opendaylight.protocol.bgp.evpn.spi.pojo.SimpleEsiTypeRegistry;
+import org.opendaylight.protocol.bgp.evpn.impl.esi.types.SimpleEsiTypeRegistry;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZone;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.NlriType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.es.route.EsRoute;

diff --git a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/MACIpAdvRParser.java b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/MACIpAdvRParser.java
index 5009639e876f3daa3d09bbd07553feed8caf5a2d..e1b332e0fb8232d5c447402459d4ab965d52ab05 100644 (file)
--- a/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/MACIpAdvRParser.java
+++ b/bgp/extensions/evpn/src/main/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/MACIpAdvRParser.java
@@ -19,7 +19,7 @@ import static org.opendaylight.protocol.util.MplsLabelUtil.mplsLabelForByteBuf;
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import org.opendaylight.protocol.bgp.evpn.spi.pojo.SimpleEsiTypeRegistry;
+import org.opendaylight.protocol.bgp.evpn.impl.esi.types.SimpleEsiTypeRegistry;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.protocol.util.Ipv4Util;
 import org.opendaylight.protocol.util.Ipv6Util;

diff --git a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthADRParserTest.java b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthADRParserTest.java
index 9f747db9a8189fdfbe696f0a6c27047423c3545d..b680f782bdef645ce43641a4fb0ad72edde7315c 100644 (file)
--- a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthADRParserTest.java
+++ b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthADRParserTest.java
@@ -21,10 +21,7 @@ import static org.opendaylight.protocol.bgp.evpn.impl.nlri.SimpleEvpnNlriRegistr
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import java.util.ArrayList;
-import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.protocol.bgp.evpn.impl.esi.types.ESIActivator;
 import org.opendaylight.protocol.bgp.evpn.impl.esi.types.LanParserTest;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.ethernet.a.d.route.EthernetADRouteBuilder;
@@ -64,13 +61,7 @@ public class EthADRParserTest {
         (byte) 0x02, (byte) 0x00,
         (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x0a, (byte) 0x05, (byte) 0xdc, (byte) 0x10
     };
-    private EthADRParser parser;
-
-    @Before
-    public void setUp() {
-        this.parser = new EthADRParser();
-        ESIActivator.registerEsiTypeParsers(new ArrayList<>());
-    }
+    private final EthADRParser parser = new EthADRParser();
 
     @Test
     public void parserTest() {

diff --git a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthSegRParserTest.java b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthSegRParserTest.java
index fa2ac72674a9cf42b93d94cf11403929df8c5608..fa229b1542713784f60ab537db629ae16910912d 100644 (file)
--- a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthSegRParserTest.java
+++ b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EthSegRParserTest.java
@@ -21,10 +21,7 @@ import static org.opendaylight.protocol.bgp.evpn.impl.nlri.EthADRParserTest.WRON
 import static org.opendaylight.protocol.bgp.evpn.impl.nlri.NlriModelUtil.ORI_NID;
 
 import io.netty.buffer.Unpooled;
-import java.util.ArrayList;
-import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.protocol.bgp.evpn.impl.esi.types.ESIActivator;
 import org.opendaylight.protocol.bgp.evpn.impl.esi.types.LanParserTest;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.es.route.EsRouteBuilder;
@@ -69,13 +66,7 @@ public class EthSegRParserTest {
         (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00,
         (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01,
     };
-    private EthSegRParser parser;
-
-    @Before
-    public void setUp() {
-        this.parser = new EthSegRParser();
-        ESIActivator.registerEsiTypeParsers(new ArrayList<>());
-    }
+    private final EthSegRParser parser = new EthSegRParser();
 
     @Test
     public void parserTest() {

diff --git a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EvpnNlriAttributesParserTest.java b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EvpnNlriAttributesParserTest.java
index ed2db167107df33269c5b4ef93553ac834eaef25..15fc8609a14025f76b5646da79252fa74e1e9357 100644 (file)
--- a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EvpnNlriAttributesParserTest.java
+++ b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EvpnNlriAttributesParserTest.java
@@ -12,11 +12,8 @@ import static org.opendaylight.protocol.bgp.evpn.impl.EvpnTestUtil.RD;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import java.util.ArrayList;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.protocol.bgp.evpn.impl.esi.types.ESIActivator;
 import org.opendaylight.protocol.bgp.parser.BGPParsingException;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.evpn.destination.EvpnDestinationBuilder;
@@ -36,13 +33,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mult
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.mp.unreach.nlri.WithdrawnRoutesBuilder;
 
 public class EvpnNlriAttributesParserTest {
-    private EvpnNlriParser parser;
-
-    @Before
-    public void setUp() {
-        ESIActivator.registerEsiTypeParsers(new ArrayList<>());
-        this.parser = new EvpnNlriParser();
-    }
+    private final EvpnNlriParser parser = new EvpnNlriParser();
 
     @Test
     public void testAttributes1() throws BGPParsingException {

diff --git a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EvpnNlriParserTest.java b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EvpnNlriParserTest.java
index f718c63a52ce2e106fa28d865add06ae044406b2..78ceaff44e0747ec370200bf44d149920f0d1642 100644 (file)
--- a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EvpnNlriParserTest.java
+++ b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/EvpnNlriParserTest.java
@@ -17,12 +17,8 @@ import static org.opendaylight.protocol.bgp.evpn.impl.nlri.SimpleEvpnNlriRegistr
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.protocol.bgp.evpn.impl.esi.types.ESIActivator;
 import org.opendaylight.protocol.bgp.parser.BGPParsingException;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.EvpnSubsequentAddressFamily;
@@ -48,8 +44,11 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableUn
 
 public class EvpnNlriParserTest {
     private static final NodeIdentifier EVPN_CHOICE_NID = new NodeIdentifier(EvpnChoice.QNAME);
-    private List<EvpnDestination> dest;
-    private EvpnNlriParser parser;
+
+    private final List<EvpnDestination> dest = List.of(new EvpnDestinationBuilder()
+        .setRouteDistinguisher(RD)
+        .setEvpnChoice(IncMultEthTagRParserTest.createIncMultiCase()).build());
+    private final EvpnNlriParser parser = new EvpnNlriParser();
 
     private static ChoiceNode createMACIpAdvChoice() {
         final DataContainerNodeBuilder<NodeIdentifier, ChoiceNode> choice = Builders.choiceBuilder();
@@ -57,15 +56,6 @@ public class EvpnNlriParserTest {
         return choice.addChild(MACIpAdvRParserTest.createMacIpCont()).build();
     }
 
-    @Before
-    public void setUp() {
-        ESIActivator.registerEsiTypeParsers(new ArrayList<>());
-        this.dest = Collections.singletonList(new EvpnDestinationBuilder()
-                .setRouteDistinguisher(RD)
-                .setEvpnChoice(IncMultEthTagRParserTest.createIncMultiCase()).build());
-        this.parser = new EvpnNlriParser();
-    }
-
     @Test
     public void testSerializeNlri() {
         final ByteBuf buffer = Unpooled.buffer();

diff --git a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/IncMultEthTagRParserTest.java b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/IncMultEthTagRParserTest.java
index 733afb58c4b088bf624d61ee354ae7e1e71c57d8..6e68ec38c3bc94ccd3eb9462b24665af8d5e8310 100644 (file)
--- a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/IncMultEthTagRParserTest.java
+++ b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/IncMultEthTagRParserTest.java
@@ -20,10 +20,7 @@ import static org.opendaylight.protocol.bgp.evpn.impl.nlri.MACIpAdvRParserTest.c
 import static org.opendaylight.protocol.bgp.evpn.impl.nlri.NlriModelUtil.ORI_NID;
 
 import io.netty.buffer.Unpooled;
-import java.util.ArrayList;
-import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.protocol.bgp.evpn.impl.esi.types.ESIActivator;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.evpn.EvpnChoice;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.evpn.evpn.choice.EsRouteCaseBuilder;
@@ -47,17 +44,10 @@ public class IncMultEthTagRParserTest {
         (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x0a,
         (byte) 0x20, (byte) 0x7f, (byte) 0x00, (byte) 0x00, (byte) 0x01
     };
-    private IncMultEthTagRParser parser;
-
-    @Before
-    public void setUp() {
-        this.parser = new IncMultEthTagRParser();
-        ESIActivator.registerEsiTypeParsers(new ArrayList<>());
-    }
+    private final IncMultEthTagRParser parser = new IncMultEthTagRParser();
 
     @Test
     public void parserTest() {
-
         final IncMultiEthernetTagResCase expected = IncMultEthTagRParserTest.createIncMultiCase();
         assertArrayEquals(RESULT, ByteArray.getAllBytes(this.parser.serializeEvpn(expected,
                 Unpooled.wrappedBuffer(ROUDE_DISTIN))));

diff --git a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/MACIpAdvRParserTest.java b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/MACIpAdvRParserTest.java
index 224cdcee86a98fd0b39ed8083a673436b81b2c5d..e63472ef1f541ef0b612605e04930f7b79ac7e82 100644 (file)
--- a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/MACIpAdvRParserTest.java
+++ b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/MACIpAdvRParserTest.java
@@ -33,10 +33,7 @@ import static org.opendaylight.protocol.bgp.evpn.impl.nlri.NlriModelUtil.MPLS2_N
 import static org.opendaylight.protocol.bgp.evpn.impl.nlri.NlriModelUtil.VLAN_NID;
 
 import io.netty.buffer.Unpooled;
-import java.util.ArrayList;
-import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.protocol.bgp.evpn.impl.esi.types.ESIActivator;
 import org.opendaylight.protocol.bgp.evpn.impl.esi.types.LanParserTest;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.evpn.EvpnChoice;
@@ -94,13 +91,7 @@ public class MACIpAdvRParserTest {
         (byte) 0x05, (byte) 0xdc, (byte) 0x10, //MPLS
     };
 
-    private MACIpAdvRParser parser;
-
-    @Before
-    public void setUp() {
-        this.parser = new MACIpAdvRParser();
-        ESIActivator.registerEsiTypeParsers(new ArrayList<>());
-    }
+    private final MACIpAdvRParser parser = new MACIpAdvRParser();
 
     @Test
     public void parserCase1Test() {

diff --git a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/SimpleEvpnNlriRegistryTest.java b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/SimpleEvpnNlriRegistryTest.java
index 5f519a289bc124d14cea45aa1990f21515f9588b..85dce053cbd80a97b38cbeb188dc13ef3c5d0631 100644 (file)
--- a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/SimpleEvpnNlriRegistryTest.java
+++ b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/impl/nlri/SimpleEvpnNlriRegistryTest.java
@@ -18,15 +18,11 @@ import static org.opendaylight.protocol.bgp.evpn.impl.nlri.EthADRParserTest.crea
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import java.util.ArrayList;
-import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.protocol.bgp.evpn.impl.esi.types.ESIActivator;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.Evpn;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.NlriType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.evpn.EvpnChoice;
-import org.opendaylight.yangtools.concepts.Registration;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
@@ -43,12 +39,6 @@ public final class SimpleEvpnNlriRegistryTest {
         }
     }
 
-    @Before
-    public void setUp() {
-        final ArrayList<Registration> reg = new ArrayList<>();
-        ESIActivator.registerEsiTypeParsers(reg);
-    }
-
     @Test
     public void registryTest() {
         final ByteBuf buff = SimpleEvpnNlriRegistry.getInstance().serializeEvpn(ETHERNET_AD_ROUTE_CASE,

diff --git a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEsiTypeRegistryTest.java b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEsiTypeRegistryTest.java
index 0952fcf1e247af88df3177cf46461215b08315e8..a3a7d141c2f411827338b4e80fb7ee06dede269c 100644 (file)
--- a/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEsiTypeRegistryTest.java
+++ b/bgp/extensions/evpn/src/test/java/org/opendaylight/protocol/bgp/evpn/spi/pojo/SimpleEsiTypeRegistryTest.java
@@ -14,11 +14,9 @@ import static org.opendaylight.protocol.bgp.evpn.impl.esi.types.RouterIdParserTe
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import java.util.ArrayList;
-import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.protocol.bgp.evpn.impl.esi.types.ESIActivator;
 import org.opendaylight.protocol.bgp.evpn.impl.esi.types.RouterIdParserTest;
+import org.opendaylight.protocol.bgp.evpn.impl.esi.types.SimpleEsiTypeRegistry;
 import org.opendaylight.protocol.util.ByteArray;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.esi.Esi;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.evpn.rev200120.evpn.routes.evpn.routes.EvpnRoute;
@@ -38,11 +36,6 @@ public class SimpleEsiTypeRegistryTest {
         }
     }
 
-    @Before
-    public void setUp() {
-        ESIActivator.registerEsiTypeParsers(new ArrayList<>());
-    }
-
     @Test
     public void registryTest() {
         final ByteBuf buff = Unpooled.buffer(ESI_TYPE_LENGTH);