Make use of Java 17 pattern matching switch statements by JaySabva · Pull Request #17909 · opensearch-project/OpenSearch

JaySabva · 2025-04-11T17:36:23Z

Description

Changed if-else instaceof check to JAVA 17 pattern matching switch

Related Issues

Resolves #17874

Check List

Functionality includes testing.
API changes companion pull request created, if applicable.
Public documentation issue/PR created, if applicable.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

github-actions · 2025-04-11T18:35:21Z

❌ Gradle check result for 38eeb9d: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

github-actions · 2025-04-12T11:56:32Z

❕ Gradle check result for f3e2454: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

codecov · 2025-04-12T11:56:53Z

Codecov Report

Attention: Patch coverage is 79.10448% with 14 lines in your changes missing coverage. Please review.

Project coverage is 72.44%. Comparing base (1628152) to head (f3e2454).
Report is 25 commits behind head on main.

Files with missing lines	Patch %	Lines
...java/org/opensearch/index/search/NestedHelper.java	76.92%	5 Missing and 7 partials ⚠️
...src/main/java/org/opensearch/ExceptionsHelper.java	86.66%	1 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##               main   #17909   +/-   ##
=========================================
  Coverage     72.43%   72.44%           
- Complexity    66789    66809   +20     
=========================================
  Files          5449     5452    +3     
  Lines        309085   309181   +96     
  Branches      44979    44963   -16     
=========================================
+ Hits         223899   223998   +99     
+ Misses        66906    66843   -63     
- Partials      18280    18340   +60

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

github-actions · 2025-04-12T14:13:04Z

❌ Gradle check result for f2ae0fa: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

owaiskazi19

Thanks for raising a PR @JaySabva! There are other classes as well. For ex:

https://github.com/opensearch-project/OpenSearch/blob/main/plugins/repository-s3/src/internalClusterTest/java/org/opensearch/repositories/s3/S3BlobStoreRepositoryTests.java#L357-L368
https://github.com/opensearch-project/OpenSearch/blob/main/buildSrc/src/main/java/org/opensearch/gradle/util/Util.java#L135-L145
To name a few.
Also, DCO check is failing. Can you sign your commit with git commit -s --amend and push again? To sign the commits you need to include -s flag

owaiskazi19 · 2025-04-14T17:23:50Z

server/src/main/java/org/opensearch/index/search/NestedHelper.java

-            return true;
-        }
+            case OpenSearchToParentBlockJoinQuery ostpbjq -> ostpbjq.getPath() != null;
+            case null -> true;


Wouldn't this map to default case?

I think that will raise null pointer exception I tried that in my scratch file.

In this and the other cases with case null, I believe you can collapse them both into a single branch, like:

case null, default -> true

owaiskazi19 · 2025-04-14T17:24:03Z

server/src/main/java/org/opensearch/index/search/NestedHelper.java

-        } else {
-            return true;
-        }
+            case null -> true;


JaySabva · 2025-04-14T17:29:50Z

I thought only instance of if else.

Sure I will make changes.

…witch statements Signed-off-by: Jay Sabva <202101224@daiict.ac.in>

github-actions · 2025-04-14T19:37:22Z

❌ Gradle check result for 5f4340f: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

owaiskazi19

We can combine the cases

owaiskazi19 · 2025-05-02T20:38:44Z

libs/core/src/main/java/org/opensearch/ExceptionsHelper.java

+        return switch (t) {
+            case OpenSearchException ose -> ose.status();
+            case IllegalArgumentException iae -> RestStatus.BAD_REQUEST;
+            case JsonParseException jpe -> RestStatus.BAD_REQUEST;
+            case OpenSearchRejectedExecutionException osre -> RestStatus.TOO_MANY_REQUESTS;
+            case NotXContentException nxce -> RestStatus.BAD_REQUEST;
+            case null -> RestStatus.INTERNAL_SERVER_ERROR;
+            default -> RestStatus.INTERNAL_SERVER_ERROR;
+        };


Suggested change

return switch (t) {

case OpenSearchException ose -> ose.status();

case IllegalArgumentException iae -> RestStatus.BAD_REQUEST;

case JsonParseException jpe -> RestStatus.BAD_REQUEST;

case OpenSearchRejectedExecutionException osre -> RestStatus.TOO_MANY_REQUESTS;

case NotXContentException nxce -> RestStatus.BAD_REQUEST;

case null -> RestStatus.INTERNAL_SERVER_ERROR;

default -> RestStatus.INTERNAL_SERVER_ERROR;

};

