You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ar...@apache.org on 2021/11/29 07:56:35 UTC
[flink] branch master updated (f8f6935 -> 35e90eb)
This is an automated email from the ASF dual-hosted git repository.
arvid pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git.
from f8f6935 [FLINK-20370][table] part1: Fix wrong results when sink primary key is not the same with query result's changelog upsert key
add 9649f45 [FLINK-24325][connectors/elasticsearch] Remove Elasticsearch 5 from connectors
add 95ddabe [FLINK-24325][connectors/elasticsearch] Extract common unified Elasticsearch sink for versions 6 and 7
add 6609570 [FLINK-24325][connectors/elasticsearch] Integrate common unified Elasticsearch sink with Table API for versions 6 and 7
add 9b59b28 [FLINK-24325][connectors/elasticsearch] Migrate KeyExtractorTest to JUnit 5 and remove dependency on deprecated TableSchema
add 27e41fd [hotfix][connectors/elasticsearch] Fix license formatting
add 41e0655 [hotfix][connectors/elasticsearch] Move files from streaming.connectors.elasticsearch.table to connector.elasticsearch.table
add 99ecaa8 [FLINK-24325][connectors/elasticsearch] Make ElasticsearchSinkBuilderBase type-capturing
add 35e90eb [FLINK-24325][tests] Update Elasticsearch CI tests
No new revisions were added by this update.
Summary of changes:
.../flink-connector-elasticsearch-base/pom.xml | 29 +-
.../elasticsearch/sink/BulkProcessorConfig.java | 24 +-
.../sink/BulkRequestConsumerFactory.java} | 27 +-
.../elasticsearch/sink/ElasticsearchEmitter.java | 15 +-
.../elasticsearch/sink/ElasticsearchSink.java | 27 +-
.../sink/ElasticsearchSinkBuilderBase.java} | 190 ++++++----
.../elasticsearch/sink/ElasticsearchWriter.java | 24 +-
.../elasticsearch/sink/FlushBackoffType.java | 15 +-
.../elasticsearch/sink/NetworkClientConfig.java | 15 +-
.../elasticsearch/sink/RequestIndexer.java | 15 +-
.../table/AbstractTimeIndexGenerator.java | 2 +-
.../table/ElasticsearchConfiguration.java} | 41 +--
.../table/ElasticsearchConnectorOptions.java} | 13 +-
.../table/ElasticsearchDynamicSink.java} | 87 +++--
.../table/ElasticsearchDynamicSinkFactoryBase.java | 222 ++++++++++++
.../table/ElasticsearchSinkBuilderSupplier.java} | 17 +-
.../table/ElasticsearchValidationUtils.java | 58 +--
.../elasticsearch/table/IndexGenerator.java | 4 +-
.../elasticsearch/table/IndexGeneratorBase.java | 2 +-
.../elasticsearch/table/IndexGeneratorFactory.java | 14 +-
.../elasticsearch/table/KeyExtractor.java | 35 +-
.../elasticsearch/table/LogicalTypeWithIndex.java | 2 +-
.../table/RowElasticsearchEmitter.java | 14 +-
.../elasticsearch/table/SerializableFunction.java | 2 +-
.../elasticsearch/table/StaticIndexGenerator.java | 2 +-
.../elasticsearch/ElasticsearchApiCallBridge.java | 7 +-
.../index/AbstractTimeIndexGenerator.java | 38 --
.../elasticsearch/index/IndexGeneratorFactory.java | 282 ---------------
.../table/ElasticsearchConfiguration.java | 169 ---------
.../table/ElasticsearchConnectorOptions.java | 171 ---------
.../elasticsearch/table/RequestFactory.java | 54 ---
.../table/RowElasticsearchSinkFunction.java | 140 --------
.../elasticsearch/util/ElasticsearchUtils.java | 53 ---
.../sink/ElasticsearchSinkBaseITCase.java} | 68 ++--
.../sink/ElasticsearchSinkBuilderBaseTest.java | 83 +++++
.../sink/ElasticsearchWriterITCase.java | 68 +++-
.../elasticsearch/sink/TestClientBase.java} | 21 +-
.../connector/elasticsearch/sink/TestEmitter.java | 3 +
.../table/ElasticsearchDynamicSinkBaseITCase.java} | 138 +++----
.../ElasticsearchDynamicSinkFactoryBaseTest.java | 230 ++++++++++++
.../elasticsearch/table/IndexGeneratorTest.java | 264 ++++++++++++++
.../elasticsearch/table/KeyExtractorTest.java | 147 ++++++++
.../elasticsearch/table/TestContext.java | 2 +-
.../elasticsearch/ElasticsearchSinkBaseTest.java | 9 +
.../elasticsearch/TestRequestIndexer.java} | 15 +-
.../elasticsearch/index/IndexGeneratorTest.java | 260 --------------
.../table/IndexGeneratorFactoryTest.java | 215 -----------
.../elasticsearch/table/KeyExtractorTest.java | 135 -------
.../flink-connector-elasticsearch5/pom.xml | 272 --------------
.../Elasticsearch5ApiCallBridge.java | 145 --------
.../elasticsearch5/ElasticsearchSink.java | 112 ------
.../src/main/resources/META-INF/NOTICE | 104 ------
.../resources/META-INF/licenses/LICENSE.base64 | 26 --
.../META-INF/licenses/LICENSE.hdrhistogram | 125 -------
.../resources/META-INF/licenses/LICENSE.joptsimple | 22 --
.../resources/META-INF/licenses/LICENSE.jsr166y | 26 --
.../main/resources/META-INF/licenses/LICENSE.jzlib | 26 --
.../resources/META-INF/licenses/LICENSE.webbit | 38 --
.../EmbeddedElasticsearchNodeEnvironmentImpl.java | 89 -----
.../elasticsearch5/ElasticsearchSinkITCase.java | 136 -------
.../src/test/resources/log4j2-test.properties | 28 --
.../flink-connector-elasticsearch6/pom.xml | 15 +
.../sink/Elasticsearch6SinkBuilder.java | 81 +++++
.../table/Elasticsearch6Configuration.java} | 23 +-
.../table/Elasticsearch6ConnectorOptions.java} | 42 +--
.../table/Elasticsearch6DynamicSinkFactory.java | 72 ++++
.../table/Elasticsearch6Configuration.java | 79 ----
.../table/Elasticsearch6DynamicSink.java | 317 ----------------
.../table/Elasticsearch6DynamicSinkFactory.java | 170 ---------
.../org.apache.flink.table.factories.Factory | 2 +-
.../sink/Elasticsearch6SinkBuilderTest.java} | 32 +-
.../sink/Elasticsearch6SinkITCase.java | 55 +++
.../sink/Elasticsearch6TestClient.java} | 31 +-
.../Elasticsearch6DynamicSinkFactoryTest.java | 55 +++
.../table/Elasticsearch6DynamicSinkITCase.java | 96 +++++
.../Elasticsearch6DynamicSinkFactoryTest.java | 250 -------------
.../table/Elasticsearch6DynamicSinkITCase.java | 399 ---------------------
.../table/Elasticsearch6DynamicSinkTest.java | 294 ---------------
.../flink-connector-elasticsearch7/pom.xml | 7 +
.../sink/Elasticsearch7SinkBuilder.java | 82 +++++
.../table/Elasticsearch7DynamicSinkFactory.java} | 18 +-
.../table/Elasticsearch7DynamicSinkFactory.java | 192 ----------
.../org.apache.flink.table.factories.Factory | 2 +-
.../sink/Elasticsearch7SinkBuilderTest.java} | 32 +-
.../sink/Elasticsearch7SinkITCase.java | 56 +++
.../sink/Elasticsearch7TestClient.java} | 32 +-
.../sink/ElasticsearchSinkBuilderTest.java | 85 -----
.../Elasticsearch7DynamicSinkFactoryTest.java | 53 +++
.../table/Elasticsearch7DynamicSinkITCase.java | 90 +++++
.../Elasticsearch7DynamicSinkFactoryTest.java | 232 ------------
flink-connectors/pom.xml | 1 -
.../flink-elasticsearch5-test/pom.xml | 77 ----
.../streaming/tests/Elasticsearch5SinkExample.java | 117 ------
.../streaming/tests/Elasticsearch7SinkExample.java | 8 +-
.../flink-quickstart-test/pom.xml | 2 +-
.../test/Elasticsearch5SinkExample.java | 99 -----
.../test/Elasticsearch7SinkExample.java | 79 ++++
...ample.scala => Elasticsearch7SinkExample.scala} | 56 ++-
flink-end-to-end-tests/pom.xml | 1 -
flink-end-to-end-tests/run-nightly-tests.sh | 2 +-
.../test-scripts/elasticsearch-common.sh | 6 +
.../test-scripts/test_quickstarts.sh | 14 +-
.../org/apache/flink/util/DockerImageVersions.java | 3 +
tools/ci/compile.sh | 4 +-
.../modules-skipping-deployment.modulelist | 1 -
tools/ci/shade.sh | 2 +-
tools/ci/stage.sh | 1 -
107 files changed, 2350 insertions(+), 5634 deletions(-)
rename flink-connectors/{flink-connector-elasticsearch7 => flink-connector-elasticsearch-base}/src/main/java/org/apache/flink/connector/elasticsearch/sink/BulkProcessorConfig.java (69%)
copy flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/{streaming/connectors/elasticsearch/index/IndexGenerator.java => connector/elasticsearch/sink/BulkRequestConsumerFactory.java} (56%)
rename flink-connectors/{flink-connector-elasticsearch7 => flink-connector-elasticsearch-base}/src/main/java/org/apache/flink/connector/elasticsearch/sink/ElasticsearchEmitter.java (83%)
rename flink-connectors/{flink-connector-elasticsearch7 => flink-connector-elasticsearch-base}/src/main/java/org/apache/flink/connector/elasticsearch/sink/ElasticsearchSink.java (82%)
rename flink-connectors/{flink-connector-elasticsearch7/src/main/java/org/apache/flink/connector/elasticsearch/sink/ElasticsearchSinkBuilder.java => flink-connector-elasticsearch-base/src/main/java/org/apache/flink/connector/elasticsearch/sink/ElasticsearchSinkBuilderBase.java} (59%)
rename flink-connectors/{flink-connector-elasticsearch7 => flink-connector-elasticsearch-base}/src/main/java/org/apache/flink/connector/elasticsearch/sink/ElasticsearchWriter.java (93%)
copy flink-connectors/{flink-connector-elasticsearch7 => flink-connector-elasticsearch-base}/src/main/java/org/apache/flink/connector/elasticsearch/sink/FlushBackoffType.java (66%)
rename flink-connectors/{flink-connector-elasticsearch7 => flink-connector-elasticsearch-base}/src/main/java/org/apache/flink/connector/elasticsearch/sink/NetworkClientConfig.java (71%)
rename flink-connectors/{flink-connector-elasticsearch7 => flink-connector-elasticsearch-base}/src/main/java/org/apache/flink/connector/elasticsearch/sink/RequestIndexer.java (76%)
rename flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/{streaming/connectors => connector}/elasticsearch/table/AbstractTimeIndexGenerator.java (95%)
rename flink-connectors/{flink-connector-elasticsearch7/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7Configuration.java => flink-connector-elasticsearch-base/src/main/java/org/apache/flink/connector/elasticsearch/table/ElasticsearchConfiguration.java} (66%)
rename flink-connectors/{flink-connector-elasticsearch7/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7ConnectorOptions.java => flink-connector-elasticsearch-base/src/main/java/org/apache/flink/connector/elasticsearch/table/ElasticsearchConnectorOptions.java} (93%)
rename flink-connectors/{flink-connector-elasticsearch7/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSink.java => flink-connector-elasticsearch-base/src/main/java/org/apache/flink/connector/elasticsearch/table/ElasticsearchDynamicSink.java} (65%)
create mode 100644 flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/connector/elasticsearch/table/ElasticsearchDynamicSinkFactoryBase.java
rename flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/{streaming/connectors/elasticsearch/index/StaticIndexGenerator.java => connector/elasticsearch/table/ElasticsearchSinkBuilderSupplier.java} (67%)
rename flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/{streaming/connectors => connector}/elasticsearch/table/ElasticsearchValidationUtils.java (56%)
rename flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/{streaming/connectors => connector}/elasticsearch/table/IndexGenerator.java (91%)
rename flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/{streaming/connectors => connector}/elasticsearch/table/IndexGeneratorBase.java (95%)
rename flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/{streaming/connectors => connector}/elasticsearch/table/IndexGeneratorFactory.java (95%)
rename flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/{streaming/connectors => connector}/elasticsearch/table/KeyExtractor.java (71%)
rename flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/{streaming/connectors => connector}/elasticsearch/table/LogicalTypeWithIndex.java (94%)
rename flink-connectors/{flink-connector-elasticsearch7/src/main/java/org/apache/flink/streaming/connectors => flink-connector-elasticsearch-base/src/main/java/org/apache/flink/connector}/elasticsearch/table/RowElasticsearchEmitter.java (90%)
rename flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/{streaming/connectors => connector}/elasticsearch/table/SerializableFunction.java (93%)
copy flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/{streaming/connectors => connector}/elasticsearch/table/StaticIndexGenerator.java (94%)
delete mode 100644 flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/index/AbstractTimeIndexGenerator.java
delete mode 100644 flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/index/IndexGeneratorFactory.java
delete mode 100644 flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/ElasticsearchConfiguration.java
delete mode 100644 flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/ElasticsearchConnectorOptions.java
delete mode 100644 flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/RequestFactory.java
delete mode 100644 flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/RowElasticsearchSinkFunction.java
delete mode 100644 flink-connectors/flink-connector-elasticsearch-base/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/util/ElasticsearchUtils.java
rename flink-connectors/{flink-connector-elasticsearch7/src/test/java/org/apache/flink/connector/elasticsearch/sink/ElasticsearchSinkITCase.java => flink-connector-elasticsearch-base/src/test/java/org/apache/flink/connector/elasticsearch/sink/ElasticsearchSinkBaseITCase.java} (81%)
create mode 100644 flink-connectors/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/connector/elasticsearch/sink/ElasticsearchSinkBuilderBaseTest.java
rename flink-connectors/{flink-connector-elasticsearch7 => flink-connector-elasticsearch-base}/src/test/java/org/apache/flink/connector/elasticsearch/sink/ElasticsearchWriterITCase.java (80%)
rename flink-connectors/{flink-connector-elasticsearch7/src/test/java/org/apache/flink/connector/elasticsearch/sink/TestClient.java => flink-connector-elasticsearch-base/src/test/java/org/apache/flink/connector/elasticsearch/sink/TestClientBase.java} (78%)
rename flink-connectors/{flink-connector-elasticsearch7 => flink-connector-elasticsearch-base}/src/test/java/org/apache/flink/connector/elasticsearch/sink/TestEmitter.java (95%)
rename flink-connectors/{flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkITCase.java => flink-connector-elasticsearch-base/src/test/java/org/apache/flink/connector/elasticsearch/table/ElasticsearchDynamicSinkBaseITCase.java} (69%)
create mode 100644 flink-connectors/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/connector/elasticsearch/table/ElasticsearchDynamicSinkFactoryBaseTest.java
create mode 100644 flink-connectors/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/connector/elasticsearch/table/IndexGeneratorTest.java
create mode 100644 flink-connectors/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/connector/elasticsearch/table/KeyExtractorTest.java
rename flink-connectors/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/{streaming/connectors => connector}/elasticsearch/table/TestContext.java (97%)
rename flink-connectors/flink-connector-elasticsearch-base/src/{main/java/org/apache/flink/streaming/connectors/elasticsearch/PreElasticsearch6BulkProcessorIndexer.java => test/java/org/apache/flink/streaming/connectors/elasticsearch/TestRequestIndexer.java} (85%)
delete mode 100644 flink-connectors/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/index/IndexGeneratorTest.java
delete mode 100644 flink-connectors/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/IndexGeneratorFactoryTest.java
delete mode 100644 flink-connectors/flink-connector-elasticsearch-base/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/KeyExtractorTest.java
delete mode 100644 flink-connectors/flink-connector-elasticsearch5/pom.xml
delete mode 100644 flink-connectors/flink-connector-elasticsearch5/src/main/java/org/apache/flink/streaming/connectors/elasticsearch5/Elasticsearch5ApiCallBridge.java
delete mode 100644 flink-connectors/flink-connector-elasticsearch5/src/main/java/org/apache/flink/streaming/connectors/elasticsearch5/ElasticsearchSink.java
delete mode 100644 flink-connectors/flink-connector-elasticsearch5/src/main/resources/META-INF/NOTICE
delete mode 100644 flink-connectors/flink-connector-elasticsearch5/src/main/resources/META-INF/licenses/LICENSE.base64
delete mode 100644 flink-connectors/flink-connector-elasticsearch5/src/main/resources/META-INF/licenses/LICENSE.hdrhistogram
delete mode 100644 flink-connectors/flink-connector-elasticsearch5/src/main/resources/META-INF/licenses/LICENSE.joptsimple
delete mode 100644 flink-connectors/flink-connector-elasticsearch5/src/main/resources/META-INF/licenses/LICENSE.jsr166y
delete mode 100644 flink-connectors/flink-connector-elasticsearch5/src/main/resources/META-INF/licenses/LICENSE.jzlib
delete mode 100644 flink-connectors/flink-connector-elasticsearch5/src/main/resources/META-INF/licenses/LICENSE.webbit
delete mode 100644 flink-connectors/flink-connector-elasticsearch5/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/EmbeddedElasticsearchNodeEnvironmentImpl.java
delete mode 100644 flink-connectors/flink-connector-elasticsearch5/src/test/java/org/apache/flink/streaming/connectors/elasticsearch5/ElasticsearchSinkITCase.java
delete mode 100644 flink-connectors/flink-connector-elasticsearch5/src/test/resources/log4j2-test.properties
create mode 100644 flink-connectors/flink-connector-elasticsearch6/src/main/java/org/apache/flink/connector/elasticsearch/sink/Elasticsearch6SinkBuilder.java
rename flink-connectors/{flink-connector-elasticsearch-base/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/index/IndexGenerator.java => flink-connector-elasticsearch6/src/main/java/org/apache/flink/connector/elasticsearch/table/Elasticsearch6Configuration.java} (62%)
rename flink-connectors/{flink-connector-elasticsearch-base/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/index/IndexGeneratorBase.java => flink-connector-elasticsearch6/src/main/java/org/apache/flink/connector/elasticsearch/table/Elasticsearch6ConnectorOptions.java} (51%)
create mode 100644 flink-connectors/flink-connector-elasticsearch6/src/main/java/org/apache/flink/connector/elasticsearch/table/Elasticsearch6DynamicSinkFactory.java
delete mode 100644 flink-connectors/flink-connector-elasticsearch6/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6Configuration.java
delete mode 100644 flink-connectors/flink-connector-elasticsearch6/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSink.java
delete mode 100644 flink-connectors/flink-connector-elasticsearch6/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkFactory.java
copy flink-connectors/{flink-connector-elasticsearch7/src/main/java/org/apache/flink/connector/elasticsearch/sink/FlushBackoffType.java => flink-connector-elasticsearch6/src/test/java/org/apache/flink/connector/elasticsearch/sink/Elasticsearch6SinkBuilderTest.java} (59%)
create mode 100644 flink-connectors/flink-connector-elasticsearch6/src/test/java/org/apache/flink/connector/elasticsearch/sink/Elasticsearch6SinkITCase.java
copy flink-connectors/{flink-connector-elasticsearch7/src/main/java/org/apache/flink/connector/elasticsearch/sink/FlushBackoffType.java => flink-connector-elasticsearch6/src/test/java/org/apache/flink/connector/elasticsearch/sink/Elasticsearch6TestClient.java} (60%)
create mode 100644 flink-connectors/flink-connector-elasticsearch6/src/test/java/org/apache/flink/connector/elasticsearch/table/Elasticsearch6DynamicSinkFactoryTest.java
create mode 100644 flink-connectors/flink-connector-elasticsearch6/src/test/java/org/apache/flink/connector/elasticsearch/table/Elasticsearch6DynamicSinkITCase.java
delete mode 100644 flink-connectors/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkFactoryTest.java
delete mode 100644 flink-connectors/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkITCase.java
delete mode 100644 flink-connectors/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkTest.java
create mode 100644 flink-connectors/flink-connector-elasticsearch7/src/main/java/org/apache/flink/connector/elasticsearch/sink/Elasticsearch7SinkBuilder.java
rename flink-connectors/{flink-connector-elasticsearch-base/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/StaticIndexGenerator.java => flink-connector-elasticsearch7/src/main/java/org/apache/flink/connector/elasticsearch/table/Elasticsearch7DynamicSinkFactory.java} (60%)
delete mode 100644 flink-connectors/flink-connector-elasticsearch7/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkFactory.java
copy flink-connectors/flink-connector-elasticsearch7/src/{main/java/org/apache/flink/connector/elasticsearch/sink/FlushBackoffType.java => test/java/org/apache/flink/connector/elasticsearch/sink/Elasticsearch7SinkBuilderTest.java} (59%)
create mode 100644 flink-connectors/flink-connector-elasticsearch7/src/test/java/org/apache/flink/connector/elasticsearch/sink/Elasticsearch7SinkITCase.java
rename flink-connectors/flink-connector-elasticsearch7/src/{main/java/org/apache/flink/connector/elasticsearch/sink/FlushBackoffType.java => test/java/org/apache/flink/connector/elasticsearch/sink/Elasticsearch7TestClient.java} (60%)
delete mode 100644 flink-connectors/flink-connector-elasticsearch7/src/test/java/org/apache/flink/connector/elasticsearch/sink/ElasticsearchSinkBuilderTest.java
create mode 100644 flink-connectors/flink-connector-elasticsearch7/src/test/java/org/apache/flink/connector/elasticsearch/table/Elasticsearch7DynamicSinkFactoryTest.java
create mode 100644 flink-connectors/flink-connector-elasticsearch7/src/test/java/org/apache/flink/connector/elasticsearch/table/Elasticsearch7DynamicSinkITCase.java
delete mode 100644 flink-connectors/flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkFactoryTest.java
delete mode 100644 flink-end-to-end-tests/flink-elasticsearch5-test/pom.xml
delete mode 100644 flink-end-to-end-tests/flink-elasticsearch5-test/src/main/java/org/apache/flink/streaming/tests/Elasticsearch5SinkExample.java
delete mode 100644 flink-end-to-end-tests/flink-quickstart-test/src/main/java/org/apache/flink/quickstarts/test/Elasticsearch5SinkExample.java
create mode 100644 flink-end-to-end-tests/flink-quickstart-test/src/main/java/org/apache/flink/quickstarts/test/Elasticsearch7SinkExample.java
rename flink-end-to-end-tests/flink-quickstart-test/src/main/scala/org/apache/flink/quickstarts/test/{Elasticsearch5SinkExample.scala => Elasticsearch7SinkExample.scala} (50%)