Use Java 14 switch expressions #82178

arteam · 2022-01-03T16:54:26Z

JEP 361 added support for switch expressions
which can be much more terse and less error-prone than switch statements.

Another useful feature of switch expressions is exhaustiveness: we can make
sure that an enum switch expression covers all the cases at compile time.

JEP 361[https://openjdk.java.net/jeps/361] added support for switch expressions which can be much more terse and less error-prone than switch statements. Another useful feature of switch expressions is exhaustiveness: we can make sure that an enum switch expression covers all the cases at compile time.

elasticmachine · 2022-01-04T08:38:21Z

Pinging @elastic/es-core-infra (Team:Core/Infra)

benchmarks/src/main/java/org/elasticsearch/benchmark/indices/common/RoundingBenchmark.java

...est-high-level/src/test/java/org/elasticsearch/client/ml/EvaluateDataFrameResponseTests.java

...igh-level/src/test/java/org/elasticsearch/client/security/KibanaEnrollmentResponseTests.java

...-level/src/test/java/org/elasticsearch/client/transform/transforms/TransformConfigTests.java

...rc/test/java/org/elasticsearch/client/transform/transforms/pivot/AggregationConfigTests.java

libs/core/src/main/java/org/elasticsearch/core/TimeValue.java

libs/x-content/src/test/java/org/elasticsearch/xcontent/XContentParserTests.java

modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/EnhancedPainlessLexer.java

modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/EnhancedSuggestLexer.java

modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/parsers/GeoWKTParser.java

...legacy-geo/src/main/java/org/elasticsearch/legacygeo/query/LegacyGeoShapeQueryProcessor.java

...repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureStorageService.java

# Conflicts: # x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/AllocateActionTests.java

…ommon/RoundingBenchmark.java Co-authored-by: Rory Hunter <pugnascotia@users.noreply.github.com>

pugnascotia · 2022-01-05T09:06:24Z

See #82090 for the formatting problem - I've already filed an issue with Eclipse, but I suspect I'd have to fix it myself 🙈

...src/internalClusterTest/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java

.../org/elasticsearch/action/admin/cluster/snapshots/status/TransportSnapshotsStatusAction.java

…apshots/status/TransportSnapshotsStatusAction.java Co-authored-by: Rory Hunter <pugnascotia@users.noreply.github.com>

server/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java

server/src/main/java/org/elasticsearch/cluster/routing/allocation/decider/Decision.java

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/action/util/QueryPageTests.java

…-switch-expressions

...k/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/WaitForIndexColorStepTests.java

.../src/test/java/org/elasticsearch/xpack/core/ilm/step/info/AllocationRoutedStepInfoTests.java

...c/test/java/org/elasticsearch/xpack/core/ml/action/EvaluateDataFrameActionResponseTests.java

...gin/core/src/test/java/org/elasticsearch/xpack/core/security/support/StringMatcherTests.java

...ta-streams/src/test/java/org/elasticsearch/xpack/core/action/GetDataStreamsRequestTests.java

arteam · 2022-01-06T16:07:18Z

@elasticmachine update branch

pugnascotia

LGTM.

arteam · 2022-01-10T08:53:42Z

Thanks, Rory!

elasticsearchmachine · 2022-01-10T08:54:38Z

💔 Backport failed

Status	Branch	Result
❌	8.0	Commit could not be cherrypicked due to conflicts

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 82178

JEP 361[https://openjdk.java.net/jeps/361] added support for switch expressions which can be much more terse and less error-prone than switch statements. Another useful feature of switch expressions is exhaustiveness: we can make sure that an enum switch expression covers all the cases at compile time. (cherry picked from commit 0699c93)

JEP 361[https://openjdk.java.net/jeps/361] added support for switch expressions which can be much more terse and less error-prone than switch statements. Another useful feature of switch expressions is exhaustiveness: we can make sure that an enum switch expression covers all the cases at compile time. (cherry picked from commit 0699c93) * Rollback switch expressions for the SQL plugin (#82349) It was updated to Java 8 compatibility in #82274 (cherry picked from commit 78509f4)

arteam mentioned this pull request Jan 3, 2022

Java 17 features in Elasticsearch code base #81820

Open

19 tasks

elasticsearchmachine added the v8.1.0 label Jan 3, 2022

arteam force-pushed the use-switch-expressions branch from 07ed27d to 4779bd2 Compare January 3, 2022 17:57

arteam force-pushed the use-switch-expressions branch from 4779bd2 to 4b50990 Compare January 3, 2022 19:31

arteam added :Core/Infra/Core Core issues without another label >non-issue >refactoring auto-backport Automatically create backport pull requests when merged v8.0.0 labels Jan 4, 2022

arteam marked this pull request as ready for review January 4, 2022 08:38

elasticmachine added the Team:Core/Infra Meta label for core/infra team label Jan 4, 2022