Migrate getResult()/getErrors() callers

These are deprecated, migrate their users.

Change-Id: I069d6e535ba1edcbd56f8ef2953db351c9837140
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfDataTreeServiceActor.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfDataTreeServiceActor.java
index 923fe599c45019cee734f3fc7a219e8197cf8029..dff990f8d74325225a74204526dd0ba47a0c03e9 100644 (file)
--- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfDataTreeServiceActor.java
+++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfDataTreeServiceActor.java
@@ -65,60 +65,51 @@ public final class NetconfDataTreeServiceActor extends UntypedAbstractActor {
 
     @Override
     public void onReceive(final Object message) {
-        if (message instanceof GetWithFieldsRequest) {
-            final GetWithFieldsRequest getRequest = (GetWithFieldsRequest) message;
+        if (message instanceof GetWithFieldsRequest getRequest) {
             final YangInstanceIdentifier path = getRequest.getPath();
             final ListenableFuture<Optional<NormalizedNode>> future = netconfService.get(
                     getRequest.getPath(), getRequest.getFields());
             context().stop(self());
             sendResult(future, path, sender(), self());
-        } else if (message instanceof GetRequest) {
-            final GetRequest getRequest = (GetRequest) message;
+        } else if (message instanceof GetRequest getRequest) {
             final YangInstanceIdentifier path = getRequest.getPath();
             final ListenableFuture<Optional<NormalizedNode>> future = netconfService.get(path);
             context().stop(self());
             sendResult(future, path, sender(), self());
-        } else if (message instanceof GetConfigWithFieldsRequest) {
-            final GetConfigWithFieldsRequest getConfigRequest = (GetConfigWithFieldsRequest) message;
+        } else if (message instanceof GetConfigWithFieldsRequest getConfigRequest) {
             final YangInstanceIdentifier path = getConfigRequest.getPath();
             final ListenableFuture<Optional<NormalizedNode>> future = netconfService.getConfig(
                     path, getConfigRequest.getFields());
             context().stop(self());
             sendResult(future, path, sender(), self());
-        } else if (message instanceof GetConfigRequest) {
-            final GetConfigRequest getConfigRequest = (GetConfigRequest) message;
+        } else if (message instanceof GetConfigRequest getConfigRequest) {
             final YangInstanceIdentifier path = getConfigRequest.getPath();
             final ListenableFuture<Optional<NormalizedNode>> future = netconfService.getConfig(path);
             context().stop(self());
             sendResult(future, path, sender(), self());
         } else if (message instanceof LockRequest) {
             invokeRpcCall(netconfService::lock, sender(), self());
-        } else if (message instanceof MergeEditConfigRequest) {
-            final MergeEditConfigRequest request = (MergeEditConfigRequest) message;
+        } else if (message instanceof MergeEditConfigRequest request) {
             netconfService.merge(
                 request.getStore(),
                 request.getNormalizedNodeMessage().getIdentifier(),
                 request.getNormalizedNodeMessage().getNode(),
                 Optional.ofNullable(request.getDefaultOperation()));
-        } else if (message instanceof ReplaceEditConfigRequest) {
-            final ReplaceEditConfigRequest request = (ReplaceEditConfigRequest) message;
+        } else if (message instanceof ReplaceEditConfigRequest request) {
             netconfService.replace(
                 request.getStore(),
                 request.getNormalizedNodeMessage().getIdentifier(),
                 request.getNormalizedNodeMessage().getNode(),
                 Optional.ofNullable(request.getDefaultOperation()));
-        } else if (message instanceof CreateEditConfigRequest) {
-            final CreateEditConfigRequest request = (CreateEditConfigRequest) message;
+        } else if (message instanceof CreateEditConfigRequest request) {
             netconfService.create(
                 request.getStore(),
                 request.getNormalizedNodeMessage().getIdentifier(),
                 request.getNormalizedNodeMessage().getNode(),
                 Optional.ofNullable(request.getDefaultOperation()));
-        } else if (message instanceof DeleteEditConfigRequest) {
-            final DeleteEditConfigRequest request = (DeleteEditConfigRequest) message;
+        } else if (message instanceof DeleteEditConfigRequest request) {
             netconfService.delete(request.getStore(), request.getPath());
-        } else if (message instanceof RemoveEditConfigRequest) {
-            final RemoveEditConfigRequest request = (RemoveEditConfigRequest) message;
+        } else if (message instanceof RemoveEditConfigRequest request) {
             netconfService.remove(request.getStore(), request.getPath());
         } else if (message instanceof CommitRequest) {
             submit(sender(), self());
@@ -147,10 +138,10 @@ public final class NetconfDataTreeServiceActor extends UntypedAbstractActor {
                     return;
                 }
                 NormalizedNodeMessage nodeMessageResp = null;
-                if (result.getResult() != null) {
-                    nodeMessageResp = new NormalizedNodeMessage(YangInstanceIdentifier.empty(), result.getResult());
+                if (result.value() != null) {
+                    nodeMessageResp = new NormalizedNodeMessage(YangInstanceIdentifier.empty(), result.value());
                 }
-                requester.tell(new InvokeRpcMessageReply(nodeMessageResp, result.getErrors()), self);
+                requester.tell(new InvokeRpcMessageReply(nodeMessageResp, result.errors()), self);
             }
 
             @Override
@@ -170,10 +161,10 @@ public final class NetconfDataTreeServiceActor extends UntypedAbstractActor {
                     return;
                 }
                 NormalizedNodeMessage nodeMessageResp = null;
-                if (rpcResult.getResult() != null) {
-                    nodeMessageResp = new NormalizedNodeMessage(YangInstanceIdentifier.empty(), rpcResult.getResult());
+                if (rpcResult.value() != null) {
+                    nodeMessageResp = new NormalizedNodeMessage(YangInstanceIdentifier.empty(), rpcResult.value());
                 }
-                requester.tell(new InvokeRpcMessageReply(nodeMessageResp, rpcResult.getErrors()), self);
+                requester.tell(new InvokeRpcMessageReply(nodeMessageResp, rpcResult.errors()), self);
             }
 
             @Override

diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfNodeActor.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfNodeActor.java
index e9289499b129220e3d5871f30ef11a8a2dc77e9c..b0599cc97e3436c79d0876041deea489dc70bb18 100644 (file)
--- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfNodeActor.java
+++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfNodeActor.java
@@ -253,11 +253,10 @@ public class NetconfNodeActor extends AbstractUntypedActor {
                     return;
                 }
                 NormalizedNodeMessage nodeMessageReply = null;
-                if (domRpcResult.getResult() != null) {
-                    nodeMessageReply = new NormalizedNodeMessage(YangInstanceIdentifier.empty(),
-                            domRpcResult.getResult());
+                if (domRpcResult.value() != null) {
+                    nodeMessageReply = new NormalizedNodeMessage(YangInstanceIdentifier.empty(), domRpcResult.value());
                 }
-                recipient.tell(new InvokeRpcMessageReply(nodeMessageReply, domRpcResult.getErrors()), getSelf());
+                recipient.tell(new InvokeRpcMessageReply(nodeMessageReply, domRpcResult.errors()), getSelf());
             }
 
             @Override

diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java
index 1d9cd4a7e812ed36e38f5128ef4beb1aaa21bd52..b29a4ce9b60cc95553d1fa351bc74c21faed41a2 100644 (file)
--- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java
+++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java
@@ -511,8 +511,8 @@ public class NetconfNodeActorTest extends AbstractBaseSchemasTest {
 
         result = slaveDomRPCService.invokeRpc(testQName, outputNode).get(2, TimeUnit.SECONDS);
 
-        assertEquals(outputNode, result.getResult());
-        assertTrue(result.getErrors().isEmpty());
+        assertEquals(outputNode, result.value());
+        assertTrue(result.errors().isEmpty());
 
         // RPC with response error.
 
@@ -521,8 +521,8 @@ public class NetconfNodeActorTest extends AbstractBaseSchemasTest {
 
         result = slaveDomRPCService.invokeRpc(testQName, outputNode).get(2, TimeUnit.SECONDS);
 
-        assertNull(result.getResult());
-        assertEquals(rpcError, result.getErrors().iterator().next());
+        assertNull(result.value());
+        assertEquals(rpcError, result.errors().iterator().next());
 
         // RPC with response output and error.
 
@@ -532,8 +532,8 @@ public class NetconfNodeActorTest extends AbstractBaseSchemasTest {
         final DOMRpcResult resultOutputError =
                 slaveDomRPCService.invokeRpc(testQName, outputNode).get(2, TimeUnit.SECONDS);
 
-        assertEquals(outputNode, resultOutputError.getResult());
-        assertEquals(rpcError, resultOutputError.getErrors().iterator().next());
+        assertEquals(outputNode, resultOutputError.value());
+        assertEquals(rpcError, resultOutputError.errors().iterator().next());
 
         // RPC failure.
         doReturn(FluentFutures.immediateFailedFluentFuture(new ClusteringRpcException("mock")))

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/AbstractNetconfDataTreeService.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/AbstractNetconfDataTreeService.java
index 1c2012f5e38a1888dd5d69f1b220a8457198d828..90d95d5e274135451eefcd5403117cbee745d712 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/AbstractNetconfDataTreeService.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/AbstractNetconfDataTreeService.java
@@ -236,7 +236,7 @@ public abstract class AbstractNetconfDataTreeService implements NetconfDataTreeS
         Futures.addCallback(result, new FutureCallback<>() {
             @Override
             public void onSuccess(final DOMRpcResult result) {
-                final var errors = result.getErrors();
+                final var errors = result.errors();
                 if (errors.isEmpty()) {
                     LOG.debug("{}: Unlock successful.", id);
                     return;
@@ -359,7 +359,7 @@ public abstract class AbstractNetconfDataTreeService implements NetconfDataTreeS
 
             final var builder = ImmutableList.<RpcError>builder();
             for (ListenableFuture<? extends DOMRpcResult> future : futures) {
-                builder.addAll(Futures.getDone(future).getErrors());
+                builder.addAll(Futures.getDone(future).errors());
             }
             return new DefaultDOMRpcResult(null, builder.build());
         }, MoreExecutors.directExecutor());

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java
index e567d9d62460843011b4c3906c4dfc5782615324..2bf994ceaa9beec96c54f4ba4d1d07b906447571 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/schema/NetconfRemoteSchemaYangSourceProvider.java
@@ -106,8 +106,8 @@ public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSource
         return Futures.transform(
             rpc.invokeRpc(NetconfMessageTransformUtil.GET_SCHEMA_QNAME, getSchemaRequest), input -> {
                 // Transform composite node to string schema representation and then to ASTSchemaSource.
-                if (input.getErrors().isEmpty()) {
-                    final Optional<String> schemaString = getSchemaFromRpc(id, input.getResult());
+                if (input.errors().isEmpty()) {
+                    final Optional<String> schemaString = getSchemaFromRpc(id, input.value());
                     checkState(schemaString.isPresent(),
                         "%s: Unexpected response to get-schema, schema not present in message for: %s", id,
                         sourceIdentifier);
@@ -117,10 +117,10 @@ public final class NetconfRemoteSchemaYangSourceProvider implements SchemaSource
                 }
 
                 LOG.warn("{}: YANG schema was not successfully retrieved for {}. Errors: {}", id, sourceIdentifier,
-                    input.getErrors());
+                    input.errors());
                 throw new IllegalStateException(String.format(
                     "%s: YANG schema was not successfully retrieved for %s. Errors: %s", id, sourceIdentifier,
-                    input.getErrors()));
+                    input.errors()));
             }, MoreExecutors.directExecutor());
     }
 

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java
index db6c2d32e49c30144bcedbeb7eb6d7f47ea3f62e..d55b0ebc4a84f0460194ae5cf68713b9e5699dee 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOps.java
@@ -258,9 +258,9 @@ public final class NetconfBaseOps {
     private ListenableFuture<Optional<NormalizedNode>> extractData(final Optional<YangInstanceIdentifier> path,
             final ListenableFuture<? extends DOMRpcResult> configRunning) {
         return Futures.transform(configRunning, result -> {
-            final var errors = result.getErrors();
+            final var errors = result.errors();
             checkArgument(errors.isEmpty(), "Unable to read data: %s, errors: %s", path, errors);
-            return transformer.selectFromDataStructure(((ContainerNode) result.getResult())
+            return transformer.selectFromDataStructure(result.value()
                 .getChildByArg(NetconfMessageTransformUtil.NETCONF_DATA_NODEID), path.orElseThrow());
         }, MoreExecutors.directExecutor());
     }