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/11/07 14:14:26 UTC
svn commit: r1846026 [2/2] - in /jackrabbit/oak/branches/1.8: ./ oak-lucene/
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/
oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/binary/
oak-lucene/src/main/ja...
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDoc.java Wed Nov 7 14:14:25 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/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDocumentHolder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDocumentHolder.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDocumentHolder.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneDocumentHolder.java Wed Nov 7 14:14:25 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/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneJournalPropertyBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneJournalPropertyBuilder.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneJournalPropertyBuilder.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/LuceneJournalPropertyBuilder.java Wed Nov 7 14:14:25 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;
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndex.java Wed Nov 7 14:14:25 2018
@@ -27,9 +27,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
-
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import org.apache.commons.io.FileUtils;
@@ -50,6 +47,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.IndexableField;
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;
@@ -114,7 +112,7 @@ public class NRTIndex implements Closeab
* Note that this method is called from a different NRTIndex instance getReaders
* call. So "dirReader" instance changed here is different
*/
- @CheckForNull
+ @Nullable
private LuceneIndexReader getPrimaryReader() {
DirectoryReader latestReader = createReader(dirReaderUsedForPrevious);
while (latestReader != null && !latestReader.tryIncRef()) {
@@ -271,7 +269,7 @@ public class NRTIndex implements Closeab
* If index was updated then a new reader would be returned otherwise
* existing reader would be returned
*/
- @CheckForNull
+ @Nullable
private synchronized DirectoryReader createReader(DirectoryReader dirReader) {
checkState(!closed);
//Its possible that readers are obtained
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/NRTIndexFactory.java Wed Nov 7 14:14:25 2018
@@ -25,8 +25,6 @@ import java.io.IOException;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import javax.annotation.CheckForNull;
-
import com.google.common.collect.LinkedListMultimap;
import com.google.common.collect.ListMultimap;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexCopier;
@@ -36,6 +34,7 @@ import org.apache.jackrabbit.oak.stats.S
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.store.NRTCachingDirectory;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,7 +73,7 @@ public class NRTIndexFactory implements
//This would not be invoked concurrently
// but still mark it synchronized for safety
- @CheckForNull
+ @Nullable
public synchronized NRTIndex createIndex(IndexDefinition definition) {
if (!(definition.isNRTIndexingEnabled() || definition.isSyncIndexingEnabled())){
return null;
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexUpdateCallback.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexUpdateCallback.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexUpdateCallback.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexUpdateCallback.java Wed Nov 7 14:14:25 2018
@@ -22,7 +22,6 @@ package org.apache.jackrabbit.oak.plugin
import java.util.HashSet;
import java.util.Set;
-import javax.annotation.Nullable;
import javax.jcr.PropertyType;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -37,6 +36,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.stats.Clock;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java Wed Nov 7 14:14:25 2018
@@ -21,9 +21,6 @@ package org.apache.jackrabbit.oak.plugin
import java.io.IOException;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
-
import com.google.common.io.Closer;
import org.apache.jackrabbit.oak.plugins.index.lucene.util.SuggestHelper;
import org.apache.lucene.analysis.Analyzer;
@@ -31,6 +28,7 @@ import org.apache.lucene.index.Directory
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.suggest.analyzing.AnalyzingInfixSuggester;
import org.apache.lucene.store.Directory;
+import org.jetbrains.annotations.Nullable;
import static org.apache.jackrabbit.oak.plugins.index.lucene.directory.DirectoryUtils.dirSize;
@@ -63,13 +61,13 @@ public class DefaultIndexReader implemen
}
@Override
- @CheckForNull
+ @Nullable
public AnalyzingInfixSuggester getLookup() {
return lookup;
}
@Override
- @CheckForNull
+ @Nullable
public Directory getSuggestDirectory() {
return suggestDirectory;
}
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReaderFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReaderFactory.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReaderFactory.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReaderFactory.java Wed Nov 7 14:14:25 2018
@@ -24,9 +24,6 @@ import java.io.IOException;
import java.util.Collections;
import java.util.List;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
-
import com.google.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexCopier;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexDefinition;
@@ -38,6 +35,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.ReadOnlyBuilder;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
+import org.jetbrains.annotations.Nullable;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INDEX_DATA_CHILD_NAME;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.PERSISTENCE_FILE;
@@ -84,14 +82,14 @@ public class DefaultIndexReaderFactory i
return readers.build();
}
- @CheckForNull
+ @Nullable
private LuceneIndexReader createReader(Mount mount, IndexDefinition definition, NodeState defnNodeState,
String indexPath) throws IOException {
return createReader(definition, defnNodeState, indexPath, MultiplexersLucene.getIndexDirName(mount),
MultiplexersLucene.getSuggestDirName(mount));
}
- @CheckForNull
+ @Nullable
private LuceneIndexReader createReader(IndexDefinition definition, NodeState defnNodeState, String indexPath,
String indexDataNodeName, String suggestDataNodeName) throws IOException {
Directory directory = null;
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/LuceneIndexReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/LuceneIndexReader.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/LuceneIndexReader.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/LuceneIndexReader.java Wed Nov 7 14:14:25 2018
@@ -22,20 +22,19 @@ package org.apache.jackrabbit.oak.plugin
import java.io.Closeable;
import java.io.IOException;
-import javax.annotation.CheckForNull;
-
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.suggest.analyzing.AnalyzingInfixSuggester;
import org.apache.lucene.store.Directory;
+import org.jetbrains.annotations.Nullable;
public interface LuceneIndexReader extends Closeable{
IndexReader getReader();
- @CheckForNull
+ @Nullable
AnalyzingInfixSuggester getLookup();
- @CheckForNull
+ @Nullable
Directory getSuggestDirectory();
long getIndexSize() throws IOException;
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/spi/FulltextQueryTermsProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/spi/FulltextQueryTermsProvider.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/spi/FulltextQueryTermsProvider.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/spi/FulltextQueryTermsProvider.java Wed Nov 7 14:14:25 2018
@@ -19,12 +19,11 @@ package org.apache.jackrabbit.oak.plugin
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.search.Query;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import java.util.Collections;
import java.util.Set;
-
/**
* Implementations of this interface would get callbacks while forming lucene full text queries.
*/
@@ -51,7 +50,7 @@ public interface FulltextQueryTermsProvi
* @param indexDefinition {@link NodeState} of index definition
* @return {@link Query} object to be OR'ed with query being prepared. {@code null}, if nothing is to be added.
*/
- @CheckForNull
+ @Nullable
Query getQueryTerm(String text, Analyzer analyzer, NodeState indexDefinition);
/**
@@ -61,6 +60,6 @@ public interface FulltextQueryTermsProvi
* exact matches and do not support inheritance.
* @return {@link Set} of types supported by the implementation
*/
- @Nonnull
+ @NotNull
Set<String> getSupportedTypes();
}
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/spi/IndexFieldProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/spi/IndexFieldProvider.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/spi/IndexFieldProvider.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/spi/IndexFieldProvider.java Wed Nov 7 14:14:25 2018
@@ -18,11 +18,10 @@ package org.apache.jackrabbit.oak.plugin
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.lucene.document.Field;
+import org.jetbrains.annotations.NotNull;
-import javax.annotation.Nonnull;
import java.util.Collections;
import java.util.Set;
-
/**
* Implementations of this interface would get callbacks while indexing documents. It's the responsibility
* of the implementation to exit as early as possible if it doesn't care about the document being indexed.
@@ -51,7 +50,7 @@ public interface IndexFieldProvider {
* @param indexDefinition {@link NodeState} of index definition
* @return {@link Iterable} of fields that are to be added to {@link org.apache.lucene.document.Document} being prepared
*/
- @Nonnull
+ @NotNull
Iterable<Field> getAugmentedFields(String path, NodeState document, NodeState indexDefinition);
/**
@@ -61,6 +60,6 @@ public interface IndexFieldProvider {
* exact matches and do not support inheritance.
* @return {@link Set} of types supported by the implementation
*/
- @Nonnull
+ @NotNull
Set<String> getSupportedTypes();
}
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/spi/package-info.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/spi/package-info.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/spi/package-info.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/spi/package-info.java Wed Nov 7 14:14:25 2018
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-@Version("1.0.0")
+@Version("1.0.1")
package org.apache.jackrabbit.oak.plugins.index.lucene.spi;
import org.osgi.annotation.versioning.Version;
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneIndexHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneIndexHelper.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneIndexHelper.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneIndexHelper.java Wed Nov 7 14:14:25 2018
@@ -43,12 +43,11 @@ import static org.apache.jackrabbit.oak.
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
public class LuceneIndexHelper {
@@ -71,13 +70,13 @@ public class LuceneIndexHelper {
}
public static NodeBuilder newLuceneIndexDefinition(
- @Nonnull NodeBuilder index, @Nonnull String name,
+ @NotNull NodeBuilder index, @NotNull String name,
@Nullable Set<String> propertyTypes) {
return newLuceneIndexDefinition(index, name, propertyTypes, null, null, null);
}
public static NodeBuilder newLuceneIndexDefinition(
- @Nonnull NodeBuilder index, @Nonnull String name,
+ @NotNull NodeBuilder index, @NotNull String name,
@Nullable Set<String> propertyTypes,
@Nullable Set<String> excludes, @Nullable String async) {
return newLuceneIndexDefinition(index, name, propertyTypes, excludes,
@@ -85,7 +84,7 @@ public class LuceneIndexHelper {
}
public static NodeBuilder newLuceneIndexDefinition(
- @Nonnull NodeBuilder index, @Nonnull String name,
+ @NotNull NodeBuilder index, @NotNull String name,
@Nullable Set<String> propertyTypes,
@Nullable Set<String> excludes, @Nullable String async,
@Nullable Boolean stored) {
@@ -114,16 +113,16 @@ public class LuceneIndexHelper {
}
public static NodeBuilder newLuceneFileIndexDefinition(
- @Nonnull NodeBuilder index, @Nonnull String name,
- @Nullable Set<String> propertyTypes, @Nonnull String path) {
+ @NotNull NodeBuilder index, @NotNull String name,
+ @Nullable Set<String> propertyTypes, @NotNull String path) {
return newLuceneFileIndexDefinition(index, name, propertyTypes, null,
path, null);
}
public static NodeBuilder newLuceneFileIndexDefinition(
- @Nonnull NodeBuilder index, @Nonnull String name,
+ @NotNull NodeBuilder index, @NotNull String name,
@Nullable Set<String> propertyTypes,
- @Nullable Set<String> excludes, @Nonnull String path,
+ @Nullable Set<String> excludes, @NotNull String path,
@Nullable String async) {
if (index.hasChildNode(name)) {
return index.child(name);
@@ -149,9 +148,9 @@ public class LuceneIndexHelper {
}
public static NodeBuilder newLucenePropertyIndexDefinition(
- @Nonnull NodeBuilder index, @Nonnull String name,
- @Nonnull Set<String> includes,
- @Nonnull String async) {
+ @NotNull NodeBuilder index, @NotNull String name,
+ @NotNull Set<String> includes,
+ @NotNull String async) {
checkArgument(!includes.isEmpty(), "Lucene property index " +
"requires explicit list of property names to be indexed");
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneInitializerHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneInitializerHelper.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneInitializerHelper.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneInitializerHelper.java Wed Nov 7 14:14:25 2018
@@ -23,10 +23,9 @@ import static org.apache.jackrabbit.oak.
import java.util.Set;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.jetbrains.annotations.NotNull;
public class LuceneInitializerHelper implements RepositoryInitializer {
@@ -87,13 +86,13 @@ public class LuceneInitializerHelper imp
* @param async
* @return
*/
- public LuceneInitializerHelper async(@Nonnull final String async) {
+ public LuceneInitializerHelper async(@NotNull final String async) {
this.async = checkNotNull(async);
return this;
}
@Override
- public void initialize(@Nonnull NodeBuilder builder) {
+ public void initialize(@NotNull NodeBuilder builder) {
if (builder.hasChildNode(INDEX_DEFINITIONS_NAME)
&& builder.getChildNode(INDEX_DEFINITIONS_NAME).hasChildNode(name)) {
// do nothing
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/SuggestHelper.java Wed Nov 7 14:14:25 2018
@@ -24,8 +24,6 @@ import java.io.Reader;
import java.util.Collections;
import java.util.List;
-import javax.annotation.Nullable;
-
import com.google.common.io.Closer;
import com.google.common.io.Files;
import org.apache.commons.io.FileUtils;
@@ -39,6 +37,7 @@ import org.apache.lucene.search.suggest.
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.util.Version;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriter.java Wed Nov 7 14:14:25 2018
@@ -23,8 +23,6 @@ import java.io.IOException;
import java.util.Calendar;
import java.util.List;
-import javax.annotation.Nonnull;
-
import com.google.common.io.Closer;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
@@ -42,6 +40,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.search.PrefixQuery;
import org.apache.lucene.store.Directory;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -242,9 +241,9 @@ class DefaultIndexWriter implements Luce
return -1;
}
- private static void trackIndexSizeInfo(@Nonnull IndexWriter writer,
- @Nonnull IndexDefinition definition,
- @Nonnull Directory directory) throws IOException {
+ private static void trackIndexSizeInfo(@NotNull IndexWriter writer,
+ @NotNull IndexDefinition definition,
+ @NotNull Directory directory) throws IOException {
checkNotNull(writer);
checkNotNull(definition);
checkNotNull(directory);
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/AsyncConflictsIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/AsyncConflictsIT.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/AsyncConflictsIT.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/AsyncConflictsIT.java Wed Nov 7 14:14:25 2018
@@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Random;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.Node;
import javax.jcr.Repository;
import javax.jcr.RepositoryException;
@@ -41,6 +40,7 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorProvider;
+import org.jetbrains.annotations.NotNull;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
@@ -141,7 +141,7 @@ public class AsyncConflictsIT extends Do
}
}
- private void defineIndex(@Nonnull final Repository repo) throws RepositoryException {
+ private void defineIndex(@NotNull final Repository repo) throws RepositoryException {
Session session = repo.login(ADMIN);
try {
Node n = session.getRootNode().getNode("oak:index");
@@ -191,7 +191,7 @@ public class AsyncConflictsIT extends Do
}
- private void unsubscribe(@Nonnull final Appender<ILoggingEvent> appender) {
+ private void unsubscribe(@NotNull final Appender<ILoggingEvent> appender) {
((LoggerContext) LoggerFactory.getILoggerFactory()).getLogger(
ch.qos.logback.classic.Logger.ROOT_LOGGER_NAME).detachAppender(appender);
}
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java Wed Nov 7 14:14:25 2018
@@ -30,7 +30,6 @@ import static org.apache.jackrabbit.oak.
import java.util.Properties;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import org.apache.jackrabbit.oak.plugins.index.aggregate.SimpleNodeAggregator;
@@ -42,6 +41,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.NodeBuilder;
+import org.jetbrains.annotations.NotNull;
public class LuceneOakRepositoryStub extends OakSegmentTarRepositoryStub {
@@ -75,7 +75,7 @@ public class LuceneOakRepositoryStub ext
}
@Override
- public void initialize(@Nonnull NodeBuilder builder) {
+ public void initialize(@NotNull NodeBuilder builder) {
if (builder.hasChildNode(INDEX_DEFINITIONS_NAME)
&& builder.getChildNode(INDEX_DEFINITIONS_NAME).hasChildNode(name)) {
// do nothing
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImplTest.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImplTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImplTest.java Wed Nov 7 14:14:25 2018
@@ -58,13 +58,13 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
import org.apache.jackrabbit.oak.stats.Clock;
import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
+import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import javax.annotation.Nonnull;
import java.io.File;
import java.util.List;
import java.util.concurrent.Callable;
@@ -72,7 +72,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Supplier;
-
import static com.google.common.collect.Lists.newArrayList;
import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
import static org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean.STATUS_DONE;
@@ -230,10 +229,10 @@ public class ActiveDeletedBlobCollectorM
));
NodeStore failingNodeStore = new MemoryNodeStore() {
- @Nonnull
+ @NotNull
@Override
- public synchronized NodeState merge(@Nonnull NodeBuilder builder, @Nonnull CommitHook commitHook,
- @Nonnull CommitInfo info) throws CommitFailedException {
+ public synchronized NodeState merge(@NotNull NodeBuilder builder, @NotNull CommitHook commitHook,
+ @NotNull CommitInfo info) throws CommitFailedException {
throw new CommitFailedException("TestFail", 1, "We must never merge");
}
};
@@ -455,7 +454,7 @@ public class ActiveDeletedBlobCollectorM
implements ActiveDeletedBlobCollector {
private final Callable callback;
- PauseNotifyingActiveDeletedBlobCollector (@Nonnull Callable callback) {
+ PauseNotifyingActiveDeletedBlobCollector (Callable callback) {
this.callback = callback;
}
@Override
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexAugmentorFactoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexAugmentorFactoryTest.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexAugmentorFactoryTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexAugmentorFactoryTest.java Wed Nov 7 14:14:25 2018
@@ -36,14 +36,13 @@ import org.apache.lucene.search.TermQuer
import org.apache.sling.testing.mock.osgi.MockOsgi;
import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
import org.hamcrest.CoreMatchers;
+import org.jetbrains.annotations.NotNull;
import org.junit.Rule;
import org.junit.Test;
-import javax.annotation.Nonnull;
import java.util.Collections;
import java.util.List;
import java.util.Set;
-
import static org.apache.lucene.search.BooleanClause.Occur.SHOULD;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
@@ -177,13 +176,13 @@ public class IndexAugmentorFactoryTest {
context.registerService(IndexFieldProvider.class, this);
}
- @Nonnull
+ @NotNull
@Override
public Iterable<Field> getAugmentedFields(String path, NodeState document, NodeState indexDefinition) {
return Lists.newArrayList(id);
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return nodeTypes;
@@ -205,7 +204,7 @@ public class IndexAugmentorFactoryTest {
return id;
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return nodeTypes;
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexPlannerTest.java Wed Nov 7 14:14:25 2018
@@ -56,8 +56,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Lists;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
@@ -92,6 +90,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.RAMDirectory;
+import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.Test;
@@ -1749,7 +1748,7 @@ public class IndexPlannerTest {
return createSampleDirectory(numOfDocs, Collections.EMPTY_LIST);
}
- private static Directory createSampleDirectory(long numOfDocs, @Nonnull Document doc) throws IOException {
+ private static Directory createSampleDirectory(long numOfDocs, @NotNull Document doc) throws IOException {
return createSampleDirectory(numOfDocs, Collections.singletonList(doc));
}
@@ -1773,8 +1772,8 @@ public class IndexPlannerTest {
return (IndexPlanner.PlanResult) plan.getAttribute(LucenePropertyIndex.ATTR_PLAN_RESULT);
}
- @Nonnull
- private static NodeBuilder getNode(@Nonnull NodeBuilder node, @Nonnull String path) {
+ @NotNull
+ private static NodeBuilder getNode(@NotNull NodeBuilder node, @NotNull String path) {
for (String name : PathUtils.elements(checkNotNull(path))) {
node = node.getChildNode(checkNotNull(name));
}
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregation2Test.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregation2Test.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregation2Test.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAggregation2Test.java Wed Nov 7 14:14:25 2018
@@ -43,8 +43,6 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.ContentRepository;
@@ -73,6 +71,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.plugins.tree.TreeUtil;
+import org.jetbrains.annotations.NotNull;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
@@ -97,7 +96,7 @@ public class LuceneIndexAggregation2Test
.with(new InitialContent() {
@Override
- public void initialize(@Nonnull NodeBuilder builder) {
+ public void initialize(@NotNull NodeBuilder builder) {
super.initialize(builder);
// registering additional node types for wider testing
@@ -423,8 +422,8 @@ public class LuceneIndexAggregation2Test
* @param nodeName the node name to be used
* @return the {@code metadata} node. See above for details
*/
- private static Tree createAssetStructure(@Nonnull final Tree parent,
- @Nonnull final String nodeName) {
+ private static Tree createAssetStructure(@NotNull final Tree parent,
+ @NotNull final String nodeName) {
checkNotNull(parent);
checkArgument(!Strings.isNullOrEmpty(nodeName), "nodeName cannot be null or empty");
@@ -461,8 +460,8 @@ public class LuceneIndexAggregation2Test
* @param nodeName the node name to be used
* @return the {@code jcr:content} node. See above for details
*/
- private static Tree createPageStructure(@Nonnull final Tree parent,
- @Nonnull final String nodeName) {
+ private static Tree createPageStructure(@NotNull final Tree parent,
+ @NotNull final String nodeName) {
checkNotNull(parent);
checkArgument(!Strings.isNullOrEmpty(nodeName), "nodeName cannot be null or empty");
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAugmentTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAugmentTest.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAugmentTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexAugmentTest.java Wed Nov 7 14:14:25 2018
@@ -48,14 +48,13 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
-import javax.annotation.Nonnull;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeFalse;
@@ -107,7 +106,7 @@ public class LuceneIndexAugmentTest exte
return new TermQuery(new Term(":fulltext", realSearchText));
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return Collections.singleton(TestUtil.NT_TEST);
@@ -140,14 +139,14 @@ public class LuceneIndexAugmentTest exte
//setup index augmentor
final AtomicInteger counter = new AtomicInteger(0);
factory.indexFieldProvider = new IndexFieldProvider() {
- @Nonnull
+ @NotNull
@Override
public Iterable<Field> getAugmentedFields(String path, NodeState document, NodeState indexDefinition) {
counter.incrementAndGet();
return IndexFieldProvider.DEFAULT.getAugmentedFields(path, document, indexDefinition);
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return Collections.singleton(TestUtil.NT_TEST);
@@ -185,7 +184,7 @@ public class LuceneIndexAugmentTest exte
//setup index augmentor
factory.indexFieldProvider = new IndexFieldProvider() {
- @Nonnull
+ @NotNull
@Override
public Iterable<Field> getAugmentedFields(String path, NodeState document, NodeState indexDefinition) {
assertEquals("/test/item", path);
@@ -195,7 +194,7 @@ public class LuceneIndexAugmentTest exte
return Lists.<Field>newArrayList(new StringField("barbar", "1", Field.Store.NO));
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return Collections.singleton(TestUtil.NT_TEST);
@@ -245,7 +244,7 @@ public class LuceneIndexAugmentTest exte
return null;
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return FulltextQueryTermsProvider.DEFAULT.getSupportedTypes();
@@ -260,7 +259,7 @@ public class LuceneIndexAugmentTest exte
return null;
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return Collections.singleton(TestUtil.NT_TEST);
@@ -275,7 +274,7 @@ public class LuceneIndexAugmentTest exte
return new TermQuery(new Term("bar", "baz"));
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return Collections.singleton(TestUtil.NT_TEST);
@@ -291,13 +290,13 @@ public class LuceneIndexAugmentTest exte
//Set index augmentor... with null fields
factory.indexFieldProvider = new IndexFieldProvider() {
- @Nonnull
+ @NotNull
@Override
public Iterable<Field> getAugmentedFields(String path, NodeState document, NodeState indexDefinition) {
return IndexFieldProvider.DEFAULT.getAugmentedFields(path, document, indexDefinition);
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return Collections.singleton(TestUtil.NT_TEST);
@@ -308,7 +307,7 @@ public class LuceneIndexAugmentTest exte
//Set index augmentor... with some fields
factory.fulltextQueryTermsProvider = null;
factory.indexFieldProvider = new IndexFieldProvider() {
- @Nonnull
+ @NotNull
@Override
public Iterable<Field> getAugmentedFields(String path, NodeState document, NodeState indexDefinition) {
List<Field> fields = Lists.newArrayList();
@@ -316,7 +315,7 @@ public class LuceneIndexAugmentTest exte
return fields;
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return Collections.singleton(TestUtil.NT_TEST);
@@ -331,7 +330,7 @@ public class LuceneIndexAugmentTest exte
return null;
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return Collections.singleton(TestUtil.NT_TEST);
@@ -357,14 +356,14 @@ public class LuceneIndexAugmentTest exte
//setup augmentors
final AtomicInteger indexingCounter = new AtomicInteger(0);
factory.indexFieldProvider = new IndexFieldProvider() {
- @Nonnull
+ @NotNull
@Override
public Iterable<Field> getAugmentedFields(String path, NodeState document, NodeState indexDefinition) {
indexingCounter.incrementAndGet();
return IndexFieldProvider.DEFAULT.getAugmentedFields(path, document, indexDefinition);
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return Collections.singleton(TestUtil.NT_TEST);
@@ -378,7 +377,7 @@ public class LuceneIndexAugmentTest exte
return null;
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return Collections.singleton(TestUtil.NT_TEST);
@@ -420,14 +419,14 @@ public class LuceneIndexAugmentTest exte
//setup augmentors
final AtomicInteger indexingCounter = new AtomicInteger(0);
factory.indexFieldProvider = new IndexFieldProvider() {
- @Nonnull
+ @NotNull
@Override
public Iterable<Field> getAugmentedFields(String path, NodeState document, NodeState indexDefinition) {
indexingCounter.incrementAndGet();
return IndexFieldProvider.DEFAULT.getAugmentedFields(path, document, indexDefinition);
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return Collections.singleton(TestUtil.NT_TEST);
@@ -441,7 +440,7 @@ public class LuceneIndexAugmentTest exte
return null;
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return Collections.singleton(TestUtil.NT_TEST);
@@ -487,14 +486,14 @@ public class LuceneIndexAugmentTest exte
//setup augmentors
final AtomicInteger indexingCounter = new AtomicInteger(0);
factory.indexFieldProvider = new IndexFieldProvider() {
- @Nonnull
+ @NotNull
@Override
public Iterable<Field> getAugmentedFields(String path, NodeState document, NodeState indexDefinition) {
indexingCounter.incrementAndGet();
return IndexFieldProvider.DEFAULT.getAugmentedFields(path, document, indexDefinition);
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return Collections.singleton(TestUtil.NT_TEST);
@@ -508,7 +507,7 @@ public class LuceneIndexAugmentTest exte
return null;
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return Collections.singleton(TestUtil.NT_TEST);
@@ -558,28 +557,28 @@ public class LuceneIndexAugmentTest exte
final AtomicInteger indexingCounter1 = new AtomicInteger(0);
final AtomicInteger indexingCounter2 = new AtomicInteger(0);
factory.registerIndexFieldProvider(new IndexFieldProvider() {
- @Nonnull
+ @NotNull
@Override
public Iterable<Field> getAugmentedFields(String path, NodeState document, NodeState indexDefinition) {
indexingCounter1.incrementAndGet();
return IndexFieldProvider.DEFAULT.getAugmentedFields(path, document, indexDefinition);
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return Collections.singleton(JcrConstants.NT_BASE);
}
});
factory.registerIndexFieldProvider(new IndexFieldProvider() {
- @Nonnull
+ @NotNull
@Override
public Iterable<Field> getAugmentedFields(String path, NodeState document, NodeState indexDefinition) {
indexingCounter2.incrementAndGet();
return IndexFieldProvider.DEFAULT.getAugmentedFields(path, document, indexDefinition);
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return Collections.singleton(TestUtil.NT_TEST);
@@ -613,7 +612,7 @@ public class LuceneIndexAugmentTest exte
return null;
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return Collections.singleton(JcrConstants.NT_BASE);
@@ -626,7 +625,7 @@ public class LuceneIndexAugmentTest exte
return null;
}
- @Nonnull
+ @NotNull
@Override
public Set<String> getSupportedTypes() {
return Collections.singleton(TestUtil.NT_TEST);
@@ -671,7 +670,7 @@ public class LuceneIndexAugmentTest exte
bindFulltextQueryTermsProvider(provider);
}
- @Nonnull
+ @NotNull
@Override
public IndexFieldProvider getIndexFieldProvider(String nodeType) {
return useSuperBehavior?
@@ -681,7 +680,7 @@ public class LuceneIndexAugmentTest exte
IndexFieldProvider.DEFAULT;
}
- @Nonnull
+ @NotNull
@Override
public FulltextQueryTermsProvider getFulltextQueryTermsProvider(String nodeType) {
return useSuperBehavior?
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor2Test.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor2Test.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor2Test.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditor2Test.java Wed Nov 7 14:14:25 2018
@@ -25,9 +25,6 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -45,6 +42,8 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.lucene.index.IndexableField;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.Test;
import static org.apache.jackrabbit.oak.InitialContent.INITIAL_CONTENT;
@@ -191,10 +190,10 @@ public class LuceneIndexEditor2Test {
private EditorHook createHook(LuceneIndexEditorContext context) {
IndexEditorProvider provider = new IndexEditorProvider() {
- @CheckForNull
+ @Nullable
@Override
- public Editor getIndexEditor(@Nonnull String type, @Nonnull NodeBuilder definition,
- @Nonnull NodeState root, @Nonnull IndexUpdateCallback callback)
+ public Editor getIndexEditor(@NotNull String type, @NotNull NodeBuilder definition,
+ @NotNull NodeState root, @NotNull IndexUpdateCallback callback)
throws CommitFailedException {
if ("lucene".equals(type)) {
return new LuceneIndexEditor(context);
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java Wed Nov 7 14:14:25 2018
@@ -47,8 +47,6 @@ import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.commons.CIHelper;
@@ -87,6 +85,7 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
+import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -589,9 +588,9 @@ public class LuceneIndexEditorTest {
private boolean shouldFail;
@Override
- public Editor getIndexEditor(@Nonnull String type, @Nonnull NodeBuilder definition,
- @Nonnull NodeState root,
- @Nonnull IndexUpdateCallback callback) throws CommitFailedException {
+ public Editor getIndexEditor(@NotNull String type, @NotNull NodeBuilder definition,
+ @NotNull NodeState root,
+ @NotNull IndexUpdateCallback callback) throws CommitFailedException {
if (PropertyIndexEditorProvider.TYPE.equals(type)) {
return new FailOnDemandEditor();
}
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexTest.java Wed Nov 7 14:14:25 2018
@@ -64,7 +64,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.Nonnull;
import javax.jcr.PropertyType;
import org.apache.commons.io.FileUtils;
@@ -117,6 +116,7 @@ import org.apache.lucene.queries.CustomS
import org.apache.lucene.queries.CustomScoreQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.store.Directory;
+import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
@@ -715,7 +715,7 @@ public class LuceneIndexTest {
tracker = new IndexTracker();
((Observable)nodeStore).addObserver(new Observer() {
@Override
- public void contentChanged(@Nonnull NodeState root, @Nonnull CommitInfo info) {
+ public void contentChanged(@NotNull NodeState root, @NotNull CommitInfo info) {
tracker.update(root);
}
});
@@ -1001,10 +1001,10 @@ public class LuceneIndexTest {
super(b);
}
- @Nonnull
+ @NotNull
@Override
public InputStream getNewStream() {
throw new UnsupportedOperationException();
}
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndexTest.java Wed Nov 7 14:14:25 2018
@@ -89,7 +89,6 @@ import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import javax.annotation.Nonnull;
import javax.jcr.PropertyType;
import com.google.common.base.Charsets;
@@ -144,6 +143,7 @@ import org.apache.jackrabbit.util.ISO860
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.store.FilterDirectory;
+import org.jetbrains.annotations.NotNull;
import org.junit.After;
import org.junit.Ignore;
import org.junit.Rule;
@@ -3089,7 +3089,7 @@ public class LucenePropertyIndexTest ext
this.id = id;
}
- @Nonnull
+ @NotNull
@Override
public InputStream getNewStream() {
accessCount++;
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ResultCountingIndexProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ResultCountingIndexProvider.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ResultCountingIndexProvider.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/ResultCountingIndexProvider.java Wed Nov 7 14:14:25 2018
@@ -29,10 +29,9 @@ import org.apache.jackrabbit.oak.spi.que
import org.apache.jackrabbit.oak.spi.query.QueryIndex.AdvanceFulltextQueryIndex;
import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
-import javax.annotation.Nonnull;
import java.util.List;
-
class ResultCountingIndexProvider implements QueryIndexProvider {
private final QueryIndexProvider delegate;
private final CountingCursorFactory cursorFactory;
@@ -62,14 +61,14 @@ class ResultCountingIndexProvider implem
count++;
}
- @Nonnull
+ @NotNull
@Override
public List<? extends QueryIndex> getQueryIndexes(NodeState nodeState) {
if (shouldCount) {
return Lists.transform(delegate.getQueryIndexes(nodeState), new Function<QueryIndex, QueryIndex>() {
- @Nonnull
+ @NotNull
@Override
- public QueryIndex apply(@Nonnull QueryIndex input) {
+ public QueryIndex apply(@NotNull QueryIndex input) {
if (input instanceof AdvanceFulltextQueryIndex) {
return new CountingIndex((AdvanceFulltextQueryIndex)input, cursorFactory);
} else {
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java Wed Nov 7 14:14:25 2018
@@ -24,8 +24,6 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.jcr.PropertyType;
import javax.jcr.Repository;
@@ -61,6 +59,8 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexOutput;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.ImmutableSet.of;
@@ -96,7 +96,7 @@ public class TestUtil {
}
public static NodeBuilder newLuceneIndexDefinitionV2(
- @Nonnull NodeBuilder index, @Nonnull String name,
+ @NotNull NodeBuilder index, @NotNull String name,
@Nullable Set<String> propertyTypes) {
NodeBuilder nb = LuceneIndexHelper.newLuceneIndexDefinition(index, name, propertyTypes, null, null, null);
useV2(nb);
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/AbstractActiveDeletedBlobTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/AbstractActiveDeletedBlobTest.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/AbstractActiveDeletedBlobTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/AbstractActiveDeletedBlobTest.java Wed Nov 7 14:14:25 2018
@@ -25,9 +25,6 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.ExecutorService;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Iterators;
import com.google.common.util.concurrent.MoreExecutors;
import org.apache.jackrabbit.JcrConstants;
@@ -52,6 +49,8 @@ import org.apache.jackrabbit.oak.spi.blo
import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.stats.Clock;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Rule;
import org.junit.rules.TemporaryFolder;
@@ -197,11 +196,11 @@ public abstract class AbstractActiveDele
return delegate.deleteChunks(chunkIds, maxLastModifiedTime);
}
- @Override @CheckForNull public String getBlobId(@Nonnull String reference) {
+ @Override @Nullable public String getBlobId(@NotNull String reference) {
return delegate.getBlobId(reference);
}
- @Override @CheckForNull public String getReference(@Nonnull String blobId) {
+ @Override @Nullable public String getReference(@NotNull String blobId) {
return delegate.getReference(blobId);
}
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorTest.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorTest.java Wed Nov 7 14:14:25 2018
@@ -45,8 +45,6 @@ import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.Nonnull;
-
import ch.qos.logback.classic.Level;
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
@@ -60,6 +58,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.spi.blob.BlobOptions;
import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore;
import org.apache.jackrabbit.oak.stats.Clock;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -537,12 +536,12 @@ public class ActiveDeletedBlobCollectorT
}
@Override
- public String getBlobId(@Nonnull String reference) {
+ public String getBlobId(@NotNull String reference) {
return null;
}
@Override
- public String getReference(@Nonnull String blobId) {
+ public String getReference(@NotNull String blobId) {
return null;
}
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyCheckerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyCheckerTest.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyCheckerTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyCheckerTest.java Wed Nov 7 14:14:25 2018
@@ -25,8 +25,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.List;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Lists;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.oak.InitialContent;
@@ -46,6 +44,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.Version;
+import org.jetbrains.annotations.NotNull;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
@@ -223,7 +222,7 @@ public class IndexConsistencyCheckerTest
this.corruptLength = corruptLength;
}
- @Nonnull
+ @NotNull
@Override
public InputStream getNewStream() {
if (corruptLength){
@@ -244,4 +243,4 @@ public class IndexConsistencyCheckerTest
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexClusterIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexClusterIT.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexClusterIT.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexClusterIT.java Wed Nov 7 14:14:25 2018
@@ -26,7 +26,6 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -65,6 +64,7 @@ import org.apache.jackrabbit.oak.spi.whi
import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils;
import org.apache.jackrabbit.oak.stats.Clock;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+import org.jetbrains.annotations.Nullable;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/HybridIndexTest.java Wed Nov 7 14:14:25 2018
@@ -31,8 +31,6 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.management.AttributeNotFoundException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -95,6 +93,8 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.store.NRTCachingDirectory;
import org.apache.lucene.store.NoLockFactory;
import org.apache.lucene.store.SimpleFSDirectory;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Ignore;
import org.junit.Rule;
@@ -536,7 +536,7 @@ public class HybridIndexTest extends Abs
super(value);
}
- @Nonnull
+ @NotNull
@Override
public InputStream getNewStream() {
accessCount++;
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleanerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleanerTest.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleanerTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleanerTest.java Wed Nov 7 14:14:25 2018
@@ -24,8 +24,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import javax.annotation.CheckForNull;
-
import com.google.common.collect.ImmutableList;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
@@ -49,6 +47,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.stats.Clock;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+import org.jetbrains.annotations.Nullable;
import org.json.simple.parser.ParseException;
import org.junit.Before;
import org.junit.Test;
@@ -349,13 +348,13 @@ public class PropertyIndexCleanerTest {
throw new UnsupportedOperationException();
}
- @CheckForNull
+ @Nullable
@Override
public AsyncIndexInfo getInfo(String name) {
return infos.get(name);
}
- @CheckForNull
+ @Nullable
@Override
public AsyncIndexInfo getInfo(String name, NodeState root) {
return null;
@@ -381,4 +380,4 @@ public class PropertyIndexCleanerTest {
}
-}
\ No newline at end of file
+}
Modified: jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/SynchronousPropertyIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/SynchronousPropertyIndexTest.java?rev=1846026&r1=1846025&r2=1846026&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/SynchronousPropertyIndexTest.java (original)
+++ jackrabbit/oak/branches/1.8/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/SynchronousPropertyIndexTest.java Wed Nov 7 14:14:25 2018
@@ -29,9 +29,6 @@ import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.InitialContent;
@@ -78,6 +75,8 @@ import org.apache.jackrabbit.oak.spi.whi
import org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils;
import org.apache.jackrabbit.oak.stats.Clock;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -517,10 +516,10 @@ public class SynchronousPropertyIndexTes
private static class DelayingIndexEditor implements IndexEditorProvider {
private Semaphore semaphore;
- @CheckForNull
+ @Nullable
@Override
- public Editor getIndexEditor(@Nonnull String type, @Nonnull NodeBuilder definition,
- @Nonnull NodeState root, @Nonnull IndexUpdateCallback callback)
+ public Editor getIndexEditor(@NotNull String type, @NotNull NodeBuilder definition,
+ @NotNull NodeState root, @NotNull IndexUpdateCallback callback)
throws CommitFailedException {
ContextAwareCallback ccb = (ContextAwareCallback) callback;
if (semaphore != null && ccb.getIndexingContext().isAsync()) {