From 33d4762518cbd392654569eb920a82073a9f787c Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 28 Apr 2020 09:09:28 +0200 Subject: [PATCH] Remove use of deprecated addAugmentation() The two-argument variant has been removed, do not use it. Change-Id: Iae92f7215994dd46f237284acd295eb37c5f2950 Signed-off-by: Robert Varga --- .../cluster/datastore/admin/ClusterAdminRpcService.java | 3 +-- .../md/sal/test/model/util/ListsBindingUtils.java | 8 +++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java b/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java index 6102db5348..b5fb0c1f99 100644 --- a/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java +++ b/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java @@ -105,7 +105,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin.rev151013.RemoveShardReplicaInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin.rev151013.RemoveShardReplicaOutput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin.rev151013.RemoveShardReplicaOutputBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin.rev151013.get.known.clients._for.all.shards.output.ShardResult1; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin.rev151013.get.known.clients._for.all.shards.output.ShardResult1Builder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin.rev151013.get.known.clients._for.all.shards.output.shard.result.KnownClients; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.cluster.admin.rev151013.get.known.clients._for.all.shards.output.shard.result.KnownClientsBuilder; @@ -674,7 +673,7 @@ public class ClusterAdminRpcService implements ClusterAdminService { final ShardResult sr = builder .setSucceeded(Boolean.TRUE) - .addAugmentation(ShardResult1.class, new ShardResult1Builder() + .addAugmentation(new ShardResult1Builder() .setKnownClients(reply.getClients().stream() .map(client -> new KnownClientsBuilder() .setMember(client.getFrontendId().getMemberName().toYang()) diff --git a/opendaylight/md-sal/sal-test-model/src/main/java/org/opendaylight/controller/md/sal/test/model/util/ListsBindingUtils.java b/opendaylight/md-sal/sal-test-model/src/main/java/org/opendaylight/controller/md/sal/test/model/util/ListsBindingUtils.java index 1f379fd262..726b2a6713 100644 --- a/opendaylight/md-sal/sal-test-model/src/main/java/org/opendaylight/controller/md/sal/test/model/util/ListsBindingUtils.java +++ b/opendaylight/md-sal/sal-test-model/src/main/java/org/opendaylight/controller/md/sal/test/model/util/ListsBindingUtils.java @@ -67,9 +67,11 @@ public final class ListsBindingUtils { } public static TopLevelList topLevelList(final TopLevelListKey key, final TreeComplexUsesAugment augment) { - TopLevelListBuilder builder = new TopLevelListBuilder().withKey(key); - builder.addAugmentation(TreeComplexUsesAugment.class, augment); - return builder.build(); + final TopLevelListBuilder builder = new TopLevelListBuilder(); + if (augment != null) { + builder.addAugmentation(augment); + } + return builder.withKey(key).build(); } public static TreeComplexUsesAugment complexUsesAugment(final ListViaUsesKey... keys) { -- 2.36.6