This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new c444f56e84 NIFI-14763 Replaced deprecated Lang3 StringUtils methods
with Strings (#10122)
c444f56e84 is described below
commit c444f56e84dbec9a3c154c7f5f63355ef96e80fc
Author: dan-s1 <[email protected]>
AuthorDate: Tue Jul 22 19:38:02 2025 -0400
NIFI-14763 Replaced deprecated Lang3 StringUtils methods with Strings
(#10122)
Signed-off-by: David Handermann <[email protected]>
---
.../nifi/c2/client/http/url/ProxyAwareC2UrlProvider.java | 4 ++--
.../apache/nifi/authorization/util/IdentityMappingUtil.java | 3 ++-
.../org/apache/nifi/processors/aws/s3/TestPutS3Object.java | 8 ++++----
.../processors/azure/data/explorer/PutAzureDataExplorer.java | 4 ++--
.../java/org/apache/nifi/processors/hadoop/FetchHDFS.java | 4 ++--
.../main/java/org/apache/nifi/processors/hadoop/GetHDFS.java | 4 ++--
.../java/org/apache/nifi/processors/hadoop/MoveHDFS.java | 4 ++--
.../java/org/apache/nifi/script/ScriptingComponentUtils.java | 3 ++-
.../apache/nifi/processors/standard/EvaluateJsonPath.java | 3 ++-
.../apache/nifi/processors/standard/HandleHttpRequest.java | 3 ++-
.../java/org/apache/nifi/processors/standard/InvokeHTTP.java | 3 ++-
.../java/org/apache/nifi/processors/standard/SplitJson.java | 4 ++--
.../nifi/processors/standard/servlets/ListenHTTPServlet.java | 3 ++-
.../apache/nifi/processors/standard/TestUnpackContent.java | 5 +++--
.../main/java/org/apache/nifi/dbcp/DBCPConnectionPool.java | 3 ++-
.../apache/nifi/processors/attributes/UpdateAttribute.java | 11 ++++++-----
.../org/apache/nifi/update/attributes/api/RuleResource.java | 4 ++--
.../coordination/http/endpoints/ParameterProviderMerger.java | 4 ++--
.../org/apache/nifi/parameter/StandardParameterContext.java | 4 ++--
.../org/apache/nifi/controller/AbstractComponentNode.java | 5 +++--
.../cluster/leader/zookeeper/CuratorACLProviderFactory.java | 3 ++-
.../java/org/apache/nifi/web/StandardNiFiServiceFacade.java | 5 ++---
.../src/main/java/org/apache/nifi/web/api/FlowResource.java | 3 ++-
.../apache/nifi/web/controller/ControllerSearchService.java | 4 ++--
.../nifi/web/search/attributematchers/AttributeMatcher.java | 4 ++--
.../web/search/attributematchers/BackPressureMatcher.java | 4 ++--
.../nifi/web/search/attributematchers/ExecutionMatcher.java | 4 ++--
.../nifi/web/search/attributematchers/ExpirationMatcher.java | 4 ++--
.../search/attributematchers/PortScheduledStateMatcher.java | 10 +++++-----
.../nifi/web/search/attributematchers/PropertyMatcher.java | 4 ++--
.../web/search/attributematchers/ScheduledStateMatcher.java | 12 ++++++------
.../nifi/web/search/attributematchers/SchedulingMatcher.java | 6 +++---
.../search/attributematchers/TransmissionStatusMatcher.java | 4 ++--
.../security/jwt/resolver/StandardBearerTokenResolver.java | 6 +++---
.../nifi/registry/properties/NiFiRegistryProperties.java | 3 ++-
.../nifi/registry/properties/util/IdentityMappingUtil.java | 3 ++-
.../cli/impl/command/nifi/policies/UpdateAccessPolicy.java | 5 +++--
.../cli/impl/command/registry/flow/ImportAllFlows.java | 4 ++--
38 files changed, 94 insertions(+), 80 deletions(-)
diff --git
a/c2/c2-client-bundle/c2-client-http/src/main/java/org/apache/nifi/c2/client/http/url/ProxyAwareC2UrlProvider.java
b/c2/c2-client-bundle/c2-client-http/src/main/java/org/apache/nifi/c2/client/http/url/ProxyAwareC2UrlProvider.java
index fcb440081e..e05ce714a0 100644
---
a/c2/c2-client-bundle/c2-client-http/src/main/java/org/apache/nifi/c2/client/http/url/ProxyAwareC2UrlProvider.java
+++
b/c2/c2-client-bundle/c2-client-http/src/main/java/org/apache/nifi/c2/client/http/url/ProxyAwareC2UrlProvider.java
@@ -17,12 +17,12 @@
package org.apache.nifi.c2.client.http.url;
-import static org.apache.commons.lang3.StringUtils.appendIfMissing;
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.stripStart;
import java.util.Optional;
import okhttp3.HttpUrl;
+import org.apache.commons.lang3.Strings;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,7 +39,7 @@ public class ProxyAwareC2UrlProvider implements C2UrlProvider
{
ProxyAwareC2UrlProvider(String c2RestPathBase, String c2RestPathHeartbeat,
String c2RestPathAcknowledge) {
this.c2RestPathBase = Optional.ofNullable(c2RestPathBase)
.filter(StringUtils::isNotBlank)
- .map(apiBase -> appendIfMissing(apiBase, SLASH)) // trailing slash
needs to be added for proper URL creation
+ .map(apiBase -> Strings.CS.appendIfMissing(apiBase, SLASH)) //
trailing slash needs to be added for proper URL creation
.map(HttpUrl::parse)
.orElseThrow(() -> new IllegalArgumentException("Parameter
c2RestPathBase should not be null or empty and should be a valid URL"));
this.c2RestPathHeartbeat = toAbsoluteUrl(c2RestPathHeartbeat)
diff --git
a/nifi-commons/nifi-security-identity/src/main/java/org/apache/nifi/authorization/util/IdentityMappingUtil.java
b/nifi-commons/nifi-security-identity/src/main/java/org/apache/nifi/authorization/util/IdentityMappingUtil.java
index b4fd0ac779..38a83bdf32 100644
---
a/nifi-commons/nifi-security-identity/src/main/java/org/apache/nifi/authorization/util/IdentityMappingUtil.java
+++
b/nifi-commons/nifi-security-identity/src/main/java/org/apache/nifi/authorization/util/IdentityMappingUtil.java
@@ -17,6 +17,7 @@
package org.apache.nifi.authorization.util;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.authorization.util.IdentityMapping.Transform;
import org.apache.nifi.util.NiFiProperties;
import org.slf4j.Logger;
@@ -78,7 +79,7 @@ public class IdentityMappingUtil {
// go through each property
for (String propertyName : properties.getPropertyKeys()) {
- if (StringUtils.startsWith(propertyName, patternPrefix)) {
+ if (Strings.CS.startsWith(propertyName, patternPrefix)) {
final String key = StringUtils.substringAfter(propertyName,
patternPrefix);
final String identityPattern =
properties.getProperty(propertyName);
diff --git
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestPutS3Object.java
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestPutS3Object.java
index de42e4cc20..13d43c20ee 100644
---
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestPutS3Object.java
+++
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/s3/TestPutS3Object.java
@@ -35,7 +35,7 @@ import com.amazonaws.services.s3.model.PutObjectRequest;
import com.amazonaws.services.s3.model.PutObjectResult;
import com.amazonaws.services.s3.model.StorageClass;
import com.amazonaws.services.s3.model.Tag;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.components.AllowableValue;
import org.apache.nifi.fileresource.service.api.FileResource;
import org.apache.nifi.fileresource.service.api.FileResourceService;
@@ -289,12 +289,12 @@ public class TestPutS3Object {
public void testPersistenceFileLocationWithDefaultTempDir() {
String dir = System.getProperty("java.io.tmpdir");
- executePersistenceFileLocationTest(StringUtils.appendIfMissing(dir,
File.separator) + putS3Object.getIdentifier());
+ executePersistenceFileLocationTest(Strings.CS.appendIfMissing(dir,
File.separator) + putS3Object.getIdentifier());
}
@Test
public void
testPersistenceFileLocationWithUserDefinedDirWithEndingSeparator() {
- String dir = StringUtils.appendIfMissing(new
File("target").getAbsolutePath(), File.separator);
+ String dir = Strings.CS.appendIfMissing(new
File("target").getAbsolutePath(), File.separator);
runner.setProperty(PutS3Object.MULTIPART_TEMP_DIR, dir);
executePersistenceFileLocationTest(dir + putS3Object.getIdentifier());
@@ -302,7 +302,7 @@ public class TestPutS3Object {
@Test
public void
testPersistenceFileLocationWithUserDefinedDirWithoutEndingSeparator() {
- String dir = StringUtils.removeEnd(new
File("target").getAbsolutePath(), File.separator);
+ String dir = Strings.CS.removeEnd(new
File("target").getAbsolutePath(), File.separator);
runner.setProperty(PutS3Object.MULTIPART_TEMP_DIR, dir);
executePersistenceFileLocationTest(dir + File.separator +
putS3Object.getIdentifier());
diff --git
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/data/explorer/PutAzureDataExplorer.java
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/data/explorer/PutAzureDataExplorer.java
index 01175a913c..1aa43754fa 100644
---
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/data/explorer/PutAzureDataExplorer.java
+++
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/data/explorer/PutAzureDataExplorer.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.processors.azure.data.explorer;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.Tags;
@@ -240,7 +240,7 @@ public class PutAzureDataExplorer extends AbstractProcessor
{
} else if (result == KustoIngestionResult.PARTIALLY_SUCCEEDED) {
getLogger().warn("Ingest {} for {}", result.getStatus(),
flowFile);
flowFile = session.putAttribute(flowFile, "ingestion_status",
KustoIngestionResult.PARTIALLY_SUCCEEDED.getStatus());
- if
(StringUtils.equalsIgnoreCase(partiallySucceededRoutingStrategy,
SUCCESS.getName())) {
+ if (Strings.CI.equals(partiallySucceededRoutingStrategy,
SUCCESS.getName())) {
transferRelationship = SUCCESS;
}
}
diff --git
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/FetchHDFS.java
b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/FetchHDFS.java
index f0f1d4e43d..34cc349c4a 100644
---
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/FetchHDFS.java
+++
b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/FetchHDFS.java
@@ -17,7 +17,7 @@
package org.apache.nifi.processors.hadoop;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -173,7 +173,7 @@ public class FetchHDFS extends AbstractHadoopProcessor {
// Check if compression codec is defined (inferred or
otherwise)
if (codec != null) {
stream = codec.createInputStream(stream);
- outputFilename = StringUtils.removeEnd(originalFilename,
codec.getDefaultExtension());
+ outputFilename = Strings.CS.removeEnd(originalFilename,
codec.getDefaultExtension());
} else {
outputFilename = originalFilename;
}
diff --git
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFS.java
b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFS.java
index ed6ae26b8a..244467cdd5 100644
---
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFS.java
+++
b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/GetHDFS.java
@@ -17,7 +17,7 @@
package org.apache.nifi.processors.hadoop;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileStatus;
@@ -375,7 +375,7 @@ public class GetHDFS extends AbstractHadoopProcessor {
// Check if compression codec is defined (inferred or
otherwise)
if (codec != null) {
stream = codec.createInputStream(stream);
- outputFilename = StringUtils.removeEnd(originalFilename,
codec.getDefaultExtension());
+ outputFilename = Strings.CS.removeEnd(originalFilename,
codec.getDefaultExtension());
} else {
outputFilename = originalFilename;
}
diff --git
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/MoveHDFS.java
b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/MoveHDFS.java
index 120c9be421..1c41b0494a 100644
---
a/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/MoveHDFS.java
+++
b/nifi-extension-bundles/nifi-hadoop-bundle/nifi-hdfs-processors/src/main/java/org/apache/nifi/processors/hadoop/MoveHDFS.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.processors.hadoop;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
@@ -438,7 +438,7 @@ public class MoveHDFS extends AbstractHadoopProcessor {
flowFile = session.putAttribute(flowFile,
ABSOLUTE_HDFS_PATH_ATTRIBUTE, hdfsPath);
final Path qualifiedPath =
newFile.makeQualified(hdfs.getUri(), hdfs.getWorkingDirectory());
flowFile = session.putAttribute(flowFile,
HADOOP_FILE_URL_ATTRIBUTE, qualifiedPath.toString());
- final String transitUri = hdfs.getUri() +
StringUtils.prependIfMissing(outputPath, "/");
+ final String transitUri = hdfs.getUri() +
Strings.CS.prependIfMissing(outputPath, "/");
session.getProvenanceReporter().send(flowFile, transitUri);
session.transfer(flowFile, REL_SUCCESS);
diff --git
a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentUtils.java
b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentUtils.java
index c8da51a69b..d621f75207 100644
---
a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentUtils.java
+++
b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/script/ScriptingComponentUtils.java
@@ -18,6 +18,7 @@ package org.apache.nifi.script;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.Validator;
import org.apache.nifi.components.resource.ResourceCardinality;
@@ -107,7 +108,7 @@ public class ScriptingComponentUtils {
while (scanner.hasNextLine()) {
final String line = scanner.nextLine();
- if (StringUtils.containsIgnoreCase(line, term)) {
+ if (Strings.CI.contains(line, term)) {
final String text = String.format("Matched script at line %d:
%s", index, line);
results.add(new
SearchResult.Builder().label(text).match(term).build());
}
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java
index ac80af3da3..6bdcb8b6ba 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/EvaluateJsonPath.java
@@ -22,6 +22,7 @@ import com.jayway.jsonpath.InvalidJsonException;
import com.jayway.jsonpath.JsonPath;
import com.jayway.jsonpath.PathNotFoundException;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.annotation.behavior.DynamicProperty;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
@@ -216,7 +217,7 @@ public class EvaluateJsonPath extends
AbstractJsonPathProcessor {
@Override
public void onPropertyModified(PropertyDescriptor descriptor, String
oldValue, String newValue) {
- if (descriptor.isDynamic() && !StringUtils.equals(oldValue, newValue)
&& oldValue != null) {
+ if (descriptor.isDynamic() && !Strings.CS.equals(oldValue, newValue)
&& oldValue != null) {
cachedJsonPathMap.remove(oldValue);
}
}
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java
index ccdfb6c993..98675d99f9 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpRequest.java
@@ -26,6 +26,7 @@ import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.Part;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
import org.apache.nifi.annotation.behavior.WritesAttribute;
@@ -612,7 +613,7 @@ public class HandleHttpRequest extends AbstractProcessor {
final long start = System.nanoTime();
final HttpServletRequest request = container.getRequest();
- if (StringUtils.contains(request.getContentType(),
MIME_TYPE__MULTIPART_FORM_DATA)) {
+ if (Strings.CS.contains(request.getContentType(),
MIME_TYPE__MULTIPART_FORM_DATA)) {
final long requestMaxSize =
context.getProperty(MULTIPART_REQUEST_MAX_SIZE).asDataSize(DataUnit.B).longValue();
final int readBufferSize =
context.getProperty(MULTIPART_READ_BUFFER_SIZE).asDataSize(DataUnit.B).intValue();
String tempDir = System.getProperty("java.io.tmpdir");
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
index d0f542260c..61c7b4797a 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/InvokeHTTP.java
@@ -41,6 +41,7 @@ import okio.Okio;
import okio.Source;
import org.apache.commons.io.input.TeeInputStream;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.annotation.behavior.DynamicProperties;
import org.apache.nifi.annotation.behavior.DynamicProperty;
import org.apache.nifi.annotation.behavior.InputRequirement;
@@ -1298,7 +1299,7 @@ public class InvokeHTTP extends AbstractProcessor {
private String getFileNameFromUrl(URL url) {
String fileName = null;
- String path = StringUtils.removeEnd(url.getPath(), "/");
+ String path = Strings.CS.removeEnd(url.getPath(), "/");
if (!StringUtils.isEmpty(path)) {
fileName = path.substring(path.lastIndexOf('/') + 1);
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java
index 16f25c8d32..7b5b3a2e77 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitJson.java
@@ -21,7 +21,7 @@ import com.jayway.jsonpath.DocumentContext;
import com.jayway.jsonpath.InvalidJsonException;
import com.jayway.jsonpath.JsonPath;
import com.jayway.jsonpath.PathNotFoundException;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.annotation.behavior.InputRequirement;
import org.apache.nifi.annotation.behavior.InputRequirement.Requirement;
import org.apache.nifi.annotation.behavior.SideEffectFree;
@@ -133,7 +133,7 @@ public class SplitJson extends AbstractJsonPathProcessor {
@Override
public void onPropertyModified(PropertyDescriptor descriptor, String
oldValue, String newValue) {
if (descriptor.equals(ARRAY_JSON_PATH_EXPRESSION)) {
- if (!StringUtils.equals(oldValue, newValue)) {
+ if (!Strings.CS.equals(oldValue, newValue)) {
// This value will be computed and set in customValidate()
JSON_PATH_REF.set(null);
}
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java
index a401b00f6d..e3262d355d 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java
@@ -29,6 +29,7 @@ import jakarta.ws.rs.Path;
import jakarta.ws.rs.core.MediaType;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.flowfile.attributes.StandardFlowFileMediaType;
@@ -455,7 +456,7 @@ public class ListenHTTPServlet extends HttpServlet {
unpackager = new FlowFileUnpackagerV3();
} else if
(StandardFlowFileMediaType.VERSION_2.getMediaType().equals(contentType)) {
unpackager = new FlowFileUnpackagerV2();
- } else if (StringUtils.startsWith(contentType,
StandardFlowFileMediaType.VERSION_UNSPECIFIED.getMediaType())) {
+ } else if (Strings.CS.startsWith(contentType,
StandardFlowFileMediaType.VERSION_UNSPECIFIED.getMediaType())) {
unpackager = new FlowFileUnpackagerV1();
} else {
unpackager = null;
diff --git
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestUnpackContent.java
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestUnpackContent.java
index bfc6a26dfd..4b69676d0e 100644
---
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestUnpackContent.java
+++
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestUnpackContent.java
@@ -21,6 +21,7 @@ import net.lingala.zip4j.model.ZipParameters;
import net.lingala.zip4j.model.enums.EncryptionMethod;
import org.apache.commons.io.Charsets;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.util.MockFlowFile;
import org.apache.nifi.util.TestRunner;
@@ -318,10 +319,10 @@ public class TestUnpackContent {
for (final MockFlowFile flowFile : unpacked) {
final String outputFilename =
flowFile.getAttribute(CoreAttributes.FILENAME.key());
assertTrue(StringUtils.containsNone(outputFilename, "?"),
"filename contains '?': " + outputFilename);
- assertTrue(StringUtils.contains(outputFilename, specialChar),
"filename missing '%s': %s".formatted(specialChar, outputFilename));
+ assertTrue(Strings.CS.contains(outputFilename, specialChar),
"filename missing '%s': %s".formatted(specialChar, outputFilename));
final String path =
flowFile.getAttribute(CoreAttributes.PATH.key());
assertTrue(StringUtils.containsNone(path, "?"), "path contains
'?': " + path);
- assertTrue(StringUtils.contains(path, specialChar), "path missing
'%s': %s".formatted(specialChar, path));
+ assertTrue(Strings.CS.contains(path, specialChar), "path missing
'%s': %s".formatted(specialChar, path));
}
}
diff --git
a/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/main/java/org/apache/nifi/dbcp/DBCPConnectionPool.java
b/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/main/java/org/apache/nifi/dbcp/DBCPConnectionPool.java
index f5ccb22aab..ee430e8621 100644
---
a/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/main/java/org/apache/nifi/dbcp/DBCPConnectionPool.java
+++
b/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/main/java/org/apache/nifi/dbcp/DBCPConnectionPool.java
@@ -25,6 +25,7 @@ import java.util.Map;
import java.util.stream.Collectors;
import org.apache.commons.dbcp2.BasicDataSource;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.annotation.behavior.DynamicProperties;
import org.apache.nifi.annotation.behavior.DynamicProperty;
import org.apache.nifi.annotation.behavior.RequiresInstanceClassLoading;
@@ -182,7 +183,7 @@ public class DBCPConnectionPool extends
AbstractDBCPConnectionPool implements DB
final PropertyValue propertyValue =
context.getProperty(descriptor);
if (descriptor.isSensitive()) {
final String propertyName;
- if (StringUtils.startsWith(descriptor.getName(),
SENSITIVE_PROPERTY_PREFIX)) {
+ if (Strings.CS.startsWith(descriptor.getName(),
SENSITIVE_PROPERTY_PREFIX)) {
propertyName =
StringUtils.substringAfter(descriptor.getName(), SENSITIVE_PROPERTY_PREFIX);
} else {
propertyName = descriptor.getName();
diff --git
a/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java
b/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java
index a85eadd47c..b1f654b800 100644
---
a/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java
+++
b/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-processor/src/main/java/org/apache/nifi/processors/attributes/UpdateAttribute.java
@@ -19,6 +19,7 @@ package org.apache.nifi.processors.attributes;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.LoadingCache;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.annotation.behavior.DefaultRunDuration;
import org.apache.nifi.annotation.behavior.DynamicProperty;
import org.apache.nifi.annotation.behavior.InputRequirement;
@@ -422,19 +423,19 @@ public class UpdateAttribute extends AbstractProcessor
implements Searchable {
// ensure there are some rules
if (criteria.getRules() != null) {
final FlowFilePolicy flowFilePolicy =
criteria.getFlowFilePolicy();
- if (flowFilePolicy != null &&
StringUtils.containsIgnoreCase(flowFilePolicy.name(), term)) {
+ if (flowFilePolicy != null &&
Strings.CI.contains(flowFilePolicy.name(), term)) {
results.add(new SearchResult.Builder().label("FlowFile
policy").match(flowFilePolicy.name()).build());
}
for (final Rule rule : criteria.getRules()) {
- if (StringUtils.containsIgnoreCase(rule.getName(), term)) {
+ if (Strings.CI.contains(rule.getName(), term)) {
results.add(new SearchResult.Builder().label("Rule
name").match(rule.getName()).build());
}
// ensure there are some conditions
if (rule.getConditions() != null) {
for (final Condition condition : rule.getConditions())
{
- if
(StringUtils.containsIgnoreCase(condition.getExpression(), term)) {
+ if (Strings.CI.contains(condition.getExpression(),
term)) {
results.add(new
SearchResult.Builder().label(String.format("Condition in rule '%s'",
rule.getName())).match(condition.getExpression()).build());
}
}
@@ -443,10 +444,10 @@ public class UpdateAttribute extends AbstractProcessor
implements Searchable {
// ensure there are some actions
if (rule.getActions() != null) {
for (final Action action : rule.getActions()) {
- if
(StringUtils.containsIgnoreCase(action.getAttribute(), term)) {
+ if (Strings.CI.contains(action.getAttribute(),
term)) {
results.add(new
SearchResult.Builder().label(String.format("Action in rule '%s'",
rule.getName())).match(action.getAttribute()).build());
}
- if
(StringUtils.containsIgnoreCase(action.getValue(), term)) {
+ if (Strings.CI.contains(action.getValue(), term)) {
results.add(new
SearchResult.Builder().label(String.format("Action in rule '%s'",
rule.getName())).match(action.getValue()).build());
}
}
diff --git
a/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/java/org/apache/nifi/update/attributes/api/RuleResource.java
b/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/java/org/apache/nifi/update/attributes/api/RuleResource.java
index 8f8485a800..7a7165271f 100644
---
a/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/java/org/apache/nifi/update/attributes/api/RuleResource.java
+++
b/nifi-extension-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/java/org/apache/nifi/update/attributes/api/RuleResource.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.update.attributes.api;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.update.attributes.Action;
import org.apache.nifi.update.attributes.Condition;
import org.apache.nifi.update.attributes.Criteria;
@@ -417,7 +417,7 @@ public class RuleResource {
if (rules != null) {
ruleDtos = new ArrayList<>(rules.size());
for (final Rule rule : rules) {
- if (StringUtils.containsIgnoreCase(rule.getName(), term)) {
+ if (Strings.CI.contains(rule.getName(), term)) {
final RuleDTO ruleDto = DtoFactory.createRuleDTO(rule);
ruleDtos.add(ruleDto);
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ParameterProviderMerger.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ParameterProviderMerger.java
index 0b106b9c25..02b3a21bfe 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ParameterProviderMerger.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/ParameterProviderMerger.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.cluster.coordination.http.endpoints;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.parameter.ParameterSensitivity;
import org.apache.nifi.web.api.entity.ParameterGroupConfigurationEntity;
import org.apache.nifi.web.api.entity.ParameterProviderEntity;
@@ -38,7 +38,7 @@ public class ParameterProviderMerger {
continue;
}
ParameterGroupConfigurationEntity otherConfiguration =
otherGroupIterator.next();
- if
(!StringUtils.equals(parameterGroupConfiguration.getGroupName(),
otherConfiguration.getGroupName())) {
+ if
(!Strings.CS.equals(parameterGroupConfiguration.getGroupName(),
otherConfiguration.getGroupName())) {
continue;
}
final Map<String, ParameterSensitivity>
targetParameterSensitivities =
parameterGroupConfiguration.getParameterSensitivities();
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/parameter/StandardParameterContext.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/parameter/StandardParameterContext.java
index f5093737a3..1ce405dc9e 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/parameter/StandardParameterContext.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/parameter/StandardParameterContext.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.parameter;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.nifi.authorization.AccessDeniedException;
import org.apache.nifi.authorization.Authorizer;
@@ -629,7 +629,7 @@ public class StandardParameterContext implements
ParameterContext {
if
(currentEffectiveParameters.containsKey(proposedParameterDescriptor)) {
final Parameter currentParameter =
currentEffectiveParameters.get(proposedParameterDescriptor);
if (!currentParameter.equals(proposedParameter) ||
currentParameter.getDescriptor().isSensitive() !=
proposedParameter.getDescriptor().isSensitive()
- ||
!StringUtils.equals(currentParameter.getDescriptor().getDescription(),
proposedParameter.getDescriptor().getDescription())) {
+ ||
!Strings.CS.equals(currentParameter.getDescriptor().getDescription(),
proposedParameter.getDescriptor().getDescription())) {
// The parameter has been updated in some way
effectiveParameterUpdates.put(proposedParameterDescriptor.getName(),
proposedParameter);
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractComponentNode.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractComponentNode.java
index b6011e6b59..6185285370 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractComponentNode.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/AbstractComponentNode.java
@@ -17,6 +17,7 @@
package org.apache.nifi.controller;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.attribute.expression.language.Query;
import org.apache.nifi.attribute.expression.language.StandardPropertyValue;
import org.apache.nifi.attribute.expression.language.VariableImpact;
@@ -775,7 +776,7 @@ public abstract class AbstractComponentNode implements
ComponentNode {
final Set<URL> additionalUrls =
this.getAdditionalClasspathResources(descriptors);
final String newFingerprint =
ClassLoaderUtils.generateAdditionalUrlsFingerprint(additionalUrls,
determineClasloaderIsolationKey());
- return (!StringUtils.equals(additionalResourcesFingerprint,
newFingerprint));
+ return (!Strings.CS.equals(additionalResourcesFingerprint,
newFingerprint));
}
/**
@@ -795,7 +796,7 @@ public abstract class AbstractComponentNode implements
ComponentNode {
final Set<URL> additionalUrls =
this.getAdditionalClasspathResources(descriptors,
this::getEffectivePropertyValueWithDefault);
final String newFingerprint =
ClassLoaderUtils.generateAdditionalUrlsFingerprint(additionalUrls,
isolationKey);
- if (!StringUtils.equals(additionalResourcesFingerprint,
newFingerprint)) {
+ if (!Strings.CS.equals(additionalResourcesFingerprint,
newFingerprint)) {
setAdditionalResourcesFingerprint(newFingerprint);
try {
logger.info("Updating classpath for [{}] with the ID
[{}]", this.componentType, this.getIdentifier());
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-framework-zookeeper-leader-election/src/main/java/org/apache/nifi/framework/cluster/leader/zookeeper/CuratorACLProviderFactory.java
b/nifi-framework-bundle/nifi-framework/nifi-framework-zookeeper-leader-election/src/main/java/org/apache/nifi/framework/cluster/leader/zookeeper/CuratorACLProviderFactory.java
index be79a3e0ba..e7aa9a9996 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-framework-zookeeper-leader-election/src/main/java/org/apache/nifi/framework/cluster/leader/zookeeper/CuratorACLProviderFactory.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-framework-zookeeper-leader-election/src/main/java/org/apache/nifi/framework/cluster/leader/zookeeper/CuratorACLProviderFactory.java
@@ -22,6 +22,7 @@ import java.util.Arrays;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.curator.framework.api.ACLProvider;
import org.apache.curator.framework.imps.DefaultACLProvider;
import org.apache.nifi.framework.cluster.zookeeper.ZooKeeperClientConfig;
@@ -34,7 +35,7 @@ public class CuratorACLProviderFactory {
public static final String SASL_AUTH_SCHEME = "sasl";
public ACLProvider create(ZooKeeperClientConfig config) {
- return StringUtils.equalsIgnoreCase(config.getAuthType(),
SASL_AUTH_SCHEME) ? new SaslACLProvider(config) : new DefaultACLProvider();
+ return Strings.CI.equals(config.getAuthType(), SASL_AUTH_SCHEME) ? new
SaslACLProvider(config) : new DefaultACLProvider();
}
private class SaslACLProvider implements ACLProvider {
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
index 2874a57aa8..e9d56be344 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
@@ -20,6 +20,7 @@ import io.prometheus.client.CollectorRegistry;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.Response;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.action.Action;
import org.apache.nifi.action.Component;
import org.apache.nifi.action.FlowChangeAction;
@@ -451,8 +452,6 @@ import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import static org.apache.commons.lang3.StringUtils.containsIgnoreCase;
-
/**
* Implementation of NiFiServiceFacade that performs revision checking.
*/
@@ -4614,7 +4613,7 @@ public class StandardNiFiServiceFacade implements
NiFiServiceFacade {
}
private boolean isMatched(final String label, final String query) {
- return StringUtils.isEmpty(query) || containsIgnoreCase(label, query);
+ return StringUtils.isEmpty(query) || Strings.CI.contains(label, query);
}
private UserEntity createUserEntity(final User user, final boolean
enforceUserExistence) {
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java
index 6214b74f72..851bd8db19 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/FlowResource.java
@@ -43,6 +43,7 @@ import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.StreamingOutput;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.authorization.Authorizer;
import org.apache.nifi.authorization.RequestAction;
import org.apache.nifi.authorization.resource.Authorizable;
@@ -3835,7 +3836,7 @@ public class FlowResource extends ApplicationResource {
final String address = node.getAddress() + ":" + node.getApiPort();
// count the node if there is no search or it matches the address
- if (StringUtils.isBlank(value) ||
StringUtils.containsIgnoreCase(address, value)) {
+ if (StringUtils.isBlank(value) || Strings.CI.contains(address,
value)) {
final NodeSearchResultDTO nodeMatch = new
NodeSearchResultDTO();
nodeMatch.setId(node.getNodeId());
nodeMatch.setAddress(address);
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerSearchService.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerSearchService.java
index 98524bd425..36e5e99c69 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerSearchService.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerSearchService.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.web.controller;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.authorization.Authorizer;
import org.apache.nifi.authorization.RequestAction;
import org.apache.nifi.authorization.resource.Authorizable;
@@ -123,7 +123,7 @@ public class ControllerSearchService {
final List<ProcessGroup> lineage = getLineage(scope);
for (final ProcessGroup group : lineage) {
- if (StringUtils.containsIgnoreCase(group.getName(), filterValue)
|| StringUtils.containsIgnoreCase(group.getIdentifier(), filterValue)) {
+ if (Strings.CI.contains(group.getName(), filterValue) ||
Strings.CI.contains(group.getIdentifier(), filterValue)) {
return true;
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/AttributeMatcher.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/AttributeMatcher.java
index 6f7709b152..eea005eab8 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/AttributeMatcher.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/AttributeMatcher.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.web.search.attributematchers;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.web.search.query.SearchQuery;
import java.util.List;
@@ -49,7 +49,7 @@ public interface AttributeMatcher<T> {
static void addIfMatching(final String searchTerm, final String subject,
final String label, final List<String> matches) {
final String match = label + SEPARATOR + subject;
- if (StringUtils.containsIgnoreCase(subject, searchTerm) && matches !=
null && !matches.contains(match)) {
+ if (Strings.CI.contains(subject, searchTerm) && matches != null &&
!matches.contains(match)) {
matches.add(match);
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/BackPressureMatcher.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/BackPressureMatcher.java
index 7cc6a49dc3..9392ae74b0 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/BackPressureMatcher.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/BackPressureMatcher.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.web.search.attributematchers;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.connectable.Connection;
import org.apache.nifi.processor.DataUnit;
import org.apache.nifi.web.search.query.SearchQuery;
@@ -51,6 +51,6 @@ public class BackPressureMatcher implements
AttributeMatcher<Connection> {
}
private boolean containsKeyword(final SearchQuery query) {
- return KEYWORDS.stream().anyMatch(keyword ->
StringUtils.containsIgnoreCase(keyword, query.getTerm()));
+ return KEYWORDS.stream().anyMatch(keyword ->
Strings.CI.contains(keyword, query.getTerm()));
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/ExecutionMatcher.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/ExecutionMatcher.java
index 3c82d46e21..f860be5848 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/ExecutionMatcher.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/ExecutionMatcher.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.web.search.attributematchers;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.controller.ProcessorNode;
import org.apache.nifi.scheduling.ExecutionNode;
import org.apache.nifi.web.search.query.SearchQuery;
@@ -29,7 +29,7 @@ public class ExecutionMatcher implements
AttributeMatcher<ProcessorNode> {
@Override
public void match(final ProcessorNode component, final SearchQuery query,
final List<String> matches) {
- if (ExecutionNode.PRIMARY.equals(component.getExecutionNode()) &&
StringUtils.containsIgnoreCase(SEARCH_TERM, query.getTerm())) {
+ if (ExecutionNode.PRIMARY.equals(component.getExecutionNode()) &&
Strings.CI.contains(SEARCH_TERM, query.getTerm())) {
matches.add(MATCH_LABEL);
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/ExpirationMatcher.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/ExpirationMatcher.java
index 5c7bd96fba..eded92d175 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/ExpirationMatcher.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/ExpirationMatcher.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.web.search.attributematchers;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.connectable.Connection;
import org.apache.nifi.web.search.query.SearchQuery;
@@ -44,6 +44,6 @@ public class ExpirationMatcher implements
AttributeMatcher<Connection> {
}
private boolean containsKeyword(final SearchQuery query) {
- return KEYWORDS.stream().anyMatch(keyword ->
StringUtils.containsIgnoreCase(keyword, query.getTerm()));
+ return KEYWORDS.stream().anyMatch(keyword ->
Strings.CI.contains(keyword, query.getTerm()));
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/PortScheduledStateMatcher.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/PortScheduledStateMatcher.java
index 7cb3af8c2b..cd1051e642 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/PortScheduledStateMatcher.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/PortScheduledStateMatcher.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.web.search.attributematchers;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.connectable.Port;
import org.apache.nifi.controller.ScheduledState;
import org.apache.nifi.web.search.query.SearchQuery;
@@ -40,14 +40,14 @@ public class PortScheduledStateMatcher implements
AttributeMatcher<Port> {
final String searchTerm = query.getTerm();
if (ScheduledState.DISABLED.equals(component.getScheduledState())) {
- if (StringUtils.containsIgnoreCase(SEARCH_TERM_DISABLED,
searchTerm)) {
+ if (Strings.CI.contains(SEARCH_TERM_DISABLED, searchTerm)) {
matches.add(MATCH_PREFIX + MATCH_DISABLED);
}
- } else if (StringUtils.containsIgnoreCase(SEARCH_TERM_INVALID,
searchTerm) && !component.isValid()) {
+ } else if (Strings.CI.contains(SEARCH_TERM_INVALID, searchTerm) &&
!component.isValid()) {
matches.add(MATCH_PREFIX + MATCH_INVALID);
- } else if
(ScheduledState.RUNNING.equals(component.getScheduledState()) &&
StringUtils.containsIgnoreCase(SEARCH_TERM_RUNNING, searchTerm)) {
+ } else if
(ScheduledState.RUNNING.equals(component.getScheduledState()) &&
Strings.CI.contains(SEARCH_TERM_RUNNING, searchTerm)) {
matches.add(MATCH_PREFIX + MATCH_RUNNING);
- } else if
(ScheduledState.STOPPED.equals(component.getScheduledState()) &&
StringUtils.containsIgnoreCase(SEARCH_TERM_STOPPED, searchTerm)) {
+ } else if
(ScheduledState.STOPPED.equals(component.getScheduledState()) &&
Strings.CI.contains(SEARCH_TERM_STOPPED, searchTerm)) {
matches.add(MATCH_PREFIX + MATCH_STOPPED);
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/PropertyMatcher.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/PropertyMatcher.java
index 6b24414e49..7d5563d33e 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/PropertyMatcher.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/PropertyMatcher.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.web.search.attributematchers;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.controller.ComponentNode;
import org.apache.nifi.web.search.query.SearchQuery;
@@ -53,7 +53,7 @@ public class PropertyMatcher<T extends ComponentNode>
implements AttributeMatche
final String value =
Optional.ofNullable(entry.getValue()).orElse(descriptor.getDefaultValue());
// evaluate if the value matches the search criteria
- if (StringUtils.containsIgnoreCase(value, searchTerm)) {
+ if (Strings.CI.contains(value, searchTerm)) {
matches.add(LABEL_VALUE + SEPARATOR +
descriptor.getName() + " - " + value);
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/ScheduledStateMatcher.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/ScheduledStateMatcher.java
index 44185a4f49..ba57586e16 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/ScheduledStateMatcher.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/ScheduledStateMatcher.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.web.search.attributematchers;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.components.validation.ValidationStatus;
import org.apache.nifi.controller.ProcessorNode;
import org.apache.nifi.controller.ScheduledState;
@@ -43,16 +43,16 @@ public class ScheduledStateMatcher implements
AttributeMatcher<ProcessorNode> {
final String searchTerm = query.getTerm();
if (ScheduledState.DISABLED.equals(component.getScheduledState())) {
- if (StringUtils.containsIgnoreCase(SEARCH_TERM_DISABLED,
searchTerm)) {
+ if (Strings.CI.contains(SEARCH_TERM_DISABLED, searchTerm)) {
matches.add(MATCH_PREFIX + MATCH_DISABLED);
}
- } else if (StringUtils.containsIgnoreCase(SEARCH_TERM_INVALID,
searchTerm) && component.getValidationStatus() == ValidationStatus.INVALID) {
+ } else if (Strings.CI.contains(SEARCH_TERM_INVALID, searchTerm) &&
component.getValidationStatus() == ValidationStatus.INVALID) {
matches.add(MATCH_PREFIX + MATCH_INVALID);
- } else if (StringUtils.containsIgnoreCase(SEARCH_TERM_VALIDATING,
searchTerm) && component.getValidationStatus() == ValidationStatus.VALIDATING) {
+ } else if (Strings.CI.contains(SEARCH_TERM_VALIDATING, searchTerm) &&
component.getValidationStatus() == ValidationStatus.VALIDATING) {
matches.add(MATCH_PREFIX + MATCH_VALIDATING);
- } else if
(ScheduledState.RUNNING.equals(component.getScheduledState()) &&
StringUtils.containsIgnoreCase(SEARCH_TERM_RUNNING, searchTerm)) {
+ } else if
(ScheduledState.RUNNING.equals(component.getScheduledState()) &&
Strings.CI.contains(SEARCH_TERM_RUNNING, searchTerm)) {
matches.add(MATCH_PREFIX + MATCH_RUNNING);
- } else if
(ScheduledState.STOPPED.equals(component.getScheduledState()) &&
StringUtils.containsIgnoreCase(SEARCH_TERM_STOPPED, searchTerm)) {
+ } else if
(ScheduledState.STOPPED.equals(component.getScheduledState()) &&
Strings.CI.contains(SEARCH_TERM_STOPPED, searchTerm)) {
matches.add(MATCH_PREFIX + MATCH_STOPPED);
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/SchedulingMatcher.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/SchedulingMatcher.java
index 634260135d..97c08b620f 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/SchedulingMatcher.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/SchedulingMatcher.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.web.search.attributematchers;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.controller.ProcessorNode;
import org.apache.nifi.scheduling.SchedulingStrategy;
import org.apache.nifi.web.search.query.SearchQuery;
@@ -39,9 +39,9 @@ public class SchedulingMatcher implements
AttributeMatcher<ProcessorNode> {
final String searchTerm = query.getTerm();
final SchedulingStrategy schedulingStrategy =
component.getSchedulingStrategy();
- if (TIMER_DRIVEN.equals(schedulingStrategy) &&
StringUtils.containsIgnoreCase(SEARCH_TERM_TIMER, searchTerm)) {
+ if (TIMER_DRIVEN.equals(schedulingStrategy) &&
Strings.CI.contains(SEARCH_TERM_TIMER, searchTerm)) {
matches.add(MATCH_PREFIX + MATCH_TIMER);
- } else if (CRON_DRIVEN.equals(schedulingStrategy) &&
StringUtils.containsIgnoreCase(SEARCH_TERM_CRON, searchTerm)) {
+ } else if (CRON_DRIVEN.equals(schedulingStrategy) &&
Strings.CI.contains(SEARCH_TERM_CRON, searchTerm)) {
matches.add(MATCH_PREFIX + MATCH_CRON);
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/TransmissionStatusMatcher.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/TransmissionStatusMatcher.java
index 53e82524b4..f3762e392c 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/TransmissionStatusMatcher.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/search/attributematchers/TransmissionStatusMatcher.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.web.search.attributematchers;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.groups.RemoteProcessGroup;
import org.apache.nifi.web.search.query.SearchQuery;
@@ -43,6 +43,6 @@ public class TransmissionStatusMatcher implements
AttributeMatcher<RemoteProcess
}
private boolean containsKeyword(final SearchQuery query, final Set<String>
keywords) {
- return keywords.stream().anyMatch(keyword ->
StringUtils.containsIgnoreCase(keyword, query.getTerm()));
+ return keywords.stream().anyMatch(keyword ->
Strings.CI.contains(keyword, query.getTerm()));
}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/jwt/resolver/StandardBearerTokenResolver.java
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/jwt/resolver/StandardBearerTokenResolver.java
index 1e7bdfec21..dcbc691908 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/jwt/resolver/StandardBearerTokenResolver.java
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/jwt/resolver/StandardBearerTokenResolver.java
@@ -16,7 +16,7 @@
*/
package org.apache.nifi.web.security.jwt.resolver;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.web.security.http.SecurityCookieName;
import org.apache.nifi.web.security.http.SecurityHeader;
import org.slf4j.Logger;
@@ -45,8 +45,8 @@ public class StandardBearerTokenResolver implements
BearerTokenResolver {
String bearerToken = null;
final String header =
request.getHeader(SecurityHeader.AUTHORIZATION.getHeader());
- if (StringUtils.startsWithIgnoreCase(header, BEARER_PREFIX)) {
- bearerToken = StringUtils.removeStartIgnoreCase(header,
BEARER_PREFIX);
+ if (Strings.CI.startsWith(header, BEARER_PREFIX)) {
+ bearerToken = Strings.CI.removeStart(header, BEARER_PREFIX);
} else {
final Cookie cookie = WebUtils.getCookie(request,
SecurityCookieName.AUTHORIZATION_BEARER.getName());
if (cookie == null) {
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-properties/src/main/java/org/apache/nifi/registry/properties/NiFiRegistryProperties.java
b/nifi-registry/nifi-registry-core/nifi-registry-properties/src/main/java/org/apache/nifi/registry/properties/NiFiRegistryProperties.java
index fe024e4cf2..56bdb97f3e 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-properties/src/main/java/org/apache/nifi/registry/properties/NiFiRegistryProperties.java
+++
b/nifi-registry/nifi-registry-core/nifi-registry-properties/src/main/java/org/apache/nifi/registry/properties/NiFiRegistryProperties.java
@@ -17,6 +17,7 @@
package org.apache.nifi.registry.properties;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.properties.ApplicationProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -504,7 +505,7 @@ public class NiFiRegistryProperties extends
ApplicationProperties {
// go through each property
for (String propertyName : getPropertyKeys()) {
// determine if the property is a network interface name
- if (StringUtils.startsWith(propertyName,
WEB_HTTPS_NETWORK_INTERFACE_PREFIX)) {
+ if (Strings.CS.startsWith(propertyName,
WEB_HTTPS_NETWORK_INTERFACE_PREFIX)) {
// get the network interface property value
final String interfaceName = getProperty(propertyName);
if (StringUtils.isNotBlank(interfaceName)) {
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-properties/src/main/java/org/apache/nifi/registry/properties/util/IdentityMappingUtil.java
b/nifi-registry/nifi-registry-core/nifi-registry-properties/src/main/java/org/apache/nifi/registry/properties/util/IdentityMappingUtil.java
index dddf0a8dad..9abdb16340 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-properties/src/main/java/org/apache/nifi/registry/properties/util/IdentityMappingUtil.java
+++
b/nifi-registry/nifi-registry-core/nifi-registry-properties/src/main/java/org/apache/nifi/registry/properties/util/IdentityMappingUtil.java
@@ -17,6 +17,7 @@
package org.apache.nifi.registry.properties.util;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.registry.properties.util.IdentityMapping.Transform;
import org.apache.nifi.registry.properties.NiFiRegistryProperties;
import org.slf4j.Logger;
@@ -83,7 +84,7 @@ public class IdentityMappingUtil {
// go through each property
for (String propertyName : properties.getPropertyKeys()) {
- if (StringUtils.startsWith(propertyName, patternPrefix)) {
+ if (Strings.CS.startsWith(propertyName, patternPrefix)) {
final String key = StringUtils.substringAfter(propertyName,
patternPrefix);
final String identityPattern =
properties.getProperty(propertyName);
diff --git
a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/policies/UpdateAccessPolicy.java
b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/policies/UpdateAccessPolicy.java
index cfa4df1a7f..7ece57c688 100644
---
a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/policies/UpdateAccessPolicy.java
+++
b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/nifi/policies/UpdateAccessPolicy.java
@@ -18,6 +18,7 @@ package
org.apache.nifi.toolkit.cli.impl.command.nifi.policies;
import org.apache.commons.cli.MissingOptionException;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.nifi.toolkit.cli.api.AccessPolicyAction;
import org.apache.nifi.toolkit.cli.api.CommandException;
import org.apache.nifi.toolkit.cli.api.Context;
@@ -70,7 +71,7 @@ public class UpdateAccessPolicy extends
AbstractNiFiCommand<VoidResult> {
final PoliciesClient policiesClient = client.getPoliciesClient();
final TenantsClient tenantsClient = client.getTenantsClient();
- final String resource = "/" +
StringUtils.removeStart(getRequiredArg(properties,
CommandOption.POLICY_RESOURCE), "/");
+ final String resource = "/" +
Strings.CS.removeStart(getRequiredArg(properties,
CommandOption.POLICY_RESOURCE), "/");
final AccessPolicyAction actionType = AccessPolicyAction.valueOf(
getRequiredArg(properties,
CommandOption.POLICY_ACTION).toUpperCase().trim());
@@ -116,7 +117,7 @@ public class UpdateAccessPolicy extends
AbstractNiFiCommand<VoidResult> {
if (shouldPrint(properties)) {
println("Access policy not found" +
" for action " + actionType.toString().toLowerCase() +
- " on resource /" + StringUtils.removeStart(resource,
"/"));
+ " on resource /" + Strings.CS.removeStart(resource,
"/"));
}
final AccessPolicyDTO policyDTO = new AccessPolicyDTO();
diff --git
a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/flow/ImportAllFlows.java
b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/flow/ImportAllFlows.java
index 1b205635aa..229faa53c5 100644
---
a/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/flow/ImportAllFlows.java
+++
b/nifi-toolkit/nifi-toolkit-cli/src/main/java/org/apache/nifi/toolkit/cli/impl/command/registry/flow/ImportAllFlows.java
@@ -19,7 +19,7 @@ package
org.apache.nifi.toolkit.cli.impl.command.registry.flow;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.cli.MissingOptionException;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.nifi.flow.VersionedFlowCoordinates;
@@ -266,7 +266,7 @@ public class ImportAllFlows extends
AbstractNiFiRegistryCommand<StringResult> {
private void updateStorageLocation(final VersionedProcessGroup group,
final String registryUrl) {
final VersionedFlowCoordinates flowCoordinates =
group.getVersionedFlowCoordinates();
- if (flowCoordinates != null &&
!StringUtils.startsWith(flowCoordinates.getStorageLocation(), registryUrl)) {
+ if (flowCoordinates != null &&
!Strings.CS.startsWith(flowCoordinates.getStorageLocation(), registryUrl)) {
final String updatedStorageLocation =
String.format(STORAGE_LOCATION_URL, registryUrl, flowCoordinates.getBucketId(),
flowCoordinates.getFlowId(), flowCoordinates.getVersion());
