From 042b763254cc60083c54c50ab6328e7600b22396 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 28 Dec 2023 21:35:07 +0100 Subject: [PATCH] Bump upstreams Adopt: - odlparent-13.0.10 - yangtools-11.0.5 - mdsal-12.0.4 Change-Id: Ia6f7420c5751436ec97d0a45187d79dadf9c3d94 Signed-off-by: Robert Varga --- akka/pom.xml | 2 +- akka/repackaged-akka-jar/pom.xml | 2 +- artifacts/pom.xml | 2 +- .../dsbenchmark/simpletx/SimpletxBaWrite.java | 22 +++++---- .../simpletx/SimpletxDomWrite.java | 30 ++++++------- .../dsbenchmark/txchain/TxchainBaWrite.java | 28 ++++++------ .../dsbenchmark/txchain/TxchainDomWrite.java | 27 +++++------ benchmark/pom.xml | 2 +- bundle-parent/pom.xml | 2 +- docs/pom.xml | 8 ++-- .../features-controller-experimental/pom.xml | 2 +- features/features-controller-testing/pom.xml | 2 +- features/features-controller/pom.xml | 2 +- features/pom.xml | 2 +- features/single-feature-parent/pom.xml | 2 +- jolokia/pom.xml | 2 +- karaf/pom.xml | 2 +- opendaylight/blueprint/pom.xml | 6 +-- .../blueprint/ext/ActionProviderBean.java | 21 ++++----- .../blueprint/ext/ComponentProcessor.java | 39 +++++++--------- .../ext/NotificationListenerBean.java | 8 ++-- .../blueprint/ext/RpcImplementationBean.java | 16 +++---- .../netty-event-executor-config/pom.xml | 2 +- .../config/netty-threadgroup-config/pom.xml | 2 +- .../config/netty-timer-config/pom.xml | 2 +- opendaylight/config/pom.xml | 2 +- .../config/threadpool-config-api/pom.xml | 2 +- .../config/threadpool-config-impl/pom.xml | 2 +- .../cluster/access/client/InversibleLock.java | 6 ++- opendaylight/md-sal/mdsal-it-base/pom.xml | 4 +- opendaylight/md-sal/mdsal-it-parent/pom.xml | 2 +- opendaylight/md-sal/parent/pom.xml | 2 +- opendaylight/md-sal/pom.xml | 2 +- .../md-sal/sal-clustering-config/pom.xml | 2 +- .../AbstractDOMBrokerTransaction.java | 14 ++++-- ...NotificationListenerRegistrationActor.java | 33 +++++++------- .../clustering-test-app/configuration/pom.xml | 2 +- .../samples/clustering-test-app/pom.xml | 2 +- .../it/provider/BasicRpcTestProvider.java | 2 +- .../it/provider/impl/IdIntsListener.java | 45 +++++++++---------- .../impl/SingletonGetConstantService.java | 3 +- opendaylight/md-sal/samples/pom.xml | 2 +- pom.xml | 2 +- 43 files changed, 177 insertions(+), 187 deletions(-) diff --git a/akka/pom.xml b/akka/pom.xml index 9bac3bcd21..a0b412ae9e 100644 --- a/akka/pom.xml +++ b/akka/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 diff --git a/akka/repackaged-akka-jar/pom.xml b/akka/repackaged-akka-jar/pom.xml index e92c20029a..1fae249847 100644 --- a/akka/repackaged-akka-jar/pom.xml +++ b/akka/repackaged-akka-jar/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent - 13.0.7 + 13.0.10 diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 216eccd1b0..d2b15600b7 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxBaWrite.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxBaWrite.java index 8893a70574..5395868aec 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxBaWrite.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxBaWrite.java @@ -5,16 +5,15 @@ * 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.dsbenchmark.simpletx; +import static java.util.Objects.requireNonNull; + import java.util.List; import java.util.concurrent.ExecutionException; import org.opendaylight.dsbenchmark.BaListBuilder; import org.opendaylight.dsbenchmark.DatastoreAbstractWriter; import org.opendaylight.mdsal.binding.api.DataBroker; -import org.opendaylight.mdsal.binding.api.WriteTransaction; -import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput.DataStore; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec; @@ -25,31 +24,31 @@ import org.slf4j.LoggerFactory; public class SimpletxBaWrite extends DatastoreAbstractWriter { private static final Logger LOG = LoggerFactory.getLogger(SimpletxBaWrite.class); + private final DataBroker dataBroker; - private List list; + private List list = null; public SimpletxBaWrite(final DataBroker dataBroker, final StartTestInput.Operation oper, final int outerListElem, final int innerListElem, final long writesPerTx, final DataStore dataStore) { super(oper, outerListElem, innerListElem, writesPerTx, dataStore); - this.dataBroker = dataBroker; + this.dataBroker = requireNonNull(dataBroker); LOG.debug("Created SimpletxBaWrite"); } @Override public void createList() { - list = BaListBuilder.buildOuterList(this.outerListElem, this.innerListElem); + list = BaListBuilder.buildOuterList(outerListElem, innerListElem); } @Override public void executeList() { - final LogicalDatastoreType dsType = getDataStoreType(); + final var dsType = getDataStoreType(); - WriteTransaction tx = dataBroker.newWriteOnlyTransaction(); + var tx = dataBroker.newWriteOnlyTransaction(); long writeCnt = 0; - for (OuterList element : this.list) { - InstanceIdentifier iid = InstanceIdentifier.create(TestExec.class) - .child(OuterList.class, element.key()); + for (var element : list) { + final var iid = InstanceIdentifier.create(TestExec.class).child(OuterList.class, element.key()); if (oper == StartTestInput.Operation.PUT) { tx.put(dsType, iid, element); } else { @@ -80,5 +79,4 @@ public class SimpletxBaWrite extends DatastoreAbstractWriter { } } } - } diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomWrite.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomWrite.java index f4cdbef26d..a57773125f 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomWrite.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/simpletx/SimpletxDomWrite.java @@ -5,16 +5,15 @@ * 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.dsbenchmark.simpletx; +import static java.util.Objects.requireNonNull; + import java.util.List; import java.util.concurrent.ExecutionException; import org.opendaylight.dsbenchmark.DatastoreAbstractWriter; import org.opendaylight.dsbenchmark.DomListBuilder; -import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataBroker; -import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput.DataStore; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec; @@ -27,33 +26,32 @@ import org.slf4j.LoggerFactory; public class SimpletxDomWrite extends DatastoreAbstractWriter { private static final Logger LOG = LoggerFactory.getLogger(SimpletxDomWrite.class); - private final DOMDataBroker domDataBroker; - private List list; - public SimpletxDomWrite(final DOMDataBroker domDataBroker, final StartTestInput.Operation oper, + private final DOMDataBroker dataBroker; + private List list = null; + + public SimpletxDomWrite(final DOMDataBroker dataBroker, final StartTestInput.Operation oper, final int outerListElem, final int innerListElem, final long putsPerTx, final DataStore dataStore) { super(oper, outerListElem, innerListElem, putsPerTx, dataStore); - this.domDataBroker = domDataBroker; + this.dataBroker = requireNonNull(dataBroker); LOG.debug("Created SimpletxDomWrite"); } @Override public void createList() { - list = DomListBuilder.buildOuterList(this.outerListElem, this.innerListElem); + list = DomListBuilder.buildOuterList(outerListElem, innerListElem); } @Override public void executeList() { - final LogicalDatastoreType dsType = getDataStoreType(); - final YangInstanceIdentifier pid = - YangInstanceIdentifier.builder().node(TestExec.QNAME).node(OuterList.QNAME).build(); + final var dsType = getDataStoreType(); + final var pid = YangInstanceIdentifier.of(TestExec.QNAME, OuterList.QNAME); - DOMDataTreeWriteTransaction tx = domDataBroker.newWriteOnlyTransaction(); + var tx = dataBroker.newWriteOnlyTransaction(); long writeCnt = 0; - for (MapEntryNode element : this.list) { - YangInstanceIdentifier yid = - pid.node(NodeIdentifierWithPredicates.of(OuterList.QNAME, element.getIdentifier().asMap())); + for (var element : list) { + final var yid = pid.node(NodeIdentifierWithPredicates.of(OuterList.QNAME, element.name().asMap())); if (oper == StartTestInput.Operation.PUT) { tx.put(dsType, yid, element); @@ -71,7 +69,7 @@ public class SimpletxDomWrite extends DatastoreAbstractWriter { LOG.error("Transaction failed", e); txError++; } - tx = domDataBroker.newWriteOnlyTransaction(); + tx = dataBroker.newWriteOnlyTransaction(); writeCnt = 0; } } diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaWrite.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaWrite.java index b96c1763b7..53c9e2fae4 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaWrite.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaWrite.java @@ -7,6 +7,8 @@ */ package org.opendaylight.dsbenchmark.txchain; +import static java.util.Objects.requireNonNull; + import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.MoreExecutors; import java.util.List; @@ -17,9 +19,7 @@ import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.Transaction; import org.opendaylight.mdsal.binding.api.TransactionChain; import org.opendaylight.mdsal.binding.api.TransactionChainListener; -import org.opendaylight.mdsal.binding.api.WriteTransaction; import org.opendaylight.mdsal.common.api.CommitInfo; -import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput.DataStore; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput.Operation; @@ -31,33 +31,33 @@ import org.slf4j.LoggerFactory; public class TxchainBaWrite extends DatastoreAbstractWriter implements TransactionChainListener { private static final Logger LOG = LoggerFactory.getLogger(TxchainBaWrite.class); - private final DataBroker bindingDataBroker; - private List list; - public TxchainBaWrite(final DataBroker bindingDataBroker, final Operation oper, - final int outerListElem, final int innerListElem, final long writesPerTx, final DataStore dataStore) { + private final DataBroker dataBroker; + private List list = null; + + public TxchainBaWrite(final DataBroker dataBroker, final Operation oper, final int outerListElem, + final int innerListElem, final long writesPerTx, final DataStore dataStore) { super(oper, outerListElem, innerListElem, writesPerTx, dataStore); - this.bindingDataBroker = bindingDataBroker; + this.dataBroker = requireNonNull(dataBroker); LOG.debug("Created TxchainBaWrite"); } @Override public void createList() { - list = BaListBuilder.buildOuterList(this.outerListElem, this.innerListElem); + list = BaListBuilder.buildOuterList(outerListElem, innerListElem); } @Override public void executeList() { - final TransactionChain chain = bindingDataBroker.createMergingTransactionChain(this); - final LogicalDatastoreType dsType = getDataStoreType(); + final var chain = dataBroker.createMergingTransactionChain(this); + final var dsType = getDataStoreType(); - WriteTransaction tx = chain.newWriteOnlyTransaction(); + var tx = chain.newWriteOnlyTransaction(); int txSubmitted = 0; int writeCnt = 0; - for (OuterList element : this.list) { - InstanceIdentifier iid = InstanceIdentifier.create(TestExec.class) - .child(OuterList.class, element.key()); + for (var element : list) { + final var iid = InstanceIdentifier.create(TestExec.class).child(OuterList.class, element.key()); if (oper == StartTestInput.Operation.PUT) { tx.put(dsType, iid, element); diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomWrite.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomWrite.java index 4f254a2ce9..ae7e1a1dd7 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomWrite.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainDomWrite.java @@ -14,10 +14,8 @@ import java.util.concurrent.ExecutionException; import org.opendaylight.dsbenchmark.DatastoreAbstractWriter; import org.opendaylight.dsbenchmark.DomListBuilder; import org.opendaylight.mdsal.common.api.CommitInfo; -import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataBroker; import org.opendaylight.mdsal.dom.api.DOMDataTreeTransaction; -import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; import org.opendaylight.mdsal.dom.api.DOMTransactionChain; import org.opendaylight.mdsal.dom.api.DOMTransactionChainListener; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput; @@ -32,35 +30,34 @@ import org.slf4j.LoggerFactory; public class TxchainDomWrite extends DatastoreAbstractWriter implements DOMTransactionChainListener { private static final Logger LOG = LoggerFactory.getLogger(TxchainDomWrite.class); - private final DOMDataBroker domDataBroker; - private List list; - public TxchainDomWrite(final DOMDataBroker domDataBroker, final StartTestInput.Operation oper, + private final DOMDataBroker dataBroker; + private List list = null; + + public TxchainDomWrite(final DOMDataBroker dataBroker, final StartTestInput.Operation oper, final int outerListElem, final int innerListElem, final long writesPerTx, final DataStore dataStore) { super(oper, outerListElem, innerListElem, writesPerTx, dataStore); - this.domDataBroker = domDataBroker; + this.dataBroker = dataBroker; LOG.debug("Created TxchainDomWrite"); } @Override public void createList() { - list = DomListBuilder.buildOuterList(this.outerListElem, this.innerListElem); + list = DomListBuilder.buildOuterList(outerListElem, innerListElem); } @Override public void executeList() { - final LogicalDatastoreType dsType = getDataStoreType(); - final YangInstanceIdentifier pid = - YangInstanceIdentifier.builder().node(TestExec.QNAME).node(OuterList.QNAME).build(); - final DOMTransactionChain chain = domDataBroker.createMergingTransactionChain(this); + final var dsType = getDataStoreType(); + final var pid = YangInstanceIdentifier.of(TestExec.QNAME, OuterList.QNAME); + final var chain = dataBroker.createMergingTransactionChain(this); - DOMDataTreeWriteTransaction tx = chain.newWriteOnlyTransaction(); + var tx = chain.newWriteOnlyTransaction(); int txSubmitted = 0; int writeCnt = 0; - for (MapEntryNode element : this.list) { - YangInstanceIdentifier yid = - pid.node(NodeIdentifierWithPredicates.of(OuterList.QNAME, element.getIdentifier().asMap())); + for (var element : list) { + var yid = pid.node(NodeIdentifierWithPredicates.of(OuterList.QNAME, element.name().asMap())); if (oper == StartTestInput.Operation.PUT) { tx.put(dsType, yid, element); diff --git a/benchmark/pom.xml b/benchmark/pom.xml index d09fa0afcd..55e8863966 100644 --- a/benchmark/pom.xml +++ b/benchmark/pom.xml @@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml index d861f247b2..e101c797ff 100644 --- a/bundle-parent/pom.xml +++ b/bundle-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal dom-parent - 12.0.3 + 12.0.4 diff --git a/docs/pom.xml b/docs/pom.xml index 5ab3c674eb..6555a91ede 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 13.0.7 + 13.0.10 @@ -233,9 +233,9 @@ https://netty.io/4.1/api/ https://commons.apache.org/proper/commons-lang/javadocs/api-release/ - https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/13.0.7/ - https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/11.0.4/ - https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/12.0.3/ + https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/13.0.10/ + https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/11.0.5/ + https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/12.0.4/ diff --git a/features/features-controller-experimental/pom.xml b/features/features-controller-experimental/pom.xml index 01f4c09b5d..d5bc175d39 100644 --- a/features/features-controller-experimental/pom.xml +++ b/features/features-controller-experimental/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 13.0.7 + 13.0.10 diff --git a/features/features-controller-testing/pom.xml b/features/features-controller-testing/pom.xml index 269fb786c9..a5c3357db4 100644 --- a/features/features-controller-testing/pom.xml +++ b/features/features-controller-testing/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 13.0.7 + 13.0.10 diff --git a/features/features-controller/pom.xml b/features/features-controller/pom.xml index bb917de8e9..c03549ada7 100644 --- a/features/features-controller/pom.xml +++ b/features/features-controller/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 13.0.7 + 13.0.10 diff --git a/features/pom.xml b/features/pom.xml index 3358c7fe4a..e239014b7a 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 diff --git a/features/single-feature-parent/pom.xml b/features/single-feature-parent/pom.xml index ab0507a179..97f0599686 100644 --- a/features/single-feature-parent/pom.xml +++ b/features/single-feature-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent single-feature-parent - 13.0.7 + 13.0.10 diff --git a/jolokia/pom.xml b/jolokia/pom.xml index 0baad04eba..9884e1192f 100644 --- a/jolokia/pom.xml +++ b/jolokia/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 13.0.7 + 13.0.10 diff --git a/karaf/pom.xml b/karaf/pom.xml index 758a76a09f..a0dfcd8dc6 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf4-parent - 13.0.7 + 13.0.10 diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml index 8d47a148b1..e6e9fb4175 100644 --- a/opendaylight/blueprint/pom.xml +++ b/opendaylight/blueprint/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 13.0.7 + 13.0.10 @@ -27,14 +27,14 @@ org.opendaylight.yangtools yangtools-artifacts - 11.0.4 + 11.0.5 pom import org.opendaylight.mdsal mdsal-artifacts - 12.0.3 + 12.0.4 pom import diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ActionProviderBean.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ActionProviderBean.java index 14297a10bf..5139b5fab6 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ActionProviderBean.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ActionProviderBean.java @@ -9,9 +9,7 @@ package org.opendaylight.controller.blueprint.ext; import com.google.common.collect.Collections2; import com.google.common.collect.ImmutableSet; -import java.util.Collection; import java.util.Objects; -import java.util.Set; import org.opendaylight.mdsal.binding.api.RpcProviderService; import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier; import org.opendaylight.mdsal.dom.api.DOMRpcImplementationNotAvailableException; @@ -20,7 +18,6 @@ import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.util.concurrent.FluentFutures; import org.opendaylight.yangtools.yang.binding.RpcService; -import org.opendaylight.yangtools.yang.common.QName; import org.osgi.framework.Bundle; import org.osgi.service.blueprint.container.ComponentDefinitionException; import org.slf4j.Logger; @@ -41,13 +38,13 @@ public class ActionProviderBean { private static final Logger LOG = LoggerFactory.getLogger(ActionProviderBean.class); - private DOMRpcProviderService domRpcProvider; - private RpcProviderService bindingRpcProvider; - private DOMSchemaService schemaService; - private RpcService implementation; - private String interfaceName; + private DOMRpcProviderService domRpcProvider = null; + private RpcProviderService bindingRpcProvider = null; + private DOMSchemaService schemaService = null; + private RpcService implementation = null; + private String interfaceName = null; private Registration reg; - private Bundle bundle; + private Bundle bundle = null; public void setBundle(final Bundle bundle) { this.bundle = bundle; @@ -119,14 +116,14 @@ public class ActionProviderBean { } private void registerFallback(final Class interfaceClass) { - final Collection paths = RpcUtil.decomposeRpcService(interfaceClass, - schemaService.getGlobalContext(), Objects::nonNull); + final var paths = RpcUtil.decomposeRpcService(interfaceClass, schemaService.getGlobalContext(), + Objects::nonNull); if (paths.isEmpty()) { LOG.warn("{}: interface {} has no actions defined", ACTION_PROVIDER, interfaceClass); return; } - final Set rpcs = ImmutableSet.copyOf(Collections2.transform(paths, DOMRpcIdentifier::create)); + final var rpcs = ImmutableSet.copyOf(Collections2.transform(paths, DOMRpcIdentifier::create)); reg = domRpcProvider.registerRpcImplementation( (rpc, input) -> FluentFutures.immediateFailedFluentFuture(new DOMRpcImplementationNotAvailableException( "Action %s has no instance matching %s", rpc, input)), rpcs); diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ComponentProcessor.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ComponentProcessor.java index 11807c6376..8e8d98ff36 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ComponentProcessor.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/ComponentProcessor.java @@ -25,8 +25,6 @@ import org.osgi.framework.Bundle; import org.osgi.framework.Constants; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceRegistration; -import org.osgi.service.blueprint.reflect.BeanProperty; -import org.osgi.service.blueprint.reflect.ComponentMetadata; import org.osgi.service.blueprint.reflect.ValueMetadata; import org.osgi.service.cm.ManagedService; import org.slf4j.Logger; @@ -45,8 +43,8 @@ public class ComponentProcessor implements ComponentDefinitionRegistryProcessor private static final String CM_PERSISTENT_ID_PROPERTY = "persistentId"; private final List> managedServiceRegs = new ArrayList<>(); - private Bundle bundle; - private BlueprintContainerRestartService blueprintContainerRestartService; + private Bundle bundle = null; + private BlueprintContainerRestartService blueprintContainerRestartService = null; private boolean restartDependentsOnUpdates; private boolean useDefaultForReferenceTypes; @@ -67,21 +65,19 @@ public class ComponentProcessor implements ComponentDefinitionRegistryProcessor } public void destroy() { - for (ServiceRegistration reg: managedServiceRegs) { - AriesFrameworkUtil.safeUnregisterService(reg); - } + managedServiceRegs.forEach(AriesFrameworkUtil::safeUnregisterService); } @Override public void process(final ComponentDefinitionRegistry registry) { LOG.debug("{}: In process", logName()); - for (String name : registry.getComponentDefinitionNames()) { - ComponentMetadata component = registry.getComponentDefinition(name); - if (component instanceof MutableBeanMetadata) { - processMutableBeanMetadata((MutableBeanMetadata) component); - } else if (component instanceof MutableServiceReferenceMetadata) { - processServiceReferenceMetadata((MutableServiceReferenceMetadata)component); + for (var name : registry.getComponentDefinitionNames()) { + final var component = registry.getComponentDefinition(name); + if (component instanceof MutableBeanMetadata bean) { + processMutableBeanMetadata(bean); + } else if (component instanceof MutableServiceReferenceMetadata serviceRef) { + processServiceReferenceMetadata(serviceRef); } } } @@ -112,18 +108,15 @@ public class ComponentProcessor implements ComponentDefinitionRegistryProcessor LOG.debug("{}: Found PropertyPlaceholder bean: {}, runtime {}", logName(), bean.getId(), bean.getRuntimeClass()); - for (BeanProperty prop : bean.getProperties()) { + for (var prop : bean.getProperties()) { if (CM_PERSISTENT_ID_PROPERTY.equals(prop.getName())) { - if (prop.getValue() instanceof ValueMetadata) { - ValueMetadata persistentId = (ValueMetadata)prop.getValue(); - - LOG.debug("{}: Found {} property, value : {}", logName(), - CM_PERSISTENT_ID_PROPERTY, persistentId.getStringValue()); - + if (prop.getValue() instanceof ValueMetadata persistentId) { + LOG.debug("{}: Found {} property, value : {}", logName(), CM_PERSISTENT_ID_PROPERTY, + persistentId.getStringValue()); registerManagedService(persistentId.getStringValue()); } else { - LOG.debug("{}: {} property metadata {} is not instanceof ValueMetadata", - logName(), CM_PERSISTENT_ID_PROPERTY, prop.getValue()); + LOG.debug("{}: {} property metadata {} is not instanceof ValueMetadata", logName(), + CM_PERSISTENT_ID_PROPERTY, prop.getValue()); } break; @@ -135,7 +128,7 @@ public class ComponentProcessor implements ComponentDefinitionRegistryProcessor private void registerManagedService(final String persistentId) { // Register a ManagedService so we get updates from the ConfigAdmin when the cfg file corresponding // to the persistentId changes. - final ManagedService managedService = new ManagedService() { + final var managedService = new ManagedService() { private final AtomicBoolean initialUpdate = new AtomicBoolean(true); private volatile Dictionary previousProperties; diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/NotificationListenerBean.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/NotificationListenerBean.java index 74c2956621..55be59cea3 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/NotificationListenerBean.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/NotificationListenerBean.java @@ -24,10 +24,10 @@ public class NotificationListenerBean { private static final Logger LOG = LoggerFactory.getLogger(NotificationListenerBean.class); static final String NOTIFICATION_LISTENER = "notification-listener"; - private Bundle bundle; - private NotificationService notificationService; - private NotificationListener notificationListener; - private ListenerRegistration registration; + private Bundle bundle = null; + private NotificationService notificationService = null; + private NotificationListener notificationListener = null; + private ListenerRegistration registration = null; public void setNotificationService(final NotificationService notificationService) { this.notificationService = notificationService; diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/RpcImplementationBean.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/RpcImplementationBean.java index 94d5b3b22f..a8fc47ab45 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/RpcImplementationBean.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/RpcImplementationBean.java @@ -29,11 +29,11 @@ public class RpcImplementationBean { private static final Logger LOG = LoggerFactory.getLogger(RpcImplementationBean.class); static final String RPC_IMPLEMENTATION = "rpc-implementation"; - private RpcProviderService rpcProvider; - private Bundle bundle; - private String interfaceName; - private RpcService implementation; private final List> rpcRegistrations = new ArrayList<>(); + private RpcProviderService rpcProvider = null; + private Bundle bundle = null; + private String interfaceName = null; + private RpcService implementation = null; public void setRpcProvider(final RpcProviderService rpcProvider) { this.rpcProvider = rpcProvider; @@ -54,13 +54,13 @@ public class RpcImplementationBean { @SuppressWarnings("checkstyle:IllegalCatch") public void init() { try { - List> rpcInterfaces = getImplementedRpcServiceInterfaces(interfaceName, + final var rpcInterfaces = getImplementedRpcServiceInterfaces(interfaceName, implementation.getClass(), bundle, RPC_IMPLEMENTATION); LOG.debug("{}: init - adding implementation {} for RpcService interface(s) {}", bundle.getSymbolicName(), implementation, rpcInterfaces); - for (Class rpcInterface : rpcInterfaces) { + for (var rpcInterface : rpcInterfaces) { rpcRegistrations.add(rpcProvider.registerRpcImplementation(rpcInterface, implementation)); } } catch (final ComponentDefinitionException e) { @@ -93,8 +93,8 @@ public class RpcImplementationBean { return Collections.singletonList((Class)rpcInterface); } - List> rpcInterfaces = new ArrayList<>(); - for (Class intface : implementationClass.getInterfaces()) { + final var rpcInterfaces = new ArrayList>(); + for (var intface : implementationClass.getInterfaces()) { if (RpcService.class.isAssignableFrom(intface)) { rpcInterfaces.add((Class) intface); } diff --git a/opendaylight/config/netty-event-executor-config/pom.xml b/opendaylight/config/netty-event-executor-config/pom.xml index beac957672..1c675f3ffa 100644 --- a/opendaylight/config/netty-event-executor-config/pom.xml +++ b/opendaylight/config/netty-event-executor-config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 13.0.7 + 13.0.10 diff --git a/opendaylight/config/netty-threadgroup-config/pom.xml b/opendaylight/config/netty-threadgroup-config/pom.xml index 6354722d6a..2434b62587 100644 --- a/opendaylight/config/netty-threadgroup-config/pom.xml +++ b/opendaylight/config/netty-threadgroup-config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 13.0.7 + 13.0.10 diff --git a/opendaylight/config/netty-timer-config/pom.xml b/opendaylight/config/netty-timer-config/pom.xml index 0af2b1a08a..91cf223011 100644 --- a/opendaylight/config/netty-timer-config/pom.xml +++ b/opendaylight/config/netty-timer-config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 13.0.7 + 13.0.10 diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml index 611bf48652..1380da29ca 100644 --- a/opendaylight/config/pom.xml +++ b/opendaylight/config/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 diff --git a/opendaylight/config/threadpool-config-api/pom.xml b/opendaylight/config/threadpool-config-api/pom.xml index 6b3635e259..629b78eed6 100644 --- a/opendaylight/config/threadpool-config-api/pom.xml +++ b/opendaylight/config/threadpool-config-api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 13.0.7 + 13.0.10 diff --git a/opendaylight/config/threadpool-config-impl/pom.xml b/opendaylight/config/threadpool-config-impl/pom.xml index 9e94cc0a49..0ece5fad94 100644 --- a/opendaylight/config/threadpool-config-impl/pom.xml +++ b/opendaylight/config/threadpool-config-impl/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 13.0.7 + 13.0.10 diff --git a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/InversibleLock.java b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/InversibleLock.java index 7e68445396..0917174b65 100644 --- a/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/InversibleLock.java +++ b/opendaylight/md-sal/cds-access-client/src/main/java/org/opendaylight/controller/cluster/access/client/InversibleLock.java @@ -10,6 +10,7 @@ package org.opendaylight.controller.cluster.access.client; import static com.google.common.base.Verify.verify; import static com.google.common.base.Verify.verifyNotNull; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.lang.invoke.MethodHandles; import java.lang.invoke.VarHandle; import java.util.concurrent.CountDownLatch; @@ -33,6 +34,8 @@ public final class InversibleLock { private final StampedLock lock = new StampedLock(); + @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", + justification = "https://github.com/spotbugs/spotbugs/issues/2749") private volatile CountDownLatch latch; /** @@ -69,8 +72,7 @@ public final class InversibleLock { } public void unlockWrite(final long stamp) { - final CountDownLatch local = (CountDownLatch) LATCH.getAndSet(this, null); - verifyNotNull(local); + final var local = verifyNotNull((CountDownLatch) LATCH.getAndSet(this, null)); lock.unlockWrite(stamp); local.countDown(); } diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml index aeefceff1f..4cf2d8b724 100644 --- a/opendaylight/md-sal/mdsal-it-base/pom.xml +++ b/opendaylight/md-sal/mdsal-it-base/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent bundle-parent - 13.0.7 + 13.0.10 @@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 12.0.3 + 12.0.4 pom import diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml index b93a5136a0..8d5f632185 100644 --- a/opendaylight/md-sal/mdsal-it-parent/pom.xml +++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent bundle-parent - 13.0.7 + 13.0.10 diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml index 072aee59c8..34569d8ee1 100644 --- a/opendaylight/md-sal/parent/pom.xml +++ b/opendaylight/md-sal/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 12.0.3 + 12.0.4 diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 90f8639543..2b127011e8 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 diff --git a/opendaylight/md-sal/sal-clustering-config/pom.xml b/opendaylight/md-sal/sal-clustering-config/pom.xml index bcaadf3d67..329341cc75 100644 --- a/opendaylight/md-sal/sal-clustering-config/pom.xml +++ b/opendaylight/md-sal/sal-clustering-config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerTransaction.java index f75707ccbf..e064818695 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/AbstractDOMBrokerTransaction.java @@ -10,8 +10,10 @@ package org.opendaylight.controller.cluster.databroker; import static com.google.common.base.Preconditions.checkArgument; import static java.util.Objects.requireNonNull; +import com.google.common.annotations.VisibleForTesting; import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.lang.invoke.MethodHandles; import java.lang.invoke.VarHandle; import java.util.Map; @@ -39,6 +41,8 @@ public abstract class AbstractDOMBrokerTransaction storeTxFactories; + @SuppressFBWarnings(value = "UWF_UNWRITTEN_FIELD", + justification = "https://github.com/spotbugs/spotbugs/issues/2749") private volatile Entry backingTx; /** @@ -47,7 +51,7 @@ public abstract class AbstractDOMBrokerTransaction storeTxFactories) { + final Map storeTxFactories) { this.identifier = requireNonNull(identifier, "Identifier should not be null"); this.storeTxFactories = requireNonNull(storeTxFactories, "Store Transaction Factories should not be null"); checkArgument(!storeTxFactories.isEmpty(), "Store Transaction Factories should not be empty"); @@ -91,6 +95,7 @@ public abstract class AbstractDOMBrokerTransaction entry; return (entry = backingTx) == null ? null : entry.getValue(); @@ -105,16 +110,17 @@ public abstract class AbstractDOMBrokerTransaction registration; - private Runnable onClose; + private SetRegistration registration = null; + private Cancellable killSchedule = null; private boolean closed; - private Cancellable killSchedule; @Override protected void handleReceive(final Object message) { @@ -42,9 +42,8 @@ public final class DataTreeNotificationListenerRegistrationActor extends Abstrac if (isValidSender(getSender())) { getSender().tell(CloseDataTreeNotificationListenerRegistrationReply.getInstance(), getSelf()); } - } else if (message instanceof SetRegistration) { - registration = ((SetRegistration)message).registration; - onClose = ((SetRegistration)message).onClose; + } else if (message instanceof SetRegistration setRegistration) { + registration = setRegistration; if (closed) { closeListenerRegistration(); } @@ -55,10 +54,12 @@ public final class DataTreeNotificationListenerRegistrationActor extends Abstrac private void closeListenerRegistration() { closed = true; - if (registration != null) { - registration.close(); - onClose.run(); + + final var reg = registration; + if (reg != null) { registration = null; + reg.registration.close(); + reg.onClose.run(); if (killSchedule == null) { killSchedule = getContext().system().scheduler().scheduleOnce(FiniteDuration.create(killDelay, @@ -72,13 +73,11 @@ public final class DataTreeNotificationListenerRegistrationActor extends Abstrac return Props.create(DataTreeNotificationListenerRegistrationActor.class); } - public static class SetRegistration { - private final ListenerRegistration registration; - private final Runnable onClose; - - public SetRegistration(final ListenerRegistration registration, final Runnable onClose) { - this.registration = requireNonNull(registration); - this.onClose = requireNonNull(onClose); + @NonNullByDefault + public record SetRegistration(Registration registration, Runnable onClose) { + public SetRegistration { + requireNonNull(registration); + requireNonNull(onClose); } } } diff --git a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml index d119f999d1..abdef3911e 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 diff --git a/opendaylight/md-sal/samples/clustering-test-app/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/pom.xml index b449086803..ae97e849b0 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/BasicRpcTestProvider.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/BasicRpcTestProvider.java index b04b517579..a3bf8c20b2 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/BasicRpcTestProvider.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/BasicRpcTestProvider.java @@ -40,7 +40,7 @@ public final class BasicRpcTestProvider implements ClusterSingletonService, Basi private final RpcProviderService rpcProviderRegistry; private final Registration singletonRegistration; - private ObjectRegistration rpcRegistration; + private ObjectRegistration rpcRegistration = null; @Inject @Activate diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/IdIntsListener.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/IdIntsListener.java index 5a1c90317e..68d7ea9a3c 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/IdIntsListener.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/IdIntsListener.java @@ -14,7 +14,6 @@ import com.google.common.util.concurrent.SettableFuture; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.ScheduledExecutorService; @@ -22,7 +21,7 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import org.opendaylight.mdsal.dom.api.ClusteredDOMDataTreeChangeListener; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; @@ -35,10 +34,11 @@ public final class IdIntsListener implements ClusteredDOMDataTreeChangeListener private static final Logger LOG = LoggerFactory.getLogger(IdIntsListener.class); private static final long SECOND_AS_NANO = 1000000000; - private volatile NormalizedNode localCopy; private final AtomicLong lastNotifTimestamp = new AtomicLong(0); - private ScheduledExecutorService executorService; - private ScheduledFuture scheduledFuture; + private ScheduledExecutorService executorService = null; + private ScheduledFuture scheduledFuture = null; + + private volatile NormalizedNode localCopy; @Override public void onInitialData() { @@ -84,7 +84,7 @@ public final class IdIntsListener implements ClusteredDOMDataTreeChangeListener public Future tryFinishProcessing() { executorService = Executors.newSingleThreadScheduledExecutor(); - final SettableFuture settableFuture = SettableFuture.create(); + final var settableFuture = SettableFuture.create(); scheduledFuture = executorService.scheduleAtFixedRate(new CheckFinishedTask(settableFuture), 0, 1, TimeUnit.SECONDS); @@ -94,43 +94,42 @@ public final class IdIntsListener implements ClusteredDOMDataTreeChangeListener public static String diffNodes(final MapNode expected, final MapNode actual) { StringBuilder builder = new StringBuilder("MapNodes diff:"); - final YangInstanceIdentifier.NodeIdentifier itemNodeId = new YangInstanceIdentifier.NodeIdentifier(ITEM); + final var itemNodeId = new NodeIdentifier(ITEM); - Map expIdIntMap = new HashMap<>(); - expected.body().forEach(node -> expIdIntMap.put(node.getIdentifier(), node)); + final var expIdIntMap = new HashMap(); + expected.body().forEach(node -> expIdIntMap.put(node.name(), node)); actual.body().forEach(actIdInt -> { - final MapEntryNode expIdInt = expIdIntMap.remove(actIdInt.getIdentifier()); + final var expIdInt = expIdIntMap.remove(actIdInt.name()); if (expIdInt == null) { - builder.append('\n').append(" Unexpected id-int entry for ").append(actIdInt.getIdentifier()); + builder.append('\n').append(" Unexpected id-int entry for ").append(actIdInt.name()); return; } - Map expItemMap = new HashMap<>(); - ((MapNode)expIdInt.findChildByArg(itemNodeId).orElseThrow()).body() - .forEach(node -> expItemMap.put(node.getIdentifier(), node)); + final var expItemMap = new HashMap(); + ((MapNode)expIdInt.getChildByArg(itemNodeId)).body() + .forEach(node -> expItemMap.put(node.name(), node)); - ((MapNode)actIdInt.findChildByArg(itemNodeId).orElseThrow()).body().forEach(actItem -> { - final MapEntryNode expItem = expItemMap.remove(actItem.getIdentifier()); + ((MapNode)actIdInt.getChildByArg(itemNodeId)).body().forEach(actItem -> { + final var expItem = expItemMap.remove(actItem.name()); if (expItem == null) { - builder.append('\n').append(" Unexpected item entry ").append(actItem.getIdentifier()) - .append(" for id-int entry ").append(actIdInt.getIdentifier()); + builder.append('\n').append(" Unexpected item entry ").append(actItem.name()) + .append(" for id-int entry ").append(actIdInt.name()); } }); expItemMap.values().forEach(node -> builder.append('\n') - .append(" Actual is missing item entry ").append(node.getIdentifier()) - .append(" for id-int entry ").append(actIdInt.getIdentifier())); + .append(" Actual is missing item entry ").append(node.name()) + .append(" for id-int entry ").append(actIdInt.name())); }); expIdIntMap.values().forEach(node -> builder.append('\n') - .append(" Actual is missing id-int entry for ").append(node.getIdentifier())); + .append(" Actual is missing id-int entry for ").append(node.name())); return builder.toString(); } - private class CheckFinishedTask implements Runnable { - + private final class CheckFinishedTask implements Runnable { private final SettableFuture future; CheckFinishedTask(final SettableFuture future) { diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/SingletonGetConstantService.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/SingletonGetConstantService.java index 6cda13b8ff..f700741891 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/SingletonGetConstantService.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/impl/SingletonGetConstantService.java @@ -47,7 +47,8 @@ public final class SingletonGetConstantService implements DOMRpcImplementation, private final DOMRpcProviderService rpcProviderService; private final String constant; - private DOMRpcImplementationRegistration rpcRegistration; + + private DOMRpcImplementationRegistration rpcRegistration = null; private SingletonGetConstantService(final DOMRpcProviderService rpcProviderService, final String constant) { this.rpcProviderService = rpcProviderService; diff --git a/opendaylight/md-sal/samples/pom.xml b/opendaylight/md-sal/samples/pom.xml index 4033806b77..7ccade36bc 100644 --- a/opendaylight/md-sal/samples/pom.xml +++ b/opendaylight/md-sal/samples/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 diff --git a/pom.xml b/pom.xml index 3f3da56e22..08d3b212b0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 13.0.7 + 13.0.10 -- 2.36.6