From 47c9d6a2bdf5897a8e6abbe2cb753dddedbc3b61 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 17 Apr 2023 14:24:43 +0200 Subject: [PATCH] Bump upstreams Adopt: - odlparent-12.0.4 - yangtools-10.0.5 - mdsal-11.0.8 Change-Id: I6a99e63080fff51681681ef80089de63af163be4 Signed-off-by: Robert Varga --- akka/pom.xml | 2 +- akka/repackaged-akka-jar/pom.xml | 2 +- artifacts/pom.xml | 2 +- benchmark/pom.xml | 2 +- bundle-parent/pom.xml | 2 +- docs/pom.xml | 8 +++--- .../features-controller-experimental/pom.xml | 2 +- features/features-controller-testing/pom.xml | 2 +- features/features-controller/pom.xml | 2 +- features/pom.xml | 2 +- features/single-feature-parent/pom.xml | 2 +- jolokia/pom.xml | 2 +- karaf/pom.xml | 2 +- opendaylight/blueprint/pom.xml | 6 ++--- .../netty-event-executor-config/pom.xml | 2 +- .../config/netty-threadgroup-config/pom.xml | 2 +- .../config/netty-timer-config/pom.xml | 2 +- opendaylight/config/pom.xml | 2 +- .../config/threadpool-config-api/pom.xml | 2 +- .../config/threadpool-config-impl/pom.xml | 2 +- opendaylight/md-sal/mdsal-it-base/pom.xml | 4 +-- opendaylight/md-sal/mdsal-it-parent/pom.xml | 2 +- opendaylight/md-sal/parent/pom.xml | 2 +- opendaylight/md-sal/pom.xml | 2 +- .../md-sal/sal-clustering-config/pom.xml | 2 +- .../datastore/CompositeDataTreeCohort.java | 6 ++--- .../datastore/DataTreeCohortActor.java | 8 +++--- .../DataTreeCohortActorRegistry.java | 10 +++---- .../datastore/DataTreeCohortActorTest.java | 10 +++---- .../DataTreeCohortIntegrationTest.java | 26 +++++++++---------- .../clustering-test-app/configuration/pom.xml | 2 +- .../samples/clustering-test-app/pom.xml | 2 +- .../CarEntryDataTreeCommitCohort.java | 4 +-- opendaylight/md-sal/samples/pom.xml | 2 +- pom.xml | 2 +- 35 files changed, 67 insertions(+), 67 deletions(-) diff --git a/akka/pom.xml b/akka/pom.xml index 33d7dc40c7..9d3d890a78 100644 --- a/akka/pom.xml +++ b/akka/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.4 diff --git a/akka/repackaged-akka-jar/pom.xml b/akka/repackaged-akka-jar/pom.xml index a905660d02..c9ff9f8974 100644 --- a/akka/repackaged-akka-jar/pom.xml +++ b/akka/repackaged-akka-jar/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent - 12.0.3 + 12.0.4 diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 0ae23e7f74..e1abdec4f6 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.4 diff --git a/benchmark/pom.xml b/benchmark/pom.xml index 4f3c7509fc..8b860bf201 100644 --- a/benchmark/pom.xml +++ b/benchmark/pom.xml @@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.4 diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml index 05500bbfe8..f096506f6c 100644 --- a/bundle-parent/pom.xml +++ b/bundle-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal dom-parent - 11.0.7 + 11.0.8 diff --git a/docs/pom.xml b/docs/pom.xml index 7c1a40b7dc..c410a7e4e1 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 12.0.3 + 12.0.4 @@ -229,9 +229,9 @@ http://netty.io/4.1/api/ https://commons.apache.org/proper/commons-lang/javadocs/api-release/ - https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/12.0.3/ - https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/10.0.4/ - https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/11.0.7/ + https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/12.0.4/ + https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/10.0.5/ + https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/11.0.8/ diff --git a/features/features-controller-experimental/pom.xml b/features/features-controller-experimental/pom.xml index 4955713e76..9fccbccf0d 100644 --- a/features/features-controller-experimental/pom.xml +++ b/features/features-controller-experimental/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 12.0.3 + 12.0.4 diff --git a/features/features-controller-testing/pom.xml b/features/features-controller-testing/pom.xml index eff2e62abc..89733e9cbb 100644 --- a/features/features-controller-testing/pom.xml +++ b/features/features-controller-testing/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 12.0.3 + 12.0.4 diff --git a/features/features-controller/pom.xml b/features/features-controller/pom.xml index 10b60d21f3..9e74182bed 100644 --- a/features/features-controller/pom.xml +++ b/features/features-controller/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent feature-repo-parent - 12.0.3 + 12.0.4 diff --git a/features/pom.xml b/features/pom.xml index 66d94d3d2f..5e22ea8cbd 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.4 diff --git a/features/single-feature-parent/pom.xml b/features/single-feature-parent/pom.xml index 20c2e6ce59..1b55be8d71 100644 --- a/features/single-feature-parent/pom.xml +++ b/features/single-feature-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent single-feature-parent - 12.0.3 + 12.0.4 diff --git a/jolokia/pom.xml b/jolokia/pom.xml index c5fbb84e57..d08228f96c 100644 --- a/jolokia/pom.xml +++ b/jolokia/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 12.0.3 + 12.0.4 diff --git a/karaf/pom.xml b/karaf/pom.xml index 7ff955876c..21fd0ecec8 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf4-parent - 12.0.3 + 12.0.4 diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml index 7406c34437..951cf7e858 100644 --- a/opendaylight/blueprint/pom.xml +++ b/opendaylight/blueprint/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 12.0.3 + 12.0.4 @@ -27,14 +27,14 @@ org.opendaylight.yangtools yangtools-artifacts - 10.0.4 + 10.0.5 pom import org.opendaylight.mdsal mdsal-artifacts - 11.0.7 + 11.0.8 pom import diff --git a/opendaylight/config/netty-event-executor-config/pom.xml b/opendaylight/config/netty-event-executor-config/pom.xml index afdcd84291..9fde1d17b1 100644 --- a/opendaylight/config/netty-event-executor-config/pom.xml +++ b/opendaylight/config/netty-event-executor-config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 12.0.3 + 12.0.4 diff --git a/opendaylight/config/netty-threadgroup-config/pom.xml b/opendaylight/config/netty-threadgroup-config/pom.xml index e407a15c2e..9dcb40a06a 100644 --- a/opendaylight/config/netty-threadgroup-config/pom.xml +++ b/opendaylight/config/netty-threadgroup-config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 12.0.3 + 12.0.4 diff --git a/opendaylight/config/netty-timer-config/pom.xml b/opendaylight/config/netty-timer-config/pom.xml index 6b9858dde2..4a52c6d07f 100644 --- a/opendaylight/config/netty-timer-config/pom.xml +++ b/opendaylight/config/netty-timer-config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 12.0.3 + 12.0.4 diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml index 44826ddf60..80dbae6622 100644 --- a/opendaylight/config/pom.xml +++ b/opendaylight/config/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.4 diff --git a/opendaylight/config/threadpool-config-api/pom.xml b/opendaylight/config/threadpool-config-api/pom.xml index 7ebb9ae6a4..76c1cb678f 100644 --- a/opendaylight/config/threadpool-config-api/pom.xml +++ b/opendaylight/config/threadpool-config-api/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 12.0.3 + 12.0.4 diff --git a/opendaylight/config/threadpool-config-impl/pom.xml b/opendaylight/config/threadpool-config-impl/pom.xml index ad6422c7e5..71ad69a23b 100644 --- a/opendaylight/config/threadpool-config-impl/pom.xml +++ b/opendaylight/config/threadpool-config-impl/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 12.0.3 + 12.0.4 diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml index d77c2781ea..891734143d 100644 --- a/opendaylight/md-sal/mdsal-it-base/pom.xml +++ b/opendaylight/md-sal/mdsal-it-base/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent bundle-parent - 12.0.3 + 12.0.4 @@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal mdsal-artifacts - 11.0.7 + 11.0.8 pom import diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml index 2b796a0a11..68dd4cc1b9 100644 --- a/opendaylight/md-sal/mdsal-it-parent/pom.xml +++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent bundle-parent - 12.0.3 + 12.0.4 diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml index 5a24741b18..ddae880e7d 100644 --- a/opendaylight/md-sal/parent/pom.xml +++ b/opendaylight/md-sal/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 11.0.7 + 11.0.8 diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 19aa7c249f..4ab5cc1dd0 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.4 diff --git a/opendaylight/md-sal/sal-clustering-config/pom.xml b/opendaylight/md-sal/sal-clustering-config/pom.xml index 921c8a0735..6aff371405 100644 --- a/opendaylight/md-sal/sal-clustering-config/pom.xml +++ b/opendaylight/md-sal/sal-clustering-config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.4 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeDataTreeCohort.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeDataTreeCohort.java index 2aab8260f3..078b45f68f 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeDataTreeCohort.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeDataTreeCohort.java @@ -36,7 +36,7 @@ import org.opendaylight.controller.cluster.datastore.DataTreeCohortActor.CanComm import org.opendaylight.controller.cluster.datastore.DataTreeCohortActor.Success; import org.opendaylight.yangtools.yang.common.Empty; import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidate; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import scala.compat.java8.FutureConverters; @@ -99,7 +99,7 @@ class CompositeDataTreeCohort { private final DataTreeCohortActorRegistry registry; private final TransactionIdentifier txId; - private final SchemaContext schema; + private final EffectiveModelContext schema; private final Executor callbackExecutor; private final Timeout timeout; @@ -107,7 +107,7 @@ class CompositeDataTreeCohort { private State state = State.IDLE; CompositeDataTreeCohort(final DataTreeCohortActorRegistry registry, final TransactionIdentifier transactionID, - final SchemaContext schema, final Executor callbackExecutor, final Timeout timeout) { + final EffectiveModelContext schema, final Executor callbackExecutor, final Timeout timeout) { this.registry = requireNonNull(registry); txId = requireNonNull(transactionID); this.schema = requireNonNull(schema); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActor.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActor.java index feeb9f5e9e..9efca64937 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActor.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActor.java @@ -29,7 +29,7 @@ import org.opendaylight.mdsal.common.api.ThreePhaseCommitStep; import org.opendaylight.mdsal.dom.api.DOMDataTreeCandidate; import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohort; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; /** * Proxy actor which acts as a facade to the user-provided commit cohort. Responsible for @@ -89,10 +89,10 @@ final class DataTreeCohortActor extends AbstractUntypedActor { private final Collection candidates; private final ActorRef cohort; - private final SchemaContext schema; + private final EffectiveModelContext schema; CanCommit(final TransactionIdentifier txId, final Collection candidates, - final SchemaContext schema, final ActorRef cohort) { + final EffectiveModelContext schema, final ActorRef cohort) { super(txId); this.cohort = Objects.requireNonNull(cohort); this.candidates = Objects.requireNonNull(candidates); @@ -103,7 +103,7 @@ final class DataTreeCohortActor extends AbstractUntypedActor { return candidates; } - SchemaContext getSchema() { + EffectiveModelContext getSchema() { return schema; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorRegistry.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorRegistry.java index f213cc7588..e9ed9f8646 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorRegistry.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorRegistry.java @@ -33,7 +33,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidate; import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidateNode; import org.opendaylight.yangtools.yang.data.tree.api.ModificationType; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -82,7 +82,7 @@ class DataTreeCohortActorRegistry extends AbstractRegistrationTree { } List createCanCommitMessages(final TransactionIdentifier txId, - final DataTreeCandidate candidate, final SchemaContext schema) { + final DataTreeCandidate candidate, final EffectiveModelContext schema) { try (RegistrationTreeSnapshot cohorts = takeSnapshot()) { return new CanCommitMessageBuilder(txId, candidate, schema).perform(cohorts.getRootNode()); } @@ -131,10 +131,10 @@ class DataTreeCohortActorRegistry extends AbstractRegistrationTree { private final Multimap actorToCandidates = ArrayListMultimap.create(); private final TransactionIdentifier txId; private final DataTreeCandidate candidate; - private final SchemaContext schema; + private final EffectiveModelContext schema; CanCommitMessageBuilder(final TransactionIdentifier txId, final DataTreeCandidate candidate, - final SchemaContext schema) { + final EffectiveModelContext schema) { this.txId = requireNonNull(txId); this.candidate = requireNonNull(candidate); this.schema = schema; @@ -210,7 +210,7 @@ class DataTreeCohortActorRegistry extends AbstractRegistrationTree { } } - CompositeDataTreeCohort createCohort(final SchemaContext schemaContext, final TransactionIdentifier txId, + CompositeDataTreeCohort createCohort(final EffectiveModelContext schemaContext, final TransactionIdentifier txId, final Executor callbackExecutor, final Timeout commitStepTimeout) { return new CompositeDataTreeCohort(this, txId, schemaContext, callbackExecutor, commitStepTimeout); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorTest.java index aaf0260027..ae8dd51466 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortActorTest.java @@ -47,7 +47,7 @@ import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohort; import org.opendaylight.yangtools.util.concurrent.FluentFutures; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.tree.api.DataValidationFailedException; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import scala.concurrent.Await; /** @@ -57,7 +57,7 @@ import scala.concurrent.Await; */ public class DataTreeCohortActorTest extends AbstractActorTest { private static final Collection CANDIDATES = new ArrayList<>(); - private static final SchemaContext MOCK_SCHEMA = mock(SchemaContext.class); + private static final EffectiveModelContext MOCK_SCHEMA = mock(EffectiveModelContext.class); private final TestActorFactory actorFactory = new TestActorFactory(getSystem()); private final DOMDataTreeCommitCohort mockCohort = mock(DOMDataTreeCommitCohort.class); private final PostCanCommitStep mockPostCanCommit = mock(PostCanCommitStep.class); @@ -114,7 +114,7 @@ public class DataTreeCohortActorTest extends AbstractActorTest { ListeningExecutorService executor = MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor()); doReturn(executeWithDelay(executor, mockPostCanCommit)) - .when(mockCohort).canCommit(any(Object.class), any(SchemaContext.class), anyCollection()); + .when(mockCohort).canCommit(any(Object.class), any(EffectiveModelContext.class), anyCollection()); doReturn(executor.submit(() -> mockPostPreCommit)).when(mockPostCanCommit).preCommit(); @@ -140,7 +140,7 @@ public class DataTreeCohortActorTest extends AbstractActorTest { DataValidationFailedException failure = new DataValidationFailedException(YangInstanceIdentifier.empty(), "mock"); doReturn(FluentFutures.immediateFailedFluentFuture(failure)).when(mockCohort).canCommit(any(Object.class), - any(SchemaContext.class), anyCollection()); + any(EffectiveModelContext.class), anyCollection()); ActorRef cohortActor = newCohortActor("testFailureOnCanCommit"); @@ -203,7 +203,7 @@ public class DataTreeCohortActorTest extends AbstractActorTest { doReturn(ThreePhaseCommitStep.NOOP_ABORT_FUTURE).when(mockPostCanCommit).abort(); doReturn(Futures.immediateFuture(mockPostPreCommit)).when(mockPostCanCommit).preCommit(); doReturn(FluentFutures.immediateFluentFuture(mockPostCanCommit)).when(mockCohort).canCommit(any(Object.class), - any(SchemaContext.class), anyCollection()); + any(EffectiveModelContext.class), anyCollection()); doReturn(ThreePhaseCommitStep.NOOP_ABORT_FUTURE).when(mockPostPreCommit).abort(); doReturn(Futures.immediateFuture(null)).when(mockPostPreCommit).commit(); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortIntegrationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortIntegrationTest.java index 0d24952fe2..ad74a4ba16 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortIntegrationTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeCohortIntegrationTest.java @@ -57,7 +57,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.tree.api.ModificationType; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; public class DataTreeCohortIntegrationTest { @@ -96,7 +96,7 @@ public class DataTreeCohortIntegrationTest { public void testSuccessfulCanCommitWithNoopPostStep() throws Exception { final DOMDataTreeCommitCohort cohort = mock(DOMDataTreeCommitCohort.class); doReturn(PostCanCommitStep.NOOP_SUCCESSFUL_FUTURE).when(cohort).canCommit(any(Object.class), - any(SchemaContext.class), anyCollection()); + any(EffectiveModelContext.class), anyCollection()); ArgumentCaptor candidateCapt = ArgumentCaptor.forClass(Collection.class); IntegrationTestKit kit = new IntegrationTestKit(getSystem(), datastoreContextBuilder); @@ -111,19 +111,19 @@ public class DataTreeCohortIntegrationTest { final ContainerNode node = ImmutableNodes.containerNode(TestModel.TEST_QNAME); kit.testWriteTransaction(dataStore, TestModel.TEST_PATH, node); - verify(cohort).canCommit(any(Object.class), any(SchemaContext.class), candidateCapt.capture()); + verify(cohort).canCommit(any(Object.class), any(EffectiveModelContext.class), candidateCapt.capture()); assertDataTreeCandidate((DOMDataTreeCandidate) candidateCapt.getValue().iterator().next(), TEST_ID, ModificationType.WRITE, Optional.of(node), Optional.empty()); reset(cohort); doReturn(PostCanCommitStep.NOOP_SUCCESSFUL_FUTURE).when(cohort).canCommit(any(Object.class), - any(SchemaContext.class), anyCollection()); + any(EffectiveModelContext.class), anyCollection()); kit.testWriteTransaction(dataStore, TestModel.OUTER_LIST_PATH, ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME) .withChild(ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 42)) .build()); - verify(cohort).canCommit(any(Object.class), any(SchemaContext.class), anyCollection()); + verify(cohort).canCommit(any(Object.class), any(EffectiveModelContext.class), anyCollection()); cohortReg.close(); @@ -140,7 +140,7 @@ public class DataTreeCohortIntegrationTest { final DOMDataTreeCommitCohort failedCohort = mock(DOMDataTreeCommitCohort.class); doReturn(FAILED_CAN_COMMIT_FUTURE).when(failedCohort).canCommit(any(Object.class), - any(SchemaContext.class), anyCollection()); + any(EffectiveModelContext.class), anyCollection()); IntegrationTestKit kit = new IntegrationTestKit(getSystem(), datastoreContextBuilder); try (AbstractDataStore dataStore = kit.setupAbstractDataStore( @@ -167,7 +167,7 @@ public class DataTreeCohortIntegrationTest { public void testCanCommitWithListEntries() throws Exception { final DOMDataTreeCommitCohort cohort = mock(DOMDataTreeCommitCohort.class); doReturn(PostCanCommitStep.NOOP_SUCCESSFUL_FUTURE).when(cohort).canCommit(any(Object.class), - any(SchemaContext.class), anyCollection()); + any(EffectiveModelContext.class), anyCollection()); IntegrationTestKit kit = new IntegrationTestKit(getSystem(), datastoreContextBuilder); try (AbstractDataStore dataStore = kit.setupAbstractDataStore( @@ -197,7 +197,7 @@ public class DataTreeCohortIntegrationTest { kit.doCommit(writeTx.ready()); ArgumentCaptor candidateCapture = ArgumentCaptor.forClass(Collection.class); - verify(cohort).canCommit(any(Object.class), any(SchemaContext.class), candidateCapture.capture()); + verify(cohort).canCommit(any(Object.class), any(EffectiveModelContext.class), candidateCapture.capture()); assertDataTreeCandidate((DOMDataTreeCandidate) candidateCapture.getValue().iterator().next(), new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, optimaPath), ModificationType.WRITE, Optional.of(optimaNode), Optional.empty()); @@ -208,7 +208,7 @@ public class DataTreeCohortIntegrationTest { reset(cohort); doReturn(PostCanCommitStep.NOOP_SUCCESSFUL_FUTURE).when(cohort).canCommit(any(Object.class), - any(SchemaContext.class), anyCollection()); + any(EffectiveModelContext.class), anyCollection()); writeTx = dataStore.newWriteOnlyTransaction(); final YangInstanceIdentifier sportagePath = CarsModel.newCarPath("sportage"); @@ -219,7 +219,7 @@ public class DataTreeCohortIntegrationTest { kit.doCommit(writeTx.ready()); candidateCapture = ArgumentCaptor.forClass(Collection.class); - verify(cohort).canCommit(any(Object.class), any(SchemaContext.class), candidateCapture.capture()); + verify(cohort).canCommit(any(Object.class), any(EffectiveModelContext.class), candidateCapture.capture()); assertDataTreeCandidate(findCandidate(candidateCapture, sportagePath), new DOMDataTreeIdentifier( LogicalDatastoreType.CONFIGURATION, sportagePath), ModificationType.WRITE, @@ -237,14 +237,14 @@ public class DataTreeCohortIntegrationTest { reset(cohort); doReturn(PostCanCommitStep.NOOP_SUCCESSFUL_FUTURE).when(cohort).canCommit(any(Object.class), - any(SchemaContext.class), anyCollection()); + any(EffectiveModelContext.class), anyCollection()); writeTx = dataStore.newWriteOnlyTransaction(); writeTx.delete(CarsModel.BASE_PATH); kit.doCommit(writeTx.ready()); candidateCapture = ArgumentCaptor.forClass(Collection.class); - verify(cohort).canCommit(any(Object.class), any(SchemaContext.class), candidateCapture.capture()); + verify(cohort).canCommit(any(Object.class), any(EffectiveModelContext.class), candidateCapture.capture()); assertDataTreeCandidate(findCandidate(candidateCapture, sportagePath), new DOMDataTreeIdentifier( LogicalDatastoreType.CONFIGURATION, sportagePath), ModificationType.DELETE, @@ -283,7 +283,7 @@ public class DataTreeCohortIntegrationTest { doReturn(ThreePhaseCommitStep.NOOP_ABORT_FUTURE).when(stepToAbort).abort(); doReturn(PostPreCommitStep.NOOP_FUTURE).when(stepToAbort).preCommit(); doReturn(FluentFutures.immediateFluentFuture(stepToAbort)).when(cohortToAbort).canCommit(any(Object.class), - any(SchemaContext.class), anyCollection()); + any(EffectiveModelContext.class), anyCollection()); IntegrationTestKit kit = new IntegrationTestKit(getSystem(), datastoreContextBuilder); try (AbstractDataStore dataStore = kit.setupAbstractDataStore( diff --git a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml index 7f5e875ffa..15e3ad46e5 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.4 diff --git a/opendaylight/md-sal/samples/clustering-test-app/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/pom.xml index 084adb4d55..89dee846d3 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/pom.xml +++ b/opendaylight/md-sal/samples/clustering-test-app/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.4 diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarEntryDataTreeCommitCohort.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarEntryDataTreeCommitCohort.java index c3294bd6c7..8683b8c825 100644 --- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarEntryDataTreeCommitCohort.java +++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/CarEntryDataTreeCommitCohort.java @@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidateNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +40,7 @@ public final class CarEntryDataTreeCommitCohort implements DOMDataTreeCommitCoho private static final NodeIdentifier YEAR_NODE_ID = new NodeIdentifier(YEAR_QNAME); @Override - public FluentFuture canCommit(final Object txId, final SchemaContext ctx, + public FluentFuture canCommit(final Object txId, final EffectiveModelContext ctx, final Collection candidates) { for (DOMDataTreeCandidate candidate : candidates) { diff --git a/opendaylight/md-sal/samples/pom.xml b/opendaylight/md-sal/samples/pom.xml index ddb12d37b9..4e226858a7 100644 --- a/opendaylight/md-sal/samples/pom.xml +++ b/opendaylight/md-sal/samples/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.4 diff --git a/pom.xml b/pom.xml index c755875fc0..7f0be93bab 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent-lite - 12.0.3 + 12.0.4 -- 2.36.6