svn commit: r1727705 - in /sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful: AuthenticatedResourceProvider.java ResourceProviderAuthenticator.java

[cziegeler]

Author: cziegeler
Date: Sat Jan 30 14:41:44 2016
New Revision: 1727705

URL: http://svn.apache.org/viewvc?rev=1727705&view=rev
Log:
Simple code cleanup

Modified:
    
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/AuthenticatedResourceProvider.java
    
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/ResourceProviderAuthenticator.java

Modified: 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/AuthenticatedResourceProvider.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/AuthenticatedResourceProvider.java?rev=1727705&r1=1727704&r2=1727705&view=diff
==============================================================================
--- 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/AuthenticatedResourceProvider.java
 (original)
+++ 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/AuthenticatedResourceProvider.java
 Sat Jan 30 14:41:44 2016
@@ -155,7 +155,6 @@ public class AuthenticatedResourceProvid
 
                 @Override
                 public Map<String, String> getResolveParameters() {
-                    // TODO Auto-generated method stub
                     return parameters;
                 }
             };
@@ -346,7 +345,7 @@ public class AuthenticatedResourceProvid
     public ResourceProvider<Object> getResourceProvider() {
         return rp;
     }
-    
+
     @Override
     public String toString() {
         return "[" + getClass().getSimpleName() + "# rp: " + rp + ", 
authenticated: " + authenticated + "]";

Modified: 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/ResourceProviderAuthenticator.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/ResourceProviderAuthenticator.java?rev=1727705&r1=1727704&r2=1727705&view=diff
==============================================================================
--- 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/ResourceProviderAuthenticator.java
 (original)
+++ 
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/ResourceProviderAuthenticator.java
 Sat Jan 30 14:41:44 2016
@@ -58,8 +58,6 @@ public class ResourceProviderAuthenticat
 
     private final ResourceAccessSecurityTracker securityTracker;
 
-    boolean allProvidersAuthenticated;
-
     public ResourceProviderAuthenticator(ResourceResolver resolver, 
Map<String, Object> authInfo,
             ResourceAccessSecurityTracker securityTracker) throws 
LoginException {
         this.stateful = new IdentityHashMap<ResourceProviderHandler, 
StatefulResourceProvider>();
@@ -144,8 +142,17 @@ public class ResourceProviderAuthenticat
         return result;
     }
 
-    private @Nonnull StatefulResourceProvider 
createStateful(ResourceProviderHandler handler,
-            CombinedResourceProvider combinedProvider) throws LoginException {
+    /**
+     * Create a stateful resource provider
+     * @param handler Resource provider handler
+     * @param combinedProvider Combined resource provider
+     * @return The stateful resource provider
+     * @throws LoginException
+     */
+    private @Nonnull StatefulResourceProvider createStateful(
+            final ResourceProviderHandler handler,
+            final CombinedResourceProvider combinedProvider)
+    throws LoginException {
         final ResourceProvider<?> rp = handler.getResourceProvider();
         StatefulResourceProvider authenticated;
         authenticated = new AuthenticatedResourceProvider(rp, 
handler.getInfo(), resolver, authInfo, combinedProvider);