svn commit: r1836189 - in /jackrabbit/oak/trunk/oak-search-mt: ./ src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/

[reschke]

Author: reschke
Date: Wed Jul 18 14:54:30 2018
New Revision: 1836189

URL: http://svn.apache.org/viewvc?rev=1836189&view=rev
Log:
OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations 
instead - oak-search-mt

Modified:
    jackrabbit/oak/trunk/oak-search-mt/pom.xml
    
jackrabbit/oak/trunk/oak-search-mt/src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/MTFulltextQueryTermsProvider.java
    
jackrabbit/oak/trunk/oak-search-mt/src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/MTFulltextQueryTermsProviderFactory.java

Modified: jackrabbit/oak/trunk/oak-search-mt/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-mt/pom.xml?rev=1836189&r1=1836188&r2=1836189&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-mt/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-search-mt/pom.xml Wed Jul 18 14:54:30 2018
@@ -137,10 +137,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-mt/src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/MTFulltextQueryTermsProvider.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-mt/src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/MTFulltextQueryTermsProvider.java?rev=1836189&r1=1836188&r2=1836189&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-search-mt/src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/MTFulltextQueryTermsProvider.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-search-mt/src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/MTFulltextQueryTermsProvider.java
 Wed Jul 18 14:54:30 2018
@@ -22,8 +22,6 @@ import java.io.StringReader;
 import java.util.List;
 import java.util.Set;
 
-import javax.annotation.Nonnull;
-
 import org.apache.jackrabbit.oak.plugins.index.lucene.FieldNames;
 import org.apache.jackrabbit.oak.plugins.index.lucene.OakAnalyzer;
 import 
org.apache.jackrabbit.oak.plugins.index.lucene.spi.FulltextQueryTermsProvider;
@@ -42,6 +40,7 @@ import org.apache.lucene.search.BooleanQ
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.util.Version;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -135,7 +134,7 @@ public class MTFulltextQueryTermsProvide
         decoder.cleanUp();
     }
 
-    @Nonnull
+    @NotNull
     @Override
     public Set<String> getSupportedTypes() {
         return nodeTypes;

Modified: 
jackrabbit/oak/trunk/oak-search-mt/src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/MTFulltextQueryTermsProviderFactory.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-mt/src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/MTFulltextQueryTermsProviderFactory.java?rev=1836189&r1=1836188&r2=1836189&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-search-mt/src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/MTFulltextQueryTermsProviderFactory.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-search-mt/src/main/java/org/apache/jackrabbit/oak/plugins/index/mt/MTFulltextQueryTermsProviderFactory.java
 Wed Jul 18 14:54:30 2018
@@ -18,14 +18,12 @@
  */
 package org.apache.jackrabbit.oak.plugins.index.mt;
 
-import javax.annotation.Nonnull;
 import java.io.File;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.ConfigurationPolicy;
@@ -39,6 +37,7 @@ import org.apache.joshua.decoder.Decoder
 import org.apache.joshua.decoder.JoshuaConfiguration;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.search.Query;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -114,7 +113,7 @@ public class MTFulltextQueryTermsProvide
         }
     }
 
-    @Nonnull
+    @NotNull
     @Override
     public Set<String> getSupportedTypes() {
         if (queryTermsProvider != null) {