Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineImpl.java (revision ) @@ -37,6 +37,7 @@ import org.apache.jackrabbit.oak.namepath.NamePathMapperImpl; import org.apache.jackrabbit.oak.query.ast.NodeTypeInfoProvider; import org.apache.jackrabbit.oak.query.xpath.XPathToSQL2Converter; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.MDC; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettings.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettings.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettings.java (revision ) @@ -18,124 +18,10 @@ */ package org.apache.jackrabbit.oak.query; -import org.apache.jackrabbit.oak.api.jmx.QueryEngineSettingsMBean; - /** * Settings of the query engine. + * + * @deprecated Use {@link org.apache.jackrabbit.oak.spi.query.QueryEngineSettings} instead */ -public class QueryEngineSettings implements QueryEngineSettingsMBean { - - /** - * the flag used to turn on/off the optimisations on top of the {@link Query} object. - * {@code -Doak.query.sql2optimisation} - */ - public static final String SQL2_OPTIMISATION_FLAG = "oak.query.sql2optimisation"; - - public static final String SQL2_OPTIMISATION_FLAG_2 = "oak.query.sql2optimisation2"; - - public static final boolean SQL2_OPTIMIZATION_2 = - Boolean.parseBoolean(System.getProperty(SQL2_OPTIMISATION_FLAG_2, "true")); - - static final String OAK_QUERY_LIMIT_IN_MEMORY = "oak.queryLimitInMemory"; - - // should be the same as QueryEngineSettingsService.DEFAULT_QUERY_LIMIT_IN_MEMORY - static final int DEFAULT_QUERY_LIMIT_IN_MEMORY = - Integer.getInteger(OAK_QUERY_LIMIT_IN_MEMORY, 500000); - - static final String OAK_QUERY_LIMIT_READS = "oak.queryLimitReads"; - - // should be the same as QueryEngineSettingsService.DEFAULT_QUERY_LIMIT_READS - static final int DEFAULT_QUERY_LIMIT_READS = - Integer.getInteger(OAK_QUERY_LIMIT_READS, 100000); - - static final String OAK_QUERY_FAIL_TRAVERSAL = "oak.queryFailTraversal"; - private static final boolean DEFAULT_FAIL_TRAVERSAL = - Boolean.getBoolean(OAK_QUERY_FAIL_TRAVERSAL); - - private static final boolean DEFAULT_FULL_TEXT_COMPARISON_WITHOUT_INDEX = - Boolean.getBoolean("oak.queryFullTextComparisonWithoutIndex"); - - private long limitInMemory = DEFAULT_QUERY_LIMIT_IN_MEMORY; - - private long limitReads = DEFAULT_QUERY_LIMIT_READS; - - private boolean failTraversal = DEFAULT_FAIL_TRAVERSAL; - - private boolean fullTextComparisonWithoutIndex = - DEFAULT_FULL_TEXT_COMPARISON_WITHOUT_INDEX; - - private boolean sql2Optimisation = - Boolean.parseBoolean(System.getProperty(SQL2_OPTIMISATION_FLAG, "true")); - - private static final String OAK_FAST_QUERY_SIZE = "oak.fastQuerySize"; - static final boolean DEFAULT_FAST_QUERY_SIZE = Boolean.getBoolean(OAK_FAST_QUERY_SIZE); - private boolean fastQuerySize = DEFAULT_FAST_QUERY_SIZE; - - public QueryEngineSettings() { - } - - @Override - public long getLimitInMemory() { - return limitInMemory; - } - - @Override - public void setLimitInMemory(long limitInMemory) { - this.limitInMemory = limitInMemory; - } - - @Override - public long getLimitReads() { - return limitReads; - } - - @Override - public void setLimitReads(long limitReads) { - this.limitReads = limitReads; - } - - @Override - public boolean getFailTraversal() { - return failTraversal; - } - - @Override - public void setFailTraversal(boolean failTraversal) { - this.failTraversal = failTraversal; - } - - @Override - public boolean isFastQuerySize() { - return fastQuerySize; - } - - @Override - public void setFastQuerySize(boolean fastQuerySize) { - this.fastQuerySize = fastQuerySize; - System.setProperty(OAK_FAST_QUERY_SIZE, String.valueOf(fastQuerySize)); - } - - public void setFullTextComparisonWithoutIndex(boolean fullTextComparisonWithoutIndex) { - this.fullTextComparisonWithoutIndex = fullTextComparisonWithoutIndex; - } - - public boolean getFullTextComparisonWithoutIndex() { - return fullTextComparisonWithoutIndex; - } - - public boolean isSql2Optimisation() { - return sql2Optimisation; - } - - @Override - public String toString() { - return "QueryEngineSettings{" + - "limitInMemory=" + limitInMemory + - ", limitReads=" + limitReads + - ", failTraversal=" + failTraversal + - ", fullTextComparisonWithoutIndex=" + fullTextComparisonWithoutIndex + - ", sql2Optimisation=" + sql2Optimisation + - ", fastQuerySize=" + fastQuerySize + - '}'; - } +public class QueryEngineSettings extends org.apache.jackrabbit.oak.spi.query.QueryEngineSettings { } Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextExpression.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextExpression.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/FullTextExpression.java (revision ) @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.query.fulltext; +package org.apache.jackrabbit.oak.spi.query.fulltext; /** * The base class for fulltext condition expression. \ No newline at end of file Index: oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java (revision 1797861) +++ oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java (revision ) @@ -35,10 +35,10 @@ import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition.IndexingRule; import org.apache.jackrabbit.oak.plugins.index.lucene.util.FacetHelper; -import org.apache.jackrabbit.oak.query.fulltext.FullTextContains; -import org.apache.jackrabbit.oak.query.fulltext.FullTextExpression; -import org.apache.jackrabbit.oak.query.fulltext.FullTextTerm; -import org.apache.jackrabbit.oak.query.fulltext.FullTextVisitor; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextContains; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextExpression; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextTerm; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextVisitor; import org.apache.jackrabbit.oak.spi.query.Filter; import org.apache.jackrabbit.oak.spi.query.QueryConstants; import org.apache.lucene.index.IndexReader; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ComparisonImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ComparisonImpl.java (revision 1797929) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ComparisonImpl.java (revision ) @@ -28,7 +28,7 @@ import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; import org.apache.jackrabbit.oak.query.ValueConverter; -import org.apache.jackrabbit.oak.query.fulltext.LikePattern; +import org.apache.jackrabbit.oak.spi.query.fulltext.LikePattern; import org.apache.jackrabbit.oak.query.index.FilterImpl; import org.apache.jackrabbit.oak.plugins.memory.PropertyValues; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregationCursor.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregationCursor.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregationCursor.java (revision ) @@ -25,7 +25,7 @@ import org.apache.jackrabbit.oak.api.Result.SizePrecision; import org.apache.jackrabbit.oak.spi.query.Cursor; import org.apache.jackrabbit.oak.spi.query.IndexRow; -import org.apache.jackrabbit.oak.spi.query.Cursors.AbstractCursor; +import org.apache.jackrabbit.oak.query.index.Cursors.AbstractCursor; import org.apache.jackrabbit.oak.spi.state.NodeState; import com.google.common.base.Predicates; \ No newline at end of file Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/LikePattern.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/LikePattern.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/LikePattern.java (revision ) @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.query.fulltext; +package org.apache.jackrabbit.oak.spi.query.fulltext; /** * A pattern matcher. \ No newline at end of file Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/SQL2Parser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/SQL2Parser.java (revision 1797907) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/SQL2Parser.java (revision ) @@ -55,6 +55,7 @@ import org.apache.jackrabbit.oak.query.ast.SourceImpl; import org.apache.jackrabbit.oak.query.ast.StaticOperandImpl; import org.apache.jackrabbit.oak.plugins.memory.PropertyValues; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.apache.jackrabbit.oak.spi.query.QueryConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java (revision ) @@ -35,7 +35,7 @@ import org.apache.jackrabbit.oak.plugins.tree.impl.ImmutableTree; import org.apache.jackrabbit.oak.query.ExecutionContext; import org.apache.jackrabbit.oak.query.QueryEngineImpl; -import org.apache.jackrabbit.oak.query.QueryEngineSettings; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.apache.jackrabbit.oak.spi.state.NodeState; /** Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndex.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndex.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndex.java (revision ) @@ -21,7 +21,7 @@ import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider; import org.apache.jackrabbit.oak.spi.query.Cursor; -import org.apache.jackrabbit.oak.spi.query.Cursors; +import org.apache.jackrabbit.oak.query.index.Cursors; import org.apache.jackrabbit.oak.spi.query.Filter; import org.apache.jackrabbit.oak.spi.query.QueryIndex; import org.apache.jackrabbit.oak.spi.state.NodeState; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexPathServiceImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexPathServiceImpl.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexPathServiceImpl.java (revision ) @@ -29,7 +29,7 @@ import org.apache.felix.scr.annotations.Service; import org.apache.jackrabbit.oak.plugins.index.nodetype.NodeTypeIndexProvider; import org.apache.jackrabbit.oak.query.NodeStateNodeTypeInfoProvider; -import org.apache.jackrabbit.oak.query.QueryEngineSettings; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.apache.jackrabbit.oak.query.ast.NodeTypeInfo; import org.apache.jackrabbit.oak.query.ast.NodeTypeInfoProvider; import org.apache.jackrabbit.oak.query.ast.SelectorImpl; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryEngineSettings.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryEngineSettings.java (revision ) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/QueryEngineSettings.java (revision ) @@ -0,0 +1,141 @@ +/* + * 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.jackrabbit.oak.spi.query; + +import org.apache.jackrabbit.oak.api.jmx.QueryEngineSettingsMBean; + +/** + * Settings of the query engine. + */ +public class QueryEngineSettings implements QueryEngineSettingsMBean { + + /** + * the flag used to turn on/off the optimisations on top of the {@link org.apache.jackrabbit.oak.query.Query} object. + * {@code -Doak.query.sql2optimisation} + */ + public static final String SQL2_OPTIMISATION_FLAG = "oak.query.sql2optimisation"; + + public static final String SQL2_OPTIMISATION_FLAG_2 = "oak.query.sql2optimisation2"; + + public static final boolean SQL2_OPTIMIZATION_2 = + Boolean.parseBoolean(System.getProperty(SQL2_OPTIMISATION_FLAG_2, "true")); + + public static final String OAK_QUERY_LIMIT_IN_MEMORY = "oak.queryLimitInMemory"; + + // should be the same as QueryEngineSettingsService.DEFAULT_QUERY_LIMIT_IN_MEMORY + public static final int DEFAULT_QUERY_LIMIT_IN_MEMORY = + Integer.getInteger(OAK_QUERY_LIMIT_IN_MEMORY, 500000); + + public static final String OAK_QUERY_LIMIT_READS = "oak.queryLimitReads"; + + // should be the same as QueryEngineSettingsService.DEFAULT_QUERY_LIMIT_READS + public static final int DEFAULT_QUERY_LIMIT_READS = + Integer.getInteger(OAK_QUERY_LIMIT_READS, 100000); + + public static final String OAK_QUERY_FAIL_TRAVERSAL = "oak.queryFailTraversal"; + private static final boolean DEFAULT_FAIL_TRAVERSAL = + Boolean.getBoolean(OAK_QUERY_FAIL_TRAVERSAL); + + private static final boolean DEFAULT_FULL_TEXT_COMPARISON_WITHOUT_INDEX = + Boolean.getBoolean("oak.queryFullTextComparisonWithoutIndex"); + + private long limitInMemory = DEFAULT_QUERY_LIMIT_IN_MEMORY; + + private long limitReads = DEFAULT_QUERY_LIMIT_READS; + + private boolean failTraversal = DEFAULT_FAIL_TRAVERSAL; + + private boolean fullTextComparisonWithoutIndex = + DEFAULT_FULL_TEXT_COMPARISON_WITHOUT_INDEX; + + private boolean sql2Optimisation = + Boolean.parseBoolean(System.getProperty(SQL2_OPTIMISATION_FLAG, "true")); + + private static final String OAK_FAST_QUERY_SIZE = "oak.fastQuerySize"; + public static final boolean DEFAULT_FAST_QUERY_SIZE = Boolean.getBoolean(OAK_FAST_QUERY_SIZE); + private boolean fastQuerySize = DEFAULT_FAST_QUERY_SIZE; + + public QueryEngineSettings() { + } + + @Override + public long getLimitInMemory() { + return limitInMemory; + } + + @Override + public void setLimitInMemory(long limitInMemory) { + this.limitInMemory = limitInMemory; + } + + @Override + public long getLimitReads() { + return limitReads; + } + + @Override + public void setLimitReads(long limitReads) { + this.limitReads = limitReads; + } + + @Override + public boolean getFailTraversal() { + return failTraversal; + } + + @Override + public void setFailTraversal(boolean failTraversal) { + this.failTraversal = failTraversal; + } + + @Override + public boolean isFastQuerySize() { + return fastQuerySize; + } + + @Override + public void setFastQuerySize(boolean fastQuerySize) { + this.fastQuerySize = fastQuerySize; + System.setProperty(OAK_FAST_QUERY_SIZE, String.valueOf(fastQuerySize)); + } + + public void setFullTextComparisonWithoutIndex(boolean fullTextComparisonWithoutIndex) { + this.fullTextComparisonWithoutIndex = fullTextComparisonWithoutIndex; + } + + public boolean getFullTextComparisonWithoutIndex() { + return fullTextComparisonWithoutIndex; + } + + public boolean isSql2Optimisation() { + return sql2Optimisation; + } + + @Override + public String toString() { + return "QueryEngineSettings{" + + "limitInMemory=" + limitInMemory + + ", limitReads=" + limitReads + + ", failTraversal=" + failTraversal + + ", fullTextComparisonWithoutIndex=" + fullTextComparisonWithoutIndex + + ", sql2Optimisation=" + sql2Optimisation + + ", fastQuerySize=" + fastQuerySize + + '}'; + } +} Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/ContentMirrorStoreStrategy.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/ContentMirrorStoreStrategy.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/strategy/ContentMirrorStoreStrategy.java (revision ) @@ -35,7 +35,7 @@ import org.apache.jackrabbit.oak.plugins.index.counter.jmx.NodeCounter; import org.apache.jackrabbit.oak.plugins.memory.MemoryChildNodeEntry; import org.apache.jackrabbit.oak.query.FilterIterators; -import org.apache.jackrabbit.oak.query.QueryEngineSettings; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.apache.jackrabbit.oak.spi.query.Filter; import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; \ No newline at end of file Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettingsService.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettingsService.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryEngineSettingsService.java (revision ) @@ -28,6 +28,7 @@ import org.apache.felix.scr.annotations.Reference; import org.apache.jackrabbit.oak.api.jmx.QueryEngineSettingsMBean; import org.apache.jackrabbit.oak.commons.PropertiesUtil; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.osgi.framework.BundleContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Index: oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java (revision 1797907) +++ oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java (revision ) @@ -54,20 +54,20 @@ import org.apache.jackrabbit.oak.plugins.index.lucene.util.MoreLikeThisHelper; import org.apache.jackrabbit.oak.plugins.index.lucene.util.SpellcheckHelper; import org.apache.jackrabbit.oak.plugins.index.lucene.util.SuggestHelper; -import org.apache.jackrabbit.oak.query.QueryEngineSettings; -import org.apache.jackrabbit.oak.query.fulltext.FullTextAnd; -import org.apache.jackrabbit.oak.query.fulltext.FullTextContains; -import org.apache.jackrabbit.oak.query.fulltext.FullTextExpression; -import org.apache.jackrabbit.oak.query.fulltext.FullTextOr; -import org.apache.jackrabbit.oak.query.fulltext.FullTextTerm; -import org.apache.jackrabbit.oak.query.fulltext.FullTextVisitor; +import org.apache.jackrabbit.oak.plugins.memory.PropertyValues; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextAnd; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextContains; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextExpression; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextOr; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextTerm; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextVisitor; import org.apache.jackrabbit.oak.spi.query.Cursor; -import org.apache.jackrabbit.oak.spi.query.Cursors.PathCursor; +import org.apache.jackrabbit.oak.query.index.Cursors.PathCursor; import org.apache.jackrabbit.oak.spi.query.Filter; import org.apache.jackrabbit.oak.spi.query.Filter.PropertyRestriction; import org.apache.jackrabbit.oak.spi.query.IndexRow; -import org.apache.jackrabbit.oak.plugins.memory.PropertyValues; import org.apache.jackrabbit.oak.spi.query.QueryConstants; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.apache.jackrabbit.oak.spi.query.QueryIndex; import org.apache.jackrabbit.oak.spi.query.QueryIndex.AdvanceFulltextQueryIndex; import org.apache.jackrabbit.oak.spi.state.NodeState; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java (revision ) @@ -44,7 +44,7 @@ import org.apache.jackrabbit.oak.plugins.index.diffindex.UUIDDiffIndexProviderWrapper; import org.apache.jackrabbit.oak.query.ExecutionContext; import org.apache.jackrabbit.oak.query.QueryEngineImpl; -import org.apache.jackrabbit.oak.query.QueryEngineSettings; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.apache.jackrabbit.oak.spi.commit.CommitContext; import org.apache.jackrabbit.oak.spi.commit.CommitHook; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextContains.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextContains.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/FullTextContains.java (revision ) @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.query.fulltext; +package org.apache.jackrabbit.oak.spi.query.fulltext; /** * A group of full-text expressions that reflects a "contains(...)" expression, Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndex.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndex.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndex.java (revision ) @@ -28,7 +28,7 @@ import static org.apache.jackrabbit.oak.plugins.index.reference.NodeReferenceConstants.NAME; import static org.apache.jackrabbit.oak.plugins.index.reference.NodeReferenceConstants.REF_NAME; import static org.apache.jackrabbit.oak.plugins.index.reference.NodeReferenceConstants.WEAK_REF_NAME; -import static org.apache.jackrabbit.oak.spi.query.Cursors.newPathCursor; +import static org.apache.jackrabbit.oak.query.index.Cursors.newPathCursor; import java.util.ArrayList; import java.util.List; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java (revision 1797907) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/QueryImpl.java (revision ) @@ -82,6 +82,7 @@ import org.apache.jackrabbit.oak.spi.query.Filter; import org.apache.jackrabbit.oak.plugins.memory.PropertyValues; import org.apache.jackrabbit.oak.spi.query.QueryConstants; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.apache.jackrabbit.oak.spi.query.QueryIndex; import org.apache.jackrabbit.oak.spi.query.QueryIndex.AdvancedQueryIndex; import org.apache.jackrabbit.oak.spi.query.QueryIndex.IndexPlan; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/UnionQueryImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/UnionQueryImpl.java (revision 1797907) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/UnionQueryImpl.java (revision ) @@ -32,6 +32,7 @@ import org.apache.jackrabbit.oak.query.ast.OrderingImpl; import org.apache.jackrabbit.oak.query.QueryImpl.MeasuringIterator; import org.apache.jackrabbit.oak.plugins.memory.PropertyValues; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/DiffIndex.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/DiffIndex.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/diffindex/DiffIndex.java (revision ) @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.plugins.index.diffindex; import org.apache.jackrabbit.oak.spi.query.Cursor; -import org.apache.jackrabbit.oak.spi.query.Cursors; +import org.apache.jackrabbit.oak.query.index.Cursors; import org.apache.jackrabbit.oak.spi.query.Filter; import org.apache.jackrabbit.oak.spi.query.QueryIndex; import org.apache.jackrabbit.oak.spi.state.NodeState; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextOr.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextOr.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/FullTextOr.java (revision ) @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.query.fulltext; +package org.apache.jackrabbit.oak.spi.query.fulltext; import java.util.ArrayList; import java.util.LinkedHashSet; \ No newline at end of file Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndex.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndex.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/aggregate/AggregateIndex.java (revision ) @@ -21,15 +21,15 @@ import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import org.apache.jackrabbit.oak.query.fulltext.FullTextAnd; -import org.apache.jackrabbit.oak.query.fulltext.FullTextContains; -import org.apache.jackrabbit.oak.query.fulltext.FullTextExpression; -import org.apache.jackrabbit.oak.query.fulltext.FullTextOr; -import org.apache.jackrabbit.oak.query.fulltext.FullTextTerm; -import org.apache.jackrabbit.oak.query.fulltext.FullTextVisitor; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextAnd; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextContains; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextExpression; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextOr; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextTerm; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextVisitor; import org.apache.jackrabbit.oak.query.index.FilterImpl; import org.apache.jackrabbit.oak.spi.query.Cursor; -import org.apache.jackrabbit.oak.spi.query.Cursors; +import org.apache.jackrabbit.oak.query.index.Cursors; import org.apache.jackrabbit.oak.spi.query.Filter; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.slf4j.Logger; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/ExecutionContext.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/ExecutionContext.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/ExecutionContext.java (revision ) @@ -24,6 +24,7 @@ import org.apache.jackrabbit.oak.api.Root; import org.apache.jackrabbit.oak.query.ast.NodeTypeInfoProvider; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider; import org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionProvider; import org.apache.jackrabbit.oak.spi.state.NodeState; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexPlan.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexPlan.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexPlan.java (revision ) @@ -34,13 +34,13 @@ import org.apache.jackrabbit.oak.plugins.index.IndexConstants; import org.apache.jackrabbit.oak.plugins.index.PathFilter; import org.apache.jackrabbit.oak.plugins.index.property.strategy.IndexStoreStrategy; -import org.apache.jackrabbit.oak.query.QueryEngineSettings; import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider; import org.apache.jackrabbit.oak.spi.mount.Mounts; import org.apache.jackrabbit.oak.spi.query.Cursor; -import org.apache.jackrabbit.oak.spi.query.Cursors; +import org.apache.jackrabbit.oak.query.index.Cursors; import org.apache.jackrabbit.oak.spi.query.Filter; import org.apache.jackrabbit.oak.spi.query.Filter.PropertyRestriction; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.apache.jackrabbit.oak.spi.state.NodeState; import com.google.common.collect.Iterables; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AndImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AndImpl.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/AndImpl.java (revision ) @@ -31,9 +31,9 @@ import java.util.List; import java.util.Set; -import org.apache.jackrabbit.oak.query.QueryEngineSettings; -import org.apache.jackrabbit.oak.query.fulltext.FullTextAnd; -import org.apache.jackrabbit.oak.query.fulltext.FullTextExpression; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextAnd; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextExpression; import org.apache.jackrabbit.oak.query.index.FilterImpl; import com.google.common.collect.Sets; Index: oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java (revision 1797861) +++ oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/FilterQueryParser.java (revision ) @@ -22,12 +22,12 @@ import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration; -import org.apache.jackrabbit.oak.query.fulltext.FullTextAnd; -import org.apache.jackrabbit.oak.query.fulltext.FullTextContains; -import org.apache.jackrabbit.oak.query.fulltext.FullTextExpression; -import org.apache.jackrabbit.oak.query.fulltext.FullTextOr; -import org.apache.jackrabbit.oak.query.fulltext.FullTextTerm; -import org.apache.jackrabbit.oak.query.fulltext.FullTextVisitor; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextAnd; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextContains; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextExpression; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextOr; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextTerm; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextVisitor; import org.apache.jackrabbit.oak.spi.query.Filter; import org.apache.jackrabbit.oak.spi.query.QueryConstants; import org.apache.jackrabbit.oak.spi.query.QueryIndex; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java (revision ) @@ -36,12 +36,12 @@ import com.google.common.collect.ListMultimap; import org.apache.jackrabbit.oak.api.PropertyValue; import org.apache.jackrabbit.oak.commons.PathUtils; -import org.apache.jackrabbit.oak.query.QueryEngineSettings; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.apache.jackrabbit.oak.query.ast.JoinConditionImpl; import org.apache.jackrabbit.oak.query.ast.NativeFunctionImpl; import org.apache.jackrabbit.oak.query.ast.Operator; import org.apache.jackrabbit.oak.query.ast.SelectorImpl; -import org.apache.jackrabbit.oak.query.fulltext.FullTextExpression; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextExpression; import org.apache.jackrabbit.oak.spi.query.Filter; import org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionProvider; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/FilterIterators.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/FilterIterators.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/FilterIterators.java (revision ) @@ -20,6 +20,8 @@ import java.util.Iterator; import java.util.NoSuchElementException; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursors.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Cursors.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/Cursors.java (revision ) @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.oak.spi.query; +package org.apache.jackrabbit.oak.query.index; import java.util.Deque; import java.util.HashMap; @@ -28,10 +28,13 @@ import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.plugins.memory.MemoryChildNodeEntry; import org.apache.jackrabbit.oak.query.FilterIterators; -import org.apache.jackrabbit.oak.query.QueryEngineSettings; import org.apache.jackrabbit.oak.query.QueryImpl; import org.apache.jackrabbit.oak.query.index.IndexRowImpl; +import org.apache.jackrabbit.oak.spi.query.Cursor; +import org.apache.jackrabbit.oak.spi.query.Filter; import org.apache.jackrabbit.oak.spi.query.Filter.PathRestriction; +import org.apache.jackrabbit.oak.spi.query.IndexRow; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.jackrabbit.oak.spi.state.NodeStateUtils; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/TraversingIndex.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/TraversingIndex.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/TraversingIndex.java (revision ) @@ -22,7 +22,6 @@ import org.apache.jackrabbit.oak.plugins.index.counter.jmx.NodeCounter; import org.apache.jackrabbit.oak.query.ast.JoinConditionImpl; import org.apache.jackrabbit.oak.spi.query.Cursor; -import org.apache.jackrabbit.oak.spi.query.Cursors; import org.apache.jackrabbit.oak.spi.query.Filter; import org.apache.jackrabbit.oak.spi.query.Filter.PathRestriction; import org.apache.jackrabbit.oak.spi.query.QueryIndex; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/Operator.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/Operator.java (revision 1797907) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/Operator.java (revision ) @@ -18,7 +18,7 @@ import org.apache.jackrabbit.oak.api.PropertyValue; import org.apache.jackrabbit.oak.api.Type; -import org.apache.jackrabbit.oak.query.fulltext.LikePattern; +import org.apache.jackrabbit.oak.spi.query.fulltext.LikePattern; import org.apache.jackrabbit.oak.plugins.memory.PropertyValues; /** Index: oak-core/pom.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/pom.xml (revision 1797861) +++ oak-core/pom.xml (revision ) @@ -71,6 +71,7 @@ org.apache.jackrabbit.oak.plugins.value.jcr, org.apache.jackrabbit.oak.plugins.version, org.apache.jackrabbit.oak.spi.query, + org.apache.jackrabbit.oak.spi.query.fulltext, org.apache.jackrabbit.oak.spi.security, org.apache.jackrabbit.oak.spi.security.authentication, org.apache.jackrabbit.oak.spi.security.authentication.callback, @@ -86,9 +87,7 @@ org.apache.jackrabbit.oak.spi.security.user.action, org.apache.jackrabbit.oak.spi.security.user.util, org.apache.jackrabbit.oak.spi.xml, - org.apache.jackrabbit.oak.query, org.apache.jackrabbit.oak.query.ast, - org.apache.jackrabbit.oak.query.fulltext, org.apache.jackrabbit.oak.query.facet, org.apache.jackrabbit.oak.query.index, org.apache.jackrabbit.oak.security, Index: oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java (revision 1797907) +++ oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java (revision ) @@ -40,19 +40,19 @@ import org.apache.jackrabbit.oak.plugins.index.lucene.util.MoreLikeThisHelper; import org.apache.jackrabbit.oak.plugins.index.lucene.util.SpellcheckHelper; import org.apache.jackrabbit.oak.plugins.index.lucene.util.SuggestHelper; -import org.apache.jackrabbit.oak.query.QueryEngineSettings; -import org.apache.jackrabbit.oak.query.fulltext.FullTextAnd; -import org.apache.jackrabbit.oak.query.fulltext.FullTextContains; -import org.apache.jackrabbit.oak.query.fulltext.FullTextExpression; -import org.apache.jackrabbit.oak.query.fulltext.FullTextOr; -import org.apache.jackrabbit.oak.query.fulltext.FullTextTerm; -import org.apache.jackrabbit.oak.query.fulltext.FullTextVisitor; +import org.apache.jackrabbit.oak.plugins.memory.PropertyValues; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextAnd; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextContains; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextExpression; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextOr; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextTerm; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextVisitor; import org.apache.jackrabbit.oak.spi.query.Cursor; -import org.apache.jackrabbit.oak.spi.query.Cursors.PathCursor; +import org.apache.jackrabbit.oak.query.index.Cursors.PathCursor; import org.apache.jackrabbit.oak.spi.query.Filter; import org.apache.jackrabbit.oak.spi.query.Filter.PropertyRestriction; import org.apache.jackrabbit.oak.spi.query.IndexRow; -import org.apache.jackrabbit.oak.plugins.memory.PropertyValues; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.apache.jackrabbit.oak.spi.query.QueryConstants; import org.apache.jackrabbit.oak.spi.query.QueryIndex; import org.apache.jackrabbit.oak.spi.query.QueryIndex.AdvanceFulltextQueryIndex; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ConstraintImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ConstraintImpl.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ConstraintImpl.java (revision ) @@ -21,7 +21,7 @@ import javax.annotation.Nonnull; -import org.apache.jackrabbit.oak.query.fulltext.FullTextExpression; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextExpression; import org.apache.jackrabbit.oak.query.index.FilterImpl; /** Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextTerm.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextTerm.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/FullTextTerm.java (revision ) @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.query.fulltext; +package org.apache.jackrabbit.oak.spi.query.fulltext; /** * A fulltext term, or a "not" term. \ No newline at end of file Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java (revision 1797907) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java (revision ) @@ -40,12 +40,12 @@ import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.plugins.memory.PropertyBuilder; import org.apache.jackrabbit.oak.query.QueryImpl; -import org.apache.jackrabbit.oak.query.fulltext.FullTextExpression; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextExpression; import org.apache.jackrabbit.oak.query.index.FilterImpl; import org.apache.jackrabbit.oak.query.plan.ExecutionPlan; import org.apache.jackrabbit.oak.query.plan.SelectorExecutionPlan; import org.apache.jackrabbit.oak.spi.query.Cursor; -import org.apache.jackrabbit.oak.spi.query.Cursors; +import org.apache.jackrabbit.oak.query.index.Cursors; import org.apache.jackrabbit.oak.spi.query.IndexRow; import org.apache.jackrabbit.oak.plugins.memory.PropertyValues; import org.apache.jackrabbit.oak.spi.query.QueryConstants; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/Filter.java (revision ) @@ -27,8 +27,7 @@ import javax.jcr.PropertyType; import org.apache.jackrabbit.oak.api.PropertyValue; -import org.apache.jackrabbit.oak.query.QueryEngineSettings; -import org.apache.jackrabbit.oak.query.fulltext.FullTextExpression; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextExpression; /** * The filter for an index lookup that contains a number of restrictions that Index: oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidator.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidator.java (revision 1797861) +++ oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CrossMountReferenceValidator.java (revision ) @@ -23,13 +23,13 @@ import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.index.property.Multiplexers; import org.apache.jackrabbit.oak.plugins.index.property.strategy.IndexStoreStrategy; -import org.apache.jackrabbit.oak.query.QueryEngineSettings; import org.apache.jackrabbit.oak.query.index.FilterImpl; import org.apache.jackrabbit.oak.spi.commit.DefaultValidator; import org.apache.jackrabbit.oak.spi.commit.Validator; import org.apache.jackrabbit.oak.spi.mount.Mount; import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider; import org.apache.jackrabbit.oak.spi.query.Filter; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextAnd.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextAnd.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/FullTextAnd.java (revision ) @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.query.fulltext; +package org.apache.jackrabbit.oak.spi.query.fulltext; import java.util.ArrayList; import java.util.List; \ No newline at end of file Index: oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java (revision ) @@ -79,7 +79,7 @@ import org.apache.jackrabbit.oak.plugins.index.property.jmx.PropertyIndexAsyncReindex; import org.apache.jackrabbit.oak.plugins.index.property.jmx.PropertyIndexAsyncReindexMBean; import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore; -import org.apache.jackrabbit.oak.query.QueryEngineSettings; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.apache.jackrabbit.oak.spi.commit.CommitHook; import org.apache.jackrabbit.oak.spi.commit.CommitInfo; import org.apache.jackrabbit.oak.spi.commit.CompositeEditorProvider; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/RootFactory.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/RootFactory.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/RootFactory.java (revision ) @@ -50,6 +50,9 @@ return ImmutableRoot.getInstance(root); } + /** + * @deprecated with Oak 1.7.2 due to the usage of deprecated {@link QueryEngineSettings} + */ @Nonnull public static Root createSystemRoot(@Nonnull NodeStore store, @Nullable CommitHook hook, \ No newline at end of file Index: oak-core/src/main/java/org/apache/jackrabbit/oak/core/SystemRoot.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/core/SystemRoot.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/core/SystemRoot.java (revision ) @@ -20,8 +20,8 @@ import javax.security.auth.Subject; import org.apache.jackrabbit.oak.api.Root; -import org.apache.jackrabbit.oak.query.QueryEngineSettings; import org.apache.jackrabbit.oak.spi.commit.CommitHook; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; import org.apache.jackrabbit.oak.spi.security.authentication.LoginContext; Index: oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java (revision 1797861) +++ oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/Jcr.java (revision ) @@ -48,7 +48,6 @@ import org.apache.jackrabbit.oak.plugins.observation.ChangeCollectorProvider; import org.apache.jackrabbit.oak.plugins.observation.CommitRateLimiter; import org.apache.jackrabbit.oak.plugins.version.VersionHook; -import org.apache.jackrabbit.oak.query.QueryEngineSettings; import org.apache.jackrabbit.oak.security.SecurityProviderImpl; import org.apache.jackrabbit.oak.spi.commit.BackgroundObserver; import org.apache.jackrabbit.oak.spi.commit.CommitHook; @@ -58,6 +57,7 @@ import org.apache.jackrabbit.oak.spi.commit.Observer; import org.apache.jackrabbit.oak.spi.commit.PartialConflictHandler; import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; import org.apache.jackrabbit.oak.spi.state.Clusterable; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/OrImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/OrImpl.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/OrImpl.java (revision ) @@ -34,8 +34,8 @@ import java.util.Map.Entry; import java.util.Set; -import org.apache.jackrabbit.oak.query.fulltext.FullTextExpression; -import org.apache.jackrabbit.oak.query.fulltext.FullTextOr; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextExpression; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextOr; import org.apache.jackrabbit.oak.query.index.FilterImpl; import com.google.common.collect.Sets; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentRepositoryImpl.java (revision ) @@ -87,7 +87,7 @@ import org.apache.jackrabbit.oak.api.ContentRepository; import org.apache.jackrabbit.oak.api.ContentSession; import org.apache.jackrabbit.oak.api.Descriptors; -import org.apache.jackrabbit.oak.query.QueryEngineSettings; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.apache.jackrabbit.oak.spi.commit.CommitHook; import org.apache.jackrabbit.oak.spi.query.CompositeQueryIndexProvider; import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextVisitor.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextVisitor.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/FullTextVisitor.java (revision ) @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.query.fulltext; +package org.apache.jackrabbit.oak.spi.query.fulltext; /** * A visitor for full-text expressions. This class is abstract because at least Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java (revision 1797907) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/FullTextSearchImpl.java (revision ) @@ -30,9 +30,9 @@ import org.apache.jackrabbit.oak.api.Tree; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.commons.PathUtils; -import org.apache.jackrabbit.oak.query.fulltext.FullTextContains; -import org.apache.jackrabbit.oak.query.fulltext.FullTextExpression; -import org.apache.jackrabbit.oak.query.fulltext.FullTextParser; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextContains; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextExpression; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextParser; import org.apache.jackrabbit.oak.query.index.FilterImpl; import org.apache.jackrabbit.oak.plugins.memory.PropertyValues; import org.apache.jackrabbit.oak.spi.query.QueryIndex.FulltextQueryIndex; Index: oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java (revision 1797907) +++ oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java (revision ) @@ -47,18 +47,18 @@ import org.apache.jackrabbit.oak.plugins.index.solr.configuration.nodestate.OakSolrNodeStateConfiguration; import org.apache.jackrabbit.oak.plugins.index.solr.server.OakSolrServer; import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider; -import org.apache.jackrabbit.oak.query.QueryEngineSettings; -import org.apache.jackrabbit.oak.query.fulltext.FullTextExpression; -import org.apache.jackrabbit.oak.query.fulltext.FullTextTerm; -import org.apache.jackrabbit.oak.query.fulltext.FullTextVisitor; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextExpression; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextTerm; +import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextVisitor; import org.apache.jackrabbit.oak.spi.query.Cursor; -import org.apache.jackrabbit.oak.spi.query.Cursors; +import org.apache.jackrabbit.oak.query.index.Cursors; import org.apache.jackrabbit.oak.spi.query.Filter; import org.apache.jackrabbit.oak.spi.query.IndexRow; import org.apache.jackrabbit.oak.plugins.memory.PropertyValues; import org.apache.jackrabbit.oak.spi.query.QueryConstants; import org.apache.jackrabbit.oak.spi.query.QueryIndex; import org.apache.jackrabbit.oak.spi.query.QueryIndex.FulltextQueryIndex; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.apache.jackrabbit.oak.spi.state.NodeState; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrServer; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/core/ContentSessionImpl.java (revision ) @@ -27,7 +27,7 @@ import org.apache.jackrabbit.oak.api.AuthInfo; import org.apache.jackrabbit.oak.api.ContentSession; import org.apache.jackrabbit.oak.api.Root; -import org.apache.jackrabbit.oak.query.QueryEngineSettings; +import org.apache.jackrabbit.oak.spi.query.QueryEngineSettings; import org.apache.jackrabbit.oak.spi.commit.CommitHook; import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider; import org.apache.jackrabbit.oak.spi.security.SecurityProvider; Index: oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextParser.java =================================================================== --- oak-core/src/main/java/org/apache/jackrabbit/oak/query/fulltext/FullTextParser.java (revision 1797861) +++ oak-core/src/main/java/org/apache/jackrabbit/oak/spi/query/fulltext/FullTextParser.java (revision ) @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.jackrabbit.oak.query.fulltext; +package org.apache.jackrabbit.oak.spi.query.fulltext; import java.text.ParseException; import java.util.ArrayList;