Author: tommaso
Date: Mon Feb 16 12:25:05 2015
New Revision: 1660092
URL: http://svn.apache.org/r1660092
Log:
OAK-2182 - removed useless NodeBuilder parameter from SolrIndexEditor, minor
fixes
Modified:
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/index/SolrIndexEditor.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/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrNodeStateConfigurationTest.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/SolrIndexEditorTest.java
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=1660092&r1=1660091&r2=1660092&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
Mon Feb 16 12:25:05 2015
@@ -238,11 +238,15 @@ public class OakSolrNodeStateConfigurati
if ("embedded".equalsIgnoreCase(type)) {
String solrHomePath = getStringValueFor(Properties.SOLRHOME_PATH,
SolrServerConfigurationDefaults.SOLR_HOME_PATH);
String coreName = getStringValueFor(Properties.CORE_NAME,
SolrServerConfigurationDefaults.CORE_NAME);
- String context = getStringValueFor(Properties.CONTEXT,
SolrServerConfigurationDefaults.CONTEXT);
- Integer httpPort =
Integer.valueOf(getStringValueFor(Properties.HTTP_PORT,
SolrServerConfigurationDefaults.HTTP_PORT));
+ String context = getStringValueFor(Properties.CONTEXT, null);
+ Integer httpPort =
Integer.valueOf(getStringValueFor(Properties.HTTP_PORT, "0"));
- return (SolrServerConfiguration) new
EmbeddedSolrServerConfiguration(solrHomePath,
- coreName).withHttpConfiguration(context, httpPort);
+ if (context != null && httpPort > 0) {
+ return (SolrServerConfiguration) new
EmbeddedSolrServerConfiguration(solrHomePath, coreName)
+ .withHttpConfiguration(context, httpPort);
+ } else {
+ return (SolrServerConfiguration) new
EmbeddedSolrServerConfiguration(solrHomePath, coreName);
+ }
} else if ("remote".equalsIgnoreCase(type)) {
String solrZkHost = getStringValueFor(Properties.ZK_HOST,
SolrServerConfigurationDefaults.ZK_HOST);
String solrCollection = getStringValueFor(Properties.COLLECTION,
SolrServerConfigurationDefaults.COLLECTION);
@@ -254,7 +258,8 @@ public class OakSolrNodeStateConfigurati
return (SolrServerConfiguration) new
RemoteSolrServerConfiguration(solrZkHost, solrCollection, solrShardsNo,
solrReplicationFactor, solrConfDir, solrHttpUrls);
} else {
- return null;
+
+ throw new RuntimeException("unexpected Solr server type: " + type);
}
}
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=1660092&r1=1660091&r2=1660092&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
Mon Feb 16 12:25:05 2015
@@ -69,11 +69,6 @@ class SolrIndexEditor implements IndexEd
*/
private String path;
- /**
- * Index definition node builder
- */
- private final NodeBuilder definition;
-
private final SolrServer solrServer;
private final OakSolrConfiguration configuration;
@@ -85,13 +80,12 @@ class SolrIndexEditor implements IndexEd
private static final Parser parser = new AutoDetectParser();
SolrIndexEditor(
- NodeBuilder definition, SolrServer solrServer,
+ SolrServer solrServer,
OakSolrConfiguration configuration,
IndexUpdateCallback callback) {
this.parent = null;
this.name = null;
this.path = "/";
- this.definition = definition;
this.solrServer = solrServer;
this.configuration = configuration;
this.updateCallback = callback;
@@ -101,7 +95,6 @@ class SolrIndexEditor implements IndexEd
this.parent = parent;
this.name = name;
this.path = null;
- this.definition = parent.definition;
this.solrServer = parent.solrServer;
this.configuration = parent.configuration;
this.updateCallback = parent.updateCallback;
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=1660092&r1=1660091&r2=1660092&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
Mon Feb 16 12:25:05 2015
@@ -62,7 +62,6 @@ public class SolrIndexEditorProvider imp
SolrServer solrServer =
solrServerProvider.getIndexingSolrServer();
if (solrServer != null) {
return new SolrIndexEditor(
- definition,
solrServer,
oakSolrConfigurationProvider.getConfiguration(),
callback);
} else {
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrNodeStateConfigurationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrNodeStateConfigurationTest.java?rev=1660092&r1=1660091&r2=1660092&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrNodeStateConfigurationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/OakSolrNodeStateConfigurationTest.java
Mon Feb 16 12:25:05 2015
@@ -61,7 +61,7 @@ public class OakSolrNodeStateConfigurati
NodeState idxDef =
store.getRoot().getChildNode("oak:index").getChildNode("solrIdx");
OakSolrNodeStateConfiguration fixedNodeStateConfiguration = new
OakSolrNodeStateConfiguration(idxDef);
SolrServerConfiguration<SolrServerProvider> configuration =
fixedNodeStateConfiguration.getSolrServerConfiguration();
-// assertNotNull(configuration);
+ assertNotNull(configuration);
// assertEquals("sh", configuration.getSolrHomePath()); // property
defined in the node state
// assertEquals("cn", solrServerConfiguration.getCoreName()); //
property defined in the node state
// assertEquals("path_exact",
fixedNodeStateConfiguration.getPathField()); // using default as this property
is not defined in the node state
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=1660092&r1=1660091&r2=1660092&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
Mon Feb 16 12:25:05 2015
@@ -50,7 +50,7 @@ public class SolrIndexEditorTest {
SolrServer solrServer = TestUtils.createSolrServer();
OakSolrConfiguration configuration = TestUtils.getTestConfiguration();
IndexUpdateCallback callback = mock(IndexUpdateCallback.class);
- SolrIndexEditor solrIndexEditor = new SolrIndexEditor(builder,
solrServer, configuration, callback);
+ SolrIndexEditor solrIndexEditor = new SolrIndexEditor(solrServer,
configuration, callback);
NodeState before = mock(NodeState.class);
NodeState after = mock(NodeState.class);
Iterable properties = new Iterable<PropertyState>() {
@@ -82,7 +82,7 @@ public class SolrIndexEditorTest {
}
};
IndexUpdateCallback callback = mock(IndexUpdateCallback.class);
- SolrIndexEditor solrIndexEditor = new SolrIndexEditor(builder,
solrServer, configuration, callback);
+ SolrIndexEditor solrIndexEditor = new SolrIndexEditor(solrServer,
configuration, callback);
NodeState before = mock(NodeState.class);
NodeState after = mock(NodeState.class);
Iterable properties = new Iterable<PropertyState>() {
