You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2014/11/27 10:44:07 UTC
svn commit: r1642062 - in /jackrabbit/oak/trunk/oak-solr-core/src:
main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/
main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/
main/java/org/apache/jackrabbit/oak/plugins/index/sol...
Author: tommaso
Date: Thu Nov 27 09:44:06 2014
New Revision: 1642062
URL: http://svn.apache.org/r1642062
Log:
OAK-2303 - added jsr305 annotations
Modified:
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/OakSolrNodeStateConfiguration.java
jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfiguration.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/index/SolrIndexEditor.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/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/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/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/test/java/org/apache/jackrabbit/oak/jcr/SolrOakRepositoryStub.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/TextExtractionQueryTest.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/SolrIndexQueryTestIT.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java
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=1642062&r1=1642061&r2=1642062&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 Thu Nov 27 09:44:06 2014
@@ -18,6 +18,8 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Arrays;
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;
@@ -27,18 +29,20 @@ import org.apache.jackrabbit.oak.spi.que
*/
public class DefaultSolrConfiguration implements OakSolrConfiguration {
- private static Collection<String> ignoredProperties = Arrays.asList(SolrServerConfigurationDefaults.IGNORED_PROPERTIES.split(","));
+ private static final Collection<String> ignoredProperties = Arrays.asList(SolrServerConfigurationDefaults.IGNORED_PROPERTIES.split(","));
@Override
public String getFieldNameFor(Type<?> propertyType) {
return null;
}
+ @Nonnull
@Override
public String getPathField() {
return SolrServerConfigurationDefaults.PATH_FIELD_NAME;
}
+ @CheckForNull
@Override
public String getFieldForPathRestriction(Filter.PathRestriction pathRestriction) {
String fieldName = null;
@@ -73,6 +77,7 @@ public class DefaultSolrConfiguration im
return null;
}
+ @Nonnull
@Override
public CommitPolicy getCommitPolicy() {
return CommitPolicy.SOFT;
@@ -103,6 +108,7 @@ public class DefaultSolrConfiguration im
return SolrServerConfigurationDefaults.PATH_RESTRICTIONS;
}
+ @Nonnull
@Override
public Collection<String> getIgnoredProperties() {
return ignoredProperties;
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=1642062&r1=1642061&r2=1642062&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 Thu Nov 27 09:44:06 2014
@@ -17,6 +17,8 @@
package org.apache.jackrabbit.oak.plugins.index.solr.configuration;
+import javax.annotation.Nonnull;
+
/**
* The default {@link org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationProvider}
*/
@@ -32,6 +34,7 @@ public class DefaultSolrConfigurationPro
this.defaultConfiguration = configuration;
}
+ @Nonnull
@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=1642062&r1=1642061&r2=1642062&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 Thu Nov 27 09:44:06 2014
@@ -17,6 +17,8 @@
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;
@@ -31,51 +33,61 @@ public interface OakSolrConfiguration {
* Provide a field name to be used for indexing / searching a certain {@link org.apache.jackrabbit.oak.api.Type}
*
* @param propertyType the {@link org.apache.jackrabbit.oak.api.Type} to be indexed / searched
- * @return a <code>String</code> representing the Solr field to be used for the given {@link org.apache.jackrabbit.oak.api.Type}.
+ * @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
String getFieldNameFor(Type<?> propertyType);
/**
* Provide the field name for indexing / searching paths
*
- * @return a <code>String</code> representing the Solr field to be used for paths.
+ * @return the name of the Solr field to be used for indexing and searching on paths (exact matching).
*/
+ @Nonnull
String getPathField();
/**
* Provide a field name to search over for the given {@link org.apache.jackrabbit.oak.spi.query.Filter.PathRestriction}
*
- * @param pathRestriction the {@link org.apache.jackrabbit.oak.spi.query.Filter.PathRestriction} used for filtering search results
- * @return the field name as a <code>String</code> to be used by Solr for the given restriction
+ * @param pathRestriction the {@link org.apache.jackrabbit.oak.spi.query.Filter.PathRestriction} used for filtering
+ * 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
String getFieldForPathRestriction(Filter.PathRestriction pathRestriction);
/**
* Provide a field name to search over for the given {@link org.apache.jackrabbit.oak.spi.query.Filter.PropertyRestriction}
*
* @param propertyRestriction the {@link org.apache.jackrabbit.oak.spi.query.Filter.PropertyRestriction} used for filtering search results
- * @return the field name as a <code>String</code> to be used by Solr for the given restriction
+ * @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
String getFieldForPropertyRestriction(Filter.PropertyRestriction propertyRestriction);
/**
- * Provide the commit policy to be used with the underlying Solr instance
+ * Provide the commit policy to be used by a given {@link org.apache.solr.client.solrj.SolrServer}
*
* @return a {@link org.apache.jackrabbit.oak.plugins.index.solr.configuration.CommitPolicy}
*/
+ @Nonnull
CommitPolicy getCommitPolicy();
/**
* Provide a field name that is used as the default "catch all" field for searching over all the data
*
- * @return a <code>String</code> representing the Solr field to be used as "catch all" field
+ * @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
String getCatchAllField();
/**
* Provide the number of documents (rows) to be fetched for each Solr query
*
- * @return an <code>int</code> for the setting of Solr rows parameter
+ * @return the number of rows to fetch
*/
int getRows();
@@ -104,9 +116,10 @@ public interface OakSolrConfiguration {
boolean useForPathRestrictions();
/**
- * Provide the collection of properties that should be neither indexed nor searched by the Solr index
+ * Provide the names of the properties that should be neither indexed nor searched by the Solr index
*
- * @return a {@link java.util.Collection} of names of properties to be ignored
+ * @return a {@link java.util.Collection} of property names for properties to be ignored
*/
+ @Nonnull
Collection<String> getIgnoredProperties();
}
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=1642062&r1=1642061&r2=1642062&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 Thu Nov 27 09:44:06 2014
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.configuration;
+import javax.annotation.Nonnull;
+
/**
* A provider for {@link org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration}s
*/
@@ -26,5 +28,6 @@ public interface OakSolrConfigurationPro
*
* @return a {@link org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration}
*/
+ @Nonnull
public OakSolrConfiguration getConfiguration();
}
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/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/OakSolrNodeStateConfiguration.java?rev=1642062&r1=1642061&r2=1642062&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrNodeStateConfiguration.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrNodeStateConfiguration.java Thu Nov 27 09:44:06 2014
@@ -20,6 +20,9 @@ import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
+import javax.annotation.CheckForNull;
+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.server.EmbeddedSolrServerProvider;
@@ -62,11 +65,13 @@ public abstract class OakSolrNodeStateCo
return null;
}
+ @Nonnull
@Override
public String getPathField() {
return getStringValueFor(Properties.PATH_FIELD, SolrServerConfigurationDefaults.PATH_FIELD_NAME);
}
+ @CheckForNull
@Override
public String getFieldForPathRestriction(Filter.PathRestriction pathRestriction) {
String fieldName = null;
@@ -117,6 +122,7 @@ public abstract class OakSolrNodeStateCo
return null;
}
+ @Nonnull
@Override
public CommitPolicy getCommitPolicy() {
return CommitPolicy.valueOf(getStringValueFor(Properties.COMMIT_POLICY, CommitPolicy.SOFT.toString()));
@@ -142,6 +148,7 @@ public abstract class OakSolrNodeStateCo
return getBooleanValueFor(Properties.PATH_RESTRICTIONS, SolrServerConfigurationDefaults.PATH_RESTRICTIONS);
}
+ @Nonnull
@Override
public Collection<String> getIgnoredProperties() {
Collection<String> ignoredProperties;
@@ -205,6 +212,7 @@ public abstract class OakSolrNodeStateCo
return values;
}
+ @Nonnull
@Override
public SolrServerConfiguration<EmbeddedSolrServerProvider> getSolrServerConfiguration() {
String solrHomePath = getStringValueFor(Properties.SOLRHOME_PATH, SolrServerConfigurationDefaults.SOLR_HOME_PATH);
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfiguration.java?rev=1642062&r1=1642061&r2=1642062&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfiguration.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/SolrServerConfiguration.java Thu Nov 27 09:44:06 2014
@@ -43,7 +43,7 @@ public abstract class SolrServerConfigur
}
public S getProvider()
- throws NoSuchMethodException, IllegalAccessException,
+ throws IllegalAccessException,
InvocationTargetException, InstantiationException {
if (constructor == null) {
Class<?> rawType = type instanceof Class<?>
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=1642062&r1=1642061&r2=1642062&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 Thu Nov 27 09:44:06 2014
@@ -16,6 +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;
/**
@@ -29,5 +31,6 @@ public interface SolrServerConfiguration
*
* @return the {@link org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfiguration} holding the configuration parameters
*/
+ @Nonnull
public SolrServerConfiguration<S> getSolrServerConfiguration();
}
Modified: jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditor.java?rev=1642062&r1=1642061&r2=1642062&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditor.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditor.java Thu Nov 27 09:44:06 2014
@@ -51,7 +51,7 @@ import static org.apache.jackrabbit.oak.
/**
* Index editor for keeping a Solr index up to date.
*/
-public class SolrIndexEditor implements IndexEditor {
+class SolrIndexEditor implements IndexEditor {
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -88,7 +88,7 @@ public class SolrIndexEditor implements
SolrIndexEditor(
NodeBuilder definition, SolrServer solrServer,
OakSolrConfiguration configuration,
- IndexUpdateCallback callback) throws CommitFailedException {
+ IndexUpdateCallback callback) {
this.parent = null;
this.name = null;
this.path = "/";
@@ -108,7 +108,7 @@ public class SolrIndexEditor implements
this.updateCallback = parent.updateCallback;
}
- public String getPath() {
+ String getPath() {
if (path == null) { // => parent != null
path = concat(parent.getPath(), name);
}
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=1642062&r1=1642061&r2=1642062&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 Thu Nov 27 09:44:06 2014
@@ -17,6 +17,8 @@
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;
@@ -74,6 +76,7 @@ public class EmbeddedSolrServerConfigura
solrCoreName = null;
}
+ @Nonnull
@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=1642062&r1=1642061&r2=1642062&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 Thu Nov 27 09:44:06 2014
@@ -19,6 +19,9 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Arrays;
import java.util.Collection;
+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;
@@ -136,6 +139,7 @@ public class OakSolrConfigurationProvide
oakSolrConfiguration = null;
}
+ @Nonnull
@Override
public OakSolrConfiguration getConfiguration() {
if (oakSolrConfiguration == null) {
@@ -168,11 +172,13 @@ public class OakSolrConfigurationProvide
return null;
}
+ @Nonnull
@Override
public String getPathField() {
return pathExactFieldName;
}
+ @CheckForNull
@Override
public String getFieldForPathRestriction(Filter.PathRestriction pathRestriction) {
String fieldName = null;
@@ -202,6 +208,7 @@ public class OakSolrConfigurationProvide
return fieldName;
}
+ @Nonnull
@Override
public CommitPolicy getCommitPolicy() {
return commitPolicy;
@@ -232,6 +239,7 @@ public class OakSolrConfigurationProvide
return useForPathRestrictions;
}
+ @Nonnull
@Override
public Collection<String> getIgnoredProperties() {
return Arrays.asList(ignoredProperties);
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=1642062&r1=1642061&r2=1642062&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 Thu Nov 27 09:44:06 2014
@@ -16,6 +16,8 @@
*/
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;
@@ -89,6 +91,7 @@ public class RemoteSolrServerConfigurati
}
+ @Nonnull
@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/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=1642062&r1=1642061&r2=1642062&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 Thu Nov 27 09:44:06 2014
@@ -18,6 +18,8 @@ package org.apache.jackrabbit.oak.plugin
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;
@@ -122,6 +124,7 @@ public class SolrServerProviderService i
}
}
+ @CheckForNull
@Override
public SolrServer getSolrServer() throws Exception {
synchronized (solrServerConfigurationProviders) {
@@ -133,6 +136,7 @@ public class SolrServerProviderService i
SolrServerConfiguration solrServerConfiguration = solrServerConfigurationProvider.getSolrServerConfiguration();
SolrServerProvider solrServerProvider = solrServerConfiguration.getProvider();
cachedSolrServer = solrServerProvider.getSolrServer();
+ log.info("created new SolrServer {}", cachedSolrServer);
} catch (Exception e) {
log.error("could not get a SolrServerProvider of type {}", serverType, e);
}
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=1642062&r1=1642061&r2=1642062&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 Thu Nov 27 09:44:06 2014
@@ -112,8 +112,7 @@ public class SolrQueryIndex implements F
}
// primary type restriction defined AND primary type restriction handled
- if (filter.getPrimaryTypes() != null && filter.getPrimaryTypes().size() > 0
- && configuration.useForPrimaryTypes()) {
+ if (filter.getPrimaryTypes().size() > 0 && configuration.useForPrimaryTypes()) {
match++;
}
@@ -468,7 +467,7 @@ public class SolrQueryIndex implements F
return endOfData();
}
- private SolrResultRow convertToRow(SolrDocument doc) throws IOException {
+ private SolrResultRow convertToRow(SolrDocument doc) {
String path = String.valueOf(doc.getFieldValue(configuration.getPathField()));
if (path != null) {
if ("".equals(path)) {
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=1642062&r1=1642061&r2=1642062&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 Thu Nov 27 09:44:06 2014
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.server;
+import javax.annotation.CheckForNull;
+
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfigurationDefaults;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
@@ -24,6 +26,7 @@ public class DefaultSolrServerProvider i
private SolrServer solrServer;
+ @CheckForNull
@Override
public SolrServer getSolrServer() throws Exception {
if (solrServer == null) {
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=1642062&r1=1642061&r2=1642062&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 Thu Nov 27 09:44:06 2014
@@ -21,6 +21,8 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
+import javax.annotation.CheckForNull;
+
import org.apache.jackrabbit.oak.commons.IOUtils;
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.EmbeddedSolrServerConfiguration;
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfigurationDefaults;
@@ -199,6 +201,7 @@ public class EmbeddedSolrServerProvider
}
+ @CheckForNull
@Override
public SolrServer getSolrServer() throws Exception {
synchronized (this) {
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=1642062&r1=1642061&r2=1642062&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 Thu Nov 27 09:44:06 2014
@@ -19,6 +19,8 @@ package org.apache.jackrabbit.oak.plugin
import java.io.File;
import java.io.IOException;
+import javax.annotation.CheckForNull;
+
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.RemoteSolrServerConfiguration;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.SolrServerException;
@@ -47,6 +49,7 @@ public class RemoteSolrServerProvider im
this.remoteSolrServerConfiguration = remoteSolrServerConfiguration;
}
+ @CheckForNull
@Override
public SolrServer getSolrServer() throws Exception {
if (solrServer == null && remoteSolrServerConfiguration.getSolrZkHost() != null && remoteSolrServerConfiguration.getSolrZkHost().length() > 0) {
@@ -82,7 +85,7 @@ public class RemoteSolrServerProvider im
}
- private SolrServer initializeWithCloudSolrServer() throws IOException, SolrServerException {
+ private SolrServer initializeWithCloudSolrServer() throws IOException {
// try SolrCloud client
CloudSolrServer cloudSolrServer = new CloudSolrServer(remoteSolrServerConfiguration.getSolrZkHost());
cloudSolrServer.setZkConnectTimeout(100);
@@ -150,7 +153,7 @@ public class RemoteSolrServerProvider im
return connected;
}
- private void createCollectionIfNeeded(CloudSolrServer cloudSolrServer) throws SolrServerException, IOException {
+ private void createCollectionIfNeeded(CloudSolrServer cloudSolrServer) throws SolrServerException {
String solrCollection = remoteSolrServerConfiguration.getSolrCollection();
try {
ZkStateReader zkStateReader = cloudSolrServer.getZkStateReader();
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=1642062&r1=1642061&r2=1642062&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 Thu Nov 27 09:44:06 2014
@@ -16,6 +16,8 @@
*/
package org.apache.jackrabbit.oak.plugins.index.solr.server;
+import javax.annotation.CheckForNull;
+
import org.apache.solr.client.solrj.SolrServer;
/**
@@ -29,5 +31,6 @@ public interface SolrServerProvider {
* @return a {@link org.apache.solr.client.solrj.SolrServer} instance
* @throws Exception if anything goes wrong while providing the {@link org.apache.solr.client.solrj.SolrServer}
*/
+ @CheckForNull
public SolrServer getSolrServer() throws Exception;
}
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=1642062&r1=1642061&r2=1642062&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 Thu Nov 27 09:44:06 2014
@@ -18,9 +18,10 @@ package org.apache.jackrabbit.oak.jcr;
import java.io.File;
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;
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.CommitPolicy;
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.DefaultSolrConfiguration;
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.DefaultSolrConfigurationProvider;
@@ -52,6 +53,7 @@ public class SolrOakRepositoryStub exten
throw new RuntimeException();
}
SolrServerProvider solrServerProvider = new SolrServerProvider() {
+ @CheckForNull
@Override
public SolrServer getSolrServer() throws Exception {
return solrServer;
@@ -65,6 +67,7 @@ public class SolrOakRepositoryStub exten
throw new RuntimeException(e);
}
OakSolrConfiguration configuration = new DefaultSolrConfiguration() {
+ @Nonnull
@Override
public CommitPolicy getCommitPolicy() {
return CommitPolicy.HARD;
Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/TextExtractionQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/TextExtractionQueryTest.java?rev=1642062&r1=1642061&r2=1642062&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/TextExtractionQueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/jcr/query/TextExtractionQueryTest.java Thu Nov 27 09:44:06 2014
@@ -23,7 +23,6 @@ import javax.jcr.Binary;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.nodetype.NodeType;
-import javax.jcr.query.InvalidQueryException;
import javax.jcr.query.Query;
import org.apache.jackrabbit.JcrConstants;
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=1642062&r1=1642061&r2=1642062&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 Thu Nov 27 09:44:06 2014
@@ -18,6 +18,9 @@ package org.apache.jackrabbit.oak.plugin
import java.io.File;
+import javax.annotation.CheckForNull;
+import javax.annotation.Nonnull;
+
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.CommitPolicy;
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.DefaultSolrConfiguration;
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration;
@@ -58,6 +61,7 @@ public class TestUtils
public static OakSolrConfiguration getTestConfiguration() {
return new DefaultSolrConfiguration() {
+ @Nonnull
@Override
public CommitPolicy getCommitPolicy() {
return CommitPolicy.HARD;
@@ -84,11 +88,13 @@ public class TestUtils
private final OakSolrConfiguration configuration = getTestConfiguration();
+ @CheckForNull
@Override
public SolrServer getSolrServer() {
return solrServer;
}
+ @Nonnull
@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=1642062&r1=1642061&r2=1642062&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 Thu Nov 27 09:44:06 2014
@@ -20,6 +20,8 @@ import java.util.Arrays;
import java.util.Collection;
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;
@@ -69,10 +71,12 @@ public class SolrIndexEditorTest {
NodeBuilder builder = mock(NodeBuilder.class);
SolrServer solrServer = TestUtils.createSolrServer();
OakSolrConfiguration configuration = new DefaultSolrConfiguration() {
+ @Nonnull
@Override
public Collection<String> getIgnoredProperties() {
return Arrays.asList("foo2");
}
+ @Nonnull
@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/SolrIndexQueryTestIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexQueryTestIT.java?rev=1642062&r1=1642061&r2=1642062&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexQueryTestIT.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexQueryTestIT.java Thu Nov 27 09:44:06 2014
@@ -35,7 +35,6 @@ import org.apache.jackrabbit.oak.spi.que
import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
import org.apache.solr.client.solrj.SolrServer;
import org.junit.After;
-import org.junit.Assume;
import org.junit.Ignore;
import org.junit.Test;
@@ -383,9 +382,7 @@ public class SolrIndexQueryTestIT extend
test.addChild("a").setProperty("name", "/parent/child/node");
root.commit();
- StringBuffer stmt = new StringBuffer();
- stmt.append("//*[jcr:contains(., '/parent/child')]");
- assertQuery(stmt.toString(), "xpath", ImmutableList.of("/test/a"));
+ assertQuery("//*[jcr:contains(., '/parent/child')]", "xpath", ImmutableList.of("/test/a"));
}
@@ -397,9 +394,7 @@ public class SolrIndexQueryTestIT extend
a.setProperty("name", "/segment1/segment2/segment3");
root.commit();
- StringBuffer stmt = new StringBuffer();
- stmt.append("//*[jcr:contains(., '/segment1/segment2')]");
- assertQuery(stmt.toString(), "xpath", ImmutableList.of("/test/a"));
+ assertQuery("//*[jcr:contains(., '/segment1/segment2')]", "xpath", ImmutableList.of("/test/a"));
}
@@ -423,9 +418,7 @@ public class SolrIndexQueryTestIT extend
root.commit();
- StringBuffer stmt = new StringBuffer();
- stmt.append("//*[jcr:contains(., 'media') and (@p = 'dam/smartcollection' or @p = 'dam/collection') ]");
- assertQuery(stmt.toString(), "xpath",
+ assertQuery("//*[jcr:contains(., 'media') and (@p = 'dam/smartcollection' or @p = 'dam/collection') ]", "xpath",
ImmutableList.of(one.getPath(), two.getPath()));
}
}
Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java?rev=1642062&r1=1642061&r2=1642062&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexTest.java Thu Nov 27 09:44:06 2014
@@ -20,6 +20,8 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
+import javax.annotation.Nonnull;
+
import org.apache.jackrabbit.oak.plugins.index.solr.TestUtils;
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.DefaultSolrConfiguration;
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration;
@@ -27,7 +29,6 @@ import org.apache.jackrabbit.oak.query.Q
import org.apache.jackrabbit.oak.query.ast.Operator;
import org.apache.jackrabbit.oak.query.ast.SelectorImpl;
import org.apache.jackrabbit.oak.query.index.FilterImpl;
-import org.apache.jackrabbit.oak.spi.query.Cursor;
import org.apache.jackrabbit.oak.spi.query.Filter;
import org.apache.jackrabbit.oak.spi.query.PropertyValues;
import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -35,7 +36,6 @@ import org.apache.solr.client.solrj.Solr
import org.apache.solr.common.SolrInputDocument;
import org.junit.Test;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
@@ -185,6 +185,7 @@ public class SolrQueryIndexTest {
return true;
}
+ @Nonnull
@Override
public Collection<String> getIgnoredProperties() {
return Arrays.asList("name");
@@ -216,6 +217,7 @@ public class SolrQueryIndexTest {
return true;
}
+ @Nonnull
@Override
public Collection<String> getIgnoredProperties() {
return Arrays.asList("name");