You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mt...@apache.org on 2024/06/23 22:14:34 UTC
(nifi) branch main updated: NIFI-13421 Replaced String.format in logging statements where only formatting strings (%s) with the use of logging parameters ({})
This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 957510e65a NIFI-13421 Replaced String.format in logging statements where only formatting strings (%s) with the use of logging parameters ({})
957510e65a is described below
commit 957510e65a052bbb7a69718f84363443fe2d1eee
Author: dan-s1 <ds...@gmail.com>
AuthorDate: Fri Jun 21 18:33:26 2024 +0000
NIFI-13421 Replaced String.format in logging statements where only formatting strings (%s) with the use of logging parameters ({})
This closes #8994
Signed-off-by: Mike Thomsen <mt...@apache.org>
---
.../java/org/apache/nifi/amqp/processors/PublishAMQP.java | 2 +-
.../org/apache/nifi/processors/aws/s3/FetchS3Object.java | 2 +-
.../azure/cosmos/document/PutAzureCosmosDBRecord.java | 2 +-
.../elasticsearch/ElasticSearchClientServiceImpl.java | 15 +++++----------
.../nifi/processors/gcp/storage/FetchGCSObject.java | 2 +-
.../cachemanager/EmbeddedHazelcastCacheManager.java | 12 ++++++------
.../src/main/java/org/apache/nifi/ldap/LdapProvider.java | 4 ++--
.../apache/nifi/ldap/tenants/LdapUserGroupProvider.java | 4 ++--
.../org/apache/nifi/processors/mongodb/DeleteMongo.java | 2 +-
.../nifi/processors/mongodb/gridfs/DeleteGridFS.java | 4 ++--
.../nifi/processors/script/InvokeScriptedProcessor.java | 3 +--
.../org/apache/nifi/script/ScriptingComponentUtils.java | 2 +-
.../nifi/processors/standard/PutDatabaseRecord.java | 5 ++---
.../nifi/processors/standard/util/SFTPTransfer.java | 2 +-
.../nifi/processors/attributes/UpdateAttribute.java | 8 ++++----
.../apache/nifi/authorization/AuthorizerFactoryBean.java | 2 +-
.../apache/nifi/authorization/user/NiFiUserUtilsTest.java | 6 +++---
.../cluster/coordination/node/NodeClusterCoordinator.java | 2 +-
.../controller/reporting/AbstractReportingTaskNode.java | 4 ++--
.../state/manager/StandardStateManagerProvider.java | 2 +-
.../apache/nifi/remote/StandardRemoteProcessGroup.java | 2 +-
.../bootstrap/shell/command/AbstractShellCommand.java | 2 +-
.../nifi/nar/StandardExtensionDiscoveringManager.java | 2 +-
.../main/java/org/apache/nifi/nar/NarClassLoaders.java | 14 ++++++--------
.../main/java/org/apache/nifi/web/server/JettyServer.java | 2 +-
.../org/apache/nifi/web/StandardNiFiServiceFacade.java | 6 +++---
.../nifi/web/api/config/AccessDeniedExceptionMapper.java | 2 +-
.../web/api/config/AdministrationExceptionMapper.java | 2 +-
.../AuthenticationCredentialsNotFoundExceptionMapper.java | 2 +-
.../api/config/AuthorizationAccessExceptionMapper.java | 2 +-
.../nifi/web/api/config/ClusterExceptionMapper.java | 2 +-
.../IllegalClusterResourceRequestExceptionMapper.java | 2 +-
.../api/config/IllegalClusterStateExceptionMapper.java | 2 +-
.../api/config/IllegalNodeDeletionExceptionMapper.java | 2 +-
.../config/IllegalNodeDisconnectionExceptionMapper.java | 2 +-
.../web/api/config/IllegalNodeOffloadExceptionMapper.java | 2 +-
.../config/IllegalNodeReconnectionExceptionMapper.java | 2 +-
.../nifi/web/api/config/InterruptedExceptionMapper.java | 2 +-
.../web/api/config/InvalidRevisionExceptionMapper.java | 2 +-
.../api/config/JsonContentConversionExceptionMapper.java | 2 +-
.../nifi/web/api/config/JsonMappingExceptionMapper.java | 2 +-
.../nifi/web/api/config/JsonParseExceptionMapper.java | 2 +-
.../web/api/config/MutableRequestExceptionMapper.java | 2 +-
.../api/config/NoClusterCoordinatorExceptionMapper.java | 2 +-
.../web/api/config/NoConnectedNodesExceptionMapper.java | 2 +-
.../api/config/NoResponseFromNodesExceptionMapper.java | 2 +-
.../web/api/config/NodeDisconnectionExceptionMapper.java | 2 +-
.../web/api/config/NodeReconnectionExceptionMapper.java | 2 +-
.../nifi/web/api/config/NotFoundExceptionMapper.java | 2 +-
.../web/api/config/ResourceNotFoundExceptionMapper.java | 2 +-
.../org/apache/nifi/web/api/config/ThrowableMapper.java | 2 +-
.../nifi/web/api/config/UnknownNodeExceptionMapper.java | 2 +-
.../nifi/web/api/config/ValidationExceptionMapper.java | 2 +-
.../org/apache/nifi/web/controller/ControllerFacade.java | 2 +-
.../apache/nifi/web/dao/impl/StandardConnectionDAO.java | 4 ++--
.../main/java/org/apache/nifi/web/util/SnippetUtils.java | 2 +-
.../web/security/x509/ocsp/OcspCertificateValidator.java | 12 ++++++------
.../security/authorization/AuthorizerFactory.java | 2 +-
.../authorization/file/FileAccessPolicyProvider.java | 2 +-
.../authorization/file/FileUserGroupProvider.java | 2 +-
.../nifi/registry/security/ldap/LdapIdentityProvider.java | 4 ++--
.../security/ldap/tenants/LdapUserGroupProvider.java | 10 +++++-----
.../nifi/registry/properties/NiFiRegistryProperties.java | 2 +-
.../org/apache/nifi/registry/web/api/AccessResource.java | 4 ++--
.../apache/nifi/registry/web/api/ApplicationResource.java | 2 +-
.../registry/web/mapper/AccessDeniedExceptionMapper.java | 2 +-
.../web/mapper/AdministrationExceptionMapper.java | 2 +-
.../AuthenticationCredentialsNotFoundExceptionMapper.java | 2 +-
.../web/mapper/AuthorizationAccessExceptionMapper.java | 2 +-
.../registry/web/mapper/BadRequestExceptionMapper.java | 2 +-
.../web/mapper/ConstraintViolationExceptionMapper.java | 2 +-
.../web/mapper/IllegalArgumentExceptionMapper.java | 2 +-
.../registry/web/mapper/IllegalStateExceptionMapper.java | 2 +-
.../web/mapper/InvalidRevisionExceptionMapper.java | 2 +-
.../registry/web/mapper/NotAllowedExceptionMapper.java | 2 +-
.../nifi/registry/web/mapper/NotFoundExceptionMapper.java | 2 +-
.../registry/web/mapper/QueryParamExceptionMapper.java | 2 +-
.../web/mapper/ResourceNotFoundExceptionMapper.java | 2 +-
.../registry/web/mapper/SerializationExceptionMapper.java | 2 +-
.../apache/nifi/registry/web/mapper/ThrowableMapper.java | 2 +-
.../web/security/authentication/jwt/JwtService.java | 6 ++----
81 files changed, 120 insertions(+), 131 deletions(-)
diff --git a/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/PublishAMQP.java b/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/PublishAMQP.java
index 942ce40e69..8e660c8f08 100644
--- a/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/PublishAMQP.java
+++ b/nifi-extension-bundles/nifi-amqp-bundle/nifi-amqp-processors/src/main/java/org/apache/nifi/amqp/processors/PublishAMQP.java
@@ -263,7 +263,7 @@ public class PublishAMQP extends AbstractAMQPProcessor<AMQPPublisher> {
} else if (kv.length == 1) {
headers.put(kv[0].trim(), null);
} else {
- getLogger().warn(String.format("Malformed key value pair in AMQP header property (%s): %s", amqpPropValue, strEntry));
+ getLogger().warn("Malformed key value pair in AMQP header property ({}): {}", amqpPropValue, strEntry);
}
}
return headers;
diff --git a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java
index 639c9205b5..67fe18280b 100644
--- a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java
+++ b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/s3/FetchS3Object.java
@@ -334,7 +334,7 @@ public class FetchS3Object extends AbstractS3Processor {
.explanation(String.format("Successfully performed HEAD on [%s] (%s bytes) from Bucket [%s]", key, byteCount, bucket))
.build());
} catch (final Exception e) {
- getLogger().error(String.format("Failed to fetch [%s] from Bucket [%s]", key, bucket), e);
+ getLogger().error("Failed to fetch [{}] from Bucket [{}]", key, bucket, e);
results.add(new ConfigVerificationResult.Builder()
.verificationStepName("HEAD S3 Object")
.outcome(Outcome.FAILED)
diff --git a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/cosmos/document/PutAzureCosmosDBRecord.java b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/cosmos/document/PutAzureCosmosDBRecord.java
index bed246b966..eea4ba0d61 100644
--- a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/cosmos/document/PutAzureCosmosDBRecord.java
+++ b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-processors/src/main/java/org/apache/nifi/processors/azure/cosmos/document/PutAzureCosmosDBRecord.java
@@ -168,7 +168,7 @@ public class PutAzureCosmosDBRecord extends AbstractAzureCosmosDBProcessor {
contentMap.put("id", UUID.randomUUID().toString());
}
if (!contentMap.containsKey(partitionKeyField)) {
- logger.error(String.format("PutAzureCosmoDBRecord failed with missing partitionKeyField (%s)", partitionKeyField));
+ logger.error("PutAzureCosmoDBRecord failed with missing partitionKeyField ({})", partitionKeyField);
error = true;
break;
}
diff --git a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientServiceImpl.java b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientServiceImpl.java
index 1c34fb14a6..e94a12b860 100644
--- a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientServiceImpl.java
+++ b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-client-service/src/main/java/org/apache/nifi/elasticsearch/ElasticSearchClientServiceImpl.java
@@ -680,7 +680,7 @@ public class ElasticSearchClientServiceImpl extends AbstractControllerService im
parseResponseWarningHeaders(response);
if (getLogger().isDebugEnabled()) {
- getLogger().debug(String.format("Response was: %s", rawResponse));
+ getLogger().debug("Response was: {}", rawResponse);
}
return IndexOperationResponse.fromJsonResponse(rawResponse);
@@ -717,8 +717,7 @@ public class ElasticSearchClientServiceImpl extends AbstractControllerService im
watch.stop();
if (getLogger().isDebugEnabled()) {
- getLogger().debug(String.format("Response for bulk delete: %s",
- IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8)));
+ getLogger().debug("Response for bulk delete: {}", IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8));
}
parseResponseWarningHeaders(response);
@@ -880,7 +879,7 @@ public class ElasticSearchClientServiceImpl extends AbstractControllerService im
parseResponseWarningHeaders(response);
if (getLogger().isDebugEnabled()) {
- getLogger().debug(String.format("Response for initialising Point in Time: %s", body));
+ getLogger().debug("Response for initialising Point in Time: {}", body);
}
return (String) mapper.readValue(body, Map.class).get("id");
@@ -899,9 +898,7 @@ public class ElasticSearchClientServiceImpl extends AbstractControllerService im
watch.stop();
if (getLogger().isDebugEnabled()) {
- getLogger().debug(String.format("Response for deleting Point in Time: %s",
- IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8))
- );
+ getLogger().debug("Response for deleting Point in Time: {}", IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8));
}
parseResponseWarningHeaders(response);
@@ -927,9 +924,7 @@ public class ElasticSearchClientServiceImpl extends AbstractControllerService im
watch.stop();
if (getLogger().isDebugEnabled()) {
- getLogger().debug(String.format("Response for deleting Scroll: %s",
- IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8))
- );
+ getLogger().debug("Response for deleting Scroll: {}", IOUtils.toString(response.getEntity().getContent(), StandardCharsets.UTF_8));
}
parseResponseWarningHeaders(response);
diff --git a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/storage/FetchGCSObject.java b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/storage/FetchGCSObject.java
index cb3d25c621..164a726792 100644
--- a/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/storage/FetchGCSObject.java
+++ b/nifi-extension-bundles/nifi-gcp-bundle/nifi-gcp-processors/src/main/java/org/apache/nifi/processors/gcp/storage/FetchGCSObject.java
@@ -262,7 +262,7 @@ public class FetchGCSObject extends AbstractGCSProcessor {
.explanation(String.format("Successfully fetched [%s] from Bucket [%s], totaling %s bytes", key, bucketName, byteCount))
.build());
} catch (final StorageException | IOException e) {
- getLogger().error(String.format("Failed to fetch [%s] from Bucket [%s]", key, bucketName), e);
+ getLogger().error("Failed to fetch [{}] from Bucket [{}]", key, bucketName, e);
results.add(new ConfigVerificationResult.Builder()
.verificationStepName("Fetch GCS Blob")
.outcome(Outcome.FAILED)
diff --git a/nifi-extension-bundles/nifi-hazelcast-bundle/nifi-hazelcast-services/src/main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java b/nifi-extension-bundles/nifi-hazelcast-bundle/nifi-hazelcast-services/src/main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java
index 755eedecb5..4578d44234 100644
--- a/nifi-extension-bundles/nifi-hazelcast-bundle/nifi-hazelcast-services/src/main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java
+++ b/nifi-extension-bundles/nifi-hazelcast-bundle/nifi-hazelcast-services/src/main/java/org/apache/nifi/hazelcast/services/cachemanager/EmbeddedHazelcastCacheManager.java
@@ -49,8 +49,8 @@ public class EmbeddedHazelcastCacheManager extends IMapBasedHazelcastCacheManage
private static final int DEFAULT_HAZELCAST_PORT = 5701;
private static final String PORT_SEPARATOR = ":";
- private static final String INSTANCE_CREATION_LOG = "Embedded Hazelcast server instance with instance name %s has been created successfully";
- private static final String MEMBER_LIST_LOG = "Hazelcast cluster will be created based on the NiFi cluster with the following members: %s";
+ private static final String INSTANCE_CREATION_LOG = "Embedded Hazelcast server instance with instance name {} has been created successfully";
+ private static final String MEMBER_LIST_LOG = "Hazelcast cluster will be created based on the NiFi cluster with the following members: {}";
private static final AllowableValue CLUSTER_NONE = new AllowableValue("none", "None", "No high availability or data replication is provided," +
" every node has access only to the data stored locally.");
@@ -140,10 +140,10 @@ public class EmbeddedHazelcastCacheManager extends IMapBasedHazelcastCacheManage
.map(m -> m + PORT_SEPARATOR + port)
.collect(Collectors.toList());
- getLogger().info(String.format(MEMBER_LIST_LOG, hazelcastMembers.stream().collect(Collectors.joining(", "))));
+ getLogger().info(MEMBER_LIST_LOG, String.join(", ", hazelcastMembers));
tcpIpConfig.setMembers(hazelcastMembers);
result = Hazelcast.newHazelcastInstance(config);
- getLogger().info(String.format(INSTANCE_CREATION_LOG, instanceName));
+ getLogger().info(INSTANCE_CREATION_LOG, instanceName);
} else if (clusteringStrategy.equals(CLUSTER_EXPLICIT.getValue())) {
final List<String> hazelcastMembers = getHazelcastMemberHosts(context);
@@ -151,7 +151,7 @@ public class EmbeddedHazelcastCacheManager extends IMapBasedHazelcastCacheManage
if (hazelcastMembers.contains(getNodeTypeProvider().getCurrentNode().get())) {
tcpIpConfig.setMembers(hazelcastMembers.stream().map(m -> m + PORT_SEPARATOR + port).collect(Collectors.toList()));
result = Hazelcast.newHazelcastInstance(config);
- getLogger().info(String.format(INSTANCE_CREATION_LOG, instanceName));
+ getLogger().info(INSTANCE_CREATION_LOG, instanceName);
} else {
result = getClientInstance(
clusterName,
@@ -164,7 +164,7 @@ public class EmbeddedHazelcastCacheManager extends IMapBasedHazelcastCacheManage
}
} else if (clusteringStrategy.equals(CLUSTER_NONE.getValue())) {
result = Hazelcast.newHazelcastInstance(config);
- getLogger().info(String.format(INSTANCE_CREATION_LOG, instanceName));
+ getLogger().info(INSTANCE_CREATION_LOG, instanceName);
} else {
throw new ProcessException("Unknown Hazelcast Clustering Strategy!");
}
diff --git a/nifi-extension-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/LdapProvider.java b/nifi-extension-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/LdapProvider.java
index 7a1269fd92..e60acc8dd1 100644
--- a/nifi-extension-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/LdapProvider.java
+++ b/nifi-extension-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/LdapProvider.java
@@ -197,7 +197,7 @@ public class LdapProvider implements LoginIdentityProvider {
final String rawIdentityStrategy = configurationContext.getProperty("Identity Strategy");
if (StringUtils.isBlank(rawIdentityStrategy)) {
- logger.info(String.format("Identity Strategy is not configured, defaulting strategy to %s.", IdentityStrategy.USE_DN));
+ logger.info("Identity Strategy is not configured, defaulting strategy to {}.", IdentityStrategy.USE_DN);
// if this value is not configured, default to use dn which was the previous implementation
identityStrategy = IdentityStrategy.USE_DN;
@@ -282,7 +282,7 @@ public class LdapProvider implements LoginIdentityProvider {
final LdapUserDetails userDetails = (LdapUserDetails) authentication.getPrincipal();
return new AuthenticationResponse(userDetails.getDn(), credentials.getUsername(), expiration, issuer);
} else {
- logger.warn(String.format("Unable to determine user DN for %s, using username.", authentication.getName()));
+ logger.warn("Unable to determine user DN for {}, using username.", authentication.getName());
return new AuthenticationResponse(authentication.getName(), credentials.getUsername(), expiration, issuer);
}
} else {
diff --git a/nifi-extension-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/tenants/LdapUserGroupProvider.java b/nifi-extension-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/tenants/LdapUserGroupProvider.java
index 4730203769..8f35fc9599 100644
--- a/nifi-extension-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/tenants/LdapUserGroupProvider.java
+++ b/nifi-extension-bundles/nifi-ldap-iaa-providers-bundle/nifi-ldap-iaa-providers/src/main/java/org/apache/nifi/ldap/tenants/LdapUserGroupProvider.java
@@ -601,8 +601,8 @@ public class LdapUserGroupProvider implements UserGroupProvider {
if (user != null) {
groupToUserIdentifierMappings.computeIfAbsent(referencedGroupValue, g -> new HashSet<>()).add(user.getIdentifier());
} else {
- logger.debug(String.format("%s contains member %s but that user was not found while searching users. This may be due "
- + "to a misconfiguration or it's possible the user is not a NiFi user. Ignoring group membership.", name, userValue));
+ logger.debug("{} contains member {} but that user was not found while searching users. This may be due "
+ + "to a misconfiguration or it's possible the user is not a NiFi user. Ignoring group membership.", name, userValue);
}
} else {
// since performUserSearch is false, then the referenced group attribute must be blank... the user value must be the dn.
diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/DeleteMongo.java b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/DeleteMongo.java
index 3a786329b7..ff0fd70307 100644
--- a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/DeleteMongo.java
+++ b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/DeleteMongo.java
@@ -131,7 +131,7 @@ public class DeleteMongo extends AbstractMongoProcessor {
if (deleteMode.equals(DELETE_ATTR.getValue())
&& (StringUtils.isEmpty(deleteAttr) || !ALLOWED_DELETE_VALUES.contains(deleteAttr.toLowerCase()) )) {
- getLogger().error(String.format("%s is not an allowed value for mongodb.delete.mode", deleteAttr));
+ getLogger().error("{} is not an allowed value for mongodb.delete.mode", deleteAttr);
session.transfer(flowFile, REL_FAILURE);
return;
}
diff --git a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/DeleteGridFS.java b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/DeleteGridFS.java
index c2c4262fd0..3d8946c80b 100644
--- a/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/DeleteGridFS.java
+++ b/nifi-extension-bundles/nifi-mongodb-bundle/nifi-mongodb-processors/src/main/java/org/apache/nifi/processors/mongodb/gridfs/DeleteGridFS.java
@@ -159,13 +159,13 @@ public class DeleteGridFS extends AbstractGridFSProcessor {
session.transfer(input, REL_SUCCESS);
} else {
- getLogger().error(String.format("Query %s did not delete anything in %s", deleteQuery, bucket.getBucketName()));
+ getLogger().error("Query {} did not delete anything in {}", deleteQuery, bucket.getBucketName());
session.transfer(input, REL_FAILURE);
}
cursor.close();
} catch (Exception ex) {
- getLogger().error(String.format("Error deleting using query: %s", deleteQuery), ex);
+ getLogger().error("Error deleting using query: {}", deleteQuery, ex);
session.transfer(input, REL_FAILURE);
}
}
diff --git a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java
index e0b74d156b..74215f6df1 100644
--- a/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java
+++ b/nifi-extension-bundles/nifi-scripting-bundle/nifi-scripting-processors/src/main/java/org/apache/nifi/processors/script/InvokeScriptedProcessor.java
@@ -572,8 +572,7 @@ public class InvokeScriptedProcessor extends AbstractSessionFactoryProcessor {
// ensure the processor did not fail to reload at some point
final Collection<ValidationResult> results = validationResults.get();
if (!results.isEmpty()) {
- log.error(String.format("Unable to run because the Processor is not valid: [%s]",
- StringUtils.join(results, ", ")));
+ log.error("Unable to run because the Processor is not valid: [{}]", StringUtils.join(results, ", "));
context.yield();
return;
}
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 00e867e365..c8da51a69b 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
@@ -97,7 +97,7 @@ public class ScriptingComponentUtils {
try (final InputStream in = scriptFile.read()) {
script = IOUtils.toString(in, StandardCharsets.UTF_8);
} catch (Exception e) {
- logger.error(String.format("Could not read from path %s", scriptFile), e);
+ logger.error("Could not read from path {}", scriptFile, e);
return results;
}
}
diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDatabaseRecord.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDatabaseRecord.java
index 566794ad34..b287c68b85 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDatabaseRecord.java
+++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutDatabaseRecord.java
@@ -619,7 +619,7 @@ public class PutDatabaseRecord extends AbstractProcessor {
connection.setAutoCommit(originalAutoCommit);
}
} catch (final Exception autoCommitException) {
- getLogger().warn(String.format("Failed to set auto-commit back to %s on connection", originalAutoCommit), autoCommitException);
+ getLogger().warn("Failed to set auto-commit back to {} on connection", originalAutoCommit, autoCommitException);
}
try {
@@ -1599,8 +1599,7 @@ public class PutDatabaseRecord extends AbstractProcessor {
try {
return connection.getMetaData().supportsBatchUpdates();
} catch (Exception ex) {
- getLogger().debug(String.format("Exception while testing if connection supportsBatchUpdates due to %s - %s",
- ex.getClass().getName(), ex.getMessage()));
+ getLogger().debug("Exception while testing if connection supportsBatchUpdates", ex);
return false;
}
}
diff --git a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
index 4efdfc5f08..ac81b836bf 100644
--- a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
+++ b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/util/SFTPTransfer.java
@@ -558,7 +558,7 @@ public class SFTPTransfer implements FileTransfer {
} catch (SFTPException e) {
if (e.getStatusCode() == Response.StatusCode.NO_SUCH_FILE) {
// No Such File. This happens when parent directory was not found.
- logger.debug(String.format("Could not create %s due to 'No such file'. Will try to create the parent dir.", remoteDirectory));
+ logger.debug("Could not create {} due to 'No such file'. Will try to create the parent dir.", remoteDirectory);
} else if (e.getStatusCode() == Response.StatusCode.FAILURE) {
// Swallow '4: Failure' including the remote directory already exists.
logger.debug("Could not blindly create remote directory", e);
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 6c662f687d..121546b0dd 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
@@ -645,7 +645,7 @@ public class UpdateAttribute extends AbstractProcessor implements Searchable {
// evaluate the expression for the given flow file
return getPropertyValue(condition.getExpression(), context).evaluateAttributeExpressions(flowfile, null, null, statefulAttributes).asBoolean();
} catch (final Exception e) {
- getLogger().error(String.format("Could not evaluate the condition '%s' while processing Flowfile '%s'", condition.getExpression(), flowfile));
+ getLogger().error("Could not evaluate the condition '{}' while processing Flowfile '{}'", condition.getExpression(), flowfile);
throw new ProcessException(String.format("Unable to evaluate condition '%s': %s.", condition.getExpression(), e), e);
}
}
@@ -700,7 +700,7 @@ public class UpdateAttribute extends AbstractProcessor implements Searchable {
// log if appropriate
if (debugEnabled) {
- logger.debug(String.format("%s deleting attribute '%s' for %s per regex '%s'.", this, key, flowfile, regex));
+ logger.debug("{} deleting attribute '{}' for {} per regex '{}'.", this, key, flowfile, regex);
}
attributesToDelete.add(key);
@@ -710,7 +710,7 @@ public class UpdateAttribute extends AbstractProcessor implements Searchable {
attributesToUpdate.keySet().removeAll(attributesToDelete);
}
} catch (final Exception e) {
- logger.error(String.format("Unable to delete attribute '%s' while processing FlowFile '%s' .", attribute, flowfile));
+ logger.error("Unable to delete attribute '{}' while processing FlowFile '{}' .", attribute, flowfile);
throw new ProcessException(String.format("Unable to delete attribute '%s': %s.", attribute, e), e);
}
} else {
@@ -724,7 +724,7 @@ public class UpdateAttribute extends AbstractProcessor implements Searchable {
// log if appropriate
if (debugEnabled) {
- logger.debug(String.format("%s setting attribute '%s' = '%s' for %s per rule '%s'.", this, attribute, newAttributeValue, flowfile, ruleName));
+ logger.debug("{} setting attribute '{}' = '{}' for {} per rule '{}'.", this, attribute, newAttributeValue, flowfile, ruleName);
}
if (setStatefulAttribute) {
diff --git a/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/main/java/org/apache/nifi/authorization/AuthorizerFactoryBean.java b/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/main/java/org/apache/nifi/authorization/AuthorizerFactoryBean.java
index 1dfa185d68..083c51f99c 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/main/java/org/apache/nifi/authorization/AuthorizerFactoryBean.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-authorizer/src/main/java/org/apache/nifi/authorization/AuthorizerFactoryBean.java
@@ -346,7 +346,7 @@ public class AuthorizerFactoryBean implements FactoryBean<Authorizer>, Disposabl
// if additional classpath resources were specified, replace with a new ClassLoader that wraps the original one
if (StringUtils.isNotEmpty(classpathResources)) {
- logger.info(String.format("Replacing Authorizer ClassLoader for '%s' to include additional resources: %s", identifier, classpathResources));
+ logger.info("Replacing Authorizer ClassLoader for '{}' to include additional resources: {}", identifier, classpathResources);
URL[] urls = ClassLoaderUtils.getURLsForClasspath(classpathResources, null, true);
authorizerClassLoader = new URLClassLoader(urls, authorizerClassLoader);
}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/user/NiFiUserUtilsTest.java b/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/user/NiFiUserUtilsTest.java
index b53ff8d577..02b964770c 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/user/NiFiUserUtilsTest.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-authorization-providers/src/test/java/org/apache/nifi/authorization/user/NiFiUserUtilsTest.java
@@ -41,7 +41,7 @@ public class NiFiUserUtilsTest {
final NiFiUser mockJohn = createMockNiFiUser(SAFE_USER_NAME_JOHN, mockProxy1, false);
final List<String> proxiedEntitiesChain = NiFiUserUtils.buildProxiedEntitiesChain(mockJohn);
- logger.info(String.format("Proxied entities chain: %s", proxiedEntitiesChain));
+ logger.info("Proxied entities chain: {}", proxiedEntitiesChain);
assertEquals(proxiedEntitiesChain, Arrays.asList(SAFE_USER_NAME_JOHN, SAFE_USER_NAME_PROXY_1));
}
@@ -61,7 +61,7 @@ public class NiFiUserUtilsTest {
final NiFiUser mockAnonymous = createMockNiFiUser("anonymous", mockProxy1, true);
final List<String> proxiedEntitiesChain = NiFiUserUtils.buildProxiedEntitiesChain(mockAnonymous);
- logger.info(String.format("Proxied entities chain: %s", proxiedEntitiesChain));
+ logger.info("Proxied entities chain: {}", proxiedEntitiesChain);
assertEquals(proxiedEntitiesChain, Arrays.asList("", SAFE_USER_NAME_PROXY_1));
}
@@ -69,7 +69,7 @@ public class NiFiUserUtilsTest {
@Test
public void testBuildProxyChainFromNullUserShouldBeEmpty() {
final List<String> proxiedEntitiesChain = NiFiUserUtils.buildProxiedEntitiesChain(null);
- logger.info(String.format("Proxied entities chain: %s", proxiedEntitiesChain));
+ logger.info("Proxied entities chain: {}", proxiedEntitiesChain);
assertEquals(proxiedEntitiesChain, Collections.EMPTY_LIST);
}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/node/NodeClusterCoordinator.java b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/node/NodeClusterCoordinator.java
index 211edb0147..51db839844 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/node/NodeClusterCoordinator.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/node/NodeClusterCoordinator.java
@@ -1389,7 +1389,7 @@ public class NodeClusterCoordinator implements ClusterCoordinator, ProtocolHandl
// disconnect problematic nodes
if (!problematicNodeResponses.isEmpty() && problematicNodeResponses.size() < nodeResponses.size()) {
final Set<NodeIdentifier> failedNodeIds = problematicNodeResponses.stream().map(response -> response.getNodeId()).collect(Collectors.toSet());
- logger.warn(String.format("The following nodes failed to process URI %s '%s'. Requesting each node reconnect to cluster.", uriPath, failedNodeIds));
+ logger.warn("The following nodes failed to process URI {} '{}'. Requesting each node reconnect to cluster.", uriPath, failedNodeIds);
for (final NodeIdentifier nodeId : failedNodeIds) {
// Update the node to 'CONNECTING' status and request that the node connect
final NodeConnectionStatus reconnectionStatus = new NodeConnectionStatus(nodeId, NodeConnectionState.CONNECTING);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java
index 900fa48df4..e1201cc47b 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/reporting/AbstractReportingTaskNode.java
@@ -117,13 +117,13 @@ public abstract class AbstractReportingTaskNode extends AbstractComponentNode im
try {
this.setSchedulingStrategy(dsc.strategy());
} catch (Throwable ex) {
- LOG.error(String.format("Error while setting scheduling strategy from DefaultSchedule annotation: %s", ex.getMessage()), ex);
+ LOG.error("Error while setting scheduling strategy from DefaultSchedule annotation", ex);
}
try {
this.setSchedulingPeriod(dsc.period());
} catch (Throwable ex) {
this.setSchedulingStrategy(SchedulingStrategy.TIMER_DRIVEN);
- LOG.error(String.format("Error while setting scheduling period from DefaultSchedule annotation: %s", ex.getMessage()), ex);
+ LOG.error("Error while setting scheduling period from DefaultSchedule annotation", ex);
}
}
}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/state/manager/StandardStateManagerProvider.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/state/manager/StandardStateManagerProvider.java
index f6c6a2ef68..c31491aed2 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/state/manager/StandardStateManagerProvider.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/state/manager/StandardStateManagerProvider.java
@@ -413,7 +413,7 @@ public class StandardStateManagerProvider implements StateManagerProvider {
try {
performMethodInjection(provider, mgrClass);
} catch (InvocationTargetException e) {
- logger.error(String.format("Failed to inject nifi.properties to the '%s' state provider.", type), e);
+ logger.error("Failed to inject nifi.properties to the '{}' state provider.", type, e);
}
return withNarClassLoader(provider);
} finally {
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroup.java b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroup.java
index a40aff24b0..6617173e5b 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroup.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/remote/StandardRemoteProcessGroup.java
@@ -1306,7 +1306,7 @@ public class StandardRemoteProcessGroup implements RemoteProcessGroup {
}
} catch (final Exception e) {
- logger.warn(String.format("Unable to connect to %s due to %s", StandardRemoteProcessGroup.this, e));
+ logger.warn("Unable to connect to {} due to {}", StandardRemoteProcessGroup.this, e.toString());
getEventReporter().reportEvent(Severity.WARNING, "Site to Site", String.format("Unable to connect to %s due to %s",
StandardRemoteProcessGroup.this.getTargetUris(), e));
}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/bootstrap/shell/command/AbstractShellCommand.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/bootstrap/shell/command/AbstractShellCommand.java
index b31e75194e..2089422f3e 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/bootstrap/shell/command/AbstractShellCommand.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/diagnostics/bootstrap/shell/command/AbstractShellCommand.java
@@ -64,7 +64,7 @@ public abstract class AbstractShellCommand implements PlatformShellCommand {
final Process process = processBuilder.start();
return result.createResult(process.getInputStream());
} catch (UnsupportedOperationException e) {
- logger.warn(String.format("Operating system is not supported, failed to execute command: %s, ", name));
+ logger.warn("Operating system is not supported, failed to execute command: {}, ", name);
return Collections.EMPTY_LIST;
} catch (Exception e) {
throw new RuntimeException(String.format("Failed to execute command: %s", name), e);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/nar/StandardExtensionDiscoveringManager.java b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/nar/StandardExtensionDiscoveringManager.java
index 4e951d57dc..1e21a50cfc 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/nar/StandardExtensionDiscoveringManager.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-nar-utils/src/main/java/org/apache/nifi/nar/StandardExtensionDiscoveringManager.java
@@ -386,7 +386,7 @@ public class StandardExtensionDiscoveringManager implements ExtensionDiscovering
initializer.initialize(configurableComponent);
}
} catch (final InitializationException e) {
- logger.warn(String.format("Unable to initialize component %s due to %s", configurableComponent.getClass().getName(), e.getMessage()));
+ logger.warn("Unable to initialize component {} due to {}", configurableComponent.getClass().getName(), e.getMessage());
}
}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoaders.java b/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoaders.java
index aecb846fda..30b7263c8d 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoaders.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoaders.java
@@ -255,8 +255,8 @@ public final class NarClassLoaders {
// if that bundle is loaded, use it
if (narCoordinateClassLoaderLookup.containsKey(coordinate.getCoordinate())) {
- logger.warn(String.format("While loading '%s' unable to locate exact NAR dependency '%s'. Only found one possible match '%s'. Continuing...",
- narDetail.getCoordinate().getCoordinate(), dependencyCoordinateStr, coordinate.getCoordinate()));
+ logger.warn("While loading '{}' unable to locate exact NAR dependency '{}'. Only found one possible match '{}'. Continuing...",
+ narDetail.getCoordinate().getCoordinate(), dependencyCoordinateStr, coordinate.getCoordinate());
final ClassLoader narDependencyClassLoader = narCoordinateClassLoaderLookup.get(coordinate.getCoordinate());
narClassLoader = createNarClassLoader(narDetail.getWorkingDirectory(), narDependencyClassLoader, logDetails);
@@ -298,8 +298,7 @@ public final class NarClassLoaders {
// see if any nars couldn't be loaded
for (final BundleDetails narDetail : narDetails) {
- logger.warn(String.format("Unable to resolve required dependency '%s'. Skipping NAR '%s'",
- narDetail.getDependencyCoordinate().getId(), narDetail.getWorkingDirectory().getAbsolutePath()));
+ logger.warn("Unable to resolve required dependency '{}'. Skipping NAR '{}'", narDetail.getDependencyCoordinate().getId(), narDetail.getWorkingDirectory().getAbsolutePath());
}
}
@@ -378,8 +377,7 @@ public final class NarClassLoaders {
// See if any bundles couldn't be loaded
final Set<BundleDetails> skippedBundles = new HashSet<>();
for (final BundleDetails bundleDetail : additionalBundleDetails) {
- logger.warn(String.format("Unable to resolve required dependency '%s'. Skipping NAR '%s'",
- bundleDetail.getDependencyCoordinate().getId(), bundleDetail.getWorkingDirectory().getAbsolutePath()));
+ logger.warn("Unable to resolve required dependency '{}'. Skipping NAR '{}'", bundleDetail.getDependencyCoordinate().getId(), bundleDetail.getWorkingDirectory().getAbsolutePath());
skippedBundles.add(bundleDetail);
}
@@ -424,8 +422,8 @@ public final class NarClassLoaders {
final Optional<Bundle> matchingDependencyIdBundle = getBundle(coordinate);
if (matchingDependencyIdBundle.isPresent()) {
final String dependencyCoordinateStr = bundleDependencyCoordinate.getCoordinate();
- logger.warn(String.format("While loading '%s' unable to locate exact NAR dependency '%s'. Only found one possible match '%s'. Continuing...",
- bundleDetail.getCoordinate().getCoordinate(), dependencyCoordinateStr, coordinate.getCoordinate()));
+ logger.warn("While loading '{}' unable to locate exact NAR dependency '{}'. Only found one possible match '{}'. Continuing...",
+ bundleDetail.getCoordinate().getCoordinate(), dependencyCoordinateStr, coordinate.getCoordinate());
final ClassLoader narDependencyClassLoader = matchingDependencyIdBundle.get().getClassLoader();
bundleClassLoader = createNarClassLoader(bundleDetail.getWorkingDirectory(), narDependencyClassLoader, logDetails);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
index d025bc24c0..264dfbaa9e 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/src/main/java/org/apache/nifi/web/server/JettyServer.java
@@ -517,7 +517,7 @@ public class JettyServer implements NiFiServer, ExtensionUiLoader {
readUiExtensions(uiExtensions, UiExtensionType.ParameterProviderConfiguration, jarFile, jarFile.getJarEntry("META-INF/nifi-parameter-provider-configuration"));
readUiExtensions(uiExtensions, UiExtensionType.FlowRegistryClientConfiguration, jarFile, jarFile.getJarEntry("META-INF/nifi-flow-registry-client-configuration"));
} catch (IOException ioe) {
- logger.warn(String.format("Unable to inspect %s for a UI extensions.", warFile));
+ logger.warn("Unable to inspect {} for a UI extensions.", warFile);
}
}
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 464e03a81e..06d7fbbb59 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
@@ -2200,7 +2200,7 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade {
accessPolicyDAO.deleteAccessPolicy(readPolicy.getIdentifier());
}
} catch (final Exception e) {
- logger.warn(String.format("Unable to remove access policy for %s %s after component removal.", action, resource.getIdentifier()), e);
+ logger.warn("Unable to remove access policy for {} {} after component removal.", action, resource.getIdentifier(), e);
}
}
}
@@ -2793,7 +2793,7 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade {
}
});
} catch (final Exception e) {
- logger.warn(String.format("Unable to create ControllerService of type %s to populate default values.", dto.getType()));
+ logger.warn("Unable to create ControllerService of type {} to populate default values.", dto.getType());
}
});
}
@@ -2817,7 +2817,7 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade {
}
});
} catch (final Exception e) {
- logger.warn(String.format("Unable to create Processor of type %s to populate default values.", dto.getType()));
+ logger.warn("Unable to create Processor of type {} to populate default values.", dto.getType());
}
});
}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AccessDeniedExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AccessDeniedExceptionMapper.java
index 4223d24757..ba13fa0fad 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AccessDeniedExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AccessDeniedExceptionMapper.java
@@ -58,7 +58,7 @@ public class AccessDeniedExceptionMapper implements ExceptionMapper<AccessDenied
identity = user.toString();
}
- logger.info(String.format("%s does not have permission to access the requested resource. %s Returning %s response.", identity, exception.getMessage(), status));
+ logger.info("{} does not have permission to access the requested resource. {} Returning {} response.", identity, exception.getMessage(), status);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AdministrationExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AdministrationExceptionMapper.java
index 4c088b835d..bb87e29a33 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AdministrationExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AdministrationExceptionMapper.java
@@ -34,7 +34,7 @@ public class AdministrationExceptionMapper implements ExceptionMapper<Administra
@Override
public Response toResponse(AdministrationException exception) {
// log the error
- logger.error(String.format("%s. Returning %s response.", exception, Response.Status.INTERNAL_SERVER_ERROR), exception);
+ logger.error("{}. Returning {} response.", exception, Response.Status.INTERNAL_SERVER_ERROR, exception);
// generate the response
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(exception.getMessage()).type("text/plain").build();
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AuthenticationCredentialsNotFoundExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AuthenticationCredentialsNotFoundExceptionMapper.java
index 4665680c2f..078f914715 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AuthenticationCredentialsNotFoundExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AuthenticationCredentialsNotFoundExceptionMapper.java
@@ -35,7 +35,7 @@ public class AuthenticationCredentialsNotFoundExceptionMapper implements Excepti
@Override
public Response toResponse(AuthenticationCredentialsNotFoundException exception) {
// log the error
- logger.info(String.format("No valid credentials were found in the request: %s. Returning %s response.", exception, Response.Status.FORBIDDEN));
+ logger.info("No valid credentials were found in the request: {}. Returning {} response.", exception, Response.Status.FORBIDDEN);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AuthorizationAccessExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AuthorizationAccessExceptionMapper.java
index a69577e2b9..e5979c3c2b 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AuthorizationAccessExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/AuthorizationAccessExceptionMapper.java
@@ -35,7 +35,7 @@ public class AuthorizationAccessExceptionMapper implements ExceptionMapper<Autho
@Override
public Response toResponse(AuthorizationAccessException e) {
// log the error
- logger.error(String.format("%s. Returning %s response.", e, Response.Status.INTERNAL_SERVER_ERROR), e);
+ logger.error("{}. Returning {} response.", e, Response.Status.INTERNAL_SERVER_ERROR, e);
// generate the response
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).type("text/plain").build();
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ClusterExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ClusterExceptionMapper.java
index 8e334b44c2..d0e7ed8d30 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ClusterExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ClusterExceptionMapper.java
@@ -35,7 +35,7 @@ public class ClusterExceptionMapper implements ExceptionMapper<ClusterException>
@Override
public Response toResponse(ClusterException exception) {
// log the error
- logger.error(String.format("%s. Returning %s response.", exception, Response.Status.INTERNAL_SERVER_ERROR), exception);
+ logger.error("{}. Returning {} response.", exception, Response.Status.INTERNAL_SERVER_ERROR, exception);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(exception.getMessage()).type("text/plain").build();
}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalClusterResourceRequestExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalClusterResourceRequestExceptionMapper.java
index dde08eacf0..e280240b77 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalClusterResourceRequestExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalClusterResourceRequestExceptionMapper.java
@@ -35,7 +35,7 @@ public class IllegalClusterResourceRequestExceptionMapper implements ExceptionMa
@Override
public Response toResponse(IllegalClusterResourceRequestException exception) {
// log the error
- logger.info(String.format("%s. Returning %s response.", exception, Response.Status.NOT_FOUND));
+ logger.info("{}. Returning {} response.", exception, Response.Status.NOT_FOUND);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalClusterStateExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalClusterStateExceptionMapper.java
index 625361fc6e..2e6d6e20c9 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalClusterStateExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalClusterStateExceptionMapper.java
@@ -35,7 +35,7 @@ public class IllegalClusterStateExceptionMapper implements ExceptionMapper<Illeg
@Override
public Response toResponse(IllegalClusterStateException exception) {
// log the error
- logger.info(String.format("%s. Returning %s response.", exception, Response.Status.CONFLICT));
+ logger.info("{}. Returning {} response.", exception, Response.Status.CONFLICT);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeDeletionExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeDeletionExceptionMapper.java
index 7476f961e8..3b160491ed 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeDeletionExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeDeletionExceptionMapper.java
@@ -35,7 +35,7 @@ public class IllegalNodeDeletionExceptionMapper implements ExceptionMapper<Illeg
@Override
public Response toResponse(IllegalNodeDeletionException exception) {
// log the error
- logger.info(String.format("%s. Returning %s response.", exception, Response.Status.CONFLICT));
+ logger.info("{}. Returning {} response.", exception, Response.Status.CONFLICT);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeDisconnectionExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeDisconnectionExceptionMapper.java
index 3e982f10be..955aff2b26 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeDisconnectionExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeDisconnectionExceptionMapper.java
@@ -35,7 +35,7 @@ public class IllegalNodeDisconnectionExceptionMapper implements ExceptionMapper<
@Override
public Response toResponse(IllegalNodeDisconnectionException exception) {
// log the error
- logger.info(String.format("%s. Returning %s response.", exception, Response.Status.CONFLICT));
+ logger.info("{}. Returning {} response.", exception, Response.Status.CONFLICT);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeOffloadExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeOffloadExceptionMapper.java
index d19ee0dec1..5d7d94e370 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeOffloadExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeOffloadExceptionMapper.java
@@ -35,7 +35,7 @@ public class IllegalNodeOffloadExceptionMapper implements ExceptionMapper<Illega
@Override
public Response toResponse(IllegalNodeOffloadException exception) {
- logger.info(String.format("%s. Returning %s response.", exception, Response.Status.CONFLICT));
+ logger.info("{}. Returning {} response.", exception, Response.Status.CONFLICT);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeReconnectionExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeReconnectionExceptionMapper.java
index 720ab4bd7f..502f4bf30d 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeReconnectionExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/IllegalNodeReconnectionExceptionMapper.java
@@ -35,7 +35,7 @@ public class IllegalNodeReconnectionExceptionMapper implements ExceptionMapper<I
@Override
public Response toResponse(IllegalNodeReconnectionException exception) {
// log the error
- logger.info(String.format("%s. Returning %s response.", exception, Response.Status.CONFLICT));
+ logger.info("{}. Returning {} response.", exception, Response.Status.CONFLICT);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/InterruptedExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/InterruptedExceptionMapper.java
index 65159afcda..7599a5e1b7 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/InterruptedExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/InterruptedExceptionMapper.java
@@ -31,7 +31,7 @@ public class InterruptedExceptionMapper implements ExceptionMapper<InterruptedEx
@Override
public Response toResponse(InterruptedException exception) {
// log the error
- logger.info(String.format("%s. Returning %s response.", exception, Response.Status.INTERNAL_SERVER_ERROR));
+ logger.info("{}. Returning {} response.", exception, Response.Status.INTERNAL_SERVER_ERROR);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/InvalidRevisionExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/InvalidRevisionExceptionMapper.java
index 7d4cb88132..db131a97ec 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/InvalidRevisionExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/InvalidRevisionExceptionMapper.java
@@ -37,7 +37,7 @@ public class InvalidRevisionExceptionMapper implements ExceptionMapper<InvalidRe
@Override
public Response toResponse(InvalidRevisionException exception) {
// log the error
- logger.info(String.format("%s. Returning %s response.", exception, Status.BAD_REQUEST));
+ logger.info("{}. Returning {} response.", exception, Status.BAD_REQUEST);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/JsonContentConversionExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/JsonContentConversionExceptionMapper.java
index e6eb9cbcb5..5148fffe94 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/JsonContentConversionExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/JsonContentConversionExceptionMapper.java
@@ -38,7 +38,7 @@ public class JsonContentConversionExceptionMapper implements ExceptionMapper<Inv
@Override
public Response toResponse(InvalidFormatException ex) {
// log the error
- logger.info(String.format("%s. Returning %s response.", ex, Response.Status.BAD_REQUEST));
+ logger.info("{}. Returning {} response.", ex, Response.Status.BAD_REQUEST);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, ex);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/JsonMappingExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/JsonMappingExceptionMapper.java
index b291cfe3a0..cdf33a180a 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/JsonMappingExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/JsonMappingExceptionMapper.java
@@ -36,7 +36,7 @@ public class JsonMappingExceptionMapper implements ExceptionMapper<JsonMappingEx
@Override
public Response toResponse(JsonMappingException ex) {
// log the error
- logger.info(String.format("%s. Returning %s response.", ex, Response.Status.BAD_REQUEST));
+ logger.info("{}. Returning {} response.", ex, Response.Status.BAD_REQUEST);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, ex);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/JsonParseExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/JsonParseExceptionMapper.java
index 5de273ccba..28b11d9d65 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/JsonParseExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/JsonParseExceptionMapper.java
@@ -35,7 +35,7 @@ public class JsonParseExceptionMapper implements ExceptionMapper<JsonParseExcept
@Override
public Response toResponse(JsonParseException ex) {
// log the error
- logger.info(String.format("%s. Returning %s response.", ex, Response.Status.BAD_REQUEST));
+ logger.info("{}. Returning {} response.", ex, Response.Status.BAD_REQUEST);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, ex);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/MutableRequestExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/MutableRequestExceptionMapper.java
index b0b36c8c4a..71f3753c0c 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/MutableRequestExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/MutableRequestExceptionMapper.java
@@ -35,7 +35,7 @@ public class MutableRequestExceptionMapper implements ExceptionMapper<MutableReq
@Override
public Response toResponse(MutableRequestException ex) {
// log the error
- logger.info(String.format("Cluster is unable to service request to change flow: %s. Returning %s response.", ex, Response.Status.CONFLICT));
+ logger.info("Cluster is unable to service request to change flow: {}. Returning {} response.", ex, Response.Status.CONFLICT);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, ex);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NoClusterCoordinatorExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NoClusterCoordinatorExceptionMapper.java
index 328f9b169c..7e8e7f6456 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NoClusterCoordinatorExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NoClusterCoordinatorExceptionMapper.java
@@ -32,7 +32,7 @@ public class NoClusterCoordinatorExceptionMapper implements ExceptionMapper<NoCl
@Override
public Response toResponse(final NoClusterCoordinatorException ex) {
// log the error
- logger.info(String.format("Cluster failed processing request: %s. Returning %s response.", ex, Response.Status.SERVICE_UNAVAILABLE));
+ logger.info("Cluster failed processing request: {}. Returning {} response.", ex, Response.Status.SERVICE_UNAVAILABLE);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, ex);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NoConnectedNodesExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NoConnectedNodesExceptionMapper.java
index d9c6d1b677..ed28da993b 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NoConnectedNodesExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NoConnectedNodesExceptionMapper.java
@@ -35,7 +35,7 @@ public class NoConnectedNodesExceptionMapper implements ExceptionMapper<NoConnec
@Override
public Response toResponse(NoConnectedNodesException ex) {
// log the error
- logger.info(String.format("Cluster failed processing request: %s. Returning %s response.", ex, Response.Status.INTERNAL_SERVER_ERROR));
+ logger.info("Cluster failed processing request: {}. Returning {} response.", ex, Response.Status.INTERNAL_SERVER_ERROR);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, ex);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NoResponseFromNodesExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NoResponseFromNodesExceptionMapper.java
index f6139bd73a..688a0842c8 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NoResponseFromNodesExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NoResponseFromNodesExceptionMapper.java
@@ -36,7 +36,7 @@ public class NoResponseFromNodesExceptionMapper implements ExceptionMapper<NoRes
@Override
public Response toResponse(NoResponseFromNodesException exception) {
// log the error
- logger.info(String.format("%s. Returning %s response.", exception, Response.Status.CONFLICT));
+ logger.info("{}. Returning {} response.", exception, Response.Status.CONFLICT);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NodeDisconnectionExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NodeDisconnectionExceptionMapper.java
index 8c7ee98e71..71cb8e53c4 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NodeDisconnectionExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NodeDisconnectionExceptionMapper.java
@@ -35,7 +35,7 @@ public class NodeDisconnectionExceptionMapper implements ExceptionMapper<NodeDis
@Override
public Response toResponse(NodeDisconnectionException exception) {
// log the error
- logger.info(String.format("%s. Returning %s response.", exception, Response.Status.CONFLICT));
+ logger.info("{}. Returning {} response.", exception, Response.Status.CONFLICT);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NodeReconnectionExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NodeReconnectionExceptionMapper.java
index 38e8b89b44..5feb32e1ab 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NodeReconnectionExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NodeReconnectionExceptionMapper.java
@@ -35,7 +35,7 @@ public class NodeReconnectionExceptionMapper implements ExceptionMapper<NodeReco
@Override
public Response toResponse(NodeReconnectionException exception) {
// log the error
- logger.info(String.format("%s. Returning %s response.", exception, Response.Status.CONFLICT));
+ logger.info("{}. Returning {} response.", exception, Response.Status.CONFLICT);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NotFoundExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NotFoundExceptionMapper.java
index 7b169e7f23..9524d45cf0 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NotFoundExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/NotFoundExceptionMapper.java
@@ -37,7 +37,7 @@ public class NotFoundExceptionMapper implements ExceptionMapper<NotFoundExceptio
@Override
public Response toResponse(NotFoundException exception) {
// log the error
- logger.info(String.format("%s. Returning %s response.", exception, Status.NOT_FOUND));
+ logger.info("{}. Returning {} response.", exception, Status.NOT_FOUND);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ResourceNotFoundExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ResourceNotFoundExceptionMapper.java
index 682ee7b78b..2af069f0d3 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ResourceNotFoundExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ResourceNotFoundExceptionMapper.java
@@ -37,7 +37,7 @@ public class ResourceNotFoundExceptionMapper implements ExceptionMapper<Resource
@Override
public Response toResponse(ResourceNotFoundException exception) {
// log the error
- logger.info(String.format("%s. Returning %s response.", exception, Response.Status.NOT_FOUND));
+ logger.info("{}. Returning {} response.", exception, Response.Status.NOT_FOUND);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ThrowableMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ThrowableMapper.java
index 28b52b1f40..74013c09d1 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ThrowableMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ThrowableMapper.java
@@ -33,7 +33,7 @@ public class ThrowableMapper implements ExceptionMapper<Throwable> {
@Override
public Response toResponse(Throwable exception) {
// log the error
- logger.error(String.format("An unexpected error has occurred: %s. Returning %s response.", exception, Response.Status.INTERNAL_SERVER_ERROR), exception);
+ logger.error("An unexpected error has occurred: {}. Returning {} response.", exception, Response.Status.INTERNAL_SERVER_ERROR, exception);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity("An unexpected error has occurred. Please check the logs for additional details.").type("text/plain").build();
}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/UnknownNodeExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/UnknownNodeExceptionMapper.java
index f4e2f7dd01..8001642979 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/UnknownNodeExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/UnknownNodeExceptionMapper.java
@@ -35,7 +35,7 @@ public class UnknownNodeExceptionMapper implements ExceptionMapper<UnknownNodeEx
@Override
public Response toResponse(UnknownNodeException exception) {
// log the error
- logger.info(String.format("%s. Returning %s response.", exception, Response.Status.NOT_FOUND));
+ logger.info("{}. Returning {} response.", exception, Response.Status.NOT_FOUND);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ValidationExceptionMapper.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ValidationExceptionMapper.java
index 26c47619ff..7d7612276a 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ValidationExceptionMapper.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/config/ValidationExceptionMapper.java
@@ -36,7 +36,7 @@ public class ValidationExceptionMapper implements ExceptionMapper<ValidationExce
@Override
public Response toResponse(ValidationException exception) {
// log the error
- logger.info(String.format("%s. Returning %s response.", exception, Response.Status.BAD_REQUEST));
+ logger.info("{}. Returning {} response.", exception, Response.Status.BAD_REQUEST);
if (logger.isDebugEnabled()) {
logger.debug(org.apache.nifi.util.StringUtils.EMPTY, exception);
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
index 09b312781c..d1c243b1ae 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
@@ -1350,7 +1350,7 @@ public class ControllerFacade implements Authorizable {
} catch (final ContentNotFoundException cnfe) {
throw new ResourceNotFoundException("Unable to find the specified content.");
} catch (final IOException ioe) {
- logger.error(String.format("Unable to get the content for event (%s) at this time.", eventId), ioe);
+ logger.error("Unable to get the content for event ({}) at this time.", eventId, ioe);
throw new IllegalStateException("Unable to get the content at this time.");
}
}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java
index bf0a8b6989..71d26712f5 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardConnectionDAO.java
@@ -144,7 +144,7 @@ public class StandardConnectionDAO extends ComponentDAO implements ConnectionDAO
return flowFile;
} catch (final IOException ioe) {
- logger.error(String.format("Unable to get the flowfile (%s) at this time.", flowFileUuid), ioe);
+ logger.error("Unable to get the flowfile ({}) at this time.", flowFileUuid, ioe);
throw new IllegalStateException("Unable to get the FlowFile at this time.");
}
}
@@ -677,7 +677,7 @@ public class StandardConnectionDAO extends ComponentDAO implements ConnectionDAO
} catch (final ContentNotFoundException cnfe) {
throw new ResourceNotFoundException("Unable to find the specified content.");
} catch (final IOException ioe) {
- logger.error(String.format("Unable to get the content for flowfile (%s) at this time.", flowFileUuid), ioe);
+ logger.error("Unable to get the content for flowfile ({}) at this time.", flowFileUuid, ioe);
throw new IllegalStateException("Unable to get the content at this time.");
}
}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java
index ce96e1ae09..67fb65db21 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java
@@ -925,7 +925,7 @@ public final class SnippetUtils {
try {
accessPolicyDAO.deleteAccessPolicy(accessPolicy.getIdentifier());
} catch (final Exception e) {
- logger.warn(String.format("Unable to clean up cloned access policy for %s %s after failed copy/paste action.", action, componentResource.getIdentifier()), e);
+ logger.warn("Unable to clean up cloned access policy for {} {} after failed copy/paste action.", action, componentResource.getIdentifier(), e);
}
}
}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/x509/ocsp/OcspCertificateValidator.java b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/x509/ocsp/OcspCertificateValidator.java
index a35a6113af..f16b74c95d 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/x509/ocsp/OcspCertificateValidator.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-security/src/main/java/org/apache/nifi/web/security/x509/ocsp/OcspCertificateValidator.java
@@ -128,9 +128,9 @@ public class OcspCertificateValidator {
ocspCache = Caffeine.newBuilder().expireAfterWrite(cacheDurationMillis, TimeUnit.MILLISECONDS).build(ocspRequest -> {
final String subjectDn = ocspRequest.getSubjectCertificate().getSubjectX500Principal().getName();
- logger.info(String.format("Validating client certificate via OCSP: <%s>", subjectDn));
+ logger.info("Validating client certificate via OCSP: <{}>", subjectDn);
final OcspStatus ocspStatus = getOcspStatus(ocspRequest);
- logger.info(String.format("Client certificate status for <%s>: %s", subjectDn, ocspStatus.toString()));
+ logger.info("Client certificate status for <{}>: {}", subjectDn, ocspStatus);
return ocspStatus;
});
@@ -307,7 +307,7 @@ public class OcspCertificateValidator {
// ensure the request was completed successfully
if (Response.Status.OK.getStatusCode() != response.getStatusInfo().getStatusCode()) {
- logger.warn(String.format("OCSP request was unsuccessful (%s).", response.getStatus()));
+ logger.warn("OCSP request was unsuccessful ({}).", response.getStatus());
return ocspStatus;
}
@@ -341,14 +341,14 @@ public class OcspCertificateValidator {
// only proceed if the response was successful
if (ocspResponse.getStatus() != OCSPRespBuilder.SUCCESSFUL) {
- logger.warn(String.format("OCSP request was unsuccessful (%s).", ocspStatus.getResponseStatus().toString()));
+ logger.warn("OCSP request was unsuccessful ({}).", ocspStatus.getResponseStatus());
return ocspStatus;
}
// ensure the appropriate response object
final Object ocspResponseObject = ocspResponse.getResponseObject();
if (!(ocspResponseObject instanceof BasicOCSPResp)) {
- logger.warn(String.format("Unexpected OCSP response object: %s", ocspResponseObject));
+ logger.warn("Unexpected OCSP response object: {}", ocspResponseObject);
return ocspStatus;
}
@@ -358,7 +358,7 @@ public class OcspCertificateValidator {
// attempt to locate the responder certificate
final X509CertificateHolder[] responderCertificates = basicOcspResponse.getCerts();
if (responderCertificates.length != 1) {
- logger.warn(String.format("Unexpected number of OCSP responder certificates: %s", responderCertificates.length));
+ logger.warn("Unexpected number of OCSP responder certificates: {}", responderCertificates.length);
return ocspStatus;
}
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/AuthorizerFactory.java b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/AuthorizerFactory.java
index 4c0f41d60f..7642125f4f 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/AuthorizerFactory.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/AuthorizerFactory.java
@@ -386,7 +386,7 @@ public class AuthorizerFactory implements UserGroupProviderLookup, AccessPolicyP
// if additional classpath resources were specified, replace with a new ClassLoader that contains
// the combined resources of the original ClassLoader + the additional resources
if (StringUtils.isNotEmpty(classpathResources)) {
- logger.info(String.format("Replacing Authorizer ClassLoader for '%s' to include additional resources: %s", identifier, classpathResources));
+ logger.info("Replacing Authorizer ClassLoader for '{}' to include additional resources: {}", identifier, classpathResources);
final URL[] originalUrls = extensionClassLoader.getURLs();
final URL[] additionalUrls = ClassLoaderUtils.getURLsForClasspath(classpathResources, null, true);
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/file/FileAccessPolicyProvider.java b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/file/FileAccessPolicyProvider.java
index e0c3dbc019..ac0d1e2dfc 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/file/FileAccessPolicyProvider.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/file/FileAccessPolicyProvider.java
@@ -157,7 +157,7 @@ public class FileAccessPolicyProvider extends AbstractConfigurableAccessPolicyPr
// load the authorizations
load();
- logger.info(String.format("Authorizations file loaded at %s", new Date().toString()));
+ logger.info("Authorizations file loaded at {}", new Date());
} catch (JAXBException | SAXException e) {
throw new SecurityProviderCreationException(e);
}
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/file/FileUserGroupProvider.java b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/file/FileUserGroupProvider.java
index 5650761077..93361d18bc 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/file/FileUserGroupProvider.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/authorization/file/FileUserGroupProvider.java
@@ -140,7 +140,7 @@ public class FileUserGroupProvider implements ConfigurableUserGroupProvider {
load();
- logger.info(String.format("Users/Groups file loaded at %s", new Date().toString()));
+ logger.info("Users/Groups file loaded at {}", new Date());
} catch (SecurityProviderCreationException | JAXBException | IllegalStateException | SAXException e) {
throw new SecurityProviderCreationException(e);
}
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/ldap/LdapIdentityProvider.java b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/ldap/LdapIdentityProvider.java
index 47760c1c86..22f0e4eeea 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/ldap/LdapIdentityProvider.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/ldap/LdapIdentityProvider.java
@@ -195,7 +195,7 @@ public class LdapIdentityProvider extends BasicAuthIdentityProvider implements I
final String rawIdentityStrategy = configurationContext.getProperty("Identity Strategy");
if (StringUtils.isBlank(rawIdentityStrategy)) {
- logger.info(String.format("Identity Strategy is not configured, defaulting strategy to %s.", IdentityStrategy.USE_DN));
+ logger.info("Identity Strategy is not configured, defaulting strategy to {}.", IdentityStrategy.USE_DN);
// if this value is not configured, default to use dn which was the previous implementation
identityStrategy = IdentityStrategy.USE_DN;
@@ -254,7 +254,7 @@ public class LdapIdentityProvider extends BasicAuthIdentityProvider implements I
final LdapUserDetails userDetails = (LdapUserDetails) authentication.getPrincipal();
return new AuthenticationResponse(userDetails.getDn(), username, expiration, issuer);
} else {
- logger.warn(String.format("Unable to determine user DN for %s, using username.", authentication.getName()));
+ logger.warn("Unable to determine user DN for {}, using username.", authentication.getName());
return new AuthenticationResponse(authentication.getName(), username, expiration, issuer);
}
} else {
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/ldap/tenants/LdapUserGroupProvider.java b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/ldap/tenants/LdapUserGroupProvider.java
index 09f22681e9..ec16a6efab 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/ldap/tenants/LdapUserGroupProvider.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/src/main/java/org/apache/nifi/registry/security/ldap/tenants/LdapUserGroupProvider.java
@@ -586,9 +586,9 @@ public class LdapUserGroupProvider implements UserGroupProvider {
if (user != null) {
groupToUserIdentifierMappings.computeIfAbsent(referencedGroupValue, g -> new HashSet<>()).add(user.getIdentifier());
} else {
- logger.debug(String.format("%s contains member %s but that user was not found while searching users. " +
+ logger.debug("{} contains member {} but that user was not found while searching users. " +
"This may be due to misconfiguration or because that user is not a NiFi Registry user as defined by the User Search Base and Filter. " +
- "Ignoring group membership.", name, userValue));
+ "Ignoring group membership.", name, userValue);
}
} else {
// since performUserSearch is false, then the referenced group attribute must be blank... the user value must be the dn.
@@ -634,10 +634,10 @@ public class LdapUserGroupProvider implements UserGroupProvider {
} while (hasMorePages(groupProcessor));
// any remaining groupDn's were referenced by a user but not found while searching groups
- groupToUserIdentifierMappings.forEach((referencedGroupValue, userIdentifiers) -> logger.debug(String.format(
- "[%s] are members of %s but that group was not found while searching groups. " +
+ groupToUserIdentifierMappings.forEach((referencedGroupValue, userIdentifiers) -> logger.debug(
+ "[{}] are members of {} but that group was not found while searching groups. " +
"This may be due to misconfiguration or because that group is not a NiFi Registry group as defined by the Group Search Base and Filter. " +
- "Ignoring group membership.", StringUtils.join(userIdentifiers, ", "), referencedGroupValue)));
+ "Ignoring group membership.", StringUtils.join(userIdentifiers, ", "), referencedGroupValue));
} else {
// since performGroupSearch is false, then the referenced user attribute must be blank... the group value must be the dn
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 12df974c13..83a3109087 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
@@ -152,7 +152,7 @@ public class NiFiRegistryProperties extends ApplicationProperties {
try {
webThreads = Integer.parseInt(getProperty(WEB_THREADS));
} catch (final NumberFormatException nfe) {
- logger.warn(String.format("%s must be an integer value. Defaulting to %s", WEB_THREADS, webThreads));
+ logger.warn("{} must be an integer value. Defaulting to {}", WEB_THREADS, webThreads);
}
return webThreads;
}
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/api/AccessResource.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/api/AccessResource.java
index 158c90dee5..ba1bb21d54 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/api/AccessResource.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/api/AccessResource.java
@@ -991,7 +991,7 @@ public class AccessResource extends ApplicationResource {
oidcResponse = AuthenticationResponseParser.parse(requestUri);
} catch (final ParseException e) {
final String loginOrLogoutString = isLogin ? "login" : "logout";
- logger.error(String.format("Unable to parse the redirect URI from the OpenId Connect Provider. Unable to continue %s process.", loginOrLogoutString));
+ logger.error("Unable to parse the redirect URI from the OpenId Connect Provider. Unable to continue {} process.", loginOrLogoutString);
// remove the oidc request cookie
removeOidcRequestCookie(httpServletResponse);
@@ -1009,7 +1009,7 @@ public class AccessResource extends ApplicationResource {
final State state = successfulOidcResponse.getState();
if (state == null || !oidcService.isStateValid(oidcRequestIdentifier, state)) {
final String loginOrLogoutMessage = isLogin ? "login" : "logout";
- logger.error(String.format("The state value returned by the OpenId Connect Provider does not match the stored state. Unable to continue %s process.", loginOrLogoutMessage));
+ logger.error("The state value returned by the OpenId Connect Provider does not match the stored state. Unable to continue {} process.", loginOrLogoutMessage);
// remove the oidc request cookie
removeOidcRequestCookie(httpServletResponse);
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/api/ApplicationResource.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/api/ApplicationResource.java
index 51c5f8fc9c..7a66c59a98 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/api/ApplicationResource.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/api/ApplicationResource.java
@@ -117,7 +117,7 @@ public class ApplicationResource {
try {
uriPort = Integer.parseInt(port);
} catch (final NumberFormatException nfe) {
- logger.warn(String.format("Unable to parse proxy port HTTP header '%s'. Using port from request URI '%s'.", port, uriPort));
+ logger.warn("Unable to parse proxy port HTTP header '{}'. Using port from request URI '{}'.", port, uriPort);
}
}
}
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/AccessDeniedExceptionMapper.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/AccessDeniedExceptionMapper.java
index 204179556a..eab8b25c9f 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/AccessDeniedExceptionMapper.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/AccessDeniedExceptionMapper.java
@@ -60,7 +60,7 @@ public class AccessDeniedExceptionMapper implements ExceptionMapper<AccessDenied
identity = user.toString();
}
- logger.info(String.format("%s does not have permission to access the requested resource. %s Returning %s response.", identity, exception.getMessage(), status));
+ logger.info("{} does not have permission to access the requested resource. {} Returning {} response.", identity, exception.getMessage(), status);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/AdministrationExceptionMapper.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/AdministrationExceptionMapper.java
index 606569b2c0..d6d0c05dd9 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/AdministrationExceptionMapper.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/AdministrationExceptionMapper.java
@@ -37,7 +37,7 @@ public class AdministrationExceptionMapper implements ExceptionMapper<Administra
@Override
public Response toResponse(AdministrationException exception) {
// log the error
- logger.error(String.format("%s. Returning %s response.", exception, Response.Status.INTERNAL_SERVER_ERROR), exception);
+ logger.error("{}. Returning {} response.", exception, Response.Status.INTERNAL_SERVER_ERROR, exception);
// generate the response
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(exception.getMessage()).type("text/plain").build();
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/AuthenticationCredentialsNotFoundExceptionMapper.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/AuthenticationCredentialsNotFoundExceptionMapper.java
index e89e42a209..3cd0422a5f 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/AuthenticationCredentialsNotFoundExceptionMapper.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/AuthenticationCredentialsNotFoundExceptionMapper.java
@@ -38,7 +38,7 @@ public class AuthenticationCredentialsNotFoundExceptionMapper implements Excepti
@Override
public Response toResponse(AuthenticationCredentialsNotFoundException exception) {
// log the error
- logger.info(String.format("No valid credentials were found in the request: %s. Returning %s response.", exception, Response.Status.FORBIDDEN));
+ logger.info("No valid credentials were found in the request: {}. Returning {} response.", exception, Response.Status.FORBIDDEN);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/AuthorizationAccessExceptionMapper.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/AuthorizationAccessExceptionMapper.java
index 40edcb03e0..f6a8ee19d5 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/AuthorizationAccessExceptionMapper.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/AuthorizationAccessExceptionMapper.java
@@ -37,7 +37,7 @@ public class AuthorizationAccessExceptionMapper implements ExceptionMapper<Autho
@Override
public Response toResponse(AuthorizationAccessException e) {
// log the error
- logger.error(String.format("%s. Returning %s response.", e, Response.Status.INTERNAL_SERVER_ERROR), e);
+ logger.error("{}. Returning {} response.", e, Response.Status.INTERNAL_SERVER_ERROR, e);
// generate the response
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).type("text/plain").build();
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/BadRequestExceptionMapper.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/BadRequestExceptionMapper.java
index ec1d4b510d..3758d91885 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/BadRequestExceptionMapper.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/BadRequestExceptionMapper.java
@@ -37,7 +37,7 @@ public class BadRequestExceptionMapper implements ExceptionMapper<BadRequestExce
@Override
public Response toResponse(BadRequestException exception) {
- logger.info(String.format("%s. Returning %s response.", exception, Response.Status.BAD_REQUEST));
+ logger.info("{}. Returning {} response.", exception, Response.Status.BAD_REQUEST);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/ConstraintViolationExceptionMapper.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/ConstraintViolationExceptionMapper.java
index efbe32a910..c78cd46e5b 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/ConstraintViolationExceptionMapper.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/ConstraintViolationExceptionMapper.java
@@ -56,7 +56,7 @@ public class ConstraintViolationExceptionMapper implements ExceptionMapper<Const
errorMessage.append(lastNode.getName()).append(" ").append(violation.getMessage());
}
- logger.info(String.format("%s. Returning %s response.", errorMessage, Response.Status.BAD_REQUEST));
+ logger.info("{}. Returning {} response.", errorMessage, Response.Status.BAD_REQUEST);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
}
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/IllegalArgumentExceptionMapper.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/IllegalArgumentExceptionMapper.java
index d47cd1a99a..c58d9a4af5 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/IllegalArgumentExceptionMapper.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/IllegalArgumentExceptionMapper.java
@@ -36,7 +36,7 @@ public class IllegalArgumentExceptionMapper implements ExceptionMapper<IllegalAr
@Override
public Response toResponse(IllegalArgumentException exception) {
- logger.info(String.format("%s. Returning %s response.", exception, Response.Status.BAD_REQUEST));
+ logger.info("{}. Returning {} response.", exception, Response.Status.BAD_REQUEST);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/IllegalStateExceptionMapper.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/IllegalStateExceptionMapper.java
index 46ee0784a3..bcdbe08bf3 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/IllegalStateExceptionMapper.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/IllegalStateExceptionMapper.java
@@ -34,7 +34,7 @@ public class IllegalStateExceptionMapper implements ExceptionMapper<IllegalState
@Override
public Response toResponse(IllegalStateException exception) {
// log the error
- logger.info(String.format("%s. Returning %s response.", exception, Response.Status.CONFLICT));
+ logger.info("{}. Returning {} response.", exception, Response.Status.CONFLICT);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/InvalidRevisionExceptionMapper.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/InvalidRevisionExceptionMapper.java
index 94f758f34e..34592f166c 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/InvalidRevisionExceptionMapper.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/InvalidRevisionExceptionMapper.java
@@ -36,7 +36,7 @@ public class InvalidRevisionExceptionMapper implements ExceptionMapper<InvalidRe
@Override
public Response toResponse(final InvalidRevisionException exception) {
// log the error
- logger.info(String.format("%s. Returning %s response.", exception, Response.Status.BAD_REQUEST));
+ logger.info("{}. Returning {} response.", exception, Response.Status.BAD_REQUEST);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/NotAllowedExceptionMapper.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/NotAllowedExceptionMapper.java
index c02d2d17cb..3ffa7d2fb5 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/NotAllowedExceptionMapper.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/NotAllowedExceptionMapper.java
@@ -38,7 +38,7 @@ public class NotAllowedExceptionMapper implements ExceptionMapper<NotAllowedExce
@Override
public Response toResponse(NotAllowedException exception) {
- logger.info(String.format("%s. Returning %s response.", exception, Status.METHOD_NOT_ALLOWED));
+ logger.info("{}. Returning {} response.", exception, Status.METHOD_NOT_ALLOWED);
logger.debug(StringUtils.EMPTY, exception);
return Response.status(Status.METHOD_NOT_ALLOWED).entity(exception.getMessage()).type("text/plain").build();
}
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/NotFoundExceptionMapper.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/NotFoundExceptionMapper.java
index f59756b267..c9545f8fe0 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/NotFoundExceptionMapper.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/NotFoundExceptionMapper.java
@@ -38,7 +38,7 @@ public class NotFoundExceptionMapper implements ExceptionMapper<NotFoundExceptio
@Override
public Response toResponse(NotFoundException exception) {
// log the error
- logger.info(String.format("%s. Returning %s response.", exception, Response.Status.NOT_FOUND));
+ logger.info("{}. Returning {} response.", exception, Response.Status.NOT_FOUND);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/QueryParamExceptionMapper.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/QueryParamExceptionMapper.java
index 3d63bd8f04..fa99478404 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/QueryParamExceptionMapper.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/QueryParamExceptionMapper.java
@@ -34,7 +34,7 @@ public class QueryParamExceptionMapper implements ExceptionMapper<ParamException
@Override
public Response toResponse(ParamException.QueryParamException exception) {
- logger.info(String.format("%s. Returning %s response.", exception, Response.Status.BAD_REQUEST));
+ logger.info("{}. Returning {} response.", exception, Response.Status.BAD_REQUEST);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/ResourceNotFoundExceptionMapper.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/ResourceNotFoundExceptionMapper.java
index 512389d17f..98451df3fa 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/ResourceNotFoundExceptionMapper.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/ResourceNotFoundExceptionMapper.java
@@ -35,7 +35,7 @@ public class ResourceNotFoundExceptionMapper implements ExceptionMapper<Resource
@Override
public Response toResponse(ResourceNotFoundException exception) {
// log the error
- logger.info(String.format("%s. Returning %s response.", exception, Response.Status.NOT_FOUND));
+ logger.info("{}. Returning {} response.", exception, Response.Status.NOT_FOUND);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/SerializationExceptionMapper.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/SerializationExceptionMapper.java
index 57ff30f9bf..c210f92a36 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/SerializationExceptionMapper.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/SerializationExceptionMapper.java
@@ -35,7 +35,7 @@ public class SerializationExceptionMapper implements ExceptionMapper<Serializati
@Override
public Response toResponse(SerializationException exception) {
// log the error
- logger.info(String.format("%s. Returning %s response.", exception, Response.Status.INTERNAL_SERVER_ERROR));
+ logger.info("{}. Returning {} response.", exception, Response.Status.INTERNAL_SERVER_ERROR);
if (logger.isDebugEnabled()) {
logger.debug(StringUtils.EMPTY, exception);
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/ThrowableMapper.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/ThrowableMapper.java
index 7614ed0da0..792d43ddca 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/ThrowableMapper.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/mapper/ThrowableMapper.java
@@ -35,7 +35,7 @@ public class ThrowableMapper implements ExceptionMapper<Throwable> {
@Override
public Response toResponse(Throwable exception) {
// log the error
- logger.error(String.format("An unexpected error has occurred: %s. Returning %s response.", exception, Response.Status.INTERNAL_SERVER_ERROR), exception);
+ logger.error("An unexpected error. Returning {} response.", Response.Status.INTERNAL_SERVER_ERROR, exception);
return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity("An unexpected error has occurred. Please check the logs for additional details.").type("text/plain").build();
}
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/jwt/JwtService.java b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/jwt/JwtService.java
index afaa9c6526..a48c2ba679 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/jwt/JwtService.java
+++ b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/main/java/org/apache/nifi/registry/web/security/authentication/jwt/JwtService.java
@@ -185,12 +185,10 @@ public class JwtService {
final long minExpiration = TimeUnit.MILLISECONDS.convert(1, TimeUnit.MINUTES);
if (proposedTokenExpiration > maxExpiration) {
- logger.warn(String.format("Max token expiration exceeded. Setting expiration to %s from %s for %s", maxExpiration,
- proposedTokenExpiration, identity));
+ logger.warn("Max token expiration exceeded. Setting expiration to {} from {} for {}", maxExpiration, proposedTokenExpiration, identity);
proposedTokenExpiration = maxExpiration;
} else if (proposedTokenExpiration < minExpiration) {
- logger.warn(String.format("Min token expiration not met. Setting expiration to %s from %s for %s", minExpiration,
- proposedTokenExpiration, identity));
+ logger.warn("Min token expiration not met. Setting expiration to {} from {} for {}", minExpiration, proposedTokenExpiration, identity);
proposedTokenExpiration = minExpiration;
}