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 re...@apache.org on 2018/07/18 14:47:41 UTC
svn commit: r1836183 [1/2] - in /jackrabbit/oak/trunk/oak-lucene: ./
src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/
src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/binary/
src/main/java/org/apache/jackrabbit/oak/plugins/inde...
Author: reschke
Date: Wed Jul 18 14:47:40 2018
New Revision: 1836183
URL: http://svn.apache.org/viewvc?rev=1836183&view=rev
Log:
OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations instead - oak-lucene
Modified:
jackrabbit/oak/trunk/oak-lucene/pom.xml
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBean.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImpl.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/Aggregate.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ExtractedTextCache.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexAugmentorFactory.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNode.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNodeManager.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexTracker.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneDocumentMaker.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/LuceneIndexEditorProvider.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexMBeanImpl.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/LuceneIndexProviderService.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/LuceneRequestFacade.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyUpdateCallback.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/binary/BinaryTextExtractor.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorFactory.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectory.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/DefaultDirectoryFactory.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexMeta.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakDirectory.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakIndexFile.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalIndexObserver.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalObserverBuilder.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserver.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDocumentHolder.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneJournalPropertyBuilder.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexUpdateCallback.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReaderFactory.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/LuceneIndexReader.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/spi/FulltextQueryTermsProvider.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/spi/IndexFieldProvider.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/spi/package-info.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneIndexHelper.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneInitializerHelper.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/AsyncConflictsIT.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImplTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexAugmentorFactoryTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregation2Test.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAugmentTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor2Test.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ResultCountingIndexProvider.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/AbstractActiveDeletedBlobTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyCheckerTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexClusterIT.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleanerTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/SynchronousPropertyIndexTest.java
Modified: jackrabbit/oak/trunk/oak-lucene/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/pom.xml?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-lucene/pom.xml Wed Jul 18 14:47:40 2018
@@ -260,10 +260,10 @@
<artifactId>slf4j-api</artifactId>
</dependency>
- <!-- Findbugs annotations -->
+ <!-- Nullability annotations -->
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
</dependency>
<!-- Test Dependencies -->
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBean.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBean.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBean.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBean.java Wed Jul 18 14:47:40 2018
@@ -19,10 +19,11 @@
package org.apache.jackrabbit.oak.plugins.index.lucene;
-import javax.annotation.Nonnull;
import javax.management.openmbean.CompositeData;
import java.util.Map;
+import org.jetbrains.annotations.NotNull;
+
/**
* MBean for starting and monitoring the progress of
* collection of deleted lucene index blobs.
@@ -37,7 +38,7 @@ public interface ActiveDeletedBlobCollec
*
* @return the status of the operation right after it was initiated
*/
- @Nonnull
+ @NotNull
CompositeData startActiveCollection();
/**
@@ -46,7 +47,7 @@ public interface ActiveDeletedBlobCollec
*
* @return the status of the operation right after it was initiated
*/
- @Nonnull
+ @NotNull
CompositeData cancelActiveCollection();
/**
@@ -55,13 +56,13 @@ public interface ActiveDeletedBlobCollec
* @return the status of the ongoing operation or if none the terminal
* status of the last operation or <em>Status not available</em> if none.
*/
- @Nonnull
+ @NotNull
CompositeData getActiveCollectionStatus();
/**
* @return true: if recording deleted blob for active deletion is unsafe; false: otherwise
*/
- @Nonnull
+ @NotNull
boolean isActiveDeletionUnsafe();
/**
@@ -70,7 +71,7 @@ public interface ActiveDeletedBlobCollec
* in-memory flag so that new blobs also are flagged to be not marked for deletion
* by active deletion
*/
- @Nonnull
+ @NotNull
void flagActiveDeletionUnsafeForCurrentState();
/**
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImpl.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImpl.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImpl.java Wed Jul 18 14:47:40 2018
@@ -37,10 +37,10 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.whiteboard.Tracker;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
import org.apache.jackrabbit.oak.stats.Clock;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nonnull;
import javax.management.openmbean.CompositeData;
import java.util.Iterator;
import java.util.List;
@@ -78,16 +78,16 @@ public class ActiveDeletedBlobCollectorM
Clock clock = Clock.SIMPLE; // package private for tests
- @Nonnull
+ @NotNull
private final ActiveDeletedBlobCollector activeDeletedBlobCollector;
- @Nonnull
+ @NotNull
private Whiteboard whiteboard;
- @Nonnull
+ @NotNull
private final GarbageCollectableBlobStore blobStore;
- @Nonnull
+ @NotNull
private final Executor executor;
private final NodeStore store;
@@ -112,13 +112,13 @@ public class ActiveDeletedBlobCollectorM
* @param executor executor for running the collection task
*/
ActiveDeletedBlobCollectorMBeanImpl(
- @Nonnull ActiveDeletedBlobCollector activeDeletedBlobCollector,
- @Nonnull Whiteboard whiteboard,
- @Nonnull NodeStore store,
- @Nonnull IndexPathService indexPathService,
- @Nonnull AsyncIndexInfoService asyncIndexInfoService,
- @Nonnull GarbageCollectableBlobStore blobStore,
- @Nonnull Executor executor) {
+ @NotNull ActiveDeletedBlobCollector activeDeletedBlobCollector,
+ @NotNull Whiteboard whiteboard,
+ @NotNull NodeStore store,
+ @NotNull IndexPathService indexPathService,
+ @NotNull AsyncIndexInfoService asyncIndexInfoService,
+ @NotNull GarbageCollectableBlobStore blobStore,
+ @NotNull Executor executor) {
this.activeDeletedBlobCollector = checkNotNull(activeDeletedBlobCollector);
this.whiteboard = checkNotNull(whiteboard);
this.store = store;
@@ -130,7 +130,7 @@ public class ActiveDeletedBlobCollectorM
LOG.info("Active blob collector initialized with minAge: {}", MIN_BLOB_AGE_TO_ACTIVELY_DELETE);
}
- @Nonnull
+ @NotNull
@Override
public CompositeData startActiveCollection() {
if (gcOp.isDone()) {
@@ -150,7 +150,7 @@ public class ActiveDeletedBlobCollectorM
}
}
- @Nonnull
+ @NotNull
@Override
public CompositeData cancelActiveCollection() {
if (!gcOp.isDone()) {
@@ -165,7 +165,7 @@ public class ActiveDeletedBlobCollectorM
}
}
- @Nonnull
+ @NotNull
@Override
public CompositeData getActiveCollectionStatus() {
return gcOp.getStatus().toCompositeData();
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/Aggregate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/Aggregate.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/Aggregate.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/Aggregate.java Wed Jul 18 14:47:40 2018
@@ -26,8 +26,6 @@ import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
-import javax.annotation.CheckForNull;
-
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
@@ -39,6 +37,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.memory.MemoryChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.Nullable;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.collect.Iterables.toArray;
@@ -215,7 +214,7 @@ class Aggregate {
}
public static interface AggregateMapper {
- @CheckForNull
+ @Nullable
Aggregate getAggregate(String nodeTypeName);
}
@@ -254,7 +253,7 @@ class Aggregate {
public abstract boolean aggregatesProperty(String name);
- @CheckForNull
+ @Nullable
public Aggregate getAggregate(NodeState matchedNodeState) {
return null;
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ExtractedTextCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ExtractedTextCache.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ExtractedTextCache.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ExtractedTextCache.java Wed Jul 18 14:47:40 2018
@@ -37,9 +37,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.Weigher;
@@ -49,6 +46,8 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.plugins.index.fulltext.ExtractedText;
import org.apache.jackrabbit.oak.plugins.index.fulltext.ExtractedText.ExtractionResult;
import org.apache.jackrabbit.oak.plugins.index.fulltext.PreExtractedTextProvider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -114,7 +113,7 @@ public class ExtractedTextCache {
* @return null if no pre extracted text entry found. Otherwise returns the pre extracted
* text
*/
- @CheckForNull
+ @Nullable
public String get(String nodePath, String propertyName, Blob blob, boolean reindexMode){
String result = null;
//Consult the PreExtractedTextProvider only in reindex mode and not in
@@ -143,7 +142,7 @@ public class ExtractedTextCache {
return result;
}
- public void put(@Nonnull Blob blob, @Nonnull ExtractedText extractedText) {
+ public void put(@NotNull Blob blob, @NotNull ExtractedText extractedText) {
String id = blob.getContentIdentity();
if (cache != null && id != null) {
if (extractedText.getExtractionResult() == ExtractionResult.SUCCESS
@@ -153,7 +152,7 @@ public class ExtractedTextCache {
}
}
- public void putTimeout(@Nonnull Blob blob, @Nonnull ExtractedText extractedText) {
+ public void putTimeout(@NotNull Blob blob, @NotNull ExtractedText extractedText) {
if (EXTRACT_FORGET_TIMEOUT) {
return;
}
@@ -228,7 +227,7 @@ public class ExtractedTextCache {
};
}
- @CheckForNull
+ @Nullable
public CacheStats getCacheStats() {
return cacheStats;
}
@@ -258,7 +257,7 @@ public class ExtractedTextCache {
private EmpiricalWeigher() {
}
- private static long getMemory(@Nonnull String s) {
+ private static long getMemory(@NotNull String s) {
return 16 // shallow size
+ 40 + (long)s.length() * 2; // value
}
@@ -341,7 +340,7 @@ public class ExtractedTextCache {
}
};
@Override
- public Thread newThread(@Nonnull Runnable r) {
+ public Thread newThread(@NotNull Runnable r) {
Thread thread = new Thread(r, createName());
thread.setDaemon(true);
thread.setPriority(Thread.MIN_PRIORITY);
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexAugmentorFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexAugmentorFactory.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexAugmentorFactory.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexAugmentorFactory.java Wed Jul 18 14:47:40 2018
@@ -39,14 +39,13 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Query;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nonnull;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
@SuppressWarnings("UnusedDeclaration")
@Component
@Service(value = IndexAugmentorFactory.class)
@@ -83,13 +82,13 @@ public class IndexAugmentorFactory {
resetState();
}
- @Nonnull
+ @NotNull
public IndexFieldProvider getIndexFieldProvider(String nodeType) {
IndexFieldProvider provider = indexFieldProviderMap.get(nodeType);
return (provider != null) ? provider : IndexFieldProvider.DEFAULT;
}
- @Nonnull
+ @NotNull
public FulltextQueryTermsProvider getFulltextQueryTermsProvider(String nodeType) {
FulltextQueryTermsProvider provider = fulltextQueryTermsProviderMap.get(nodeType);
return (provider != null) ? provider : FulltextQueryTermsProvider.DEFAULT;
@@ -182,7 +181,7 @@ public class IndexAugmentorFactory {
this.providers = ImmutableList.copyOf(providers);
}
- @Nonnull
+ @NotNull
@Override
public List<Field> getAugmentedFields(final String path,
final NodeState document, final NodeState indexDefinition) {
@@ -199,7 +198,7 @@ public class IndexAugmentorFactory {
return fields;
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return Collections.singleton(nodeType);
@@ -244,7 +243,7 @@ public class IndexAugmentorFactory {
return ret;
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return Collections.singleton(nodeType);
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexDefinition.java Wed Jul 18 14:47:40 2018
@@ -29,9 +29,6 @@ import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import javax.jcr.nodetype.NodeTypeIterator;
@@ -74,6 +71,8 @@ import org.apache.lucene.index.LogDocMer
import org.apache.lucene.index.MergePolicy;
import org.apache.lucene.index.NoMergePolicy;
import org.apache.lucene.index.TieredMergePolicy;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -435,12 +434,12 @@ public final class IndexDefinition imple
return blobSize;
}
- @CheckForNull
+ @Nullable
public Codec getCodec() {
return codec;
}
- @Nonnull
+ @NotNull
public MergePolicy getMergePolicy() {
// MP is not cached to avoid complaining about multiple IWs with multiplexing writers
return createMergePolicy();
@@ -549,7 +548,7 @@ public final class IndexDefinition imple
return queryPaths;
}
- @CheckForNull
+ @Nullable
public String getUniqueId() {
return uid;
}
@@ -665,7 +664,7 @@ public final class IndexDefinition imple
//~---------------------------------------------------< Aggregates >
- @CheckForNull
+ @Nullable
public Aggregate getAggregate(String nodeType){
Aggregate agg = aggregates.get(nodeType);
return agg != null ? agg : null;
@@ -710,7 +709,7 @@ public final class IndexDefinition imple
return definedRules;
}
- @CheckForNull
+ @Nullable
public IndexingRule getApplicableIndexingRule(String primaryNodeType) {
//This method would be invoked for every node. So be as
//conservative as possible in object creation
@@ -740,7 +739,7 @@ public final class IndexDefinition imple
* @param state a node state.
* @return the indexing rule or <code>null</code> if none applies.
*/
- @CheckForNull
+ @Nullable
public IndexingRule getApplicableIndexingRule(NodeState state) {
//This method would be invoked for every node. So be as
//conservative as possible in object creation
@@ -1114,7 +1113,7 @@ public final class IndexDefinition imple
* indexing rule does not contain a configuration for the given
* property.
*/
- @CheckForNull
+ @Nullable
public PropertyDefinition getConfig(String propertyName) {
PropertyDefinition config = propConfigs.get(propertyName.toLowerCase(Locale.ENGLISH));
if (config != null) {
@@ -1674,7 +1673,7 @@ public final class IndexDefinition imple
return TreeUtil.getTree(root,NODE_TYPES_PATH);
}
- @Nonnull
+ @NotNull
@Override
protected NamePathMapper getNamePathMapper() {
return NamePathMapper.DEFAULT;
@@ -1826,7 +1825,7 @@ public final class IndexDefinition imple
return defn.getChildNode(LuceneIndexConstants.INDEX_RULES).exists();
}
- @CheckForNull
+ @Nullable
private static String determineUniqueId(NodeState defn) {
return defn.getChildNode(STATUS_NODE).getString(PROP_UID);
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNode.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNode.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNode.java Wed Jul 18 14:47:40 2018
@@ -22,13 +22,12 @@ package org.apache.jackrabbit.oak.plugin
import java.io.IOException;
import java.util.List;
-import javax.annotation.CheckForNull;
-
import org.apache.jackrabbit.oak.plugins.index.lucene.reader.LuceneIndexReader;
import org.apache.jackrabbit.oak.plugins.index.lucene.writer.LuceneIndexWriter;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.suggest.analyzing.AnalyzingInfixSuggester;
import org.apache.lucene.store.Directory;
+import org.jetbrains.annotations.Nullable;
public interface IndexNode {
@@ -42,17 +41,17 @@ public interface IndexNode {
List<LuceneIndexReader> getPrimaryReaders();
- @CheckForNull
+ @Nullable
Directory getSuggestDirectory();
List<LuceneIndexReader> getNRTReaders();
- @CheckForNull
+ @Nullable
AnalyzingInfixSuggester getLookup();
int getIndexNodeId();
- @CheckForNull
+ @Nullable
LuceneIndexWriter getLocalWriter() throws IOException;
void refreshReadersOnWriteIfRequired();
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNodeManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNodeManager.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNodeManager.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexNodeManager.java Wed Jul 18 14:47:40 2018
@@ -31,9 +31,6 @@ import java.util.concurrent.locks.ReadWr
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
-
import com.google.common.collect.Iterables;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.commons.PerfLogger;
@@ -50,6 +47,7 @@ import org.apache.lucene.index.MultiRead
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.suggest.analyzing.AnalyzingInfixSuggester;
import org.apache.lucene.store.Directory;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -144,17 +142,17 @@ public class IndexNodeManager {
return definition;
}
- @CheckForNull
+ @Nullable
private Directory getSuggestDirectory() {
return readers.isEmpty() ? null : getDefaultReader().getSuggestDirectory();
}
- @CheckForNull
+ @Nullable
private AnalyzingInfixSuggester getLookup() {
return readers.isEmpty() ? null : getDefaultReader().getLookup();
}
- @CheckForNull
+ @Nullable
IndexNode acquire() {
lock.readLock().lock();
if (closed) {
@@ -203,7 +201,7 @@ public class IndexNodeManager {
return readers;
}
- @CheckForNull
+ @Nullable
private LuceneIndexWriter getLocalWriter() throws IOException{
return nrtIndex != null ? nrtIndex.getWriter() : null;
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlanner.java Wed Jul 18 14:47:40 2018
@@ -29,8 +29,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.CheckForNull;
-
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Iterables;
import com.google.common.collect.Multimap;
@@ -49,6 +47,7 @@ import org.apache.jackrabbit.oak.spi.que
import org.apache.jackrabbit.oak.spi.query.Filter;
import org.apache.jackrabbit.oak.spi.query.QueryConstants;
import org.apache.jackrabbit.oak.spi.query.Filter.PropertyRestriction;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -609,7 +608,7 @@ class IndexPlanner {
return indexedProps;
}
- @CheckForNull
+ @Nullable
private static PropertyDefinition getSimpleProperty(IndexingRule indexingRule, String relativePropertyName) {
String name = PathUtils.getName(relativePropertyName);
if (name.equals(relativePropertyName)){
@@ -831,7 +830,7 @@ class IndexPlanner {
return orderEntries;
}
- @CheckForNull
+ @Nullable
private IndexingRule getApplicableRule() {
if (filter.matchesAllTypes()){
return definition.getApplicableIndexingRule(JcrConstants.NT_BASE);
@@ -975,7 +974,7 @@ class IndexPlanner {
* @return transformed path. Returns null if the path does not confirm to relative
* path requirements
*/
- @CheckForNull
+ @Nullable
public String transformPath(String path){
if (isPathTransformed()){
// get the base path
@@ -1003,7 +1002,7 @@ class IndexPlanner {
public boolean evaluateNodeNameRestriction() {return nodeNameRestriction;}
- @CheckForNull
+ @Nullable
public PropertyIndexResult getPropertyIndexResult() {
return propertyIndexResult;
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexTracker.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexTracker.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexTracker.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexTracker.java Wed Jul 18 14:47:40 2018
@@ -37,9 +37,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
-
import com.google.common.collect.Sets;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.commons.PerfLogger;
@@ -55,6 +52,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.mount.Mounts;
import org.apache.jackrabbit.oak.spi.state.EqualsDiff;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -205,7 +203,7 @@ public class IndexTracker {
}
}
- @CheckForNull
+ @Nullable
public IndexDefinition getIndexDefinition(String indexPath){
IndexNodeManager node = indices.get(indexPath);
if (node != null){
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneDocumentMaker.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneDocumentMaker.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneDocumentMaker.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneDocumentMaker.java Wed Jul 18 14:47:40 2018
@@ -26,9 +26,6 @@ import java.util.Collections;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.PropertyType;
import com.google.common.collect.Iterables;
@@ -52,6 +49,8 @@ import org.apache.lucene.document.String
import org.apache.lucene.facet.FacetsConfig;
import org.apache.lucene.facet.sortedset.SortedSetDocValuesFacetField;
import org.apache.lucene.util.BytesRef;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,18 +73,18 @@ public class LuceneDocumentMaker {
private final IndexAugmentorFactory augmentorFactory;
private final String path;
- public LuceneDocumentMaker(@Nonnull IndexDefinition definition,
- @Nonnull IndexingRule indexingRule,
- @Nonnull String path) {
+ public LuceneDocumentMaker(@NotNull IndexDefinition definition,
+ @NotNull IndexingRule indexingRule,
+ @NotNull String path) {
this(null, null, null, definition, indexingRule, path);
}
public LuceneDocumentMaker(@Nullable BinaryTextExtractor textExtractor,
@Nullable FacetsConfigProvider facetsConfigProvider,
@Nullable IndexAugmentorFactory augmentorFactory,
- @Nonnull IndexDefinition definition,
- @Nonnull IndexingRule indexingRule,
- @Nonnull String path) {
+ @NotNull IndexDefinition definition,
+ @NotNull IndexingRule indexingRule,
+ @NotNull String path) {
this.textExtractor = textExtractor;
this.facetsConfigProvider = facetsConfigProvider;
this.definition = checkNotNull(definition);
@@ -94,12 +93,12 @@ public class LuceneDocumentMaker {
this.path = checkNotNull(path);
}
- @CheckForNull
+ @Nullable
public Document makeDocument(NodeState state) throws IOException {
return makeDocument(state, false, Collections.<PropertyState>emptyList());
}
- @CheckForNull
+ @Nullable
public Document makeDocument(NodeState state, boolean isUpdate, List<PropertyState> propertiesModified) throws IOException {
boolean facet = false;
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=1836183&r1=1836182&r2=1836183&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 Wed Jul 18 14:47:40 2018
@@ -19,9 +19,6 @@ package org.apache.jackrabbit.oak.plugin
import java.io.IOException;
import java.util.Calendar;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.PerfLogger;
@@ -40,6 +37,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.stats.Clock;
import org.apache.jackrabbit.util.ISO8601;
import org.apache.lucene.facet.FacetsConfig;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -130,7 +128,7 @@ public class LuceneIndexEditorContext im
return indexingContext;
}
- @CheckForNull
+ @Nullable
public PropertyUpdateCallback getPropertyUpdateCallback() {
return propertyUpdateCallback;
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorProvider.java Wed Jul 18 14:47:40 2018
@@ -16,9 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.index.lucene;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.index.ContextAwareCallback;
import org.apache.jackrabbit.oak.plugins.index.IndexEditor;
@@ -47,6 +44,8 @@ import org.apache.jackrabbit.oak.spi.mou
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.ReadOnlyBuilder;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -115,7 +114,7 @@ public class LuceneIndexEditorProvider i
ExtractedTextCache extractedTextCache,
@Nullable IndexAugmentorFactory augmentorFactory,
MountInfoProvider mountInfoProvider,
- @Nonnull ActiveDeletedBlobCollector activeDeletedBlobCollector) {
+ @NotNull ActiveDeletedBlobCollector activeDeletedBlobCollector) {
this.indexCopier = indexCopier;
this.indexTracker = indexTracker;
this.extractedTextCache = extractedTextCache != null ? extractedTextCache : new ExtractedTextCache(0, 0);
@@ -126,8 +125,8 @@ public class LuceneIndexEditorProvider i
@Override
public Editor getIndexEditor(
- @Nonnull String type, @Nonnull NodeBuilder definition, @Nonnull NodeState root,
- @Nonnull IndexUpdateCallback callback)
+ @NotNull String type, @NotNull NodeBuilder definition, @NotNull NodeState root,
+ @NotNull IndexUpdateCallback callback)
throws CommitFailedException {
if (TYPE_LUCENE.equals(type)) {
checkArgument(callback instanceof ContextAwareCallback, "callback instance not of type " +
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexMBeanImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexMBeanImpl.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexMBeanImpl.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexMBeanImpl.java Wed Jul 18 14:47:40 2018
@@ -27,8 +27,6 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.management.openmbean.CompositeDataSupport;
import javax.management.openmbean.CompositeType;
import javax.management.openmbean.OpenDataException;
@@ -79,6 +77,8 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.util.BytesRef;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -487,7 +487,7 @@ public class LuceneIndexMBeanImpl extend
for (LuceneDoc doc : docs){
TreeTraverser<LuceneDoc> traverser = new TreeTraverser<LuceneDoc>() {
@Override
- public Iterable<LuceneDoc> children(@Nonnull LuceneDoc root) {
+ public Iterable<LuceneDoc> children(@NotNull LuceneDoc root) {
//Break at maxLevel
if (root.depth >= maxLevel) {
return Collections.emptyList();
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=1836183&r1=1836182&r2=1836183&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 Wed Jul 18 14:47:40 2018
@@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.plugin
import java.io.Closeable;
import java.util.List;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.plugins.index.aggregate.AggregateIndex;
import org.apache.jackrabbit.oak.plugins.index.lucene.score.ScorerProviderFactory;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
@@ -28,6 +26,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.query.QueryIndex;
import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
import com.google.common.collect.ImmutableList;
@@ -71,13 +70,13 @@ public class LuceneIndexProvider impleme
//----------------------------------------------------------< Observer >--
@Override
- public void contentChanged(@Nonnull NodeState root,@Nonnull CommitInfo info) {
+ public void contentChanged(@NotNull NodeState root,@NotNull CommitInfo info) {
tracker.update(root);
}
//------------------------------------------------< QueryIndexProvider >--
- @Override @Nonnull
+ @Override @NotNull
public List<QueryIndex> getQueryIndexes(NodeState nodeState) {
return ImmutableList.<QueryIndex> of(new AggregateIndex(newLuceneIndex()), newLucenePropertyIndex());
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java Wed Jul 18 14:47:40 2018
@@ -32,7 +32,6 @@ import java.util.concurrent.ThreadPoolEx
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nonnull;
import javax.management.NotCompliantMBeanException;
import com.google.common.base.Strings;
@@ -89,6 +88,7 @@ import org.apache.lucene.analysis.util.T
import org.apache.lucene.analysis.util.TokenizerFactory;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.util.InfoStream;
+import org.jetbrains.annotations.NotNull;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
import org.slf4j.Logger;
@@ -571,7 +571,7 @@ public class LuceneIndexProviderService
}
};
@Override
- public Thread newThread(@Nonnull Runnable r) {
+ public Thread newThread(@NotNull Runnable r) {
Thread thread = new Thread(r, createName());
thread.setDaemon(true);
thread.setPriority(Thread.MIN_PRIORITY);
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=1836183&r1=1836182&r2=1836183&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 Wed Jul 18 14:47:40 2018
@@ -30,9 +30,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.PropertyType;
import com.google.common.base.Joiner;
@@ -127,6 +124,8 @@ import org.apache.lucene.search.postings
import org.apache.lucene.search.spell.SuggestWord;
import org.apache.lucene.search.suggest.Lookup;
import org.apache.lucene.util.Version;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -1000,8 +999,8 @@ public class LucenePropertyIndex impleme
* @param qs the list of queries. Cannot be null.
* @return
*/
- @Nonnull
- public static LuceneRequestFacade<Query> performAdditionalWraps(@Nonnull List<Query> qs) {
+ @NotNull
+ public static LuceneRequestFacade<Query> performAdditionalWraps(@NotNull List<Query> qs) {
checkNotNull(qs);
if (qs.size() == 1) {
Query q = qs.get(0);
@@ -1043,7 +1042,7 @@ public class LucenePropertyIndex impleme
* @param output the query where the unwrapped NOTs will be saved into. Cannot be null.
* @return true if there where at least one unwrapped NOT. false otherwise.
*/
- private static boolean unwrapMustNot(@Nonnull BooleanQuery input, @Nonnull BooleanQuery output) {
+ private static boolean unwrapMustNot(@NotNull BooleanQuery input, @NotNull BooleanQuery output) {
checkNotNull(input);
checkNotNull(output);
boolean unwrapped = false;
@@ -1227,7 +1226,7 @@ public class LucenePropertyIndex impleme
}
}
- @CheckForNull
+ @Nullable
private static Query createQuery(String propertyName, PropertyRestriction pr,
PropertyDefinition defn) {
int propType = determinePropertyType(defn, pr);
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneRequestFacade.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneRequestFacade.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneRequestFacade.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneRequestFacade.java Wed Jul 18 14:47:40 2018
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.index.lucene;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
/**
* Facade for possible requests to be done to Lucene, like queries, spellchecking requests, etc..
@@ -27,7 +27,7 @@ class LuceneRequestFacade<T> {
private final T luceneRequest;
- LuceneRequestFacade(@Nonnull T luceneRequest) {
+ LuceneRequestFacade(@NotNull T luceneRequest) {
this.luceneRequest = luceneRequest;
}
@@ -39,4 +39,4 @@ class LuceneRequestFacade<T> {
public String toString() {
return luceneRequest.toString();
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyDefinition.java Wed Jul 18 14:47:40 2018
@@ -19,7 +19,6 @@
package org.apache.jackrabbit.oak.plugins.index.lucene;
-import javax.annotation.CheckForNull;
import javax.jcr.PropertyType;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -30,6 +29,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexHelper;
import org.apache.jackrabbit.oak.plugins.index.property.ValuePattern;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -104,7 +104,7 @@ public class PropertyDefinition {
* Property name excluding the relativePath. For regular expression based definition
* its set to null
*/
- @CheckForNull
+ @Nullable
final String nonRelativeName;
/**
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyUpdateCallback.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyUpdateCallback.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyUpdateCallback.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/PropertyUpdateCallback.java Wed Jul 18 14:47:40 2018
@@ -19,10 +19,9 @@
package org.apache.jackrabbit.oak.plugins.index.lucene;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
+import org.jetbrains.annotations.Nullable;
/**
* Callback to be invoked for each indexable property change
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/binary/BinaryTextExtractor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/binary/BinaryTextExtractor.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/binary/BinaryTextExtractor.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/binary/BinaryTextExtractor.java Wed Jul 18 14:47:40 2018
@@ -29,8 +29,6 @@ import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeoutException;
-import javax.annotation.Nullable;
-
import com.google.common.io.CountingInputStream;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.JcrConstants;
@@ -52,6 +50,7 @@ import org.apache.tika.parser.AutoDetect
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
import org.apache.tika.sax.WriteOutContentHandler;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.SAXException;
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorFactory.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorFactory.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorFactory.java Wed Jul 18 14:47:40 2018
@@ -34,10 +34,10 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.IndexCommitCallback;
import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore;
import org.apache.jackrabbit.oak.stats.Clock;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nonnull;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.BufferedWriter;
@@ -57,7 +57,6 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-
import static com.google.common.base.Preconditions.checkArgument;
public class ActiveDeletedBlobCollectorFactory {
@@ -134,7 +133,7 @@ public class ActiveDeletedBlobCollectorF
};
}
- public static ActiveDeletedBlobCollector newInstance(@Nonnull File rootDirectory,
+ public static ActiveDeletedBlobCollector newInstance(@NotNull File rootDirectory,
ExecutorService executorService) {
try {
FileUtils.forceMkdir(rootDirectory);
@@ -185,12 +184,12 @@ public class ActiveDeletedBlobCollectorF
* @param executorService executor service to asynchronously flush deleted blobs
* to a file.
*/
- ActiveDeletedBlobCollectorImpl(@Nonnull File rootDirectory, @Nonnull ExecutorService executorService) {
+ ActiveDeletedBlobCollectorImpl(@NotNull File rootDirectory, @NotNull ExecutorService executorService) {
this(Clock.SIMPLE, rootDirectory, executorService);
}
- ActiveDeletedBlobCollectorImpl(Clock clock, @Nonnull File rootDirectory,
- @Nonnull ExecutorService executorService) {
+ ActiveDeletedBlobCollectorImpl(Clock clock, @NotNull File rootDirectory,
+ @NotNull ExecutorService executorService) {
this.clock = clock;
this.rootDirectory = rootDirectory;
this.executorService = executorService;
@@ -203,7 +202,7 @@ public class ActiveDeletedBlobCollectorF
* @param before only purge blobs which were deleted before this timestamps
* @param blobStore used to purge blobs/chunks
*/
- public void purgeBlobsDeleted(long before, @Nonnull GarbageCollectableBlobStore blobStore) {
+ public void purgeBlobsDeleted(long before, @NotNull GarbageCollectableBlobStore blobStore) {
cancelled = false;
long start = clock.getTime();
LOG.info("Starting purge of blobs deleted before {}", before);
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectory.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectory.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/BufferedOakDirectory.java Wed Jul 18 14:47:40 2018
@@ -27,17 +27,16 @@ import org.apache.lucene.store.IndexInpu
import org.apache.lucene.store.IndexOutput;
import org.apache.lucene.store.Lock;
import org.apache.lucene.store.LockFactory;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
import java.util.Set;
-
import static com.google.common.base.Preconditions.checkNotNull;
import static java.util.Arrays.asList;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
@@ -101,18 +100,18 @@ public final class BufferedOakDirectory
private int deleteCount;
- public BufferedOakDirectory(@Nonnull NodeBuilder builder,
- @Nonnull String dataNodeName,
- @Nonnull IndexDefinition definition,
+ public BufferedOakDirectory(@NotNull NodeBuilder builder,
+ @NotNull String dataNodeName,
+ @NotNull IndexDefinition definition,
@Nullable BlobStore blobStore) {
this(builder, dataNodeName, definition, blobStore, BlobDeletionCallback.NOOP);
}
- public BufferedOakDirectory(@Nonnull NodeBuilder builder,
- @Nonnull String dataNodeName,
- @Nonnull IndexDefinition definition,
+ public BufferedOakDirectory(@NotNull NodeBuilder builder,
+ @NotNull String dataNodeName,
+ @NotNull IndexDefinition definition,
@Nullable BlobStore blobStore,
- @Nonnull BlobDeletionCallback blobDeletionCallback) {
+ @NotNull BlobDeletionCallback blobDeletionCallback) {
this.blobFactory = blobStore != null ?
BlobFactory.getBlobStoreBlobFactory(blobStore) :
BlobFactory.getNodeBuilderBlobFactory(builder);
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/DefaultDirectoryFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/DefaultDirectoryFactory.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/DefaultDirectoryFactory.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/DefaultDirectoryFactory.java Wed Jul 18 14:47:40 2018
@@ -22,15 +22,14 @@ package org.apache.jackrabbit.oak.plugin
import java.io.File;
import java.io.IOException;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.plugins.index.lucene.*;
import org.apache.jackrabbit.oak.plugins.index.lucene.directory.ActiveDeletedBlobCollectorFactory.BlobDeletionCallback;
import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.PERSISTENCE_PATH;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.SUGGEST_DATA_CHILD_NAME;
@@ -45,7 +44,7 @@ public class DefaultDirectoryFactory imp
this(indexCopier, blobStore, BlobDeletionCallback.NOOP);
}
public DefaultDirectoryFactory(@Nullable IndexCopier indexCopier, @Nullable GarbageCollectableBlobStore blobStore,
- @Nonnull BlobDeletionCallback blobDeletionCallback) {
+ @NotNull BlobDeletionCallback blobDeletionCallback) {
this.indexCopier = indexCopier;
this.blobStore = blobStore;
this.blobDeletionCallback = blobDeletionCallback;
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexMeta.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexMeta.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexMeta.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexMeta.java Wed Jul 18 14:47:40 2018
@@ -30,10 +30,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import javax.annotation.CheckForNull;
-
import com.google.common.collect.Maps;
import org.apache.commons.io.FileUtils;
+import org.jetbrains.annotations.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -72,7 +71,7 @@ final class IndexMeta implements Compara
properties.put(keyFromFSDirName(fsDirName), jcrDirName);
}
- @CheckForNull
+ @Nullable
public String getJcrNameFromFSName(String fsDirName) {
String nameKey = keyFromFSDirName(fsDirName);
for (Map.Entry<String, String> e : properties.entrySet()) {
@@ -87,7 +86,7 @@ final class IndexMeta implements Compara
* Returns the file system name for the given JCR name which
* represents a directory on the file system
*/
- @CheckForNull
+ @Nullable
public String getFSNameFromJCRName(String jcrDirName) {
for (Map.Entry<String, String> e : properties.entrySet()) {
if (e.getKey().startsWith(DIR_PREFIX) && jcrDirName.equals(e.getValue())){
@@ -138,4 +137,4 @@ final class IndexMeta implements Compara
}
}
}
-
\ No newline at end of file
+
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java Wed Jul 18 14:47:40 2018
@@ -29,8 +29,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import javax.annotation.CheckForNull;
-
import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
import com.google.common.collect.ArrayListMultimap;
@@ -45,6 +43,7 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition;
import org.apache.jackrabbit.oak.plugins.index.lucene.hybrid.NRTIndex;
import org.apache.jackrabbit.oak.stats.Clock;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -296,7 +295,7 @@ public class IndexRootDirectory {
return size;
}
- @CheckForNull
+ @Nullable
private LocalIndexDir findMatchingIndexDir(File dir) throws IOException {
//Resolve to canonical file so that equals can work reliable
dir = dir.getCanonicalFile();
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java Wed Jul 18 14:47:40 2018
@@ -24,14 +24,13 @@ import org.apache.jackrabbit.oak.api.Typ
import org.apache.jackrabbit.oak.commons.StringUtils;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.lucene.store.DataInput;
+import org.jetbrains.annotations.NotNull;
-import javax.annotation.Nonnull;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.SequenceInputStream;
import java.util.List;
-
import static com.google.common.base.Preconditions.checkElementIndex;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkPositionIndexes;
@@ -116,7 +115,7 @@ class OakBufferedIndexFile implements Oa
private final BlobFactory blobFactory;
public OakBufferedIndexFile(String name, NodeBuilder file, String dirDetails,
- @Nonnull BlobFactory blobFactory) {
+ @NotNull BlobFactory blobFactory) {
this.name = name;
this.file = file;
this.dirDetails = dirDetails;
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakDirectory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakDirectory.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakDirectory.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakDirectory.java Wed Jul 18 14:47:40 2018
@@ -36,17 +36,16 @@ import org.apache.lucene.store.IndexOutp
import org.apache.lucene.store.Lock;
import org.apache.lucene.store.LockFactory;
import org.apache.lucene.store.NoLockFactory;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.security.SecureRandom;
import java.util.Collection;
import java.util.Set;
-
import static com.google.common.base.Preconditions.checkArgument;
import static org.apache.jackrabbit.JcrConstants.JCR_DATA;
import static org.apache.jackrabbit.oak.api.Type.BINARIES;
@@ -101,7 +100,7 @@ public class OakDirectory extends Direct
public OakDirectory(NodeBuilder builder, String dataNodeName, IndexDefinition definition,
boolean readOnly, @Nullable GarbageCollectableBlobStore blobStore,
- @Nonnull BlobDeletionCallback blobDeletionCallback) {
+ @NotNull BlobDeletionCallback blobDeletionCallback) {
this(builder, dataNodeName, definition, readOnly,
blobStore != null ? BlobFactory.getBlobStoreBlobFactory(blobStore) : BlobFactory.getNodeBuilderBlobFactory(builder),
blobDeletionCallback);
@@ -114,13 +113,13 @@ public class OakDirectory extends Direct
public OakDirectory(NodeBuilder builder, String dataNodeName, IndexDefinition definition,
boolean readOnly, BlobFactory blobFactory,
- @Nonnull BlobDeletionCallback blobDeletionCallback) {
+ @NotNull BlobDeletionCallback blobDeletionCallback) {
this(builder, dataNodeName, definition, readOnly, blobFactory, blobDeletionCallback, false);
}
public OakDirectory(NodeBuilder builder, String dataNodeName, IndexDefinition definition,
boolean readOnly, BlobFactory blobFactory,
- @Nonnull BlobDeletionCallback blobDeletionCallback,
+ @NotNull BlobDeletionCallback blobDeletionCallback,
boolean streamingWriteEnabled) {
this.lockFactory = NoLockFactory.getNoLockFactory();
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakIndexFile.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakIndexFile.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakIndexFile.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakIndexFile.java Wed Jul 18 14:47:40 2018
@@ -19,21 +19,20 @@ package org.apache.jackrabbit.oak.plugin
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.lucene.store.DataInput;
+import org.jetbrains.annotations.NotNull;
-import javax.annotation.Nonnull;
import java.io.IOException;
-
import static org.apache.jackrabbit.JcrConstants.JCR_DATA;
import static org.apache.jackrabbit.oak.api.Type.BINARY;
public interface OakIndexFile {
static OakIndexFile getOakIndexFile(String name, NodeBuilder file, String dirDetails,
- @Nonnull BlobFactory blobFactory) {
+ @NotNull BlobFactory blobFactory) {
return getOakIndexFile(name, file, dirDetails, blobFactory, false);
}
static OakIndexFile getOakIndexFile(String name, NodeBuilder file, String dirDetails,
- @Nonnull BlobFactory blobFactory, boolean streamingWriteEnabled) {
+ @NotNull BlobFactory blobFactory, boolean streamingWriteEnabled) {
boolean useStreaming;
PropertyState property = file.getProperty(JCR_DATA);
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java Wed Jul 18 14:47:40 2018
@@ -23,15 +23,14 @@ import org.apache.jackrabbit.oak.api.Pro
import org.apache.jackrabbit.oak.commons.StringUtils;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.lucene.store.DataInput;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nonnull;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.SequenceInputStream;
-
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkPositionIndexes;
import static org.apache.jackrabbit.JcrConstants.JCR_DATA;
@@ -92,7 +91,7 @@ class OakStreamingIndexFile implements O
private final BlobFactory blobFactory;
OakStreamingIndexFile(String name, NodeBuilder file, String dirDetails,
- @Nonnull BlobFactory blobFactory) {
+ @NotNull BlobFactory blobFactory) {
this.name = name;
this.file = file;
this.dirDetails = dirDetails;
@@ -270,7 +269,7 @@ class OakStreamingIndexFile implements O
}
@Override
- public int read(@Nonnull byte[] target, int off, int len) throws IOException {
+ public int read(@NotNull byte[] target, int off, int len) throws IOException {
if (available() <= 0) {
return -1;
}
@@ -309,7 +308,7 @@ class OakStreamingIndexFile implements O
}
@Override
- public int read(@Nonnull byte[] b, int off, int len) throws IOException {
+ public int read(@NotNull byte[] b, int off, int len) throws IOException {
if (bytesLeftToRead == 0) {
return -1;
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalIndexObserver.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalIndexObserver.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalIndexObserver.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalIndexObserver.java Wed Jul 18 14:47:40 2018
@@ -21,8 +21,6 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Set;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Sets;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexTracker;
@@ -38,6 +36,7 @@ import org.apache.jackrabbit.oak.stats.S
import org.apache.jackrabbit.oak.stats.StatsOptions;
import org.apache.jackrabbit.oak.stats.TimerStats;
import org.apache.lucene.document.Document;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,7 +57,7 @@ class ExternalIndexObserver implements O
}
@Override
- public boolean excludes(@Nonnull NodeState root, @Nonnull CommitInfo info) {
+ public boolean excludes(@NotNull NodeState root, @NotNull CommitInfo info) {
//Only interested in external changes
if (!info.isExternal()) {
return true;
@@ -85,7 +84,7 @@ class ExternalIndexObserver implements O
}
@Override
- public void contentChanged(@Nonnull NodeState after, @Nonnull CommitInfo info) {
+ public void contentChanged(@NotNull NodeState after, @NotNull CommitInfo info) {
//Only interested in external changes
if (excludes(after, info)) {
return;
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalObserverBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalObserverBuilder.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalObserverBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/ExternalObserverBuilder.java Wed Jul 18 14:47:40 2018
@@ -21,8 +21,6 @@ package org.apache.jackrabbit.oak.plugin
import java.util.concurrent.Executor;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexTracker;
import org.apache.jackrabbit.oak.plugins.observation.Filter;
import org.apache.jackrabbit.oak.spi.commit.BackgroundObserver;
@@ -30,6 +28,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -72,7 +71,7 @@ public class ExternalObserverBuilder {
private static class WarningObserver extends BackgroundObserver {
private final int queueLength;
- public WarningObserver(@Nonnull Observer observer, @Nonnull Executor executor, int queueLength) {
+ public WarningObserver(@NotNull Observer observer, @NotNull Executor executor, int queueLength) {
super(observer, executor, queueLength);
this.queueLength = queueLength;
}
@@ -97,7 +96,7 @@ public class ExternalObserverBuilder {
}
@Override
- public void contentChanged(@Nonnull NodeState root, @Nonnull CommitInfo info) {
+ public void contentChanged(@NotNull NodeState root, @NotNull CommitInfo info) {
//TODO Optimize for the case where new async index update is detected. Then
//existing items in queue should not be processed
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserver.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserver.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserver.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LocalIndexObserver.java Wed Jul 18 14:47:40 2018
@@ -19,14 +19,13 @@
package org.apache.jackrabbit.oak.plugins.index.lucene.hybrid;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.spi.commit.CommitContext;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,7 +38,7 @@ public class LocalIndexObserver implemen
}
@Override
- public void contentChanged(@Nonnull NodeState root, @Nonnull CommitInfo info) {
+ public void contentChanged(@NotNull NodeState root, @NotNull CommitInfo info) {
if (info.isExternal()){
return;
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java Wed Jul 18 14:47:40 2018
@@ -19,9 +19,8 @@
package org.apache.jackrabbit.oak.plugins.index.lucene.hybrid;
-import javax.annotation.Nullable;
-
import org.apache.lucene.index.IndexableField;
+import org.jetbrains.annotations.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDocumentHolder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDocumentHolder.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDocumentHolder.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDocumentHolder.java Wed Jul 18 14:47:40 2018
@@ -22,13 +22,12 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Collection;
import java.util.Map;
-import javax.annotation.Nonnull;
-
import com.google.common.base.Function;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Iterables;
import com.google.common.collect.ListMultimap;
import org.apache.jackrabbit.oak.plugins.document.spi.JournalProperty;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,7 +47,7 @@ public class LuceneDocumentHolder implem
private boolean docAddedToQueue;
private boolean schedulingDone;
- public LuceneDocumentHolder(@Nonnull IndexingQueue documentQueue, int inMemoryDocsLimit) {
+ public LuceneDocumentHolder(@NotNull IndexingQueue documentQueue, int inMemoryDocsLimit) {
this.documentQueue = checkNotNull(documentQueue);
this.inMemoryDocsLimit = inMemoryDocsLimit;
}
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneJournalPropertyBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneJournalPropertyBuilder.java?rev=1836183&r1=1836182&r2=1836183&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneJournalPropertyBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneJournalPropertyBuilder.java Wed Jul 18 14:47:40 2018
@@ -22,8 +22,6 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Collection;
import java.util.Map;
-import javax.annotation.Nullable;
-
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
@@ -32,6 +30,7 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.commons.json.JsopWriter;
import org.apache.jackrabbit.oak.plugins.document.spi.JournalProperty;
import org.apache.jackrabbit.oak.plugins.document.spi.JournalPropertyBuilder;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;