Merge pull request #206 from eclipse/update-solr

Update solr to version 9.1

Author: otaviojava

CHANGELOG.adoc

@@ -11,6 +11,7 @@ and this project adheres to https://semver.org/spec/v2.0.0.html[Semantic Version
 === Changed
 
 - Update ES library to version 8.5
+- Update Apache Solr to version 9.1
 - Update Jakarta API to after the Big-bang
 
 === Removed

README.adoc

@@ -898,7 +898,7 @@ Please note that you can establish properties using the https://microprofile.io/
 |Configuration property |Description
 
 |`jnosql.solr.host`
-|Database's host. It is a prefix to enumerate hosts. E.g.: jnosql.solr.host.1=HOST
+|Database's host. E.g.: jnosql.solr.host=http://localhost:8983/solr/
 
 |`jnosql.solr.user`
 |The user's userID.

jnosql-solr-driver/pom.xml

@@ -38,7 +38,13 @@
         <dependency>
             <groupId>org.apache.solr</groupId>
             <artifactId>solr-solrj</artifactId>
-            <version>8.11.2</version>
+            <version>9.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>solr</artifactId>
+            <version>${testcontainers.version}</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
 

jnosql-solr-driver/src/main/java/org/eclipse/jnosql/communication/solr/document/DefaultSolrDocumentManager.java

@@ -16,16 +16,16 @@
 package org.eclipse.jnosql.communication.solr.document;
 
 import jakarta.data.repository.Direction;
-import org.eclipse.jnosql.communication.document.DocumentDeleteQuery;
-import org.eclipse.jnosql.communication.document.DocumentEntity;
-import org.eclipse.jnosql.communication.document.DocumentQuery;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrQuery.SortClause;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.HttpSolrClient;
+import org.apache.solr.client.solrj.impl.Http2SolrClient;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrDocumentList;
 import org.apache.solr.common.SolrInputDocument;
+import org.eclipse.jnosql.communication.document.DocumentDeleteQuery;
+import org.eclipse.jnosql.communication.document.DocumentEntity;
+import org.eclipse.jnosql.communication.document.DocumentQuery;
 
 import java.io.IOException;
 import java.time.Duration;
