Author: reschke
Date: Wed Jul 18 14:53:34 2018
New Revision: 1836188
URL: http://svn.apache.org/viewvc?rev=1836188&view=rev
Log:
OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations
instead - oak-search
Modified:
jackrabbit/oak/trunk/oak-search/pom.xml
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/Aggregate.java
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/IndexDefinition.java
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/PropertyDefinition.java
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/PropertyUpdateCallback.java
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextBinaryTextExtractor.java
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextDocumentMaker.java
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextIndexEditorContext.java
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexTracker.java
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/IndexNodeManager.java
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/util/ConfigUtil.java
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/util/IndexHelper.java
jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/search/TestUtil.java
Modified: jackrabbit/oak/trunk/oak-search/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/pom.xml?rev=1836188&r1=1836187&r2=1836188&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-search/pom.xml Wed Jul 18 14:53:34 2018
@@ -125,10 +125,10 @@
<scope>provided</scope>
</dependency>
- <!-- Findbugs annotations -->
+ <!-- Nullability annotations -->
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
<scope>provided</scope>
</dependency>
Modified:
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/Aggregate.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/Aggregate.java?rev=1836188&r1=1836187&r2=1836188&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/Aggregate.java
(original)
+++
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/Aggregate.java
Wed Jul 18 14:53:34 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;
@@ -216,7 +215,7 @@ public class Aggregate {
}
public static interface AggregateMapper {
- @CheckForNull
+ @Nullable
Aggregate getAggregate(String nodeTypeName);
}
@@ -255,7 +254,7 @@ public class Aggregate {
public abstract boolean aggregatesProperty(String name);
- @CheckForNull
+ @Nullable
public Aggregate getAggregate(NodeState matchedNodeState) {
return null;
}
Modified:
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java?rev=1836188&r1=1836187&r2=1836188&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java
(original)
+++
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java
Wed Jul 18 14:53:34 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;
@@ -50,6 +47,8 @@ import org.apache.jackrabbit.oak.plugins
import
org.apache.jackrabbit.oak.plugins.index.fulltext.ExtractedText.ExtractionResult;
import
org.apache.jackrabbit.oak.plugins.index.fulltext.PreExtractedTextProvider;
import
org.apache.jackrabbit.oak.plugins.index.search.spi.editor.FulltextIndexEditor;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -115,7 +114,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
@@ -144,7 +143,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
@@ -154,7 +153,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;
}
@@ -229,7 +228,7 @@ public class ExtractedTextCache {
};
}
- @CheckForNull
+ @Nullable
public CacheStats getCacheStats() {
return cacheStats;
}
@@ -259,7 +258,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
}
@@ -342,7 +341,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-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/IndexDefinition.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/IndexDefinition.java?rev=1836188&r1=1836187&r2=1836188&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/IndexDefinition.java
(original)
+++
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/IndexDefinition.java
Wed Jul 18 14:53:34 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;
@@ -62,6 +59,8 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
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;
@@ -514,7 +513,7 @@ public final class IndexDefinition imple
return queryPaths;
}
- @CheckForNull
+ @Nullable
public String getUniqueId() {
return uid;
}
@@ -586,7 +585,7 @@ public final class IndexDefinition imple
//~---------------------------------------------------< Aggregates >
- @CheckForNull
+ @Nullable
public Aggregate getAggregate(String nodeType){
Aggregate agg = aggregates.get(nodeType);
return agg != null ? agg : null;
@@ -631,7 +630,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
@@ -661,7 +660,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
@@ -1022,7 +1021,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) {
@@ -1533,7 +1532,7 @@ public final class IndexDefinition imple
return TreeUtil.getTree(root,NODE_TYPES_PATH);
}
- @Nonnull
+ @NotNull
@Override
protected NamePathMapper getNamePathMapper() {
return NamePathMapper.DEFAULT;
@@ -1685,7 +1684,7 @@ public final class IndexDefinition imple
return defn.getChildNode(FulltextIndexConstants.INDEX_RULES).exists();
}
- @CheckForNull
+ @Nullable
private static String determineUniqueId(NodeState defn) {
return defn.getChildNode(STATUS_NODE).getString(PROP_UID);
}
Modified:
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/PropertyDefinition.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/PropertyDefinition.java?rev=1836188&r1=1836187&r2=1836188&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/PropertyDefinition.java
(original)
+++
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/PropertyDefinition.java
Wed Jul 18 14:53:34 2018
@@ -19,7 +19,6 @@
package org.apache.jackrabbit.oak.plugins.index.search;
-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.property.ValuePattern;
import org.apache.jackrabbit.oak.plugins.index.search.util.IndexHelper;
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
public final String nonRelativeName;
/**
Modified:
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/PropertyUpdateCallback.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/PropertyUpdateCallback.java?rev=1836188&r1=1836187&r2=1836188&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/PropertyUpdateCallback.java
(original)
+++
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/PropertyUpdateCallback.java
Wed Jul 18 14:53:34 2018
@@ -19,10 +19,9 @@
package org.apache.jackrabbit.oak.plugins.index.search;
-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-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextBinaryTextExtractor.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextBinaryTextExtractor.java?rev=1836188&r1=1836187&r2=1836188&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextBinaryTextExtractor.java
(original)
+++
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextBinaryTextExtractor.java
Wed Jul 18 14:53:34 2018
@@ -28,8 +28,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;
@@ -49,6 +47,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-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextDocumentMaker.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextDocumentMaker.java?rev=1836188&r1=1836187&r2=1836188&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextDocumentMaker.java
(original)
+++
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextDocumentMaker.java
Wed Jul 18 14:53:34 2018
@@ -26,13 +26,13 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.annotation.CheckForNull;
import javax.jcr.PropertyType;
import com.google.common.collect.Iterables;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.jetbrains.annotations.Nullable;
import org.apache.jackrabbit.oak.plugins.index.search.Aggregate;
import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition;
@@ -95,12 +95,12 @@ public abstract class FulltextDocumentMa
protected abstract boolean indexNodeName(D doc, String value);
- @CheckForNull
+ @Nullable
public D makeDocument(NodeState state) throws IOException {
return makeDocument(state, false,
Collections.<PropertyState>emptyList());
}
- @CheckForNull
+ @Nullable
public D makeDocument(NodeState state, boolean isUpdate,
List<PropertyState> propertiesModified) throws IOException {
boolean facet = false;
Modified:
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextIndexEditorContext.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextIndexEditorContext.java?rev=1836188&r1=1836187&r2=1836188&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextIndexEditorContext.java
(original)
+++
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/editor/FulltextIndexEditorContext.java
Wed Jul 18 14:53:34 2018
@@ -21,9 +21,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;
@@ -41,6 +38,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeStateUtils;
import org.apache.jackrabbit.oak.stats.Clock;
import org.apache.jackrabbit.util.ISO8601;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -133,7 +131,7 @@ public abstract class FulltextIndexEdito
return indexingContext;
}
- @CheckForNull
+ @Nullable
public PropertyUpdateCallback getPropertyUpdateCallback() {
return propertyUpdateCallback;
}
Modified:
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java?rev=1836188&r1=1836187&r2=1836188&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java
(original)
+++
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexPlanner.java
Wed Jul 18 14:53:34 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;
@@ -53,6 +51,7 @@ import org.apache.jackrabbit.oak.spi.que
import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextExpression;
import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextTerm;
import org.apache.jackrabbit.oak.spi.query.fulltext.FullTextVisitor;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -617,7 +616,7 @@ public class FulltextIndexPlanner {
return indexedProps;
}
- @CheckForNull
+ @Nullable
private static PropertyDefinition getSimpleProperty(IndexingRule
indexingRule, String relativePropertyName) {
String name = PathUtils.getName(relativePropertyName);
if (name.equals(relativePropertyName)){
@@ -839,7 +838,7 @@ public class FulltextIndexPlanner {
return orderEntries;
}
- @CheckForNull
+ @Nullable
private IndexDefinition.IndexingRule getApplicableRule() {
if (filter.matchesAllTypes()){
return definition.getApplicableIndexingRule(JcrConstants.NT_BASE);
@@ -983,7 +982,7 @@ public class FulltextIndexPlanner {
* @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
@@ -1011,7 +1010,7 @@ public class FulltextIndexPlanner {
public boolean evaluateNodeNameRestriction() {return
nodeNameRestriction;}
- @CheckForNull
+ @Nullable
public PropertyIndexResult getPropertyIndexResult() {
return propertyIndexResult;
}
Modified:
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexTracker.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexTracker.java?rev=1836188&r1=1836187&r2=1836188&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexTracker.java
(original)
+++
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/FulltextIndexTracker.java
Wed Jul 18 14:53:34 2018
@@ -21,8 +21,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.annotation.CheckForNull;
-
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
@@ -40,6 +38,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.SubtreeEditor;
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;
@@ -183,7 +182,7 @@ public abstract class FulltextIndexTrack
}
}
- @CheckForNull
+ @Nullable
public IndexDefinition getIndexDefinition(String indexPath){
IndexNodeManager node = indices.get(indexPath);
if (node != null){
Modified:
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/IndexNodeManager.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/IndexNodeManager.java?rev=1836188&r1=1836187&r2=1836188&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/IndexNodeManager.java
(original)
+++
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/spi/query/IndexNodeManager.java
Wed Jul 18 14:53:34 2018
@@ -22,13 +22,12 @@ import java.util.concurrent.atomic.Atomi
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import javax.annotation.CheckForNull;
-
import org.apache.jackrabbit.oak.commons.PerfLogger;
import org.apache.jackrabbit.oak.plugins.index.search.IndexDefinition;
import org.apache.jackrabbit.oak.plugins.index.search.IndexNode;
import org.apache.jackrabbit.oak.plugins.index.search.ReaderRefreshPolicy;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -99,7 +98,7 @@ public abstract class IndexNodeManager {
private boolean closed = false;
- @CheckForNull
+ @Nullable
IndexNode acquire() {
lock.readLock().lock();
if (closed) {
Modified:
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/util/ConfigUtil.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/util/ConfigUtil.java?rev=1836188&r1=1836187&r2=1836188&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/util/ConfigUtil.java
(original)
+++
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/util/ConfigUtil.java
Wed Jul 18 14:53:34 2018
@@ -21,14 +21,13 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Collections;
-import javax.annotation.CheckForNull;
-
import com.google.common.primitives.Ints;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.Nullable;
import static com.google.common.base.Preconditions.checkArgument;
@@ -76,7 +75,7 @@ public class ConfigUtil {
* Assumes that given state is of type nt:file and then reads
* the jcr:content/@jcr:data property to get the binary content
*/
- @CheckForNull
+ @Nullable
public static Blob getBlob(NodeState state, String resourceName){
NodeState contentNode = state.getChildNode(JcrConstants.JCR_CONTENT);
checkArgument(contentNode.exists(), "Was expecting to find jcr:content
node to read resource %s", resourceName);
Modified:
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/util/IndexHelper.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/util/IndexHelper.java?rev=1836188&r1=1836187&r2=1836188&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/util/IndexHelper.java
(original)
+++
jackrabbit/oak/trunk/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/util/IndexHelper.java
Wed Jul 18 14:53:34 2018
@@ -18,12 +18,11 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Set;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.jackrabbit.oak.plugins.index.search.FulltextIndexConstants;
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;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.collect.ImmutableSet.of;
@@ -70,13 +69,13 @@ public class IndexHelper {
}
public static NodeBuilder newFTIndexDefinition(
- @Nonnull NodeBuilder index, @Nonnull String name, String type,
+ @NotNull NodeBuilder index, @NotNull String name, String type,
@Nullable Set<String> propertyTypes) {
return newFTIndexDefinition(index, name, type, propertyTypes, null,
null, null);
}
public static NodeBuilder newFTIndexDefinition(
- @Nonnull NodeBuilder index, @Nonnull String name, String type,
+ @NotNull NodeBuilder index, @NotNull String name, String type,
@Nullable Set<String> propertyTypes,
@Nullable Set<String> excludes, @Nullable String async) {
return newFTIndexDefinition(index, type, name, propertyTypes, excludes,
@@ -84,7 +83,7 @@ public class IndexHelper {
}
public static NodeBuilder newFTIndexDefinition(
- @Nonnull NodeBuilder index, @Nonnull String name, String type,
+ @NotNull NodeBuilder index, @NotNull String name, String type,
@Nullable Set<String> propertyTypes,
@Nullable Set<String> excludes, @Nullable String async,
@Nullable Boolean stored) {
@@ -113,16 +112,16 @@ public class IndexHelper {
}
public static NodeBuilder newFTFileIndexDefinition(
- @Nonnull NodeBuilder index, @Nonnull String name, String type,
- @Nullable Set<String> propertyTypes, @Nonnull String path) {
+ @NotNull NodeBuilder index, @NotNull String name, String type,
+ @Nullable Set<String> propertyTypes, @NotNull String path) {
return newFTFileIndexDefinition(index, type, name, propertyTypes, null,
path, null);
}
public static NodeBuilder newFTFileIndexDefinition(
- @Nonnull NodeBuilder index, @Nonnull String name, String type,
+ @NotNull NodeBuilder index, @NotNull String name, String type,
@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);
@@ -148,9 +147,9 @@ public class IndexHelper {
}
public static NodeBuilder newFTPropertyIndexDefinition(
- @Nonnull NodeBuilder index, @Nonnull String name, String type,
- @Nonnull Set<String> includes,
- @Nonnull String async) {
+ @NotNull NodeBuilder index, @NotNull String name, String type,
+ @NotNull Set<String> includes,
+ @NotNull String async) {
checkArgument(!includes.isEmpty(), "Fulltext property index " +
"requires explicit list of property names to be indexed");
Modified:
jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/search/TestUtil.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/search/TestUtil.java?rev=1836188&r1=1836187&r2=1836188&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/search/TestUtil.java
(original)
+++
jackrabbit/oak/trunk/oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/search/TestUtil.java
Wed Jul 18 14:53:34 2018
@@ -23,8 +23,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;
@@ -56,6 +54,8 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
+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;
@@ -90,7 +90,7 @@ public class TestUtil {
}
public static NodeBuilder newFTIndexDefinitionV2(
- @Nonnull NodeBuilder index, @Nonnull String name, String type,
+ @NotNull NodeBuilder index, @NotNull String name, String type,
@Nullable Set<String> propertyTypes) {
NodeBuilder nb = IndexHelper.newFTIndexDefinition(index, name, type,
propertyTypes, null, null, null);
useV2(nb);
