From 877d1d76b482d5c3b1de18f1a48851b5436af6a4 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sat, 11 Jun 2011 17:55:28 +0000 Subject: [PATCH] simplify debug with using slf4j feature with {} git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1134713 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/archiva/web/action/BrowseAction.java | 10 ++-------- .../AbstractManagedRepositoriesAction.java | 2 +- .../maven/archiva/webdav/ArchivaDavResource.java | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java index 9073be9b8..9b3cb7f58 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/BrowseAction.java @@ -114,10 +114,7 @@ public class BrowseAction } if ( subNamespaces.size() != 1 ) { - if ( log.isDebugEnabled() ) - { - log.debug( n + " is not collapsible as it has sub-namespaces: " + subNamespaces ); - } + log.debug( "{} is not collapsible as it has sub-namespaces: {}", n, subNamespaces ); return n; } else @@ -127,10 +124,7 @@ public class BrowseAction Collection projects = metadataResolver.resolveProjects( repositorySession, repoId, n ); if ( projects != null && !projects.isEmpty() ) { - if ( log.isDebugEnabled() ) - { - log.debug( n + " is not collapsible as it has projects" ); - } + log.debug( "{} is not collapsible as it has projects", n ); return n; } } diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java index 356ca6a99..7dd646963 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/repositories/AbstractManagedRepositoriesAction.java @@ -148,7 +148,7 @@ public abstract class AbstractManagedRepositoriesAction roleManager.removeTemplatedRole( ArchivaRoleConstants.TEMPLATE_REPOSITORY_OBSERVER, repoId ); } - log.debug( "removed user roles associated with repository " + repoId ); + log.debug( "removed user roles associated with repository {}", repoId ); } protected String removeExpressions( String directory ) diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java index c4e9ff478..c84b2cd4c 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResource.java @@ -310,7 +310,7 @@ public class ArchivaDavResource { String msg = "Content Header length was " + expectedContentLength + " but was " + actualContentLength; - log.debug( "Upload failed: " + msg ); + log.debug( "Upload failed: {}", msg ); FileUtils.deleteQuietly( localFile ); throw new DavException( HttpServletResponse.SC_BAD_REQUEST, msg ); -- 2.39.5