You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2016/02/04 17:58:33 UTC
svn commit: r1728518 - in /sling/trunk/bundles/resourceresolver/src:
main/java/org/apache/sling/resourceresolver/impl/legacy/
main/java/org/apache/sling/resourceresolver/impl/providers/stateful/
test/java/org/apache/sling/resourceresolver/impl/ test/ja...
Author: cziegeler
Date: Thu Feb 4 16:58:33 2016
New Revision: 1728518
URL: http://svn.apache.org/viewvc?rev=1728518&view=rev
Log:
Correct name of ResolveContext (was ResolverContext)
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderAdapter.java
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderFactoryAdapter.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/ResolveContextManager.java
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/SecureResourceProviderDecorator.java
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/StatefulResourceProvider.java
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/MockedResourceResolverImplTest.java
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ProviderHandlerTest.java
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceDecoratorTestBase.java
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceProviderEntryTest.java
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverMangleNamespacesTest.java
sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java
Modified: sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderAdapter.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderAdapter.java?rev=1728518&r1=1728517&r2=1728518&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderAdapter.java (original)
+++ sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderAdapter.java Thu Feb 4 16:58:33 2016
@@ -36,7 +36,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.spi.resource.provider.QueryLanguageProvider;
-import org.apache.sling.spi.resource.provider.ResolverContext;
+import org.apache.sling.spi.resource.provider.ResolveContext;
import org.apache.sling.spi.resource.provider.ResourceContext;
import org.apache.sling.spi.resource.provider.ResourceProvider;
@@ -57,7 +57,7 @@ public class LegacyResourceProviderAdapt
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
- public Resource getResource(ResolverContext<Object> ctx, String path, ResourceContext resourceContext, Resource parent) {
+ public Resource getResource(ResolveContext<Object> ctx, String path, ResourceContext resourceContext, Resource parent) {
Resource resourceCandidate;
if (rp instanceof ParametrizableResourceProvider) {
resourceCandidate = ((ParametrizableResourceProvider) rp).getResource(ctx.getResourceResolver(), path,
@@ -67,7 +67,7 @@ public class LegacyResourceProviderAdapt
}
ResourceProvider<?> parentProvider = ctx.getParentResourceProvider();
- ResolverContext parentCtx = ctx.getParentResolveContext();
+ ResolveContext parentCtx = ctx.getParentResolveContext();
// Ask the parent provider
if (resourceCandidate == null && !ownsRoot && parentProvider != null) {
return parentProvider.getResource(parentCtx, path, resourceContext, parent);
@@ -92,17 +92,17 @@ public class LegacyResourceProviderAdapt
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
- public Iterator<Resource> listChildren(ResolverContext<Object> ctx, Resource parent) {
+ public Iterator<Resource> listChildren(ResolveContext<Object> ctx, Resource parent) {
Iterator<Resource> children = rp.listChildren(parent);
if (children == null && !ownsRoot && ctx.getParentResourceProvider() != null) {
- children = ctx.getParentResourceProvider().listChildren((ResolverContext) ctx.getParentResolveContext(),
+ children = ctx.getParentResourceProvider().listChildren((ResolveContext) ctx.getParentResolveContext(),
parent);
}
return children;
}
@Override
- public void refresh(final @Nonnull ResolverContext<Object> ctx) {
+ public void refresh(final @Nonnull ResolveContext<Object> ctx) {
if (rp instanceof RefreshableResourceProvider) {
((RefreshableResourceProvider) rp).refresh();
}
@@ -118,7 +118,7 @@ public class LegacyResourceProviderAdapt
}
@Override
- public Collection<String> getAttributeNames(final @Nonnull ResolverContext<Object> ctx) {
+ public Collection<String> getAttributeNames(final @Nonnull ResolveContext<Object> ctx) {
if (rp instanceof AttributableResourceProvider) {
return ((AttributableResourceProvider) rp).getAttributeNames(ctx.getResourceResolver());
} else {
@@ -127,7 +127,7 @@ public class LegacyResourceProviderAdapt
}
@Override
- public Object getAttribute(final @Nonnull ResolverContext<Object> ctx, final @Nonnull String name) {
+ public Object getAttribute(final @Nonnull ResolveContext<Object> ctx, final @Nonnull String name) {
if (rp instanceof AttributableResourceProvider) {
return ((AttributableResourceProvider) rp).getAttribute(ctx.getResourceResolver(), name);
} else {
@@ -136,7 +136,7 @@ public class LegacyResourceProviderAdapt
}
@Override
- public boolean isLive(final @Nonnull ResolverContext<Object> ctx) {
+ public boolean isLive(final @Nonnull ResolveContext<Object> ctx) {
if (rp instanceof DynamicResourceProvider) {
return ((DynamicResourceProvider) rp).isLive();
} else {
@@ -153,21 +153,21 @@ public class LegacyResourceProviderAdapt
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
- public Resource create(final @Nonnull ResolverContext<Object> ctx, final String path,
+ public Resource create(final @Nonnull ResolveContext<Object> ctx, final String path,
final Map<String, Object> properties) throws PersistenceException {
Resource createdResource = null;
if (rp instanceof ModifyingResourceProvider) {
createdResource = ((ModifyingResourceProvider) rp).create(ctx.getResourceResolver(), path, properties);
}
if (createdResource == null && !ownsRoot && ctx.getParentResourceProvider() != null) {
- createdResource = ctx.getParentResourceProvider().create((ResolverContext) ctx.getParentResolveContext(),
+ createdResource = ctx.getParentResourceProvider().create((ResolveContext) ctx.getParentResolveContext(),
path, properties);
}
return createdResource;
}
@Override
- public void delete(final @Nonnull ResolverContext<Object> ctx, final @Nonnull Resource resource)
+ public void delete(final @Nonnull ResolveContext<Object> ctx, final @Nonnull Resource resource)
throws PersistenceException {
if (rp instanceof ModifyingResourceProvider) {
((ModifyingResourceProvider) rp).delete(ctx.getResourceResolver(), resource.getPath());
@@ -177,7 +177,7 @@ public class LegacyResourceProviderAdapt
}
@Override
- public void revert(final @Nonnull ResolverContext<Object> ctx) {
+ public void revert(final @Nonnull ResolveContext<Object> ctx) {
if (rp instanceof ModifyingResourceProvider) {
((ModifyingResourceProvider) rp).revert(ctx.getResourceResolver());
} else {
@@ -186,7 +186,7 @@ public class LegacyResourceProviderAdapt
}
@Override
- public void commit(final @Nonnull ResolverContext<Object> ctx) throws PersistenceException {
+ public void commit(final @Nonnull ResolveContext<Object> ctx) throws PersistenceException {
if (rp instanceof ModifyingResourceProvider) {
((ModifyingResourceProvider) rp).commit(ctx.getResourceResolver());
} else {
@@ -195,7 +195,7 @@ public class LegacyResourceProviderAdapt
}
@Override
- public boolean hasChanges(final @Nonnull ResolverContext<Object> ctx) {
+ public boolean hasChanges(final @Nonnull ResolveContext<Object> ctx) {
if (rp instanceof ModifyingResourceProvider) {
return ((ModifyingResourceProvider) rp).hasChanges(ctx.getResourceResolver());
} else {
@@ -215,17 +215,17 @@ public class LegacyResourceProviderAdapt
}
@Override
- public String[] getSupportedLanguages(ResolverContext<Object> ctx) {
+ public String[] getSupportedLanguages(ResolveContext<Object> ctx) {
return languages;
}
@Override
- public Iterator<Resource> findResources(ResolverContext<Object> ctx, String query, String language) {
+ public Iterator<Resource> findResources(ResolveContext<Object> ctx, String query, String language) {
return rp.findResources(ctx.getResourceResolver(), query, language);
}
@Override
- public Iterator<ValueMap> queryResources(ResolverContext<Object> ctx, String query, String language) {
+ public Iterator<ValueMap> queryResources(ResolveContext<Object> ctx, String query, String language) {
return rp.queryResources(ctx.getResourceResolver(), query, language);
}
}
Modified: sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderFactoryAdapter.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderFactoryAdapter.java?rev=1728518&r1=1728517&r2=1728518&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderFactoryAdapter.java (original)
+++ sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/legacy/LegacyResourceProviderFactoryAdapter.java Thu Feb 4 16:58:33 2016
@@ -32,7 +32,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceProviderFactory;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.spi.resource.provider.QueryLanguageProvider;
-import org.apache.sling.spi.resource.provider.ResolverContext;
+import org.apache.sling.spi.resource.provider.ResolveContext;
import org.apache.sling.spi.resource.provider.ResourceContext;
import org.apache.sling.spi.resource.provider.ResourceProvider;
@@ -64,18 +64,18 @@ public class LegacyResourceProviderFacto
}
@Override
- public Resource getResource(ResolverContext<LegacyResourceProviderAdapter> ctx, String path, ResourceContext resourceContext, Resource parent) {
- return ctx.getProviderState().getResource((ResolverContext) ctx, path, resourceContext, parent);
+ public Resource getResource(ResolveContext<LegacyResourceProviderAdapter> ctx, String path, ResourceContext resourceContext, Resource parent) {
+ return ctx.getProviderState().getResource((ResolveContext) ctx, path, resourceContext, parent);
}
@Override
- public Iterator<Resource> listChildren(ResolverContext<LegacyResourceProviderAdapter> ctx, Resource parent) {
- return ctx.getProviderState().listChildren((ResolverContext) ctx, parent);
+ public Iterator<Resource> listChildren(ResolveContext<LegacyResourceProviderAdapter> ctx, Resource parent) {
+ return ctx.getProviderState().listChildren((ResolveContext) ctx, parent);
}
@Override
- public void refresh(final @Nonnull ResolverContext<LegacyResourceProviderAdapter> ctx) {
- ctx.getProviderState().refresh((ResolverContext) ctx);
+ public void refresh(final @Nonnull ResolveContext<LegacyResourceProviderAdapter> ctx) {
+ ctx.getProviderState().refresh((ResolveContext) ctx);
}
@Override
@@ -88,46 +88,46 @@ public class LegacyResourceProviderFacto
}
@Override
- public Collection<String> getAttributeNames(final @Nonnull ResolverContext<LegacyResourceProviderAdapter> ctx) {
- return ctx.getProviderState().getAttributeNames((ResolverContext) ctx);
+ public Collection<String> getAttributeNames(final @Nonnull ResolveContext<LegacyResourceProviderAdapter> ctx) {
+ return ctx.getProviderState().getAttributeNames((ResolveContext) ctx);
}
@Override
- public Object getAttribute(final @Nonnull ResolverContext<LegacyResourceProviderAdapter> ctx,
+ public Object getAttribute(final @Nonnull ResolveContext<LegacyResourceProviderAdapter> ctx,
final @Nonnull String name) {
- return ctx.getProviderState().getAttribute((ResolverContext) ctx, name);
+ return ctx.getProviderState().getAttribute((ResolveContext) ctx, name);
}
@Override
- public boolean isLive(final @Nonnull ResolverContext<LegacyResourceProviderAdapter> ctx) {
- return ctx.getProviderState().isLive((ResolverContext) ctx);
+ public boolean isLive(final @Nonnull ResolveContext<LegacyResourceProviderAdapter> ctx) {
+ return ctx.getProviderState().isLive((ResolveContext) ctx);
}
@Override
- public Resource create(final @Nonnull ResolverContext<LegacyResourceProviderAdapter> ctx, final String path,
+ public Resource create(final @Nonnull ResolveContext<LegacyResourceProviderAdapter> ctx, final String path,
final Map<String, Object> properties) throws PersistenceException {
- return ctx.getProviderState().create((ResolverContext) ctx, path, properties);
+ return ctx.getProviderState().create((ResolveContext) ctx, path, properties);
}
@Override
- public void delete(final @Nonnull ResolverContext<LegacyResourceProviderAdapter> ctx,
+ public void delete(final @Nonnull ResolveContext<LegacyResourceProviderAdapter> ctx,
final @Nonnull Resource resource) throws PersistenceException {
- ctx.getProviderState().delete((ResolverContext) ctx, resource);
+ ctx.getProviderState().delete((ResolveContext) ctx, resource);
}
@Override
- public void revert(final @Nonnull ResolverContext<LegacyResourceProviderAdapter> ctx) {
- ctx.getProviderState().revert((ResolverContext) ctx);
+ public void revert(final @Nonnull ResolveContext<LegacyResourceProviderAdapter> ctx) {
+ ctx.getProviderState().revert((ResolveContext) ctx);
}
@Override
- public void commit(final @Nonnull ResolverContext<LegacyResourceProviderAdapter> ctx) throws PersistenceException {
- ctx.getProviderState().commit((ResolverContext) ctx);
+ public void commit(final @Nonnull ResolveContext<LegacyResourceProviderAdapter> ctx) throws PersistenceException {
+ ctx.getProviderState().commit((ResolveContext) ctx);
}
@Override
- public boolean hasChanges(final @Nonnull ResolverContext<LegacyResourceProviderAdapter> ctx) {
- return ctx.getProviderState().hasChanges((ResolverContext) ctx);
+ public boolean hasChanges(final @Nonnull ResolveContext<LegacyResourceProviderAdapter> ctx) {
+ return ctx.getProviderState().hasChanges((ResolveContext) ctx);
}
private static class JCRQueryProviderAdapter implements QueryLanguageProvider<LegacyResourceProviderAdapter> {
@@ -139,20 +139,20 @@ public class LegacyResourceProviderFacto
}
@Override
- public String[] getSupportedLanguages(ResolverContext<LegacyResourceProviderAdapter> ctx) {
+ public String[] getSupportedLanguages(ResolveContext<LegacyResourceProviderAdapter> ctx) {
return languages;
}
@Override
- public Iterator<Resource> findResources(ResolverContext<LegacyResourceProviderAdapter> ctx, String query,
+ public Iterator<Resource> findResources(ResolveContext<LegacyResourceProviderAdapter> ctx, String query,
String language) {
- return ctx.getProviderState().getQueryLanguageProvider().findResources((ResolverContext) ctx, query, language);
+ return ctx.getProviderState().getQueryLanguageProvider().findResources((ResolveContext) ctx, query, language);
}
@Override
- public Iterator<ValueMap> queryResources(ResolverContext<LegacyResourceProviderAdapter> ctx, String query,
+ public Iterator<ValueMap> queryResources(ResolveContext<LegacyResourceProviderAdapter> ctx, String query,
String language) {
- return ctx.getProviderState().getQueryLanguageProvider().queryResources((ResolverContext) ctx, query, language);
+ return ctx.getProviderState().getQueryLanguageProvider().queryResources((ResolveContext) ctx, query, language);
}
}
}
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=1728518&r1=1728517&r2=1728518&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 Thu Feb 4 16:58:33 2016
@@ -35,7 +35,7 @@ import org.apache.sling.api.resource.run
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;
+import org.apache.sling.spi.resource.provider.ResolveContext;
import org.apache.sling.spi.resource.provider.ResourceContext;
import org.apache.sling.spi.resource.provider.ResourceProvider;
import org.slf4j.Logger;
@@ -61,7 +61,7 @@ public class AuthenticatedResourceProvid
private final ResourceResolverControl resolverContext;
- private volatile ResolverContext<Object> cachedContext;
+ private volatile ResolveContext<Object> cachedContext;
private volatile boolean authenticated;
@@ -79,7 +79,7 @@ public class AuthenticatedResourceProvid
}
}
- private ResolverContext<Object> authenticate() throws LoginException {
+ private ResolveContext<Object> authenticate() throws LoginException {
if ( cachedContext == null ) {
Object contextData = null;
if ( (handler.getInfo().getAuthType() == AuthType.required || handler.getInfo().getAuthType() == AuthType.lazy) ) {
@@ -99,7 +99,7 @@ public class AuthenticatedResourceProvid
}
@Override
- public ResolverContext<Object> getContext() throws LoginException {
+ public ResolveContext<Object> getContext() throws LoginException {
return authenticate();
}
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=1728518&r1=1728517&r2=1728518&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 Thu Feb 4 16:58:33 2016
@@ -25,10 +25,10 @@ import org.apache.sling.resourceresolver
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;
-import org.apache.sling.spi.resource.provider.ResolverContext;
+import org.apache.sling.spi.resource.provider.ResolveContext;
import org.apache.sling.spi.resource.provider.ResourceProvider;
-public class BasicResolveContext<T> implements ResolverContext<T> {
+public class BasicResolveContext<T> implements ResolveContext<T> {
private final String parentPath;
@@ -42,7 +42,7 @@ public class BasicResolveContext<T> impl
private volatile ResourceProvider<Object> parentProvider;
- private volatile ResolverContext<Object> parentResolveContext;
+ private volatile ResolveContext<Object> parentResolveContext;
public BasicResolveContext(ResourceResolver resourceResolver,
T providerState,
@@ -70,7 +70,7 @@ public class BasicResolveContext<T> impl
}
@Override
- public ResolverContext<?> getParentResolveContext() {
+ public ResolveContext<?> getParentResolveContext() {
this.getParentResourceProvider();
return parentResolveContext;
}
Modified: sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/ResolveContextManager.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/ResolveContextManager.java?rev=1728518&r1=1728517&r2=1728518&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/ResolveContextManager.java (original)
+++ sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/ResolveContextManager.java Thu Feb 4 16:58:33 2016
@@ -22,17 +22,17 @@ import java.util.Map;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderHandler;
-import org.apache.sling.spi.resource.provider.ResolverContext;
+import org.apache.sling.spi.resource.provider.ResolveContext;
public class ResolveContextManager {
- private final Map<ResourceProviderHandler, ResolverContext<Object>> contextMap;
+ private final Map<ResourceProviderHandler, ResolveContext<Object>> contextMap;
public ResolveContextManager(final ResourceResolver resolver) {
- this.contextMap = new IdentityHashMap<ResourceProviderHandler, ResolverContext<Object>>();
+ this.contextMap = new IdentityHashMap<ResourceProviderHandler, ResolveContext<Object>>();
}
- public ResolverContext<Object> getResolveContext(final ResourceProviderHandler handler) {
+ public ResolveContext<Object> getResolveContext(final ResourceProviderHandler handler) {
return this.contextMap.get(handler);
}
}
Modified: sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/SecureResourceProviderDecorator.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/SecureResourceProviderDecorator.java?rev=1728518&r1=1728517&r2=1728518&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/SecureResourceProviderDecorator.java (original)
+++ sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/SecureResourceProviderDecorator.java Thu Feb 4 16:58:33 2016
@@ -30,7 +30,7 @@ import org.apache.sling.api.security.Res
import org.apache.sling.resourceresolver.impl.ResourceAccessSecurityTracker;
import org.apache.sling.resourceresolver.impl.ResourceResolverImpl;
import org.apache.sling.resourceresolver.impl.helper.AbstractIterator;
-import org.apache.sling.spi.resource.provider.ResolverContext;
+import org.apache.sling.spi.resource.provider.ResolveContext;
import org.apache.sling.spi.resource.provider.ResourceProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -141,7 +141,7 @@ public class SecureResourceProviderDecor
}
@Override
- public ResolverContext<Object> getContext() throws LoginException {
+ public ResolveContext<Object> getContext() throws LoginException {
return rp.getContext();
}
Modified: sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/StatefulResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/StatefulResourceProvider.java?rev=1728518&r1=1728517&r2=1728518&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/StatefulResourceProvider.java (original)
+++ sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/StatefulResourceProvider.java Thu Feb 4 16:58:33 2016
@@ -30,7 +30,7 @@ import org.apache.sling.api.resource.Per
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.spi.resource.provider.QueryLanguageProvider;
-import org.apache.sling.spi.resource.provider.ResolverContext;
+import org.apache.sling.spi.resource.provider.ResolveContext;
import org.apache.sling.spi.resource.provider.ResourceProvider;
/**
@@ -153,5 +153,5 @@ public interface StatefulResourceProvide
* @return Context for the wrapped ResourceProvider
* @throws LoginException
*/
- ResolverContext<Object> getContext() throws LoginException;
+ ResolveContext<Object> getContext() throws LoginException;
}
Modified: sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/MockedResourceResolverImplTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/MockedResourceResolverImplTest.java?rev=1728518&r1=1728517&r2=1728518&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/MockedResourceResolverImplTest.java (original)
+++ sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/MockedResourceResolverImplTest.java Thu Feb 4 16:58:33 2016
@@ -48,7 +48,7 @@ import org.apache.sling.resourceresolver
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderStorage;
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderTracker;
import org.apache.sling.spi.resource.provider.QueryLanguageProvider;
-import org.apache.sling.spi.resource.provider.ResolverContext;
+import org.apache.sling.spi.resource.provider.ResolveContext;
import org.apache.sling.spi.resource.provider.ResourceContext;
import org.apache.sling.spi.resource.provider.ResourceProvider;
import org.junit.After;
@@ -238,7 +238,7 @@ public class MockedResourceResolverImplT
mappingChildren.add(buildResource(path+"/http/localhost_any", localHostAnyList, resourceResolver, provider,"sling:match", "localhost\\.\\d*", "sling:internalRedirect", "/content"));
Resource etcMapResource = buildResource(path+"/http", mappingChildren);
- Mockito.when(provider.getResource(Mockito.any(ResolverContext.class), Mockito.eq(path), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(etcMapResource);
+ Mockito.when(provider.getResource(Mockito.any(ResolveContext.class), Mockito.eq(path), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(etcMapResource);
return etcMapResource;
}
@@ -299,8 +299,8 @@ public class MockedResourceResolverImplT
// register the resource with the provider
if ( provider != null ) {
- Mockito.when(provider.listChildren(Mockito.any(ResolverContext.class), Mockito.eq(resource))).thenReturn(children.iterator());
- Mockito.when(provider.getResource(Mockito.any(ResolverContext.class), Mockito.eq(fullpath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(resource);
+ Mockito.when(provider.listChildren(Mockito.any(ResolveContext.class), Mockito.eq(resource))).thenReturn(children.iterator());
+ Mockito.when(provider.getResource(Mockito.any(ResolveContext.class), Mockito.eq(fullpath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(resource);
}
if ( properties != null ) {
ValueMap vm = new SimpleValueMapImpl();
@@ -547,8 +547,8 @@ public class MockedResourceResolverImplT
public void testQueryResources() throws LoginException {
final int n = 3;
String[] languages = new String[] {FAKE_QUERY_LANGUAGE};
- Mockito.when(queryProvider.getSupportedLanguages(Mockito.any(ResolverContext.class))).thenReturn(languages);
- Mockito.when(queryProvider.queryResources(Mockito.any(ResolverContext.class), Mockito.any(String.class), Mockito.any(String.class)))
+ Mockito.when(queryProvider.getSupportedLanguages(Mockito.any(ResolveContext.class))).thenReturn(languages);
+ Mockito.when(queryProvider.queryResources(Mockito.any(ResolveContext.class), Mockito.any(String.class), Mockito.any(String.class)))
.thenReturn(buildValueMapCollection(n, "A_").iterator());
final ResourceResolver rr = resourceResolverFactory.getResourceResolver(null);
Modified: sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ProviderHandlerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ProviderHandlerTest.java?rev=1728518&r1=1728517&r2=1728518&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ProviderHandlerTest.java (original)
+++ sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ProviderHandlerTest.java Thu Feb 4 16:58:33 2016
@@ -33,7 +33,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderHandler;
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderStorage;
-import org.apache.sling.spi.resource.provider.ResolverContext;
+import org.apache.sling.spi.resource.provider.ResolveContext;
import org.apache.sling.spi.resource.provider.ResourceContext;
import org.apache.sling.spi.resource.provider.ResourceProvider;
import org.junit.Test;
@@ -55,7 +55,7 @@ public class ProviderHandlerTest {
});
final ResourceProvider<?> leaveProvider = Mockito.mock(ResourceProvider.class);
- Mockito.when(leaveProvider.getResource(Mockito.any(ResolverContext.class), Mockito.eq(servletpath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(servletResource);
+ Mockito.when(leaveProvider.getResource(Mockito.any(ResolveContext.class), Mockito.eq(servletpath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(servletResource);
ResourceProviderHandler h = createRPHandler(leaveProvider, "my-pid", 0, servletpath);
ResourceResolver resolver = new ResourceResolverImpl(new CommonResourceResolverFactoryImpl(new ResourceResolverFactoryActivator()), false, null, new ResourceProviderStorage(Arrays.asList(h)));
Modified: sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceDecoratorTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceDecoratorTestBase.java?rev=1728518&r1=1728517&r2=1728518&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceDecoratorTestBase.java (original)
+++ sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceDecoratorTestBase.java Thu Feb 4 16:58:33 2016
@@ -40,7 +40,7 @@ import org.apache.sling.resourceresolver
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderHandler;
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderStorage;
import org.apache.sling.spi.resource.provider.QueryLanguageProvider;
-import org.apache.sling.spi.resource.provider.ResolverContext;
+import org.apache.sling.spi.resource.provider.ResolveContext;
import org.apache.sling.spi.resource.provider.ResourceContext;
import org.apache.sling.spi.resource.provider.ResourceProvider;
import org.junit.Before;
@@ -79,12 +79,12 @@ public abstract class ResourceDecoratorT
return new QueryLanguageProvider<Object>() {
@Override
- public String[] getSupportedLanguages(ResolverContext<Object> ctx) {
+ public String[] getSupportedLanguages(ResolveContext<Object> ctx) {
return new String[] { QUERY_LANGUAGE };
}
@Override
- public Iterator<Resource> findResources(ResolverContext<Object> ctx, String query, String language) {
+ public Iterator<Resource> findResources(ResolveContext<Object> ctx, String query, String language) {
final List<Resource> found = new ArrayList<Resource>();
found.add(mockResource("/tmp/C"));
found.add(mockResource("/tmp/D"));
@@ -94,14 +94,14 @@ public abstract class ResourceDecoratorT
}
@Override
- public Iterator<ValueMap> queryResources(ResolverContext<Object> ctx, String query, String language) {
+ public Iterator<ValueMap> queryResources(ResolveContext<Object> ctx, String query, String language) {
return null;
}
};
}
@Override
- public Resource getResource(ResolverContext<Object> ctx, String path, final ResourceContext rCtx, Resource parent) {
+ public Resource getResource(ResolveContext<Object> ctx, String path, final ResourceContext rCtx, Resource parent) {
if(path.equals("/") || path.startsWith("/tmp") || path.startsWith("/var")) {
return mockResource(path);
}
@@ -109,7 +109,7 @@ public abstract class ResourceDecoratorT
}
@Override
- public Iterator<Resource> listChildren(ResolverContext<Object> ctx, Resource parent) {
+ public Iterator<Resource> listChildren(ResolveContext<Object> ctx, Resource parent) {
final List<Resource> children = new ArrayList<Resource>();
if("/".equals(parent.getPath())) {
children.add(mockResource("/tmp"));
Modified: sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceProviderEntryTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceProviderEntryTest.java?rev=1728518&r1=1728517&r2=1728518&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceProviderEntryTest.java (original)
+++ sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceProviderEntryTest.java Thu Feb 4 16:58:33 2016
@@ -37,7 +37,7 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.SyntheticResource;
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderHandler;
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderStorage;
-import org.apache.sling.spi.resource.provider.ResolverContext;
+import org.apache.sling.spi.resource.provider.ResolveContext;
import org.apache.sling.spi.resource.provider.ResourceContext;
import org.apache.sling.spi.resource.provider.ResourceProvider;
import org.junit.Before;
@@ -59,7 +59,7 @@ public class ResourceProviderEntryTest {
this.providersBasedResolver = null;
this.providers.clear();
final ResourceProvider<?> rootProvider = Mockito.mock(ResourceProvider.class);
- Mockito.when(rootProvider.getResource(Mockito.any(ResolverContext.class), Mockito.anyString(), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(this.mockedRootResolver));
+ Mockito.when(rootProvider.getResource(Mockito.any(ResolveContext.class), Mockito.anyString(), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(this.mockedRootResolver));
providers.add(createRPHandler(rootProvider, "rp0", 0, "/"));
}
@@ -76,7 +76,7 @@ public class ResourceProviderEntryTest {
String firstPath = "/rootel";
final ResourceResolver resolver = Mockito.mock(ResourceResolver.class);
final ResourceProvider<?> first = Mockito.mock(ResourceProvider.class);
- Mockito.when(first.getResource(Mockito.any(ResolverContext.class), Mockito.startsWith(firstPath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(resolver));
+ Mockito.when(first.getResource(Mockito.any(ResolveContext.class), Mockito.startsWith(firstPath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(resolver));
providers.add(createRPHandler(first, "rp1", 1, "/rootel"));
this.providersBasedResolver = null;
@@ -97,13 +97,13 @@ public class ResourceProviderEntryTest {
final ResourceResolver firstResolver = Mockito.mock(ResourceResolver.class);
final ResourceProvider<?> first = Mockito.mock(ResourceProvider.class);
- Mockito.when(first.getResource(Mockito.any(ResolverContext.class), Mockito.startsWith(firstPath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(firstResolver));
+ Mockito.when(first.getResource(Mockito.any(ResolveContext.class), Mockito.startsWith(firstPath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(firstResolver));
final ResourceResolver secondResolver = Mockito.mock(ResourceResolver.class);
final ResourceProvider<?> second = Mockito.mock(ResourceProvider.class);
- Mockito.when(second.getResource(Mockito.any(ResolverContext.class), Mockito.startsWith(secondPath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(secondResolver));
+ Mockito.when(second.getResource(Mockito.any(ResolveContext.class), Mockito.startsWith(secondPath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(secondResolver));
final ResourceResolver thirdResolver = Mockito.mock(ResourceResolver.class);
final ResourceProvider<?> third = Mockito.mock(ResourceProvider.class);
- Mockito.when(third.getResource(Mockito.any(ResolverContext.class), Mockito.startsWith(thirdPath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(thirdResolver));
+ Mockito.when(third.getResource(Mockito.any(ResolveContext.class), Mockito.startsWith(thirdPath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(thirdResolver));
providers.add(createRPHandler(first, "rp1", 1, firstPath));
providers.add(createRPHandler(second, "rp2", 2, secondPath));
@@ -126,13 +126,13 @@ public class ResourceProviderEntryTest {
final ResourceResolver firstResolver = Mockito.mock(ResourceResolver.class);
final ResourceProvider<?> first = Mockito.mock(ResourceProvider.class);
- Mockito.when(first.getResource(Mockito.any(ResolverContext.class), Mockito.startsWith(firstPath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(firstResolver));
+ Mockito.when(first.getResource(Mockito.any(ResolveContext.class), Mockito.startsWith(firstPath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(firstResolver));
final ResourceResolver secondResolver = Mockito.mock(ResourceResolver.class);
final ResourceProvider<?> second = Mockito.mock(ResourceProvider.class);
- Mockito.when(second.getResource(Mockito.any(ResolverContext.class), Mockito.startsWith(secondPath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(secondResolver));
+ Mockito.when(second.getResource(Mockito.any(ResolveContext.class), Mockito.startsWith(secondPath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(secondResolver));
final ResourceResolver thirdResolver = Mockito.mock(ResourceResolver.class);
final ResourceProvider<?> third = Mockito.mock(ResourceProvider.class);
- Mockito.when(third.getResource(Mockito.any(ResolverContext.class), Mockito.startsWith(thirdPath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(thirdResolver));
+ Mockito.when(third.getResource(Mockito.any(ResolveContext.class), Mockito.startsWith(thirdPath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(thirdResolver));
providers.add(createRPHandler(first, "rp1", 1, firstPath));
providers.add(createRPHandler(second, "rp2", 2, secondPath));
@@ -155,13 +155,13 @@ public class ResourceProviderEntryTest {
final ResourceResolver firstResolver = Mockito.mock(ResourceResolver.class);
final ResourceProvider<?> first = Mockito.mock(ResourceProvider.class);
- Mockito.when(first.getResource(Mockito.any(ResolverContext.class), Mockito.startsWith(firstPath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(firstResolver));
+ Mockito.when(first.getResource(Mockito.any(ResolveContext.class), Mockito.startsWith(firstPath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(firstResolver));
final ResourceResolver secondResolver = Mockito.mock(ResourceResolver.class);
final ResourceProvider<?> second = Mockito.mock(ResourceProvider.class);
- Mockito.when(second.getResource(Mockito.any(ResolverContext.class), Mockito.startsWith(secondPath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(secondResolver));
+ Mockito.when(second.getResource(Mockito.any(ResolveContext.class), Mockito.startsWith(secondPath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(secondResolver));
final ResourceResolver thirdResolver = Mockito.mock(ResourceResolver.class);
final ResourceProvider<?> third = Mockito.mock(ResourceProvider.class);
- Mockito.when(third.getResource(Mockito.any(ResolverContext.class), Mockito.startsWith(thirdPath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(thirdResolver));
+ Mockito.when(third.getResource(Mockito.any(ResolveContext.class), Mockito.startsWith(thirdPath), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(thirdResolver));
final Map<String, Object> firstProps = new HashMap<String, Object>();
firstProps.put(Constants.SERVICE_ID, (long)1);
@@ -203,7 +203,7 @@ public class ResourceProviderEntryTest {
for(String path : new String[] { "/foo", "/", "/foo/bar" }) {
final ResourceResolver resolver = Mockito.mock(ResourceResolver.class);
final ResourceProvider<?> p = Mockito.mock(ResourceProvider.class);
- Mockito.when(p.getResource(Mockito.any(ResolverContext.class), Mockito.startsWith(path), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(resolver));
+ Mockito.when(p.getResource(Mockito.any(ResolveContext.class), Mockito.startsWith(path), Mockito.any(ResourceContext.class), Mockito.any(Resource.class))).thenReturn(new TestResource(resolver));
++counter;
Modified: sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java?rev=1728518&r1=1728517&r2=1728518&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java (original)
+++ sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverImplTest.java Thu Feb 4 16:58:33 2016
@@ -51,7 +51,7 @@ import org.apache.sling.api.resource.Syn
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderHandler;
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderStorage;
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderTracker;
-import org.apache.sling.spi.resource.provider.ResolverContext;
+import org.apache.sling.spi.resource.provider.ResolveContext;
import org.apache.sling.spi.resource.provider.ResourceContext;
import org.apache.sling.spi.resource.provider.ResourceProvider;
import org.junit.Before;
@@ -72,12 +72,12 @@ public class ResourceResolverImplTest {
ResourceProvider<?> rp = new ResourceProvider<Object>() {
@Override
- public Resource getResource(ResolverContext<Object> ctx, String path, ResourceContext rCtx, Resource parent) {
+ public Resource getResource(ResolveContext<Object> ctx, String path, ResourceContext rCtx, Resource parent) {
return null;
}
@Override
- public Iterator<Resource> listChildren(ResolverContext<Object> ctx, Resource parent) {
+ public Iterator<Resource> listChildren(ResolveContext<Object> ctx, Resource parent) {
return null;
}
};
Modified: sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverMangleNamespacesTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverMangleNamespacesTest.java?rev=1728518&r1=1728517&r2=1728518&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverMangleNamespacesTest.java (original)
+++ sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/ResourceResolverMangleNamespacesTest.java Thu Feb 4 16:58:33 2016
@@ -32,7 +32,7 @@ import org.apache.commons.collections.It
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderStorage;
-import org.apache.sling.spi.resource.provider.ResolverContext;
+import org.apache.sling.spi.resource.provider.ResolveContext;
import org.apache.sling.spi.resource.provider.ResourceContext;
import org.apache.sling.spi.resource.provider.ResourceProvider;
import org.junit.Before;
@@ -72,7 +72,7 @@ public class ResourceResolverMangleNames
@SuppressWarnings("unchecked")
@Override
- public @CheckForNull <AdapterType> AdapterType adaptTo(final @Nonnull ResolverContext<Object> ctx,
+ public @CheckForNull <AdapterType> AdapterType adaptTo(final @Nonnull ResolveContext<Object> ctx,
final @Nonnull Class<AdapterType> type) {
if (type.equals(Session.class)) {
return (AdapterType) activeSession;
@@ -82,13 +82,13 @@ public class ResourceResolverMangleNames
}
@Override
- public Resource getResource(ResolverContext<Object> ctx, String path, ResourceContext rCtx, Resource parent) {
+ public Resource getResource(ResolveContext<Object> ctx, String path, ResourceContext rCtx, Resource parent) {
return null;
}
@SuppressWarnings("unchecked")
@Override
- public Iterator<Resource> listChildren(ResolverContext<Object> ctx, Resource parent) {
+ public Iterator<Resource> listChildren(ResolveContext<Object> ctx, Resource parent) {
return IteratorUtils.emptyIterator();
}
};
Modified: sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java?rev=1728518&r1=1728517&r2=1728518&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java (original)
+++ sling/trunk/bundles/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceResolverControlTest.java Thu Feb 4 16:58:33 2016
@@ -53,7 +53,7 @@ import org.apache.sling.resourceresolver
import org.apache.sling.resourceresolver.impl.providers.ResourceProviderStorage;
import org.apache.sling.resourceresolver.impl.providers.stateful.ResourceProviderAuthenticator;
import org.apache.sling.spi.resource.provider.QueryLanguageProvider;
-import org.apache.sling.spi.resource.provider.ResolverContext;
+import org.apache.sling.spi.resource.provider.ResolveContext;
import org.apache.sling.spi.resource.provider.ResourceContext;
import org.apache.sling.spi.resource.provider.ResourceProvider;
import org.apache.sling.testing.mock.osgi.MockOsgi;
@@ -97,7 +97,7 @@ public class ResourceResolverControlTest
ResourceProviderHandler handler = new ResourceProviderHandler(bc, info);
when(subProvider.getQueryLanguageProvider()).thenReturn(new SimpleQueryLanguageProvider(QL_MOCK, QL_ANOTHER_MOCK) {
@Override
- public Iterator<ValueMap> queryResources(ResolverContext<Object> ctx, String query, String language) {
+ public Iterator<ValueMap> queryResources(ResolveContext<Object> ctx, String query, String language) {
if ( query.equals(QUERY_MOCK_FIND_ALL) && language.equals(QL_MOCK)) {
SimpleValueMapImpl valueMap = new SimpleValueMapImpl();
valueMap.put("key", "value");
@@ -108,7 +108,7 @@ public class ResourceResolverControlTest
}
@Override
- public Iterator<Resource> findResources(ResolverContext<Object> ctx, String query, String language) {
+ public Iterator<Resource> findResources(ResolveContext<Object> ctx, String query, String language) {
if ( query.equals(QUERY_MOCK_FIND_ALL) && language.equals(QL_MOCK)) {
return Collections.<Resource> singletonList(newMockResource("/some/path/object")).iterator();
@@ -132,7 +132,7 @@ public class ResourceResolverControlTest
subProviderResource = configureResourceAt(subProvider, "/some/path/object");
// configure query at '/'
- when(rootProvider.listChildren((ResolverContext<Object>) Mockito.anyObject(), Mockito.eq(root))).thenReturn(Collections.singleton(somethingResource).iterator());
+ when(rootProvider.listChildren((ResolveContext<Object>) Mockito.anyObject(), Mockito.eq(root))).thenReturn(Collections.singleton(somethingResource).iterator());
ResourceResolver rr = mock(ResourceResolver.class);
ResourceAccessSecurityTracker securityTracker = Mockito.mock(ResourceAccessSecurityTracker.class);
@@ -154,7 +154,7 @@ public class ResourceResolverControlTest
Resource mockResource = newMockResource(path);
- when(provider.getResource((ResolverContext<T>) Mockito.any(), Mockito.eq(path), (ResourceContext) Mockito.any(), (Resource) Mockito.any()))
+ when(provider.getResource((ResolveContext<T>) Mockito.any(), Mockito.eq(path), (ResourceContext) Mockito.any(), (Resource) Mockito.any()))
.thenReturn(mockResource);
return mockResource;
@@ -187,8 +187,8 @@ public class ResourceResolverControlTest
verify(subProvider).logout(mockContext());
}
- private ResolverContext<Object> mockContext() {
- return (ResolverContext<Object>) Mockito.any();
+ private ResolveContext<Object> mockContext() {
+ return (ResolveContext<Object>) Mockito.any();
}
/**
@@ -412,17 +412,17 @@ public class ResourceResolverControlTest
}
@Override
- public String[] getSupportedLanguages(ResolverContext<Object> ctx) {
+ public String[] getSupportedLanguages(ResolveContext<Object> ctx) {
return queryLanguages;
}
@Override
- public Iterator<ValueMap> queryResources(ResolverContext<Object> ctx, String query, String language) {
+ public Iterator<ValueMap> queryResources(ResolveContext<Object> ctx, String query, String language) {
throw new UnsupportedOperationException();
}
@Override
- public Iterator<Resource> findResources(ResolverContext<Object> ctx, String query, String language) {
+ public Iterator<Resource> findResources(ResolveContext<Object> ctx, String query, String language) {
throw new UnsupportedOperationException();
}
}