Do not catch throwable

core/src/main/java/org/elasticsearch/ElasticsearchException.java

@@ -100,7 +100,7 @@ public ElasticsearchException(String msg, Throwable cause, Object... args) {
     }
 
     public ElasticsearchException(StreamInput in) throws IOException {
-        super(in.readOptionalString(), in.readThrowable());
+        super(in.readOptionalString(), in.readException());
         readStackTrace(this, in);
         int numKeys = in.readVInt();
         for (int i = 0; i < numKeys; i++) {
@@ -162,7 +162,7 @@ public RestStatus status() {
      * Unwraps the actual cause from the exception for cases when the exception is a
      * {@link ElasticsearchWrapperException}.
      *
-     * @see org.elasticsearch.ExceptionsHelper#unwrapCause(Throwable)
+     * @see ExceptionsHelper#unwrapCause(Throwable)
      */
     public Throwable unwrapCause() {
         return ExceptionsHelper.unwrapCause(this);
@@ -415,7 +415,7 @@ public static <T extends Throwable> T readStackTrace(T throwable, StreamInput in
 
         int numSuppressed = in.readVInt();
         for (int i = 0; i < numSuppressed; i++) {
-            throwable.addSuppressed(in.readThrowable());
+            throwable.addSuppressed(in.readException());
         }
         return throwable;
     }
@@ -794,9 +794,9 @@ public String getResourceType() {
         return null;
     }
 
-    public static void renderThrowable(XContentBuilder builder, Params params, Throwable t) throws IOException {
+    public static void renderException(XContentBuilder builder, Params params, Exception e) throws IOException {
         builder.startObject("error");
-        final ElasticsearchException[] rootCauses = ElasticsearchException.guessRootCauses(t);
+        final ElasticsearchException[] rootCauses = ElasticsearchException.guessRootCauses(e);
         builder.field("root_cause");
         builder.startArray();
         for (ElasticsearchException rootCause : rootCauses) {
@@ -806,7 +806,7 @@ public static void renderThrowable(XContentBuilder builder, Params params, Throw
             builder.endObject();
         }
         builder.endArray();
-        ElasticsearchException.toXContent(builder, params, t);
+        ElasticsearchException.toXContent(builder, params, e);
         builder.endObject();
     }
 

core/src/main/java/org/elasticsearch/ElasticsearchSecurityException.java

@@ -36,7 +36,7 @@ public ElasticsearchSecurityException(String msg, RestStatus status, Throwable c
         this.status = status ;
     }
 
-    public ElasticsearchSecurityException(String msg, Throwable cause, Object... args) {
+    public ElasticsearchSecurityException(String msg, Exception cause, Object... args) {
         this(msg, ExceptionsHelper.status(cause), cause, args);
     }
 

core/src/main/java/org/elasticsearch/ExceptionsHelper.java

@@ -37,25 +37,22 @@
 import java.util.List;
 import java.util.Set;
 
-/**
- *
- */
 public final class ExceptionsHelper {
 
     private static final ESLogger logger = Loggers.getLogger(ExceptionsHelper.class);
 
-    public static RuntimeException convertToRuntime(Throwable t) {
-        if (t instanceof RuntimeException) {
-            return (RuntimeException) t;
+    public static RuntimeException convertToRuntime(Exception e) {
+        if (e instanceof RuntimeException) {
+            return (RuntimeException) e;
         }
-        return new ElasticsearchException(t);
+        return new ElasticsearchException(e);
     }
 
-    public static ElasticsearchException convertToElastic(Throwable t) {
-        if (t instanceof ElasticsearchException) {
-            return (ElasticsearchException) t;
+    public static ElasticsearchException convertToElastic(Exception e) {
+        if (e instanceof ElasticsearchException) {
+            return (ElasticsearchException) e;
         }
-        return new ElasticsearchException(t);
+        return new ElasticsearchException(e);
     }
 
     public static RestStatus status(Throwable t) {
@@ -164,8 +161,8 @@ public static <T extends Throwable> T useOrSuppress(T first, T second) {
     }
 
     public static IOException unwrapCorruption(Throwable t) {
-        return (IOException) unwrap(t, CorruptIndexException.class, 
-                                       IndexFormatTooOldException.class, 
+        return (IOException) unwrap(t, CorruptIndexException.class,
+                                       IndexFormatTooOldException.class,
                                        IndexFormatTooNewException.class);
     }
 
@@ -209,7 +206,6 @@ public static boolean reThrowIfNotNull(@Nullable Throwable e) {
         return true;
     }
 
-
     /**
      * Deduplicate the failures by exception message and index.
      */

core/src/main/java/org/elasticsearch/action/ActionListener.java

@@ -32,5 +32,5 @@ public interface ActionListener<Response> {
     /**
      * A failure caused by an exception at some phase of the task.
      */
-    void onFailure(Throwable e);
+    void onFailure(Exception e);
 }

core/src/main/java/org/elasticsearch/action/ActionRunnable.java

@@ -22,23 +22,23 @@
 import org.elasticsearch.common.util.concurrent.AbstractRunnable;
 
 /**
- * Base class for {@link Runnable}s that need to call {@link ActionListener#onFailure(Throwable)} in case an uncaught
+ * Base class for {@link Runnable}s that need to call {@link ActionListener#onFailure(Exception)} in case an uncaught
  * exception or error is thrown while the actual action is run.
  */
 public abstract class ActionRunnable<Response> extends AbstractRunnable {
-    
+
     protected final ActionListener<Response> listener;
 
     public ActionRunnable(ActionListener<Response> listener) {
         this.listener = listener;
     }
 
     /**
-     * Calls the action listeners {@link ActionListener#onFailure(Throwable)} method with the given exception.
+     * Calls the action listeners {@link ActionListener#onFailure(Exception)} method with the given exception.
      * This method is invoked for all exception thrown by {@link #doRun()}
      */
     @Override
-    public void onFailure(Throwable t) {
-        listener.onFailure(t);
+    public void onFailure(Exception e) {
+        listener.onFailure(e);
     }
 }

core/src/main/java/org/elasticsearch/action/LatchedActionListener.java

@@ -45,7 +45,7 @@ public void onResponse(T t) {
     }
 
     @Override
-    public void onFailure(Throwable e) {
+    public void onFailure(Exception e) {
         try {
             delegate.onFailure(e);
         } finally {

core/src/main/java/org/elasticsearch/action/TaskOperationFailure.java

@@ -43,15 +43,15 @@ public final class TaskOperationFailure implements Writeable, ToXContent {
 
     private final long taskId;
 
-    private final Throwable reason;
+    private final Exception reason;
 
     private final RestStatus status;
 
-    public TaskOperationFailure(String nodeId, long taskId, Throwable t) {
+    public TaskOperationFailure(String nodeId, long taskId, Exception e) {
         this.nodeId = nodeId;
         this.taskId = taskId;
-        this.reason = t;
-        status = ExceptionsHelper.status(t);
+        this.reason = e;
+        status = ExceptionsHelper.status(e);
     }
 
     /**
@@ -60,7 +60,7 @@ public TaskOperationFailure(String nodeId, long taskId, Throwable t) {
     public TaskOperationFailure(StreamInput in) throws IOException {
         nodeId = in.readString();
         taskId = in.readLong();
-        reason = in.readThrowable();
+        reason = in.readException();
         status = RestStatus.readFrom(in);
     }
 

core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportClusterAllocationExplainAction.java

@@ -145,7 +145,7 @@ public static NodeExplanation calculateNodeExplanation(ShardRouting shard,
             // No copies of the data
             storeCopy = ClusterAllocationExplanation.StoreCopy.NONE;
         } else {
-            final Throwable storeErr = storeStatus.getStoreException();
+            final Exception storeErr = storeStatus.getStoreException();
             if (storeErr != null) {
                 if (ExceptionsHelper.unwrapCause(storeErr) instanceof CorruptIndexException) {
                     storeCopy = ClusterAllocationExplanation.StoreCopy.CORRUPT;
@@ -323,7 +323,7 @@ public void onResponse(IndicesShardStoresResponse shardStoreResponse) {
             }
 
             @Override
-            public void onFailure(Throwable e) {
+            public void onFailure(Exception e) {
                 listener.onFailure(e);
             }
         });

core/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java

@@ -104,9 +104,9 @@ public void onNoLongerMaster(String source) {
                 }
 
                 @Override
-                public void onFailure(String source, Throwable t) {
-                    logger.error("unexpected failure during [{}]", t, source);
-                    listener.onFailure(t);
+                public void onFailure(String source, Exception e) {
+                    logger.error("unexpected failure during [{}]", e, source);
+                    listener.onFailure(e);
                 }
 
                 @Override

core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java

@@ -154,8 +154,8 @@ protected void doRun() throws Exception {
                     }
 
                     @Override
-                    public void onFailure(Throwable t) {
-                        listener.onFailure(t);
+                    public void onFailure(Exception e) {
+                        listener.onFailure(e);
                     }
                 });
             } else {
@@ -179,7 +179,7 @@ public void onResponse(GetTaskResponse response) {
             }
 
             @Override
-            public void onFailure(Throwable e) {
+            public void onFailure(Exception e) {
                 /*
                  * We couldn't load the task from the task index. Instead of 404 we should use the snapshot we took after it finished. If
                  * the error isn't a 404 then we'll just throw it back to the user.
@@ -207,13 +207,13 @@ void getFinishedTaskFromIndex(Task thisTask, GetTaskRequest request, ActionListe
             public void onResponse(GetResponse getResponse) {
                 try {
                     onGetFinishedTaskFromIndex(getResponse, listener);
-                } catch (Throwable e) {
+                } catch (Exception e) {
                     listener.onFailure(e);
                 }
             }
 
             @Override
-            public void onFailure(Throwable e) {
+            public void onFailure(Exception e) {
                 if (ExceptionsHelper.unwrap(e, IndexNotFoundException.class) != null) {
                     // We haven't yet created the index for the task results so it can't be found.
                     listener.onFailure(new ResourceNotFoundException("task [{}] isn't running or persisted", e, request.getTaskId()));

core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java

@@ -76,7 +76,7 @@ public void onResponse(ClusterStateUpdateResponse unregisterRepositoryResponse)
                     }
 
                     @Override
-                    public void onFailure(Throwable e) {
+                    public void onFailure(Exception e) {
                         listener.onFailure(e);
                     }
                 });

core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/TransportPutRepositoryAction.java

@@ -80,7 +80,7 @@ public void onResponse(ClusterStateUpdateResponse response) {
             }
 
             @Override
-            public void onFailure(Throwable e) {
+            public void onFailure(Exception e) {
                 listener.onFailure(e);
             }
         });

core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/verify/TransportVerifyRepositoryAction.java

@@ -78,7 +78,7 @@ public void onResponse(RepositoriesService.VerifyResponse verifyResponse) {
             }
 
             @Override
-            public void onFailure(Throwable e) {
+            public void onFailure(Exception e) {
                 listener.onFailure(e);
             }
         });

core/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java

@@ -102,9 +102,9 @@ public void onAckTimeout() {
         }
 
         @Override
-        public void onFailure(String source, Throwable t) {
-            logger.debug("failed to perform [{}]", t, source);
-            super.onFailure(source, t);
+        public void onFailure(String source, Exception e) {
+            logger.debug("failed to perform [{}]", e, source);
+            super.onFailure(source, e);
         }
 
         @Override

core/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java

@@ -93,11 +93,11 @@ protected ClusterUpdateSettingsResponse newResponse(boolean acknowledged) {
             }
 
             @Override
-            public void onAllNodesAcked(@Nullable Throwable t) {
+            public void onAllNodesAcked(@Nullable Exception e) {
                 if (changed) {
                     reroute(true);
                 } else {
-                    super.onAllNodesAcked(t);
+                    super.onAllNodesAcked(e);
                 }
             }
 
@@ -146,10 +146,10 @@ public void onNoLongerMaster(String source) {
                     }
 
                     @Override
-                    public void onFailure(String source, Throwable t) {
+                    public void onFailure(String source, Exception e) {
                         //if the reroute fails we only log
-                        logger.debug("failed to perform [{}]", t, source);
-                        listener.onFailure(new ElasticsearchException("reroute after update settings failed", t));
+                        logger.debug("failed to perform [{}]", e, source);
+                        listener.onFailure(new ElasticsearchException("reroute after update settings failed", e));
                     }
 
                     @Override
@@ -165,9 +165,9 @@ public ClusterState execute(final ClusterState currentState) {
             }
 
             @Override
-            public void onFailure(String source, Throwable t) {
-                logger.debug("failed to perform [{}]", t, source);
-                super.onFailure(source, t);
+            public void onFailure(String source, Exception e) {
+                logger.debug("failed to perform [{}]", e, source);
+                super.onFailure(source, e);
             }
 
             @Override

core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/TransportCreateSnapshotAction.java

@@ -94,10 +94,10 @@ public void onSnapshotCompletion(Snapshot snapshot, SnapshotInfo snapshotInfo) {
                         }
 
                         @Override
-                        public void onSnapshotFailure(Snapshot snapshot, Throwable t) {
+                        public void onSnapshotFailure(Snapshot snapshot, Exception e) {
                             if (snapshot.getRepository().equals(request.repository()) &&
                                     snapshot.getSnapshotId().getName().equals(request.snapshot())) {
-                                listener.onFailure(t);
+                                listener.onFailure(e);
                                 snapshotsService.removeListener(this);
                             }
                         }
@@ -108,8 +108,8 @@ public void onSnapshotFailure(Snapshot snapshot, Throwable t) {
             }
 
             @Override
-            public void onFailure(Throwable t) {
-                listener.onFailure(t);
+            public void onFailure(Exception e) {
+                listener.onFailure(e);
             }
         });
     }

core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/delete/TransportDeleteSnapshotAction.java

@@ -72,8 +72,8 @@ public void onResponse() {
             }
 
             @Override
-            public void onFailure(Throwable t) {
-                listener.onFailure(t);
+            public void onFailure(Exception e) {
+                listener.onFailure(e);
             }
         });
     }

core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/TransportGetSnapshotsAction.java

@@ -120,8 +120,8 @@ protected void masterOperation(final GetSnapshotsRequest request, ClusterState s
                 snapshotInfoBuilder.addAll(snapshotsService.snapshots(repository, new ArrayList<>(toResolve), request.ignoreUnavailable()));
             }
             listener.onResponse(new GetSnapshotsResponse(snapshotInfoBuilder));
-        } catch (Throwable t) {
-            listener.onFailure(t);
+        } catch (Exception e) {
+            listener.onFailure(e);
         }
     }
 

core/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/TransportRestoreSnapshotAction.java

@@ -94,7 +94,7 @@ public void onResponse(RestoreService.RestoreCompletionResponse restoreCompletio
                         }
 
                         @Override
-                        public void onFailure(Throwable e) {
+                        public void onFailure(Exception e) {
                             listener.onFailure(e);
                         }
                     });
@@ -104,7 +104,7 @@ public void onFailure(Throwable e) {
             }
 
             @Override
-            public void onFailure(Throwable t) {
+            public void onFailure(Exception t) {
                 listener.onFailure(t);
             }
         });