formatting
Project: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/commit/8edcb36b Tree: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/tree/8edcb36b Diff: http://git-wip-us.apache.org/repos/asf/archiva-redback-core/diff/8edcb36b Branch: refs/heads/master Commit: 8edcb36b955d650439e77de753c3acca0f151b9b Parents: 88a2ef7 Author: Olivier Lamy <[email protected]> Authored: Thu Feb 5 21:34:46 2015 +1100 Committer: Olivier Lamy <[email protected]> Committed: Thu Feb 5 21:35:04 2015 +1100 ---------------------------------------------------------------------- .../rest/services/DefaultUserService.java | 25 +++++++++++++------- .../src/test/resources/log4j2-test.xml | 1 + 2 files changed, 18 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/8edcb36b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java ---------------------------------------------------------------------- diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java index 611b607..6a405b7 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUserService.java @@ -75,7 +75,7 @@ import java.util.Collection; import java.util.List; import java.util.Set; -@Service("userService#rest") +@Service( "userService#rest" ) public class DefaultUserService implements UserService { @@ -89,7 +89,7 @@ public class DefaultUserService private SecuritySystem securitySystem; @Inject - @Named(value = "userConfiguration#default") + @Named( value = "userConfiguration#default" ) private UserConfiguration config; @Inject @@ -99,28 +99,28 @@ public class DefaultUserService * cache used for user assignments */ @Inject - @Named(value = "cache#userAssignments") + @Named( value = "cache#userAssignments" ) private Cache userAssignmentsCache; /** * cache used for user permissions */ @Inject - @Named(value = "cache#userPermissions") + @Named( value = "cache#userPermissions" ) private Cache userPermissionsCache; /** * Cache used for users */ @Inject - @Named(value = "cache#users") + @Named( value = "cache#users" ) private Cache usersCache; @Inject private Mailer mailer; @Inject - @Named(value = "rbacManager#default") + @Named( value = "rbacManager#default" ) private RBACManager rbacManager; private HttpAuthenticator httpAuthenticator; @@ -132,9 +132,9 @@ public class DefaultUserService private HttpServletRequest httpServletRequest; @Inject - public DefaultUserService( @Named(value = "userManager#default") UserManager userManager, + public DefaultUserService( @Named( value = "userManager#default" ) UserManager userManager, SecuritySystem securitySystem, - @Named("httpAuthenticator#basic") HttpAuthenticator httpAuthenticator ) + @Named( "httpAuthenticator#basic" ) HttpAuthenticator httpAuthenticator ) { this.userManager = userManager; this.securitySystem = securitySystem; @@ -306,6 +306,7 @@ public class DefaultUserService RedbackRequestInformation redbackRequestInformation = RedbackAuthenticationThreadLocal.get(); if ( redbackRequestInformation == null || redbackRequestInformation.getUser() == null ) { + log.warn( "RedbackRequestInformation from ThreadLocal is null" ); throw new RedbackServiceException( new ErrorMessage( "you must be logged to update your profile" ), Response.Status.FORBIDDEN.getStatusCode() ); } @@ -789,6 +790,10 @@ public class DefaultUserService { userName = redbackRequestInformation.getUser().getUsername(); } + else + { + log.warn( "RedbackRequestInformation from ThreadLocal is null" ); + } return getUserPermissions( userName ); } @@ -802,6 +807,10 @@ public class DefaultUserService { userName = redbackRequestInformation.getUser().getUsername(); } + else + { + log.warn( "RedbackRequestInformation from ThreadLocal is null" ); + } return getUserOperations( userName ); } http://git-wip-us.apache.org/repos/asf/archiva-redback-core/blob/8edcb36b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/log4j2-test.xml ---------------------------------------------------------------------- diff --git a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/log4j2-test.xml b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/log4j2-test.xml index 2d3ff01..eb55d39 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/test/resources/log4j2-test.xml +++ b/redback-integrations/redback-rest/redback-rest-services/src/test/resources/log4j2-test.xml @@ -31,6 +31,7 @@ <logger name="org.springframework" level="error"/> <logger name="org.apache.archiva.redback.components.cache" level="error"/> <logger name="org.apache.archiva.redback.rest.services.interceptors" level="debug"/> + <logger name="org.apache.archiva.redback.rest.services" level="debug"/> <logger name="JPOX" level="ERROR"/> <root level="info"> <appender-ref ref="console"/>
