TIKA-4321 -- rm solr 6 and 7 unit tests and turn logging to error. (#…

…1994) * TIKA-4321 -- rm solr 6 and 7 unit tests and turn logging to error. (cherry picked from commit d9dfe20)
apache · Oct 22, 2024 · c50d461 · c50d461
1 parent 66ec7a0
commit c50d461
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 176 deletions.
diff --git a/...-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr6Test.java b/...-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr6Test.java
diff --git a/...ntegration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr6ZkTest.java b/...ntegration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr6ZkTest.java
diff --git a/...-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr7Test.java b/...-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr7Test.java
diff --git a/...ntegration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr7ZkTest.java b/...ntegration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr7ZkTest.java
diff --git a/...-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr8Test.java b/...-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr8Test.java
@@ -23,7 +23,7 @@ public class TikaPipesSolr8Test extends TikaPipesSolrTestBase {
 
     @Override
     public String getSolrImageName() {
-        return "solr:8.11.2";
+        return "solr:8.11.4";
     }
 
     @Override

diff --git a/...-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr9Test.java b/...-integration-tests/src/test/java/org/apache/tika/pipes/solr/tests/TikaPipesSolr9Test.java
@@ -23,7 +23,7 @@ public class TikaPipesSolr9Test extends TikaPipesSolrTestBase {
 
     @Override
     public String getSolrImageName() {
-        return "solr:9.3";
+        return "solr:9.7.0";
     }
 
     @Override

diff --git a/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/log4j2.xml b/tika-integration-tests/tika-pipes-solr-integration-tests/src/test/resources/log4j2.xml
@@ -18,14 +18,14 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<Configuration status="WARN">
+<Configuration>
   <Appenders>
     <Console name="Console" target="SYSTEM_ERR">
       <PatternLayout pattern="%-5p [%t] %d{HH:mm:ss,SSS} %c %m%n"/>
     </Console>
   </Appenders>
   <Loggers>
-    <Root level="info">
+    <Root level="error">
       <AppenderRef ref="Console"/>
     </Root>
   </Loggers>

diff --git a/tika-parent/pom.xml b/tika-parent/pom.xml
@@ -428,8 +428,7 @@
     <slf4j.version>2.0.16</slf4j.version>
     <sis.version>1.4</sis.version>
     <snappy.version>1.1.10.7</snappy.version>
-    <!-- can't update because this requires non trivial changes in SolrEmitter.initialize() -->
-    <solrj.version>8.11.4</solrj.version>
+    <solrj.version>9.7.0</solrj.version>
     <spring.version>6.1.14</spring.version>
     <sqlite.version>3.46.1.3</sqlite.version>
     <stax.ex.version>2.1.0</stax.ex.version>

diff --git a/...tters/tika-emitter-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitter.java b/...tters/tika-emitter-solr/src/main/java/org/apache/tika/pipes/emitter/solr/SolrEmitter.java
@@ -25,9 +25,11 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.impl.Http2SolrClient;
 import org.apache.solr.client.solrj.impl.LBHttpSolrClient;
 import org.apache.solr.client.solrj.request.UpdateRequest;
 import org.apache.solr.client.solrj.response.UpdateResponse;
@@ -46,6 +48,7 @@
 import org.apache.tika.pipes.emitter.AbstractEmitter;
 import org.apache.tika.pipes.emitter.EmitData;
 import org.apache.tika.pipes.emitter.TikaEmitterException;
+import org.apache.tika.utils.StringUtils;
 
 
 public class SolrEmitter extends AbstractEmitter implements Initializable {
@@ -307,9 +310,21 @@ public void setEmbeddedFileFieldName(String embeddedFileFieldName) {
     @Override
     public void initialize(Map<String, Param> params) throws TikaConfigException {
         if (solrUrls == null || solrUrls.isEmpty()) {
+            //TODO -- there's more that we need to pass through, including ssl etc.
+            Http2SolrClient.Builder http2SolrClientBuilder = new Http2SolrClient.Builder();
+            if (!StringUtils.isBlank(httpClientFactory.getUserName())) {
+                http2SolrClientBuilder.withBasicAuthCredentials(httpClientFactory.getUserName(), httpClientFactory.getPassword());
+            }
+            http2SolrClientBuilder
+                    .withRequestTimeout(httpClientFactory.getRequestTimeout(), TimeUnit.MILLISECONDS)
+                    .withConnectionTimeout(connectionTimeout, TimeUnit.MILLISECONDS);
+
+
+            Http2SolrClient http2SolrClient = http2SolrClientBuilder.build();
             solrClient = new CloudSolrClient.Builder(solrZkHosts, Optional.ofNullable(solrZkChroot))
-                    .withConnectionTimeout(connectionTimeout).withSocketTimeout(socketTimeout)
-                    .withHttpClient(httpClientFactory.build()).build();
+                    .withHttpClient(http2SolrClient)
+                    .build();
+
         } else {
             solrClient = new LBHttpSolrClient.Builder().withConnectionTimeout(connectionTimeout)
                     .withSocketTimeout(socketTimeout).withHttpClient(httpClientFactory.build())

diff --git a/...erator-solr/src/main/java/org/apache/tika/pipes/pipesiterator/solr/SolrPipesIterator.java b/...erator-solr/src/main/java/org/apache/tika/pipes/pipesiterator/solr/SolrPipesIterator.java
@@ -24,12 +24,14 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.impl.CloudSolrClient;
+import org.apache.solr.client.solrj.impl.Http2SolrClient;
 import org.apache.solr.client.solrj.impl.LBHttpSolrClient;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrDocument;
@@ -49,6 +51,7 @@
 import org.apache.tika.pipes.emitter.EmitKey;
 import org.apache.tika.pipes.fetcher.FetchKey;
 import org.apache.tika.pipes.pipesiterator.PipesIterator;
+import org.apache.tika.utils.StringUtils;
 
 /**
  * Iterates through results from a Solr query.
@@ -232,11 +235,21 @@ protected void enqueue() throws InterruptedException, IOException, TimeoutExcept
 
     private SolrClient createSolrClient() throws TikaConfigException {
         if (solrUrls == null || solrUrls.isEmpty()) {
+            //TODO -- there's more that we need to pass through, including ssl etc.
+            Http2SolrClient.Builder http2SolrClientBuilder = new Http2SolrClient.Builder();
+            if (!StringUtils.isBlank(httpClientFactory.getUserName())) {
+                http2SolrClientBuilder.withBasicAuthCredentials(httpClientFactory.getUserName(), httpClientFactory.getPassword());
+            }
+            http2SolrClientBuilder
+                    .withRequestTimeout(httpClientFactory.getRequestTimeout(), TimeUnit.MILLISECONDS)
+                    .withConnectionTimeout(connectionTimeout, TimeUnit.MILLISECONDS);
+
+
+            Http2SolrClient http2SolrClient = http2SolrClientBuilder.build();
             return new CloudSolrClient.Builder(solrZkHosts, Optional.ofNullable(solrZkChroot))
-                    .withHttpClient(httpClientFactory.build())
-                    .withConnectionTimeout(connectionTimeout)
-                    .withSocketTimeout(socketTimeout)
+                    .withHttpClient(http2SolrClient)
                     .build();
+
         }
         return new LBHttpSolrClient.Builder()
                 .withConnectionTimeout(connectionTimeout)