From 8ebb6a36888dfdaff979fbf6e8bc8e75a543303e Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 19 Feb 2021 14:15:11 +0100 Subject: [PATCH] Split out yang-data-spi We have some SPI contracts lurking in yang-data-api as well as some a reusable baseline AbstractNormalizedNode in yang-data-impl. Instantiate yang-data-spi to host these kinds of classes, allowing a more ready reuse. JIRA: YANGTOOLS-1257 Change-Id: I6a650d2f7df9a9e8621452cfbbe42be4d54834ae Signed-off-by: Robert Varga --- artifacts/pom.xml | 5 +++ data/pom.xml | 33 +++++++++++++++ data/yang-data-spi/pom.xml | 42 +++++++++++++++++++ .../src/main/java/module-info.java | 20 +++++++++ .../data/spi/node/AbstractNormalizedNode.java | 27 ++++++++---- .../data/spi/tree}/AbstractContainerNode.java | 2 +- .../tree}/AbstractModifiedContainerNode.java | 2 +- .../tree}/AbstractMutableContainerNode.java | 2 +- .../yang/data/spi/tree}/AbstractTreeNode.java | 2 +- .../data/spi/tree}/LazyContainerNode.java | 2 +- .../spi/tree}/LazyMutableContainerNode.java | 2 +- .../spi/tree}/MaterializedContainerNode.java | 2 +- .../MaterializedMutableContainerNode.java | 2 +- .../yang/data/spi/tree}/MutableTreeNode.java | 2 +- .../data/spi/tree}/SimpleContainerNode.java | 2 +- .../yang/data/spi/tree}/TreeNode.java | 2 +- .../yang/data/spi/tree}/TreeNodeFactory.java | 2 +- .../yang/data/spi/tree}/ValueNode.java | 2 +- .../yang/data/spi/tree}/Version.java | 2 +- .../yang/data/spi/tree}/DuplicityTest.java | 2 +- .../data/spi/tree}/TreeNodeFactoryTest.java | 2 +- .../yang/data/spi/tree}/VersionTest.java | 2 +- features/odl-yangtools-data-api/pom.xml | 4 ++ features/pom.xml | 5 +++ pom.xml | 1 + .../src/main/java/module-info.java | 1 - yang/yang-data-impl/pom.xml | 4 ++ .../src/main/java/module-info.java | 1 + .../builder/impl/ImmutableMapNodeBuilder.java | 4 +- .../impl/ImmutableUnkeyedListNodeBuilder.java | 4 +- .../impl/ImmutableUserLeafSetNodeBuilder.java | 4 +- .../impl/ImmutableUserMapNodeBuilder.java | 4 +- .../AbstractImmutableDataContainerNode.java | 3 +- .../AbstractImmutableNormalizedValueNode.java | 3 +- .../impl/schema/tree/AbstractDataTreeTip.java | 2 +- ...bstractModifiedNodeBasedCandidateNode.java | 2 +- ...ractNodeContainerModificationStrategy.java | 8 ++-- .../schema/tree/AbstractReadyIterator.java | 2 +- .../impl/schema/tree/AbstractValidation.java | 4 +- .../AugmentationModificationStrategy.java | 4 +- .../schema/tree/AutomaticLifecycleMixin.java | 6 +-- .../tree/ChoiceModificationStrategy.java | 4 +- .../tree/ContainerModificationStrategy.java | 4 +- .../data/impl/schema/tree/DataTreeState.java | 2 +- .../impl/schema/tree/InMemoryDataTree.java | 2 +- .../tree/InMemoryDataTreeCandidate.java | 2 +- .../schema/tree/InMemoryDataTreeFactory.java | 4 +- .../tree/InMemoryDataTreeModification.java | 4 +- .../schema/tree/InMemoryDataTreeSnapshot.java | 2 +- .../schema/tree/ListModificationStrategy.java | 8 ++-- .../schema/tree/MandatoryLeafEnforcer.java | 2 +- .../tree/MapEntryModificationStrategy.java | 4 +- .../schema/tree/MapModificationStrategy.java | 4 +- .../tree/ModificationApplyOperation.java | 4 +- .../data/impl/schema/tree/ModifiedNode.java | 6 +-- .../impl/schema/tree/NodeModification.java | 2 +- .../schema/tree/NoopDataTreeCandidate.java | 2 +- .../tree/OperationWithModification.java | 4 +- .../tree/SchemaAwareApplyOperation.java | 4 +- ...ructuralContainerModificationStrategy.java | 4 +- .../tree/ValueNodeModificationStrategy.java | 6 +-- .../tree/ModificationMetadataTreeTest.java | 4 +- .../impl/schema/tree/StoreTreeNodesTest.java | 6 +-- 63 files changed, 218 insertions(+), 93 deletions(-) create mode 100644 data/pom.xml create mode 100644 data/yang-data-spi/pom.xml create mode 100644 data/yang-data-spi/src/main/java/module-info.java rename yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedNode.java => data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/node/AbstractNormalizedNode.java (63%) rename {yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi => data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree}/AbstractContainerNode.java (96%) rename {yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi => data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree}/AbstractModifiedContainerNode.java (96%) rename {yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi => data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree}/AbstractMutableContainerNode.java (98%) rename {yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi => data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree}/AbstractTreeNode.java (96%) rename {yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi => data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree}/LazyContainerNode.java (97%) rename {yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi => data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree}/LazyMutableContainerNode.java (95%) rename {yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi => data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree}/MaterializedContainerNode.java (94%) rename {yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi => data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree}/MaterializedMutableContainerNode.java (92%) rename {yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi => data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree}/MutableTreeNode.java (97%) rename {yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi => data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree}/SimpleContainerNode.java (95%) rename {yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi => data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree}/TreeNode.java (97%) rename {yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi => data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree}/TreeNodeFactory.java (95%) rename {yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi => data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree}/ValueNode.java (96%) rename {yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi => data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree}/Version.java (93%) rename {yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi => data/yang-data-spi/src/test/java/org/opendaylight/yangtools/yang/data/spi/tree}/DuplicityTest.java (95%) rename {yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi => data/yang-data-spi/src/test/java/org/opendaylight/yangtools/yang/data/spi/tree}/TreeNodeFactoryTest.java (96%) rename {yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi => data/yang-data-spi/src/test/java/org/opendaylight/yangtools/yang/data/spi/tree}/VersionTest.java (93%) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index a5e242acb6..371b0226b8 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -44,6 +44,11 @@ yang-data-api 7.0.0-SNAPSHOT + + org.opendaylight.yangtools + yang-data-spi + 7.0.0-SNAPSHOT + org.opendaylight.yangtools yang-data-impl diff --git a/data/pom.xml b/data/pom.xml new file mode 100644 index 0000000000..03eeda6594 --- /dev/null +++ b/data/pom.xml @@ -0,0 +1,33 @@ + + + + + 4.0.0 + + + org.opendaylight.odlparent + odlparent-lite + 8.1.0 + + + + org.opendaylight.yangtools + data-aggregator + 7.0.0-SNAPSHOT + pom + + + true + true + + + + yang-data-spi + + diff --git a/data/yang-data-spi/pom.xml b/data/yang-data-spi/pom.xml new file mode 100644 index 0000000000..bcc0aa2644 --- /dev/null +++ b/data/yang-data-spi/pom.xml @@ -0,0 +1,42 @@ + + + + + 4.0.0 + + org.opendaylight.yangtools + bundle-parent + 7.0.0-SNAPSHOT + ../../bundle-parent + + + yang-data-spi + bundle + ${project.artifactId} + ${project.artifactId} + + + + com.google.guava + guava + + + org.opendaylight.yangtools + concepts + + + org.opendaylight.yangtools + util + + + org.opendaylight.yangtools + yang-data-api + + + diff --git a/data/yang-data-spi/src/main/java/module-info.java b/data/yang-data-spi/src/main/java/module-info.java new file mode 100644 index 0000000000..9c9c04747d --- /dev/null +++ b/data/yang-data-spi/src/main/java/module-info.java @@ -0,0 +1,20 @@ +/* + * Copyright (c) 2021 PANTHEON.tech, s.r.o. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +module org.opendaylight.yangtools.yang.data.spi { + exports org.opendaylight.yangtools.yang.data.spi.node; + exports org.opendaylight.yangtools.yang.data.spi.tree; + + requires transitive org.opendaylight.yangtools.yang.data.api; + requires com.google.common; + requires org.opendaylight.yangtools.concepts; + requires org.opendaylight.yangtools.util; + requires org.slf4j; + + // Annotations + requires static transitive org.eclipse.jdt.annotation; +} diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedNode.java b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/node/AbstractNormalizedNode.java similarity index 63% rename from yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedNode.java rename to data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/node/AbstractNormalizedNode.java index bda43c15d6..571573142d 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedNode.java +++ b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/node/AbstractNormalizedNode.java @@ -1,12 +1,14 @@ /* * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * Copyright (c) 2020 PANTHEON.tech, s.r.o * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.data.impl.schema.nodes; +package org.opendaylight.yangtools.yang.data.spi.node; +import com.google.common.annotations.Beta; import com.google.common.base.MoreObjects.ToStringHelper; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.concepts.AbstractIdentifiable; @@ -14,10 +16,17 @@ import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -public abstract class AbstractImmutableNormalizedNode - extends AbstractIdentifiable implements NormalizedNode, Immutable { - protected AbstractImmutableNormalizedNode(final K nodeIdentifier) { - super(nodeIdentifier); +/** + * Abstract base class for {@link NormalizedNode} implementations. + * + * @param Identifier type + * @param Implemented {@link NormalizedNode} specialization type + */ +@Beta +public abstract class AbstractNormalizedNode + extends AbstractIdentifiable implements NormalizedNode, Immutable { + protected AbstractNormalizedNode(final I identifier) { + super(identifier); } @Override @@ -25,11 +34,11 @@ public abstract class AbstractImmutableNormalizedNode clazz = implementedType(); + final Class clazz = implementedType(); if (!clazz.isInstance(obj)) { return false; } - final N other = clazz.cast(obj); + final T other = clazz.cast(obj); return getIdentifier().equals(other.getIdentifier()) && valueEquals(other); } @@ -43,9 +52,9 @@ public abstract class AbstractImmutableNormalizedNode implementedType(); + protected abstract @NonNull Class implementedType(); protected abstract int valueHashCode(); - protected abstract boolean valueEquals(@NonNull N other); + protected abstract boolean valueEquals(@NonNull T other); } diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractContainerNode.java b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/AbstractContainerNode.java similarity index 96% rename from yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractContainerNode.java rename to data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/AbstractContainerNode.java index bfa719d25a..1bbe65de28 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractContainerNode.java +++ b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/AbstractContainerNode.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.data.api.schema.tree.spi; +package org.opendaylight.yangtools.yang.data.spi.tree; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractModifiedContainerNode.java b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/AbstractModifiedContainerNode.java similarity index 96% rename from yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractModifiedContainerNode.java rename to data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/AbstractModifiedContainerNode.java index f16d46eab2..41949f6ede 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractModifiedContainerNode.java +++ b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/AbstractModifiedContainerNode.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.data.api.schema.tree.spi; +package org.opendaylight.yangtools.yang.data.spi.tree; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractMutableContainerNode.java b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/AbstractMutableContainerNode.java similarity index 98% rename from yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractMutableContainerNode.java rename to data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/AbstractMutableContainerNode.java index 774bb86e7d..a89fadcbac 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractMutableContainerNode.java +++ b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/AbstractMutableContainerNode.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.data.api.schema.tree.spi; +package org.opendaylight.yangtools.yang.data.spi.tree; import static com.google.common.base.Verify.verify; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractTreeNode.java b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/AbstractTreeNode.java similarity index 96% rename from yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractTreeNode.java rename to data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/AbstractTreeNode.java index 86c12d58d5..1d9669ff00 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/AbstractTreeNode.java +++ b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/AbstractTreeNode.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.data.api.schema.tree.spi; +package org.opendaylight.yangtools.yang.data.spi.tree; import static java.util.Objects.requireNonNull; diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/LazyContainerNode.java b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/LazyContainerNode.java similarity index 97% rename from yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/LazyContainerNode.java rename to data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/LazyContainerNode.java index 3a91cd800a..70f9abf3b6 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/LazyContainerNode.java +++ b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/LazyContainerNode.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.data.api.schema.tree.spi; +package org.opendaylight.yangtools.yang.data.spi.tree; import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.Collections2; diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/LazyMutableContainerNode.java b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/LazyMutableContainerNode.java similarity index 95% rename from yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/LazyMutableContainerNode.java rename to data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/LazyMutableContainerNode.java index e0b3e0198e..f53d6d3a52 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/LazyMutableContainerNode.java +++ b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/LazyMutableContainerNode.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.data.api.schema.tree.spi; +package org.opendaylight.yangtools.yang.data.spi.tree; import java.util.Map; import org.opendaylight.yangtools.util.MapAdaptor; diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/MaterializedContainerNode.java b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/MaterializedContainerNode.java similarity index 94% rename from yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/MaterializedContainerNode.java rename to data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/MaterializedContainerNode.java index b87179c338..c10e7e1b06 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/MaterializedContainerNode.java +++ b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/MaterializedContainerNode.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.data.api.schema.tree.spi; +package org.opendaylight.yangtools.yang.data.spi.tree; import java.util.Map; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/MaterializedMutableContainerNode.java b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/MaterializedMutableContainerNode.java similarity index 92% rename from yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/MaterializedMutableContainerNode.java rename to data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/MaterializedMutableContainerNode.java index 8d325526ce..bc3b9adfad 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/MaterializedMutableContainerNode.java +++ b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/MaterializedMutableContainerNode.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.data.api.schema.tree.spi; +package org.opendaylight.yangtools.yang.data.spi.tree; import java.util.Map; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/MutableTreeNode.java b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/MutableTreeNode.java similarity index 97% rename from yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/MutableTreeNode.java rename to data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/MutableTreeNode.java index e1d4f378df..8d911fc252 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/MutableTreeNode.java +++ b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/MutableTreeNode.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.data.api.schema.tree.spi; +package org.opendaylight.yangtools.yang.data.spi.tree; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/SimpleContainerNode.java b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/SimpleContainerNode.java similarity index 95% rename from yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/SimpleContainerNode.java rename to data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/SimpleContainerNode.java index ec086d2c12..3374e97593 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/SimpleContainerNode.java +++ b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/SimpleContainerNode.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.data.api.schema.tree.spi; +package org.opendaylight.yangtools.yang.data.spi.tree; import com.google.common.base.MoreObjects.ToStringHelper; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/TreeNode.java b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/TreeNode.java similarity index 97% rename from yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/TreeNode.java rename to data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/TreeNode.java index 689c49c85c..c498d5b616 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/TreeNode.java +++ b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/TreeNode.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.data.api.schema.tree.spi; +package org.opendaylight.yangtools.yang.data.spi.tree; import org.eclipse.jdt.annotation.NonNullByDefault; import org.opendaylight.yangtools.concepts.Identifiable; diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/TreeNodeFactory.java b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/TreeNodeFactory.java similarity index 95% rename from yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/TreeNodeFactory.java rename to data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/TreeNodeFactory.java index bacc520890..de98db58d5 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/TreeNodeFactory.java +++ b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/TreeNodeFactory.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.data.api.schema.tree.spi; +package org.opendaylight.yangtools.yang.data.spi.tree; import org.opendaylight.yangtools.yang.data.api.schema.DistinctNodeContainer; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/ValueNode.java b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/ValueNode.java similarity index 96% rename from yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/ValueNode.java rename to data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/ValueNode.java index 559e3dee8f..a2d7c94370 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/ValueNode.java +++ b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/ValueNode.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.data.api.schema.tree.spi; +package org.opendaylight.yangtools.yang.data.spi.tree; import com.google.common.base.MoreObjects.ToStringHelper; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/Version.java b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/Version.java similarity index 93% rename from yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/Version.java rename to data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/Version.java index 759c72c4b0..5cf82577a8 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/Version.java +++ b/data/yang-data-spi/src/main/java/org/opendaylight/yangtools/yang/data/spi/tree/Version.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.data.api.schema.tree.spi; +package org.opendaylight.yangtools.yang.data.spi.tree; /** * The concept of a version, either node version, or a subtree version. The diff --git a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/DuplicityTest.java b/data/yang-data-spi/src/test/java/org/opendaylight/yangtools/yang/data/spi/tree/DuplicityTest.java similarity index 95% rename from yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/DuplicityTest.java rename to data/yang-data-spi/src/test/java/org/opendaylight/yangtools/yang/data/spi/tree/DuplicityTest.java index 2071ac43d3..99a22beaff 100644 --- a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/DuplicityTest.java +++ b/data/yang-data-spi/src/test/java/org/opendaylight/yangtools/yang/data/spi/tree/DuplicityTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.data.api.schema.tree.spi; +package org.opendaylight.yangtools.yang.data.spi.tree; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; diff --git a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/TreeNodeFactoryTest.java b/data/yang-data-spi/src/test/java/org/opendaylight/yangtools/yang/data/spi/tree/TreeNodeFactoryTest.java similarity index 96% rename from yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/TreeNodeFactoryTest.java rename to data/yang-data-spi/src/test/java/org/opendaylight/yangtools/yang/data/spi/tree/TreeNodeFactoryTest.java index 49759672f1..ac9fa44e29 100644 --- a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/TreeNodeFactoryTest.java +++ b/data/yang-data-spi/src/test/java/org/opendaylight/yangtools/yang/data/spi/tree/TreeNodeFactoryTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.data.api.schema.tree.spi; +package org.opendaylight.yangtools.yang.data.spi.tree; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; diff --git a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/VersionTest.java b/data/yang-data-spi/src/test/java/org/opendaylight/yangtools/yang/data/spi/tree/VersionTest.java similarity index 93% rename from yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/VersionTest.java rename to data/yang-data-spi/src/test/java/org/opendaylight/yangtools/yang/data/spi/tree/VersionTest.java index f4053455ff..93bd0b615f 100644 --- a/yang/yang-data-api/src/test/java/org/opendaylight/yangtools/yang/data/api/schema/tree/spi/VersionTest.java +++ b/data/yang-data-spi/src/test/java/org/opendaylight/yangtools/yang/data/spi/tree/VersionTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.yangtools.yang.data.api.schema.tree.spi; +package org.opendaylight.yangtools.yang.data.spi.tree; import static org.junit.Assert.assertFalse; diff --git a/features/odl-yangtools-data-api/pom.xml b/features/odl-yangtools-data-api/pom.xml index 7a1643cc82..10bfcec358 100644 --- a/features/odl-yangtools-data-api/pom.xml +++ b/features/odl-yangtools-data-api/pom.xml @@ -46,6 +46,10 @@ org.opendaylight.yangtools yang-data-api + + org.opendaylight.yangtools + yang-data-spi + org.opendaylight.yangtools yang-data-util diff --git a/features/pom.xml b/features/pom.xml index fe9130115e..47424f94b1 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -22,6 +22,11 @@ 7.0.0-SNAPSHOT pom + + true + true + + odl-yangtools-codec diff --git a/pom.xml b/pom.xml index db1037bda7..52b82bf5c5 100644 --- a/pom.xml +++ b/pom.xml @@ -42,6 +42,7 @@ benchmarks bundle-parent common + data plugin tools diff --git a/yang/yang-data-api/src/main/java/module-info.java b/yang/yang-data-api/src/main/java/module-info.java index 03b919b440..94e9e9ecc9 100644 --- a/yang/yang-data-api/src/main/java/module-info.java +++ b/yang/yang-data-api/src/main/java/module-info.java @@ -11,7 +11,6 @@ module org.opendaylight.yangtools.yang.data.api { exports org.opendaylight.yangtools.yang.data.api.schema; exports org.opendaylight.yangtools.yang.data.api.schema.stream; exports org.opendaylight.yangtools.yang.data.api.schema.tree; - exports org.opendaylight.yangtools.yang.data.api.schema.tree.spi; requires transitive org.opendaylight.yangtools.yang.common; requires transitive org.opendaylight.yangtools.yang.model.api; diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml index fe38e70994..308da5aa17 100644 --- a/yang/yang-data-impl/pom.xml +++ b/yang/yang-data-impl/pom.xml @@ -52,6 +52,10 @@ org.opendaylight.yangtools yang-data-api + + org.opendaylight.yangtools + yang-data-spi + org.opendaylight.yangtools yang-data-util diff --git a/yang/yang-data-impl/src/main/java/module-info.java b/yang/yang-data-impl/src/main/java/module-info.java index 4f174a1c3b..514a53a007 100644 --- a/yang/yang-data-impl/src/main/java/module-info.java +++ b/yang/yang-data-impl/src/main/java/module-info.java @@ -28,6 +28,7 @@ module org.opendaylight.yangtools.yang.data.impl { requires org.opendaylight.yangtools.util; requires org.opendaylight.yangtools.rfc8528.data.util; requires org.opendaylight.yangtools.yang.common; + requires org.opendaylight.yangtools.yang.data.spi; requires org.opendaylight.yangtools.yang.model.spi; requires org.slf4j; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapNodeBuilder.java index 5a7f797166..8342fb99ca 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapNodeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableMapNodeBuilder.java @@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.SystemMapNode; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.nodes.AbstractImmutableNormalizedNode; +import org.opendaylight.yangtools.yang.data.spi.node.AbstractNormalizedNode; public class ImmutableMapNodeBuilder implements CollectionNodeBuilder { private static final int DEFAULT_CAPACITY = 4; @@ -105,7 +105,7 @@ public class ImmutableMapNodeBuilder implements CollectionNodeBuilder + protected static final class ImmutableMapNode extends AbstractNormalizedNode implements SystemMapNode { private final @NonNull Map children; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUnkeyedListNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUnkeyedListNodeBuilder.java index a32930dc6c..e6ae5a9ea4 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUnkeyedListNodeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUnkeyedListNodeBuilder.java @@ -19,8 +19,8 @@ import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeContainerBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.nodes.AbstractImmutableNormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.nodes.AbstractImmutableNormalizedValueNode; +import org.opendaylight.yangtools.yang.data.spi.node.AbstractNormalizedNode; public class ImmutableUnkeyedListNodeBuilder implements CollectionNodeBuilder { private List value; @@ -117,7 +117,7 @@ public class ImmutableUnkeyedListNodeBuilder implements CollectionNodeBuilder implements UnkeyedListNode { + extends AbstractNormalizedNode implements UnkeyedListNode { protected EmptyImmutableUnkeyedListNode(final NodeIdentifier nodeIdentifier) { super(nodeIdentifier); } diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUserLeafSetNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUserLeafSetNodeBuilder.java index 155fb2cff0..eb2c965d17 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUserLeafSetNodeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUserLeafSetNodeBuilder.java @@ -21,7 +21,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.UserLeafSetNode; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.nodes.AbstractImmutableNormalizedNode; +import org.opendaylight.yangtools.yang.data.spi.node.AbstractNormalizedNode; public class ImmutableUserLeafSetNodeBuilder implements ListNodeBuilder> { private Map> value; @@ -102,7 +102,7 @@ public class ImmutableUserLeafSetNodeBuilder implements ListNodeBuilder - extends AbstractImmutableNormalizedNode> + extends AbstractNormalizedNode> implements UserLeafSetNode { private final Map> children; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUserMapNodeBuilder.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUserMapNodeBuilder.java index 99d6dd3f1d..41e3b3a5e7 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUserMapNodeBuilder.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/builder/impl/ImmutableUserMapNodeBuilder.java @@ -21,7 +21,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.UserMapNode; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeContainerBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.nodes.AbstractImmutableNormalizedNode; +import org.opendaylight.yangtools.yang.data.spi.node.AbstractNormalizedNode; public class ImmutableUserMapNodeBuilder implements CollectionNodeBuilder { private static final int DEFAULT_CAPACITY = 4; @@ -124,7 +124,7 @@ public class ImmutableUserMapNodeBuilder implements CollectionNodeBuilder implements UserMapNode { + extends AbstractNormalizedNode implements UserMapNode { private final Map children; ImmutableUserMapNode(final NodeIdentifier nodeIdentifier, diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableDataContainerNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableDataContainerNode.java index 3394effafb..7b56186652 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableDataContainerNode.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableDataContainerNode.java @@ -13,9 +13,10 @@ import org.opendaylight.yangtools.util.ImmutableOffsetMap; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerNode; +import org.opendaylight.yangtools.yang.data.spi.node.AbstractNormalizedNode; public abstract class AbstractImmutableDataContainerNode> - extends AbstractImmutableNormalizedNode implements DataContainerNode { + extends AbstractNormalizedNode implements DataContainerNode { private final Map children; protected AbstractImmutableDataContainerNode(final Map children, final K nodeIdentifier) { diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueNode.java index ee0acab5b9..62bfb596d9 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueNode.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/nodes/AbstractImmutableNormalizedValueNode.java @@ -12,9 +12,10 @@ import static java.util.Objects.requireNonNull; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +import org.opendaylight.yangtools.yang.data.spi.node.AbstractNormalizedNode; public abstract class AbstractImmutableNormalizedValueNode - extends AbstractImmutableNormalizedNode { + extends AbstractNormalizedNode { private final @NonNull V value; protected AbstractImmutableNormalizedValueNode(final K nodeIdentifier, final @NonNull V value) { diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeTip.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeTip.java index 40c08b5b5c..e3a144afd7 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeTip.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractDataTreeTip.java @@ -17,7 +17,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateTip import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeTip; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; abstract class AbstractDataTreeTip implements DataTreeTip { /** diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java index 8b0f48654e..487abc1355 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractModifiedNodeBasedCandidateNode.java @@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNodes; import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; abstract class AbstractModifiedNodeBasedCandidateNode implements DataTreeCandidateNode { private final ModifiedNode mod; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractNodeContainerModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractNodeContainerModificationStrategy.java index f168b1c10d..82279408cd 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractNodeContainerModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractNodeContainerModificationStrategy.java @@ -27,11 +27,11 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailed import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType; import org.opendaylight.yangtools.yang.data.api.schema.tree.ModifiedNodeDoesNotExistException; import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.MutableTreeNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNodeFactory; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeContainerBuilder; +import org.opendaylight.yangtools.yang.data.spi.tree.MutableTreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNodeFactory; +import org.opendaylight.yangtools.yang.data.spi.tree.Version; import org.opendaylight.yangtools.yang.model.api.DocumentedNode.WithStatus; abstract class AbstractNodeContainerModificationStrategy diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractReadyIterator.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractReadyIterator.java index ad3913251e..73aabcd2df 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractReadyIterator.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractReadyIterator.java @@ -12,7 +12,7 @@ import static java.util.Objects.requireNonNull; import java.util.Collection; import java.util.Iterator; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; +import org.opendaylight.yangtools.yang.data.spi.tree.Version; abstract class AbstractReadyIterator { final Iterator children; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractValidation.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractValidation.java index 620a6c1db2..484ed3a206 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractValidation.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AbstractValidation.java @@ -16,8 +16,8 @@ import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.Version; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AugmentationModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AugmentationModificationStrategy.java index b1c7076b4b..4f0d1d944a 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AugmentationModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AugmentationModificationStrategy.java @@ -11,10 +11,10 @@ import java.util.Optional; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableAugmentationNodeBuilder; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.Version; import org.opendaylight.yangtools.yang.data.util.DataSchemaContextNode; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AutomaticLifecycleMixin.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AutomaticLifecycleMixin.java index 0686502246..4669954cb5 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AutomaticLifecycleMixin.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/AutomaticLifecycleMixin.java @@ -13,9 +13,9 @@ import java.util.Optional; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodeContainer; import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNodeFactory; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNodeFactory; +import org.opendaylight.yangtools.yang.data.spi.tree.Version; /** * Mixin-type support class for subclasses of {@link ModificationApplyOperation} which need to provide automatic diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ChoiceModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ChoiceModificationStrategy.java index c213c5c53d..c2f128dbed 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ChoiceModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ChoiceModificationStrategy.java @@ -28,11 +28,11 @@ import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableChoiceNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.tree.AbstractNodeContainerModificationStrategy.Visible; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.Version; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ContainerModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ContainerModificationStrategy.java index 7cc8dbbb0e..6dabc80544 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ContainerModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ContainerModificationStrategy.java @@ -14,9 +14,9 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.Version; import org.opendaylight.yangtools.yang.model.api.ContainerLike; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/DataTreeState.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/DataTreeState.java index 522b402efd..7b2cf82a3b 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/DataTreeState.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/DataTreeState.java @@ -12,7 +12,7 @@ import static java.util.Objects.requireNonNull; import com.google.common.base.MoreObjects; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; /** diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTree.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTree.java index 1078f74b17..ce5d13cbd2 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTree.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTree.java @@ -20,7 +20,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; import org.opendaylight.yangtools.yang.data.util.DataSchemaContextNode; import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree; import org.opendaylight.yangtools.yang.model.api.ContainerLike; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeCandidate.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeCandidate.java index c2f7d8ca96..9e260b5b74 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeCandidate.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeCandidate.java @@ -11,7 +11,7 @@ import com.google.common.base.MoreObjects; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; final class InMemoryDataTreeCandidate extends AbstractDataTreeCandidate { diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeFactory.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeFactory.java index d7b0147ba7..763cdb3a2d 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeFactory.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeFactory.java @@ -26,10 +26,10 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguratio import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeFactory; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNodeFactory; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNodeFactory; +import org.opendaylight.yangtools.yang.data.spi.tree.Version; import org.opendaylight.yangtools.yang.data.util.DataSchemaContextNode; import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree; import org.opendaylight.yangtools.yang.model.api.ContainerLike; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeModification.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeModification.java index fdbf84491c..708189a692 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeModification.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeModification.java @@ -23,8 +23,8 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes; import org.opendaylight.yangtools.yang.data.api.schema.tree.CursorAwareDataTreeModification; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModificationCursor; import org.opendaylight.yangtools.yang.data.api.schema.tree.StoreTreeNodes; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.Version; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider; import org.slf4j.Logger; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeSnapshot.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeSnapshot.java index 344188682b..ad8ff60750 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeSnapshot.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/InMemoryDataTreeSnapshot.java @@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes; import org.opendaylight.yangtools.yang.data.api.schema.tree.CursorAwareDataTreeSnapshot; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshotCursor; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextProvider; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ListModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ListModificationStrategy.java index f3f156372c..ccf5eef0fc 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ListModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ListModificationStrategy.java @@ -16,14 +16,14 @@ import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration; import org.opendaylight.yangtools.yang.data.api.schema.tree.IncorrectDataStructureException; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.MutableTreeNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNodeFactory; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeContainerBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableUnkeyedListEntryNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableUnkeyedListNodeBuilder; +import org.opendaylight.yangtools.yang.data.spi.tree.MutableTreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNodeFactory; +import org.opendaylight.yangtools.yang.data.spi.tree.Version; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; final class ListModificationStrategy extends SchemaAwareApplyOperation { diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MandatoryLeafEnforcer.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MandatoryLeafEnforcer.java index 98b1412e8c..8b2d4da6a7 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MandatoryLeafEnforcer.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MandatoryLeafEnforcer.java @@ -20,7 +20,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration; import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MapEntryModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MapEntryModificationStrategy.java index dceff2df2e..c386925488 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MapEntryModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MapEntryModificationStrategy.java @@ -15,9 +15,9 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableMapEntryNodeBuilder; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.Version; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; class MapEntryModificationStrategy extends DataNodeContainerModificationStrategy { diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MapModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MapModificationStrategy.java index edb1ff4861..373c90c455 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MapModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/MapModificationStrategy.java @@ -18,12 +18,12 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.SystemMapNode; import org.opendaylight.yangtools.yang.data.api.schema.UserMapNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableMapNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableUserMapNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.tree.AbstractNodeContainerModificationStrategy.Invisible; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.Version; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; final class MapModificationStrategy extends Invisible { diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModificationApplyOperation.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModificationApplyOperation.java index a9a944801c..72426bfde9 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModificationApplyOperation.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModificationApplyOperation.java @@ -14,8 +14,8 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException; import org.opendaylight.yangtools.yang.data.api.schema.tree.StoreTreeNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.Version; /** * An operation responsible for applying {@link ModifiedNode} on tree. The operation is a hierachical composite - diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java index 735418ee59..bd5543e50e 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModifiedNode.java @@ -24,9 +24,9 @@ import org.opendaylight.yangtools.yang.data.api.schema.DistinctNodeContainer; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType; import org.opendaylight.yangtools.yang.data.api.schema.tree.StoreTreeNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNodeFactory; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNodeFactory; +import org.opendaylight.yangtools.yang.data.spi.tree.Version; /** * Node Modification Node and Tree. diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/NodeModification.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/NodeModification.java index b652aff437..67aeefc10a 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/NodeModification.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/NodeModification.java @@ -11,7 +11,7 @@ import java.util.Collection; import java.util.Optional; import org.opendaylight.yangtools.concepts.Identifiable; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; /** * Internal interface representing a modification action of a particular node. diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/NoopDataTreeCandidate.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/NoopDataTreeCandidate.java index 4d4c565b10..08f1c42d84 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/NoopDataTreeCandidate.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/NoopDataTreeCandidate.java @@ -19,7 +19,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; /** * Internal utility class for an empty candidate. We instantiate this class diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/OperationWithModification.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/OperationWithModification.java index 9bb551b78e..bb067c04a9 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/OperationWithModification.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/OperationWithModification.java @@ -12,8 +12,8 @@ import static java.util.Objects.requireNonNull; import java.util.Optional; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.Version; final class OperationWithModification { private final ModificationApplyOperation applyOperation; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/SchemaAwareApplyOperation.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/SchemaAwareApplyOperation.java index 1994fa13e4..3c28ba11aa 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/SchemaAwareApplyOperation.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/SchemaAwareApplyOperation.java @@ -26,8 +26,8 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguratio import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException; import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType; import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.Version; import org.opendaylight.yangtools.yang.model.api.AnydataSchemaNode; import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/StructuralContainerModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/StructuralContainerModificationStrategy.java index d3a418ee98..ab99537499 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/StructuralContainerModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/StructuralContainerModificationStrategy.java @@ -10,9 +10,9 @@ package org.opendaylight.yangtools.yang.data.impl.schema.tree; import java.util.Optional; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.Version; import org.opendaylight.yangtools.yang.model.api.ContainerLike; /** diff --git a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ValueNodeModificationStrategy.java b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ValueNodeModificationStrategy.java index a45c959846..97131b78ea 100644 --- a/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ValueNodeModificationStrategy.java +++ b/yang/yang-data-impl/src/main/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ValueNodeModificationStrategy.java @@ -17,9 +17,9 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.IncorrectDataStructureException; import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNodeFactory; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNodeFactory; +import org.opendaylight.yangtools.yang.data.spi.tree.Version; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; final class ValueNodeModificationStrategy diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModificationMetadataTreeTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModificationMetadataTreeTest.java index 5f8a277023..5dae30e6e3 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModificationMetadataTreeTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/ModificationMetadataTreeTest.java @@ -27,10 +27,10 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNodeFactory; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNodeFactory; +import org.opendaylight.yangtools.yang.data.spi.tree.Version; import org.opendaylight.yangtools.yang.model.api.SchemaContext; /* diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/StoreTreeNodesTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/StoreTreeNodesTest.java index c9a50468a8..502b3741d7 100644 --- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/StoreTreeNodesTest.java +++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/schema/tree/StoreTreeNodesTest.java @@ -27,10 +27,10 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration; import org.opendaylight.yangtools.yang.data.api.schema.tree.StoreTreeNodes; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.TreeNodeFactory; -import org.opendaylight.yangtools.yang.data.api.schema.tree.spi.Version; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNode; +import org.opendaylight.yangtools.yang.data.spi.tree.TreeNodeFactory; +import org.opendaylight.yangtools.yang.data.spi.tree.Version; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -- 2.36.6