Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Utilize parameterized logging and remove toString() calls 

As suggested in the SLF4J FAQ:
https://www.slf4j.org/faq.html#logging_performance
.. parameterized logging can improve the efficiency of logger calls when
logging at the specified level is disabled.

In addition, per the FAQ: https://www.slf4j.org/faq.html#paramException
since SLF4J 1.6.0 it is possible to use parameterized logging and also
log an exception/throwable.

toString() is called automatically:
https://www.slf4j.org/faq.html#string_contents

These changes were suggested by SLF4J Helper for NetBeans IDE:
http://plugins.netbeans.org/plugin/72557/
This commit is contained in:
Daniel Trebbien 2017-07-30 13:26:05 -07:00
parent f637c02c71
commit 0b15664f1c
23 changed files with 53 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
View File

@ -703,7 +703,7 @@ public class DefaultArchivaConfiguration
}
catch ( IOException e )
{
log.error( "Unable to create " + filetype + " file: " + e.getMessage(), e );
log.error( "Unable to create {} file: {}", filetype, e.getMessage(), e );
return false;
}
}

2
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurgeTest.java
View File

@ -144,7 +144,7 @@ public abstract class AbstractRepositoryPurgeTest
if ( path.contains( " " ) )
{
LoggerFactory.getLogger( AbstractRepositoryPurgeTest.class.getName() ).error(
"You are building and testing with a path: \n " + path + " containing space. Consider relocating." );
"You are building and testing with a path: \n {} containing space. Consider relocating.", path );
return path.replaceAll( " ", "&20" );
}
return path;

2
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
View File

@ -219,7 +219,7 @@ public class NexusIndexerConsumer
}
catch ( TaskQueueException e )
{
log.error( "Error queueing task: " + task + ": " + e.getMessage(), e );
log.error( "Error queueing task: {}: {}", task, e.getMessage(), e );
}
}

20
archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTest.java
View File

@ -112,7 +112,7 @@ public class DefaultFileLockManagerTest {
logger.info("thread1 ok");
success.incrementAndGet();
} catch (Throwable e) {
logger.error("Error occured " + e.getMessage());
logger.error("Error occured {}", e.getMessage());
e.printStackTrace();
throw e;
}
@ -132,7 +132,7 @@ public class DefaultFileLockManagerTest {
logger.info("thread2 ok");
success.incrementAndGet();
} catch (Throwable e) {
logger.error("Error occured " + e.getMessage());
logger.error("Error occured {}", e.getMessage());
e.printStackTrace();
throw e;
}
@ -156,7 +156,7 @@ public class DefaultFileLockManagerTest {
logger.info("thread3 ok");
success.incrementAndGet();
} catch (Throwable e) {
logger.error("Error occured " + e.getMessage());
logger.error("Error occured {}", e.getMessage());
e.printStackTrace();
throw e;
}
@ -177,7 +177,7 @@ public class DefaultFileLockManagerTest {
logger.info("thread4 ok");
success.incrementAndGet();
} catch (Throwable e) {
logger.error("Error occured " + e.getMessage());
logger.error("Error occured {}", e.getMessage());
e.printStackTrace();
throw e;
}
@ -198,7 +198,7 @@ public class DefaultFileLockManagerTest {
logger.info("thread5 ok");
success.incrementAndGet();
} catch (Throwable e) {
logger.error("Error occured " + e.getMessage());
logger.error("Error occured {}", e.getMessage());
e.printStackTrace();
throw e;
}
@ -221,7 +221,7 @@ public class DefaultFileLockManagerTest {
logger.info("thread6 ok");
success.incrementAndGet();
} catch (Throwable e) {
logger.error("Error occured " + e.getMessage());
logger.error("Error occured {}", e.getMessage());
e.printStackTrace();
throw e;
}
@ -242,7 +242,7 @@ public class DefaultFileLockManagerTest {
logger.info("thread7 ok");
success.incrementAndGet();
} catch (Throwable e) {
logger.error("Error occured " + e.getMessage());
logger.error("Error occured {}", e.getMessage());
e.printStackTrace();
throw e;
}
@ -265,7 +265,7 @@ public class DefaultFileLockManagerTest {
logger.info("thread8 ok");
success.incrementAndGet();
} catch (Throwable e) {
logger.error("Error occured " + e.getMessage());
logger.error("Error occured {}", e.getMessage());
e.printStackTrace();
throw e;
}
@ -286,7 +286,7 @@ public class DefaultFileLockManagerTest {
logger.info("thread9 ok");
success.incrementAndGet();
} catch (Throwable e) {
logger.error("Error occured " + e.getMessage());
logger.error("Error occured {}", e.getMessage());
e.printStackTrace();
throw e;
}
@ -308,7 +308,7 @@ public class DefaultFileLockManagerTest {
logger.info("thread10 ok");
success.incrementAndGet();
} catch (Throwable e) {
logger.error("Error occured " + e.getMessage());
logger.error("Error occured {}", e.getMessage());
e.printStackTrace();
throw e;
}

