Author: tomekr
Date: Wed Mar 4 13:11:09 2015
New Revision: 1663978
URL: http://svn.apache.org/r1663978
Log:
Move classes between api and api.internal in SlingQuery
Added:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/Function.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/internal/TreeProvider.java
Removed:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/TreeProvider.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/internal/Function.java
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/AbstractQuery.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/internal/ElementToIteratorFunction.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/internal/IteratorToIteratorFunction.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/ChildrenFunction.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/ClosestFunction.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/CompositeFunction.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/DescendantFunction.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/FindFunction.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/HasFunction.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/IteratorToIteratorFunctionWrapper.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/NextFunction.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/ParentFunction.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/ParentsFunction.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/PrevFunction.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/SiblingsFunction.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/UniqueFunction.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/DescendantsIterator.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/ParentsIterator.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/SiblingsIterator.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/UniqueIterator.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/tree/BfsTreeIterator.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/tree/DfsTreeIterator.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/predicate/IterableContainsPredicate.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/predicate/ParentPredicate.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/resource/ResourceTreeProvider.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/selector/FunctionType.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/selector/HierarchyOperator.java
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/selector/SelectorFunction.java
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/AbstractQuery.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/AbstractQuery.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/AbstractQuery.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/AbstractQuery.java
Wed Mar 4 13:11:09 2015
@@ -24,12 +24,12 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
+import org.apache.sling.query.api.Function;
import org.apache.sling.query.api.Predicate;
import org.apache.sling.query.api.SearchStrategy;
-import org.apache.sling.query.api.TreeProvider;
-import org.apache.sling.query.api.internal.Function;
import org.apache.sling.query.api.internal.IteratorToIteratorFunction;
import org.apache.sling.query.api.internal.Option;
+import org.apache.sling.query.api.internal.TreeProvider;
import org.apache.sling.query.function.AddFunction;
import org.apache.sling.query.function.ChildrenFunction;
import org.apache.sling.query.function.ClosestFunction;
@@ -69,7 +69,7 @@ public abstract class AbstractQuery<T, Q
private final TreeProvider<T> provider;
- protected AbstractQuery(TreeProvider<T> provider, T[]
initialCollection, SearchStrategy strategy) {
+ AbstractQuery(TreeProvider<T> provider, T[] initialCollection,
SearchStrategy strategy) {
this.provider = provider;
this.initialCollection = new
ArrayList<T>(Arrays.asList(initialCollection));
this.searchStrategy = strategy;
Added:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/Function.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/Function.java?rev=1663978&view=auto
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/Function.java
(added)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/Function.java
Wed Mar 4 13:11:09 2015
@@ -0,0 +1,41 @@
+/*-
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.sling.query.api;
+
+import aQute.bnd.annotation.ConsumerType;
+
+/**
+ * Function can transform one value into another.
+ *
+ * @author Tomasz RÄkawek
+ *
+ * @param <F> Input type
+ * @param <T> Output type
+ */
+@ConsumerType
+public interface Function<F, T> {
+ /**
+ * Take input F and transform it into output T.
+ *
+ * @param input Input value
+ * @return Output value
+ */
+ T apply(F input);
+}
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/internal/ElementToIteratorFunction.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/internal/ElementToIteratorFunction.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/internal/ElementToIteratorFunction.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/internal/ElementToIteratorFunction.java
Wed Mar 4 13:11:09 2015
@@ -21,5 +21,7 @@ package org.apache.sling.query.api.inter
import java.util.Iterator;
+import org.apache.sling.query.api.Function;
+
public interface ElementToIteratorFunction<T> extends Function<T, Iterator<T>>
{
}
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/internal/IteratorToIteratorFunction.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/internal/IteratorToIteratorFunction.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/internal/IteratorToIteratorFunction.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/internal/IteratorToIteratorFunction.java
Wed Mar 4 13:11:09 2015
@@ -21,5 +21,7 @@ package org.apache.sling.query.api.inter
import java.util.Iterator;
+import org.apache.sling.query.api.Function;
+
public interface IteratorToIteratorFunction<T> extends
Function<Iterator<Option<T>>, Iterator<Option<T>>> {
}
Added:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/internal/TreeProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/internal/TreeProvider.java?rev=1663978&view=auto
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/internal/TreeProvider.java
(added)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/api/internal/TreeProvider.java
Wed Mar 4 13:11:09 2015
@@ -0,0 +1,46 @@
+/*-
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.sling.query.api.internal;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.sling.query.api.Predicate;
+import org.apache.sling.query.selector.parser.Attribute;
+import org.apache.sling.query.selector.parser.SelectorSegment;
+
+import aQute.bnd.annotation.ConsumerType;
+
+@ConsumerType
+public interface TreeProvider<T> {
+ Iterator<T> listChildren(T parent);
+
+ T getParent(T element);
+
+ String getName(T element);
+
+ Predicate<T> getPredicate(String type, String name, List<Attribute>
attributes);
+
+ Iterator<T> query(List<SelectorSegment> segment, T resource);
+
+ boolean sameElement(T o1, T o2);
+
+ boolean isDescendant(T root, T testedElement);
+}
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/ChildrenFunction.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/ChildrenFunction.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/ChildrenFunction.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/ChildrenFunction.java
Wed Mar 4 13:11:09 2015
@@ -21,8 +21,8 @@ package org.apache.sling.query.function;
import java.util.Iterator;
-import org.apache.sling.query.api.TreeProvider;
import org.apache.sling.query.api.internal.ElementToIteratorFunction;
+import org.apache.sling.query.api.internal.TreeProvider;
public class ChildrenFunction<T> implements ElementToIteratorFunction<T> {
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/ClosestFunction.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/ClosestFunction.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/ClosestFunction.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/ClosestFunction.java
Wed Mar 4 13:11:09 2015
@@ -22,8 +22,8 @@ package org.apache.sling.query.function;
import java.util.Iterator;
import org.apache.sling.query.api.Predicate;
-import org.apache.sling.query.api.TreeProvider;
import org.apache.sling.query.api.internal.ElementToIteratorFunction;
+import org.apache.sling.query.api.internal.TreeProvider;
import org.apache.sling.query.util.IteratorUtils;
public class ClosestFunction<T> implements ElementToIteratorFunction<T> {
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/CompositeFunction.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/CompositeFunction.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/CompositeFunction.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/CompositeFunction.java
Wed Mar 4 13:11:09 2015
@@ -22,7 +22,7 @@ package org.apache.sling.query.function;
import java.util.Iterator;
import java.util.List;
-import org.apache.sling.query.api.internal.Function;
+import org.apache.sling.query.api.Function;
import org.apache.sling.query.api.internal.IteratorToIteratorFunction;
import org.apache.sling.query.api.internal.Option;
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/DescendantFunction.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/DescendantFunction.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/DescendantFunction.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/DescendantFunction.java
Wed Mar 4 13:11:09 2015
@@ -21,9 +21,9 @@ package org.apache.sling.query.function;
import java.util.Iterator;
-import org.apache.sling.query.api.TreeProvider;
import org.apache.sling.query.api.internal.IteratorToIteratorFunction;
import org.apache.sling.query.api.internal.Option;
+import org.apache.sling.query.api.internal.TreeProvider;
import org.apache.sling.query.iterator.DescendantsIterator;
public class DescendantFunction<T> implements IteratorToIteratorFunction<T> {
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/FindFunction.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/FindFunction.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/FindFunction.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/FindFunction.java
Wed Mar 4 13:11:09 2015
@@ -24,8 +24,8 @@ import java.util.Iterator;
import java.util.List;
import org.apache.sling.query.api.SearchStrategy;
-import org.apache.sling.query.api.TreeProvider;
import org.apache.sling.query.api.internal.ElementToIteratorFunction;
+import org.apache.sling.query.api.internal.TreeProvider;
import org.apache.sling.query.iterator.WarningIterator;
import org.apache.sling.query.iterator.tree.BfsTreeIterator;
import org.apache.sling.query.iterator.tree.DfsTreeIterator;
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/HasFunction.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/HasFunction.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/HasFunction.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/HasFunction.java
Wed Mar 4 13:11:09 2015
@@ -23,10 +23,10 @@ import java.util.Iterator;
import org.apache.sling.query.api.Predicate;
import org.apache.sling.query.api.SearchStrategy;
-import org.apache.sling.query.api.TreeProvider;
import org.apache.sling.query.api.internal.ElementToIteratorFunction;
import org.apache.sling.query.api.internal.IteratorToIteratorFunction;
import org.apache.sling.query.api.internal.Option;
+import org.apache.sling.query.api.internal.TreeProvider;
import org.apache.sling.query.iterator.EmptyElementFilter;
import org.apache.sling.query.selector.SelectorFunction;
import org.apache.sling.query.util.IteratorUtils;
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/IteratorToIteratorFunctionWrapper.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/IteratorToIteratorFunctionWrapper.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/IteratorToIteratorFunctionWrapper.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/IteratorToIteratorFunctionWrapper.java
Wed Mar 4 13:11:09 2015
@@ -21,8 +21,8 @@ package org.apache.sling.query.function;
import java.util.Iterator;
+import org.apache.sling.query.api.Function;
import org.apache.sling.query.api.internal.ElementToIteratorFunction;
-import org.apache.sling.query.api.internal.Function;
import org.apache.sling.query.api.internal.IteratorToIteratorFunction;
import org.apache.sling.query.api.internal.Option;
import org.apache.sling.query.iterator.ExpandingIterator;
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/NextFunction.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/NextFunction.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/NextFunction.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/NextFunction.java
Wed Mar 4 13:11:09 2015
@@ -22,8 +22,8 @@ package org.apache.sling.query.function;
import java.util.Iterator;
import org.apache.sling.query.api.Predicate;
-import org.apache.sling.query.api.TreeProvider;
import org.apache.sling.query.api.internal.ElementToIteratorFunction;
+import org.apache.sling.query.api.internal.TreeProvider;
import org.apache.sling.query.iterator.SiblingsIterator;
import org.apache.sling.query.iterator.SiblingsIterator.Type;
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/ParentFunction.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/ParentFunction.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/ParentFunction.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/ParentFunction.java
Wed Mar 4 13:11:09 2015
@@ -21,8 +21,8 @@ package org.apache.sling.query.function;
import java.util.Iterator;
-import org.apache.sling.query.api.TreeProvider;
import org.apache.sling.query.api.internal.ElementToIteratorFunction;
+import org.apache.sling.query.api.internal.TreeProvider;
import org.apache.sling.query.util.IteratorUtils;
public class ParentFunction<T> implements ElementToIteratorFunction<T> {
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/ParentsFunction.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/ParentsFunction.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/ParentsFunction.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/ParentsFunction.java
Wed Mar 4 13:11:09 2015
@@ -22,8 +22,8 @@ package org.apache.sling.query.function;
import java.util.Iterator;
import org.apache.sling.query.api.Predicate;
-import org.apache.sling.query.api.TreeProvider;
import org.apache.sling.query.api.internal.ElementToIteratorFunction;
+import org.apache.sling.query.api.internal.TreeProvider;
import org.apache.sling.query.iterator.ParentsIterator;
public class ParentsFunction<T> implements ElementToIteratorFunction<T> {
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/PrevFunction.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/PrevFunction.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/PrevFunction.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/PrevFunction.java
Wed Mar 4 13:11:09 2015
@@ -22,8 +22,8 @@ package org.apache.sling.query.function;
import java.util.Iterator;
import org.apache.sling.query.api.Predicate;
-import org.apache.sling.query.api.TreeProvider;
import org.apache.sling.query.api.internal.ElementToIteratorFunction;
+import org.apache.sling.query.api.internal.TreeProvider;
import org.apache.sling.query.iterator.SiblingsIterator;
import org.apache.sling.query.iterator.SiblingsIterator.Type;
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/SiblingsFunction.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/SiblingsFunction.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/SiblingsFunction.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/SiblingsFunction.java
Wed Mar 4 13:11:09 2015
@@ -21,8 +21,8 @@ package org.apache.sling.query.function;
import java.util.Iterator;
-import org.apache.sling.query.api.TreeProvider;
import org.apache.sling.query.api.internal.ElementToIteratorFunction;
+import org.apache.sling.query.api.internal.TreeProvider;
import org.apache.sling.query.util.IteratorUtils;
public class SiblingsFunction<T> implements ElementToIteratorFunction<T> {
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/UniqueFunction.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/UniqueFunction.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/UniqueFunction.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/function/UniqueFunction.java
Wed Mar 4 13:11:09 2015
@@ -21,9 +21,9 @@ package org.apache.sling.query.function;
import java.util.Iterator;
-import org.apache.sling.query.api.TreeProvider;
import org.apache.sling.query.api.internal.IteratorToIteratorFunction;
import org.apache.sling.query.api.internal.Option;
+import org.apache.sling.query.api.internal.TreeProvider;
import org.apache.sling.query.iterator.UniqueIterator;
public class UniqueFunction<T> implements IteratorToIteratorFunction<T> {
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/DescendantsIterator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/DescendantsIterator.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/DescendantsIterator.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/DescendantsIterator.java
Wed Mar 4 13:11:09 2015
@@ -22,8 +22,8 @@ package org.apache.sling.query.iterator;
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.sling.query.api.TreeProvider;
import org.apache.sling.query.api.internal.Option;
+import org.apache.sling.query.api.internal.TreeProvider;
import org.apache.sling.query.util.LazyList;
public class DescendantsIterator<T> extends AbstractIterator<Option<T>> {
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/ParentsIterator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/ParentsIterator.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/ParentsIterator.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/ParentsIterator.java
Wed Mar 4 13:11:09 2015
@@ -20,7 +20,7 @@
package org.apache.sling.query.iterator;
import org.apache.sling.query.api.Predicate;
-import org.apache.sling.query.api.TreeProvider;
+import org.apache.sling.query.api.internal.TreeProvider;
public class ParentsIterator<T> extends AbstractIterator<T> {
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/SiblingsIterator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/SiblingsIterator.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/SiblingsIterator.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/SiblingsIterator.java
Wed Mar 4 13:11:09 2015
@@ -23,7 +23,7 @@ import java.util.Iterator;
import java.util.ListIterator;
import org.apache.sling.query.api.Predicate;
-import org.apache.sling.query.api.TreeProvider;
+import org.apache.sling.query.api.internal.TreeProvider;
import org.apache.sling.query.util.IteratorUtils;
import org.apache.sling.query.util.LazyList;
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/UniqueIterator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/UniqueIterator.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/UniqueIterator.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/UniqueIterator.java
Wed Mar 4 13:11:09 2015
@@ -21,8 +21,8 @@ package org.apache.sling.query.iterator;
import java.util.Iterator;
-import org.apache.sling.query.api.TreeProvider;
import org.apache.sling.query.api.internal.Option;
+import org.apache.sling.query.api.internal.TreeProvider;
public class UniqueIterator<T> extends AbstractIterator<Option<T>> {
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/tree/BfsTreeIterator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/tree/BfsTreeIterator.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/tree/BfsTreeIterator.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/tree/BfsTreeIterator.java
Wed Mar 4 13:11:09 2015
@@ -23,7 +23,7 @@ import java.util.Deque;
import java.util.Iterator;
import java.util.LinkedList;
-import org.apache.sling.query.api.TreeProvider;
+import org.apache.sling.query.api.internal.TreeProvider;
import org.apache.sling.query.iterator.AbstractIterator;
public class BfsTreeIterator<T> extends AbstractIterator<T> {
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/tree/DfsTreeIterator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/tree/DfsTreeIterator.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/tree/DfsTreeIterator.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/iterator/tree/DfsTreeIterator.java
Wed Mar 4 13:11:09 2015
@@ -23,7 +23,7 @@ import java.util.Deque;
import java.util.Iterator;
import java.util.LinkedList;
-import org.apache.sling.query.api.TreeProvider;
+import org.apache.sling.query.api.internal.TreeProvider;
import org.apache.sling.query.iterator.AbstractIterator;
public class DfsTreeIterator<T> extends AbstractIterator<T> {
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/predicate/IterableContainsPredicate.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/predicate/IterableContainsPredicate.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/predicate/IterableContainsPredicate.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/predicate/IterableContainsPredicate.java
Wed Mar 4 13:11:09 2015
@@ -20,7 +20,7 @@
package org.apache.sling.query.predicate;
import org.apache.sling.query.api.Predicate;
-import org.apache.sling.query.api.TreeProvider;
+import org.apache.sling.query.api.internal.TreeProvider;
import org.apache.sling.query.util.LazyList;
public class IterableContainsPredicate<T> implements Predicate<T> {
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/predicate/ParentPredicate.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/predicate/ParentPredicate.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/predicate/ParentPredicate.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/predicate/ParentPredicate.java
Wed Mar 4 13:11:09 2015
@@ -20,7 +20,7 @@
package org.apache.sling.query.predicate;
import org.apache.sling.query.api.Predicate;
-import org.apache.sling.query.api.TreeProvider;
+import org.apache.sling.query.api.internal.TreeProvider;
public class ParentPredicate<T> implements Predicate<T> {
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/resource/ResourceTreeProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/resource/ResourceTreeProvider.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/resource/ResourceTreeProvider.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/resource/ResourceTreeProvider.java
Wed Mar 4 13:11:09 2015
@@ -25,7 +25,7 @@ import java.util.List;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.query.api.Predicate;
-import org.apache.sling.query.api.TreeProvider;
+import org.apache.sling.query.api.internal.TreeProvider;
import org.apache.sling.query.resource.jcr.JcrQueryIterator;
import org.apache.sling.query.resource.jcr.JcrTypeResolver;
import org.apache.sling.query.resource.jcr.SessionJcrTypeResolver;
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/selector/FunctionType.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/selector/FunctionType.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/selector/FunctionType.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/selector/FunctionType.java
Wed Mar 4 13:11:09 2015
@@ -19,9 +19,9 @@
package org.apache.sling.query.selector;
+import org.apache.sling.query.api.Function;
import org.apache.sling.query.api.SearchStrategy;
-import org.apache.sling.query.api.TreeProvider;
-import org.apache.sling.query.api.internal.Function;
+import org.apache.sling.query.api.internal.TreeProvider;
import org.apache.sling.query.function.EvenFunction;
import org.apache.sling.query.function.FilterFunction;
import org.apache.sling.query.function.HasFunction;
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/selector/HierarchyOperator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/selector/HierarchyOperator.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/selector/HierarchyOperator.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/selector/HierarchyOperator.java
Wed Mar 4 13:11:09 2015
@@ -19,9 +19,9 @@
package org.apache.sling.query.selector;
+import org.apache.sling.query.api.Function;
import org.apache.sling.query.api.SearchStrategy;
-import org.apache.sling.query.api.TreeProvider;
-import org.apache.sling.query.api.internal.Function;
+import org.apache.sling.query.api.internal.TreeProvider;
import org.apache.sling.query.function.ChildrenFunction;
import org.apache.sling.query.function.FindFunction;
import org.apache.sling.query.function.IdentityFunction;
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/selector/SelectorFunction.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/selector/SelectorFunction.java?rev=1663978&r1=1663977&r2=1663978&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/selector/SelectorFunction.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/selector/SelectorFunction.java
Wed Mar 4 13:11:09 2015
@@ -23,12 +23,12 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.apache.sling.query.api.Function;
import org.apache.sling.query.api.Predicate;
import org.apache.sling.query.api.SearchStrategy;
-import org.apache.sling.query.api.TreeProvider;
-import org.apache.sling.query.api.internal.Function;
import org.apache.sling.query.api.internal.IteratorToIteratorFunction;
import org.apache.sling.query.api.internal.Option;
+import org.apache.sling.query.api.internal.TreeProvider;
import org.apache.sling.query.function.CompositeFunction;
import org.apache.sling.query.function.FilterFunction;
import org.apache.sling.query.iterator.AlternativeIterator;