@@ -44,13 +44,13 @@
  */
 class DefaultSolrDocumentManager implements SolrDocumentManager {
 
-    private final HttpSolrClient solrClient;
+    private final Http2SolrClient solrClient;
 
     private final String database;
 
     private final boolean automaticCommit;
 
-    DefaultSolrDocumentManager(HttpSolrClient solrClient, String database, boolean automaticCommit) {
+    DefaultSolrDocumentManager(Http2SolrClient solrClient, String database, boolean automaticCommit) {
         this.solrClient = solrClient;
         this.database = database;
         this.automaticCommit = automaticCommit;

jnosql-solr-driver/src/main/java/org/eclipse/jnosql/communication/solr/document/SolrDocumentConfiguration.java

@@ -14,11 +14,12 @@
  */
 package org.eclipse.jnosql.communication.solr.document;
 
+import org.apache.solr.client.solrj.impl.Http2SolrClient;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
+import org.apache.solr.client.solrj.impl.XMLResponseParser;
 import org.eclipse.jnosql.communication.Configurations;
 import org.eclipse.jnosql.communication.Settings;
 import org.eclipse.jnosql.communication.document.DocumentConfiguration;
-import org.apache.solr.client.solrj.impl.HttpSolrClient;
-import org.apache.solr.client.solrj.impl.XMLResponseParser;
 
 import java.util.Arrays;
 
@@ -42,7 +43,7 @@ public class SolrDocumentConfiguration implements DocumentConfiguration {
      * @return a SolrDocumentManagerFactory instance
      * @throws NullPointerException when the mongoClient is null
      */
-    public SolrDocumentManagerFactory get(HttpSolrClient solrClient) throws NullPointerException {
+    public SolrDocumentManagerFactory get(Http2SolrClient solrClient) throws NullPointerException {
         requireNonNull(solrClient, "solrClient is required");
         return new SolrDocumentManagerFactory(solrClient, true);
     }
@@ -58,7 +59,7 @@ public SolrDocumentManagerFactory apply(Settings settings) throws NullPointerExc
 
         boolean automaticCommit = settings.getOrDefault(SolrDocumentConfigurations.AUTOMATIC_COMMIT, true);
 
-        final HttpSolrClient solrClient = new HttpSolrClient.Builder(host).build();
+        final Http2SolrClient solrClient = new Http2SolrClient.Builder(host).build();
         solrClient.setParser(new XMLResponseParser());
         return new SolrDocumentManagerFactory(solrClient, automaticCommit);
 

jnosql-solr-driver/src/main/java/org/eclipse/jnosql/communication/solr/document/SolrDocumentConfigurations.java

@@ -26,7 +26,7 @@
  */
 public enum SolrDocumentConfigurations implements Supplier<String> {
     /**
-     * Database's host. It is a prefix to enumerate hosts. E.g.: jnosql.solr.host.1=HOST
+     * Database's host. E.g.: jnosql.solr.host=http://localhost:8983/solr/
      */
     HOST("jnosql.solr.host"),
     /**

jnosql-solr-driver/src/main/java/org/eclipse/jnosql/communication/solr/document/SolrDocumentManagerFactory.java

@@ -15,8 +15,8 @@
 
 package org.eclipse.jnosql.communication.solr.document;
 
+import org.apache.solr.client.solrj.impl.Http2SolrClient;
 import org.eclipse.jnosql.communication.document.DocumentManagerFactory;
-import org.apache.solr.client.solrj.impl.HttpSolrClient;
 
 import java.util.Objects;
 
@@ -25,11 +25,11 @@
  */
 public class SolrDocumentManagerFactory implements DocumentManagerFactory {
 
-    private final HttpSolrClient solrClient;
+    private final Http2SolrClient solrClient;
 
     private final boolean automaticCommit;
 
-    SolrDocumentManagerFactory(HttpSolrClient solrClient, boolean automaticCommit) {
+    SolrDocumentManagerFactory(Http2SolrClient solrClient, boolean automaticCommit) {
         this.solrClient = solrClient;
         this.automaticCommit = automaticCommit;
     }
@@ -38,7 +38,7 @@ public class SolrDocumentManagerFactory implements DocumentManagerFactory {
     public SolrDocumentManager apply(String database) {
         Objects.requireNonNull(database, "database is required");
         final String baseURL = solrClient.getBaseURL() + '/' + database;
-        return new DefaultSolrDocumentManager(new HttpSolrClient.Builder(baseURL).build(), database, automaticCommit);
+        return new DefaultSolrDocumentManager(new Http2SolrClient.Builder(baseURL).build(), database, automaticCommit);
     }
 
 

jnosql-solr-driver/src/main/java/org/eclipse/jnosql/communication/solr/document/SolrUtils.java

@@ -14,13 +14,13 @@
  */
 package org.eclipse.jnosql.communication.solr.document;
 
+import org.apache.solr.common.SolrDocument;
+import org.apache.solr.common.SolrDocumentList;
+import org.apache.solr.common.SolrInputDocument;
 import org.eclipse.jnosql.communication.Value;
 import org.eclipse.jnosql.communication.document.Document;
 import org.eclipse.jnosql.communication.document.DocumentEntity;
 import org.eclipse.jnosql.communication.document.Documents;
-import org.apache.solr.common.SolrDocument;
-import org.apache.solr.common.SolrDocumentList;
-import org.apache.solr.common.SolrInputDocument;
 import org.eclipse.jnosql.communication.driver.ValueUtil;
 
 import java.util.List;

jnosql-solr-driver/src/test/java/org/eclipse/jnosql/communication/solr/document/DefaultSolrDocumentManagerTest.java

@@ -37,11 +37,10 @@
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
-
-import static org.eclipse.jnosql.communication.document.DocumentDeleteQuery.delete;
-import static org.eclipse.jnosql.communication.document.DocumentQuery.select;
 import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.eclipse.jnosql.communication.document.DocumentDeleteQuery.delete;
+import static org.eclipse.jnosql.communication.document.DocumentQuery.select;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -55,7 +54,7 @@ public class DefaultSolrDocumentManagerTest {
 
     @BeforeAll
     public static void setUp() {
-        entityManager = ManagerFactorySupplier.INSTANCE.get("database");
+        entityManager = SolrContainerSupplier.INSTANCE.get();
     }
 
     @Test

jnosql-solr-driver/src/test/java/org/eclipse/jnosql/communication/solr/document/ManagerFactorySupplier.java renamed to jnosql-solr-driver/src/test/java/org/eclipse/jnosql/communication/solr/document/SolrContainerSupplier.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022 Contributors to the Eclipse Foundation
+ *  Copyright (c) 2023 Contributors to the Eclipse Foundation
  *   All rights reserved. This program and the accompanying materials
  *   are made available under the terms of the Eclipse Public License v1.0
  *   and Apache License v2.0 which accompanies this distribution.
@@ -12,25 +12,42 @@
  *
  *   Otavio Santana
  */
-
 package org.eclipse.jnosql.communication.solr.document;
 
-
 import org.eclipse.jnosql.communication.Settings;
+import org.testcontainers.containers.SolrContainer;
 
-public enum ManagerFactorySupplier {
+import java.util.function.Supplier;
 
+enum SolrContainerSupplier implements Supplier<SolrDocumentManager> {
     INSTANCE;
 
-    public SolrDocumentManager get(String database) {
+    private static final String SOLR_IMAGE = "solr:9.1.1";
+    private static final String COLLECTION = "database";
+    private final SolrContainer container;
+
+    {
+        container = new SolrContainer(SOLR_IMAGE)
+                .withCollection(COLLECTION);
+        container.start();
+    }
+
+    @Override
+    public SolrDocumentManager get() {
         SolrDocumentConfiguration configuration = new SolrDocumentConfiguration();
         final SolrDocumentManagerFactory managerFactory = configuration.apply(getSettings());
-        return managerFactory.apply(database);
+        return managerFactory.apply(COLLECTION);
     }
 
-    public Settings getSettings() {
+    private Settings getSettings() {
         return Settings.builder()
-                .put(SolrDocumentConfigurations.HOST.get()+".1", "localhost:27017")
+                .put(SolrDocumentConfigurations.HOST.get(), SolrContainerSupplier.INSTANCE.getHost())
                 .build();
     }
+
+    private String getHost() {
+        return "http://" + container.getHost() + ":" + container.getSolrPort()+  "/solr";
+    }
+
+
 }