summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
1fff58d)
The two methods allowing an override of the deepest element have only a
single user, which is broken by their semantics. Deprecate them for
removal, so that we flush out anyone else still relying on them.
JIRA: YANGTOOLS-1389
Change-Id: I52e8bdebc5488d095645a7bfb45a5c9cf400ecb0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
* @return serialized normalized node for provided instance Id
*/
public static @NonNull NormalizedNode fromInstanceId(final SchemaContext ctx, final YangInstanceIdentifier id) {
* @return serialized normalized node for provided instance Id
*/
public static @NonNull NormalizedNode fromInstanceId(final SchemaContext ctx, final YangInstanceIdentifier id) {
- return fromInstanceId(ctx, id, Optional.empty());
+ return fromInstanceIdImpl(ctx, id, Optional.empty());
* @param deepestElement pre-built deepest child that will be inserted at the last path argument of provided
* instance identifier
* @return serialized normalized node for provided instance Id with overridden last child.
* @param deepestElement pre-built deepest child that will be inserted at the last path argument of provided
* instance identifier
* @return serialized normalized node for provided instance Id with overridden last child.
+ * @deprecated This method is a historic hack, which has only a single downstream user. It is scheduled for removal
+ * without a replacement.
+ @Deprecated(since = "7.0.12", forRemoval = true)
public static @NonNull NormalizedNode fromInstanceId(final SchemaContext ctx, final YangInstanceIdentifier id,
final NormalizedNode deepestElement) {
public static @NonNull NormalizedNode fromInstanceId(final SchemaContext ctx, final YangInstanceIdentifier id,
final NormalizedNode deepestElement) {
- return fromInstanceId(ctx, id, Optional.of(deepestElement));
+ return fromInstanceIdImpl(ctx, id, Optional.of(deepestElement));
* instance identifier
* @return serialized normalized node for provided instance Id with (optionally) overridden last child
* and (optionally) marked with specific operation attribute.
* instance identifier
* @return serialized normalized node for provided instance Id with (optionally) overridden last child
* and (optionally) marked with specific operation attribute.
+ * @deprecated This method is a historic hack, which has only a single downstream user. It is scheduled for removal
+ * without a replacement.
+ @Deprecated(since = "7.0.12", forRemoval = true)
public static @NonNull NormalizedNode fromInstanceId(final SchemaContext ctx, final YangInstanceIdentifier id,
final Optional<NormalizedNode> deepestElement) {
public static @NonNull NormalizedNode fromInstanceId(final SchemaContext ctx, final YangInstanceIdentifier id,
final Optional<NormalizedNode> deepestElement) {
+ return fromInstanceIdImpl(ctx, id, deepestElement);
+ }
+
+ private static @NonNull NormalizedNode fromInstanceIdImpl(final SchemaContext ctx, final YangInstanceIdentifier id,
+ final Optional<NormalizedNode> deepestElement) {
final PathArgument topLevelElement;
final InstanceIdToNodes<?> instanceIdToNodes;
final Iterator<PathArgument> it = id.getPathArguments().iterator();
final PathArgument topLevelElement;
final InstanceIdToNodes<?> instanceIdToNodes;
final Iterator<PathArgument> it = id.getPathArguments().iterator();
import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
private static final QName BAR = QName.create(ID, "bar");
private static final NodeIdentifier TWO_KEY_LIST = NodeIdentifier.create(QName.create(ID, "two-key-list"));
private static final QName BAR = QName.create(ID, "bar");
private static final NodeIdentifier TWO_KEY_LIST = NodeIdentifier.create(QName.create(ID, "two-key-list"));
- private static SchemaContext ctx;
+ private static EffectiveModelContext ctx;
private final NodeIdentifier rootContainer = new NodeIdentifier(QName.create(NS, REVISION, "test"));
private final NodeIdentifier outerContainer = new NodeIdentifier(QName.create(NS, REVISION, "outer-container"));
private final NodeIdentifier rootContainer = new NodeIdentifier(QName.create(NS, REVISION, "test"));
private final NodeIdentifier outerContainer = new NodeIdentifier(QName.create(NS, REVISION, "outer-container"));
+ @Deprecated(since = "7.0.12", forRemoval = true)
public void testInAugment() {
final LeafNode<?> leaf = Builders.leafBuilder().withNodeIdentifier(augmentedLeaf).withValue("").build();
final ContainerNode expectedFilter = Builders
public void testInAugment() {
final LeafNode<?> leaf = Builders.leafBuilder().withNodeIdentifier(augmentedLeaf).withValue("").build();
final ContainerNode expectedFilter = Builders
+ @Deprecated(since = "7.0.12", forRemoval = true)
public void testInAugmentLeafOverride() {
final LeafNode<Object> lastLeaf = Builders.leafBuilder().withNodeIdentifier(augmentedLeaf)
.withValue("randomValue").build();
public void testInAugmentLeafOverride() {
final LeafNode<Object> lastLeaf = Builders.leafBuilder().withNodeIdentifier(augmentedLeaf)
.withValue("randomValue").build();
+ @Deprecated(since = "7.0.12", forRemoval = true)
public void testListChoice() {
final LeafNode<?> leaf = Builders.leafBuilder().withNodeIdentifier(leafFromCase).withValue("").build();
final ContainerNode expectedFilter = Builders
public void testListChoice() {
final LeafNode<?> leaf = Builders.leafBuilder().withNodeIdentifier(leafFromCase).withValue("").build();
final ContainerNode expectedFilter = Builders
+ @Deprecated(since = "7.0.12", forRemoval = true)
public void testTopContainerLastChildOverride() {
final ContainerNode expectedStructure = Builders
.containerBuilder()
public void testTopContainerLastChildOverride() {
final ContainerNode expectedStructure = Builders
.containerBuilder()
.withChild(
Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(ID))
.withValue(1).build()).build();
.withChild(
Builders.leafBuilder().withNodeIdentifier(new NodeIdentifier(ID))
.withValue(1).build()).build();
- final MapNode lastChild = Builders.mapBuilder().withNodeIdentifier(this.outerList).withChild(outerListEntry)
+ final MapNode lastChild = Builders.mapBuilder().withNodeIdentifier(outerList).withChild(outerListEntry)
.build();
final ContainerNode expectedStructure = Builders.containerBuilder().withNodeIdentifier(rootContainer)
.withChild(lastChild).build();
.build();
final ContainerNode expectedStructure = Builders.containerBuilder().withNodeIdentifier(rootContainer)
.withChild(lastChild).build();