diff --git a/.github/native-tests.json b/.github/native-tests.json index cc763f3e9f9b0..5c1b2e8d8bda0 100644 --- a/.github/native-tests.json +++ b/.github/native-tests.json @@ -39,7 +39,7 @@ { "category": "Data6", "timeout": 95, - "test-modules": "elasticsearch-rest-client, elasticsearch-rest-high-level-client, elasticsearch-java-client, hibernate-search-orm-elasticsearch, hibernate-search-orm-elasticsearch-tenancy, hibernate-search-orm-opensearch, hibernate-search-orm-elasticsearch-coordination-outbox-polling", + "test-modules": "elasticsearch-rest-client, elasticsearch-java-client, hibernate-search-orm-elasticsearch, hibernate-search-orm-elasticsearch-tenancy, hibernate-search-orm-opensearch, hibernate-search-orm-elasticsearch-coordination-outbox-polling", "os-name": "ubuntu-latest" }, { diff --git a/bom/application/pom.xml b/bom/application/pom.xml index f5b5e1818a7c2..17ecbd8e08879 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -109,8 +109,6 @@ 2.1 8.0.0.Final 8.8.2 - - 7.10.2 2.2.21 2.2.5.Final 2.2.2.Final @@ -753,16 +751,6 @@ quarkus-elasticsearch-rest-client-deployment ${project.version} - - io.quarkus - quarkus-elasticsearch-rest-high-level-client - ${project.version} - - - io.quarkus - quarkus-elasticsearch-rest-high-level-client-deployment - ${project.version} - io.quarkus quarkus-elasticsearch-java-client @@ -5765,18 +5753,6 @@ - - org.elasticsearch.client - elasticsearch-rest-high-level-client - ${elasticsearch-proprietary-components-keeping-old-opensource-version.version} - - - - org.apache.logging.log4j - log4j-api - - - org.elasticsearch.client elasticsearch-rest-client-sniffer diff --git a/build-parent/pom.xml b/build-parent/pom.xml index ede0ed218ce1f..168eb617d01dd 100644 --- a/build-parent/pom.xml +++ b/build-parent/pom.xml @@ -80,7 +80,7 @@ :Z - 7.16.3 + 8.8.2 docker.io/elastic/elasticsearch:${elasticsearch-server.version} docker.io/elastic/logstash:${elasticsearch-server.version} docker.io/elastic/kibana:${elasticsearch-server.version} diff --git a/core/deployment/src/main/java/io/quarkus/deployment/Capability.java b/core/deployment/src/main/java/io/quarkus/deployment/Capability.java index ee877040cd1a3..b56057ee024c3 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/Capability.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/Capability.java @@ -73,8 +73,6 @@ public interface Capability { String MONGODB_PANACHE = QUARKUS_PREFIX + ".mongodb.panache"; String MONGODB_PANACHE_KOTLIN = MONGODB_PANACHE + ".kotlin"; - String ELASTICSEARCH_REST_HIGH_LEVEL_CLIENT = QUARKUS_PREFIX + ".elasticsearch-rest-high-level-client"; - String FLYWAY = QUARKUS_PREFIX + ".flyway"; String LIQUIBASE = QUARKUS_PREFIX + ".liquibase"; diff --git a/devtools/bom-descriptor-json/pom.xml b/devtools/bom-descriptor-json/pom.xml index 946fcea64de2c..230bd9f29e5e7 100644 --- a/devtools/bom-descriptor-json/pom.xml +++ b/devtools/bom-descriptor-json/pom.xml @@ -473,19 +473,6 @@ - - io.quarkus - quarkus-elasticsearch-rest-high-level-client - ${project.version} - pom - test - - - * - * - - - io.quarkus quarkus-elytron-security diff --git a/docs/pom.xml b/docs/pom.xml index 1f66edd36b5d4..46b84ec333121 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -487,19 +487,6 @@ - - io.quarkus - quarkus-elasticsearch-rest-high-level-client-deployment - ${project.version} - pom - test - - - * - * - - - io.quarkus quarkus-elytron-security-deployment diff --git a/docs/src/main/asciidoc/centralized-log-management.adoc b/docs/src/main/asciidoc/centralized-log-management.adoc index 6ee23b3d85598..cd640e7289de2 100644 --- a/docs/src/main/asciidoc/centralized-log-management.adoc +++ b/docs/src/main/asciidoc/centralized-log-management.adoc @@ -109,6 +109,7 @@ services: environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" discovery.type: "single-node" + cluster.routing.allocation.disk.threshold_enabled: false networks: - graylog @@ -197,6 +198,7 @@ services: environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" discovery.type: "single-node" + cluster.routing.allocation.disk.threshold_enabled: false networks: - elk @@ -286,6 +288,7 @@ services: environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" discovery.type: "single-node" + cluster.routing.allocation.disk.threshold_enabled: false networks: - efk @@ -372,6 +375,8 @@ services: - "9300:9300" environment: ES_JAVA_OPTS: "-Xms512m -Xmx512m" + discovery.type: "single-node" + cluster.routing.allocation.disk.threshold_enabled: false networks: - efk diff --git a/docs/src/main/asciidoc/elasticsearch.adoc b/docs/src/main/asciidoc/elasticsearch.adoc index 2ab5b3ee9d577..a79632c8e07a7 100644 --- a/docs/src/main/asciidoc/elasticsearch.adoc +++ b/docs/src/main/asciidoc/elasticsearch.adoc @@ -19,10 +19,8 @@ Quarkus provides two ways of accessing Elasticsearch: [WARNING] ==== -A third Quarkus extension for the "high level REST Client" exists, but is deprecated and will be removed in a future version, -as this client has been deprecated by Elastic and has some licensing issues. - -It is highly recommended to upgrade to the new Elasticsearch Java client extension. +A third Quarkus extension for the "high level REST Client" used to exist, +but was removed as this client has been deprecated by Elastic and has some licensing issues. ==== == Prerequisites @@ -352,6 +350,7 @@ If you want to use Docker to run an Elasticsearch instance, you can use the foll [source,bash,subs=attributes+] ---- docker run --name elasticsearch -e "discovery.type=single-node" -e "ES_JAVA_OPTS=-Xms512m -Xmx512m"\ + -e "cluster.routing.allocation.disk.threshold_enabled=false" --rm -p 9200:9200 {elasticsearch-image} ---- diff --git a/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc b/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc index 405d16c22a334..520433bbbecdc 100644 --- a/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc +++ b/docs/src/main/asciidoc/hibernate-search-orm-elasticsearch.adoc @@ -626,7 +626,7 @@ quarkus.datasource.db-kind=postgresql <2> quarkus.hibernate-orm.sql-load-script=import.sql <3> -quarkus.hibernate-search-orm.elasticsearch.version=7 <4> +quarkus.hibernate-search-orm.elasticsearch.version=8 <4> quarkus.hibernate-search-orm.indexing.plan.synchronization.strategy=sync <5> %prod.quarkus.datasource.jdbc.url=jdbc:postgresql://localhost/quarkus_test <6> @@ -786,7 +786,7 @@ quarkus.datasource.db-kind=h2 quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1 quarkus.hibernate-search-orm.elasticsearch.hosts=es1.mycompany.com:9200 -quarkus.hibernate-search-orm.elasticsearch.version=7 +quarkus.hibernate-search-orm.elasticsearch.version=8 ---- Using a map based approach, it is also possible to configure named persistence units: @@ -806,10 +806,10 @@ quarkus.hibernate-orm."inventory".datasource=inventory <4> quarkus.hibernate-orm."inventory".packages=org.acme.model.inventory quarkus.hibernate-search-orm."users".elasticsearch.hosts=es1.mycompany.com:9200 <5> -quarkus.hibernate-search-orm."users".elasticsearch.version=7 +quarkus.hibernate-search-orm."users".elasticsearch.version=8 quarkus.hibernate-search-orm."inventory".elasticsearch.hosts=es2.mycompany.com:9200 <6> -quarkus.hibernate-search-orm."inventory".elasticsearch.version=7 +quarkus.hibernate-search-orm."inventory".elasticsearch.version=8 ---- <1> Define a datasource named `users`. <2> Define a datasource named `inventory`. diff --git a/docs/src/main/asciidoc/native-and-ssl.adoc b/docs/src/main/asciidoc/native-and-ssl.adoc index f3f77f6738d8c..fe7a020991ebc 100644 --- a/docs/src/main/asciidoc/native-and-ssl.adoc +++ b/docs/src/main/asciidoc/native-and-ssl.adoc @@ -85,7 +85,7 @@ As SSL is de facto the standard nowadays, we decided to enable its support autom * the Agroal connection pooling extension (`quarkus-agroal`), * the Amazon Services extension (`quarkus-amazon-*`), * the Consul Config extension (`quarkus-config-consul`), - * the Elasticsearch client extensions (`quarkus-elasticsearch-rest-client` and `quarkus-elasticsearch-rest-high-level-client`) and thus the Hibernate Search Elasticsearch extension (`quarkus-hibernate-search-orm-elasticsearch`), + * the Elasticsearch client extensions (`quarkus-elasticsearch-rest-client` and `quarkus-elasticsearch-java-client`) and thus the Hibernate Search Elasticsearch extension (`quarkus-hibernate-search-orm-elasticsearch`), * the Elytron Security OAuth2 extension (`quarkus-elytron-security-oauth2`), * the gRPC extension (`quarkus-grpc`), * the Infinispan Client extension (`quarkus-infinispan-client`). diff --git a/extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/DevServicesElasticsearchProcessor.java b/extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/DevServicesElasticsearchProcessor.java index 14de2679ed56f..bb30ad5c22fb5 100644 --- a/extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/DevServicesElasticsearchProcessor.java +++ b/extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/DevServicesElasticsearchProcessor.java @@ -208,10 +208,16 @@ private DevServicesResultBuildItem.RunningDevService startElasticsearch( } timeout.ifPresent(container::withStartupTimeout); - container.withEnv(config.containerEnv); container.addEnv("ES_JAVA_OPTS", config.javaOpts); // Disable security as else we would need to configure it correctly to avoid tons of WARNING in the log container.addEnv("xpack.security.enabled", "false"); + // Disable disk-based shard allocation thresholds: + // in a single-node setup they just don't make sense, + // and lead to problems on large disks with little space left. + // See https://www.elastic.co/guide/en/elasticsearch/reference/8.8/modules-cluster.html#disk-based-shard-allocation + container.addEnv("cluster.routing.allocation.disk.threshold_enabled", "false"); + + container.withEnv(config.containerEnv); container.start(); return new DevServicesResultBuildItem.RunningDevService(Feature.ELASTICSEARCH_REST_CLIENT_COMMON.getName(), diff --git a/extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/ElasticsearchDevServicesBuildTimeConfig.java b/extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/ElasticsearchDevServicesBuildTimeConfig.java index b70c670201752..8647c4a94afb8 100644 --- a/extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/ElasticsearchDevServicesBuildTimeConfig.java +++ b/extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/ElasticsearchDevServicesBuildTimeConfig.java @@ -31,7 +31,7 @@ public class ElasticsearchDevServicesBuildTimeConfig { * The Elasticsearch container image to use. * Defaults to the elasticsearch image provided by Elastic. */ - @ConfigItem(defaultValue = "docker.elastic.co/elasticsearch/elasticsearch:7.17.0") + @ConfigItem(defaultValue = "docker.elastic.co/elasticsearch/elasticsearch:8.8.2") public String imageName; /** diff --git a/extensions/elasticsearch-rest-high-level-client/deployment/pom.xml b/extensions/elasticsearch-rest-high-level-client/deployment/pom.xml deleted file mode 100644 index 12e5b32daed5d..0000000000000 --- a/extensions/elasticsearch-rest-high-level-client/deployment/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - io.quarkus - quarkus-elasticsearch-rest-high-level-client-parent - 999-SNAPSHOT - ../pom.xml - - 4.0.0 - - quarkus-elasticsearch-rest-high-level-client-deployment - Quarkus - Elasticsearch REST high level client - Deployment - - - - io.quarkus - quarkus-core-deployment - - - io.quarkus - quarkus-elasticsearch-rest-client-common-deployment - - - io.quarkus - quarkus-elasticsearch-rest-client-deployment - - - io.quarkus - quarkus-elasticsearch-rest-high-level-client - - - io.quarkus - quarkus-arc-deployment - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - io.quarkus - quarkus-extension-processor - ${project.version} - - - - - - - - - \ No newline at end of file diff --git a/extensions/elasticsearch-rest-high-level-client/deployment/src/main/java/io/quarkus/elasticsearch/restclient/highlevel/deployment/ElasticsearchHighLevelClientProcessor.java b/extensions/elasticsearch-rest-high-level-client/deployment/src/main/java/io/quarkus/elasticsearch/restclient/highlevel/deployment/ElasticsearchHighLevelClientProcessor.java deleted file mode 100644 index 32e239e7c45b2..0000000000000 --- a/extensions/elasticsearch-rest-high-level-client/deployment/src/main/java/io/quarkus/elasticsearch/restclient/highlevel/deployment/ElasticsearchHighLevelClientProcessor.java +++ /dev/null @@ -1,28 +0,0 @@ -package io.quarkus.elasticsearch.restclient.highlevel.deployment; - -import io.quarkus.arc.deployment.AdditionalBeanBuildItem; -import io.quarkus.deployment.Feature; -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.builditem.FeatureBuildItem; -import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; -import io.quarkus.elasticsearch.restclient.highlevel.runtime.ElasticsearchRestHighLevelClientProducer; - -class ElasticsearchHighLevelClientProcessor { - - @BuildStep - FeatureBuildItem feature() { - return new FeatureBuildItem(Feature.ELASTICSEARCH_REST_HIGH_LEVEL_CLIENT); - } - - @BuildStep() - AdditionalBeanBuildItem build() { - return AdditionalBeanBuildItem.unremovableOf(ElasticsearchRestHighLevelClientProducer.class); - } - - @BuildStep - public ReflectiveClassBuildItem registerForReflection() { - return ReflectiveClassBuildItem.builder("org.apache.logging.log4j.message.ReusableMessageFactory", - "org.apache.logging.log4j.message.DefaultFlowMessageFactory").methods().build(); - } - -} diff --git a/extensions/elasticsearch-rest-high-level-client/pom.xml b/extensions/elasticsearch-rest-high-level-client/pom.xml deleted file mode 100644 index 79f0f2240d206..0000000000000 --- a/extensions/elasticsearch-rest-high-level-client/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - quarkus-extensions-parent - io.quarkus - 999-SNAPSHOT - ../pom.xml - - - 4.0.0 - - quarkus-elasticsearch-rest-high-level-client-parent - Quarkus - Elasticsearch REST high level client - Parent - pom - - - runtime - deployment - - - \ No newline at end of file diff --git a/extensions/elasticsearch-rest-high-level-client/runtime/pom.xml b/extensions/elasticsearch-rest-high-level-client/runtime/pom.xml deleted file mode 100644 index 566c7ad7d941d..0000000000000 --- a/extensions/elasticsearch-rest-high-level-client/runtime/pom.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - - io.quarkus - quarkus-elasticsearch-rest-high-level-client-parent - 999-SNAPSHOT - ../pom.xml - - 4.0.0 - - quarkus-elasticsearch-rest-high-level-client - Quarkus - Elasticsearch REST high level client - Runtime - Connect to an Elasticsearch cluster using the REST high level client - - - - io.quarkus - quarkus-core - - - io.quarkus - quarkus-elasticsearch-rest-client-common - - - io.quarkus - quarkus-elasticsearch-rest-client - - - io.quarkus - quarkus-arc - - - org.jboss.logmanager - log4j2-jboss-logmanager - - - - org.elasticsearch.client - elasticsearch-rest-high-level-client - - - - - - org.apache.lucene - lucene-analyzers-common - - - org.apache.lucene - lucene-backward-codecs - - - org.apache.lucene - lucene-grouping - - - org.apache.lucene - lucene-memory - - - org.apache.lucene - lucene-misc - - - org.apache.lucene - lucene-queryparser - - - org.apache.lucene - lucene-sandbox - - - org.apache.lucene - lucene-spatial - - - org.apache.lucene - lucene-spatial-extras - - - org.apache.lucene - lucene-spatial3d - - - org.apache.lucene - lucene-suggest - - - - - - - - - - io.quarkus - quarkus-extension-maven-plugin - - - io.quarkus.elasticsearch-rest-high-level-client - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - io.quarkus - quarkus-extension-processor - ${project.version} - - - - - - - - diff --git a/extensions/elasticsearch-rest-high-level-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/highlevel/runtime/ElasticsearchRestHighLevelClientProducer.java b/extensions/elasticsearch-rest-high-level-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/highlevel/runtime/ElasticsearchRestHighLevelClientProducer.java deleted file mode 100644 index 789b12460ab7b..0000000000000 --- a/extensions/elasticsearch-rest-high-level-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/highlevel/runtime/ElasticsearchRestHighLevelClientProducer.java +++ /dev/null @@ -1,43 +0,0 @@ -package io.quarkus.elasticsearch.restclient.highlevel.runtime; - -import java.io.IOException; -import java.io.UncheckedIOException; -import java.util.Collections; - -import jakarta.annotation.PreDestroy; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.inject.Default; -import jakarta.enterprise.inject.Produces; -import jakarta.inject.Inject; -import jakarta.inject.Singleton; - -import org.elasticsearch.client.RestClient; -import org.elasticsearch.client.RestHighLevelClient; - -@ApplicationScoped -public class ElasticsearchRestHighLevelClientProducer { - - @Inject - @Default - RestClient restClient; - - private RestHighLevelClient client; - - @Produces - @Singleton - public RestHighLevelClient restHighLevelClient() { - this.client = new QuarkusRestHighLevelClient(restClient, RestClient::close, Collections.emptyList()); - return this.client; - } - - @PreDestroy - void destroy() { - try { - if (this.client != null) { - this.client.close(); - } - } catch (IOException ioe) { - throw new UncheckedIOException(ioe); - } - } -} diff --git a/extensions/elasticsearch-rest-high-level-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/highlevel/runtime/QuarkusRestHighLevelClient.java b/extensions/elasticsearch-rest-high-level-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/highlevel/runtime/QuarkusRestHighLevelClient.java deleted file mode 100644 index 661a422899148..0000000000000 --- a/extensions/elasticsearch-rest-high-level-client/runtime/src/main/java/io/quarkus/elasticsearch/restclient/highlevel/runtime/QuarkusRestHighLevelClient.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.quarkus.elasticsearch.restclient.highlevel.runtime; - -import java.io.IOException; -import java.util.List; - -import org.elasticsearch.client.RestClient; -import org.elasticsearch.client.RestHighLevelClient; -import org.elasticsearch.common.CheckedConsumer; -import org.elasticsearch.common.xcontent.NamedXContentRegistry; - -/** - * The RestHighLevelClient cannot be built with an existing RestClient. - *

- * The only (and documented - see javadoc) way to do it is to subclass it and use its protected constructor. - */ -class QuarkusRestHighLevelClient extends RestHighLevelClient { - - protected QuarkusRestHighLevelClient(RestClient restClient, CheckedConsumer doClose, - List namedXContentEntries) { - super(restClient, doClose, namedXContentEntries); - } -} diff --git a/extensions/elasticsearch-rest-high-level-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/elasticsearch-rest-high-level-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml deleted file mode 100644 index 08a32f78d5414..0000000000000 --- a/extensions/elasticsearch-rest-high-level-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -artifact: ${project.groupId}:${project.artifactId}:${project.version} -name: "Elasticsearch REST High Level Client" -metadata: - keywords: - - "elasticsearch" - - "full text" - - "search" - guide: "https://quarkus.io/guides/elasticsearch" - categories: - - "data" - status: "deprecated" - config: - - "quarkus.elasticsearch." diff --git a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/pom.xml b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/pom.xml index c346c9a80a7f9..bf5a1e9fb07c4 100644 --- a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/pom.xml +++ b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/pom.xml @@ -122,6 +122,12 @@ single-node false -Xms512m -Xmx512m + + false 9200:9200 diff --git a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/resources/application-multiple-persistence-units.properties b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/resources/application-multiple-persistence-units.properties index 9205c99a5af03..f581b1715e944 100644 --- a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/resources/application-multiple-persistence-units.properties +++ b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/resources/application-multiple-persistence-units.properties @@ -7,7 +7,7 @@ quarkus.datasource.data1.jdbc.url=jdbc:h2:mem:data1;DB_CLOSE_DELAY=-1 quarkus.hibernate-orm.database.generation=drop-and-create quarkus.hibernate-orm.datasource= -quarkus.hibernate-search-orm.elasticsearch.version=7 +quarkus.hibernate-search-orm.elasticsearch.version=8 quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200} quarkus.hibernate-search-orm.elasticsearch.protocol=${elasticsearch.protocol:http} quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop @@ -16,7 +16,7 @@ quarkus.hibernate-search-orm.coordination.strategy=outbox-polling quarkus.hibernate-orm."pu1".database.generation=drop-and-create quarkus.hibernate-orm."pu1".datasource=data1 -quarkus.hibernate-search-orm."pu1".elasticsearch.version=7 +quarkus.hibernate-search-orm."pu1".elasticsearch.version=8 quarkus.hibernate-search-orm."pu1".elasticsearch.hosts=${elasticsearch.hosts:localhost:9200} quarkus.hibernate-search-orm."pu1".elasticsearch.protocol=${elasticsearch.protocol:http} quarkus.hibernate-search-orm."pu1".schema-management.strategy=drop-and-create-and-drop diff --git a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/resources/application.properties b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/resources/application.properties index 4ebf423c76656..da45874756f06 100644 --- a/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/resources/application.properties +++ b/extensions/hibernate-search-orm-coordination-outbox-polling/deployment/src/test/resources/application.properties @@ -3,7 +3,7 @@ quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1 quarkus.hibernate-orm.database.generation=drop-and-create -quarkus.hibernate-search-orm.elasticsearch.version=7 +quarkus.hibernate-search-orm.elasticsearch.version=8 quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200} quarkus.hibernate-search-orm.elasticsearch.protocol=${elasticsearch.protocol:http} quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml b/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml index 4d92af9a5529e..6f2645e3e2bf0 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/pom.xml @@ -127,6 +127,12 @@ single-node false -Xms512m -Xmx512m + + false 9200:9200 diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-multiple-persistence-units.properties b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-multiple-persistence-units.properties index a8744d6fc51ec..0f6a3846d4383 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-multiple-persistence-units.properties +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-multiple-persistence-units.properties @@ -13,7 +13,7 @@ quarkus.datasource.data3.jdbc.url=jdbc:h2:mem:data3;DB_CLOSE_DELAY=-1 quarkus.hibernate-orm.datasource= quarkus.hibernate-orm.database.generation=drop-and-create -quarkus.hibernate-search-orm.elasticsearch.version=7 +quarkus.hibernate-search-orm.elasticsearch.version=8 quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200} quarkus.hibernate-search-orm.elasticsearch.protocol=${elasticsearch.protocol:http} quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop @@ -22,7 +22,7 @@ quarkus.hibernate-search-orm.indexing.plan.synchronization.strategy=sync quarkus.hibernate-orm."pu1".database.generation=drop-and-create quarkus.hibernate-orm."pu1".datasource=data1 -quarkus.hibernate-search-orm."pu1".elasticsearch.version=7 +quarkus.hibernate-search-orm."pu1".elasticsearch.version=8 quarkus.hibernate-search-orm."pu1".elasticsearch.hosts=${elasticsearch.hosts:localhost:9200} quarkus.hibernate-search-orm."pu1".elasticsearch.protocol=${elasticsearch.protocol:http} quarkus.hibernate-search-orm."pu1".schema-management.strategy=drop-and-create-and-drop @@ -31,7 +31,7 @@ quarkus.hibernate-search-orm."pu1".indexing.plan.synchronization.strategy=sync quarkus.hibernate-orm."pu2".database.generation=drop-and-create quarkus.hibernate-orm."pu2".datasource=data2 -quarkus.hibernate-search-orm."pu2".elasticsearch.version=7 +quarkus.hibernate-search-orm."pu2".elasticsearch.version=8 quarkus.hibernate-search-orm."pu2".elasticsearch.hosts=${elasticsearch.hosts:localhost:9200} quarkus.hibernate-search-orm."pu2".elasticsearch.protocol=${elasticsearch.protocol:http} quarkus.hibernate-search-orm."pu2".schema-management.strategy=drop-and-create-and-drop diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-start-offline.properties b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-start-offline.properties index 88ef2edcc8631..84523c3108fc2 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-start-offline.properties +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application-start-offline.properties @@ -3,7 +3,7 @@ quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1 quarkus.hibernate-orm.database.generation=drop-and-create -quarkus.hibernate-search-orm.elasticsearch.version=7.10 +quarkus.hibernate-search-orm.elasticsearch.version=8.8 # Simulate an offline Elasticsearch instance by pointing to a non-existing cluster quarkus.hibernate-search-orm.elasticsearch.hosts=localhost:14800 quarkus.hibernate-search-orm.schema-management.strategy=none diff --git a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application.properties b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application.properties index a8fbe9b92cdc2..419a324d6b66f 100644 --- a/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application.properties +++ b/extensions/hibernate-search-orm-elasticsearch/deployment/src/test/resources/application.properties @@ -3,7 +3,7 @@ quarkus.datasource.jdbc.url=jdbc:h2:mem:default;DB_CLOSE_DELAY=-1 quarkus.hibernate-orm.database.generation=drop-and-create -quarkus.hibernate-search-orm.elasticsearch.version=7 +quarkus.hibernate-search-orm.elasticsearch.version=8 quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200} quarkus.hibernate-search-orm.elasticsearch.protocol=${elasticsearch.protocol:http} quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop diff --git a/extensions/pom.xml b/extensions/pom.xml index 453c4a3ba3f50..dca6d6983881d 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -101,7 +101,6 @@ hibernate-search-orm-coordination-outbox-polling elasticsearch-rest-client-common elasticsearch-rest-client - elasticsearch-rest-high-level-client elasticsearch-java-client kafka-client kafka-streams diff --git a/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-bom-quarkus-platform-descriptor-999-SNAPSHOT-999-SNAPSHOT.json b/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-bom-quarkus-platform-descriptor-999-SNAPSHOT-999-SNAPSHOT.json index 243a5afb3590c..1ee6e7f002a23 100644 --- a/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-bom-quarkus-platform-descriptor-999-SNAPSHOT-999-SNAPSHOT.json +++ b/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-bom-quarkus-platform-descriptor-999-SNAPSHOT-999-SNAPSHOT.json @@ -246,23 +246,6 @@ }, "artifact" : "io.quarkus:quarkus-elasticsearch-rest-client::jar:999-SNAPSHOT", "origins" : [ "io.quarkus:quarkus-bom-quarkus-platform-descriptor:999-SNAPSHOT:json:999-SNAPSHOT" ] - }, { - "name" : "Elasticsearch REST High Level Client", - "description" : "Connect to an Elasticsearch cluster using the REST high level client", - "metadata" : { - "keywords" : [ "elasticsearch", "full text", "search" ], - "guide" : "https://quarkus.io/guides/elasticsearch", - "categories" : [ "data" ], - "status" : "preview", - "config" : [ "quarkus.elasticsearch." ], - "built-with-quarkus-core" : "999-SNAPSHOT", - "capabilities" : { - "provides" : [ "io.quarkus.elasticsearch-rest-high-level-client" ] - }, - "extension-dependencies" : [ "io.quarkus:quarkus-core", "io.quarkus:quarkus-elasticsearch-rest-client-common", "io.quarkus:quarkus-apache-httpclient", "io.quarkus:quarkus-elasticsearch-rest-client", "io.quarkus:quarkus-arc" ] - }, - "artifact" : "io.quarkus:quarkus-elasticsearch-rest-high-level-client::jar:999-SNAPSHOT", - "origins" : [ "io.quarkus:quarkus-bom-quarkus-platform-descriptor:999-SNAPSHOT:json:999-SNAPSHOT" ] }, { "name" : "Security", "description" : "Security", diff --git a/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-universe-bom-quarkus-platform-descriptor-2.0.3.Final-2.0.3.Final.json b/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-universe-bom-quarkus-platform-descriptor-2.0.3.Final-2.0.3.Final.json index 01658618638dc..dd4ca187ee5f0 100644 --- a/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-universe-bom-quarkus-platform-descriptor-2.0.3.Final-2.0.3.Final.json +++ b/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-universe-bom-quarkus-platform-descriptor-2.0.3.Final-2.0.3.Final.json @@ -651,19 +651,6 @@ }, "artifact" : "io.quarkus:quarkus-elasticsearch-rest-client::jar:2.0.3.Final", "origins" : [ "io.quarkus:quarkus-universe-bom-quarkus-platform-descriptor:2.0.3.Final:json:2.0.3.Final" ] - }, { - "name" : "Elasticsearch REST High Level Client", - "description" : "Connect to an Elasticsearch cluster using the REST high level client", - "metadata" : { - "keywords" : [ "elasticsearch", "full text", "search" ], - "guide" : "https://quarkus.io/guides/elasticsearch", - "categories" : [ "data" ], - "status" : "preview", - "built-with-quarkus-core" : "2.0.3.Final", - "extension-dependencies" : [ "io.quarkus:quarkus-core", "io.quarkus:quarkus-elasticsearch-rest-client-common", "io.quarkus:quarkus-apache-httpclient", "io.quarkus:quarkus-elasticsearch-rest-client", "io.quarkus:quarkus-arc" ] - }, - "artifact" : "io.quarkus:quarkus-elasticsearch-rest-high-level-client::jar:2.0.3.Final", - "origins" : [ "io.quarkus:quarkus-universe-bom-quarkus-platform-descriptor:2.0.3.Final:json:2.0.3.Final" ] }, { "name" : "Elytron Security Common", "description" : "Common components to secure your applications via Elytron", @@ -4043,7 +4030,7 @@ "categories" : [ "integration" ], "status" : [ "stable" ], "built-with-quarkus-core" : "2.0.0.Final", - "extension-dependencies" : [ "io.quarkus:quarkus-elasticsearch-rest-client::jar", "io.quarkus:quarkus-core::jar", "io.quarkus:quarkus-elasticsearch-rest-client-common::jar", "io.quarkus:quarkus-apache-httpclient::jar", "io.quarkus:quarkus-arc::jar", "io.quarkus:quarkus-elasticsearch-rest-high-level-client::jar", "org.apache.camel.quarkus:camel-quarkus-core::jar", "org.apache.camel.quarkus:camel-quarkus-support-common::jar" ] + "extension-dependencies" : [ "io.quarkus:quarkus-elasticsearch-rest-client::jar", "io.quarkus:quarkus-core::jar", "io.quarkus:quarkus-elasticsearch-rest-client-common::jar", "io.quarkus:quarkus-apache-httpclient::jar", "io.quarkus:quarkus-arc::jar", "org.apache.camel.quarkus:camel-quarkus-core::jar", "org.apache.camel.quarkus:camel-quarkus-support-common::jar" ] }, "artifact" : "org.apache.camel.quarkus:camel-quarkus-elasticsearch-rest::jar:2.0.0", "origins" : [ "io.quarkus:quarkus-universe-bom-quarkus-platform-descriptor:2.0.3.Final:json:2.0.3.Final" ] diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devui/DevUIHibernateSearchActiveFalseAndNamedPuActiveTrueTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devui/DevUIHibernateSearchActiveFalseAndNamedPuActiveTrueTest.java index 2bbe3afd98e45..6e9d3dbfb93b3 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devui/DevUIHibernateSearchActiveFalseAndNamedPuActiveTrueTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devui/DevUIHibernateSearchActiveFalseAndNamedPuActiveTrueTest.java @@ -19,11 +19,11 @@ public class DevUIHibernateSearchActiveFalseAndNamedPuActiveTrueTest extends Abs + "quarkus.hibernate-orm.datasource=\n" + "quarkus.hibernate-orm.packages=io.quarkus.test.devui\n" + "quarkus.hibernate-search-orm.active=false\n" - + "quarkus.hibernate-search-orm.elasticsearch.version=7.10\n" + + "quarkus.hibernate-search-orm.elasticsearch.version=8.8\n" // ... but it's (implicitly) active for a named PU + "quarkus.hibernate-orm.\"namedpu\".datasource=nameddatasource\n" + "quarkus.hibernate-orm.\"namedpu\".packages=io.quarkus.test.devui.namedpu\n" - + "quarkus.hibernate-search-orm.\"namedpu\".elasticsearch.version=7.10\n" + + "quarkus.hibernate-search-orm.\"namedpu\".elasticsearch.version=8.8\n" // Start Hibernate Search offline for the named PU, // because we don't have dev services except for the default PU + "quarkus.hibernate-search-orm.\"namedpu\".schema-management.strategy=none\n" diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devui/DevUIHibernateSearchActiveFalseTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devui/DevUIHibernateSearchActiveFalseTest.java index 674712dec93e6..6ea1667f8a8dc 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devui/DevUIHibernateSearchActiveFalseTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devui/DevUIHibernateSearchActiveFalseTest.java @@ -14,7 +14,7 @@ public class DevUIHibernateSearchActiveFalseTest extends AbstractDevUIHibernateS + "quarkus.datasource.jdbc.url=jdbc:h2:mem:test\n" // Hibernate Search is inactive: the dev console should be empty. + "quarkus.hibernate-search-orm.active=false\n" - + "quarkus.hibernate-search-orm.elasticsearch.version=7.10\n"), + + "quarkus.hibernate-search-orm.elasticsearch.version=8.8\n"), "application.properties") .addClasses(MyIndexedEntity.class)); diff --git a/integration-tests/devmode/src/test/java/io/quarkus/test/devui/DevUIHibernateSearchSmokeTest.java b/integration-tests/devmode/src/test/java/io/quarkus/test/devui/DevUIHibernateSearchSmokeTest.java index fc91169826aa6..38326d02c3ef0 100644 --- a/integration-tests/devmode/src/test/java/io/quarkus/test/devui/DevUIHibernateSearchSmokeTest.java +++ b/integration-tests/devmode/src/test/java/io/quarkus/test/devui/DevUIHibernateSearchSmokeTest.java @@ -12,7 +12,7 @@ public class DevUIHibernateSearchSmokeTest extends AbstractDevUIHibernateSearchT .withApplicationRoot((jar) -> jar.addAsResource( new StringAsset("quarkus.datasource.db-kind=h2\n" + "quarkus.datasource.jdbc.url=jdbc:h2:mem:test\n" - + "quarkus.hibernate-search-orm.elasticsearch.version=7.10\n" + + "quarkus.hibernate-search-orm.elasticsearch.version=8.8\n" // Start offline, we don't have an Elasticsearch cluster here + "quarkus.hibernate-search-orm.schema-management.strategy=none\n" + "quarkus.hibernate-search-orm.elasticsearch.version-check.enabled=false\n"), diff --git a/integration-tests/elasticsearch-java-client/pom.xml b/integration-tests/elasticsearch-java-client/pom.xml index a3bd81558cc3a..bcb1f3405e81f 100644 --- a/integration-tests/elasticsearch-java-client/pom.xml +++ b/integration-tests/elasticsearch-java-client/pom.xml @@ -167,6 +167,12 @@ single-node false -Xms512m -Xmx512m + + false 9200:9200 diff --git a/integration-tests/elasticsearch-rest-client/pom.xml b/integration-tests/elasticsearch-rest-client/pom.xml index af00909796ce0..0010baf5a2d06 100644 --- a/integration-tests/elasticsearch-rest-client/pom.xml +++ b/integration-tests/elasticsearch-rest-client/pom.xml @@ -167,6 +167,12 @@ single-node false -Xms512m -Xmx512m + + false 9200:9200 diff --git a/integration-tests/elasticsearch-rest-high-level-client/.gitignore b/integration-tests/elasticsearch-rest-high-level-client/.gitignore deleted file mode 100644 index 087a18358fe57..0000000000000 --- a/integration-tests/elasticsearch-rest-high-level-client/.gitignore +++ /dev/null @@ -1,35 +0,0 @@ -# Eclipse -.project -.classpath -.settings/ -bin/ - -# IntelliJ -.idea -*.ipr -*.iml -*.iws - -# NetBeans -nb-configuration.xml - -# Visual Studio Code -.vscode - -# OSX -.DS_Store - -# Vim -*.swp -*.swo - -# patch -*.orig -*.rej - -# Maven -target/ -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -release.properties \ No newline at end of file diff --git a/integration-tests/elasticsearch-rest-high-level-client/README.md b/integration-tests/elasticsearch-rest-high-level-client/README.md deleted file mode 100644 index db869a7f3aebf..0000000000000 --- a/integration-tests/elasticsearch-rest-high-level-client/README.md +++ /dev/null @@ -1,30 +0,0 @@ -# quarkus-integration-test-elasticsearch-rest-high-level-client project - -This project uses Quarkus, the Supersonic Subatomic Java Framework. - -If you want to learn more about Quarkus, please visit its website: https://quarkus.io/ . - -## Running the application in dev mode - -You can run your application in dev mode that enables live coding using: -``` -./mvnw quarkus:dev -``` - -## Packaging and running the application - -The application can be packaged using `./mvnw package`. -It produces the `quarkus-integration-test-elasticsearch-rest-high-level-client-1.0-SNAPSHOT-runner.jar` file in the `/target` directory. -Be aware that it’s not an _über-jar_ as the dependencies are copied into the `target/lib` directory. - -The application is now runnable using `java -jar target/quarkus-integration-test-elasticsearch-rest-high-level-client-1.0-SNAPSHOT-runner.jar`. - -## Creating a native executable - -You can create a native executable using: `./mvnw package -Dnative`. - -Or, if you don't have GraalVM installed, you can run the native executable build in a container using: `./mvnw package -Dnative -Dquarkus.native.container-build=true`. - -You can then execute your native executable with: `./target/quarkus-integration-test-elasticsearch-rest-high-level-client-1.0-SNAPSHOT-runner` - -If you want to learn more about building native executables, please consult https://quarkus.io/guides/building-native-image. diff --git a/integration-tests/elasticsearch-rest-high-level-client/pom.xml b/integration-tests/elasticsearch-rest-high-level-client/pom.xml deleted file mode 100644 index aa91995642362..0000000000000 --- a/integration-tests/elasticsearch-rest-high-level-client/pom.xml +++ /dev/null @@ -1,233 +0,0 @@ - - - - quarkus-integration-tests-parent - io.quarkus - 999-SNAPSHOT - - - 4.0.0 - - quarkus-integration-test-elasticsearch-rest-high-level-client - Quarkus - Integration Tests - Elasticsearch REST high level client - - - - - io.quarkus - quarkus-resteasy-jackson - - - io.quarkus - quarkus-elasticsearch-rest-high-level-client - - - io.quarkus - quarkus-smallrye-health - - - - io.quarkus - quarkus-junit5 - test - - - io.rest-assured - rest-assured - test - - - - - io.quarkus - quarkus-elasticsearch-rest-high-level-client-deployment - ${project.version} - pom - test - - - * - * - - - - - io.quarkus - quarkus-resteasy-jackson-deployment - ${project.version} - pom - test - - - * - * - - - - - io.quarkus - quarkus-smallrye-health-deployment - ${project.version} - pom - test - - - * - * - - - - - - - - - src/main/resources - true - - - - - io.quarkus - quarkus-maven-plugin - ${project.version} - - - - build - - - - - - maven-surefire-plugin - - true - - - - maven-failsafe-plugin - - true - - - - - - - - test-elasticsearch - - - test-containers - - - - - - maven-surefire-plugin - - false - - - - maven-failsafe-plugin - - false - - - - - - - - docker-elasticsearch - - - start-containers - - - - localhost:9200 - http - - - - - io.fabric8 - docker-maven-plugin - - - - ${elasticsearch.image} - elasticsearch - - - single-node - false - -Xms512m -Xmx512m - - - 9200:9200 - - - Elasticsearch: - default - cyan - - - - http://localhost:9200 - GET - 200 - - - - - - - true - - - - docker-start - process-test-classes - - stop - start - - - - docker-stop - post-integration-test - - stop - - - - - - org.codehaus.mojo - exec-maven-plugin - - - docker-prune - generate-resources - - exec - - - ${docker-prune.location} - - - - - - - - - - - diff --git a/integration-tests/elasticsearch-rest-high-level-client/src/main/java/io/quarkus/it/elasticsearch/highlevel/Fruit.java b/integration-tests/elasticsearch-rest-high-level-client/src/main/java/io/quarkus/it/elasticsearch/highlevel/Fruit.java deleted file mode 100644 index 07c6e2d45ae96..0000000000000 --- a/integration-tests/elasticsearch-rest-high-level-client/src/main/java/io/quarkus/it/elasticsearch/highlevel/Fruit.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.quarkus.it.elasticsearch.highlevel; - -public class Fruit { - public String id; - public String name; - public String color; -} diff --git a/integration-tests/elasticsearch-rest-high-level-client/src/main/java/io/quarkus/it/elasticsearch/highlevel/FruitResource.java b/integration-tests/elasticsearch-rest-high-level-client/src/main/java/io/quarkus/it/elasticsearch/highlevel/FruitResource.java deleted file mode 100644 index 559dad17d1043..0000000000000 --- a/integration-tests/elasticsearch-rest-high-level-client/src/main/java/io/quarkus/it/elasticsearch/highlevel/FruitResource.java +++ /dev/null @@ -1,49 +0,0 @@ -package io.quarkus.it.elasticsearch.highlevel; - -import java.io.IOException; -import java.net.URI; -import java.util.List; -import java.util.UUID; - -import jakarta.inject.Inject; -import jakarta.ws.rs.BadRequestException; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.Response; - -@Path("/fruits") -public class FruitResource { - @Inject - FruitService fruitService; - - @POST - public Response index(Fruit fruit) throws IOException { - if (fruit.id == null) { - fruit.id = UUID.randomUUID().toString(); - } - fruitService.index(fruit); - return Response.created(URI.create("/fruits/" + fruit.id)).build(); - } - - @GET - @Path("/{id}") - public Fruit get(@PathParam("id") String id) throws IOException { - return fruitService.get(id); - } - - @GET - @Path("/search") - public List search(@QueryParam("name") String name, @QueryParam("color") String color) throws IOException { - if (name != null) { - return fruitService.searchByName(name); - } else if (color != null) { - return fruitService.searchByColor(color); - } else { - throw new BadRequestException("Should provide name or color query parameter"); - } - } - -} diff --git a/integration-tests/elasticsearch-rest-high-level-client/src/main/java/io/quarkus/it/elasticsearch/highlevel/FruitService.java b/integration-tests/elasticsearch-rest-high-level-client/src/main/java/io/quarkus/it/elasticsearch/highlevel/FruitService.java deleted file mode 100644 index b00f350b555ac..0000000000000 --- a/integration-tests/elasticsearch-rest-high-level-client/src/main/java/io/quarkus/it/elasticsearch/highlevel/FruitService.java +++ /dev/null @@ -1,72 +0,0 @@ -package io.quarkus.it.elasticsearch.highlevel; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; - -import org.elasticsearch.action.get.GetRequest; -import org.elasticsearch.action.get.GetResponse; -import org.elasticsearch.action.index.IndexRequest; -import org.elasticsearch.action.search.SearchRequest; -import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.client.RestHighLevelClient; -import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.search.SearchHit; -import org.elasticsearch.search.SearchHits; -import org.elasticsearch.search.builder.SearchSourceBuilder; - -import io.vertx.core.json.JsonObject; - -@ApplicationScoped -public class FruitService { - @Inject - RestHighLevelClient restHighLevelClient; - - public void index(Fruit fruit) throws IOException { - IndexRequest request = new IndexRequest("fruits"); - request.id(fruit.id); - request.source(JsonObject.mapFrom(fruit).toString(), XContentType.JSON); - restHighLevelClient.index(request, RequestOptions.DEFAULT); - } - - public Fruit get(String id) throws IOException { - GetRequest getRequest = new GetRequest("fruits", id); - GetResponse getResponse = restHighLevelClient.get(getRequest, RequestOptions.DEFAULT); - if (getResponse.isExists()) { - String sourceAsString = getResponse.getSourceAsString(); - JsonObject json = new JsonObject(sourceAsString); - return json.mapTo(Fruit.class); - } - return null; - } - - public List searchByColor(String color) throws IOException { - return search("color", color); - } - - public List searchByName(String name) throws IOException { - return search("name", name); - } - - private List search(String term, String match) throws IOException { - SearchRequest searchRequest = new SearchRequest("fruits"); - SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); - searchSourceBuilder.query(QueryBuilders.matchQuery(term, match)); - searchRequest.source(searchSourceBuilder); - - SearchResponse searchResponse = restHighLevelClient.search(searchRequest, RequestOptions.DEFAULT); - SearchHits hits = searchResponse.getHits(); - List results = new ArrayList<>(hits.getHits().length); - for (SearchHit hit : hits.getHits()) { - String sourceAsString = hit.getSourceAsString(); - JsonObject json = new JsonObject(sourceAsString); - results.add(json.mapTo(Fruit.class)); - } - return results; - } -} diff --git a/integration-tests/elasticsearch-rest-high-level-client/src/main/resources/META-INF/resources/fruits.html b/integration-tests/elasticsearch-rest-high-level-client/src/main/resources/META-INF/resources/fruits.html deleted file mode 100644 index a2144d6a57be8..0000000000000 --- a/integration-tests/elasticsearch-rest-high-level-client/src/main/resources/META-INF/resources/fruits.html +++ /dev/null @@ -1,120 +0,0 @@ - - - - - Fruit REST service - - - - - - - -

