[beam] branch master updated (025f849 -> f5d8bcd)

[ec...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

echauchot pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git.


    from 025f849  Merge pull request #10450: [BEAM-9019] Improve Encoders: replace as much as possible of catalyst generated code with java compiled code
     new 581c957  [BEAM-5192] Migrate ElasticsearchIO to v7
     new 05afd22  [BEAM-5192] Minor change of ESIO public configuration API: MaxRetryTimeout support was removed in ES 7.0. So, as we use the same REST client for all versions of ESIO, change the socketAndRetryTimeout parameter to only socketTimeout parameter.
     new 22468b1  [BEAM-5192] Fix missing ifs for ES7 specificities.
     new aa89952  [BEAM-5192] Remove unneeded transitive dependencies, upgrade ES and randomized testing minor versions
     new 49dc83b  [BEAM-5192] Disable MockHttpTransport plugin to enabe http dialog to embedded ES 7.
     new b2db1ae  [BEAM-5192] Fix util class, elasticsearch changed their json output of search request !
     new 6edec1e  [BEAM-5192] Set a custom json serializer for document metadata to be able to change serialization of metadata at runtime because ElasticSearch change it in version 7
     new 534a462  [BEAM-5192] Remove testWritePartialUpdateWithErrors because triggering and error by setting a mapping on a type + a wrong insert is no more supported on ES7. And this test only ensured that the error message in case of write error was correct which is already tested in testWriteWithErrors.
     new 233ec7d  [BEAM-5192] use <= and >= in version specific code instead of == to be future proof. There is still a check in getBackendVersion that protects us from running on a untested version of Elasticsearch.
     new f5d8bcd  Merge pull request #10433 from echauchot/BEAM-5192-ES7

The 24818 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../sdk/io/elasticsearch/ElasticsearchIOTest.java  |  20 +---
 .../sdk/io/elasticsearch/ElasticsearchIOTest.java  |  15 +--
 .../sdk/io/elasticsearch/ElasticsearchIOTest.java  |  15 +--
 .../build.gradle                                   |  14 +--
 .../src/test/contrib/create_elk_container.sh       |   2 +-
 .../sdk/io/elasticsearch/ElasticsearchIOIT.java    |   8 +-
 .../sdk/io/elasticsearch/ElasticsearchIOTest.java  |  25 ++--
 .../java/org/elasticsearch/bootstrap/JarHell.java  |   0
 .../elasticsearch-tests-common/build.gradle        |  19 ++--
 .../elasticsearch/ElasticsearchIOTestCommon.java   |  63 ++++-------
 .../io/elasticsearch/ElasticsearchIOTestUtils.java |  72 ++++++------
 sdks/java/io/elasticsearch/build.gradle            |   6 +-
 .../beam/sdk/io/elasticsearch/ElasticsearchIO.java | 126 +++++++++++++--------
 settings.gradle                                    |   1 +
 14 files changed, 181 insertions(+), 205 deletions(-)
 copy sdks/java/io/elasticsearch-tests/{elasticsearch-tests-5 => elasticsearch-tests-7}/build.gradle (89%)
 copy sdks/java/io/elasticsearch-tests/{elasticsearch-tests-6 => elasticsearch-tests-7}/src/test/contrib/create_elk_container.sh (94%)
 copy sdks/java/io/elasticsearch-tests/{elasticsearch-tests-6 => elasticsearch-tests-7}/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIOIT.java (97%)
 copy sdks/java/io/elasticsearch-tests/{elasticsearch-tests-6 => elasticsearch-tests-7}/src/test/java/org/apache/beam/sdk/io/elasticsearch/ElasticsearchIOTest.java (88%)
 copy sdks/java/io/elasticsearch-tests/{elasticsearch-tests-6 => elasticsearch-tests-7}/src/test/java/org/elasticsearch/bootstrap/JarHell.java (100%)