From d60c0af1449e1e2fa5737d80bf8d0fca1390e95b Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 17 Sep 2026 13:35:30 +0200 Subject: [PATCH 1/2] Bump upstreams Adopt: - odlparent-15.0.2 - infrautils-8.0.3 - yangtools-16.1.0 - ietf-3.0.1 - mdsal-17.0.2 - controller-14.0.4 - aaa-0.24.4 - netconf-12.0.2 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 | 6 ++++- .../cluster/impl/ClusterDependencies.java | 16 ++++++++---- .../cluster/messages/PathAndDataMsg.java | 19 +++++++------- .../blueprint/cluster-provider-wiring.xml | 6 ++--- .../provider/cluster/MountpointTest.java | 22 +++++++++------- provider/common/pom.xml | 2 +- security/aaa/pom.xml | 2 +- tools/test-tool/pom.xml | 24 ++++++++++------- .../jsonrpc/tool/test/DatastoreImpl.java | 26 ++++++++++--------- 26 files changed, 106 insertions(+), 81 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..e9b55c34 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 16.0.3 + 17.0.2 @@ -34,14 +34,14 @@ org.opendaylight.netconf netconf-artifacts - 11.0.0 + 12.0.2 pom import org.opendaylight.aaa aaa-artifacts - 0.23.2 + 0.24.4 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..71e816b4 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.4 pom import @@ -46,6 +46,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.yangtools yang-parser-api + + org.opendaylight.yangtools + yang-data-codec-binfmt + org.opendaylight.yangtools yang-data-codec-gson diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ClusterDependencies.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ClusterDependencies.java index c5e311c1..cc059684 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ClusterDependencies.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/impl/ClusterDependencies.java @@ -11,6 +11,7 @@ import java.util.Objects; import org.apache.pekko.actor.ActorSystem; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; +import org.opendaylight.controller.pekko.support.ActorSystemInstance; import org.opendaylight.jsonrpc.bus.messagelib.TransportFactory; import org.opendaylight.jsonrpc.model.GovernanceProvider; import org.opendaylight.jsonrpc.provider.common.ProviderDependencies; @@ -33,7 +34,7 @@ import org.opendaylight.yangtools.yang.parser.api.YangParserFactory; * @since Jul 2, 2020 */ public class ClusterDependencies extends ProviderDependencies { - private final ActorSystem actorSystem; + private final ActorSystemInstance actorSystemInstance; private final ClusterSingletonServiceProvider clusterSingletonServiceProvider; private final GovernanceProvider governanceProvider; private final RpcProviderService rpcProviderService; @@ -44,20 +45,25 @@ public class ClusterDependencies extends ProviderDependencies { @NonNull DOMSchemaService schemaService, @NonNull DOMNotificationPublishService domNotificationPublishService, @NonNull DOMRpcService domRpcService, @NonNull YangParserFactory yangParserFactory, @NonNull YangTextToIRSourceTransformer yangTextToIR, - @NonNull ActorSystem actorSystem, @NonNull ClusterSingletonServiceProvider clusterSingletonServiceProvider, + @NonNull ActorSystemInstance actorSystemInstance, + @NonNull ClusterSingletonServiceProvider clusterSingletonServiceProvider, @NonNull GovernanceProvider governanceProvider, @NonNull RpcProviderService rpcProviderService, @Nullable Config config) { super(transportFactory, dataBroker, domMountPointService, domDataBroker, schemaService, domNotificationPublishService, domRpcService, yangParserFactory, yangTextToIR); - this.actorSystem = Objects.requireNonNull(actorSystem); + this.actorSystemInstance = Objects.requireNonNull(actorSystemInstance); this.clusterSingletonServiceProvider = Objects.requireNonNull(clusterSingletonServiceProvider); this.governanceProvider = Objects.requireNonNull(governanceProvider); this.rpcProviderService = Objects.requireNonNull(rpcProviderService); this.config = config; } - public ActorSystem getActorSystem() { - return actorSystem; + public ActorSystemInstance getActorSystemInstance() { + return actorSystemInstance; + } + + public final ActorSystem getActorSystem() { + return actorSystemInstance.actorSystem(); } public RpcProviderService getRpcProviderService() { diff --git a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/messages/PathAndDataMsg.java b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/messages/PathAndDataMsg.java index fb5f56a4..448ebc48 100644 --- a/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/messages/PathAndDataMsg.java +++ b/provider/cluster/src/main/java/org/opendaylight/jsonrpc/provider/cluster/messages/PathAndDataMsg.java @@ -12,10 +12,11 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.controller.cluster.datastore.node.utils.stream.SerializationUtils; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeDataInput; +import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeStreamVersion; public class PathAndDataMsg implements Externalizable { private YangInstanceIdentifier path; @@ -25,7 +26,7 @@ public class PathAndDataMsg implements Externalizable { // default ctor is required } - public PathAndDataMsg(ContainerNode data) { + public PathAndDataMsg(final ContainerNode data) { this(YangInstanceIdentifier.of(), data); } @@ -44,19 +45,19 @@ public class PathAndDataMsg implements Externalizable { @Override public void writeExternal(final ObjectOutput out) throws IOException { - SerializationUtils.writeNodeAndPath(out, path, data); + try (var stream = NormalizedNodeStreamVersion.POTASSIUM.newDataOutput(out)) { + stream.writeNormalizedNode(data); + stream.writeYangInstanceIdentifier(path); + } } @Override public void readExternal(final ObjectInput in) throws IOException { - SerializationUtils.readNodeAndPath(in, this, APPLIER); + final var stream = NormalizedNodeDataInput.newDataInput(in); + data = stream.readNormalizedNode(); + path = stream.readYangInstanceIdentifier(); } - private static final SerializationUtils.Applier APPLIER = (instance, path, node) -> { - instance.path = path; - instance.data = node; - }; - @Override public String toString() { return "PathAndDataMsg [path=" + path + ", data=" + data + "]"; diff --git a/provider/cluster/src/main/resources/OSGI-INF/blueprint/cluster-provider-wiring.xml b/provider/cluster/src/main/resources/OSGI-INF/blueprint/cluster-provider-wiring.xml index 03aa8a78..c15dbae3 100644 --- a/provider/cluster/src/main/resources/OSGI-INF/blueprint/cluster-provider-wiring.xml +++ b/provider/cluster/src/main/resources/OSGI-INF/blueprint/cluster-provider-wiring.xml @@ -20,14 +20,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - + - - @@ -38,7 +36,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - + 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..997f60c5 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.WithShutdown masterActorSystemProvider; + private @Mock ActorSystemInstance.WithShutdown 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(); @@ -166,13 +166,15 @@ public class MountpointTest { masterTestCustomizer.getDOMMountPointService(), masterTestCustomizer.getDomBroker(), masterTestCustomizer.getSchemaService(), masterTestCustomizer.getDOMNotificationRouter(), new RouterDOMRpcService(masterTestCustomizer.getDOMRpcRouter()), yangParserFactory, yangTextToIR, - masterActorSystem, clusterSingletonServiceProvider, governanceProvider, rpcProviderService, null); + masterActorSystemProvider, clusterSingletonServiceProvider, governanceProvider, rpcProviderService, + null); final ClusterDependencies slaveDeps = new ClusterDependencies(tf, slaveTestCustomizer.getDataBroker(), slaveTestCustomizer.getDOMMountPointService(), slaveTestCustomizer.getDomBroker(), slaveTestCustomizer.getSchemaService(), slaveTestCustomizer.getDOMNotificationRouter(), new RouterDOMRpcService(slaveTestCustomizer.getDOMRpcRouter()), yangParserFactory, yangTextToIR, - slaveActorSystem, mockClusterSingletonServiceProvider, governanceProvider, rpcProviderService, null); + slaveActorSystemProvider, mockClusterSingletonServiceProvider, governanceProvider, rpcProviderService, + null); masterConverter = new JsonRpcCodecFactory(masterTestCustomizer.getSchemaService().getGlobalContext()); JsonRpcDatastoreAdapter datastoreAdapter = new JsonRpcDatastoreAdapter(masterConverter, @@ -214,7 +216,7 @@ public class MountpointTest { return dataBrokerTest; } - private static void createPeer(DataBroker dataBroker) throws InterruptedException, ExecutionException { + private static void createPeer(final DataBroker dataBroker) throws InterruptedException, ExecutionException { final WriteTransaction wtx = dataBroker.newWriteOnlyTransaction(); wtx.put(LogicalDatastoreType.CONFIGURATION, MOCK_PEER_CFG_ID, new ConfiguredEndpointsBuilder() .setName("device-1") @@ -232,7 +234,7 @@ public class MountpointTest { wtx.commit().get(); } - private static Optional getOpState(DataBroker dataBroker) { + private static Optional getOpState(final DataBroker dataBroker) { try (ReadTransaction rtx = dataBroker.newReadOnlyTransaction()) { return Futures.getUnchecked(rtx.read(LogicalDatastoreType.OPERATIONAL, MOCK_PEER_OP_ID)); } @@ -321,7 +323,7 @@ public class MountpointTest { } - private static Optional getMountPoint(DOMMountPointService mountService) { + private static Optional getMountPoint(final DOMMountPointService mountService) { return mountService.getMountPoint(Util.createBiPath("device-1")); } diff --git a/provider/common/pom.xml b/provider/common/pom.xml index c9cbcbe4..3a45cdb2 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.2 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..e6f1744f 100644 --- a/tools/test-tool/pom.xml +++ b/tools/test-tool/pom.xml @@ -27,29 +27,33 @@ 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 + yang-data-tree-ri org.opendaylight.yangtools diff --git a/tools/test-tool/src/main/java/org/opendaylight/jsonrpc/tool/test/DatastoreImpl.java b/tools/test-tool/src/main/java/org/opendaylight/jsonrpc/tool/test/DatastoreImpl.java index c7234db7..558cc907 100644 --- a/tools/test-tool/src/main/java/org/opendaylight/jsonrpc/tool/test/DatastoreImpl.java +++ b/tools/test-tool/src/main/java/org/opendaylight/jsonrpc/tool/test/DatastoreImpl.java @@ -10,7 +10,6 @@ package org.opendaylight.jsonrpc.tool.test; import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION; import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.OPERATIONAL; -import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import java.net.URISyntaxException; @@ -24,21 +23,25 @@ import org.opendaylight.jsonrpc.dom.codec.JsonRpcCodecFactory; import org.opendaylight.jsonrpc.impl.JsonRpcDatastoreAdapter; import org.opendaylight.jsonrpc.model.MutablePeer; import org.opendaylight.jsonrpc.provider.common.GovernanceSchemaContextProvider; -import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataBroker; import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.mdsal.dom.broker.SerializedDOMDataBroker; import org.opendaylight.mdsal.dom.spi.FixedDOMSchemaService; -import org.opendaylight.mdsal.dom.spi.store.DOMStore; -import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStore; -import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStoreFactory; +import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMStoreFactory; +import org.opendaylight.mdsal.dom.store.inmemory.dagger.InMemoryDOMStoreFactoryModule; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.YangIdentifier; +import org.opendaylight.yangtools.yang.data.tree.api.DataTreeConfiguration; +import org.opendaylight.yangtools.yang.data.tree.dagger.ReferenceDataTreeFactoryModule; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; final class DatastoreImpl extends JsonRpcDatastoreAdapter { private static final Logger LOG = LoggerFactory.getLogger(DatastoreImpl.class); + private static final InMemoryDOMStoreFactory DOMSTORE_FACTORY = + InMemoryDOMStoreFactoryModule.provideInMemoryDOMStoreFactory( + ReferenceDataTreeFactoryModule.provideDataTreeFactory()); + private final ResponderSession session; DatastoreImpl(JsonRpcCodecFactory codecFactory, DOMDataBroker domDataBroker, EffectiveModelContext schemaContext, @@ -61,13 +64,12 @@ final class DatastoreImpl extends JsonRpcDatastoreAdapter { private static DOMDataBroker createDomDataBroker(DOMSchemaService schemaService, ListeningExecutorService executor) { - final Map stores = ImmutableMap - .builder() - .put(OPERATIONAL, InMemoryDOMDataStoreFactory.create(OPERATIONAL.name(), schemaService)) - .put(CONFIGURATION, InMemoryDOMDataStoreFactory.create(CONFIGURATION.name(), schemaService)) - .build(); - - return new SerializedDOMDataBroker(ImmutableMap.copyOf(stores), executor); + return new SerializedDOMDataBroker(Map.of( + CONFIGURATION, + DOMSTORE_FACTORY.create(CONFIGURATION.name(), DataTreeConfiguration.DEFAULT_CONFIGURATION, schemaService), + OPERATIONAL, + DOMSTORE_FACTORY.create(OPERATIONAL.name(), DataTreeConfiguration.DEFAULT_OPERATIONAL, schemaService)), + executor); } @Override -- 2.34.1 From 7217dee51298fc2e366b0c602b29dd630abd35f8 Mon Sep 17 00:00:00 2001 From: jenkins-releng Date: Sun, 4 Oct 2026 16:36:14 +0000 Subject: [PATCH 2/2] 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 | 2 +- pom.xml | 2 +- provider/cluster/pom.xml | 2 +- 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, 37 insertions(+), 37 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 e9b55c34..06bff8fa 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 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 71e816b4..15258fe8 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 .. diff --git a/provider/common/pom.xml b/provider/common/pom.xml index 3a45cdb2..e996a82e 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 e6f1744f..2cf81f58 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