-

REST Service - Fruit

- -

Add a fruit

-
-
-
-
-
-
-
- -
- -

Search Fruits

-
-
-
-
-
-
-
- -
-
-
Name
-
Color
-
-
-
{{ fruit.name }}
-
{{ fruit.color }}
-
-
- - - diff --git a/integration-tests/elasticsearch-rest-high-level-client/src/main/resources/META-INF/resources/index.html b/integration-tests/elasticsearch-rest-high-level-client/src/main/resources/META-INF/resources/index.html deleted file mode 100644 index a815a45c35ba0..0000000000000 --- a/integration-tests/elasticsearch-rest-high-level-client/src/main/resources/META-INF/resources/index.html +++ /dev/null @@ -1,152 +0,0 @@ - - - - - quarkus-integration-test-elasticsearch - 1.0-SNAPSHOT - - - - - - -
-
-

Congratulations, you have created a new Quarkus application.

- -

Why do you see this?

- -

This page is served by Quarkus. The source is in - src/main/resources/META-INF/resources/index.html.

- -

What can I do from here?

- -

If not already done, run the application in dev mode using: mvn compile quarkus:dev. -

-
    -
  • Add REST resources, Servlets, functions and other services in src/main/java.
    • -
  • Your static assets are located in src/main/resources/META-INF/resources.
    • -
  • Configure your application in src/main/resources/application.properties. -
    • -
