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:05 UTC
svn commit: r1728517 - in /sling/trunk/bundles/jcr/resource/src:
main/java/org/apache/sling/jcr/resource/internal/helper/jcr/
test/java/org/apache/sling/jcr/resource/internal/helper/jcr/
Author: cziegeler
Date: Thu Feb 4 16:58:05 2016
New Revision: 1728517
URL: http://svn.apache.org/viewvc?rev=1728517&view=rev
Log:
Correct name of ResolveContext (was ResolverContext)
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/BasicQueryLanguageProvider.java
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProviderTest.java
Modified: sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/BasicQueryLanguageProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/BasicQueryLanguageProvider.java?rev=1728517&r1=1728516&r2=1728517&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/BasicQueryLanguageProvider.java (original)
+++ sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/BasicQueryLanguageProvider.java Thu Feb 4 16:58:05 2016
@@ -39,7 +39,7 @@ import org.apache.sling.api.wrappers.Val
import org.apache.sling.jcr.resource.JcrResourceUtil;
import org.apache.sling.spi.resource.provider.QueryLanguageProvider;
import org.apache.sling.spi.resource.provider.ProviderContext;
-import org.apache.sling.spi.resource.provider.ResolverContext;
+import org.apache.sling.spi.resource.provider.ResolveContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -64,7 +64,7 @@ public class BasicQueryLanguageProvider
}
@Override
- public String[] getSupportedLanguages(final ResolverContext<JcrProviderState> ctx) {
+ public String[] getSupportedLanguages(final ResolveContext<JcrProviderState> ctx) {
try {
return ctx.getProviderState().getSession().getWorkspace().getQueryManager().getSupportedQueryLanguages();
} catch (final RepositoryException e) {
@@ -73,7 +73,7 @@ public class BasicQueryLanguageProvider
}
@Override
- public Iterator<Resource> findResources(final ResolverContext<JcrProviderState> ctx,
+ public Iterator<Resource> findResources(final ResolveContext<JcrProviderState> ctx,
final String query,
final String language) {
try {
@@ -91,7 +91,7 @@ public class BasicQueryLanguageProvider
}
@Override
- public Iterator<ValueMap> queryResources(final ResolverContext<JcrProviderState> ctx,
+ public Iterator<ValueMap> queryResources(final ResolveContext<JcrProviderState> ctx,
final String query,
final String language) {
final String queryLanguage = ArrayUtils.contains(getSupportedLanguages(ctx), language) ? language : DEFAULT_QUERY_LANGUAGE;
Modified: sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java?rev=1728517&r1=1728516&r2=1728517&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java (original)
+++ sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProvider.java Thu Feb 4 16:58:05 2016
@@ -66,7 +66,7 @@ import org.apache.sling.jcr.resource.int
import org.apache.sling.jcr.resource.internal.OakResourceListener;
import org.apache.sling.spi.resource.provider.ProviderContext;
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.osgi.framework.BundleContext;
@@ -262,12 +262,12 @@ public class JcrResourceProvider extends
}
@Override
- public boolean isLive(final @Nonnull ResolverContext<JcrProviderState> ctx) {
+ public boolean isLive(final @Nonnull ResolveContext<JcrProviderState> ctx) {
return ctx.getProviderState().getSession().isLive();
}
@Override
- public Resource getResource(ResolverContext<JcrProviderState> ctx, String path, ResourceContext rCtx, Resource parent) {
+ public Resource getResource(ResolveContext<JcrProviderState> ctx, String path, ResourceContext rCtx, Resource parent) {
try {
return ctx.getProviderState().getResourceFactory().createResource(ctx.getResourceResolver(), path, parent, rCtx.getResolveParameters());
} catch (RepositoryException e) {
@@ -276,7 +276,7 @@ public class JcrResourceProvider extends
}
@Override
- public Iterator<Resource> listChildren(ResolverContext<JcrProviderState> ctx, Resource parent) {
+ public Iterator<Resource> listChildren(ResolveContext<JcrProviderState> ctx, Resource parent) {
JcrItemResource<?> parentItemResource;
// short cut for known JCR resources
@@ -301,7 +301,7 @@ public class JcrResourceProvider extends
}
@Override
- public @CheckForNull Resource getParent(final @Nonnull ResolverContext<JcrProviderState> ctx, final @Nonnull Resource child) {
+ public @CheckForNull Resource getParent(final @Nonnull ResolveContext<JcrProviderState> ctx, final @Nonnull Resource child) {
if (child instanceof JcrItemResource<?>) {
try {
String version = null;
@@ -332,7 +332,7 @@ public class JcrResourceProvider extends
}
@Override
- public Collection<String> getAttributeNames(final @Nonnull ResolverContext<JcrProviderState> ctx) {
+ public Collection<String> getAttributeNames(final @Nonnull ResolveContext<JcrProviderState> ctx) {
final Set<String> names = new HashSet<String>();
final String[] sessionNames = ctx.getProviderState().getSession().getAttributeNames();
for(final String name : sessionNames) {
@@ -344,7 +344,7 @@ public class JcrResourceProvider extends
}
@Override
- public Object getAttribute(final @Nonnull ResolverContext<JcrProviderState> ctx, final @Nonnull String name) {
+ public Object getAttribute(final @Nonnull ResolveContext<JcrProviderState> ctx, final @Nonnull String name) {
if (isAttributeVisible(name)) {
if (ResourceResolverFactory.USER.equals(name)) {
return ctx.getProviderState().getSession().getUserID();
@@ -355,7 +355,7 @@ public class JcrResourceProvider extends
}
@Override
- public Resource create(final @Nonnull ResolverContext<JcrProviderState> ctx, final String path, final Map<String, Object> properties)
+ public Resource create(final @Nonnull ResolveContext<JcrProviderState> ctx, final String path, final Map<String, Object> properties)
throws PersistenceException {
// check for node type
final Object nodeObj = (properties != null ? properties.get(NodeUtil.NODE_TYPE) : null);
@@ -434,7 +434,7 @@ public class JcrResourceProvider extends
}
@Override
- public void delete(final @Nonnull ResolverContext<JcrProviderState> ctx, final @Nonnull Resource resource)
+ public void delete(final @Nonnull ResolveContext<JcrProviderState> ctx, final @Nonnull Resource resource)
throws PersistenceException {
try {
((JcrItemResource<?>) resource).getItem().remove();
@@ -444,7 +444,7 @@ public class JcrResourceProvider extends
}
@Override
- public void revert(final @Nonnull ResolverContext<JcrProviderState> ctx) {
+ public void revert(final @Nonnull ResolveContext<JcrProviderState> ctx) {
try {
ctx.getProviderState().getSession().refresh(false);
} catch (final RepositoryException ignore) {
@@ -453,7 +453,7 @@ public class JcrResourceProvider extends
}
@Override
- public void commit(final @Nonnull ResolverContext<JcrProviderState> ctx)
+ public void commit(final @Nonnull ResolveContext<JcrProviderState> ctx)
throws PersistenceException {
try {
ctx.getProviderState().getSession().save();
@@ -463,7 +463,7 @@ public class JcrResourceProvider extends
}
@Override
- public boolean hasChanges(final @Nonnull ResolverContext<JcrProviderState> ctx) {
+ public boolean hasChanges(final @Nonnull ResolveContext<JcrProviderState> ctx) {
try {
return ctx.getProviderState().getSession().hasPendingChanges();
} catch (final RepositoryException ignore) {
@@ -473,7 +473,7 @@ public class JcrResourceProvider extends
}
@Override
- public void refresh(final @Nonnull ResolverContext<JcrProviderState> ctx) {
+ public void refresh(final @Nonnull ResolveContext<JcrProviderState> ctx) {
try {
ctx.getProviderState().getSession().refresh(true);
} catch (final RepositoryException ignore) {
@@ -483,7 +483,7 @@ public class JcrResourceProvider extends
@SuppressWarnings("unchecked")
@Override
- public @CheckForNull <AdapterType> AdapterType adaptTo(final @Nonnull ResolverContext<JcrProviderState> ctx,
+ public @CheckForNull <AdapterType> AdapterType adaptTo(final @Nonnull ResolveContext<JcrProviderState> ctx,
final @Nonnull Class<AdapterType> type) {
Session session = ctx.getProviderState().getSession();
if (type == Session.class) {
@@ -509,14 +509,14 @@ public class JcrResourceProvider extends
}
@Override
- public boolean copy(final @Nonnull ResolverContext<JcrProviderState> ctx,
+ public boolean copy(final @Nonnull ResolveContext<JcrProviderState> ctx,
final String srcAbsPath,
final String destAbsPath) throws PersistenceException {
return false;
}
@Override
- public boolean move(final @Nonnull ResolverContext<JcrProviderState> ctx,
+ public boolean move(final @Nonnull ResolveContext<JcrProviderState> ctx,
final String srcAbsPath,
final String destAbsPath) throws PersistenceException {
final String srcNodePath = pathMapper.mapResourcePathToJCRPath(srcAbsPath);
Modified: sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProviderTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProviderTest.java?rev=1728517&r1=1728516&r2=1728517&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProviderTest.java (original)
+++ sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrResourceProviderTest.java Thu Feb 4 16:58:05 2016
@@ -23,7 +23,7 @@ import java.security.Principal;
import javax.jcr.Session;
import org.apache.sling.commons.testing.jcr.RepositoryTestBase;
-import org.apache.sling.spi.resource.provider.ResolverContext;
+import org.apache.sling.spi.resource.provider.ResolveContext;
import org.junit.Assert;
import org.mockito.Mockito;
@@ -46,7 +46,7 @@ public class JcrResourceProviderTest ext
public void testAdaptTo_Principal() {
jcrResourceProvider = new JcrResourceProvider();
- ResolverContext ctx = Mockito.mock(ResolverContext.class);
+ ResolveContext ctx = Mockito.mock(ResolveContext.class);
Mockito.when(ctx.getProviderState()).thenReturn(new JcrProviderState(session, null, false));
Assert.assertNotNull(jcrResourceProvider.adaptTo(ctx, Principal.class));
}