4
archiva-modules/archiva-base/archiva-filelock/src/test/java/org/apache/archiva/common/filelock/DefaultFileLockManagerTimeoutTest.java
View File

@ -76,14 +76,14 @@ public class DefaultFileLockManagerTimeoutTest
try {
Files.copy(largeJar.toPath(), lock.getFile().toPath(), StandardCopyOption.REPLACE_EXISTING);
} catch (IOException e) {
logger.warn("Copy failed "+e.getMessage());
logger.warn("Copy failed {}", e.getMessage());
// On windows a FileSystemException is thrown
// We ignore this
}
lock = fileLockManager.writeFileLock(file);
} catch (FileSystemException ex) {
logger.error("Exception from filesystem "+ex.getMessage());
logger.error("Exception from filesystem {}", ex.getMessage());
ex.printStackTrace();
throw ex;
}

11
archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
View File

@ -428,10 +428,9 @@ public class DefaultRepositoryProxyConnectors
"Transfer error from repository {} for resource {}, continuing to next repository. Error message: {}",
targetRepository.getRepository().getId(), path, e.getMessage() );
log.debug( MarkerFactory.getDetachedMarker( "transfer.error" ),
"Transfer error from repository \"" + targetRepository.getRepository().getId()
+ "\" for resource " + path + ", continuing to next repository. Error message: {}",
e.getMessage(), e
);
"Transfer error from repository \"{}"
+ "\" for resource {}, continuing to next repository. Error message: {}",
targetRepository.getRepository().getId(), path, e.getMessage(), e );
}
catch ( RepositoryAdminException e )
{
@ -830,8 +829,8 @@ public class DefaultRepositoryProxyConnectors
}
catch ( TaskQueueException e )
{
log.error( "Unable to queue repository task to execute consumers on resource file ['" + localFile.getName()
+ "']." );
log.error( "Unable to queue repository task to execute consumers on resource file ['{}"
+ "'].", localFile.getName() );
}
}

4
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java
View File

@ -89,8 +89,8 @@ public abstract class AbstractRepositoryAdminTest
if ( path.contains( SPACE ) )
{
LoggerFactory.getLogger( AbstractRepositoryAdminTest.class.getName() ).error(
"You are building and testing with {appserver.base}: \n " + path
+ " containing space. Consider relocating." );
"You are building and testing with {appserver.base}: \n {}"
+ " containing space. Consider relocating.", path );
}
return path.replaceAll( SPACE, "&20" );
}

4
archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/ConsumerProcessFileClosure.java
View File

@ -77,8 +77,8 @@ public class ConsumerProcessFileClosure
/* Intentionally Catch all exceptions.
* So that the discoverer processing can continue.
*/
log.error( "Consumer [" + id + "] had an error when processing file ["
+ basefile.getAbsolutePath() + "]: " + e.getMessage(), e );
log.error( "Consumer [{}] had an error when processing file ["
+ "{}]: {}", id, basefile.getAbsolutePath(), e.getMessage(), e );
}
}
}

6
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/ArchivaIndexingTaskExecutor.java
View File

@ -135,7 +135,7 @@ public class ArchivaIndexingTaskExecutor
}
catch ( RepositoryAdminException e )
{
log.error( "Error occurred while creating context: " + e.getMessage() );
log.error( "Error occurred while creating context: {}", e.getMessage() );
throw new TaskExecutionException( "Error occurred while creating context: " + e.getMessage(), e );
}
}
@ -227,7 +227,7 @@ public class ArchivaIndexingTaskExecutor
}
catch ( IOException e )
{
log.error( "Error occurred while executing indexing task '" + indexingTask + "': " + e.getMessage(),
log.error( "Error occurred while executing indexing task '{}': {}", indexingTask, e.getMessage(),
e );
throw new TaskExecutionException( "Error occurred while executing indexing task '" + indexingTask + "'",
e );
@ -261,7 +261,7 @@ public class ArchivaIndexingTaskExecutor
}
catch ( IOException e )
{
log.error( "Error occurred while executing indexing task '" + indexingTask + "': " + e.getMessage() );
log.error( "Error occurred while executing indexing task '{}': {}", indexingTask, e.getMessage() );
throw new TaskExecutionException( "Error occurred while executing indexing task '" + indexingTask + "'",
e );
}

2
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
View File

@ -83,7 +83,7 @@ public class DefaultCommonServices
}
catch ( IOException e )
{
log.warn( "skip error loading properties {}", resourceName.toString() );
log.warn( "skip error loading properties {}", resourceName );
}
return fromProperties( properties );

