This is an automated email from the ASF dual-hosted git repository. jark pushed a commit to branch release-1.11 in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.11 by this push: new 29840ec [hotfix][elasticsearch] Fix validation message for 'sink.bulk-flush.max-actions' of Elasticsearch 29840ec is described below commit 29840ecebbbbdf601906b472a94139842f238a71 Author: liuyongvs <liuyon...@gmail.com> AuthorDate: Mon Jun 29 16:56:34 2020 +0800 [hotfix][elasticsearch] Fix validation message for 'sink.bulk-flush.max-actions' of Elasticsearch This closes #12790 --- .../elasticsearch/table/Elasticsearch6DynamicSinkFactory.java | 2 +- .../elasticsearch/table/Elasticsearch6DynamicSinkFactoryTest.java | 2 +- .../elasticsearch/table/Elasticsearch7DynamicSinkFactory.java | 2 +- .../elasticsearch/table/Elasticsearch7DynamicSinkFactoryTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flink-connectors/flink-connector-elasticsearch6/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkFactory.java b/flink-connectors/flink-connector-elasticsearch6/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkFactory.java index 071bbb6..70b8d38 100644 --- a/flink-connectors/flink-connector-elasticsearch6/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkFactory.java +++ b/flink-connectors/flink-connector-elasticsearch6/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkFactory.java @@ -113,7 +113,7 @@ public class Elasticsearch6DynamicSinkFactory implements DynamicTableSinkFactory validate( maxActions == -1 || maxActions >= 1, () -> String.format( - "'%s' must be at least 1 character. Got: %s", + "'%s' must be at least 1. Got: %s", BULK_FLUSH_MAX_ACTIONS_OPTION.key(), maxActions) ); diff --git a/flink-connectors/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkFactoryTest.java b/flink-connectors/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkFactoryTest.java index 143b712..b213c5d 100644 --- a/flink-connectors/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkFactoryTest.java +++ b/flink-connectors/flink-connector-elasticsearch6/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch6DynamicSinkFactoryTest.java @@ -142,7 +142,7 @@ public class Elasticsearch6DynamicSinkFactoryTest { thrown.expect(ValidationException.class); thrown.expectMessage( - "'sink.bulk-flush.max-actions' must be at least 1 character. Got: -2"); + "'sink.bulk-flush.max-actions' must be at least 1. Got: -2"); sinkFactory.createDynamicTableSink( context() .withSchema(TableSchema.builder() diff --git a/flink-connectors/flink-connector-elasticsearch7/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkFactory.java b/flink-connectors/flink-connector-elasticsearch7/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkFactory.java index 7ee2cfb..be08188 100644 --- a/flink-connectors/flink-connector-elasticsearch7/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkFactory.java +++ b/flink-connectors/flink-connector-elasticsearch7/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkFactory.java @@ -112,7 +112,7 @@ public class Elasticsearch7DynamicSinkFactory implements DynamicTableSinkFactory validate( maxActions == -1 || maxActions >= 1, () -> String.format( - "'%s' must be at least 1 character. Got: %s", + "'%s' must be at least 1. Got: %s", BULK_FLUSH_MAX_ACTIONS_OPTION.key(), maxActions) ); diff --git a/flink-connectors/flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkFactoryTest.java b/flink-connectors/flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkFactoryTest.java index 7189163..9db718c 100644 --- a/flink-connectors/flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkFactoryTest.java +++ b/flink-connectors/flink-connector-elasticsearch7/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/table/Elasticsearch7DynamicSinkFactoryTest.java @@ -137,7 +137,7 @@ public class Elasticsearch7DynamicSinkFactoryTest { thrown.expect(ValidationException.class); thrown.expectMessage( - "'sink.bulk-flush.max-actions' must be at least 1 character. Got: -2"); + "'sink.bulk-flush.max-actions' must be at least 1. Got: -2"); sinkFactory.createDynamicTableSink( context() .withSchema(TableSchema.builder()