From c6e3583411de29ebcf6e4f0c47292668217e3839 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 12 Jan 2023 12:26:28 +0100 Subject: [PATCH] Move afiClass/safiClass assignment Having a requireNonNull() silences a warning reported by eclipse. Change-Id: I5f52e44d76065a2923b43d738ee4cee998ce0443 Signed-off-by: Robert Varga --- .../protocol/bgp/rib/spi/AbstractRIBSupport.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java index bb76358a71..e0576a9e1e 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java @@ -167,6 +167,8 @@ public abstract class AbstractRIBSupport< this.routeQname = BindingReflections.findQName(listClass).bindTo(module); this.routeKeyQname = QName.create(module, ROUTE_KEY).intern(); this.routesListIdentifier = NodeIdentifier.create(routeQname); + this.afiClass = requireNonNull(afiClass); + this.safiClass = requireNonNull(safiClass); this.tk = new TablesKey(afiClass, safiClass); this.tablesKey = NodeIdentifierWithPredicates.of(Tables.QNAME, TABLES_KEY_TEMPLATE.instantiateWithValues( BindingReflections.findQName(afiClass.implementedInterface()), @@ -176,8 +178,6 @@ public abstract class AbstractRIBSupport< .toNormalizedNode(TABLES_II, new TablesBuilder().withKey(tk) .setAttributes(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib .rev180329.rib.tables.AttributesBuilder().build()).build()).getValue(); - this.afiClass = afiClass; - this.safiClass = safiClass; this.destinationNid = NodeIdentifier.create(destContainerQname); this.pathIdNid = NodeIdentifier.create(QName.create(routeQName(), "path-id").intern()); this.prefixTypeNid = NodeIdentifier.create(QName.create(destContainerQname, "prefix").intern()); @@ -186,7 +186,7 @@ public abstract class AbstractRIBSupport< TABLES_NID, TABLES_NID, ROUTES_NID, routesContainerIdentifier, routesListIdentifier, routesListIdentifier); this.relativeRoutesPath = ImmutableList.of(routesContainerIdentifier, routesListIdentifier); this.routeKeyTemplate = ImmutableOffsetMapTemplate.ordered( - ImmutableList.of(this.pathIdNid.getNodeType(), routeKeyQname)); + ImmutableList.of(pathIdNid.getNodeType(), routeKeyQname)); } @Override -- 2.36.6