- -

How do I get rid of this page?

-

Just delete the src/main/resources/META-INF/resources/index.html file.

-
-
-
-

Application

-
    -
  • GroupId: io.quarkus
    • -
  • ArtifactId: quarkus-integration-test-elasticsearch
    • -
  • Version: 1.0-SNAPSHOT
    • -
  • Quarkus Version: 1.3.0.Final
    • -
-
-
-

Next steps

- -
-
-
- - - - \ No newline at end of file diff --git a/integration-tests/elasticsearch-rest-high-level-client/src/main/resources/application.properties b/integration-tests/elasticsearch-rest-high-level-client/src/main/resources/application.properties deleted file mode 100644 index 4f57810e65b8e..0000000000000 --- a/integration-tests/elasticsearch-rest-high-level-client/src/main/resources/application.properties +++ /dev/null @@ -1,5 +0,0 @@ -quarkus.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200} -quarkus.elasticsearch.protocol=${elasticsearch.protocol:http} -quarkus.elasticsearch.socket-timeout=10S -quarkus.elasticsearch.discovery.enabled=true -quarkus.elasticsearch.discovery.refresh-interval=1M \ No newline at end of file diff --git a/integration-tests/elasticsearch-rest-high-level-client/src/test/java/io/quarkus/it/elasticsearch/FruitResourceTest.java b/integration-tests/elasticsearch-rest-high-level-client/src/test/java/io/quarkus/it/elasticsearch/FruitResourceTest.java deleted file mode 100644 index d4f6a8a3cf1fe..0000000000000 --- a/integration-tests/elasticsearch-rest-high-level-client/src/test/java/io/quarkus/it/elasticsearch/FruitResourceTest.java +++ /dev/null @@ -1,70 +0,0 @@ -package io.quarkus.it.elasticsearch; - -import static io.restassured.RestAssured.get; -import static io.restassured.RestAssured.given; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.is; - -import java.util.List; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -import io.quarkus.it.elasticsearch.highlevel.Fruit; -import io.quarkus.test.junit.QuarkusTest; -import io.restassured.RestAssured; -import io.restassured.common.mapper.TypeRef; - -@QuarkusTest -public class FruitResourceTest { - private static final TypeRef> LIST_OF_FRUIT_TYPE_REF = new TypeRef>() { - }; - - @Test - public void testEndpoint() throws InterruptedException { - // create a Fruit - Fruit fruit = new Fruit(); - fruit.id = "1"; - fruit.name = "Apple"; - fruit.color = "Green"; - given() - .contentType("application/json") - .body(fruit) - .when().post("/fruits") - .then() - .statusCode(201); - - // get the Fruit - Fruit result = get("/fruits/1").as(Fruit.class); - Assertions.assertNotNull(result); - Assertions.assertEquals("1", result.id); - Assertions.assertEquals("Apple", result.name); - Assertions.assertEquals("Green", result.color); - - // wait a few ms for the indexing to happened - Thread.sleep(1000); - - // search the Fruit - List results = get("/fruits/search?color=Green").as(LIST_OF_FRUIT_TYPE_REF); - Assertions.assertNotNull(results); - Assertions.assertFalse(results.isEmpty()); - Assertions.assertEquals("1", results.get(0).id); - Assertions.assertEquals("Apple", results.get(0).name); - Assertions.assertEquals("Green", results.get(0).color); - results = get("/fruits/search?name=Apple").as(LIST_OF_FRUIT_TYPE_REF); - Assertions.assertNotNull(results); - Assertions.assertFalse(results.isEmpty()); - Assertions.assertEquals("1", results.get(0).id); - Assertions.assertEquals("Apple", results.get(0).name); - Assertions.assertEquals("Green", results.get(0).color); - } - - @Test - public void testHealth() { - RestAssured.when().get("/q/health/ready").then() - .body("status", is("UP"), - "checks.status", containsInAnyOrder("UP"), - "checks.name", containsInAnyOrder("Elasticsearch cluster health check")); - } - -} diff --git a/integration-tests/elasticsearch-rest-high-level-client/src/test/java/io/quarkus/it/elasticsearch/NativeFruitResourceIT.java b/integration-tests/elasticsearch-rest-high-level-client/src/test/java/io/quarkus/it/elasticsearch/NativeFruitResourceIT.java deleted file mode 100644 index 281e1131b853a..0000000000000 --- a/integration-tests/elasticsearch-rest-high-level-client/src/test/java/io/quarkus/it/elasticsearch/NativeFruitResourceIT.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.quarkus.it.elasticsearch; - -import io.quarkus.test.junit.QuarkusIntegrationTest; - -@QuarkusIntegrationTest -public class NativeFruitResourceIT extends FruitResourceTest { - - // Execute the same tests but in native mode. -} diff --git a/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/pom.xml index 05e8f99f152c1..4f59a84df7820 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/pom.xml @@ -208,7 +208,12 @@ single-node false -Xms512m -Xmx512m - + + false 9200:9200 diff --git a/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/src/main/resources/application.properties b/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/src/main/resources/application.properties index 56bed6791ed15..eea4cfb24dab6 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/src/main/resources/application.properties +++ b/integration-tests/hibernate-search-orm-elasticsearch-coordination-outbox-polling/src/main/resources/application.properties @@ -6,7 +6,7 @@ quarkus.datasource.jdbc.max-size=8 quarkus.hibernate-orm.database.generation=drop-and-create -quarkus.hibernate-search-orm.elasticsearch.version=7 +quarkus.hibernate-search-orm.elasticsearch.version=8 quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200} quarkus.hibernate-search-orm.elasticsearch.protocol=${elasticsearch.protocol:http} quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop diff --git a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml index ee74eac208c1e..a888a9cbbf521 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/pom.xml @@ -224,6 +224,12 @@ single-node false -Xms512m -Xmx512m + + false 9200:9200 diff --git a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/main/resources/application.properties b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/main/resources/application.properties index 5e1f036cd0987..98944ea31cc0e 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/main/resources/application.properties +++ b/integration-tests/hibernate-search-orm-elasticsearch-tenancy/src/main/resources/application.properties @@ -6,7 +6,7 @@ quarkus.flyway.clean-at-start=true quarkus.hibernate-orm.database.generation=none quarkus.hibernate-orm.multitenant=schema -quarkus.hibernate-search-orm.elasticsearch.version=7 +quarkus.hibernate-search-orm.elasticsearch.version=8 quarkus.hibernate-search-orm.elasticsearch.hosts=${elasticsearch.hosts:localhost:9200} quarkus.hibernate-search-orm.elasticsearch.protocol=${elasticsearch.protocol:http} quarkus.hibernate-search-orm.schema-management.strategy=drop-and-create-and-drop diff --git a/integration-tests/hibernate-search-orm-elasticsearch/pom.xml b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml index 32df10fdad812..5494677e184e1 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/pom.xml +++ b/integration-tests/hibernate-search-orm-elasticsearch/pom.xml @@ -186,6 +186,12 @@ single-node false -Xms512m -Xmx512m + + false 9200:9200 diff --git a/integration-tests/hibernate-search-orm-elasticsearch/src/main/resources/application.properties b/integration-tests/hibernate-search-orm-elasticsearch/src/main/resources/application.properties index 50ea8e73a8cd4..17baefd55b1cc 100644 --- a/integration-tests/hibernate-search-orm-elasticsearch/src/main/resources/application.properties +++ b/integration-tests/hibernate-search-orm-elasticsearch/src/main/resources/application.properties @@ -6,7 +6,7 @@ quarkus.datasource.jdbc.max-size=8 quarkus.hibernate-orm.database.generation=drop-and-create quarkus.hibernate-search-orm.mapping.configurer=bean:custom-dependent-bean-mapping-configurer,class:io.quarkus.it.hibernate.search.orm.elasticsearch.mapping.CustomClassMappingConfigurer,bean:custom-application-bean-mapping-configurer -quarkus.hibernate-search-orm.elasticsearch.version=7 +quarkus.hibernate-search-orm.elasticsearch.version=8 quarkus.hibernate-search-orm.elasticsearch.analysis.configurer=bean:backend-analysis quarkus.hibernate-search-orm.elasticsearch.indexes.Analysis1TestingEntity.analysis.configurer=class:io.quarkus.it.hibernate.search.orm.elasticsearch.analysis.IndexAnalysis1Configurer quarkus.hibernate-search-orm.elasticsearch.indexes.Analysis2TestingEntity.analysis.configurer=bean:index-analysis-2 diff --git a/integration-tests/logging-gelf/pom.xml b/integration-tests/logging-gelf/pom.xml index 0fd53519d9542..4c1c3e4fd4b5e 100644 --- a/integration-tests/logging-gelf/pom.xml +++ b/integration-tests/logging-gelf/pom.xml @@ -158,12 +158,13 @@ single-node false - false - -Xms512m -Xmx512m Elasticsearch: diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml index d1b13ca0b7289..ec5090633fc30 100644 --- a/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml +++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-efk.yml @@ -7,6 +7,7 @@ services: ES_JAVA_OPTS: "-Xms512m -Xmx512m" discovery.type: "single-node" xpack.security.enabled: "false" + cluster.routing.allocation.disk.threshold_enabled: false networks: - efk diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml index ef3ac1c81d05e..6363ac563612e 100644 --- a/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml +++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-elk.yml @@ -7,6 +7,7 @@ services: ES_JAVA_OPTS: "-Xms512m -Xmx512m" discovery.type: "single-node" xpack.security.enabled: "false" + cluster.routing.allocation.disk.threshold_enabled: false networks: - elk diff --git a/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml b/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml index 2b113d640780e..645a9e1c615ac 100644 --- a/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml +++ b/integration-tests/logging-gelf/src/test/resources/docker-compose-graylog.yml @@ -7,6 +7,7 @@ services: ES_JAVA_OPTS: "-Xms512m -Xmx512m" discovery.type: "single-node" xpack.security.enabled: "false" + cluster.routing.allocation.disk.threshold_enabled: false networks: - graylog diff --git a/integration-tests/logging-gelf/src/test/resources/pipeline/gelf.conf b/integration-tests/logging-gelf/src/test/resources/pipeline/gelf.conf index b478c8175bac3..3404abddd9d05 100644 --- a/integration-tests/logging-gelf/src/test/resources/pipeline/gelf.conf +++ b/integration-tests/logging-gelf/src/test/resources/pipeline/gelf.conf @@ -3,6 +3,11 @@ input { port => 12201 } } +filter { + mutate { + remove_field => [ "host" ] + } +} output { stdout {} elasticsearch { diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 9bb8f61468177..61df37ed77654 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -347,7 +347,6 @@ devmode ide-launcher elasticsearch-rest-client - elasticsearch-rest-high-level-client elasticsearch-java-client micrometer-mp-metrics micrometer-prometheus