2
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultPluginsServices.java
View File

@ -72,7 +72,7 @@ public class DefaultPluginsServices
{
sb.append( repoType ).append( "|" );
}
log.debug( "getAdminPlugins: {}", sb.toString() );
log.debug( "getAdminPlugins: {}", sb );
if ( sb.length() > 1 )
{
adminPlugins = sb.substring( 0, sb.length() - 1 );

18
archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
View File

@ -352,7 +352,7 @@ public class DefaultRepositoriesService
}
catch ( AuthorizationException e )
{
log.error( "error reading permission: " + e.getMessage(), e );
log.error( "error reading permission: {}", e.getMessage(), e );
throw new ArchivaRestServiceException( e.getMessage(), e );
}
@ -370,7 +370,7 @@ public class DefaultRepositoriesService
}
catch ( AuthorizationException e )
{
log.error( "error reading permission: " + e.getMessage(), e );
log.error( "error reading permission: {}", e.getMessage(), e );
throw new ArchivaRestServiceException( e.getMessage(), e );
}
@ -394,7 +394,7 @@ public class DefaultRepositoriesService
if ( StringUtils.isEmpty( artifactSourcePath ) )
{
log.error( "cannot find artifact " + artifactTransferRequest.toString() );
log.error( "cannot find artifact {}", artifactTransferRequest );
throw new ArchivaRestServiceException( "cannot find artifact " + artifactTransferRequest.toString(),
null );
}
@ -403,7 +403,7 @@ public class DefaultRepositoriesService
if ( !artifactFile.exists() )
{
log.error( "cannot find artifact " + artifactTransferRequest.toString() );
log.error( "cannot find artifact {}", artifactTransferRequest );
throw new ArchivaRestServiceException( "cannot find artifact " + artifactTransferRequest.toString(),
null );
}
@ -487,17 +487,17 @@ public class DefaultRepositoriesService
}
catch ( RepositoryException e )
{
log.error( "RepositoryException: " + e.getMessage(), e );
log.error( "RepositoryException: {}", e.getMessage(), e );
throw new ArchivaRestServiceException( e.getMessage(), e );
}
catch ( RepositoryAdminException e )
{
log.error( "RepositoryAdminException: " + e.getMessage(), e );
log.error( "RepositoryAdminException: {}", e.getMessage(), e );
throw new ArchivaRestServiceException( e.getMessage(), e );
}
catch ( IOException e )
{
log.error( "IOException: " + e.getMessage(), e );
log.error( "IOException: {}", e.getMessage(), e );
throw new ArchivaRestServiceException( e.getMessage(), e );
}
return true;
@ -517,8 +517,8 @@ public class DefaultRepositoriesService
}
catch ( TaskQueueException e )
{
log.error( "Unable to queue repository task to execute consumers on resource file ['" + localFile.getName()
+ "']." );
log.error( "Unable to queue repository task to execute consumers on resource file ['{}"
+ "'].", localFile.getName() );
}
}

4
archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java
View File

@ -569,8 +569,8 @@ public class DefaultFileUploadService
}
catch ( TaskQueueException e )
{
log.error( "Unable to queue repository task to execute consumers on resource file ['" + localFile.getName()
+ "']." );
log.error( "Unable to queue repository task to execute consumers on resource file ['{}"
+ "'].", localFile.getName() );
}
}

2
archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/runtime/ldap/ArchivaLdapConnectionFactory.java
View File

@ -73,7 +73,7 @@ public class ArchivaLdapConnectionFactory
}
catch ( InvalidNameException e )
{
log.error("Error during initialization of LdapConnectionFactory "+e.getMessage(),e);
log.error( "Error during initialization of LdapConnectionFactory {}", e.getMessage(), e );
// throw new RuntimeException( "Error while initializing connection factory.", e );
}
catch ( RepositoryAdminException e )

