Author: cziegeler
Date: Tue Feb 2 20:41:38 2016
New Revision: 1728206
URL: http://svn.apache.org/viewvc?rev=1728206&view=rev
Log:
SLING-5470 : Resource providers might not be closed
Added:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControl.java
- copied, changed from r1728202,
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContext.java
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java
- copied, changed from r1728198,
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContextTest.java
Removed:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContext.java
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContextTest.java
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/ResourceResolverImpl.java
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/BasicResolveContext.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/CommonResourceResolverFactoryImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java?rev=1728206&r1=1728205&r2=1728206&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
Tue Feb 2 20:41:38 2016
@@ -36,7 +36,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceResolverFactory;
import
org.apache.sling.resourceresolver.impl.console.ResourceResolverWebConsolePlugin;
import org.apache.sling.resourceresolver.impl.helper.ResourceDecoratorTracker;
-import org.apache.sling.resourceresolver.impl.helper.ResourceResolverContext;
+import org.apache.sling.resourceresolver.impl.helper.ResourceResolverControl;
import org.apache.sling.resourceresolver.impl.mapping.MapConfigurationProvider;
import org.apache.sling.resourceresolver.impl.mapping.MapEntries;
import org.apache.sling.resourceresolver.impl.mapping.Mapping;
@@ -202,7 +202,7 @@ public class CommonResourceResolverFacto
* @param ctx The resource resolver context
*/
public void register(final ResourceResolver resolver,
- final ResourceResolverContext ctx) {
+ final ResourceResolverControl ctx) {
// create new weak reference
refs.put(ctx.hashCode(), new ResolverWeakReference(resolver,
this.resolverReferenceQueue, ctx));
}
@@ -214,7 +214,7 @@ public class CommonResourceResolverFacto
* @param ctx The resource resolver context
*/
public void unregister(final ResourceResolver resourceResolverImpl,
- final ResourceResolverContext ctx) {
+ final ResourceResolverControl ctx) {
// close the context
ctx.close();
// remove it from the set of weak references.
@@ -415,11 +415,11 @@ public class CommonResourceResolverFacto
*/
private static final class ResolverWeakReference extends
WeakReference<ResourceResolver> {
- private final ResourceResolverContext context;
+ private final ResourceResolverControl context;
public ResolverWeakReference(final ResourceResolver referent,
final ReferenceQueue<? super ResourceResolver> q,
- final ResourceResolverContext ctx) {
+ final ResourceResolverControl ctx) {
super(referent, q);
this.context = ctx;
}
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=1728206&r1=1728205&r2=1728206&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
Tue Feb 2 20:41:38 2016
@@ -53,7 +53,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.resourceresolver.impl.helper.RedirectResource;
import org.apache.sling.resourceresolver.impl.helper.ResourceIteratorDecorator;
import org.apache.sling.resourceresolver.impl.helper.ResourcePathIterator;
-import org.apache.sling.resourceresolver.impl.helper.ResourceResolverContext;
+import org.apache.sling.resourceresolver.impl.helper.ResourceResolverControl;
import org.apache.sling.resourceresolver.impl.helper.StarResource;
import org.apache.sling.resourceresolver.impl.helper.URI;
import org.apache.sling.resourceresolver.impl.helper.URIException;
@@ -98,7 +98,7 @@ public class ResourceResolverImpl extend
private final CommonResourceResolverFactoryImpl factory;
/** Resource resolver context. */
- private final ResourceResolverContext context;
+ private final ResourceResolverControl control;
private volatile Exception closedResolverException;
@@ -108,8 +108,8 @@ public class ResourceResolverImpl extend
ResourceResolverImpl(final CommonResourceResolverFactoryImpl factory,
final boolean isAdmin, final Map<String, Object> authenticationInfo, final
ResourceProviderStorage storage) throws LoginException {
this.factory = factory;
- this.context = createContext(storage, authenticationInfo, isAdmin);
- this.factory.register(this, context);
+ this.control = createControl(storage, authenticationInfo, isAdmin);
+ this.factory.register(this, control);
}
/**
@@ -121,20 +121,20 @@ public class ResourceResolverImpl extend
private ResourceResolverImpl(final ResourceResolverImpl resolver, final
Map<String, Object> authenticationInfo) throws LoginException {
this.factory = resolver.factory;
Map<String, Object> authInfo = new HashMap<String, Object>();
- if (resolver.context.getAuthenticationInfo() != null) {
- authInfo.putAll(resolver.context.getAuthenticationInfo());
+ if (resolver.control.getAuthenticationInfo() != null) {
+ authInfo.putAll(resolver.control.getAuthenticationInfo());
}
if (authenticationInfo != null) {
authInfo.putAll(authenticationInfo);
}
- this.context =
createContext(factory.getResourceProviderTracker().getResourceProviderStorage(),
authInfo, resolver.context.isAdmin());
- this.factory.register(this, context);
+ this.control =
createControl(factory.getResourceProviderTracker().getResourceProviderStorage(),
authInfo, resolver.control.isAdmin());
+ this.factory.register(this, control);
}
- private ResourceResolverContext createContext(ResourceProviderStorage
storage, Map<String, Object> authenticationInfo, final boolean isAdmin)
+ private ResourceResolverControl createControl(ResourceProviderStorage
storage, Map<String, Object> authenticationInfo, final boolean isAdmin)
throws LoginException {
final ResourceProviderAuthenticator authenticator = new
ResourceProviderAuthenticator(this, authenticationInfo,
this.factory.getResourceAccessSecurityTracker());
- final ResourceResolverContext provider = new
ResourceResolverContext(isAdmin, authenticationInfo, storage, this,
authenticator);
+ final ResourceResolverControl provider = new
ResourceResolverControl(isAdmin, authenticationInfo, storage, this,
authenticator);
authenticator.authenticateAll(storage.getAuthRequiredHandlers(),
provider);
return provider;
}
@@ -157,7 +157,7 @@ public class ResourceResolverImpl extend
*/
@Override
public boolean isLive() {
- return !this.context.isClosed() && this.context.isLive() &&
this.factory.isLive();
+ return !this.control.isClosed() && this.control.isLive() &&
this.factory.isLive();
}
/**
@@ -168,7 +168,7 @@ public class ResourceResolverImpl extend
if (factory.shouldLogResourceResolverClosing()) {
closedResolverException = new Exception("Stack Trace");
}
- this.factory.unregister(this, this.context);
+ this.factory.unregister(this, this.control);
}
/**
@@ -178,7 +178,7 @@ public class ResourceResolverImpl extend
* If the resolver is already closed or the factory is no
longer live.
*/
private void checkClosed() {
- if (this.context.isClosed()) {
+ if (this.control.isClosed()) {
if (closedResolverException != null) {
logger.error("The ResourceResolver has already been closed.",
closedResolverException);
}
@@ -197,7 +197,7 @@ public class ResourceResolverImpl extend
@Override
public Iterator<String> getAttributeNames() {
checkClosed();
- return this.context.getAttributeNames().iterator();
+ return this.control.getAttributeNames().iterator();
}
/**
@@ -210,7 +210,7 @@ public class ResourceResolverImpl extend
throw new NullPointerException("name");
}
- return this.context.getAttribute(name);
+ return this.control.getAttribute(name);
}
// ---------- resolving resources
@@ -484,7 +484,7 @@ public class ResourceResolverImpl extend
}
} else {
logger.debug("map: Optimize Alias Resolution is
Disabled");
- alias = ResourceResolverContext.getProperty(current,
PROP_ALIAS);
+ alias = ResourceResolverControl.getProperty(current,
PROP_ALIAS);
}
}
if (alias == null || alias.length() == 0) {
@@ -701,7 +701,7 @@ public class ResourceResolverImpl extend
if (parent instanceof ResourceWrapper) {
return listChildren(((ResourceWrapper) parent).getResource());
}
- return new
ResourceIteratorDecorator(this.factory.getResourceDecoratorTracker(),
this.context.listChildren(parent));
+ return new
ResourceIteratorDecorator(this.factory.getResourceDecoratorTracker(),
this.control.listChildren(parent));
}
/**
@@ -731,7 +731,7 @@ public class ResourceResolverImpl extend
checkClosed();
return new
ResourceIteratorDecorator(this.factory.getResourceDecoratorTracker(),
- context.findResources(query, defaultString(language,
DEFAULT_QUERY_LANGUAGE)));
+ control.findResources(query, defaultString(language,
DEFAULT_QUERY_LANGUAGE)));
}
/**
@@ -743,7 +743,7 @@ public class ResourceResolverImpl extend
throws SlingException {
checkClosed();
- return context.queryResources(query, defaultString(language,
DEFAULT_QUERY_LANGUAGE));
+ return control.queryResources(query, defaultString(language,
DEFAULT_QUERY_LANGUAGE));
}
/**
@@ -754,12 +754,12 @@ public class ResourceResolverImpl extend
checkClosed();
// Try auth info first
- if ( this.context.getAuthenticationInfo() != null ) {
- final Object impUser =
this.context.getAuthenticationInfo().get(ResourceResolverFactory.USER_IMPERSONATION);
+ if ( this.control.getAuthenticationInfo() != null ) {
+ final Object impUser =
this.control.getAuthenticationInfo().get(ResourceResolverFactory.USER_IMPERSONATION);
if ( impUser != null ) {
return impUser.toString();
}
- final Object user =
this.context.getAuthenticationInfo().get(ResourceResolverFactory.USER);
+ final Object user =
this.control.getAuthenticationInfo().get(ResourceResolverFactory.USER);
if ( user != null ) {
return user.toString();
}
@@ -793,7 +793,7 @@ public class ResourceResolverImpl extend
private Session getSession() {
if ( !this.searchedSession ) {
this.searchedSession = true;
- this.cachedSession = this.context.adaptTo(Session.class);
+ this.cachedSession = this.control.adaptTo(Session.class);
}
return this.cachedSession;
}
@@ -811,7 +811,7 @@ public class ResourceResolverImpl extend
if (type == Session.class) {
return (AdapterType) getSession();
}
- final AdapterType result = this.context.adaptTo(type);
+ final AdapterType result = this.control.adaptTo(type);
if ( result != null ) {
return result;
}
@@ -963,7 +963,7 @@ public class ResourceResolverImpl extend
}
Resource child = getAbsoluteResourceInternal(parent,
ResourceUtil.normalize(path), EMPTY_PARAMETERS, true );
if (child != null) {
- final String alias = ResourceResolverContext.getProperty(child,
PROP_REDIRECT_INTERNAL);
+ final String alias = ResourceResolverControl.getProperty(child,
PROP_REDIRECT_INTERNAL);
if (alias != null) {
// TODO: might be a redirect ??
logger.warn("getChildInternal: Internal redirect to {} for
Resource {} is not supported yet, ignoring", alias,
@@ -1000,7 +1000,7 @@ public class ResourceResolverImpl extend
while (children.hasNext()) {
child = children.next();
if (!child.getPath().endsWith(JCR_CONTENT_LEAF)) {
- final String[] aliases =
ResourceResolverContext.getProperty(child, PROP_ALIAS, String[].class);
+ final String[] aliases =
ResourceResolverControl.getProperty(child, PROP_ALIAS, String[].class);
if (aliases != null) {
for (final String alias : aliases) {
if (childName.equals(alias)) {
@@ -1030,7 +1030,7 @@ public class ResourceResolverImpl extend
parentToUse = null;
}
- final Resource resource = this.context.getResource(path, parentToUse,
parameters, isResolve);
+ final Resource resource = this.control.getResource(path, parentToUse,
parameters, isResolve);
if (resource != null) {
resource.getResourceMetadata().setResolutionPath(path);
resource.getResourceMetadata().setParameterMap(parameters);
@@ -1149,7 +1149,7 @@ public class ResourceResolverImpl extend
return;
}
// if resource is null, we get an NPE as stated in the API
- this.context.delete(resource);
+ this.control.delete(resource);
}
/**
@@ -1181,7 +1181,7 @@ public class ResourceResolverImpl extend
throw new IllegalArgumentException("Can't create child on a
synthetic root");
}
}
- final Resource rsrc = this.context.create(path, properties);
+ final Resource rsrc = this.control.create(path, properties);
return this.factory.getResourceDecoratorTracker().decorate(rsrc);
}
@@ -1190,7 +1190,7 @@ public class ResourceResolverImpl extend
*/
@Override
public void revert() {
- this.context.revert();
+ this.control.revert();
}
/**
@@ -1198,7 +1198,7 @@ public class ResourceResolverImpl extend
*/
@Override
public void commit() throws PersistenceException {
- this.context.commit();
+ this.control.commit();
}
/**
@@ -1206,7 +1206,7 @@ public class ResourceResolverImpl extend
*/
@Override
public boolean hasChanges() {
- return this.context.hasChanges();
+ return this.control.hasChanges();
}
/**
@@ -1237,7 +1237,7 @@ public class ResourceResolverImpl extend
*/
@Override
public String getParentResourceType(final String resourceType) {
- return this.context.getParentResourceType(this.factory, this,
resourceType);
+ return this.control.getParentResourceType(this.factory, this,
resourceType);
}
/**
@@ -1277,21 +1277,21 @@ public class ResourceResolverImpl extend
*/
@Override
public void refresh() {
- this.context.refresh();
+ this.control.refresh();
}
@Override
public Resource getParent(final Resource child) {
- return this.context.getParent(child);
+ return this.control.getParent(child);
}
@Override
public Resource copy(final String srcAbsPath, final String destAbsPath)
throws PersistenceException {
- return this.context.copy(srcAbsPath, destAbsPath);
+ return this.control.copy(srcAbsPath, destAbsPath);
}
@Override
public Resource move(final String srcAbsPath, final String destAbsPath)
throws PersistenceException {
- return this.context.move(srcAbsPath, destAbsPath);
+ return this.control.move(srcAbsPath, destAbsPath);
}
}
Copied:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControl.java
(from r1728202,
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContext.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControl.java?p2=sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControl.java&p1=sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContext.java&r1=1728202&r2=1728206&rev=1728206&view=diff
==============================================================================
---
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContext.java
(original)
+++
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControl.java
Tue Feb 2 20:41:38 2016
@@ -62,9 +62,9 @@ import org.slf4j.LoggerFactory;
*
* Like a resource resolver itself, this class is not thread safe.
*/
-public class ResourceResolverContext {
+public class ResourceResolverControl {
- private static final Logger logger =
LoggerFactory.getLogger(ResourceResolverContext.class);
+ private static final Logger logger =
LoggerFactory.getLogger(ResourceResolverControl.class);
/** Is this a resource resolver for an admin? */
private final boolean isAdmin;
@@ -86,7 +86,7 @@ public class ResourceResolverContext {
/**
* Create a new resource resolver context.
*/
- public ResourceResolverContext(final boolean isAdmin,
+ public ResourceResolverControl(final boolean isAdmin,
final Map<String, Object> authenticationInfo,
ResourceProviderStorage storage,
ResourceResolver resolver,
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=1728206&r1=1728205&r2=1728206&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
Tue Feb 2 20:41:38 2016
@@ -32,7 +32,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.runtime.dto.AuthType;
-import org.apache.sling.resourceresolver.impl.helper.ResourceResolverContext;
+import org.apache.sling.resourceresolver.impl.helper.ResourceResolverControl;
import
org.apache.sling.resourceresolver.impl.providers.ResourceProviderHandler;
import org.apache.sling.spi.resource.provider.QueryLanguageProvider;
import org.apache.sling.spi.resource.provider.ResolverContext;
@@ -59,7 +59,7 @@ public class AuthenticatedResourceProvid
private final ResourceResolver resolver;
- private final ResourceResolverContext resolverContext;
+ private final ResourceResolverControl resolverContext;
private volatile ResolverContext<Object> cachedContext;
@@ -69,7 +69,7 @@ public class AuthenticatedResourceProvid
public AuthenticatedResourceProvider(final ResourceProviderHandler handler,
ResourceResolver resolver,
Map<String, Object> authInfo,
- ResourceResolverContext resolverContext) throws LoginException {
+ ResourceResolverControl resolverContext) throws LoginException {
this.handler = handler;
this.authInfo = authInfo;
this.resolver = resolver;
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/BasicResolveContext.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/BasicResolveContext.java?rev=1728206&r1=1728205&r2=1728206&view=diff
==============================================================================
---
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/BasicResolveContext.java
(original)
+++
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/BasicResolveContext.java
Tue Feb 2 20:41:38 2016
@@ -21,7 +21,7 @@ package org.apache.sling.resourceresolve
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceUtil;
-import org.apache.sling.resourceresolver.impl.helper.ResourceResolverContext;
+import org.apache.sling.resourceresolver.impl.helper.ResourceResolverControl;
import
org.apache.sling.resourceresolver.impl.providers.ResourceProviderHandler;
import
org.apache.sling.resourceresolver.impl.providers.ResourceProviderStorage;
import org.apache.sling.resourceresolver.impl.providers.tree.Node;
@@ -36,7 +36,7 @@ public class BasicResolveContext<T> impl
private final T providerState;
- private final ResourceResolverContext combinedProvider;
+ private final ResourceResolverControl combinedProvider;
private volatile boolean parentLookupDone = false;
@@ -47,7 +47,7 @@ public class BasicResolveContext<T> impl
public BasicResolveContext(ResourceResolver resourceResolver,
T providerState,
String parentPath,
- ResourceResolverContext combinedProvider) {
+ ResourceResolverControl combinedProvider) {
this.resourceResolver = resourceResolver;
this.parentPath = parentPath;
this.providerState = providerState;
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=1728206&r1=1728205&r2=1728206&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
Tue Feb 2 20:41:38 2016
@@ -30,7 +30,7 @@ import org.apache.sling.api.resource.Log
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.runtime.dto.AuthType;
import org.apache.sling.resourceresolver.impl.ResourceAccessSecurityTracker;
-import org.apache.sling.resourceresolver.impl.helper.ResourceResolverContext;
+import org.apache.sling.resourceresolver.impl.helper.ResourceResolverControl;
import
org.apache.sling.resourceresolver.impl.providers.ResourceProviderHandler;
/**
@@ -73,7 +73,7 @@ public class ResourceProviderAuthenticat
* @throws LoginException
*/
public void authenticateAll(final List<ResourceProviderHandler> handlers,
- final ResourceResolverContext resolverContext)
+ final ResourceResolverControl resolverContext)
throws LoginException {
final List<StatefulResourceProvider> successfulHandlers = new
ArrayList<StatefulResourceProvider>();
for (final ResourceProviderHandler h : handlers) {
@@ -90,7 +90,7 @@ public class ResourceProviderAuthenticat
}
private @Nonnull StatefulResourceProvider authenticate(final
ResourceProviderHandler handler,
- ResourceResolverContext resolverContext) throws LoginException {
+ ResourceResolverControl resolverContext) throws LoginException {
StatefulResourceProvider rp = stateful.get(handler);
if (rp == null) {
rp = createStateful(handler, resolverContext);
@@ -112,7 +112,7 @@ public class ResourceProviderAuthenticat
return stateful.values();
}
- public @Nonnull StatefulResourceProvider
getStateful(ResourceProviderHandler handler, ResourceResolverContext
resolverContext)
+ public @Nonnull StatefulResourceProvider
getStateful(ResourceProviderHandler handler, ResourceResolverControl
resolverContext)
throws LoginException {
return authenticate(handler, resolverContext);
}
@@ -130,7 +130,7 @@ public class ResourceProviderAuthenticat
}
public Collection<StatefulResourceProvider>
getAllBestEffort(List<ResourceProviderHandler> handlers,
- ResourceResolverContext resolverContext) {
+ ResourceResolverControl resolverContext) {
List<StatefulResourceProvider> result = new
ArrayList<StatefulResourceProvider>(handlers.size());
for (ResourceProviderHandler h : handlers) {
try {
@@ -151,7 +151,7 @@ public class ResourceProviderAuthenticat
*/
private @Nonnull StatefulResourceProvider createStateful(
final ResourceProviderHandler handler,
- final ResourceResolverContext resolverContext)
+ final ResourceResolverControl resolverContext)
throws LoginException {
StatefulResourceProvider authenticated;
authenticated = new AuthenticatedResourceProvider(handler, resolver,
authInfo, resolverContext);
Copied:
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java
(from r1728198,
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContextTest.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java?p2=sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java&p1=sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContextTest.java&r1=1728198&r2=1728206&rev=1728206&view=diff
==============================================================================
---
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverContextTest.java
(original)
+++
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java
Tue Feb 2 20:41:38 2016
@@ -64,7 +64,7 @@ import org.mockito.Mockito;
import org.osgi.framework.BundleContext;
@SuppressWarnings("unchecked")
-public class ResourceResolverContextTest {
+public class ResourceResolverControlTest {
// query language names
private static final String QL_MOCK = "MockQueryLanguage";
@@ -75,7 +75,7 @@ public class ResourceResolverContextTest
private static final String QUERY_MOCK_FIND_ALL = "FIND ALL";
private ResourceProviderAuthenticator authenticator;
- private ResourceResolverContext crp;
+ private ResourceResolverControl crp;
private List<ResourceProviderHandler> handlers;
private ResourceProvider<Object> subProvider;
private Map<String, Object> authInfo;
@@ -141,7 +141,7 @@ public class ResourceResolverContextTest
ResourceProviderStorage storage = new
ResourceProviderStorage(handlers);
authenticator = new ResourceProviderAuthenticator(rr, authInfo,
securityTracker);
- crp = new ResourceResolverContext(false, authInfo, storage, rr,
authenticator);
+ crp = new ResourceResolverControl(false, authInfo, storage, rr,
authenticator);
}
/**
