[sling-org-apache-sling-resource-filter] branch master updated: Revert back to a single adaptable.

[jeb]

This is an automated email from the ASF dual-hosted git repository.

jeb pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resource-filter.git


The following commit(s) were added to refs/heads/master by this push:
     new ff89892  Revert back to a single adaptable.
ff89892 is described below

commit ff898929508e84e559d0e0002a3778b4ac76e4dd
Author: JE Bailey <jason.bai...@sas.com>
AuthorDate: Thu Aug 23 12:34:22 2018 -0400

    Revert back to a single adaptable.
---
 .../sling/resource/filter/impl/ResourceFilterAdapter.java  | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/resource/filter/impl/ResourceFilterAdapter.java
 
b/src/main/java/org/apache/sling/resource/filter/impl/ResourceFilterAdapter.java
index 903447e..6f568ce 100644
--- 
a/src/main/java/org/apache/sling/resource/filter/impl/ResourceFilterAdapter.java
+++ 
b/src/main/java/org/apache/sling/resource/filter/impl/ResourceFilterAdapter.java
@@ -20,25 +20,23 @@ package org.apache.sling.resource.filter.impl;
 
 import org.apache.sling.api.adapter.AdapterFactory;
 import org.apache.sling.api.resource.Resource;
-import org.apache.sling.resource.filter.ResourcePredicates;
 import org.apache.sling.resource.filter.ResourceFilterStream;
+import org.apache.sling.resource.filter.ResourcePredicates;
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
 
 
 @Component(property= 
{"adaptables=org.apache.sling.api.resource.Resource","adapters=org.apache.sling.resource.filter.ResourceFilterStream"})
 public class ResourceFilterAdapter implements AdapterFactory {
+    
+    @Reference
+    private volatile ResourcePredicates filter;
 
     @SuppressWarnings("unchecked")
     @Override
     public <T> T getAdapter(Object adaptable, Class<T> type) {
         if (adaptable instanceof Resource) {
-            ResourcePredicates filter = new ResourcePredicateImpl();
-            if (type == ResourceFilterStream.class) {
-                return (T) new ResourceFilterStream((Resource)adaptable, 
filter);
-            }
-            if (type == ResourcePredicates.class) {
-                return (T) filter;
-            }
+            return (T) new ResourceFilterStream((Resource)adaptable, filter);
         }
         return null;
     }