use multicatch to restrict caught exceptions

Signed-off-by: Andrew Parmet <[email protected]>
opensearch-project · Oct 6, 2023 · 77feacc · 77feacc
1 parent 0da9cb2
commit 77feacc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/...ent/src/test/java/org/opensearch/client/opensearch/integTest/AbstractClusterClientIT.java b/...ent/src/test/java/org/opensearch/client/opensearch/integTest/AbstractClusterClientIT.java
@@ -93,7 +93,7 @@ public void testClusterUpdateSettingNonExistent() throws IOException {
         try {
             openSearchClient.cluster().putSettings(request);
             fail();
-        } catch (Exception e) {
+        } catch (OpenSearchException | IOException e) {
             OpenSearchException openSearchException;
             if (e instanceof OpenSearchException) {
                 openSearchException = (OpenSearchException) e;

diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractCrudIT.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/AbstractCrudIT.java
@@ -268,7 +268,7 @@ public void testUpdate() throws Exception {
                     .build();
             try {
                 javaClient().update(updateRequest, AppData.class);
-            } catch (Exception e) {
+            } catch (OpenSearchException | IOException e) {
                 OpenSearchException openSearchException;
                 if (e instanceof OpenSearchException) {
                     openSearchException = (OpenSearchException) e;

diff --git a/...ent/src/test/java/org/opensearch/client/opensearch/integTest/AbstractIndicesClientIT.java b/...ent/src/test/java/org/opensearch/client/opensearch/integTest/AbstractIndicesClientIT.java
@@ -53,7 +53,7 @@ public void testIndicesExists() throws IOException {
             try {
                 javaClient().indices().get(request);
                 fail(); // should never execute
-            } catch (Exception ex) {
+            } catch (OpenSearchException | IOException ex) {
                 OpenSearchException openSearchException;
                 if (ex instanceof OpenSearchException) {
                     openSearchException = (OpenSearchException) ex;
@@ -81,7 +81,7 @@ public void testIndicesExists() throws IOException {
             try {
                 javaClient().indices().get(request);
                 fail(); // should never execute
-            } catch (Exception ex) {
+            } catch (OpenSearchException | IOException ex) {
                 if (!(ex instanceof OpenSearchException)) {
                     assertTrue(ex.getCause() instanceof OpenSearchException);
                 }
@@ -115,7 +115,7 @@ public void testGetSettingsNonExistentIndex() throws IOException {
         try {
             javaClient().indices().getSettings(getIndicesSettingsRequest);
             fail();
-        } catch (Exception ex) {
+        } catch (OpenSearchException | IOException ex) {
             OpenSearchException openSearchException;
             if (ex instanceof OpenSearchException) {
                 openSearchException = (OpenSearchException) ex;
@@ -201,7 +201,7 @@ public void testDataStream() throws IOException {
         try {
             javaClient().indices().getDataStream(b -> b.name(dataStreamName));
             fail();
-        } catch (Exception ex) {
+        } catch (OpenSearchException | IOException ex) {
             OpenSearchException openSearchException;
             if (ex instanceof OpenSearchException) {
                 openSearchException = (OpenSearchException) ex;
@@ -220,7 +220,7 @@ public void testGetNotExistingIndexAlias() throws Exception {
         try {
             GetAliasResponse response = javaClient().indices().getAlias(aliasRequest);
             fail();
-        } catch (Exception ex) {
+        } catch (OpenSearchException | IOException ex) {
             OpenSearchException openSearchException;
             if (ex instanceof OpenSearchException) {
                 openSearchException = (OpenSearchException) ex;