Apache/nifi
1
0
Fork 0
mirror of https://github.com/apache/nifi.git synced 2025-02-10 03:55:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIFI-14223 - pg-import fix NPE when inputSource not specified

Browse Source 
This closes #9686.

Signed-off-by: Chris Sampson <chris.sampson82@gmail.com>
This commit is contained in:
Pierre Villard 2025-02-03 13:06:40 +01:00 committed by Chris Sampson
parent 2ca59d71e6
commit a7bc0e5236
No known key found for this signature in database
GPG Key ID: 546AEB0826587237
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/pg/PGImport.java
View File

@ -80,6 +80,7 @@ public class PGImport extends AbstractNiFiCommand<StringResult> {
throws NiFiClientException, IOException, MissingOptionException { throws NiFiClientException, IOException, MissingOptionException {
final String inputSource = getArg(properties, CommandOption.INPUT_SOURCE); final String inputSource = getArg(properties, CommandOption.INPUT_SOURCE);
final boolean isInputSpecified = StringUtils.isNotBlank(inputSource);
final String bucketId = getArg(properties, CommandOption.BUCKET_ID); final String bucketId = getArg(properties, CommandOption.BUCKET_ID);
final String flowId = getArg(properties, CommandOption.FLOW_ID); final String flowId = getArg(properties, CommandOption.FLOW_ID);
@ -93,9 +94,9 @@ public class PGImport extends AbstractNiFiCommand<StringResult> {
final boolean posXExists = StringUtils.isNotBlank(posXStr); final boolean posXExists = StringUtils.isNotBlank(posXStr);
final boolean posYExists = StringUtils.isNotBlank(posYStr); final boolean posYExists = StringUtils.isNotBlank(posYStr);
final File input = new File(inputSource); final File input = isInputSpecified ? new File(inputSource) : null;
if (StringUtils.isBlank(inputSource)) { if (!isInputSpecified) {
if (StringUtils.isBlank(bucketId)) { if (StringUtils.isBlank(bucketId)) {
throw new IllegalArgumentException("Input path is not specified so Bucket ID must be specified"); throw new IllegalArgumentException("Input path is not specified so Bucket ID must be specified");
} }
@ -157,7 +158,7 @@ public class PGImport extends AbstractNiFiCommand<StringResult> {
final ProcessGroupClient pgClient = client.getProcessGroupClient(); final ProcessGroupClient pgClient = client.getProcessGroupClient();
ProcessGroupEntity createdEntity = null; ProcessGroupEntity createdEntity = null;
if (StringUtils.isBlank(inputSource)) { if (!isInputSpecified) {
// if a registry client is specified use it, otherwise see if there is only one // if a registry client is specified use it, otherwise see if there is only one
// available and use that, if more than one is available then throw an exception // available and use that, if more than one is available then throw an exception