Skip to content

Account for random order of DevservicesElasticsearchBuildItems when comparing versions/distributions #50890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Account for random order of DevservicesElasticsearchBuildItems when comparing versions/distributions #50890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...quarkus/elasticsearch/restclient/common/deployment/DevServicesElasticsearchProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ private DevservicesElasticsearchBuildItemsConfiguration(List<DevservicesElastics
for (DevservicesElasticsearchBuildItem buildItem : buildItems) {
if (version == null) {
version = buildItem.getVersion();
} else if (!version.equals(buildItem.getVersion())) {
} else if (buildItem.getVersion() != null && !version.equals(buildItem.getVersion())) {
// safety guard but should never occur as only Hibernate Search ORM Elasticsearch configure the version
throw new BuildException(
"Multiple extensions request different versions of Elasticsearch for Dev Services.",
Expand All @@ -364,7 +364,7 @@ private DevservicesElasticsearchBuildItemsConfiguration(List<DevservicesElastics

if (distribution == null) {
distribution = buildItem.getDistribution();
} else if (!distribution.equals(buildItem.getDistribution())) {
} else if (buildItem.getDistribution() != null && !distribution.equals(buildItem.getDistribution())) {
// safety guard but should never occur as only Hibernate Search ORM Elasticsearch configure the distribution
throw new BuildException(
"Multiple extensions request different distributions of Elasticsearch for Dev Services.",
Expand Down
65 changes: 65 additions & 0 deletions integration-tests/hibernate-search-orm-elasticsearch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-hibernate-search-orm-elasticsearch</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-elasticsearch-java-client</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jdbc-h2</artifactId>
Expand Down Expand Up @@ -98,6 +102,19 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-elasticsearch-java-client-deployment</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

<build>
Expand All @@ -113,12 +130,60 @@
<configuration>
<skip>true</skip>
</configuration>
<executions>
<execution>
<id>default-test</id>
<configuration>
<classpathDependencyExcludes>
<exclude>io.quarkus:quarkus-elasticsearch-java-client</exclude>
</classpathDependencyExcludes>
<excludes>
<exclude>io.quarkus.it.hibernate.search.orm.elasticsearch.devservices.HibernateSearchElasticsearchWithElasticsearchJavaClientDevServicesTest</exclude>
</excludes>
</configuration>
</execution>
<execution>
<id>mixed-test</id>
<goals>
<goal>test</goal>
</goals>
<configuration>
<includes>
<include>io.quarkus.it.hibernate.search.orm.elasticsearch.devservices.HibernateSearchElasticsearchWithElasticsearchJavaClientDevServicesTest</include>
</includes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
<executions>
<execution>
<id>default-test</id>
<configuration>
<classpathDependencyExcludes>
<exclude>io.quarkus:quarkus-elasticsearch-java-client</exclude>
</classpathDependencyExcludes>
<excludes>
<exclude>io.quarkus.it.hibernate.search.orm.elasticsearch.devservices.HibernateSearchElasticsearchWithElasticsearchJavaClientDevServicesTest</exclude>
</excludes>
</configuration>
</execution>
<execution>
<id>mixed-test</id>
<goals>
<goal>integration-test</goal>
</goals>
<configuration>
<includes>
<include>io.quarkus.it.hibernate.search.orm.elasticsearch.devservices.HibernateSearchElasticsearchWithElasticsearchJavaClientDevServicesTest</include>
</includes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.quarkus</groupId>
Expand Down
67 changes: 67 additions & 0 deletions ...h/devservices/HibernateSearchElasticsearchWithElasticsearchJavaClientDevServicesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
package io.quarkus.it.hibernate.search.orm.elasticsearch.devservices;

import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.is;

import java.io.IOException;
import java.util.HashMap;
import java.util.Map;

import jakarta.inject.Inject;

import org.elasticsearch.client.Request;
import org.elasticsearch.client.RestClient;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;

import io.quarkus.test.common.DevServicesContext;
import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.QuarkusTestProfile;
import io.quarkus.test.junit.TestProfile;
import io.restassured.RestAssured;

@QuarkusTest
@DisabledOnOs(OS.WINDOWS)
@TestProfile(HibernateSearchElasticsearchWithElasticsearchJavaClientDevServicesTest.Profile.class)
public class HibernateSearchElasticsearchWithElasticsearchJavaClientDevServicesTest {
public static class Profile implements QuarkusTestProfile {
@Override
public Map<String, String> getConfigOverrides() {
Map<String, String> config = new HashMap<>();
config.put("quarkus.elasticsearch.devservices.enabled", "true");
config.put("quarkus.hibernate-search-orm.elasticsearch.version", "9.1");
return config;
}

@Override
public String getConfigProfile() {
// Don't use %test properties;
// that way, we can control whether quarkus.hibernate-search-orm.elasticsearch.hosts is set or not.
// In this test, we do NOT set quarkus.hibernate-search-orm.elasticsearch.hosts.
return "someotherprofile";
}
}

DevServicesContext context;

@Inject
RestClient client;

@Test
public void testDevServicesProperties() {
assertThat(context.devServicesProperties())
.containsKey("quarkus.hibernate-search-orm.elasticsearch.hosts");
}

@Test
public void smoke() throws IOException {
RestAssured.when().get("/test/dev-services/count").then()
.statusCode(200)
.body(is("0"));

assertThat(client.performRequest(new Request("GET", "/")).getStatusLine().getStatusCode())
.isEqualTo(200);

}
}
Loading