2
archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
View File

@ -89,7 +89,7 @@ public class ArchivaUserManagerAuthenticator
}
catch ( RepositoryAdminException e )
{
log.error("Error during repository initialization "+e.getMessage(),e);
log.error( "Error during repository initialization {}", e.getMessage(), e );
// throw new AuthenticationException( e.getMessage(), e );
}
}

2
archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
View File

@ -152,7 +152,7 @@ public class SecuritySynchronization
catch ( RoleManagerException e )
{
// Log error.
log.error( "Unable to create roles for configured repositories: " + e.getMessage(), e );
log.error( "Unable to create roles for configured repositories: {}", e.getMessage(), e );
}
}

4
archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResource.java
View File

@ -723,8 +723,8 @@ public class ArchivaDavResource
}
catch ( TaskQueueException e )
{
log.error( "Unable to queue repository task to execute consumers on resource file ['" + localFile.getName()
+ "']." );
log.error( "Unable to queue repository task to execute consumers on resource file ['{}"
+ "'].", localFile.getName() );
}
}
}

4
archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/util/MimeTypes.java
View File

@ -100,7 +100,7 @@ public class MimeTypes
}
catch ( IOException e )
{
log.error( "Unable to load mime map " + resourceName + " : " + e.getMessage(), e );
log.error( "Unable to load mime map {} : {}", resourceName, e.getMessage(), e );
}
}
@ -146,7 +146,7 @@ public class MimeTypes
}
catch ( IOException e )
{
log.error( "Unable to read mime types from input stream : " + e.getMessage(), e );
log.error( "Unable to read mime types from input stream : {}", e.getMessage(), e );
}
}

2
archiva-modules/plugins/audit/src/main/java/org/apache/archiva/audit/DefaultAuditManager.java
View File

@ -134,7 +134,7 @@ public class DefaultAuditManager
}
catch ( ParseException e )
{
log.error( "Invalid audit event found in the metadata repository: " + e.getMessage() );
log.error( "Invalid audit event found in the metadata repository: {}", e.getMessage() );
// continue and ignore this one
}
}

2
archiva-modules/plugins/metadata-store-cassandra/src/main/java/org/apache/archiva/metadata/repository/cassandra/DefaultCassandraArchivaManager.java
View File

@ -458,7 +458,7 @@ public class DefaultCassandraArchivaManager
{ // ensure keyspace exists, here if the keyspace doesn't exist we suppose nothing exist
if ( cluster.describeKeyspace( keyspaceName ) == null )
{
logger.info( "Creating Archiva Cassandra '" + keyspaceName + "' keyspace." );
logger.info( "Creating Archiva Cassandra '{}' keyspace.", keyspaceName );
cluster.addKeyspace( HFactory.createKeyspaceDefinition( keyspaceName, //
ThriftKsDef.DEF_STRATEGY_CLASS, //
replicationFactor, //

2
archiva-modules/plugins/metadata-store-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
View File

@ -570,7 +570,7 @@ public class FileMetadataRepository
MetadataFacetFactory factory = metadataFacetFactories.get( facetId );
if ( factory == null )
{
log.error( "Attempted to load unknown artifact metadata facet: " + facetId );
log.error( "Attempted to load unknown artifact metadata facet: {}", facetId );
}
else
{

4
archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
View File

@ -1353,7 +1353,7 @@ public class JcrMetadataRepository
getJcrSession().save();
} catch ( InvalidItemStateException e ) {
// olamy this might happen when deleting a repo while is under scanning
log.warn( "skip InvalidItemStateException:" + e.getMessage(), e );
log.warn( "skip InvalidItemStateException:{}", e.getMessage(), e );
}
catch ( RepositoryException e )
{
@ -1493,7 +1493,7 @@ public class JcrMetadataRepository
MetadataFacetFactory factory = metadataFacetFactories.get( name );
if ( factory == null )
{
log.error( "Attempted to load unknown project version metadata facet: " + name );
log.error( "Attempted to load unknown project version metadata facet: {}", name );
}
else
{

2
archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/DefaultRepositoryStatisticsManager.java
View File

@ -156,7 +156,7 @@ public class DefaultRepositoryStatisticsManager
}
catch ( ParseException e )
{
log.error( "Invalid scan result found in the metadata repository: " + e.getMessage() );
log.error( "Invalid scan result found in the metadata repository: {}", e.getMessage() );
// continue and ignore this one
}
}