From 1a379576451ad8eadd450cd28ba55b6b835f796e Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 5 Oct 2022 13:16:17 +0200 Subject: [PATCH] Bump upstreams Adopt: - odlparent-12.0.0 - yangtools-10.0.0 Change-Id: Ic101cb87855ee69680746d783e1a40b6f944e3f9 Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- binding/binding-parent/pom.xml | 2 +- .../codec/impl/DataObjectCodecContext.java | 6 +++--- .../reactor/AbstractAugmentGenerator.java | 7 +++---- .../reactor/AbstractTypeAwareGenerator.java | 2 +- .../reactor/CompositeRuntimeTypeBuilder.java | 2 +- .../impl/reactor/ContainerGenerator.java | 2 +- .../generator/impl/reactor/ListGenerator.java | 2 +- .../impl/reactor/NotificationGenerator.java | 2 +- .../impl/reactor/OpaqueObjectGenerator.java | 2 +- .../reactor/OperationContainerGenerator.java | 2 +- .../TargetAugmentEffectiveStatement.java | 19 +++++++++++-------- binding/mdsal-binding-test-utils/pom.xml | 2 +- binding/pom.xml | 2 +- common/pom.xml | 2 +- docs/pom.xml | 4 ++-- dom/dom-parent/pom.xml | 4 ++-- dom/pom.xml | 2 +- entityownership/pom.xml | 2 +- features/feature-parent/pom.xml | 4 ++-- features/features-mdsal-experimental/pom.xml | 2 +- features/features-mdsal/pom.xml | 2 +- .../src/main/feature/feature.xml | 2 +- .../src/main/feature/feature.xml | 2 +- .../src/main/feature/feature.xml | 4 ++-- .../src/main/feature/feature.xml | 2 +- .../src/main/feature/feature.xml | 2 +- .../src/main/feature/feature.xml | 2 +- .../src/main/feature/feature.xml | 2 +- .../src/main/feature/feature.xml | 2 +- .../src/main/feature/feature.xml | 2 +- features/pom.xml | 2 +- karaf/pom.xml | 2 +- model/iana/pom.xml | 2 +- model/ietf/pom.xml | 2 +- model/pom.xml | 2 +- netty/pom.xml | 2 +- pom.xml | 2 +- replicate/pom.xml | 2 +- singleton-service/pom.xml | 2 +- trace/pom.xml | 2 +- yanglib/pom.xml | 2 +- 42 files changed, 60 insertions(+), 58 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index eca7edf44d..0ac3463ebf 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 12.0.0 diff --git a/binding/binding-parent/pom.xml b/binding/binding-parent/pom.xml index f6186ca181..d7fb5355e9 100644 --- a/binding/binding-parent/pom.xml +++ b/binding/binding-parent/pom.xml @@ -54,7 +54,7 @@ org.opendaylight.yangtools yang-maven-plugin - 9.0.1 + 10.0.0 org.opendaylight.mdsal diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java index 2fa41e9585..c29d6b6aef 100644 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java +++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/DataObjectCodecContext.java @@ -44,6 +44,7 @@ import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.Item; import org.opendaylight.yangtools.yang.binding.OpaqueObject; +import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; @@ -393,7 +394,7 @@ public abstract class DataObjectCodecContext (QName) stmt.argument()) .collect(ImmutableSet.toImmutableSet()); if (possibleChildren.isEmpty()) { return null; @@ -431,8 +432,7 @@ public abstract class DataObjectCodecContext(); for (final NormalizedNode childValue : data.body()) { - if (childValue instanceof AugmentationNode) { - final AugmentationNode augDomNode = (AugmentationNode) childValue; + if (childValue instanceof AugmentationNode augDomNode) { final DataContainerCodecPrototype codecProto = augmentationByYang.get(augDomNode.getIdentifier()); if (codecProto != null) { final DataContainerCodecContext codec = codecProto.get(); diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractAugmentGenerator.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractAugmentGenerator.java index d48e841929..0a70ed04fb 100644 --- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractAugmentGenerator.java +++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractAugmentGenerator.java @@ -34,7 +34,6 @@ import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.AugmentEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ChoiceEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeAwareEffectiveStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeAwareEffectiveStatement.SchemaTreeNamespace; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStatement; import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack; @@ -178,10 +177,10 @@ abstract class AbstractAugmentGenerator final var stmts = augment.effectiveSubstatements(); final var builder = ImmutableList.>builderWithExpectedSize(stmts.size()); for (var child : stmts) { - if (child instanceof SchemaTreeEffectiveStatement) { - final var qname = ((SchemaTreeEffectiveStatement) child).getIdentifier(); + if (child instanceof SchemaTreeEffectiveStatement schemaTreeChild) { + final var qname = schemaTreeChild.argument(); // Note: a match in target may be missing -- for example if it was 'deviate unsupported' - target.get(SchemaTreeNamespace.class, transform.apply(qname)).ifPresent(builder::add); + target.findSchemaTreeNode(transform.apply(qname)).ifPresent(builder::add); } else { builder.add(child); } diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeAwareGenerator.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeAwareGenerator.java index eb98a61350..ab40f29d9c 100644 --- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeAwareGenerator.java +++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/AbstractTypeAwareGenerator.java @@ -38,7 +38,7 @@ abstract class AbstractTypeAwareGenerator, R // such in the schema tree. // // That is in general -- 'choice' statements are doing their own thing separately. - if (!isAugmentedChild(child.getIdentifier())) { + if (!isAugmentedChild(child.argument())) { final var childGen = verifyNotNull(findChildGenerator(generator, child.argument().getLocalName()), "Cannot find child for %s in %s", child, generator); final var childRuntimeType = childGen.createInternalRuntimeType(resolver, child); diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ContainerGenerator.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ContainerGenerator.java index 8e905ea938..3855915202 100644 --- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ContainerGenerator.java +++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/ContainerGenerator.java @@ -27,7 +27,7 @@ final class ContainerGenerator extends CompositeSchemaTreeGenerator, R @Override void pushToInference(final SchemaInferenceStack dataTree) { - dataTree.enterDataTree(statement().getIdentifier()); + dataTree.enterDataTree(statement().argument()); } @Override diff --git a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OperationContainerGenerator.java b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OperationContainerGenerator.java index 35a70e5824..5da1711fd5 100644 --- a/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OperationContainerGenerator.java +++ b/binding/mdsal-binding-generator/src/main/java/org/opendaylight/mdsal/binding/generator/impl/reactor/OperationContainerGenerator.java @@ -31,7 +31,7 @@ abstract class OperationContainerGenerator> Optional get(final Class namespace, final K identifier) { - return Optional.empty(); + public List> effectiveSubstatements() { + return substatements; } @Override - public > Map getAll(final Class namespace) { - return Map.of(); + @SuppressWarnings({ "rawtypes", "unchecked" }) + public Collection> schemaTreeNodes() { + return (Collection) collectEffectiveSubstatements(SchemaTreeEffectiveStatement.class); } @Override - public List> effectiveSubstatements() { - return substatements; + @SuppressWarnings({ "rawtypes", "unchecked" }) + public Optional> findSchemaTreeNode(final QName qname) { + return (Optional) streamEffectiveSubstatements(SchemaTreeEffectiveStatement.class) + .filter(stmt -> qname.equals(stmt.argument())) + .findAny(); } @Override diff --git a/binding/mdsal-binding-test-utils/pom.xml b/binding/mdsal-binding-test-utils/pom.xml index 375e1b565f..0d50e08e70 100644 --- a/binding/mdsal-binding-test-utils/pom.xml +++ b/binding/mdsal-binding-test-utils/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent - 11.0.1 + 12.0.0 diff --git a/binding/pom.xml b/binding/pom.xml index 3ff5986ff8..6eaff60ea9 100644 --- a/binding/pom.xml +++ b/binding/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 12.0.0 diff --git a/common/pom.xml b/common/pom.xml index fc8274323c..2f83e1da86 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 12.0.0 diff --git a/docs/pom.xml b/docs/pom.xml index 9d7b43d0ed..3798398ee6 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -606,8 +606,8 @@ https://google.github.io/guava/releases/31.1-jre/api/docs/ https://commons.apache.org/proper/commons-lang/javadocs/api-release/ - https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/11.0.1/ - https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/9.0.1/ + https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/12.0.0/ + https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/10.0.0/ diff --git a/dom/dom-parent/pom.xml b/dom/dom-parent/pom.xml index 4fefab86ce..f0382d068f 100644 --- a/dom/dom-parent/pom.xml +++ b/dom/dom-parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 11.0.1 + 12.0.0 @@ -29,7 +29,7 @@ org.opendaylight.yangtools yangtools-artifacts - 9.0.1 + 10.0.0 pom import diff --git a/dom/pom.xml b/dom/pom.xml index 016b385a76..5fc2a78566 100644 --- a/dom/pom.xml +++ b/dom/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 12.0.0 diff --git a/entityownership/pom.xml b/entityownership/pom.xml index 2811809477..a24ca014ab 100644 --- a/entityownership/pom.xml +++ b/entityownership/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 12.0.0 diff --git a/features/feature-parent/pom.xml b/features/feature-parent/pom.xml index 7097223212..a927f5837a 100644 --- a/features/feature-parent/pom.xml +++ b/features/feature-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent single-feature-parent - 11.0.1 + 12.0.0 @@ -27,7 +27,7 @@ org.opendaylight.yangtools yangtools-artifacts - 9.0.1 + 10.0.0 pom import diff --git a/features/features-mdsal-experimental/pom.xml b/features/features-mdsal-experimental/pom.xml index ddf7e78b70..57b749aebc 100644 --- a/features/features-mdsal-experimental/pom.xml +++ b/features/features-mdsal-experimental/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 11.0.1 + 12.0.0 diff --git a/features/features-mdsal/pom.xml b/features/features-mdsal/pom.xml index 7a258ab31b..7c623f709f 100644 --- a/features/features-mdsal/pom.xml +++ b/features/features-mdsal/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 11.0.1 + 12.0.0 diff --git a/features/odl-mdsal-binding-api/src/main/feature/feature.xml b/features/odl-mdsal-binding-api/src/main/feature/feature.xml index 71a21559ab..cf0027b6b7 100644 --- a/features/odl-mdsal-binding-api/src/main/feature/feature.xml +++ b/features/odl-mdsal-binding-api/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-yangtools-data-api + odl-yangtools-data-api diff --git a/features/odl-mdsal-binding-base/src/main/feature/feature.xml b/features/odl-mdsal-binding-base/src/main/feature/feature.xml index 59b5cc90c8..4611715bee 100644 --- a/features/odl-mdsal-binding-base/src/main/feature/feature.xml +++ b/features/odl-mdsal-binding-base/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-yangtools-common + odl-yangtools-common diff --git a/features/odl-mdsal-binding-runtime-api/src/main/feature/feature.xml b/features/odl-mdsal-binding-runtime-api/src/main/feature/feature.xml index 6f8ed41b2b..582657b26f 100644 --- a/features/odl-mdsal-binding-runtime-api/src/main/feature/feature.xml +++ b/features/odl-mdsal-binding-runtime-api/src/main/feature/feature.xml @@ -1,7 +1,7 @@ - odl-yangtools-data - odl-yangtools-parser + odl-yangtools-data + odl-yangtools-parser diff --git a/features/odl-mdsal-common/src/main/feature/feature.xml b/features/odl-mdsal-common/src/main/feature/feature.xml index 1e484f0e8f..ab7ba8b35c 100644 --- a/features/odl-mdsal-common/src/main/feature/feature.xml +++ b/features/odl-mdsal-common/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-yangtools-common + odl-yangtools-common diff --git a/features/odl-mdsal-dom-api/src/main/feature/feature.xml b/features/odl-mdsal-dom-api/src/main/feature/feature.xml index b46c82edc0..e00bd53f70 100644 --- a/features/odl-mdsal-dom-api/src/main/feature/feature.xml +++ b/features/odl-mdsal-dom-api/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-yangtools-data-api + odl-yangtools-data-api diff --git a/features/odl-mdsal-eos-common/src/main/feature/feature.xml b/features/odl-mdsal-eos-common/src/main/feature/feature.xml index 945628d485..9b716906ad 100644 --- a/features/odl-mdsal-eos-common/src/main/feature/feature.xml +++ b/features/odl-mdsal-eos-common/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-yangtools-data-api + odl-yangtools-data-api diff --git a/features/odl-mdsal-exp-yanglib-api/src/main/feature/feature.xml b/features/odl-mdsal-exp-yanglib-api/src/main/feature/feature.xml index 9f1dc8b278..1a2308c6eb 100644 --- a/features/odl-mdsal-exp-yanglib-api/src/main/feature/feature.xml +++ b/features/odl-mdsal-exp-yanglib-api/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-yangtools-data-api + odl-yangtools-data-api diff --git a/features/odl-mdsal-replicate-netty/src/main/feature/feature.xml b/features/odl-mdsal-replicate-netty/src/main/feature/feature.xml index 317c8dbb3a..2f2998eaf7 100644 --- a/features/odl-mdsal-replicate-netty/src/main/feature/feature.xml +++ b/features/odl-mdsal-replicate-netty/src/main/feature/feature.xml @@ -4,6 +4,6 @@ mvn:org.opendaylight.mdsal/mdsal-replicate-netty/${project.version}/config/sink mvn:org.opendaylight.mdsal/mdsal-replicate-netty/${project.version}/config/source odl-netty-4 - odl-yangtools-codec + odl-yangtools-codec diff --git a/features/odl-mdsal-rfc8294-netty/src/main/feature/feature.xml b/features/odl-mdsal-rfc8294-netty/src/main/feature/feature.xml index 762c8c7e17..c22ee82343 100644 --- a/features/odl-mdsal-rfc8294-netty/src/main/feature/feature.xml +++ b/features/odl-mdsal-rfc8294-netty/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-yangtools-netty + odl-yangtools-netty diff --git a/features/pom.xml b/features/pom.xml index 9d06029487..1f73b312fd 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 12.0.0 diff --git a/karaf/pom.xml b/karaf/pom.xml index c3270df29d..ca1353deda 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf4-parent - 11.0.1 + 12.0.0 diff --git a/model/iana/pom.xml b/model/iana/pom.xml index 8f6a6ff991..3764a41c8d 100644 --- a/model/iana/pom.xml +++ b/model/iana/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 12.0.0 diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml index 23d99acaa3..40b08b3aa8 100644 --- a/model/ietf/pom.xml +++ b/model/ietf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 12.0.0 diff --git a/model/pom.xml b/model/pom.xml index 47647391cf..da26e833ee 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 12.0.0 diff --git a/netty/pom.xml b/netty/pom.xml index eed829c293..82259db032 100644 --- a/netty/pom.xml +++ b/netty/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 12.0.0 diff --git a/pom.xml b/pom.xml index 9b6d1fe473..6a589d43e1 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 12.0.0 diff --git a/replicate/pom.xml b/replicate/pom.xml index 39423a25cd..49e50af002 100644 --- a/replicate/pom.xml +++ b/replicate/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 12.0.0 diff --git a/singleton-service/pom.xml b/singleton-service/pom.xml index c16a597a1e..8ecc11b525 100644 --- a/singleton-service/pom.xml +++ b/singleton-service/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 12.0.0 diff --git a/trace/pom.xml b/trace/pom.xml index 6dc0e0d292..9d7e975219 100644 --- a/trace/pom.xml +++ b/trace/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 12.0.0 diff --git a/yanglib/pom.xml b/yanglib/pom.xml index b2934eefe1..4dc0f55de9 100644 --- a/yanglib/pom.xml +++ b/yanglib/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 12.0.0 -- 2.36.6