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.

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

Elasticsearch 8 compatible high-level client integration #1047

Merged
merged 14 commits into from
Jul 26, 2022
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ Automatic-Module-Name: com.b2international.snowowl.snomed.cis
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
org.apache.httpcomponents.httpasyncclient;bundle-version="[4.1.4,4.1.5)",
org.apache.httpcomponents.httpclient;bundle-version="[4.5.3,4.5.4)",
org.apache.httpcomponents.httpcore;bundle-version="[4.4.10,4.4.11)",
org.apache.httpcomponents.httpasyncclient;bundle-version="[4.1.4,4.2.0)",
org.apache.httpcomponents.httpclient;bundle-version="[4.5.10,4.6.0)",
org.apache.httpcomponents.httpcore;bundle-version="[4.4.12,4.5.0)",
com.b2international.snowowl.core
Import-Package: org.slf4j;version="1.7.25"
Export-Package: com.b2international.snowowl.snomed.cis,
Expand Down
12 changes: 12 additions & 0 deletions commons/com.b2international.index.es8/.classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-rest-client-8.3.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-java-8.3.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jakarta.json-api-2.0.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jsr305-3.0.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/parsson-1.0.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
34 changes: 34 additions & 0 deletions commons/com.b2international.index.es8/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>com.b2international.index.es8</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
207 changes: 207 additions & 0 deletions commons/com.b2international.index.es8/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Elasticsearch 8 Index Client Module
Bundle-SymbolicName: com.b2international.index.es8;singleton:=true
Bundle-Version: 8.4.1.qualifier
Bundle-Vendor: B2i Healthcare
Automatic-Module-Name: com.b2international.index.es8
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
org.apache.commons.codec;bundle-version="1.11.0",
com.b2international.commons;visibility:=reexport,
org.apache.httpcomponents.httpasyncclient;bundle-version="[4.1.4,4.2.0)",
org.apache.httpcomponents.httpclient;bundle-version="[4.5.10,4.6.0)",
org.apache.httpcomponents.httpcore;bundle-version="[4.4.12,4.5.0)"
Bundle-ClassPath: .,
lib/elasticsearch-java-8.3.2.jar,
lib/elasticsearch-rest-client-8.3.2.jar,
lib/jakarta.json-api-2.0.1.jar,
lib/jsr305-3.0.2.jar,
lib/parsson-1.0.0.jar
Export-Package: co.elastic.clients,
co.elastic.clients.elasticsearch,
co.elastic.clients.elasticsearch._types,
co.elastic.clients.elasticsearch._types.aggregations,
co.elastic.clients.elasticsearch._types.analysis,
co.elastic.clients.elasticsearch._types.mapping,
co.elastic.clients.elasticsearch._types.query_dsl,
co.elastic.clients.elasticsearch.async_search,
co.elastic.clients.elasticsearch.async_search.status,
co.elastic.clients.elasticsearch.autoscaling,
co.elastic.clients.elasticsearch.autoscaling.get_autoscaling_capacity,
co.elastic.clients.elasticsearch.cat,
co.elastic.clients.elasticsearch.cat.aliases,
co.elastic.clients.elasticsearch.cat.allocation,
co.elastic.clients.elasticsearch.cat.component_templates,
co.elastic.clients.elasticsearch.cat.count,
co.elastic.clients.elasticsearch.cat.fielddata,
co.elastic.clients.elasticsearch.cat.health,
co.elastic.clients.elasticsearch.cat.help,
co.elastic.clients.elasticsearch.cat.indices,
co.elastic.clients.elasticsearch.cat.master,
co.elastic.clients.elasticsearch.cat.ml_data_frame_analytics,
co.elastic.clients.elasticsearch.cat.ml_datafeeds,
co.elastic.clients.elasticsearch.cat.ml_jobs,
co.elastic.clients.elasticsearch.cat.ml_trained_models,
co.elastic.clients.elasticsearch.cat.nodeattrs,
co.elastic.clients.elasticsearch.cat.nodes,
co.elastic.clients.elasticsearch.cat.pending_tasks,
co.elastic.clients.elasticsearch.cat.plugins,
co.elastic.clients.elasticsearch.cat.recovery,
co.elastic.clients.elasticsearch.cat.repositories,
co.elastic.clients.elasticsearch.cat.segments,
co.elastic.clients.elasticsearch.cat.shards,
co.elastic.clients.elasticsearch.cat.snapshots,
co.elastic.clients.elasticsearch.cat.tasks,
co.elastic.clients.elasticsearch.cat.templates,
co.elastic.clients.elasticsearch.cat.thread_pool,
co.elastic.clients.elasticsearch.cat.transforms,
co.elastic.clients.elasticsearch.ccr,
co.elastic.clients.elasticsearch.ccr.follow_info,
co.elastic.clients.elasticsearch.ccr.get_auto_follow_pattern,
co.elastic.clients.elasticsearch.ccr.stats,
co.elastic.clients.elasticsearch.cluster,
co.elastic.clients.elasticsearch.cluster.allocation_explain,
co.elastic.clients.elasticsearch.cluster.health,
co.elastic.clients.elasticsearch.cluster.pending_tasks,
co.elastic.clients.elasticsearch.cluster.remote_info,
co.elastic.clients.elasticsearch.cluster.reroute,
co.elastic.clients.elasticsearch.cluster.stats,
co.elastic.clients.elasticsearch.core,
co.elastic.clients.elasticsearch.core.bulk,
co.elastic.clients.elasticsearch.core.explain,
co.elastic.clients.elasticsearch.core.field_caps,
co.elastic.clients.elasticsearch.core.get,
co.elastic.clients.elasticsearch.core.get_script_context,
co.elastic.clients.elasticsearch.core.get_script_languages,
co.elastic.clients.elasticsearch.core.knn_search,
co.elastic.clients.elasticsearch.core.mget,
co.elastic.clients.elasticsearch.core.msearch,
co.elastic.clients.elasticsearch.core.msearch_template,
co.elastic.clients.elasticsearch.core.mtermvectors,
co.elastic.clients.elasticsearch.core.rank_eval,
co.elastic.clients.elasticsearch.core.reindex,
co.elastic.clients.elasticsearch.core.reindex_rethrottle,
co.elastic.clients.elasticsearch.core.scripts_painless_execute,
co.elastic.clients.elasticsearch.core.search,
co.elastic.clients.elasticsearch.core.search_shards,
co.elastic.clients.elasticsearch.core.termvectors,
co.elastic.clients.elasticsearch.core.update,
co.elastic.clients.elasticsearch.core.update_by_query_rethrottle,
co.elastic.clients.elasticsearch.dangling_indices,
co.elastic.clients.elasticsearch.dangling_indices.list_dangling_indices,
co.elastic.clients.elasticsearch.enrich,
co.elastic.clients.elasticsearch.enrich.execute_policy,
co.elastic.clients.elasticsearch.enrich.stats,
co.elastic.clients.elasticsearch.eql,
co.elastic.clients.elasticsearch.eql.search,
co.elastic.clients.elasticsearch.features,
co.elastic.clients.elasticsearch.fleet,
co.elastic.clients.elasticsearch.graph,
co.elastic.clients.elasticsearch.ilm,
co.elastic.clients.elasticsearch.ilm.explain_lifecycle,
co.elastic.clients.elasticsearch.ilm.get_lifecycle,
co.elastic.clients.elasticsearch.ilm.move_to_step,
co.elastic.clients.elasticsearch.indices,
co.elastic.clients.elasticsearch.indices.add_block,
co.elastic.clients.elasticsearch.indices.analyze,
co.elastic.clients.elasticsearch.indices.close,
co.elastic.clients.elasticsearch.indices.data_streams_stats,
co.elastic.clients.elasticsearch.indices.field_usage_stats,
co.elastic.clients.elasticsearch.indices.get,
co.elastic.clients.elasticsearch.indices.get_alias,
co.elastic.clients.elasticsearch.indices.get_field_mapping,
co.elastic.clients.elasticsearch.indices.get_index_template,
co.elastic.clients.elasticsearch.indices.get_mapping,
co.elastic.clients.elasticsearch.indices.modify_data_stream,
co.elastic.clients.elasticsearch.indices.put_index_template,
co.elastic.clients.elasticsearch.indices.recovery,
co.elastic.clients.elasticsearch.indices.reload_search_analyzers,
co.elastic.clients.elasticsearch.indices.resolve_index,
co.elastic.clients.elasticsearch.indices.rollover,
co.elastic.clients.elasticsearch.indices.segments,
co.elastic.clients.elasticsearch.indices.shard_stores,
co.elastic.clients.elasticsearch.indices.simulate_template,
co.elastic.clients.elasticsearch.indices.stats,
co.elastic.clients.elasticsearch.indices.update_aliases,
co.elastic.clients.elasticsearch.indices.validate_query,
co.elastic.clients.elasticsearch.ingest,
co.elastic.clients.elasticsearch.ingest.geo_ip_stats,
co.elastic.clients.elasticsearch.ingest.simulate,
co.elastic.clients.elasticsearch.license,
co.elastic.clients.elasticsearch.license.get,
co.elastic.clients.elasticsearch.license.post,
co.elastic.clients.elasticsearch.logstash,
co.elastic.clients.elasticsearch.migration,
co.elastic.clients.elasticsearch.migration.deprecations,
co.elastic.clients.elasticsearch.migration.get_feature_upgrade_status,
co.elastic.clients.elasticsearch.migration.post_feature_upgrade,
co.elastic.clients.elasticsearch.ml,
co.elastic.clients.elasticsearch.ml.evaluate_data_frame,
co.elastic.clients.elasticsearch.ml.get_calendars,
co.elastic.clients.elasticsearch.ml.get_memory_stats,
co.elastic.clients.elasticsearch.ml.info,
co.elastic.clients.elasticsearch.ml.preview_data_frame_analytics,
co.elastic.clients.elasticsearch.ml.put_trained_model,
co.elastic.clients.elasticsearch.monitoring,
co.elastic.clients.elasticsearch.nodes,
co.elastic.clients.elasticsearch.nodes.clear_repositories_metering_archive,
co.elastic.clients.elasticsearch.nodes.get_repositories_metering_info,
co.elastic.clients.elasticsearch.nodes.hot_threads,
co.elastic.clients.elasticsearch.nodes.info,
co.elastic.clients.elasticsearch.nodes.reload_secure_settings,
co.elastic.clients.elasticsearch.nodes.stats,
co.elastic.clients.elasticsearch.nodes.usage,
co.elastic.clients.elasticsearch.rollup,
co.elastic.clients.elasticsearch.rollup.get_jobs,
co.elastic.clients.elasticsearch.rollup.get_rollup_caps,
co.elastic.clients.elasticsearch.rollup.get_rollup_index_caps,
co.elastic.clients.elasticsearch.searchable_snapshots,
co.elastic.clients.elasticsearch.searchable_snapshots.cache_stats,
co.elastic.clients.elasticsearch.searchable_snapshots.mount,
co.elastic.clients.elasticsearch.security,
co.elastic.clients.elasticsearch.security.authenticate,
co.elastic.clients.elasticsearch.security.create_api_key,
co.elastic.clients.elasticsearch.security.create_service_token,
co.elastic.clients.elasticsearch.security.delete_privileges,
co.elastic.clients.elasticsearch.security.enroll_kibana,
co.elastic.clients.elasticsearch.security.get_role,
co.elastic.clients.elasticsearch.security.get_service_accounts,
co.elastic.clients.elasticsearch.security.get_service_credentials,
co.elastic.clients.elasticsearch.security.get_token,
co.elastic.clients.elasticsearch.security.grant_api_key,
co.elastic.clients.elasticsearch.security.has_privileges,
co.elastic.clients.elasticsearch.security.put_privileges,
co.elastic.clients.elasticsearch.security.suggest_user_profiles,
co.elastic.clients.elasticsearch.shutdown,
co.elastic.clients.elasticsearch.shutdown.get_node,
co.elastic.clients.elasticsearch.slm,
co.elastic.clients.elasticsearch.snapshot,
co.elastic.clients.elasticsearch.snapshot.cleanup_repository,
co.elastic.clients.elasticsearch.snapshot.get,
co.elastic.clients.elasticsearch.snapshot.restore,
co.elastic.clients.elasticsearch.snapshot.verify_repository,
co.elastic.clients.elasticsearch.sql,
co.elastic.clients.elasticsearch.ssl,
co.elastic.clients.elasticsearch.ssl.certificates,
co.elastic.clients.elasticsearch.tasks,
co.elastic.clients.elasticsearch.transform,
co.elastic.clients.elasticsearch.transform.get_transform,
co.elastic.clients.elasticsearch.transform.get_transform_stats,
co.elastic.clients.elasticsearch.watcher,
co.elastic.clients.elasticsearch.watcher.execute_watch,
co.elastic.clients.elasticsearch.watcher.stats,
co.elastic.clients.elasticsearch.xpack,
co.elastic.clients.elasticsearch.xpack.info,
co.elastic.clients.elasticsearch.xpack.usage,
co.elastic.clients.json,
co.elastic.clients.json.jackson,
co.elastic.clients.json.jsonb,
co.elastic.clients.transport,
co.elastic.clients.transport.endpoints,
co.elastic.clients.transport.rest_client,
co.elastic.clients.util,
com.b2international.index.es8
Import-Package: org.apache.commons.logging;version="1.2.0",
org.slf4j;version="1.7.2"
5 changes: 5 additions & 0 deletions commons/com.b2international.index.es8/build.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
source.. = src/
output.. = target/classes
bin.includes = META-INF/,\
.,\
lib/
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
# Ignore everything in this directory
*
# Except this file
!.gitignore
!.gitignore
!elasticsearch-log4j-*.jar
94 changes: 94 additions & 0 deletions commons/com.b2international.index.es8/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<artifactId>com.b2international.index.es8</artifactId>
<packaging>eclipse-plugin</packaging>

<parent>
<groupId>com.b2international.snowowl</groupId>
<artifactId>commons-parent</artifactId>
<version>8.4.1-SNAPSHOT</version>
</parent>

<properties>
<elasticsearch8.version>8.3.2</elasticsearch8.version>
</properties>

<dependencies>
<dependency>
<groupId>co.elastic.clients</groupId>
<artifactId>elasticsearch-java</artifactId>
<version>${elasticsearch8.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
<version>2.0.1</version>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.1.1</version>
<executions>
<execution>
<id>copy-runtime-dependencies</id>
<phase>generate-sources</phase>
<goals>
<goal>copy-dependencies</goal>
</goals>
<configuration>
<!-- Copying only the necessary JARs from the dependencies and their transitive stuff -->
<includeArtifactIds>
elasticsearch-java,
elasticsearch-rest-client,
jakarta.json-api,
jsr305,
parsson
</includeArtifactIds>
<outputDirectory>lib</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>

<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<versionRange>[3.0.2,)</versionRange>
<goals>
<goal>copy-dependencies</goal>
</goals>
</pluginExecutionFilter>
<action>
<execute>
<runOnIncremental>false</runOnIncremental>
</execute>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

</project>
Loading