From 730518c4a74a671df546208abc3d7e380b99d6cc Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 17 Sep 2026 13:56:01 +0200 Subject: [PATCH 01/10] Ditch use of checker-qual Use ErrorProne annotations instead of checker-qual. Change-Id: I3147ad034acec84211ca8cbbfae27a9d546a307d Signed-off-by: Robert Varga --- provider/cluster/pom.xml | 5 ----- .../cluster/impl/JsonRpcPeerListManager.java | 14 ++++++-------- provider/common/pom.xml | 6 ------ .../org/opendaylight/jsonrpc/impl/TxChain.java | 5 ++--- provider/single/pom.xml | 5 ----- .../jsonrpc/provider/single/JsonRPCProvider.java | 2 +- 6 files changed, 9 insertions(+), 28 deletions(-) diff --git a/provider/cluster/pom.xml b/provider/cluster/pom.xml index 2e899e64..8c5d1547 100644 --- a/provider/cluster/pom.xml +++ b/provider/cluster/pom.xml @@ -42,11 +42,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html netty-transport provided - - org.checkerframework - checker-qual - provided - org.opendaylight.yangtools yang-parser-api diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/JsonRpcPeerListManager.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/JsonRpcPeerListManager.java index eb7bcc82..2881b2bd 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/JsonRpcPeerListManager.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/JsonRpcPeerListManager.java @@ -11,15 +11,13 @@ import static org.opendaylight.jsonrpc.provider.common.Util.removeFromMapAndClos import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import org.apache.pekko.util.Timeout; -import org.checkerframework.checker.lock.qual.GuardedBy; -import org.checkerframework.checker.lock.qual.Holding; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.jsonrpc.provider.cluster.api.JsonRpcPeerSingletonService; import org.opendaylight.jsonrpc.provider.common.AbstractPeerContext; @@ -56,8 +54,8 @@ public final class JsonRpcPeerListManager implements DataTreeChangeListener peerMap = new HashMap<>(); - private final Map clusterRegistrations = new HashMap<>(); + private final HashMap peerMap = new HashMap<>(); + private final HashMap clusterRegistrations = new HashMap<>(); private final ClusterDependencies dependencies; private final Registration dtcListener; private Registration rpcReg; @@ -103,7 +101,7 @@ public final class JsonRpcPeerListManager implements DataTreeChangeListenerorg.bouncycastle bcpkix-jdk18on - - org.checkerframework - checker-qual - provided - true - org.osgi org.osgi.service.component.annotations diff --git a/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/TxChain.java b/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/TxChain.java index 7c4eb822..ce990b74 100644 --- a/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/TxChain.java +++ b/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/TxChain.java @@ -11,15 +11,14 @@ package org.opendaylight.jsonrpc.impl; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; +import com.google.errorprone.annotations.concurrent.GuardedBy; import com.google.gson.JsonElement; import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.checkerframework.checker.lock.qual.GuardedBy; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.jsonrpc.bus.messagelib.TransportFactory; import org.opendaylight.jsonrpc.dom.codec.JsonRpcCodecFactory; @@ -56,7 +55,7 @@ public class TxChain extends AbstractJsonRPCComponent implements DOMTransactionC private volatile boolean closed = false; private volatile boolean successful = true; @GuardedBy("rwLock") - private final ConcurrentMap pendingTxs = new ConcurrentHashMap<>(); + private final ConcurrentHashMap pendingTxs = new ConcurrentHashMap<>(); public TxChain(@NonNull final DOMTransactionFactory dataBroker, @NonNull TransportFactory transportFactory, @NonNull HierarchicalEnumMap pathMap, diff --git a/provider/single/pom.xml b/provider/single/pom.xml index aa1d66da..0e05a36c 100644 --- a/provider/single/pom.xml +++ b/provider/single/pom.xml @@ -26,11 +26,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html netty-transport provided - - org.checkerframework - checker-qual - provided - org.opendaylight.yangtools yang-parser-api diff --git a/provider/single/src/main/java/org/opendaylight/jsonrpc/provider/single/JsonRPCProvider.java b/provider/single/src/main/java/org/opendaylight/jsonrpc/provider/single/JsonRPCProvider.java index 7f603c27..e3a6c196 100644 --- a/provider/single/src/main/java/org/opendaylight/jsonrpc/provider/single/JsonRPCProvider.java +++ b/provider/single/src/main/java/org/opendaylight/jsonrpc/provider/single/JsonRPCProvider.java @@ -11,6 +11,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.errorprone.annotations.concurrent.GuardedBy; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Collection; @@ -24,7 +25,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock; import java.util.function.Function; import java.util.stream.Collectors; -import org.checkerframework.checker.lock.qual.GuardedBy; import org.opendaylight.jsonrpc.bus.messagelib.TransportFactory; import org.opendaylight.jsonrpc.model.CombinedSchemaContextProvider; import org.opendaylight.jsonrpc.model.GovernanceProvider; -- 2.34.1 From 20479976bb42cef961048c38b3b7e4180a29ae00 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 17 Sep 2026 14:14:24 +0200 Subject: [PATCH 02/10] Ditch use of Joiner String.join() can do the same thing and does not trigger modernizer. Change-Id: Ifc83550a02749c40148a6da07426cb6bff3a421d Signed-off-by: Robert Varga --- .../opendaylight/jsonrpc/bus/messagelib/TestMessageServer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/TestMessageServer.java b/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/TestMessageServer.java index 0b53f792..b5507099 100644 --- a/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/TestMessageServer.java +++ b/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/TestMessageServer.java @@ -7,7 +7,6 @@ */ package org.opendaylight.jsonrpc.bus.messagelib; -import com.google.common.base.Joiner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,7 +25,7 @@ public class TestMessageServer implements ServerPartialInterface { @Override public String join(String delim, String[] msgs) { - return Joiner.on(delim).join(msgs); + return String.join(delim, msgs); } @Override -- 2.34.1 From a365741bf4ba51004432dd9ae56e353ffcdef3bc Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 17 Sep 2026 14:29:24 +0200 Subject: [PATCH 03/10] Ditch use of InstanceIdentifier Migrate to DataObjectIdentifier. Change-Id: I0838076b88fdda15ef6b017215fd4f7669eb780b Signed-off-by: Robert Varga --- .../opendaylight/jsonrpc/impl/RemoteControlProvider.java | 7 +++---- .../jsonrpc/provider/common/JsonRPCTxTest.java | 4 ++-- .../jsonrpc/provider/common/RemoteControlTest.java | 8 ++++---- .../opendaylight/jsonrpc/provider/common/TestUtils.java | 4 ++-- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/RemoteControlProvider.java b/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/RemoteControlProvider.java index 7e5d6ce4..5131e14e 100644 --- a/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/RemoteControlProvider.java +++ b/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/RemoteControlProvider.java @@ -23,7 +23,6 @@ import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.DataObjectModification; import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType; import org.opendaylight.mdsal.binding.api.DataTreeChangeListener; -import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; import org.opendaylight.mdsal.binding.api.DataTreeModification; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataBroker; @@ -33,8 +32,8 @@ import org.opendaylight.mdsal.dom.api.DOMRpcService; import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.Config; +import org.opendaylight.yangtools.binding.DataObjectIdentifier; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.model.spi.source.YangTextToIRSourceTransformer; import org.opendaylight.yangtools.yang.parser.api.YangParserFactory; import org.osgi.service.component.annotations.Activate; @@ -76,8 +75,8 @@ public final class RemoteControlProvider this.dependencies = Objects.requireNonNull(dependencies); this.codecFactory = new JsonRpcCodecFactory(dependencies.getSchemaService().getGlobalContext()); registration = dependencies.getDataBroker() - .registerTreeChangeListener(DataTreeIdentifier.of(LogicalDatastoreType.CONFIGURATION, - InstanceIdentifier.create(Config.class)), this); + .registerTreeChangeListener(LogicalDatastoreType.CONFIGURATION, + DataObjectIdentifier.builder(Config.class).build(), this); } @Override diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCTxTest.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCTxTest.java index b845770d..ec098efa 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCTxTest.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCTxTest.java @@ -61,10 +61,10 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointBuilder; +import org.opendaylight.yangtools.binding.DataObjectIdentifier; import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer; import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer.NodeResult; import org.opendaylight.yangtools.binding.util.BindingMap; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.slf4j.Logger; @@ -229,7 +229,7 @@ public class JsonRPCTxTest extends AbstractJsonRpcTest { static NodeResult createContainerNodeData(BindingNormalizedNodeSerializer codec) { //@formatter:off - final InstanceIdentifier ii = InstanceIdentifier.create(NetworkTopology.class); + final var ii = DataObjectIdentifier.builder(NetworkTopology.class).build(); final NetworkTopology dObj = new NetworkTopologyBuilder() .setTopology(BindingMap.of(new TopologyBuilder() .setNode(BindingMap.of(List.of( diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteControlTest.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteControlTest.java index 6f934097..ccd0c6df 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteControlTest.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/RemoteControlTest.java @@ -58,8 +58,8 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint; +import org.opendaylight.yangtools.binding.DataObjectIdentifier; import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer.NodeResult; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.OperationFailedException; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; @@ -143,7 +143,7 @@ public class RemoteControlTest extends AbstractJsonRpcTest { wtx.put(LogicalDatastoreType.OPERATIONAL, e.path(), e.node()); wtx.commit().get(); - InstanceIdentifier nii = InstanceIdentifier.create(NetworkTopology.class); + var nii = DataObjectIdentifier.builder(NetworkTopology.class).build(); YangInstanceIdentifier yii = getCodec().toYangInstanceIdentifier(nii); dumpYii(yii); @@ -236,14 +236,14 @@ public class RemoteControlTest extends AbstractJsonRpcTest { .setConfiguredEndpoints(Map.of()).build(); NodeResult e1 = getCodec() - .toNormalizedDataObject(InstanceIdentifier.create(Config.class), c1); + .toNormalizedDataObject(DataObjectIdentifier.builder(Config.class).build(), c1); wtx.put(LogicalDatastoreType.CONFIGURATION, e1.path(), e1.node()); wtx.commit().get(); ConfiguredEndpoints c2 = new ConfiguredEndpointsBuilder().setName("name-1") .setModules(Set.of(new YangIdentifier("ietf-inet-types"))).build(); - NodeResult e2 = getCodec().toNormalizedDataObject(InstanceIdentifier + NodeResult e2 = getCodec().toNormalizedDataObject(DataObjectIdentifier .builder(Config.class).child(ConfiguredEndpoints.class, new ConfiguredEndpointsKey("name-1")).build(), c2); diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/TestUtils.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/TestUtils.java index cb917f96..648e9fda 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/TestUtils.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/TestUtils.java @@ -19,10 +19,10 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointKey; +import org.opendaylight.yangtools.binding.DataObjectIdentifier; import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer; import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer.NodeResult; import org.opendaylight.yangtools.binding.util.BindingMap; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** * Utility class to reduce code duplication. @@ -62,7 +62,7 @@ public final class TestUtils { public static NodeResult getMockTopologyAsDom(BindingNormalizedNodeSerializer codec) { final NetworkTopology nt = getMockTopology(); - return codec.toNormalizedDataObject(InstanceIdentifier.create(NetworkTopology.class), nt); + return codec.toNormalizedDataObject(DataObjectIdentifier.builder(NetworkTopology.class).build(), nt); } /** -- 2.34.1 From 8a765e0f088d1396ba64bc2127b244de2c5add7f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 17 Sep 2026 15:32:12 +0200 Subject: [PATCH 04/10] Migrate to DataObjectIdentifier Update provider-cluster to not work on deprecated InstanceIdentifier. Change-Id: I188b56fad32dd8a93d81853d50624cd8fd8aa203 Signed-off-by: Robert Varga --- .../provider/cluster/impl/ClusterUtil.java | 26 +++++++++---------- .../cluster/impl/JsonRpcPeerListManager.java | 4 +-- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ClusterUtil.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ClusterUtil.java index 1063daa8..1926bbfb 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ClusterUtil.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ClusterUtil.java @@ -7,8 +7,6 @@ */ package org.opendaylight.jsonrpc.provider.cluster.impl; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; import java.util.concurrent.TimeUnit; import org.opendaylight.mdsal.binding.api.DataTreeIdentifier; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; @@ -18,8 +16,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.config.Ac import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.config.ActualEndpointsKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.config.ConfiguredEndpoints; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.config.ConfiguredEndpointsKey; +import org.opendaylight.yangtools.binding.DataObjectIdentifier; import org.opendaylight.yangtools.binding.KeyStep; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.Uint16; import scala.concurrent.duration.Duration; import scala.concurrent.duration.FiniteDuration; @@ -47,7 +45,7 @@ final class ClusterUtil { */ public static DataTreeIdentifier getPeerOpstateIdentifier(String name) { return DataTreeIdentifier.of(LogicalDatastoreType.OPERATIONAL, - InstanceIdentifier.builder(Config.class) + DataObjectIdentifier.builder(Config.class) .child(ActualEndpoints.class, new ActualEndpointsKey(name)) .build()); } @@ -59,7 +57,7 @@ final class ClusterUtil { */ public static DataTreeIdentifier getPeerListIdentifier() { return DataTreeIdentifier.of(LogicalDatastoreType.CONFIGURATION, - InstanceIdentifier.builder(Config.class).child(ConfiguredEndpoints.class).build()); + DataObjectIdentifier.builder(Config.class).child(ConfiguredEndpoints.class).build()); } /** @@ -68,16 +66,16 @@ final class ClusterUtil { * @param ii {@link InstanceIdentifier} of subtype of {@link Peer} * @return peer's name */ - public static String peerNameFromII(InstanceIdentifier ii) { - final var last = Iterables.getLast(ii.getPathArguments()); - Preconditions.checkArgument(last instanceof KeyStep); - if (((KeyStep) last).key() instanceof ConfiguredEndpointsKey) { - return ((ConfiguredEndpointsKey) ((KeyStep) last).key()).getName(); + public static String peerNameFromII(DataObjectIdentifier ii) { + final var last = ii.lastStep(); + if (!(last instanceof KeyStep keyStep)) { + throw new IllegalArgumentException("Unexpected last step " + last); } - if (((KeyStep) last).key() instanceof ActualEndpointsKey) { - return ((ActualEndpointsKey) ((KeyStep) last).key()).getName(); - } - throw new IllegalArgumentException("Unrecognized key : " + last); + return switch (keyStep.key()) { + case ConfiguredEndpointsKey key -> key.getName(); + case ActualEndpointsKey key -> key.getName(); + default -> throw new IllegalArgumentException("Unrecognized key : " + keyStep); + }; } public static String createActorPath(final String masterAddress, final String name) { diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/JsonRpcPeerListManager.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/JsonRpcPeerListManager.java index 2881b2bd..528c02f3 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/JsonRpcPeerListManager.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/JsonRpcPeerListManager.java @@ -35,8 +35,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.ForceRelo import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.ForceReloadOutputBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.Peer; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.config.ConfiguredEndpoints; +import org.opendaylight.yangtools.binding.DataObjectIdentifier; import org.opendaylight.yangtools.concepts.Registration; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.slf4j.Logger; @@ -77,7 +77,7 @@ public final class JsonRpcPeerListManager implements DataTreeChangeListener> changes) { for (final DataTreeModification change : changes) { final DataObjectModification rootNode = change.getRootNode(); - final InstanceIdentifier ident = change.getRootPath().path(); + final DataObjectIdentifier ident = change.path(); final String name = ClusterUtil.peerNameFromII(ident); LOG.debug("CFG DTC [{}] : {} => {}", rootNode.modificationType(), rootNode.dataBefore(), rootNode.dataAfter()); -- 2.34.1 From 650af684d07c3f9dfd4265344b85b6857cb8404b Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 17 Sep 2026 14:40:43 +0200 Subject: [PATCH 05/10] Use RootMeta to extract YangModuleInfo This is a more straightforward way of getting the same instance. Change-Id: I29769e9f5df31f81098f67876d3e95b5efdf1850 Signed-off-by: Robert Varga --- .../provider/cluster/MountpointTest.java | 20 +++++++++---------- .../provider/common/AbstractJsonRpcTest.java | 20 +++++++++---------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/provider/cluster/src/test/java/org/opendaylight/jsonrpc/provider/cluster/MountpointTest.java b/provider/cluster/src/test/java/org/opendaylight/jsonrpc/provider/cluster/MountpointTest.java index 00c13774..97867e6c 100644 --- a/provider/cluster/src/test/java/org/opendaylight/jsonrpc/provider/cluster/MountpointTest.java +++ b/provider/cluster/src/test/java/org/opendaylight/jsonrpc/provider/cluster/MountpointTest.java @@ -20,7 +20,6 @@ import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.gson.JsonObject; @@ -72,6 +71,7 @@ import org.opendaylight.mdsal.singleton.impl.EOSClusterSingletonServiceProvider; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.YangIdentifier; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.Config; +import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.JsonrpcData; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.MountStatus; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.config.ActualEndpoints; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.config.ActualEndpointsKey; @@ -82,14 +82,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.peer.Data import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.peer.DataConfigEndpointsKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.peer.RpcEndpointsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.peer.RpcEndpointsKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.data.rev201014.TopContainer; -import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.rpc.rev201014.FactorialInput; +import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.data.rev201014.TestModelDataData; +import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.rpc.rev201014.TestModelRpcData; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopologyData; import org.opendaylight.yangtools.binding.DataObjectIdentifier; import org.opendaylight.yangtools.binding.Rpc; import org.opendaylight.yangtools.binding.meta.YangModuleInfo; -import org.opendaylight.yangtools.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -203,12 +202,11 @@ public class MountpointTest { final TestCustomizer dataBrokerTest = new TestCustomizer() { @Override protected Set getModuleInfos() { - return ImmutableSet.of( - BindingRuntimeHelpers.getYangModuleInfo(NetworkTopology.class), - BindingRuntimeHelpers.getYangModuleInfo(Topology.class), - BindingRuntimeHelpers.getYangModuleInfo(TopContainer.class), - BindingRuntimeHelpers.getYangModuleInfo(Config.class), - BindingRuntimeHelpers.getYangModuleInfo(FactorialInput.class)); + return Set.of( + NetworkTopologyData.META.moduleInfo(), + TestModelDataData.META.moduleInfo(), + JsonrpcData.META.moduleInfo(), + TestModelRpcData.META.moduleInfo()); } }; diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/AbstractJsonRpcTest.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/AbstractJsonRpcTest.java index 75b3e03d..4d016bed 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/AbstractJsonRpcTest.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/AbstractJsonRpcTest.java @@ -26,11 +26,11 @@ import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.mdsal.dom.broker.DOMMountPointServiceImpl; import org.opendaylight.mdsal.dom.broker.DOMNotificationRouter; import org.opendaylight.mdsal.dom.broker.DOMRpcRouter; -import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.Config; -import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.data.rev201014.TopContainer; -import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.notif.rev201014.Notification1; -import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.rpc.rev201014.FactorialInput; -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology; +import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.rev161201.JsonrpcData; +import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.data.rev201014.TestModelDataData; +import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.notif.rev201014.TestModelNotificationData; +import org.opendaylight.yang.gen.v1.urn.opendaylight.jsonrpc.test.rpc.rev201014.TestModelRpcData; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopologyData; import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer; import org.opendaylight.yangtools.binding.data.codec.impl.di.DefaultBindingDOMCodecFactory; import org.opendaylight.yangtools.binding.meta.YangModuleInfo; @@ -77,11 +77,11 @@ public abstract class AbstractJsonRpcTest extends AbstractDataBrokerTest { @Override protected Set getModuleInfos() { return Set.of( - BindingRuntimeHelpers.getYangModuleInfo(Config.class), - BindingRuntimeHelpers.getYangModuleInfo(NetworkTopology.class), - BindingRuntimeHelpers.getYangModuleInfo(TopContainer.class), - BindingRuntimeHelpers.getYangModuleInfo(Notification1.class), - BindingRuntimeHelpers.getYangModuleInfo(FactorialInput.class)); + JsonrpcData.META.moduleInfo(), + NetworkTopologyData.META.moduleInfo(), + TestModelDataData.META.moduleInfo(), + TestModelNotificationData.META.moduleInfo(), + TestModelRpcData.META.moduleInfo()); } protected BindingNormalizedNodeSerializer getCodec() { -- 2.34.1 From f74d11323bf0a04a874421fdd2659180d35371af Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 17 Sep 2026 14:04:09 +0200 Subject: [PATCH 06/10] Fix Javadoc block separation Upgraded checkstyle is finding these, fix them up. Change-Id: I836a38cdc55e69ca446c62780fcd9a134fe811d8 Signed-off-by: Robert Varga --- .../opendaylight/jsonrpc/bus/messagelib/TransportFactory.java | 1 + .../main/java/org/opendaylight/jsonrpc/bus/messagelib/Util.java | 2 ++ .../org/opendaylight/jsonrpc/impl/DataModificationContext.java | 1 + 3 files changed, 4 insertions(+) diff --git a/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/TransportFactory.java b/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/TransportFactory.java index 624248ce..fe0506d9 100644 --- a/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/TransportFactory.java +++ b/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/TransportFactory.java @@ -94,6 +94,7 @@ public interface TransportFactory extends AutoCloseable { /** * Get {@link BaseEndpointBuilder}. + * * @return {@link BaseEndpointBuilder} */ EndpointBuilder endpointBuilder(); diff --git a/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/Util.java b/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/Util.java index 2680586a..c3de8b23 100644 --- a/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/Util.java +++ b/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/Util.java @@ -153,6 +153,7 @@ public final class Util { * In order to have deterministic order of methods, we need to sort them by * argument types. This is because outcome of * {@link Class#getDeclaredMethods()} is not sorted. + * * @return {@link Comparator} */ public static Comparator argsSorter() { @@ -171,6 +172,7 @@ public final class Util { /** * Combination of {@link #nameSorter()} and {@link #argsSorter()}. + * * @return combined {@link Comparator} */ public static Comparator nameAndArgsSorter() { diff --git a/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/DataModificationContext.java b/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/DataModificationContext.java index ce9d4b3b..0fc479ea 100644 --- a/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/DataModificationContext.java +++ b/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/DataModificationContext.java @@ -42,6 +42,7 @@ public class DataModificationContext implements AutoCloseable { /** * Cancel all chained transactions. + * * @return true if no transaction has been allocated. */ public boolean cancel() { -- 2.34.1 From ca0d3e8c5f52b05092c149adb7f310eddbc6d32f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 17 Sep 2026 14:06:50 +0200 Subject: [PATCH 07/10] Clean up use of HTML entities Use {@code} block instead of HTML entities. Change-Id: Ia190783722a5baccd195f622471c8e41bdb89787 Signed-off-by: Robert Varga --- .../jsonrpc/bus/messagelib/NameMatchingPredicate.java | 6 +++--- .../main/java/org/opendaylight/jsonrpc/hmap/PathCodec.java | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/NameMatchingPredicate.java b/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/NameMatchingPredicate.java index fa2887da..3e16c9d8 100644 --- a/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/NameMatchingPredicate.java +++ b/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/NameMatchingPredicate.java @@ -45,9 +45,9 @@ public class NameMatchingPredicate implements Predicate { *

Examples: *

*
    - *
  • method-abc => method_abc
    • - *
  • method_def => method_def
    • - *
  • method123 => method123
    • + *
  • {@code method-abc => method_abc}
    • + *
  • {@code method_def => method_def}
    • + *
  • {@code method123 => method123}
    • *
*/ private String toUnderscoreName(String name) { diff --git a/provider/common/src/main/java/org/opendaylight/jsonrpc/hmap/PathCodec.java b/provider/common/src/main/java/org/opendaylight/jsonrpc/hmap/PathCodec.java index f9a82d76..f2e8a44d 100644 --- a/provider/common/src/main/java/org/opendaylight/jsonrpc/hmap/PathCodec.java +++ b/provider/common/src/main/java/org/opendaylight/jsonrpc/hmap/PathCodec.java @@ -34,8 +34,7 @@ public interface PathCodec { /** * Deserialize sequence of I into external path specification P. * - * @param path {@link Iterable}<I> sequence of internal path - * identifiers + * @param path {@code Iterable} sequence of internal path identifiers * @return P external path specification */ P deserialize(Iterable path); -- 2.34.1 From 3350e9fdcd85d592a794a1af71b111bda68fd36e Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 17 Sep 2026 14:02:37 +0200 Subject: [PATCH 08/10] Replace use of String.format() Upgraded modernizer is pointing out violations: fix that up. Change-Id: Icb9140965c5e838758c20708cc700e5c64a82f9c Signed-off-by: Robert Varga --- .../bus/api/RecoverableTransportException.java | 2 +- .../bus/messagelib/AbstractProxyHandlerAdapter.java | 4 ++-- .../jsonrpc/bus/messagelib/MessageLibrary.java | 2 +- .../bus/messagelib/NotificationHandlerAdapter.java | 2 +- .../jsonrpc/bus/messagelib/ProxyServiceImpl.java | 2 +- .../bus/messagelib/RequesterSessionImpl.java | 4 ++-- .../jsonrpc/bus/messagelib/TestHelper.java | 2 +- .../jsonrpc/bus/spi/AbstractBusSessionFactory.java | 2 +- .../jsonrpc/bus/spi/AbstractSession.java | 2 +- .../jsonrpc/bus/spi/AbstractSessionTest.java | 4 ++-- .../bus/http/AbstractWebBusSessionFactory.java | 2 +- .../opendaylight/jsonrpc/bus/zmq/ReadyCommand.java | 2 +- .../java/org/opendaylight/jsonrpc/bus/zmq/Util.java | 2 +- .../jsonrpc/dom/codec/JsonRpcPathCodec.java | 6 +++--- .../jsonrpc/provider/cluster/impl/ClusterUtil.java | 4 ++-- .../provider/cluster/impl/ProxyDOMRpcService.java | 2 +- .../provider/cluster/tx/ActorProxyTransaction.java | 2 +- .../jsonrpc/impl/DataChangeListenerRegistry.java | 2 +- .../jsonrpc/impl/JsonRPCNotificationService.java | 2 +- .../opendaylight/jsonrpc/impl/RemoteShardAware.java | 2 +- .../common/BuiltinSchemaContextProvider.java | 2 +- .../jsonrpc/provider/common/RpcClient.java | 3 +-- .../opendaylight/jsonrpc/provider/common/Util.java | 4 ++-- .../common/JsonRPCNotificationServiceTest.java | 6 ++---- .../provider/common/JsonRPCtoRPCBridgeTest.java | 5 ++--- .../provider/common/OmRootMessageHandler.java | 2 +- .../provider/single/JsonRPCProviderTest.java | 13 ++++++------- 27 files changed, 41 insertions(+), 46 deletions(-) diff --git a/bus/api/src/main/java/org/opendaylight/jsonrpc/bus/api/RecoverableTransportException.java b/bus/api/src/main/java/org/opendaylight/jsonrpc/bus/api/RecoverableTransportException.java index b0b6f623..d28c41a1 100644 --- a/bus/api/src/main/java/org/opendaylight/jsonrpc/bus/api/RecoverableTransportException.java +++ b/bus/api/src/main/java/org/opendaylight/jsonrpc/bus/api/RecoverableTransportException.java @@ -22,6 +22,6 @@ public class RecoverableTransportException extends RuntimeException { } public RecoverableTransportException(SessionType sessionType, String address) { - super(String.format("Remote enpodint not ready : %s@%s", sessionType, address)); + super("Remote enpodint not ready : %s@%s".formatted(sessionType, address)); } } diff --git a/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/AbstractProxyHandlerAdapter.java b/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/AbstractProxyHandlerAdapter.java index 2bba9d54..f0dda26f 100644 --- a/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/AbstractProxyHandlerAdapter.java +++ b/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/AbstractProxyHandlerAdapter.java @@ -94,12 +94,12 @@ abstract class AbstractProxyHandlerAdapter { // At this point it could be wrong number of arguments. opt = findMethodLenient(message); if (!opt.isEmpty()) { - String msg = String.format("Found method but wrong number of arguments: %s", message.getMethod()); + String msg = "Found method but wrong number of arguments: " + message.getMethod(); LOG.debug(msg); throw new IllegalArgumentException(msg); } } - throw new NoSuchMethodException(String.format("Method not found : %s", message.getMethod())); + throw new NoSuchMethodException("Method not found : " + message.getMethod()); } /** diff --git a/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/MessageLibrary.java b/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/MessageLibrary.java index 31c55af7..167eafe6 100644 --- a/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/MessageLibrary.java +++ b/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/MessageLibrary.java @@ -69,7 +69,7 @@ public class MessageLibrary implements AutoCloseable, Consumer { } if (desiredFactory == null) { - throw new IllegalArgumentException(String.format("Bus Type not supported : %s", busType)); + throw new IllegalArgumentException("Bus Type not supported : " + busType); } this.factory = desiredFactory; diff --git a/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/NotificationHandlerAdapter.java b/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/NotificationHandlerAdapter.java index a176e780..be432927 100644 --- a/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/NotificationHandlerAdapter.java +++ b/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/NotificationHandlerAdapter.java @@ -39,7 +39,7 @@ public class NotificationHandlerAdapter implements MessageListener { for (final JsonRpcBaseMessage notification : incoming) { if (notification.getType() != JsonRpcMessageType.NOTIFICATION) { throw new MessageLibraryMismatchException( - String.format("Expected NOTIFICATION, but got %s message", notification.getType().name())); + "Expected NOTIFICATION, but got %s message".formatted(notification.getType().name())); } else { handler.handleNotification((JsonRpcNotificationMessage) notification); } diff --git a/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/ProxyServiceImpl.java b/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/ProxyServiceImpl.java index c36e1fe4..085f4a02 100644 --- a/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/ProxyServiceImpl.java +++ b/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/ProxyServiceImpl.java @@ -130,7 +130,7 @@ public class ProxyServiceImpl implements ProxyService { */ if (TO_STRING_METHOD_NAME.equals(methodName) && method.getParameterTypes().length == 0) { LOG.debug("Proxy for session {}", proxyMap.get(obj)); - return String.format("Proxy => %s", proxyMap.get(obj)); + return "Proxy => " + proxyMap.get(obj); } /* * Special case to handle AutoCloseable#close(). Instead of forwarding diff --git a/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/RequesterSessionImpl.java b/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/RequesterSessionImpl.java index 479b48fc..428716a8 100644 --- a/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/RequesterSessionImpl.java +++ b/bus/messagelib/src/main/java/org/opendaylight/jsonrpc/bus/messagelib/RequesterSessionImpl.java @@ -70,7 +70,7 @@ public final class RequesterSessionImpl extends AbstractSession implements Messa for (final JsonRpcBaseMessage msg : messages) { if (msg.getType() != JsonRpcMessageType.REPLY) { throw new MessageLibraryMismatchException( - String.format("Requester received %s message", msg.getType().name())); + "Requester received %s message".formatted(msg.getType().name())); } handler.handleReply((JsonRpcReplyMessage) msg); } @@ -105,7 +105,7 @@ public final class RequesterSessionImpl extends AbstractSession implements Messa if (resp == null) { lastRequest.getAndSet(null).cancel(true); throw new MessageLibraryTimeoutException( - String.format("Message was not received within %d milliseconds", timeout)); + "Message was not received within %d milliseconds".formatted(timeout)); } return resp; } catch (InterruptedException e) { diff --git a/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/TestHelper.java b/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/TestHelper.java index a3a2eff2..683afb4d 100644 --- a/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/TestHelper.java +++ b/bus/messagelib/src/test/java/org/opendaylight/jsonrpc/bus/messagelib/TestHelper.java @@ -38,7 +38,7 @@ public final class TestHelper { } private static String getUri(String transport, String ip, int port) { - return String.format("%s://%s:%d", transport, ip, port); + return "%s://%s:%d".formatted(transport, ip, port); } public static void awaitForProxy(TransportFactory factory, AutoCloseable proxy, long milliseconds) { diff --git a/bus/spi/src/main/java/org/opendaylight/jsonrpc/bus/spi/AbstractBusSessionFactory.java b/bus/spi/src/main/java/org/opendaylight/jsonrpc/bus/spi/AbstractBusSessionFactory.java index a702a2fd..956a8af1 100644 --- a/bus/spi/src/main/java/org/opendaylight/jsonrpc/bus/spi/AbstractBusSessionFactory.java +++ b/bus/spi/src/main/java/org/opendaylight/jsonrpc/bus/spi/AbstractBusSessionFactory.java @@ -85,7 +85,7 @@ public abstract class AbstractBusSessionFactory implements BusSessionFactory { try { return new URI(uriStr); } catch (URISyntaxException e) { - throw new IllegalArgumentException(String.format("Invalid URI : %s", uriStr), e); + throw new IllegalArgumentException("Invalid URI : " + uriStr, e); } } } diff --git a/bus/spi/src/main/java/org/opendaylight/jsonrpc/bus/spi/AbstractSession.java b/bus/spi/src/main/java/org/opendaylight/jsonrpc/bus/spi/AbstractSession.java index 64a18cab..a6828a53 100644 --- a/bus/spi/src/main/java/org/opendaylight/jsonrpc/bus/spi/AbstractSession.java +++ b/bus/spi/src/main/java/org/opendaylight/jsonrpc/bus/spi/AbstractSession.java @@ -70,7 +70,7 @@ public abstract class AbstractSession implements AutoCloseable, BusSession { try { return new URI(uriStr); } catch (URISyntaxException e) { - throw new IllegalArgumentException(String.format("Invalid URI : '%s'", uriStr), e); + throw new IllegalArgumentException("Invalid URI : '%s'".formatted(uriStr), e); } } diff --git a/bus/spi/src/test/java/org/opendaylight/jsonrpc/bus/spi/AbstractSessionTest.java b/bus/spi/src/test/java/org/opendaylight/jsonrpc/bus/spi/AbstractSessionTest.java index 0b6cb78c..18281f58 100644 --- a/bus/spi/src/test/java/org/opendaylight/jsonrpc/bus/spi/AbstractSessionTest.java +++ b/bus/spi/src/test/java/org/opendaylight/jsonrpc/bus/spi/AbstractSessionTest.java @@ -71,11 +71,11 @@ public abstract class AbstractSessionTest { } protected String getBindUri(int port) { - return String.format("%s://0.0.0.0:%d/", factory.name(), port); + return "%s://0.0.0.0:%d/".formatted(factory.name(), port); } protected String getConnectUri(int port) { - return String.format("%s://127.0.0.1:%d/", factory.name(), port); + return "%s://127.0.0.1:%d/".formatted(factory.name(), port); } public static int getFreeTcpPort() { diff --git a/bus/transport-http/src/main/java/org/opendaylight/jsonrpc/bus/http/AbstractWebBusSessionFactory.java b/bus/transport-http/src/main/java/org/opendaylight/jsonrpc/bus/http/AbstractWebBusSessionFactory.java index 82b4dcef..9c602024 100644 --- a/bus/transport-http/src/main/java/org/opendaylight/jsonrpc/bus/http/AbstractWebBusSessionFactory.java +++ b/bus/transport-http/src/main/java/org/opendaylight/jsonrpc/bus/http/AbstractWebBusSessionFactory.java @@ -117,6 +117,6 @@ abstract class AbstractWebBusSessionFactory extends AbstractBusSessionFactory { private void throwUnsupported(SessionType sessionType) { throw new UnsupportedOperationException( - String.format("Transport '%s' does not support %s session type", name, sessionType.name())); + "Transport '%s' does not support %s session type".formatted(name, sessionType.name())); } } diff --git a/bus/transport-zmq/src/main/java/org/opendaylight/jsonrpc/bus/zmq/ReadyCommand.java b/bus/transport-zmq/src/main/java/org/opendaylight/jsonrpc/bus/zmq/ReadyCommand.java index b368f1ab..1b4c7d9a 100644 --- a/bus/transport-zmq/src/main/java/org/opendaylight/jsonrpc/bus/zmq/ReadyCommand.java +++ b/bus/transport-zmq/src/main/java/org/opendaylight/jsonrpc/bus/zmq/ReadyCommand.java @@ -37,7 +37,7 @@ public class ReadyCommand implements Command { final byte readyLen = buffer.readByte(); final String readyStr = buffer.readCharSequence(readyLen, StandardCharsets.US_ASCII).toString(); if (!Constants.READY_STR.equals(readyStr)) { - throw new IllegalArgumentException(String.format("Expected 'READY' string, but got '%s'", readyStr)); + throw new IllegalArgumentException("Expected 'READY' string, but got '%s'".formatted(readyStr)); } this.name = Constants.READY_STR; // read metadata diff --git a/bus/transport-zmq/src/main/java/org/opendaylight/jsonrpc/bus/zmq/Util.java b/bus/transport-zmq/src/main/java/org/opendaylight/jsonrpc/bus/zmq/Util.java index 2dddad44..243ec037 100644 --- a/bus/transport-zmq/src/main/java/org/opendaylight/jsonrpc/bus/zmq/Util.java +++ b/bus/transport-zmq/src/main/java/org/opendaylight/jsonrpc/bus/zmq/Util.java @@ -52,7 +52,7 @@ final class Util { final int actual = buffer.readableBytes(); if (actual < expected) { throw new IllegalArgumentException( - String.format("Not enough data in buffer. Expected at least %d, but got %d", expected, actual)); + "Not enough data in buffer. Expected at least %d, but got %d".formatted(expected, actual)); } } diff --git a/dom-codec/src/main/java/org/opendaylight/jsonrpc/dom/codec/JsonRpcPathCodec.java b/dom-codec/src/main/java/org/opendaylight/jsonrpc/dom/codec/JsonRpcPathCodec.java index 4d682a42..83e193de 100644 --- a/dom-codec/src/main/java/org/opendaylight/jsonrpc/dom/codec/JsonRpcPathCodec.java +++ b/dom-codec/src/main/java/org/opendaylight/jsonrpc/dom/codec/JsonRpcPathCodec.java @@ -130,7 +130,7 @@ public class JsonRpcPathCodec implements Codec %s", value.getClass().getSimpleName(), value)); + "Unexpected element : %s => %s".formatted(value.getClass().getSimpleName(), value)); } } return builder.build(); @@ -154,7 +154,7 @@ public class JsonRpcPathCodec implements Codec module, String name) { return module.orElseThrow( - () -> new IllegalArgumentException(String.format("Module '%s' not found in schema", name))); + () -> new IllegalArgumentException("Module '%s' not found in schema".formatted(name))); } private Module findModule(String moduleName) { @@ -167,6 +167,6 @@ public class JsonRpcPathCodec implements Codec %s", ex.getClass().getSimpleName(), ex)); + "Unexpected JsonElement : %s => %s".formatted(ex.getClass().getSimpleName(), ex)); } } diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ClusterUtil.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ClusterUtil.java index 1926bbfb..18618cca 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ClusterUtil.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ClusterUtil.java @@ -79,11 +79,11 @@ final class ClusterUtil { } public static String createActorPath(final String masterAddress, final String name) { - return String.format("%s/user/%s", masterAddress, name); + return "%s/user/%s".formatted(masterAddress, name); } public static String createMasterActorName(final String name, final String masterAddress) { - return String.format("%s_%s", masterAddress.replaceAll("//", ""), name); + return "%s_%s".formatted(masterAddress.replaceAll("//", ""), name); } public static Duration durationFromUint16seconds(Uint16 timeout, FiniteDuration defValue) { diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ProxyDOMRpcService.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ProxyDOMRpcService.java index d9098c3f..23c1c906 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ProxyDOMRpcService.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ProxyDOMRpcService.java @@ -80,7 +80,7 @@ final class ProxyDOMRpcService implements DOMRpcService { result.setException(failure); } else { result.setException( - new DefaultDOMRpcException(String.format("%s : RPC invocation failed", peer), failure)); + new DefaultDOMRpcException("%s : RPC invocation failed".formatted(peer), failure)); } return; } diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/tx/ActorProxyTransaction.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/tx/ActorProxyTransaction.java index a39eeacb..f8f85b76 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/tx/ActorProxyTransaction.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/tx/ActorProxyTransaction.java @@ -175,7 +175,7 @@ class ActorProxyTransaction implements ProxyTransactionFacade { private TransactionCommitFailedException newTransactionCommitFailedException(final Throwable failure) { return new TransactionCommitFailedException( - String.format("%s: Commit of transaction failed", getIdentifier()), failure); + "%s: Commit of transaction failed".formatted(getIdentifier()), failure); } }, executionContext); diff --git a/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/DataChangeListenerRegistry.java b/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/DataChangeListenerRegistry.java index 22d5be79..2c2907d7 100644 --- a/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/DataChangeListenerRegistry.java +++ b/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/DataChangeListenerRegistry.java @@ -87,7 +87,7 @@ public class DataChangeListenerRegistry implements AutoCloseable { try (Socket socket = new Socket()) { socket.bind(null); final PeerContext peer = PeerContextHolder.get(); - return String.format("%s://%s:%d", transport != null ? transport : peer.transport(), + return "%s://%s:%d".formatted(transport != null ? transport : peer.transport(), ((InetSocketAddress) peer.channel().localAddress()).getAddress().getHostAddress(), socket.getLocalPort()); } diff --git a/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/JsonRPCNotificationService.java b/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/JsonRPCNotificationService.java index 91b8514b..04cd2237 100644 --- a/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/JsonRPCNotificationService.java +++ b/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/JsonRPCNotificationService.java @@ -130,7 +130,7 @@ public final class JsonRPCNotificationService extends AbstractJsonRPCComponent final NotificationDefinition def = findNode(schemaContext, notification.getMethod(), Module::getNotifications) .orElseThrow(() -> new IllegalStateException( - String.format("Notification with name '%s' not found", notification.getMethod()))); + "Notification with name '%s' not found".formatted(notification.getMethod()))); publishNotification(codecFactory.notificationCodec(def).deserialize(notification.getParams())); } catch (IOException e) { throw new IllegalStateException(e); diff --git a/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/RemoteShardAware.java b/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/RemoteShardAware.java index 9566601a..70aae091 100644 --- a/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/RemoteShardAware.java +++ b/provider/common/src/main/java/org/opendaylight/jsonrpc/impl/RemoteShardAware.java @@ -61,7 +61,7 @@ abstract class RemoteShardAware extends AbstractJsonRPCComponent implements Auto */ private Supplier shardNotAvailable(final LogicalDatastoreType store, final JsonElement path) { - return () -> new IllegalArgumentException(String.format(SHARD_NOT_AVAILABLE, peer.getName(), store, path)); + return () -> new IllegalArgumentException(SHARD_NOT_AVAILABLE.formatted(peer.getName(), store, path)); } @Override diff --git a/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/BuiltinSchemaContextProvider.java b/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/BuiltinSchemaContextProvider.java index 57737031..baf101c9 100644 --- a/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/BuiltinSchemaContextProvider.java +++ b/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/BuiltinSchemaContextProvider.java @@ -48,7 +48,7 @@ public class BuiltinSchemaContextProvider implements SchemaContextProvider { .stream() .findFirst() .orElseThrow(() -> new IllegalStateException( - String.format("No model '%s' in global schema context", m)))) + "No model '%s' in global schema context".formatted(m)))) .collect(Collectors.toSet()); return buildSchemaContext(moduleIds); diff --git a/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/RpcClient.java b/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/RpcClient.java index cd3cabc5..4ca26e38 100644 --- a/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/RpcClient.java +++ b/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/RpcClient.java @@ -71,8 +71,7 @@ public class RpcClient implements AutoCloseable { return immediateFluentFuture(new DefaultDOMRpcResult(outputCodec.deserialize((JsonObject) output))); } catch (Exception e) { final RpcError error = RpcResultBuilder.newError(ErrorType.RPC, new ErrorTag("jsonrpc"), - String.format("Invocation of method '%s' failed", def.getQName().getLocalName()), null, endpoint, - e); + "Invocation of method '%s' failed".formatted(def.getQName().getLocalName()), null, endpoint, e); return immediateFluentFuture(new DefaultDOMRpcResult(error)); } } diff --git a/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/Util.java b/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/Util.java index 6efbc67f..4d747393 100644 --- a/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/Util.java +++ b/provider/common/src/main/java/org/opendaylight/jsonrpc/provider/common/Util.java @@ -91,7 +91,7 @@ public final class Util { } catch (NumberFormatException e) { /* String representation of the datastore */ final Integer s = STORE_STR_MAP.get(store); - Objects.requireNonNull(s, () -> String.format(ERR_UNRECOGNIZED_STORE, store)); + Objects.requireNonNull(s, () -> ERR_UNRECOGNIZED_STORE.formatted(store)); return s; } } @@ -105,7 +105,7 @@ public final class Util { public static int store2int(@NonNull final LogicalDatastoreType store) { Objects.requireNonNull(store); final Integer ldt = STORE_MAP.inverse().get(store); - Objects.requireNonNull(ldt, () -> String.format(ERR_UNRECOGNIZED_STORE, store)); + Objects.requireNonNull(ldt, () -> ERR_UNRECOGNIZED_STORE.formatted(store)); return ldt; } diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCNotificationServiceTest.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCNotificationServiceTest.java index d2ccc71c..3e2074a4 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCNotificationServiceTest.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCNotificationServiceTest.java @@ -134,16 +134,14 @@ public class JsonRPCNotificationServiceTest extends AbstractJsonRpcTest { } private String getPath() { - return String.format("ws://localhost:%d", port); + return "ws://localhost:%d".formatted(port); } private Peer getPeer() { //@formatter:off return new ConfiguredEndpointsBuilder() .setName("test") - .setModules(Set.of( - new YangIdentifier("test-model-notification") - )) + .setModules(Set.of(new YangIdentifier("test-model-notification"))) .setNotificationEndpoints(BindingMap.of(new NotificationEndpointsBuilder() .setPath("{}") .setEndpointUri(new Uri(getPath())) diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCtoRPCBridgeTest.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCtoRPCBridgeTest.java index adbf635e..fbda94b2 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCtoRPCBridgeTest.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/JsonRPCtoRPCBridgeTest.java @@ -276,7 +276,7 @@ public class JsonRPCtoRPCBridgeTest extends AbstractJsonRpcTest { private Peer getPeer() { final RpcEndpointsBuilder builder = new RpcEndpointsBuilder(); - builder.setEndpointUri(new Uri(String.format(TRANSPORT + "://localhost:%d", rpcResponderPort))); + builder.setEndpointUri(new Uri(TRANSPORT + "://localhost:" + rpcResponderPort)); builder.setPath("{}"); return new ConfiguredEndpointsBuilder().setName("BlahBlah") .setRpcEndpoints(BindingMap.of(builder.build())) @@ -285,8 +285,7 @@ public class JsonRPCtoRPCBridgeTest extends AbstractJsonRpcTest { private void startTransport() { messaging = ((AbstractTransportFactory) transportFactory).getMessageLibraryForTransport(TRANSPORT); - rpcResponder = messaging.responder(String.format(TRANSPORT + "://0.0.0.0:%d", rpcResponderPort), - new MockRpcHandler(), true); + rpcResponder = messaging.responder(TRANSPORT + "://0.0.0.0:" + rpcResponderPort, new MockRpcHandler(), true); LOG.info("Started responder on port {}", rpcResponderPort); } diff --git a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/OmRootMessageHandler.java b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/OmRootMessageHandler.java index 012665f8..8b73d4ed 100644 --- a/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/OmRootMessageHandler.java +++ b/provider/common/src/test/java/org/opendaylight/jsonrpc/provider/common/OmRootMessageHandler.java @@ -42,7 +42,7 @@ public class OmRootMessageHandler implements RequestMessageHandler { replyBuilder.result(new JsonPrimitive(getYangSource(request.getParams().getAsString()))); return; case "governance": - replyBuilder.result(new JsonPrimitive(String.format("zmq://localhost:%d", governancePort))); + replyBuilder.result(new JsonPrimitive("zmq://localhost:" + governancePort)); return; case "close": replyBuilder.result(new JsonPrimitive("ok")); diff --git a/provider/single/src/test/java/org/opendaylight/jsonrpc/provider/single/JsonRPCProviderTest.java b/provider/single/src/test/java/org/opendaylight/jsonrpc/provider/single/JsonRPCProviderTest.java index 3959eaa6..423b8bf7 100644 --- a/provider/single/src/test/java/org/opendaylight/jsonrpc/provider/single/JsonRPCProviderTest.java +++ b/provider/single/src/test/java/org/opendaylight/jsonrpc/provider/single/JsonRPCProviderTest.java @@ -87,8 +87,7 @@ public class JsonRPCProviderTest extends AbstractJsonRpcTest { when(tf.createSubscriber(anyString(), any(), anyBoolean())).thenReturn(mock(SubscriberSession.class)); governancePort = getFreeTcpPort(); dummyPort = getFreeTcpPort(); - updateConfig(new ConfigBuilder().setGovernanceRoot(new Uri(String.format("zmq://localhost:%d", governancePort))) - .build()); + updateConfig(new ConfigBuilder().setGovernanceRoot(new Uri("zmq://localhost:%d" + governancePort)).build()); ProviderDependencies deps = new ProviderDependencies(new MockTransportFactory(tf), getDataBroker(), getDOMMountPointService(), getDomBroker(), getSchemaService(), new RouterDOMPublishNotificationService(getDOMNotificationRouter()), @@ -146,7 +145,7 @@ public class JsonRPCProviderTest extends AbstractJsonRpcTest { // wait until nothing there retryAction(TimeUnit.SECONDS, 2, () -> !getPeerOpState(DEMO1_MODEL).isPresent()); updateConfig(new ConfigBuilder() - .setWhoAmI(new Uri(String.format("zmq://localhost:%d", getFreeTcpPort()))) + .setWhoAmI(new Uri("zmq://localhost:" + getFreeTcpPort())) .setConfiguredEndpoints(BindingMap.of(new ConfiguredEndpointsBuilder().setName("test-model") .setModules(Set.of(new YangIdentifier("test-model"))) .setRpcEndpoints(BindingMap.of(new RpcEndpointsBuilder().withKey(new RpcEndpointsKey("{}")) @@ -176,7 +175,7 @@ public class JsonRPCProviderTest extends AbstractJsonRpcTest { retryAction(TimeUnit.SECONDS, 2, () -> !getPeerOpState(DEMO1_MODEL).isPresent()); //@formatter:off updateConfig(new ConfigBuilder() - .setWhoAmI(new Uri(String.format("zmq://localhost:%d", getFreeTcpPort()))) + .setWhoAmI(new Uri("zmq://localhost:" + getFreeTcpPort())) .setConfiguredEndpoints(BindingMap.of( new ConfiguredEndpointsBuilder().setName(DEMO1_MODEL) .setModules(Set.of(new YangIdentifier("jsonrpc-inband-models"))) @@ -216,7 +215,7 @@ public class JsonRPCProviderTest extends AbstractJsonRpcTest { // wait until nothing there retryAction(TimeUnit.SECONDS, 2, () -> !getPeerOpState("test-model-op-only").isPresent()); updateConfig(new ConfigBuilder() - .setWhoAmI(new Uri(String.format("zmq://localhost:%d", getFreeTcpPort()))) + .setWhoAmI(new Uri("zmq://localhost:" + getFreeTcpPort())) .setConfiguredEndpoints(BindingMap.of( new ConfiguredEndpointsBuilder().setName("test-model-op-only") .setModules(Set.of(new YangIdentifier("test-model-op-only"))) @@ -237,7 +236,7 @@ public class JsonRPCProviderTest extends AbstractJsonRpcTest { retryAction(TimeUnit.SECONDS, 2, () -> !getPeerOpState("test-model-op-only").isPresent()); updateConfig( - new ConfigBuilder().setWhoAmI(new Uri(String.format("zmq://localhost:%d", getFreeTcpPort()))) + new ConfigBuilder().setWhoAmI(new Uri("zmq://localhost:" + getFreeTcpPort())) .setConfiguredEndpoints(BindingMap.of(new ConfiguredEndpointsBuilder() .setName("test-model-op-only") .setModules(Set.of(new YangIdentifier("bad-module"))) @@ -274,6 +273,6 @@ public class JsonRPCProviderTest extends AbstractJsonRpcTest { } private String dummyUri() { - return String.format("zmq://localhost:%d", dummyPort); + return "zmq://localhost:" + dummyPort; } } -- 2.34.1 From 09916ac2a039a5aaa20b8a853459c164de3ecd22 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 17 Sep 2026 13:35:30 +0200 Subject: [PATCH 09/10] WIP: Bump upstreams Adopt: - odlparent-15.0.2 - infrautils-8.0.3 - yangtools-16.1.0 - ietf-3.0.1 - mdsal-17.0.1 - controller-14.0.0-SNAPSHOT - netconf-12.0.0-SNAPSHOT // FIXME: non-snapshots Change-Id: I367ecde09f8e9ab009a0d1768764d38b18688e04 Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- .../jsonrpc/binding/InboundHandler.java | 17 +++++++++------- bus/config/pom.xml | 2 +- dom-codec/pom.xml | 7 ++++++- features/features-jsonrpc/pom.xml | 2 +- features/odl-jsonrpc-all/pom.xml | 2 +- .../src/main/feature/feature.xml | 2 +- features/odl-jsonrpc-bus/pom.xml | 2 +- .../src/main/feature/feature.xml | 6 +++--- features/odl-jsonrpc-cluster/pom.xml | 2 +- .../src/main/feature/feature.xml | 4 ++-- features/odl-jsonrpc-provider/pom.xml | 2 +- .../src/main/feature/feature.xml | 2 +- features/pom.xml | 2 +- karaf/pom.xml | 2 +- parent/pom.xml | 6 +++--- pom.xml | 2 +- provider/cluster/pom.xml | 2 +- .../provider/cluster/MountpointTest.java | 10 +++++----- provider/common/pom.xml | 2 +- security/aaa/pom.xml | 2 +- tools/test-tool/pom.xml | 20 +++++++++---------- 22 files changed, 54 insertions(+), 46 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 10aeb1ca..d0439380 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 14.3.1 + 15.0.2 org.opendaylight.jsonrpc diff --git a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/InboundHandler.java b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/InboundHandler.java index 448dbd41..65fa9023 100644 --- a/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/InboundHandler.java +++ b/binding-adapter/src/main/java/org/opendaylight/jsonrpc/binding/InboundHandler.java @@ -7,6 +7,8 @@ */ package org.opendaylight.jsonrpc.binding; +import static java.util.Objects.requireNonNull; + import com.google.common.util.concurrent.Futures; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -15,7 +17,6 @@ import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; import java.io.IOException; import java.lang.reflect.Method; -import java.util.Objects; import org.opendaylight.jsonrpc.bus.jsonrpc.JsonRpcErrorObject; import org.opendaylight.jsonrpc.bus.jsonrpc.JsonRpcReplyMessage.Builder; import org.opendaylight.jsonrpc.bus.jsonrpc.JsonRpcRequestMessage; @@ -41,11 +42,12 @@ import org.slf4j.LoggerFactory; */ public class InboundHandler> extends AbstractHandler implements RequestMessageHandler { private static final Logger LOG = LoggerFactory.getLogger(InboundHandler.class); - private final Rpc impl; + + private final T impl; public InboundHandler(RpcInvocationAdapter adapter, T impl) { super((Class) impl.implementedInterface(), adapter); - this.impl = Objects.requireNonNull(impl); + this.impl = requireNonNull(impl); } @SuppressWarnings("checkstyle:IllegalCatch") @@ -61,10 +63,11 @@ public class InboundHandler> extends AbstractHandler impl try { final var arg = convertArguments(request.getParams()); - @SuppressWarnings("unchecked") - final var output = ((Rpc) impl).invoke(arg); + @SuppressWarnings({ "rawtypes", "unchecked" }) + final var output = ((Rpc) impl).invoke(arg); LOG.debug("Output : {}", output); - final var rpcResult = Futures.getUnchecked(output); + @SuppressWarnings("unchecked") + final var rpcResult = (RpcResult>) Futures.getUnchecked(output); if (rpcResult.isSuccessful()) { final var result = rpcResult.getResult(); if (result != null) { @@ -104,7 +107,7 @@ public class InboundHandler> extends AbstractHandler impl } } - private RpcInput convertArguments(final JsonElement wrapper) throws IOException { + private RpcInput convertArguments(final JsonElement wrapper) throws IOException { final ContainerNode nn = adapter.converter() .get() .rpcInputCodec(rpcDef) diff --git a/bus/config/pom.xml b/bus/config/pom.xml index bc46bc2d..037d5729 100644 --- a/bus/config/pom.xml +++ b/bus/config/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 14.3.1 + 15.0.2 diff --git a/dom-codec/pom.xml b/dom-codec/pom.xml index c9a7c5aa..43b7d4f2 100644 --- a/dom-codec/pom.xml +++ b/dom-codec/pom.xml @@ -82,7 +82,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal - mdsal-dom-inmemory-datastore + dom-store-inmemory test @@ -95,6 +95,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html binding-generator test + + org.opendaylight.yangtools + yang-data-tree-ri + test + org.mockito mockito-core diff --git a/features/features-jsonrpc/pom.xml b/features/features-jsonrpc/pom.xml index f6a06a94..1325e733 100644 --- a/features/features-jsonrpc/pom.xml +++ b/features/features-jsonrpc/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent feature-repo-parent - 14.3.1 + 15.0.2 diff --git a/features/odl-jsonrpc-all/pom.xml b/features/odl-jsonrpc-all/pom.xml index 609609b7..36c3cde1 100644 --- a/features/odl-jsonrpc-all/pom.xml +++ b/features/odl-jsonrpc-all/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.3.1 + 15.0.2 diff --git a/features/odl-jsonrpc-all/src/main/feature/feature.xml b/features/odl-jsonrpc-all/src/main/feature/feature.xml index 582891d8..729c3088 100644 --- a/features/odl-jsonrpc-all/src/main/feature/feature.xml +++ b/features/odl-jsonrpc-all/src/main/feature/feature.xml @@ -8,7 +8,7 @@ --> - odl-restconf-openapi + odl-restconf-openapi diff --git a/features/odl-jsonrpc-bus/pom.xml b/features/odl-jsonrpc-bus/pom.xml index ca1e7879..11ef7039 100644 --- a/features/odl-jsonrpc-bus/pom.xml +++ b/features/odl-jsonrpc-bus/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.3.1 + 15.0.2 diff --git a/features/odl-jsonrpc-bus/src/main/feature/feature.xml b/features/odl-jsonrpc-bus/src/main/feature/feature.xml index 2a878ce2..7b947ff8 100644 --- a/features/odl-jsonrpc-bus/src/main/feature/feature.xml +++ b/features/odl-jsonrpc-bus/src/main/feature/feature.xml @@ -11,9 +11,9 @@ mvn:org.opendaylight.jsonrpc.bus/bus-config/${project.version}/cfg/config - odl-netty-4 - odl-ietf-model-rfc6991 - odl-aaa-shiro + odl-netty-4 + odl-ietf-model-rfc6991 + odl-aaa-shiro diff --git a/features/odl-jsonrpc-cluster/pom.xml b/features/odl-jsonrpc-cluster/pom.xml index 18975ad4..79bcc0a8 100644 --- a/features/odl-jsonrpc-cluster/pom.xml +++ b/features/odl-jsonrpc-cluster/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.3.1 + 15.0.2 diff --git a/features/odl-jsonrpc-cluster/src/main/feature/feature.xml b/features/odl-jsonrpc-cluster/src/main/feature/feature.xml index 3fb8c841..576e47b0 100644 --- a/features/odl-jsonrpc-cluster/src/main/feature/feature.xml +++ b/features/odl-jsonrpc-cluster/src/main/feature/feature.xml @@ -8,8 +8,8 @@ --> - odl-mdsal-binding-dom-adapter - odl-restconf-openapi + odl-mdsal-binding-dom-adapter + odl-restconf-openapi diff --git a/features/odl-jsonrpc-provider/pom.xml b/features/odl-jsonrpc-provider/pom.xml index 4d64e636..667126a3 100644 --- a/features/odl-jsonrpc-provider/pom.xml +++ b/features/odl-jsonrpc-provider/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent single-feature-parent - 14.3.1 + 15.0.2 diff --git a/features/odl-jsonrpc-provider/src/main/feature/feature.xml b/features/odl-jsonrpc-provider/src/main/feature/feature.xml index 1aea36db..9e7077e8 100644 --- a/features/odl-jsonrpc-provider/src/main/feature/feature.xml +++ b/features/odl-jsonrpc-provider/src/main/feature/feature.xml @@ -8,7 +8,7 @@ --> - odl-mdsal-binding-dom-adapter + odl-mdsal-binding-dom-adapter diff --git a/features/pom.xml b/features/pom.xml index 02ffbb8f..f08853f1 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 14.3.1 + 15.0.2 org.opendaylight.jsonrpc diff --git a/karaf/pom.xml b/karaf/pom.xml index 3da93a99..7f1fb1e7 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent karaf4-parent - 14.3.1 + 15.0.2 org.opendaylight.jsonrpc diff --git a/parent/pom.xml b/parent/pom.xml index 6c161a62..d9024d78 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 16.0.3 + 17.0.1 @@ -34,14 +34,14 @@ org.opendaylight.netconf netconf-artifacts - 11.0.0 + 12.0.0-SNAPSHOT pom import org.opendaylight.aaa aaa-artifacts - 0.23.2 + 0.24.0-SNAPSHOT pom import diff --git a/pom.xml b/pom.xml index 3e6064de..264271ab 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 14.3.1 + 15.0.2 org.opendaylight.jsonrpc diff --git a/provider/cluster/pom.xml b/provider/cluster/pom.xml index 8c5d1547..9827fe33 100644 --- a/provider/cluster/pom.xml +++ b/provider/cluster/pom.xml @@ -25,7 +25,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller bundle-parent - 13.0.2 + 14.0.0-SNAPSHOT pom import diff --git a/provider/cluster/src/test/java/org/opendaylight/jsonrpc/provider/cluster/MountpointTest.java b/provider/cluster/src/test/java/org/opendaylight/jsonrpc/provider/cluster/MountpointTest.java index 97867e6c..01420692 100644 --- a/provider/cluster/src/test/java/org/opendaylight/jsonrpc/provider/cluster/MountpointTest.java +++ b/provider/cluster/src/test/java/org/opendaylight/jsonrpc/provider/cluster/MountpointTest.java @@ -37,7 +37,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.opendaylight.controller.cluster.ActorSystemProvider; +import org.opendaylight.controller.pekko.support.ActorSystemInstance; import org.opendaylight.jsonrpc.bus.jsonrpc.JsonRpcReplyMessage; import org.opendaylight.jsonrpc.bus.messagelib.AbstractTransportFactory; import org.opendaylight.jsonrpc.bus.messagelib.MockTransportFactory; @@ -114,8 +114,8 @@ public class MountpointTest { private @Mock AbstractTransportFactory transportFactory; private EOSClusterSingletonServiceProvider clusterSingletonServiceProvider; private @Mock ClusterSingletonServiceProvider mockClusterSingletonServiceProvider; - private @Mock ActorSystemProvider masterActorSystemProvider; - private @Mock ActorSystemProvider slaveActorSystemProvider; + private @Mock ActorSystemInstance masterActorSystemProvider; + private @Mock ActorSystemInstance slaveActorSystemProvider; private @Mock GovernanceProvider governanceProvider; private @Mock Registration mockSingletonRegistration; private @Mock RequesterSession rpcClient; @@ -147,10 +147,10 @@ public class MountpointTest { .registerClusterSingletonService(any()); doReturn(Optional.empty()).when(governanceProvider).get(); masterActorSystem = ActorSystem.create("test", ConfigFactory.load().getConfig("Master")); - doReturn(masterActorSystem).when(masterActorSystemProvider).getActorSystem(); + doReturn(masterActorSystem).when(masterActorSystemProvider).actorSystem(); slaveActorSystem = ActorSystem.create("test", ConfigFactory.load().getConfig("Slave")); - doReturn(slaveActorSystem).when(slaveActorSystemProvider).getActorSystem(); + doReturn(slaveActorSystem).when(slaveActorSystemProvider).actorSystem(); masterTestCustomizer = newDataBrokerTest(); slaveTestCustomizer = newDataBrokerTest(); diff --git a/provider/common/pom.xml b/provider/common/pom.xml index c9cbcbe4..a810514d 100644 --- a/provider/common/pom.xml +++ b/provider/common/pom.xml @@ -24,7 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal bnd-parent - 16.0.3 + 17.0.1 pom import diff --git a/security/aaa/pom.xml b/security/aaa/pom.xml index 3c289e33..b25cccba 100644 --- a/security/aaa/pom.xml +++ b/security/aaa/pom.xml @@ -36,7 +36,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.aaa - aaa-encrypt-service + aaa-encrypt-service-api org.opendaylight.jsonrpc diff --git a/tools/test-tool/pom.xml b/tools/test-tool/pom.xml index 4006e2a0..fda48e53 100644 --- a/tools/test-tool/pom.xml +++ b/tools/test-tool/pom.xml @@ -27,29 +27,29 @@ and is available at http://www.eclipse.org/legal/epl-v10.html true - org.opendaylight.yangtools - binding-runtime-spi + org.opendaylight.jsonrpc + jsonrpc-test-model + compile - org.opendaylight.mdsal - mdsal-dom-inmemory-datastore + org.opendaylight.jsonrpc.bus + bus-messagelib org.opendaylight.mdsal - mdsal-dom-broker + dom-store-inmemory - org.opendaylight.jsonrpc.bus - bus-messagelib + org.opendaylight.mdsal + mdsal-dom-broker org.opendaylight.mdsal.model ietf-topology - org.opendaylight.jsonrpc - jsonrpc-test-model - compile + org.opendaylight.yangtools + binding-runtime-spi org.opendaylight.yangtools -- 2.34.1 From bb8a72d1da4134014c350ae45ca2e5f4994052f6 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Thu, 17 Sep 2026 13:56:19 +0000 Subject: [PATCH 10/10] Release Validate --- api/pom.xml | 2 +- artifacts/pom.xml | 2 +- binding-adapter/pom.xml | 2 +- bus/api/pom.xml | 2 +- bus/config/pom.xml | 2 +- bus/examples/binding-bridge/pom.xml | 2 +- bus/examples/inband-models/pom.xml | 2 +- bus/examples/pom.xml | 2 +- bus/jsonrpc/pom.xml | 2 +- bus/messagelib/pom.xml | 2 +- bus/pom.xml | 2 +- bus/spi/pom.xml | 2 +- bus/transport-http/pom.xml | 2 +- bus/transport-zmq/pom.xml | 2 +- dom-codec/pom.xml | 2 +- features/features-jsonrpc/pom.xml | 2 +- features/odl-jsonrpc-all/pom.xml | 2 +- features/odl-jsonrpc-bus/pom.xml | 2 +- features/odl-jsonrpc-cluster/pom.xml | 2 +- features/odl-jsonrpc-provider/pom.xml | 2 +- features/pom.xml | 2 +- karaf/pom.xml | 2 +- parent/pom.xml | 6 +++--- pom.xml | 2 +- provider/cluster/pom.xml | 4 ++-- provider/common/pom.xml | 2 +- provider/pom.xml | 2 +- provider/single/pom.xml | 2 +- security/aaa/pom.xml | 2 +- security/api/pom.xml | 2 +- security/noop/pom.xml | 2 +- security/pom.xml | 2 +- security/service/pom.xml | 2 +- test-model/pom.xml | 2 +- tools/parent/pom.xml | 2 +- tools/pom.xml | 2 +- tools/test-tool/pom.xml | 2 +- 37 files changed, 40 insertions(+), 40 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 0ea801ab..d2c265e2 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.21.0-SNAPSHOT + 1.21.0 ../parent jsonrpc-api diff --git a/artifacts/pom.xml b/artifacts/pom.xml index d0439380..2a59438d 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -16,7 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-artifacts - 1.21.0-SNAPSHOT + 1.21.0 pom JSON-RPC :: Artifacts diff --git a/binding-adapter/pom.xml b/binding-adapter/pom.xml index 4fabf3dc..ce7d0339 100644 --- a/binding-adapter/pom.xml +++ b/binding-adapter/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.21.0-SNAPSHOT + 1.21.0 ../parent diff --git a/bus/api/pom.xml b/bus/api/pom.xml index 0d2e41f7..467befc3 100644 --- a/bus/api/pom.xml +++ b/bus/api/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.21.0-SNAPSHOT + 1.21.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/config/pom.xml b/bus/config/pom.xml index 037d5729..482c4770 100644 --- a/bus/config/pom.xml +++ b/bus/config/pom.xml @@ -17,7 +17,7 @@ org.opendaylight.jsonrpc.bus bus-config - 1.21.0-SNAPSHOT + 1.21.0 JSON-RPC :: BUS :: Config Configuration files for JSONRPC bus jar diff --git a/bus/examples/binding-bridge/pom.xml b/bus/examples/binding-bridge/pom.xml index 060aa67c..f033c0b6 100644 --- a/bus/examples/binding-bridge/pom.xml +++ b/bus/examples/binding-bridge/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.21.0-SNAPSHOT + 1.21.0 ../../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/examples/inband-models/pom.xml b/bus/examples/inband-models/pom.xml index 6ef51873..5747f79d 100644 --- a/bus/examples/inband-models/pom.xml +++ b/bus/examples/inband-models/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.21.0-SNAPSHOT + 1.21.0 ../../../parent inband-models diff --git a/bus/examples/pom.xml b/bus/examples/pom.xml index a6bc8446..4f8410b6 100644 --- a/bus/examples/pom.xml +++ b/bus/examples/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-bus - 1.21.0-SNAPSHOT + 1.21.0 org.opendaylight.jsonrpc.bus examples diff --git a/bus/jsonrpc/pom.xml b/bus/jsonrpc/pom.xml index cdd41dcc..77327a20 100644 --- a/bus/jsonrpc/pom.xml +++ b/bus/jsonrpc/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.21.0-SNAPSHOT + 1.21.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/messagelib/pom.xml b/bus/messagelib/pom.xml index e2cf5f8c..68c170cd 100644 --- a/bus/messagelib/pom.xml +++ b/bus/messagelib/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.21.0-SNAPSHOT + 1.21.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/pom.xml b/bus/pom.xml index b6619d11..beecf00a 100644 --- a/bus/pom.xml +++ b/bus/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc - 1.21.0-SNAPSHOT + 1.21.0 jsonrpc-bus pom diff --git a/bus/spi/pom.xml b/bus/spi/pom.xml index 8b7b6197..35d0d526 100644 --- a/bus/spi/pom.xml +++ b/bus/spi/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.21.0-SNAPSHOT + 1.21.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/transport-http/pom.xml b/bus/transport-http/pom.xml index 6c504867..5edfbd8b 100644 --- a/bus/transport-http/pom.xml +++ b/bus/transport-http/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.21.0-SNAPSHOT + 1.21.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/bus/transport-zmq/pom.xml b/bus/transport-zmq/pom.xml index 1d3680c6..92f439dc 100644 --- a/bus/transport-zmq/pom.xml +++ b/bus/transport-zmq/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.21.0-SNAPSHOT + 1.21.0 ../../parent org.opendaylight.jsonrpc.bus diff --git a/dom-codec/pom.xml b/dom-codec/pom.xml index 43b7d4f2..0d471855 100644 --- a/dom-codec/pom.xml +++ b/dom-codec/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.21.0-SNAPSHOT + 1.21.0 ../parent diff --git a/features/features-jsonrpc/pom.xml b/features/features-jsonrpc/pom.xml index 1325e733..41d4d31c 100644 --- a/features/features-jsonrpc/pom.xml +++ b/features/features-jsonrpc/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc features-jsonrpc - 1.21.0-SNAPSHOT + 1.21.0 feature JSON-RPC :: Features :: repository diff --git a/features/odl-jsonrpc-all/pom.xml b/features/odl-jsonrpc-all/pom.xml index 36c3cde1..8b3378d6 100644 --- a/features/odl-jsonrpc-all/pom.xml +++ b/features/odl-jsonrpc-all/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc odl-jsonrpc-all - 1.21.0-SNAPSHOT + 1.21.0 feature JSON-RPC :: Feature :: all diff --git a/features/odl-jsonrpc-bus/pom.xml b/features/odl-jsonrpc-bus/pom.xml index 11ef7039..cfbcb95b 100644 --- a/features/odl-jsonrpc-bus/pom.xml +++ b/features/odl-jsonrpc-bus/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc odl-jsonrpc-bus - 1.21.0-SNAPSHOT + 1.21.0 feature JSON-RPC :: Feature :: bus diff --git a/features/odl-jsonrpc-cluster/pom.xml b/features/odl-jsonrpc-cluster/pom.xml index 79bcc0a8..55b0d2f8 100644 --- a/features/odl-jsonrpc-cluster/pom.xml +++ b/features/odl-jsonrpc-cluster/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc odl-jsonrpc-cluster - 1.21.0-SNAPSHOT + 1.21.0 feature JSON-RPC :: Feature :: Cluster diff --git a/features/odl-jsonrpc-provider/pom.xml b/features/odl-jsonrpc-provider/pom.xml index 667126a3..1af67ae4 100644 --- a/features/odl-jsonrpc-provider/pom.xml +++ b/features/odl-jsonrpc-provider/pom.xml @@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc odl-jsonrpc-provider - 1.21.0-SNAPSHOT + 1.21.0 feature JSON-RPC :: Feature :: provider diff --git a/features/pom.xml b/features/pom.xml index f08853f1..a02a004a 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -16,7 +16,7 @@ org.opendaylight.jsonrpc features-aggregator - 1.21.0-SNAPSHOT + 1.21.0 pom JSON-RPC :: Features :: Aggregator diff --git a/karaf/pom.xml b/karaf/pom.xml index 7f1fb1e7..930ec2db 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -16,7 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-karaf - 1.21.0-SNAPSHOT + 1.21.0 JSON-RPC :: Karaf pom diff --git a/parent/pom.xml b/parent/pom.xml index d9024d78..74ff8e0d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.opendaylight.jsonrpc jsonrpc-parent - 1.21.0-SNAPSHOT + 1.21.0 pom JSON-RPC :: Parent @@ -34,14 +34,14 @@ org.opendaylight.netconf netconf-artifacts - 12.0.0-SNAPSHOT + 12.0.0 pom import org.opendaylight.aaa aaa-artifacts - 0.24.0-SNAPSHOT + 0.24.0 pom import diff --git a/pom.xml b/pom.xml index 264271ab..de8ade2e 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc - 1.21.0-SNAPSHOT + 1.21.0 pom JSON-RPC :: POM diff --git a/provider/cluster/pom.xml b/provider/cluster/pom.xml index 9827fe33..b35c2578 100644 --- a/provider/cluster/pom.xml +++ b/provider/cluster/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-provider - 1.21.0-SNAPSHOT + 1.21.0 .. @@ -25,7 +25,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller bundle-parent - 14.0.0-SNAPSHOT + 14.0.0 pom import diff --git a/provider/common/pom.xml b/provider/common/pom.xml index a810514d..1751ef22 100644 --- a/provider/common/pom.xml +++ b/provider/common/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-provider - 1.21.0-SNAPSHOT + 1.21.0 .. diff --git a/provider/pom.xml b/provider/pom.xml index 82e57c10..4e254dd6 100644 --- a/provider/pom.xml +++ b/provider/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.21.0-SNAPSHOT + 1.21.0 ../parent diff --git a/provider/single/pom.xml b/provider/single/pom.xml index 0e05a36c..f30a1f26 100644 --- a/provider/single/pom.xml +++ b/provider/single/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-provider - 1.21.0-SNAPSHOT + 1.21.0 .. diff --git a/security/aaa/pom.xml b/security/aaa/pom.xml index b25cccba..bde3ef73 100644 --- a/security/aaa/pom.xml +++ b/security/aaa/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.21.0-SNAPSHOT + 1.21.0 ../../parent org.opendaylight.jsonrpc.security diff --git a/security/api/pom.xml b/security/api/pom.xml index 4d87da04..acd6e74e 100644 --- a/security/api/pom.xml +++ b/security/api/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.21.0-SNAPSHOT + 1.21.0 ../../parent org.opendaylight.jsonrpc.security diff --git a/security/noop/pom.xml b/security/noop/pom.xml index a9e30db3..1bf6d735 100644 --- a/security/noop/pom.xml +++ b/security/noop/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.21.0-SNAPSHOT + 1.21.0 ../../parent org.opendaylight.jsonrpc.security diff --git a/security/pom.xml b/security/pom.xml index eece47d5..d9fc0545 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc - 1.21.0-SNAPSHOT + 1.21.0 jsonrpc-security pom diff --git a/security/service/pom.xml b/security/service/pom.xml index df292a67..0f563220 100644 --- a/security/service/pom.xml +++ b/security/service/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.21.0-SNAPSHOT + 1.21.0 ../../parent org.opendaylight.jsonrpc.security diff --git a/test-model/pom.xml b/test-model/pom.xml index 1fe60b95..2f4b0a12 100644 --- a/test-model/pom.xml +++ b/test-model/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.21.0-SNAPSHOT + 1.21.0 ../parent jsonrpc-test-model diff --git a/tools/parent/pom.xml b/tools/parent/pom.xml index 330d05b4..997db54d 100644 --- a/tools/parent/pom.xml +++ b/tools/parent/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc-parent - 1.21.0-SNAPSHOT + 1.21.0 ../../parent tools-parent diff --git a/tools/pom.xml b/tools/pom.xml index a0792b6a..d7c9ec56 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc jsonrpc - 1.21.0-SNAPSHOT + 1.21.0 jsonrpc-tools pom diff --git a/tools/test-tool/pom.xml b/tools/test-tool/pom.xml index fda48e53..c9c4eb90 100644 --- a/tools/test-tool/pom.xml +++ b/tools/test-tool/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.jsonrpc tools-parent - 1.21.0-SNAPSHOT + 1.21.0 ../parent test-tool -- 2.34.1