You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2016/01/26 14:49:06 UTC
svn commit: r1726792 - in
/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers:
ResourceProviderStorage.java stateful/CombinedResourceProvider.java
Author: rombert
Date: Tue Jan 26 13:49:06 2016
New Revision: 1726792
URL: http://svn.apache.org/viewvc?rev=1726792&view=rev
Log:
SLING-4750 - New Resource Provider API
Typo and Javadoc fixes
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderStorage.java
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/CombinedResourceProvider.java
Modified: sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderStorage.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderStorage.java?rev=1726792&r1=1726791&r2=1726792&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderStorage.java (original)
+++ sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/ResourceProviderStorage.java Tue Jan 26 13:49:06 2016
@@ -36,7 +36,7 @@ public class ResourceProviderStorage {
private final List<ResourceProviderHandler> refreshableHandlers;
- private final List<ResourceProviderHandler> languageQuerableHandlers;
+ private final List<ResourceProviderHandler> languageQueryableHandlers;
private final PathTree<ResourceProviderHandler> handlersTree;
@@ -46,7 +46,7 @@ public class ResourceProviderStorage {
this.adaptableHandlers = new ArrayList<ResourceProviderHandler>();
this.attributableHandlers = new ArrayList<ResourceProviderHandler>();
this.refreshableHandlers = new ArrayList<ResourceProviderHandler>();
- this.languageQuerableHandlers = new ArrayList<ResourceProviderHandler>();
+ this.languageQueryableHandlers = new ArrayList<ResourceProviderHandler>();
for (ResourceProviderHandler h : allHandlers) {
ResourceProviderInfo info = h.getInfo();
if (info.getAuthType() == AuthType.required) {
@@ -62,7 +62,7 @@ public class ResourceProviderStorage {
this.refreshableHandlers.add(h);
}
if (h.getResourceProvider().getQueryLanguageProvider() != null) {
- this.languageQuerableHandlers.add(h);
+ this.languageQueryableHandlers.add(h);
}
}
this.handlersTree = new PathTree<ResourceProviderHandler>(handlers);
@@ -88,8 +88,8 @@ public class ResourceProviderStorage {
return refreshableHandlers;
}
- public List<ResourceProviderHandler> getLanguaheQuerableHandlers() {
- return languageQuerableHandlers;
+ public List<ResourceProviderHandler> getLanguageQueryableHandlers() {
+ return languageQueryableHandlers;
}
public PathTree<ResourceProviderHandler> getTree() {
Modified: sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/CombinedResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/CombinedResourceProvider.java?rev=1726792&r1=1726791&r2=1726792&view=diff
==============================================================================
--- sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/CombinedResourceProvider.java (original)
+++ sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/providers/stateful/CombinedResourceProvider.java Tue Jan 26 13:49:06 2016
@@ -78,7 +78,7 @@ public class CombinedResourceProvider {
}
/**
- * Logouts from all providers.
+ * Logs out from all providers.
*/
public void logout() {
for (StatefulResourceProvider p : authenticator.getAllUsedAuthenticated()) {
@@ -373,7 +373,7 @@ public class CombinedResourceProvider {
*/
public String[] getSupportedLanguages() {
Set<String> supportedLanguages = new LinkedHashSet<String>();
- for (StatefulResourceProvider p : authenticator.getAllBestEffort(storage.getLanguaheQuerableHandlers(), this)) {
+ for (StatefulResourceProvider p : authenticator.getAllBestEffort(storage.getLanguageQueryableHandlers(), this)) {
supportedLanguages.addAll(Arrays.asList(p.getSupportedLanguages()));
}
return supportedLanguages.toArray(new String[supportedLanguages.size()]);
@@ -383,31 +383,31 @@ public class CombinedResourceProvider {
* Queries all resource providers and combines the results.
*/
public Iterator<Resource> findResources(final String query, final String language) {
- List<StatefulResourceProvider> querableRP = getQuerableProviders(language);
- List<Iterator<Resource>> iterators = new ArrayList<Iterator<Resource>>(querableRP.size());
- for (StatefulResourceProvider p : querableRP) {
+ List<StatefulResourceProvider> queryableRP = getQueryableProviders(language);
+ List<Iterator<Resource>> iterators = new ArrayList<Iterator<Resource>>(queryableRP.size());
+ for (StatefulResourceProvider p : queryableRP) {
iterators.add(p.findResources(query, language));
}
return new ChainedIterator<Resource>(iterators.iterator());
}
- private List<StatefulResourceProvider> getQuerableProviders(String language) {
- List<StatefulResourceProvider> querableProviders = new ArrayList<StatefulResourceProvider>();
- for (StatefulResourceProvider p : authenticator.getAllBestEffort(storage.getLanguaheQuerableHandlers(), this)) {
+ private List<StatefulResourceProvider> getQueryableProviders(String language) {
+ List<StatefulResourceProvider> queryableProviders = new ArrayList<StatefulResourceProvider>();
+ for (StatefulResourceProvider p : authenticator.getAllBestEffort(storage.getLanguageQueryableHandlers(), this)) {
if (ArrayUtils.contains(p.getSupportedLanguages(), language)) {
- querableProviders.add(p);
+ queryableProviders.add(p);
}
}
- return querableProviders;
+ return queryableProviders;
}
/**
* Queries all resource providers and combines the results.
*/
public Iterator<Map<String, Object>> queryResources(final String query, final String language) {
- List<StatefulResourceProvider> querableRP = getQuerableProviders(language);
- List<Iterator<Map<String, Object>>> iterators = new ArrayList<Iterator<Map<String, Object>>>(querableRP.size());
- for (StatefulResourceProvider p : querableRP) {
+ List<StatefulResourceProvider> queryableRP = getQueryableProviders(language);
+ List<Iterator<Map<String, Object>>> iterators = new ArrayList<Iterator<Map<String, Object>>>(queryableRP.size());
+ for (StatefulResourceProvider p : queryableRP) {
iterators.add(p.queryResources(query, language));
}
return new ChainedIterator<Map<String, Object>>(iterators.iterator());