Author: reschke
Date: Wed Jul 18 15:03:44 2018
New Revision: 1836192
URL: http://svn.apache.org/viewvc?rev=1836192&view=rev
Log:
OAK-7511: get rid of JSR 305 dependency - use jetbrains nullability annotations
instead - oak-solr-core
Modified:
jackrabbit/oak/trunk/oak-solr-core/pom.xml
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfigurationProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServerConfigurationProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServersObserver.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/RemoteSolrServerConfigurationProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrIndexEditorProviderService.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrServerProviderService.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/DefaultSolrServerProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerProvider.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerRegistry.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/util/SolrIndexInitializer.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorTest.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexLookupTest.java
Modified: jackrabbit/oak/trunk/oak-solr-core/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/pom.xml?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-solr-core/pom.xml Wed Jul 18 15:03:44 2018
@@ -207,8 +207,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfiguration.java
Wed Jul 18 15:03:44 2018
@@ -18,11 +18,10 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Collection;
import java.util.Collections;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.spi.query.Filter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* Default {@link
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration}
@@ -37,13 +36,13 @@ public class DefaultSolrConfiguration im
return null;
}
- @Nonnull
+ @NotNull
@Override
public String getPathField() {
return OakSolrConfigurationDefaults.PATH_FIELD_NAME;
}
- @CheckForNull
+ @Nullable
@Override
public String getFieldForPathRestriction(Filter.PathRestriction
pathRestriction) {
String fieldName = null;
@@ -78,7 +77,7 @@ public class DefaultSolrConfiguration im
return null;
}
- @Nonnull
+ @NotNull
@Override
public CommitPolicy getCommitPolicy() {
return CommitPolicy.SOFT;
@@ -109,13 +108,13 @@ public class DefaultSolrConfiguration im
return OakSolrConfigurationDefaults.PATH_RESTRICTIONS;
}
- @Nonnull
+ @NotNull
@Override
public Collection<String> getIgnoredProperties() {
return ignoredProperties;
}
- @Nonnull
+ @NotNull
@Override
public Collection<String> getUsedProperties() {
return usedProperties;
@@ -126,7 +125,7 @@ public class DefaultSolrConfiguration im
return OakSolrConfigurationDefaults.COLLAPSE_JCR_CONTENT_NODES;
}
- @Nonnull
+ @NotNull
@Override
public String getCollapsedPathField() {
return OakSolrConfigurationDefaults.COLLAPSED_PATH_FIELD;
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfigurationProvider.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfigurationProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultSolrConfigurationProvider.java
Wed Jul 18 15:03:44 2018
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.configuration;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
/**
* The default {@link
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationProvider}
@@ -33,7 +33,7 @@ public class DefaultSolrConfigurationPro
this.defaultConfiguration = configuration;
}
- @Nonnull
+ @NotNull
@Override
public OakSolrConfiguration getConfiguration() {
return defaultConfiguration;
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfiguration.java
Wed Jul 18 15:03:44 2018
@@ -17,11 +17,10 @@
package org.apache.jackrabbit.oak.plugins.index.solr.configuration;
import java.util.Collection;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.spi.query.Filter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* A Solr configuration holding all the possible customizable parameters that
@@ -36,7 +35,7 @@ public interface OakSolrConfiguration {
* @return the name of the Solr field to be used for the given {@link
org.apache.jackrabbit.oak.api.Type}, or {@code null}
* if no specific field has been configured to handle the given {@code
Type}.
*/
- @CheckForNull
+ @Nullable
String getFieldNameFor(Type<?> propertyType);
/**
@@ -44,7 +43,7 @@ public interface OakSolrConfiguration {
*
* @return the name of the Solr field to be used for indexing and
searching on paths (exact matching).
*/
- @Nonnull
+ @NotNull
String getPathField();
/**
@@ -54,7 +53,7 @@ public interface OakSolrConfiguration {
* search results or {@code null} if no specific
field has been configured for it.
* @return the name of the Solr field to be used for the given {@code
PathRestriction}.
*/
- @CheckForNull
+ @Nullable
String getFieldForPathRestriction(Filter.PathRestriction pathRestriction);
/**
@@ -64,7 +63,7 @@ public interface OakSolrConfiguration {
* @return the name of the Solr field to be used for the given {@code
PropertyRestriction} or {@code null} if no specific field
* has been configured for it.
*/
- @CheckForNull
+ @Nullable
String getFieldForPropertyRestriction(Filter.PropertyRestriction
propertyRestriction);
/**
@@ -72,7 +71,7 @@ public interface OakSolrConfiguration {
*
* @return a {@link
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration.CommitPolicy}
*/
- @Nonnull
+ @NotNull
CommitPolicy getCommitPolicy();
/**
@@ -81,7 +80,7 @@ public interface OakSolrConfiguration {
* @return the name of the Solr field to be used as "catch all" field, or
{@code null} if no specific field
* has been configured for it.
*/
- @CheckForNull
+ @Nullable
String getCatchAllField();
/**
@@ -120,7 +119,7 @@ public interface OakSolrConfiguration {
*
* @return a {@link java.util.Collection} of property names for properties
to be ignored
*/
- @Nonnull
+ @NotNull
Collection<String> getIgnoredProperties();
/**
@@ -128,7 +127,7 @@ public interface OakSolrConfiguration {
*
* @return a {@link java.util.Collection} of property names for properties
to be ignored
*/
- @Nonnull
+ @NotNull
Collection<String> getUsedProperties();
/**
@@ -147,7 +146,7 @@ public interface OakSolrConfiguration {
*
* @return the name of the Solr field to be used for indexing and
searching on collapsed paths.
*/
- @Nonnull
+ @NotNull
String getCollapsedPathField();
/**
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationProvider.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrConfigurationProvider.java
Wed Jul 18 15:03:44 2018
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.configuration;
-import javax.annotation.Nonnull;
+import org.jetbrains.annotations.NotNull;
/**
* A provider for {@link
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration}s
@@ -28,6 +28,6 @@ public interface OakSolrConfigurationPro
*
* @return a {@link
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration}
*/
- @Nonnull
+ @NotNull
OakSolrConfiguration getConfiguration();
}
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationProvider.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfigurationProvider.java
Wed Jul 18 15:03:44 2018
@@ -16,9 +16,8 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.configuration;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider;
+import org.jetbrains.annotations.NotNull;
/**
* {@link org.apache.solr.client.solrj.SolrClient} configuration provider.
@@ -31,6 +30,6 @@ public interface SolrServerConfiguration
*
* @return the {@link
org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfiguration}
holding the configuration parameters
*/
- @Nonnull
+ @NotNull
SolrServerConfiguration<S> getSolrServerConfiguration();
}
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServerConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServerConfigurationProvider.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServerConfigurationProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServerConfigurationProvider.java
Wed Jul 18 15:03:44 2018
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.configuration.nodestate;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.EmbeddedSolrServerConfiguration;
@@ -27,6 +25,7 @@ import org.apache.jackrabbit.oak.plugins
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfigurationProvider;
import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
public class NodeStateSolrServerConfigurationProvider implements
SolrServerConfigurationProvider {
@@ -57,7 +56,7 @@ public class NodeStateSolrServerConfigur
return value;
}
- @Nonnull
+ @NotNull
@Override
public SolrServerConfiguration<SolrServerProvider>
getSolrServerConfiguration() {
String type = getStringValueFor(Properties.SERVER_TYPE, null);
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServersObserver.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServersObserver.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServersObserver.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServersObserver.java
Wed Jul 18 15:03:44 2018
@@ -16,14 +16,13 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.configuration.nodestate;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.plugins.index.solr.server.OakSolrServer;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.DiffObserver;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,7 +36,7 @@ public class NodeStateSolrServersObserve
private final Logger log = LoggerFactory.getLogger(getClass());
@Override
- protected NodeStateDiff getRootDiff(@Nonnull NodeState before, @Nonnull
NodeState after, @Nonnull CommitInfo info) {
+ protected NodeStateDiff getRootDiff(@NotNull NodeState before, @NotNull
NodeState after, @NotNull CommitInfo info) {
return new ChangingSolrServersNodeStateDiff(after);
}
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
Wed Jul 18 15:03:44 2018
@@ -19,9 +19,6 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import com.google.common.collect.Iterables;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
@@ -30,6 +27,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.solr.query.SolrQueryIndex;
import org.apache.jackrabbit.oak.spi.query.Filter;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* An {@link OakSolrConfiguration} specified via a given {@link
org.apache.jackrabbit.oak.spi.state.NodeState}.
@@ -64,13 +63,13 @@ public class OakSolrNodeStateConfigurati
return null;
}
- @Nonnull
+ @NotNull
@Override
public String getPathField() {
return getStringValueFor(Properties.PATH_FIELD,
OakSolrConfigurationDefaults.PATH_FIELD_NAME);
}
- @CheckForNull
+ @Nullable
@Override
public String getFieldForPathRestriction(Filter.PathRestriction
pathRestriction) {
String fieldName = null;
@@ -121,7 +120,7 @@ public class OakSolrNodeStateConfigurati
return null;
}
- @Nonnull
+ @NotNull
@Override
public CommitPolicy getCommitPolicy() {
return
CommitPolicy.valueOf(getStringValueFor(Properties.COMMIT_POLICY,
CommitPolicy.SOFT.toString()).toUpperCase());
@@ -147,7 +146,7 @@ public class OakSolrNodeStateConfigurati
return getBooleanValueFor(Properties.PATH_RESTRICTIONS,
OakSolrConfigurationDefaults.PATH_RESTRICTIONS);
}
- @Nonnull
+ @NotNull
@Override
public Collection<String> getIgnoredProperties() {
Collection<String> ignoredProperties;
@@ -163,7 +162,7 @@ public class OakSolrNodeStateConfigurati
return ignoredProperties;
}
- @Nonnull
+ @NotNull
@Override
public Collection<String> getUsedProperties() {
Collection<String> usedProperties;
@@ -184,13 +183,13 @@ public class OakSolrNodeStateConfigurati
return getBooleanValueFor(Properties.COLLAPSE_JCR_CONTENT_NODES,
OakSolrConfigurationDefaults.COLLAPSE_JCR_CONTENT_NODES);
}
- @Nonnull
+ @NotNull
@Override
public String getCollapsedPathField() {
return getStringValueFor(Properties.COLLAPSED_PATH_FIELD,
OakSolrConfigurationDefaults.COLLAPSED_PATH_FIELD);
}
- @Nonnull
+ @NotNull
@Override
public String getPathDepthField() {
return getStringValueFor(Properties.DEPTH_FIELD,
OakSolrConfigurationDefaults.PATH_DEPTH_FIELD);
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorProvider.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorProvider.java
Wed Jul 18 15:03:44 2018
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.index;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.plugins.index.IndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.IndexUpdateCallback;
@@ -34,6 +32,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrServer;
+import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,15 +50,15 @@ public class SolrIndexEditorProvider imp
private final OakSolrConfigurationProvider oakSolrConfigurationProvider;
public SolrIndexEditorProvider(
- @Nonnull SolrServerProvider solrServerProvider,
- @Nonnull OakSolrConfigurationProvider
oakSolrConfigurationProvider) {
+ @NotNull SolrServerProvider solrServerProvider,
+ @NotNull OakSolrConfigurationProvider
oakSolrConfigurationProvider) {
this.solrServerProvider = solrServerProvider;
this.oakSolrConfigurationProvider = oakSolrConfigurationProvider;
}
@Override
public Editor getIndexEditor(
- @Nonnull String type, @Nonnull NodeBuilder definition, @Nonnull
NodeState root, @Nonnull IndexUpdateCallback callback)
+ @NotNull String type, @NotNull NodeBuilder definition, @NotNull
NodeState root, @NotNull IndexUpdateCallback callback)
throws CommitFailedException {
SolrIndexEditor editor = null;
if (SolrQueryIndex.TYPE.equals(type)) {
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/EmbeddedSolrServerConfigurationProvider.java
Wed Jul 18 15:03:44 2018
@@ -17,8 +17,6 @@
package org.apache.jackrabbit.oak.plugins.index.solr.osgi;
import java.io.File;
-import javax.annotation.Nonnull;
-
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
@@ -29,6 +27,7 @@ import org.apache.jackrabbit.oak.plugins
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfigurationDefaults;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfigurationProvider;
import
org.apache.jackrabbit.oak.plugins.index.solr.server.EmbeddedSolrServerProvider;
+import org.jetbrains.annotations.NotNull;
import org.osgi.service.component.ComponentContext;
/**
@@ -70,7 +69,7 @@ public class EmbeddedSolrServerConfigura
solrCoreName = null;
}
- @Nonnull
+ @NotNull
@Override
public SolrServerConfiguration<EmbeddedSolrServerProvider>
getSolrServerConfiguration() {
return solrServerConfiguration;
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/OakSolrConfigurationProviderService.java
Wed Jul 18 15:03:44 2018
@@ -19,9 +19,6 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
@@ -35,6 +32,8 @@ import org.apache.jackrabbit.oak.plugins
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationDefaults;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationProvider;
import org.apache.jackrabbit.oak.spi.query.Filter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import org.osgi.service.component.ComponentContext;
/**
@@ -157,7 +156,7 @@ public class OakSolrConfigurationProvide
oakSolrConfiguration = null;
}
- @Nonnull
+ @NotNull
@Override
public OakSolrConfiguration getConfiguration() {
if (oakSolrConfiguration == null) {
@@ -190,13 +189,13 @@ public class OakSolrConfigurationProvide
return null;
}
- @Nonnull
+ @NotNull
@Override
public String getPathField() {
return pathExactFieldName;
}
- @CheckForNull
+ @Nullable
@Override
public String
getFieldForPathRestriction(Filter.PathRestriction pathRestriction) {
String fieldName = null;
@@ -226,7 +225,7 @@ public class OakSolrConfigurationProvide
return fieldName;
}
- @Nonnull
+ @NotNull
@Override
public CommitPolicy getCommitPolicy() {
return commitPolicy;
@@ -257,7 +256,7 @@ public class OakSolrConfigurationProvide
return useForPathRestrictions;
}
- @Nonnull
+ @NotNull
@Override
public Collection<String> getIgnoredProperties() {
if (ignoredProperties != null && ignoredProperties.length
> 0 && ignoredProperties[0].length() > 0) {
@@ -267,7 +266,7 @@ public class OakSolrConfigurationProvide
}
}
- @Nonnull
+ @NotNull
@Override
public Collection<String> getUsedProperties() {
if (usedProperties != null && usedProperties.length > 0 &&
usedProperties[0].length() > 0) {
@@ -282,7 +281,7 @@ public class OakSolrConfigurationProvide
return collapseJcrContentNodes;
}
- @Nonnull
+ @NotNull
@Override
public String getCollapsedPathField() {
return collapsedPathField;
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/RemoteSolrServerConfigurationProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/RemoteSolrServerConfigurationProvider.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/RemoteSolrServerConfigurationProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/RemoteSolrServerConfigurationProvider.java
Wed Jul 18 15:03:44 2018
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.osgi;
-import javax.annotation.Nonnull;
-
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
@@ -28,6 +26,7 @@ import org.apache.jackrabbit.oak.plugins
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfigurationDefaults;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfigurationProvider;
import
org.apache.jackrabbit.oak.plugins.index.solr.server.RemoteSolrServerProvider;
+import org.jetbrains.annotations.NotNull;
import org.osgi.service.component.ComponentContext;
/**
@@ -95,7 +94,7 @@ public class RemoteSolrServerConfigurati
}
- @Nonnull
+ @NotNull
@Override
public SolrServerConfiguration<RemoteSolrServerProvider>
getSolrServerConfiguration() {
return remoteSolrServerConfiguration;
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrIndexEditorProviderService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrIndexEditorProviderService.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrIndexEditorProviderService.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrIndexEditorProviderService.java
Wed Jul 18 15:03:44 2018
@@ -16,9 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.osgi;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
@@ -31,6 +28,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.spi.commit.Editor;
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;
/**
* Osgi Service that provides Solr based {@link
org.apache.jackrabbit.oak.plugins.index.IndexEditor}s
@@ -49,9 +48,9 @@ public class SolrIndexEditorProviderServ
private OakSolrConfigurationProvider oakSolrConfigurationProvider;
@Override
- @CheckForNull
- public Editor getIndexEditor(@Nonnull String type, @Nonnull NodeBuilder
definition,
- @Nonnull NodeState root, @Nonnull
IndexUpdateCallback callback) throws CommitFailedException {
+ @Nullable
+ public Editor getIndexEditor(@NotNull String type, @NotNull NodeBuilder
definition,
+ @NotNull NodeState root, @NotNull
IndexUpdateCallback callback) throws CommitFailedException {
if (solrServerProvider != null && oakSolrConfigurationProvider !=
null) {
return new SolrIndexEditorProvider(solrServerProvider,
oakSolrConfigurationProvider).getIndexEditor(type,
definition, root, callback);
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrServerProviderService.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrServerProviderService.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrServerProviderService.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/osgi/SolrServerProviderService.java
Wed Jul 18 15:03:44 2018
@@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.plugin
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.CheckForNull;
-
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
@@ -35,6 +33,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.solr.server.OakSolrServer;
import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider;
import org.apache.solr.client.solrj.SolrClient;
+import org.jetbrains.annotations.Nullable;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -138,7 +137,7 @@ public class SolrServerProviderService i
}
}
- @CheckForNull
+ @Nullable
@Override
public SolrClient getSolrServer() throws Exception {
synchronized (solrServerConfigurationProviders) {
@@ -149,13 +148,13 @@ public class SolrServerProviderService i
}
}
- @CheckForNull
+ @Nullable
@Override
public SolrClient getIndexingSolrServer() throws Exception {
return getSolrServer();
}
- @CheckForNull
+ @Nullable
@Override
public SolrClient getSearchingSolrServer() throws Exception {
return getSolrServer();
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
Wed Jul 18 15:03:44 2018
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.query;
-import javax.annotation.CheckForNull;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
@@ -29,7 +28,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
-
import com.google.common.collect.AbstractIterator;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
@@ -70,6 +68,7 @@ import org.apache.solr.common.SolrDocume
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -818,7 +817,7 @@ public class SolrQueryIndex implements F
}
@Override
- @CheckForNull
+ @Nullable
public NodeAggregator getNodeAggregator() {
return aggregator;
}
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java
Wed Jul 18 15:03:44 2018
@@ -16,16 +16,15 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.query;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import java.util.List;
-
import com.google.common.collect.ImmutableList;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationProvider;
import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider;
import org.apache.jackrabbit.oak.spi.query.QueryIndex;
import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* {@link QueryIndexProvider} for {@link SolrQueryIndex}
@@ -38,18 +37,18 @@ public class SolrQueryIndexProvider impl
private final QueryIndex.NodeAggregator aggregator;
- public SolrQueryIndexProvider(@Nonnull SolrServerProvider
solrServerProvider, @Nonnull OakSolrConfigurationProvider
oakSolrConfigurationProvider,
+ public SolrQueryIndexProvider(@NotNull SolrServerProvider
solrServerProvider, @NotNull OakSolrConfigurationProvider
oakSolrConfigurationProvider,
@Nullable QueryIndex.NodeAggregator
nodeAggregator) {
this.oakSolrConfigurationProvider = oakSolrConfigurationProvider;
this.solrServerProvider = solrServerProvider;
this.aggregator = nodeAggregator;
}
- public SolrQueryIndexProvider(@Nonnull SolrServerProvider
solrServerProvider, @Nonnull OakSolrConfigurationProvider
oakSolrConfigurationProvider) {
+ public SolrQueryIndexProvider(@NotNull SolrServerProvider
solrServerProvider, @NotNull OakSolrConfigurationProvider
oakSolrConfigurationProvider) {
this(solrServerProvider, oakSolrConfigurationProvider, null);
}
- @Nonnull
+ @NotNull
@Override
public List<? extends QueryIndex> getQueryIndexes(NodeState nodeState) {
return ImmutableList.of(new SolrQueryIndex(aggregator,
oakSolrConfigurationProvider, solrServerProvider));
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/DefaultSolrServerProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/DefaultSolrServerProvider.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/DefaultSolrServerProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/DefaultSolrServerProvider.java
Wed Jul 18 15:03:44 2018
@@ -17,20 +17,19 @@
package org.apache.jackrabbit.oak.plugins.index.solr.server;
import java.io.IOException;
-import javax.annotation.CheckForNull;
-
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfigurationDefaults;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.impl.ConcurrentUpdateSolrServer;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
+import org.jetbrains.annotations.Nullable;
public class DefaultSolrServerProvider implements SolrServerProvider {
private SolrClient solrServer;
private SolrClient indexingSolrServer;
- @CheckForNull
+ @Nullable
@Override
public SolrClient getSolrServer() throws Exception {
if (solrServer == null) {
@@ -39,7 +38,7 @@ public class DefaultSolrServerProvider i
return solrServer;
}
- @CheckForNull
+ @Nullable
@Override
public SolrClient getIndexingSolrServer() throws Exception {
if (indexingSolrServer == null) {
@@ -48,7 +47,7 @@ public class DefaultSolrServerProvider i
return indexingSolrServer;
}
- @CheckForNull
+ @Nullable
@Override
public SolrClient getSearchingSolrServer() throws Exception {
return getSolrServer();
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/EmbeddedSolrServerProvider.java
Wed Jul 18 15:03:44 2018
@@ -16,14 +16,12 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.server;
-import javax.annotation.CheckForNull;
import java.io.File;
import java.io.FileOutputStream;
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
-
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.commons.IOUtils;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.EmbeddedSolrServerConfiguration;
@@ -33,6 +31,7 @@ import org.apache.solr.client.solrj.embe
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.core.CoreContainer;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -229,19 +228,19 @@ public class EmbeddedSolrServerProvider
}
- @CheckForNull
+ @Nullable
@Override
public SolrClient getSolrServer() throws Exception {
return createSolrServer();
}
- @CheckForNull
+ @Nullable
@Override
public SolrClient getIndexingSolrServer() throws Exception {
return getSolrServer();
}
- @CheckForNull
+ @Nullable
@Override
public SolrClient getSearchingSolrServer() throws Exception {
return getSolrServer();
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/OakSolrServer.java
Wed Jul 18 15:03:44 2018
@@ -16,9 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.server;
-import javax.annotation.Nonnull;
import java.io.IOException;
-
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.EmbeddedSolrServerConfiguration;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfiguration;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfigurationProvider;
@@ -28,6 +26,7 @@ import org.apache.solr.client.solrj.Solr
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.NamedList;
+import org.jetbrains.annotations.NotNull;
/**
* An Oak {@link org.apache.solr.client.solrj.SolrServer}, caching a {@link
org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider}
@@ -38,7 +37,7 @@ public class OakSolrServer extends SolrS
private final SolrServerConfiguration solrServerConfiguration;
private final SolrServerProvider solrServerProvider;
- public OakSolrServer(@Nonnull SolrServerConfigurationProvider
solrServerConfigurationProvider) {
+ public OakSolrServer(@NotNull SolrServerConfigurationProvider
solrServerConfigurationProvider) {
this.solrServerConfiguration =
solrServerConfigurationProvider.getSolrServerConfiguration();
try {
this.solrServerProvider = solrServerConfiguration.getProvider();
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProvider.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/RemoteSolrServerProvider.java
Wed Jul 18 15:03:44 2018
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.server;
-import javax.annotation.CheckForNull;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -39,6 +37,7 @@ import org.apache.solr.client.solrj.resp
import org.apache.solr.client.solrj.response.SolrPingResponse;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkStateReader;
+import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,7 +54,7 @@ public class RemoteSolrServerProvider im
this.remoteSolrServerConfiguration = remoteSolrServerConfiguration;
}
- @CheckForNull
+ @Nullable
@Override
public SolrClient getSolrServer() throws Exception {
@@ -82,7 +81,7 @@ public class RemoteSolrServerProvider im
return solrServer;
}
- @CheckForNull
+ @Nullable
@Override
public SolrClient getIndexingSolrServer() throws Exception {
SolrClient server = getSolrServer();
@@ -99,7 +98,7 @@ public class RemoteSolrServerProvider im
return server;
}
- @CheckForNull
+ @Nullable
@Override
public SolrClient getSearchingSolrServer() throws Exception {
return getSolrServer();
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerProvider.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerProvider.java
Wed Jul 18 15:03:44 2018
@@ -17,9 +17,8 @@
package org.apache.jackrabbit.oak.plugins.index.solr.server;
import java.io.Closeable;
-import javax.annotation.CheckForNull;
-
import org.apache.solr.client.solrj.SolrClient;
+import org.jetbrains.annotations.Nullable;
/**
* Provider of {@link org.apache.solr.client.solrj.SolrClient}s instances
@@ -33,7 +32,7 @@ public interface SolrServerProvider exte
* @return a {@link org.apache.solr.client.solrj.SolrClient} instance
* @throws Exception if anything goes wrong while initializing the {@link
org.apache.solr.client.solrj.SolrClient}
*/
- @CheckForNull
+ @Nullable
SolrClient getSolrServer() throws Exception;
/**
@@ -43,7 +42,7 @@ public interface SolrServerProvider exte
* @return a {@link org.apache.solr.client.solrj.SolrClient} instance
* @throws Exception if anything goes wrong while initializing the {@link
org.apache.solr.client.solrj.SolrClient}
*/
- @CheckForNull
+ @Nullable
SolrClient getIndexingSolrServer() throws Exception;
/**
@@ -53,6 +52,6 @@ public interface SolrServerProvider exte
* @return a {@link org.apache.solr.client.solrj.SolrClient} instance
* @throws Exception if anything goes wrong while initializing the {@link
org.apache.solr.client.solrj.SolrClient}
*/
- @CheckForNull
+ @Nullable
SolrClient getSearchingSolrServer() throws Exception;
}
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerRegistry.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerRegistry.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerRegistry.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/SolrServerRegistry.java
Wed Jul 18 15:03:44 2018
@@ -18,12 +18,11 @@ package org.apache.jackrabbit.oak.plugin
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
-
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfiguration;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrServer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
/**
* A registry for {@link org.apache.solr.client.solrj.SolrServer}s
@@ -33,8 +32,8 @@ public class SolrServerRegistry {
private static final Map<String, SolrClient> searchingServerRegistry = new
HashMap<String, SolrClient>();
private static final Map<String, SolrClient> indexingServerRegistry = new
HashMap<String, SolrClient>();
- public static void register(@Nonnull SolrServerConfiguration
configuration, @Nonnull SolrClient solrServer,
- @Nonnull Strategy strategy) {
+ public static void register(@NotNull SolrServerConfiguration
configuration, @NotNull SolrClient solrServer,
+ @NotNull Strategy strategy) {
switch (strategy) {
case INDEXING:
synchronized (indexingServerRegistry) {
@@ -49,8 +48,8 @@ public class SolrServerRegistry {
}
}
- @CheckForNull
- public static SolrClient get(@Nonnull SolrServerConfiguration
configuration, @Nonnull Strategy strategy) {
+ @Nullable
+ public static SolrClient get(@NotNull SolrServerConfiguration
configuration, @NotNull Strategy strategy) {
switch (strategy) {
case INDEXING:
synchronized (indexingServerRegistry) {
@@ -64,7 +63,7 @@ public class SolrServerRegistry {
return null;
}
- public static void unregister(SolrServerConfiguration configuration,
@Nonnull Strategy strategy) {
+ public static void unregister(SolrServerConfiguration configuration,
@NotNull Strategy strategy) {
switch (strategy) {
case INDEXING:
synchronized (indexingServerRegistry) {
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/util/SolrIndexInitializer.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/util/SolrIndexInitializer.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/util/SolrIndexInitializer.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/util/SolrIndexInitializer.java
Wed Jul 18 15:03:44 2018
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.util;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
@@ -25,6 +23,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
+import org.jetbrains.annotations.NotNull;
import static
org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_PROPERTY_NAME;
@@ -87,7 +86,7 @@ public class SolrIndexInitializer implem
}
@Override
- public void initialize(@Nonnull NodeBuilder builder) {
+ public void initialize(@NotNull NodeBuilder builder) {
if (builder.hasChildNode(IndexConstants.INDEX_DEFINITIONS_NAME)
&&
!builder.getChildNode(IndexConstants.INDEX_DEFINITIONS_NAME).hasChildNode(SOLR_IDX))
{
NodeBuilder indexDefinitionsNode =
builder.getChildNode(IndexConstants.INDEX_DEFINITIONS_NAME);
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java
Wed Jul 18 15:03:44 2018
@@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.jcr;
import java.io.File;
import java.io.IOException;
import java.util.Properties;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import
org.apache.jackrabbit.oak.plugins.index.aggregate.AggregateIndexProvider;
@@ -37,6 +35,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.solr.util.SolrIndexInitializer;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrServer;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import static org.junit.Assert.assertNotNull;
@@ -62,7 +62,7 @@ public class SolrOakRepositoryStub exten
}
- @CheckForNull
+ @Nullable
@Override
public SolrClient getSolrServer() throws Exception {
return solrServer;
@@ -87,7 +87,7 @@ public class SolrOakRepositoryStub exten
throw new RuntimeException(e);
}
OakSolrConfiguration configuration = new DefaultSolrConfiguration() {
- @Nonnull
+ @NotNull
@Override
public CommitPolicy getCommitPolicy() {
return CommitPolicy.HARD;
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/TestUtils.java
Wed Jul 18 15:03:44 2018
@@ -16,11 +16,8 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nonnull;
import java.io.File;
import java.io.IOException;
-
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.DefaultSolrConfiguration;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.EmbeddedSolrServerConfiguration;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration;
@@ -28,6 +25,8 @@ import org.apache.jackrabbit.oak.plugins
import
org.apache.jackrabbit.oak.plugins.index.solr.server.EmbeddedSolrServerProvider;
import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider;
import org.apache.solr.client.solrj.SolrClient;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
import static org.junit.Assert.assertTrue;
@@ -62,7 +61,7 @@ public class TestUtils
public static OakSolrConfiguration getTestConfiguration() {
return new DefaultSolrConfiguration() {
- @Nonnull
+ @NotNull
@Override
public CommitPolicy getCommitPolicy() {
return CommitPolicy.HARD;
@@ -89,25 +88,25 @@ public class TestUtils
private final OakSolrConfiguration configuration = getTestConfiguration();
- @CheckForNull
+ @Nullable
@Override
public SolrClient getSolrServer() {
return solrServer;
}
- @CheckForNull
+ @Nullable
@Override
public SolrClient getIndexingSolrServer() throws Exception {
return solrServer;
}
- @CheckForNull
+ @Nullable
@Override
public SolrClient getSearchingSolrServer() throws Exception {
return solrServer;
}
- @Nonnull
+ @NotNull
@Override
public OakSolrConfiguration getConfiguration() {
return configuration;
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorTest.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorTest.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorTest.java
Wed Jul 18 15:03:44 2018
@@ -21,8 +21,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
-import javax.annotation.Nonnull;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.plugins.index.IndexUpdateCallback;
import org.apache.jackrabbit.oak.plugins.index.solr.TestUtils;
@@ -35,6 +33,7 @@ import org.apache.solr.client.solrj.Solr
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.response.QueryResponse;
+import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -66,12 +65,12 @@ public class SolrIndexEditorTest {
NodeBuilder builder = mock(NodeBuilder.class);
SolrClient solrServer = TestUtils.createSolrServer();
OakSolrConfiguration configuration = new DefaultSolrConfiguration() {
- @Nonnull
+ @NotNull
@Override
public Collection<String> getIgnoredProperties() {
return Collections.singletonList("foo2");
}
- @Nonnull
+ @NotNull
@Override
public CommitPolicy getCommitPolicy() {
return CommitPolicy.HARD;
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexLookupTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexLookupTest.java?rev=1836192&r1=1836191&r2=1836192&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexLookupTest.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexLookupTest.java
Wed Jul 18 15:03:44 2018
@@ -19,14 +19,13 @@
package org.apache.jackrabbit.oak.plugins.index.solr.query;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import java.util.Set;
-
import org.apache.jackrabbit.oak.query.index.FilterImpl;
import org.apache.jackrabbit.oak.spi.query.Filter;
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 org.junit.Test;
import static com.google.common.collect.ImmutableSet.of;
@@ -82,7 +81,7 @@ public class SolrIndexLookupTest {
}
private static NodeBuilder newSolrIndexDefinition(
- @Nonnull NodeBuilder index, @Nonnull String name,
+ @NotNull NodeBuilder index, @NotNull String name,
@Nullable Set<String> properties) {
if (index.hasChildNode(name)) {
return index.child(name);