return switch (t) {

case OpenSearchException ose -> ose.status();

case IllegalArgumentException || JsonParseException || NotXContentException -> RestStatus.BAD_REQUEST;

case OpenSearchRejectedExecutionException -> RestStatus.TOO_MANY_REQUESTS;

case null, Throwable _ -> RestStatus.INTERNAL_SERVER_ERROR;

};

opensearch-trigger-bot · 2025-06-02T15:23:01Z

This PR is stalled because it has been open for 30 days with no activity.

JaySabva requested review from Bukhtawar, CEHENKLE, Rishikesh1159, VachaShah, anasalkouz, andrross, ashking94, cwperks, dbwiddis, gbbafna, jed326, kotwanikunal, mch2, msfroh, nknize, owaiskazi19, reta, sachinpkale, saratvemulapalli, shwetathareja and sohami as code owners April 11, 2025 17:36

github-actions bot added enhancement Enhancement or improvement to existing feature or request good first issue Good for newcomers labels Apr 11, 2025

JaySabva requested review from bugmakerrrrrr, jainankitk and linuxpi as code owners April 12, 2025 10:54

owaiskazi19 reviewed Apr 14, 2025

View reviewed changes

JaySabva force-pushed the main branch from 044d7b7 to aaebb3f Compare April 14, 2025 19:05

JaySabva added 6 commits April 15, 2025 00:40

ISSUE opensearch-project#17874 Make use of Java 17 pattern matching s…

a4f4544

…witch statements Signed-off-by: Jay Sabva <202101224@daiict.ac.in>

ISSUE opensearch-project#17874 Make use of Java 17 pattern matching s…

baab507

…witch statements Signed-off-by: Jay Sabva <202101224@daiict.ac.in>

ISSUE opensearch-project#17874 Make use of Java 17 pattern matching s…

5d26ea2

…witch statements Signed-off-by: Jay Sabva <202101224@daiict.ac.in>

ISSUE opensearch-project#17874 Make use of Java 17 pattern matching s…

7e221cb

…witch statements Signed-off-by: Jay Sabva <202101224@daiict.ac.in>

ISSUE opensearch-project#17874 Make use of Java 17 pattern matching s…

1b021b6

…witch statements Signed-off-by: Jay Sabva <202101224@daiict.ac.in>

ISSUE opensearch-project#17874 Make use of Java 17 pattern matching s…

5f4340f

…witch statements Signed-off-by: Jay Sabva <202101224@daiict.ac.in>

JaySabva force-pushed the main branch from aaebb3f to 5f4340f Compare April 14, 2025 19:13

JaySabva mentioned this pull request Apr 28, 2025

[Feature Request] Make use of Java 17 pattern matching switch statements where possible #17874

Closed

opensearch-ci-bot mentioned this pull request Apr 29, 2025

[AUTOCUT] Gradle Check Flaky Test Report for SearchIT #18129

Closed

owaiskazi19 reviewed May 2, 2025

View reviewed changes

opensearch-trigger-bot bot added the stalled Issues that have stalled label Jun 2, 2025

Conversation

JaySabva commented Apr 11, 2025

Description

Related Issues

Check List

Uh oh!

github-actions bot commented Apr 11, 2025

Uh oh!

github-actions bot commented Apr 12, 2025

Uh oh!

codecov bot commented Apr 12, 2025

Codecov Report

Uh oh!

github-actions bot commented Apr 12, 2025

Uh oh!

owaiskazi19 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

owaiskazi19 Apr 14, 2025

Choose a reason for hiding this comment

Uh oh!

JaySabva Apr 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

msfroh Apr 28, 2025

Choose a reason for hiding this comment

Uh oh!

owaiskazi19 Apr 14, 2025

Choose a reason for hiding this comment

Uh oh!

JaySabva commented Apr 14, 2025

Uh oh!

github-actions bot commented Apr 14, 2025

Uh oh!

owaiskazi19 left a comment

Choose a reason for hiding this comment

Uh oh!

owaiskazi19 May 2, 2025

Choose a reason for hiding this comment

Uh oh!

opensearch-trigger-bot bot commented Jun 2, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

owaiskazi19 left a comment •

edited

Loading

JaySabva Apr 14, 2025 •

edited

Loading