You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2018/09/27 10:21:40 UTC
svn commit: r1842081 - in
/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene:
LuceneIndex.java LuceneIndexEditorContext.java LuceneIndexProvider.java
LucenePropertyIndex.java util/CompoundWordTokenFilterBase.java
Author: tommaso
Date: Thu Sep 27 10:21:40 2018
New Revision: 1842081
URL: http://svn.apache.org/viewvc?rev=1842081&view=rev
Log:
OAK-7411 - some javadoc fixes
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/CompoundWordTokenFilterBase.java
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java?rev=1842081&r1=1842080&r2=1842081&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java Thu Sep 27 10:21:40 2018
@@ -52,6 +52,7 @@ import org.apache.jackrabbit.oak.spi.que
import org.apache.jackrabbit.oak.spi.query.Filter.PropertyRestriction;
import org.apache.jackrabbit.oak.spi.query.IndexRow;
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;
import org.apache.jackrabbit.oak.spi.query.QueryLimits;
import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextAnd;
@@ -137,11 +138,8 @@ import static org.apache.lucene.search.B
* <li>a blacklist of property names: what property to be excluded from the index via the <code>excludePropertyNames</code> property</li>
* <li>the <code>reindex</code> flag which when set to <code>true</code>, triggers a full content re-index.</li>
* </ul>
- * <p>
- * <pre>{@code
* <pre>{@code
* {
- * {
* NodeBuilder index = root.child("oak:index");
* index.child("lucene")
* .setProperty("jcr:primaryType", "oak:QueryIndexDefinition", Type.NAME)
@@ -150,7 +148,6 @@ import static org.apache.lucene.search.B
* .setProperty("reindex", "true");
* }
* }</pre>
- *
* @see QueryIndex
*
*/
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java?rev=1842081&r1=1842080&r2=1842081&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorContext.java Thu Sep 27 10:21:40 2018
@@ -76,7 +76,9 @@ public class LuceneIndexEditorContext ex
return facetsConfig;
}
- /** Only set for testing */
+ /** Only set for testing
+ * @param c clock
+ * */
public static void setClock(Clock c) {
FulltextIndexEditorContext.setClock(c);
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java?rev=1842081&r1=1842080&r2=1842081&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProvider.java Thu Sep 27 10:21:40 2018
@@ -90,6 +90,8 @@ public class LuceneIndexProvider impleme
/**
* sets the default node aggregator that will be used at query time
+ *
+ * @param aggregator the node aggregator
*/
public void setAggregator(QueryIndex.NodeAggregator aggregator) {
this.aggregator = aggregator;
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java?rev=1842081&r1=1842080&r2=1842081&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java Thu Sep 27 10:21:40 2018
@@ -170,7 +170,6 @@ import static org.apache.lucene.search.B
* <li>a blacklist of property names: what property to be excluded from the index via the <code>excludePropertyNames</code> property</li>
* <li>the <code>reindex</code> flag which when set to <code>true</code>, triggers a full content re-index.</li>
* </ul>
- * <p>
* <pre>{@code
* {
* NodeBuilder index = root.child("oak:index");
@@ -885,7 +884,7 @@ public class LucenePropertyIndex extends
* play properly when sent to lucene.
*
* @param qs the list of queries. Cannot be null.
- * @return
+ * @return the request facade
*/
@NotNull
public static LuceneRequestFacade<Query> performAdditionalWraps(@NotNull List<Query> qs) {
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/CompoundWordTokenFilterBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/CompoundWordTokenFilterBase.java?rev=1842081&r1=1842080&r2=1842081&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/CompoundWordTokenFilterBase.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/CompoundWordTokenFilterBase.java Thu Sep 27 10:21:40 2018
@@ -152,7 +152,11 @@ public abstract class CompoundWordTokenF
public final CharSequence txt;
public final int startOffset, endOffset;
- /** Construct the compound token based on a slice of the current {@link CompoundWordTokenFilterBase#termAtt}. */
+ /** Construct the compound token based on a slice of the current {@link CompoundWordTokenFilterBase#termAtt}.
+ *
+ * @param offset the initial offset
+ * @param length the token length
+ * */
public CompoundToken(int offset, int length) {
this.txt = CompoundWordTokenFilterBase.this.termAtt.subSequence(offset, offset + length);