- final ControlBundleInput closeBundleInput = new ControlBundleInputBuilder().setNode(nodeRef)
- .setBundleId(bundleIdValue).setFlags(BUNDLE_FLAGS)
- .setType(BundleControlType.ONFBCTCLOSEREQUEST).build();
-
- final ControlBundleInput openBundleInput = new ControlBundleInputBuilder().setNode(nodeRef)
- .setBundleId(bundleIdValue).setFlags(BUNDLE_FLAGS)
- .setType(BundleControlType.ONFBCTOPENREQUEST).build();
-
- final AddBundleMessagesInput addBundleMessagesInput = new AddBundleMessagesInputBuilder()
- .setNode(nodeRef).setBundleId(bundleIdValue).setFlags(BUNDLE_FLAGS)
- .setMessages(createMessages(nodeRef)).build();
-
- ListenableFuture<RpcResult<ControlBundleOutput>> closeBundle = salBundleService
- .controlBundle(closeBundleInput);
-
- ListenableFuture<RpcResult<ControlBundleOutput>> openBundleMessagesFuture = Futures
- .transformAsync(closeBundle, rpcResult -> salBundleService
- .controlBundle(openBundleInput), MoreExecutors.directExecutor());
-
- ListenableFuture<RpcResult<AddBundleMessagesOutput>> addBundleMessagesFuture = Futures
- .transformAsync(openBundleMessagesFuture, rpcResult -> {
- if (rpcResult.isSuccessful()) {
- return salBundleService
- .addBundleMessages(addBundleMessagesInput);
- }
- return Futures.immediateFuture(null);
- }, MoreExecutors.directExecutor());
- BigInteger nodeId = getDpnIdFromNodeName(node);
+ final var openBundleMessagesFuture = Futures.transformAsync(
+ controlBundle.invoke(new ControlBundleInputBuilder()
+ .setNode(nodeRef)
+ .setBundleId(bundleIdValue)
+ .setFlags(BUNDLE_FLAGS)
+ .setType(BundleControlType.ONFBCTCLOSEREQUEST)
+ .build()),
+ rpcResult -> controlBundle.invoke(new ControlBundleInputBuilder()
+ .setNode(nodeRef)
+ .setBundleId(bundleIdValue)
+ .setFlags(BUNDLE_FLAGS)
+ .setType(BundleControlType.ONFBCTOPENREQUEST)
+ .build()), MoreExecutors.directExecutor());
+
+ final var addBundleMessagesFuture = Futures.transformAsync(openBundleMessagesFuture,
+ rpcResult -> rpcResult.isSuccessful()
+ ? addBundleMessages.invoke(new AddBundleMessagesInputBuilder()
+ .setNode(nodeRef)
+ .setBundleId(bundleIdValue)
+ .setFlags(BUNDLE_FLAGS)
+ .setMessages(createMessages(nodeRef))
+ .build())
+ : FluentFutures.immediateNullFluentFuture(), MoreExecutors.directExecutor());
+ final var nodeId = getDpnIdFromNodeName(node);