From 8b4bd5a34b0f72920de73f57e885a8158cc9a666 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 29 Dec 2022 21:11:15 +0100 Subject: [PATCH] Migrate getResult()/getErrors() callers These are deprecated, migrate their users. Change-Id: I069d6e535ba1edcbd56f8ef2953db351c9837140 Signed-off-by: Robert Varga --- .../actors/NetconfDataTreeServiceActor.java | 39 +++++++------------ .../impl/actors/NetconfNodeActor.java | 7 ++-- .../singleton/impl/NetconfNodeActorTest.java | 12 +++--- .../sal/AbstractNetconfDataTreeService.java | 4 +- ...NetconfRemoteSchemaYangSourceProvider.java | 8 ++-- .../connect/netconf/util/NetconfBaseOps.java | 4 +- 6 files changed, 32 insertions(+), 42 deletions(-) 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 923fe599c4..dff990f8d7 100644 --- 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> 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> 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> 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> 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 e9289499b1..b0599cc97e 100644 --- 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 1d9cd4a7e8..b29a4ce9b6 100644 --- 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 1c2012f5e3..90d95d5e27 100644 --- 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.builder(); for (ListenableFuture 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 e567d9d624..2bf994ceaa 100644 --- 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 schemaString = getSchemaFromRpc(id, input.getResult()); + if (input.errors().isEmpty()) { + final Optional 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 db6c2d32e4..d55b0ebc4a 100644 --- 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> extractData(final Optional path, final ListenableFuture 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()); } -- 2.36.6