[UIMA-2566] - replaced deprecated CommonsHttpSolrServer with HttpSolrServer plus minor improvements
git-svn-id: https://svn.apache.org/repos/asf/uima/addons/trunk@1431931 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/Solrcas/src/main/java/org/apache/uima/solrcas/FieldMappingReader.java b/Solrcas/src/main/java/org/apache/uima/solrcas/FieldMappingReader.java
index a41f5ea..f158ac1 100644
--- a/Solrcas/src/main/java/org/apache/uima/solrcas/FieldMappingReader.java
+++ b/Solrcas/src/main/java/org/apache/uima/solrcas/FieldMappingReader.java
@@ -52,9 +52,7 @@
input.close();
- SolrMappingConfiguration solrMappingConfiguration = new SolrMappingConfiguration(documentText, documentLanguage, fieldMapping);
-
- return solrMappingConfiguration;
+ return new SolrMappingConfiguration(documentText, documentLanguage, fieldMapping);
}
private static class FieldMappingHandler extends DefaultHandler {
diff --git a/Solrcas/src/main/java/org/apache/uima/solrcas/SolrCASConsumer.java b/Solrcas/src/main/java/org/apache/uima/solrcas/SolrCASConsumer.java
index 576dbb9..2a62e13 100644
--- a/Solrcas/src/main/java/org/apache/uima/solrcas/SolrCASConsumer.java
+++ b/Solrcas/src/main/java/org/apache/uima/solrcas/SolrCASConsumer.java
@@ -23,14 +23,13 @@
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URL;
import java.util.Map;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
+import org.apache.solr.client.solrj.impl.HttpSolrServer;
import org.apache.solr.common.SolrInputDocument;
import org.apache.uima.UimaContext;
import org.apache.uima.analysis_component.CasAnnotator_ImplBase;
@@ -177,8 +176,7 @@
InputStream input = getURI(mappingFileParam).toURL().openStream();
- SolrMappingConfiguration solrMappingConfiguration = fieldMappingReader.getConf(input);
- return solrMappingConfiguration;
+ return fieldMappingReader.getConf(input);
}
protected SolrServer createServer() throws SolrServerException {
@@ -193,8 +191,7 @@
getConfigParameterValue("solrPath"));
if (solrInstanceTypeParam.equalsIgnoreCase("http")) {
- URL solrURL = UriUtils.create(solrPathParam).toURL();
- solrServer = new CommonsHttpSolrServer(solrURL);
+ solrServer = new HttpSolrServer(solrPathParam);
}
} catch (Exception e) {
throw new SolrServerException("Error creating SolrServer", e);
diff --git a/Solrcas/src/main/java/org/apache/uima/solrcas/UriUtils.java b/Solrcas/src/main/java/org/apache/uima/solrcas/UriUtils.java
index 93d76f8..8cfd989 100644
--- a/Solrcas/src/main/java/org/apache/uima/solrcas/UriUtils.java
+++ b/Solrcas/src/main/java/org/apache/uima/solrcas/UriUtils.java
@@ -42,7 +42,7 @@
* @return URI with proper quoting
* @throws URISyntaxException
*/
- public static URI quote (String s) throws URISyntaxException {
+ public static URI quote(String s) throws URISyntaxException {
if (-1 == s.indexOf('%')) {
// 3 argument constructor does any needed quoting of otherwise illegal chars
// https://issues.apache.org/jira/browse/UIMA-2097
@@ -69,7 +69,7 @@
* Create a URI from a String, with proper quoting.
* Already quoted things in the input string are not re-quoted.
* Mimic exception treatment of URI.create
- * @param u
+ * @param s
* @return URI with proper quoting
*/
diff --git a/Solrcas/src/test/java/org/apache/uima/solrcas/EmbeddedSolrCASConsumer.java b/Solrcas/src/test/java/org/apache/uima/solrcas/EmbeddedSolrCASConsumer.java
index 5c801cc..37ebd5e 100644
--- a/Solrcas/src/test/java/org/apache/uima/solrcas/EmbeddedSolrCASConsumer.java
+++ b/Solrcas/src/test/java/org/apache/uima/solrcas/EmbeddedSolrCASConsumer.java
@@ -27,6 +27,10 @@
import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
import org.apache.solr.core.CoreContainer;
+/**
+ * Test {@link SolrCASConsumer} extension which uses and {@link EmbeddedSolrServer}
+ * underneath to communicate with Solr.
+ */
public class EmbeddedSolrCASConsumer extends SolrCASConsumer {
@Override
diff --git a/Solrcas/src/test/java/org/apache/uima/solrcas/SolrCasConsumerIntegrationTest.java b/Solrcas/src/test/java/org/apache/uima/solrcas/SolrCasConsumerIntegrationTest.java
index 7a92456..b771696 100644
--- a/Solrcas/src/test/java/org/apache/uima/solrcas/SolrCasConsumerIntegrationTest.java
+++ b/Solrcas/src/test/java/org/apache/uima/solrcas/SolrCasConsumerIntegrationTest.java
@@ -94,7 +94,7 @@
private CAS getCAS() throws ResourceInitializationException, CASException {
// Create an initial CASMgr from the factory.
CASMgr casMgr0 = CASFactory.createCAS();
- CASMgr casMgr = null;
+
// this call does nothing: because 2nd arg is null
CasCreationUtils.setupTypeSystem(casMgr0, null);
// Create a writable type system.
@@ -103,7 +103,7 @@
// Commit the type system.
((CASImpl) casMgr0).commitTypeSystem();
- casMgr = CASFactory.createCAS(tsa);
+ CASMgr casMgr = CASFactory.createCAS(tsa);
// Create the Base indexes.
casMgr.initCASIndexes();
