From 10606a33e2c34bd15076bd605cf9c07261e760e4 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 27 Jan 2022 19:33:09 +0100 Subject: [PATCH] Migrate to Empty.value() Empty.getInstance() is deprecated for removal, use its replacement. Change-Id: I07d6796e8211fa1ef9a08bc8bc8826d66c1b7ec9 Signed-off-by: Robert Varga --- .../controller/eos/akka/AkkaEntityOwnershipService.java | 2 +- .../org/opendaylight/controller/eos/akka/bootstrap/EOSMain.java | 2 +- .../cluster/datastore/admin/ClusterAdminRpcService.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/opendaylight/md-sal/eos-dom-akka/src/main/java/org/opendaylight/controller/eos/akka/AkkaEntityOwnershipService.java b/opendaylight/md-sal/eos-dom-akka/src/main/java/org/opendaylight/controller/eos/akka/AkkaEntityOwnershipService.java index 9520b58d59..eb3844c0c7 100644 --- a/opendaylight/md-sal/eos-dom-akka/src/main/java/org/opendaylight/controller/eos/akka/AkkaEntityOwnershipService.java +++ b/opendaylight/md-sal/eos-dom-akka/src/main/java/org/opendaylight/controller/eos/akka/AkkaEntityOwnershipService.java @@ -282,7 +282,7 @@ public class AkkaEntityOwnershipService implements DOMEntityOwnershipService, Da future.setException(failure); } else { LOG.debug("{} DataCenter successful", op); - future.set(Empty.getInstance()); + future.set(Empty.value()); } }); return future; diff --git a/opendaylight/md-sal/eos-dom-akka/src/main/java/org/opendaylight/controller/eos/akka/bootstrap/EOSMain.java b/opendaylight/md-sal/eos-dom-akka/src/main/java/org/opendaylight/controller/eos/akka/bootstrap/EOSMain.java index dfe059a785..83d28823ad 100644 --- a/opendaylight/md-sal/eos-dom-akka/src/main/java/org/opendaylight/controller/eos/akka/bootstrap/EOSMain.java +++ b/opendaylight/md-sal/eos-dom-akka/src/main/java/org/opendaylight/controller/eos/akka/bootstrap/EOSMain.java @@ -74,7 +74,7 @@ public final class EOSMain extends AbstractBehavior { } private Behavior onTerminate(final Terminate request) { - request.getReplyTo().tell(Empty.getInstance()); + request.getReplyTo().tell(Empty.value()); return Behaviors.stopped(); } } \ No newline at end of file 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 e00d620d7c..1e2ee44277 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 @@ -127,7 +127,7 @@ public class ClusterAdminRpcService implements ClusterAdminService { private static final Logger LOG = LoggerFactory.getLogger(ClusterAdminRpcService.class); private static final @NonNull RpcResult LOCAL_SHARD_RESULT = RpcResultBuilder.success(new LocateShardOutputBuilder() - .setMemberNode(new LocalBuilder().setLocal(Empty.getInstance()).build()) + .setMemberNode(new LocalBuilder().setLocal(Empty.value()).build()) .build()) .build(); -- 2.36.6