This is an automated email from the ASF dual-hosted git repository. markap14 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nifi.git
commit f42d5e56fc1a11d0d8851ce3c642029df691b8bc Author: Bryan Bende <[email protected]> AuthorDate: Tue Sep 10 09:23:29 2019 -0400 NIFI-6582 Removing bucketId argument to be consistent with other commands This closes #3667. Signed-off-by: Mark Payne <[email protected]> --- .../toolkit/cli/impl/command/registry/flow/DiffFlowVersions.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/flow/DiffFlowVersions.java b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/flow/DiffFlowVersions.java index fc985d7..4ac8188 100644 --- a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/flow/DiffFlowVersions.java +++ b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/flow/DiffFlowVersions.java @@ -21,6 +21,7 @@ import org.apache.nifi.registry.client.FlowClient; import org.apache.nifi.registry.client.NiFiRegistryClient; import org.apache.nifi.registry.client.NiFiRegistryException; import org.apache.nifi.registry.diff.VersionedFlowDifference; +import org.apache.nifi.registry.flow.VersionedFlow; import org.apache.nifi.toolkit.cli.api.Context; import org.apache.nifi.toolkit.cli.impl.command.CommandOption; import org.apache.nifi.toolkit.cli.impl.command.registry.AbstractNiFiRegistryCommand; @@ -42,7 +43,6 @@ public class DiffFlowVersions extends AbstractNiFiRegistryCommand<VersionedFlowD @Override public void doInitialize(final Context context) { - addOption(CommandOption.BUCKET_ID.createOption()); addOption(CommandOption.FLOW_ID.createOption()); addOption(CommandOption.FLOW_VERSION_1.createOption()); addOption(CommandOption.FLOW_VERSION_2.createOption()); @@ -52,13 +52,14 @@ public class DiffFlowVersions extends AbstractNiFiRegistryCommand<VersionedFlowD public VersionedFlowDifferenceResult doExecute(final NiFiRegistryClient client, final Properties properties) throws IOException, NiFiRegistryException, ParseException { - final String bucketId = getRequiredArg(properties, CommandOption.BUCKET_ID); final String flowId = getRequiredArg(properties, CommandOption.FLOW_ID); final Integer version1 = getRequiredIntArg(properties, CommandOption.FLOW_VERSION_1); final Integer version2 = getRequiredIntArg(properties, CommandOption.FLOW_VERSION_2); final FlowClient flowClient = client.getFlowClient(); - final VersionedFlowDifference flowDifference = flowClient.diff(bucketId, flowId, version1, version2); + final VersionedFlow flow = flowClient.get(flowId); + + final VersionedFlowDifference flowDifference = flowClient.diff(flow.getBucketIdentifier(), flowId, version1, version2); return new VersionedFlowDifferenceResult(getResultType(properties), flowDifference); } }
