Author: cziegeler
Date: Tue May 29 07:08:46 2012
New Revision: 1343560
URL: http://svn.apache.org/viewvc?rev=1343560&view=rev
Log:
SLING-2396 : Add new resource provider interfaces (WiP)
Modified:
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/AbstractWrappedResourceProvider.java
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/RootResourceProviderEntry.java
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/SortedProviderList.java
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/WrappedResourceProvider.java
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/WrappedResourceProviderFactory.java
Modified:
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java?rev=1343560&r1=1343559&r2=1343560&view=diff
==============================================================================
---
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
(original)
+++
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java
Tue May 29 07:08:46 2012
@@ -658,7 +658,7 @@ public class ResourceResolverImpl extend
// ---------- Adaptable interface
/**
- * @see org.apache.sling.adapter.SlingAdaptable#adaptTo(java.lang.Class)
+ * @see
org.apache.sling.api.adapter.SlingAdaptable#adaptTo(java.lang.Class)
*/
@SuppressWarnings("unchecked")
public <AdapterType> AdapterType adaptTo(final Class<AdapterType> type) {
Modified:
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/AbstractWrappedResourceProvider.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/AbstractWrappedResourceProvider.java?rev=1343560&r1=1343559&r2=1343560&view=diff
==============================================================================
---
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/AbstractWrappedResourceProvider.java
(original)
+++
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/AbstractWrappedResourceProvider.java
Tue May 29 07:08:46 2012
@@ -20,8 +20,6 @@ package org.apache.sling.resourceresolve
import java.util.Iterator;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceProvider;
import org.apache.sling.api.resource.ResourceResolver;
@@ -74,11 +72,6 @@ public abstract class AbstractWrappedRes
/**
* @see ResourceProvider#getResource(ResourceResolver, String)
*/
- public abstract Resource getResource(final ResourceResolverContext ctx,
final ResourceResolver resourceResolver, final HttpServletRequest request,
final String path);
-
- /**
- * @see ResourceProvider#getResource(ResourceResolver, HttpServletRequest,
String)
- */
public abstract Resource getResource(final ResourceResolverContext ctx,
final ResourceResolver resourceResolver, final String path);
/**
Modified:
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/RootResourceProviderEntry.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/RootResourceProviderEntry.java?rev=1343560&r1=1343559&r2=1343560&view=diff
==============================================================================
---
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/RootResourceProviderEntry.java
(original)
+++
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/RootResourceProviderEntry.java
Tue May 29 07:08:46 2012
@@ -20,6 +20,7 @@ package org.apache.sling.resourceresolve
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.Dictionary;
import java.util.HashSet;
import java.util.Hashtable;
@@ -119,8 +120,13 @@ public class RootResourceProviderEntry e
final Iterator<QueriableResourceProvider> i =
this.queriableProviders.getProviders(ctx);
while ( i.hasNext() ) {
final QueriableResourceProvider adap = i.next();
+ final Iterator<Resource> iter = adap.findResources(query,
language);
+ if ( iter != null ) {
+ // TODO
+ }
}
- return null;
+ // TODO
+ return Collections.EMPTY_LIST.iterator();
}
/**
@@ -131,8 +137,13 @@ public class RootResourceProviderEntry e
final Iterator<QueriableResourceProvider> i =
this.queriableProviders.getProviders(ctx);
while ( i.hasNext() ) {
final QueriableResourceProvider adap = i.next();
+ final Iterator<Map<String, Object>> iter =
adap.queryResources(query, language);
+ if ( iter != null ) {
+ // TODO
+ }
}
- return null;
+ // TODO
+ return Collections.EMPTY_LIST.iterator();
}
private static final String FORBIDDEN_ATTRIBUTE =
ResourceResolverFactory.PASSWORD;
Modified:
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/SortedProviderList.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/SortedProviderList.java?rev=1343560&r1=1343559&r2=1343560&view=diff
==============================================================================
---
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/SortedProviderList.java
(original)
+++
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/SortedProviderList.java
Tue May 29 07:08:46 2012
@@ -83,6 +83,7 @@ public class SortedProviderList<T> {
/**
* @see java.util.Iterator#next()
*/
+ @SuppressWarnings("unchecked")
public T next() {
final Object result = this.nextObject;
this.nextObject = seek();
Modified:
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/WrappedResourceProvider.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/WrappedResourceProvider.java?rev=1343560&r1=1343559&r2=1343560&view=diff
==============================================================================
---
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/WrappedResourceProvider.java
(original)
+++
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/WrappedResourceProvider.java
Tue May 29 07:08:46 2012
@@ -20,8 +20,6 @@ package org.apache.sling.resourceresolve
import java.util.Iterator;
import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceProvider;
import org.apache.sling.api.resource.ResourceResolver;
@@ -45,13 +43,6 @@ public class WrappedResourceProvider ext
/**
* @see ResourceProvider#getResource(ResourceResolver, String)
*/
- public Resource getResource(final ResourceResolverContext ctx, final
ResourceResolver resourceResolver, final HttpServletRequest request, final
String path) {
- return this.resourceProvider.getResource(resourceResolver, request,
path);
- }
-
- /**
- * @see ResourceProvider#getResource(ResourceResolver, HttpServletRequest,
String)
- */
public Resource getResource(final ResourceResolverContext ctx, final
ResourceResolver resourceResolver, final String path) {
return this.resourceProvider.getResource(resourceResolver, path);
}
Modified:
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/WrappedResourceProviderFactory.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/WrappedResourceProviderFactory.java?rev=1343560&r1=1343559&r2=1343560&view=diff
==============================================================================
---
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/WrappedResourceProviderFactory.java
(original)
+++
sling/whiteboard/SLING-2396/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/helper/WrappedResourceProviderFactory.java
Tue May 29 07:08:46 2012
@@ -84,13 +84,6 @@ public class WrappedResourceProviderFact
/**
* @see ResourceProvider#getResource(ResourceResolver, String)
*/
- public Resource getResource(final ResourceResolverContext ctx, final
ResourceResolver resourceResolver, final HttpServletRequest request, final
String path) {
- return this.getResourceProvider(ctx).getResource(resourceResolver,
request, path);
- }
-
- /**
- * @see ResourceProvider#getResource(ResourceResolver, HttpServletRequest,
String)
- */
public Resource getResource(final ResourceResolverContext ctx, final
ResourceResolver resourceResolver, final String path) {
return this.getResourceProvider(ctx).getResource(resourceResolver,
path);
}
