Skip to content
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

Introduce extensions for the Elasticsearch clients #10745

Merged
merged 5 commits into from
Jul 22, 2020
Merged

Introduce extensions for the Elasticsearch clients #10745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f669a26
Rename elasticsearch-rest-client extension to -common
loicmathieu Jul 15, 2020
85643a2
Add an Elasticsearch low level client extension
loicmathieu Jul 15, 2020
183f04e
Add an Elasticsearch high level client extension
loicmathieu Jul 15, 2020
95c51da
Add documentation for the new Elasticsearch client extensions
loicmathieu Jul 15, 2020
ecf34a6
Move the Elasticsearch native ITs to a specific Data6 job
gsmet Jul 15, 2020
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
10 changes: 8 additions & 2 deletions .github/workflows/ci-actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,14 +451,20 @@ jobs:
hibernate-orm-rest-data-panache
- category: Data5
postgres: "true"
timeout: 60
timeout: 65
test-modules: >
jpa-postgresql
hibernate-search-elasticsearch
narayana-stm
narayana-jta
reactive-pg-client
hibernate-reactive-postgresql
- category: Data6
postgres: "true"
timeout: 40
test-modules: >
elasticsearch-rest-client
elasticsearch-rest-high-level-client
hibernate-search-elasticsearch
- category: Amazon
amazonServices: "true"
timeout: 45
Expand Down
32 changes: 32 additions & 0 deletions bom/application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,16 @@
<artifactId>quarkus-datasource-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-elasticsearch-rest-client-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-elasticsearch-rest-client-common-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-elasticsearch-rest-client</artifactId>
Expand All @@ -470,6 +480,16 @@
<artifactId>quarkus-elasticsearch-rest-client-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-elasticsearch-rest-high-level-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-elasticsearch-rest-high-level-client-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-security</artifactId>
Expand Down Expand Up @@ -3408,6 +3428,18 @@
<artifactId>elasticsearch-rest-client</artifactId>
<version>${elasticsearch-rest-client.version}</version>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-high-level-client</artifactId>
<version>${elasticsearch-rest-client.version}</version>
<exclusions>
<!-- exclude log4j2 to get its version from log4j2-jboss-logmanager -->
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-client-sniffer</artifactId>
Expand Down
4 changes: 3 additions & 1 deletion core/deployment/src/main/java/io/quarkus/deployment/Feature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/**
* Represents a feature provided by a core extension.
*
*
* @see FeatureBuildItem
*/
public enum Feature {
Expand All @@ -23,7 +23,9 @@ public enum Feature {
CDI,
CONFIG_YAML,
CONSUL_CONFIG,
ELASTICSEARCH_REST_CLIENT_COMMON,
ELASTICSEARCH_REST_CLIENT,
ELASTICSEARCH_REST_HIGH_LEVEL_CLIENT,
Comment on lines +26 to +28
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought enumeration of the features inside th Feature class was something we want to avoid for now.
I remember some discussion about this last time I created an extension ...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, well, no :).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm pretty sure Alexey or David didn't agree with you but OK :)

FLYWAY,
GRPC_CLIENT,
GRPC_SERVER,
Expand Down
1 change: 1 addition & 0 deletions docs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
<protoc-version>${protoc.version}</protoc-version>
<os-maven-plugin-version>${os-maven-plugin.version}</os-maven-plugin-version>
<protobuf-maven-plugin-version>${protobuf-maven-plugin.version}</protobuf-maven-plugin-version>
<elasticsearch-version>${elasticsearch-server.version}</elasticsearch-version>

<!-- Project website home page -->
<quarkus-home-url>${quarkus-home-url}</quarkus-home-url>
Expand Down
Loading