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 2017/12/18 11:45:24 UTC
svn commit: r1818554 - in /jackrabbit/oak/trunk/oak-solr-core/src:
main/java/org/apache/jackrabbit/oak/plugins/index/solr/server/
test/java/org/apache/jackrabbit/oak/jcr/
test/java/org/apache/jackrabbit/oak/plugins/index/solr/index/
test/resources/solr...
Author: tommaso
Date: Mon Dec 18 11:45:24 2017
New Revision: 1818554
URL: http://svn.apache.org/viewvc?rev=1818554&view=rev
Log:
OAK-7054 - fixed path init in SolrOakRepositoryStub, some minor warnings fixed
Removed:
jackrabbit/oak/trunk/oak-solr-core/src/test/resources/solr/oak/conf/currency.xml
Modified:
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/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/index/SolrIndexEditorTest.java
jackrabbit/oak/trunk/oak-solr-core/src/test/resources/solr/oak/conf/schema.xml
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=1818554&r1=1818553&r2=1818554&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 Mon Dec 18 11:45:24 2017
@@ -29,7 +29,6 @@ import org.apache.jackrabbit.oak.commons
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.EmbeddedSolrServerConfiguration;
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.embedded.EmbeddedSolrServer;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
import org.apache.solr.client.solrj.impl.HttpSolrServer;
@@ -169,7 +168,6 @@ public class EmbeddedSolrServerProvider
out.close();
String coreConfDir = solrCoreDir + "/conf/";
- copy("/solr/oak/conf/currency.xml", coreConfDir);
copy("/solr/oak/conf/schema.xml", coreConfDir);
copy("/solr/oak/conf/solrconfig.xml", coreConfDir);
} else if (!solrCorePathFile.isDirectory()) {
@@ -179,12 +177,7 @@ public class EmbeddedSolrServerProvider
File solrDataPathFile = new File(solrHomePathFile + "/" + coreName + "/data/index");
if (solrDataPathFile.exists()) {
log.debug("deleting stale lock files");
- File[] locks = solrDataPathFile.listFiles(new FilenameFilter() {
- @Override
- public boolean accept(File dir, String name) {
- return "write.lock".equals(name);
- }
- });
+ File[] locks = solrDataPathFile.listFiles((dir, name) -> "write.lock".equals(name));
log.debug("found {} lock files", locks.length);
// remove eventaul previous lock files (e.g. due to ungraceful shutdown)
if (locks.length > 0) {
@@ -197,10 +190,12 @@ public class EmbeddedSolrServerProvider
// check if the a core with the given coreName exists
String[] files = solrHomePathFile.list();
- Arrays.sort(files);
- if (Arrays.binarySearch(files, coreName) < 0) {
- throw new IOException("could not find a directory with the coreName '" + coreName
- + "' in the solrHomePath '" + solrHomePath + "'");
+ if (files != null) {
+ Arrays.sort(files);
+ if (Arrays.binarySearch(files, coreName) < 0) {
+ throw new IOException("could not find a directory with the coreName '" + coreName
+ + "' in the solrHomePath '" + solrHomePath + "'");
+ }
}
}
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=1818554&r1=1818553&r2=1818554&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 Mon Dec 18 11:45:24 2017
@@ -38,6 +38,8 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrServer;
+import static org.junit.Assert.assertNotNull;
+
public class SolrOakRepositoryStub extends OakSegmentTarRepositoryStub {
public SolrOakRepositoryStub(Properties settings)
@@ -47,8 +49,7 @@ public class SolrOakRepositoryStub exten
@Override
protected void preCreateRepository(Jcr jcr) {
- String path = getClass().getResource("/").getFile() + "/queryjcrtest" ;
- File f = new File(path);
+ File f = new File("target" + File.pathSeparator + "queryjcrtest-" + System.currentTimeMillis());
final SolrClient solrServer;
try {
solrServer = new EmbeddedSolrServerProvider(new EmbeddedSolrServerConfiguration(f.getPath(), "oak")).getSolrServer();
@@ -78,6 +79,7 @@ public class SolrOakRepositoryStub exten
}
};
try {
+ assertNotNull(solrServer);
// safely remove any previous document on the index
solrServer.deleteByQuery("*:*");
solrServer.commit();
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=1818554&r1=1818553&r2=1818554&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 Dec 18 11:45:24 2017
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.plugin
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.Iterator;
import javax.annotation.Nonnull;
@@ -53,12 +54,7 @@ public class SolrIndexEditorTest {
SolrIndexEditor solrIndexEditor = new SolrIndexEditor(solrServer, configuration, callback);
NodeState before = mock(NodeState.class);
NodeState after = mock(NodeState.class);
- Iterable properties = new Iterable<PropertyState>() {
- @Override
- public Iterator<PropertyState> iterator() {
- return Arrays.asList(PropertyStates.createProperty("foo1", "bar")).iterator();
- }
- };
+ Iterable properties = (Iterable<PropertyState>) () -> Collections.singletonList(PropertyStates.createProperty("foo1", "bar")).iterator();
when(after.getProperties()).thenReturn(properties);
solrIndexEditor.leave(before, after);
QueryResponse queryResponse = solrServer.query(new SolrQuery("foo1:*"));
@@ -73,7 +69,7 @@ public class SolrIndexEditorTest {
@Nonnull
@Override
public Collection<String> getIgnoredProperties() {
- return Arrays.asList("foo2");
+ return Collections.singletonList("foo2");
}
@Nonnull
@Override
@@ -88,7 +84,7 @@ public class SolrIndexEditorTest {
Iterable properties = new Iterable<PropertyState>() {
@Override
public Iterator<PropertyState> iterator() {
- return Arrays.asList(PropertyStates.createProperty("foo2", "bar")).iterator();
+ return Collections.singletonList(PropertyStates.createProperty("foo2", "bar")).iterator();
}
};
when(after.getProperties()).thenReturn(properties);
Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/resources/solr/oak/conf/schema.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/resources/solr/oak/conf/schema.xml?rev=1818554&r1=1818553&r2=1818554&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/test/resources/solr/oak/conf/schema.xml (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/test/resources/solr/oak/conf/schema.xml Mon Dec 18 11:45:24 2017
@@ -122,7 +122,6 @@
<fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
geo="true" distErrPct="0.025" maxDistErr="0.000009" units="degrees" />
- <fieldType name="currency" class="solr.CurrencyField" precisionStep="8" defaultCurrency="USD" currencyConfig="currency.xml" />
<fieldtype name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField"/>
</types>
<fields>