From 4c65d80ad58c0a6ac0ebef23ef81ab5c034eb6eb Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 2 Dec 2013 02:55:43 +0000 Subject: [PATCH] fix logging info level git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1546882 13f79535-47bb-0310-9956-ffa450edef68 --- .../authentication/ldap/LdapBindAuthenticatorTest.java | 2 +- .../redback/integration/mail/MailGeneratorTest.java | 2 +- .../redback/rest/services/AbstractRestServicesTest.java | 2 +- .../redback/rest/services/RoleManagementServiceTest.java | 8 ++++---- .../archiva/redback/rest/services/UserServiceTest.java | 8 ++++---- .../redback/role/processor/DefaultRoleModelProcessor.java | 6 ++---- .../role/template/DefaultRoleTemplateProcessor.java | 4 ++-- .../archiva/redback/users/ldap/LdapUserManagerTest.java | 2 +- 8 files changed, 16 insertions(+), 18 deletions(-) diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java index e36f7158..4da47c05 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java +++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java @@ -77,7 +77,7 @@ public class LdapBindAuthenticatorTest suffix = apacheDs.addSimplePartition( "test", new String[]{ "redback", "plexus", "codehaus", "org" } ).getSuffix(); - log.info( "DN Suffix: " + suffix ); + log.info( "DN Suffix: {}", suffix ); apacheDs.startServer(); diff --git a/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java b/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java index d931c5b0..5396e003 100644 --- a/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java +++ b/redback-integrations/redback-common-integrations/src/test/java/org/apache/archiva/redback/integration/mail/MailGeneratorTest.java @@ -161,7 +161,7 @@ public class MailGeneratorTest assertNotNull( content ); - log.info( "mail content " + content ); + log.info( "mail content {}", content ); assertTrue( content.indexOf( "baseUrl" ) == -1 ); // make sure everything is properly populate assertTrue( content.indexOf( "MY_APPLICATION_URL/security" ) > 0 ); // make sure everything is properly populate diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java index cf72692a..5918fe85 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/AbstractRestServicesTest.java @@ -113,7 +113,7 @@ public abstract class AbstractRestServicesTest this.port = tomcat.getConnector().getLocalPort(); - log.info( "start server on port " + this.port ); + log.info( "start server on port {}", this.port ); UserService userService = getUserService(); diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/RoleManagementServiceTest.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/RoleManagementServiceTest.java index 63e8edb6..89d9663f 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/RoleManagementServiceTest.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/RoleManagementServiceTest.java @@ -100,7 +100,7 @@ public class RoleManagementServiceTest List roles = getRoleManagementService( authorizationHeader ).getEffectivelyAssignedRoles( "toto" ); - log.info( "toto roles:" + roles ); + log.info( "toto roles: {}", roles ); assertTrue( roles.contains( new Role( "User Administrator" ) ) ); } @@ -123,7 +123,7 @@ public class RoleManagementServiceTest for ( Role role : roles ) { - log.info( "role:" + role ); + log.info( "role: {}", role ); } } @@ -133,7 +133,7 @@ public class RoleManagementServiceTest { Role role = getRoleManagementService( authorizationHeader ).getRole( "User Administrator" ); - log.info( "role:" + role ); + log.info( "role: {}", role ); } @@ -246,7 +246,7 @@ public class RoleManagementServiceTest for ( ApplicationRoles applicationRoles : applicationRoleList ) { - log.info( "applicationRoles:" + applicationRoles ); + log.info( "applicationRoles: {}", applicationRoles ); } } diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java index 66d1bd17..6dc93799 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/test/java/org/apache/archiva/redback/rest/services/UserServiceTest.java @@ -314,7 +314,7 @@ public class UserServiceTest throws Exception { Collection permissions = getUserService( authorizationHeader ).getUserPermissions( "admin" ); - log.info( "admin permisssions:" + permissions ); + log.info( "admin permisssions: {}", permissions ); } @Test @@ -323,7 +323,7 @@ public class UserServiceTest { createGuestIfNeeded(); Collection permissions = getUserService().getCurrentUserPermissions(); - log.info( "guest permisssions:" + permissions ); + log.info( "guest permisssions: {}", permissions ); } @Test @@ -331,7 +331,7 @@ public class UserServiceTest throws Exception { Collection operations = getUserService( authorizationHeader ).getUserOperations( "admin" ); - log.info( "admin operations:" + operations ); + log.info( "admin operations: {}", operations ); } @Test @@ -340,7 +340,7 @@ public class UserServiceTest { createGuestIfNeeded(); Collection operations = getUserService().getCurrentUserOperations(); - log.info( "guest operations:" + operations ); + log.info( "guest operations: {}", operations ); } @Test diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java index 85ceec0c..bd078064 100644 --- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java +++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/processor/DefaultRoleModelProcessor.java @@ -258,8 +258,7 @@ public class DefaultRoleModelProcessor { if ( !role.getPermissions().contains( permission ) ) { - log.info( "Adding new permission '" + permission.getName() + "' to role '" + role.getName() - + "'" ); + log.info( "Adding new permission '{}' to role '{}'", permission.getName(), role.getName() ); role.addPermission( permission ); changed = true; } @@ -272,8 +271,7 @@ public class DefaultRoleModelProcessor if ( !permissions.contains( permission ) ) { log.info( - "Removing old permission '" + permission.getName() + "' from role '" + role.getName() - + "'" ); + "Removing old permission '{}' from role '{}'", permission.getName(), role.getName() ); role.removePermission( permission ); changed = true; } diff --git a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java index 313ba474..43857f10 100644 --- a/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java +++ b/redback-rbac/redback-rbac-role-manager/src/main/java/org/apache/archiva/redback/role/template/DefaultRoleTemplateProcessor.java @@ -325,8 +325,8 @@ public class DefaultRoleTemplateProcessor { if ( !role.getPermissions().contains( permission ) ) { - log.info( - "Adding new permission '" + permission.getName() + "' to role '" + role.getName() + "'" ); + log.info( "Adding new permission '{}' to role '{}'", + permission.getName(), role.getName() ); role.addPermission( permission ); changed = true; } diff --git a/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java b/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java index bc54623d..8c6339fa 100644 --- a/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java +++ b/redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java @@ -99,7 +99,7 @@ public class LdapUserManagerTest suffix = apacheDs.addSimplePartition( "test", new String[]{ "redback", "plexus", "codehaus", "org" } ).getSuffix(); - log.info( "DN Suffix: " + suffix ); + log.info( "DN Suffix: {}", suffix ); apacheDs.startServer();