From 6f88c0d2ec579baf3287c4dc2481e3f6312afe50 Mon Sep 17 00:00:00 2001
From: David Pursehouse <david.pursehouse@sonymobile.com>
Date: Fri, 11 Jul 2014 10:08:17 +0900
Subject: [PATCH] Use Java 7 style exception handling in ReviewCommand

Replace multiple catch blocks with a single catch that includes all
the exceptions.

It is no longer necessary to explicitly list AuthException,
BadRequestException, or ResourceConflictException because they are
subclasses of RestApiException.

Change-Id: Ic8abf02cc125442882ecdde6284991bbc989fc3f
---
 .../gerrit/sshd/commands/ReviewCommand.java      | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java
index 107394b1d8..106774edad 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java
@@ -25,9 +25,6 @@ import com.google.gerrit.extensions.api.changes.RestoreInput;
 import com.google.gerrit.extensions.api.changes.ReviewInput;
 import com.google.gerrit.extensions.api.changes.ReviewInput.NotifyHandling;
 import com.google.gerrit.extensions.api.changes.RevisionApi;
-import com.google.gerrit.extensions.restapi.AuthException;
-import com.google.gerrit.extensions.restapi.BadRequestException;
-import com.google.gerrit.extensions.restapi.ResourceConflictException;
 import com.google.gerrit.extensions.restapi.RestApiException;
 import com.google.gerrit.reviewdb.client.Change;
 import com.google.gerrit.reviewdb.client.PatchSet;
@@ -246,17 +243,8 @@ public class ReviewCommand extends SshCommand {
       } else if (deleteDraftPatchSet) {
         revisionApi(patchSet).delete();
       }
-    } catch (InvalidChangeOperationException e) {
-      throw error(e.getMessage());
-    } catch (IllegalStateException e) {
-      throw error(e.getMessage());
-    } catch (AuthException e) {
-      throw error(e.getMessage());
-    } catch (BadRequestException e) {
-      throw error(e.getMessage());
-    } catch (ResourceConflictException e) {
-      throw error(e.getMessage());
-    } catch (RestApiException e) {
+    } catch (IllegalStateException | InvalidChangeOperationException
+        | RestApiException e) {
       throw error(e.getMessage());
     }
   }