Author: cziegeler
Date: Mon Aug 25 09:12:58 2014
New Revision: 1620283
URL: http://svn.apache.org/r1620283
Log:
SLING-3868 : Provide a way to get/set a resource resolver associated to the
current thread
Added:
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryTest.java
(with props)
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java?rev=1620283&r1=1620282&r2=1620283&view=diff
==============================================================================
---
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
(original)
+++
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
Mon Aug 25 09:12:58 2014
@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Stack;
import org.apache.commons.collections.BidiMap;
import org.apache.sling.api.resource.LoginException;
@@ -56,6 +57,11 @@ public class CommonResourceResolverFacto
/** The activator */
private final ResourceResolverFactoryActivator activator;
+ /**
+ * Thread local holding the resource resolver stack
+ */
+ private ThreadLocal<Stack<ResourceResolver>> resolverStackHolder = new
ThreadLocal<Stack<ResourceResolver>>();
+
public CommonResourceResolverFactoryImpl(final
ResourceResolverFactoryActivator activator) {
this.activator = activator;
}
@@ -76,6 +82,9 @@ public class CommonResourceResolverFacto
return getResourceResolverInternal(authenticationInfo, true);
}
+ /**
+ * @see
org.apache.sling.api.resource.ResourceResolverFactory#getResourceResolver(java.util.Map)
+ */
public ResourceResolver getResourceResolver(final Map<String, Object>
passedAuthenticationInfo)
throws LoginException {
// create a copy of the passed authentication info as we modify the map
@@ -87,12 +96,43 @@ public class CommonResourceResolverFacto
authenticationInfo.remove(SUBSERVICE);
}
- return getResourceResolverInternal(authenticationInfo, false);
+ final ResourceResolver result =
getResourceResolverInternal(authenticationInfo, false);
+ Stack<ResourceResolver> resolverStack = resolverStackHolder.get();
+ if ( resolverStack == null ) {
+ resolverStack = new Stack<ResourceResolver>();
+ resolverStackHolder.set(resolverStack);
+ }
+ resolverStack.push(result);
+ return result;
+ }
+
+
+ /**
+ * @see
org.apache.sling.api.resource.ResourceResolverFactory#getThreadResourceResolver()
+ */
+ public ResourceResolver getThreadResourceResolver() {
+ ResourceResolver result = null;
+ final Stack<ResourceResolver> resolverStack =
resolverStackHolder.get();
+ if ( resolverStack != null && !resolverStack.isEmpty() ) {
+ result = resolverStack.peek();
+ }
+ return result;
}
// ---------- Implementation helpers --------------------------------------
/**
+ * Inform about a closed resource resolver.
+ * Make sure to remove it from the current thread context.
+ */
+ public void closed(final ResourceResolverImpl resourceResolverImpl) {
+ final Stack<ResourceResolver> resolverStack =
resolverStackHolder.get();
+ if ( resolverStack != null ) {
+ resolverStack.remove(resourceResolverImpl);
+ }
+ }
+
+ /**
* Create a new ResourceResolver
* @param authenticationInfo The authentication map
* @param isAdmin is an administrative resolver requested?
@@ -121,7 +161,7 @@ public class CommonResourceResolverFacto
try {
plugin = new ResourceResolverWebConsolePlugin(bundleContext, this);
} catch (final Throwable ignore) {
- // an exception here propably means the web console plugin is not
+ // an exception here probably means the web console plugin is not
// available
logger.debug("activate: unable to setup web console plugin.",
ignore);
}
@@ -134,7 +174,7 @@ public class CommonResourceResolverFacto
}
/**
- * Deativates this component
+ * Deactivates this component
*/
protected void deactivate() {
if (plugin != null) {
@@ -146,6 +186,7 @@ public class CommonResourceResolverFacto
mapEntries.dispose();
mapEntries = MapEntries.EMPTY;
}
+ resolverStackHolder = null;
}
public ResourceDecoratorTracker getResourceDecoratorTracker() {
@@ -199,7 +240,7 @@ public class CommonResourceResolverFacto
public boolean isOptimizeAliasResolutionEnabled() {
return this.activator.isOptimizeAliasResolutionEnabled();
}
-
+
public boolean hasVanityPathPrecedence() {
return this.activator.hasVanityPathPrecedence();
}
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java?rev=1620283&r1=1620282&r2=1620283&view=diff
==============================================================================
---
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java
(original)
+++
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryImpl.java
Mon Aug 25 09:12:58 2014
@@ -57,6 +57,9 @@ public class ResourceResolverFactoryImpl
// ---------- Resource Resolver Factory
------------------------------------
+ /**
+ * @see
org.apache.sling.api.resource.ResourceResolverFactory#getServiceResourceResolver(java.util.Map)
+ */
public ResourceResolver getServiceResourceResolver(final Map<String,
Object> passedAuthenticationInfo) throws LoginException {
// create a copy of the passed authentication info as we modify the map
final Map<String, Object> authenticationInfo = new HashMap<String,
Object>();
@@ -88,13 +91,26 @@ public class ResourceResolverFactoryImpl
return commonFactory.getResourceResolverInternal(authenticationInfo,
false);
}
+ /**
+ * @see
org.apache.sling.api.resource.ResourceResolverFactory#getResourceResolver(java.util.Map)
+ */
public ResourceResolver getResourceResolver(
final Map<String, Object> authenticationInfo) throws
LoginException {
return commonFactory.getResourceResolver(authenticationInfo);
}
+ /**
+ * @see
org.apache.sling.api.resource.ResourceResolverFactory#getAdministrativeResourceResolver(java.util.Map)
+ */
public ResourceResolver getAdministrativeResourceResolver(
final Map<String, Object> authenticationInfo) throws
LoginException {
return
commonFactory.getAdministrativeResourceResolver(authenticationInfo);
}
+
+ /**
+ * @see
org.apache.sling.api.resource.ResourceResolverFactory#getThreadResourceResolver()
+ */
+ public ResourceResolver getThreadResourceResolver() {
+ return commonFactory.getThreadResourceResolver();
+ }
}
\ No newline at end of file
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java?rev=1620283&r1=1620282&r2=1620283&view=diff
==============================================================================
---
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
(original)
+++
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
Mon Aug 25 09:12:58 2014
@@ -142,6 +142,7 @@ public class ResourceResolverImpl extend
if (!this.closed) {
this.closed = true;
this.context.close();
+ this.factory.closed(this);
}
}
Added:
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryTest.java?rev=1620283&view=auto
==============================================================================
---
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryTest.java
(added)
+++
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryTest.java
Mon Aug 25 09:12:58 2014
@@ -0,0 +1,99 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.resourceresolver.impl;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import org.apache.sling.api.resource.ResourceResolver;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ResourceResolverFactoryTest {
+
+ private CommonResourceResolverFactoryImpl commonFactory;
+
+ @Before public void setup() {
+ commonFactory = new CommonResourceResolverFactoryImpl(new
ResourceResolverFactoryActivator());
+ }
+
+ @Test public void testSingleThreadLocal() throws Exception {
+ assertNull(this.commonFactory.getThreadResourceResolver());
+ // create first resolver
+ final ResourceResolver rr1 =
this.commonFactory.getResourceResolver(null);
+ assertNotNull(rr1);
+ assertEquals(rr1, this.commonFactory.getThreadResourceResolver());
+ rr1.close();
+
+ assertNull(this.commonFactory.getThreadResourceResolver());
+ }
+
+ @Test public void testNestedThreadLocal() throws Exception {
+ assertNull(this.commonFactory.getThreadResourceResolver());
+ // create first resolver
+ final ResourceResolver rr1 =
this.commonFactory.getResourceResolver(null);
+ assertNotNull(rr1);
+ assertEquals(rr1, this.commonFactory.getThreadResourceResolver());
+
+ // create second resolver
+ final ResourceResolver rr2 =
this.commonFactory.getResourceResolver(null);
+ assertNotNull(rr2);
+ assertEquals(rr2, this.commonFactory.getThreadResourceResolver());
+
+ rr2.close();
+ assertEquals(rr1, this.commonFactory.getThreadResourceResolver());
+
+ rr1.close();
+ assertNull(this.commonFactory.getThreadResourceResolver());
+ }
+
+ @Test public void testNestedUnorderedCloseThreadLocal() throws Exception {
+ assertNull(this.commonFactory.getThreadResourceResolver());
+ // create three resolver
+ final ResourceResolver rr1 =
this.commonFactory.getResourceResolver(null);
+ final ResourceResolver rr2 =
this.commonFactory.getResourceResolver(null);
+ final ResourceResolver rr3 =
this.commonFactory.getResourceResolver(null);
+
+ assertEquals(rr3, this.commonFactory.getThreadResourceResolver());
+
+ rr2.close();
+ assertEquals(rr3, this.commonFactory.getThreadResourceResolver());
+
+ rr3.close();
+ assertEquals(rr1, this.commonFactory.getThreadResourceResolver());
+
+ rr1.close();
+ assertNull(this.commonFactory.getThreadResourceResolver());
+ }
+
+ @Test public void testThreadLocalWithAdmin() throws Exception {
+ assertNull(this.commonFactory.getThreadResourceResolver());
+ final ResourceResolver rr1 =
this.commonFactory.getResourceResolver(null);
+ final ResourceResolver admin =
this.commonFactory.getAdministrativeResourceResolver(null);
+
+ assertEquals(rr1, this.commonFactory.getThreadResourceResolver());
+
+ rr1.close();
+ assertNull(this.commonFactory.getThreadResourceResolver());
+
+ admin.close();
+ assertNull(this.commonFactory.getThreadResourceResolver());
+ }
+}
Propchange:
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryTest.java
------------------------------------------------------------------------------
svn:keywords = author date id revision rev url
Propchange:
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverFactoryTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
