Remove ElasticsearchIAE and ElasticsearchISE

src/main/java/org/apache/lucene/analysis/PrefixAnalyzer.java

@@ -21,7 +21,6 @@
 
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
-import org.elasticsearch.ElasticsearchIllegalArgumentException;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -97,7 +96,7 @@ public PrefixTokenFilter(TokenStream input, char separator, Iterable<? extends C
             this.currentPrefix = null;
             this.separator = separator;
             if (prefixes == null || !prefixes.iterator().hasNext()) {
-                throw new ElasticsearchIllegalArgumentException("one or more prefixes needed");
+                throw new IllegalArgumentException("one or more prefixes needed");
             }
         }
 

src/main/java/org/apache/lucene/store/StoreRateLimiting.java

@@ -19,7 +19,6 @@
 package org.apache.lucene.store;
 
 import org.apache.lucene.store.RateLimiter.SimpleRateLimiter;
-import org.elasticsearch.ElasticsearchIllegalArgumentException;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.unit.ByteSizeValue;
 
@@ -42,15 +41,15 @@ public static enum Type {
         MERGE,
         ALL;
 
-        public static Type fromString(String type) throws ElasticsearchIllegalArgumentException {
+        public static Type fromString(String type) {
             if ("none".equalsIgnoreCase(type)) {
                 return NONE;
             } else if ("merge".equalsIgnoreCase(type)) {
                 return MERGE;
             } else if ("all".equalsIgnoreCase(type)) {
                 return ALL;
             }
-            throw new ElasticsearchIllegalArgumentException("rate limiting type [" + type + "] not valid, can be one of [all|merge|none]");
+            throw new IllegalArgumentException("rate limiting type [" + type + "] not valid, can be one of [all|merge|none]");
         }
     }
 
@@ -88,7 +87,7 @@ public void setType(Type type) {
         this.type = type;
     }
 
-    public void setType(String type) throws ElasticsearchIllegalArgumentException {
+    public void setType(String type) {
         this.type = Type.fromString(type);
     }
 }

src/main/java/org/elasticsearch/Version.java

@@ -459,12 +459,12 @@ public static Version fromId(int id) {
     /**
      * Return the {@link Version} of Elasticsearch that has been used to create an index given its settings.
      *
-     * @throws ElasticsearchIllegalStateException if the given index settings doesn't contain a value for the key {@value IndexMetaData#SETTING_VERSION_CREATED}
+     * @throws IllegalStateException if the given index settings doesn't contain a value for the key {@value IndexMetaData#SETTING_VERSION_CREATED}
      */
     public static Version indexCreated(Settings indexSettings) {
         final Version indexVersion = indexSettings.getAsVersion(IndexMetaData.SETTING_VERSION_CREATED, null);
         if (indexVersion == null) {
-            throw new ElasticsearchIllegalStateException("[" + IndexMetaData.SETTING_VERSION_CREATED + "] is not present in the index settings for index with uuid: [" + indexSettings.get(IndexMetaData.SETTING_UUID) + "]");
+            throw new IllegalStateException("[" + IndexMetaData.SETTING_VERSION_CREATED + "] is not present in the index settings for index with uuid: [" + indexSettings.get(IndexMetaData.SETTING_UUID) + "]");
         }
         return indexVersion;
     }

src/main/java/org/elasticsearch/action/ActionFuture.java

@@ -35,29 +35,29 @@ public interface ActionFuture<T> extends Future<T> {
 
     /**
      * Similar to {@link #get()}, just catching the {@link InterruptedException} and throwing
-     * an {@link org.elasticsearch.ElasticsearchIllegalStateException} instead. Also catches
+     * an {@link IllegalStateException} instead. Also catches
      * {@link java.util.concurrent.ExecutionException} and throws the actual cause instead.
      * <p/>
      * <p>Note, the actual cause is unwrapped to the actual failure (for example, unwrapped
      * from {@link org.elasticsearch.transport.RemoteTransportException}. The root failure is
      * still accessible using {@link #getRootFailure()}.
      */
-    T actionGet() throws ElasticsearchException;
+    T actionGet();
 
     /**
      * Similar to {@link #get(long, java.util.concurrent.TimeUnit)}, just catching the {@link InterruptedException} and throwing
-     * an {@link org.elasticsearch.ElasticsearchIllegalStateException} instead. Also catches
+     * an {@link IllegalStateException} instead. Also catches
      * {@link java.util.concurrent.ExecutionException} and throws the actual cause instead.
      * <p/>
      * <p>Note, the actual cause is unwrapped to the actual failure (for example, unwrapped
      * from {@link org.elasticsearch.transport.RemoteTransportException}. The root failure is
      * still accessible using {@link #getRootFailure()}.
      */
-    T actionGet(String timeout) throws ElasticsearchException;
+    T actionGet(String timeout);
 
     /**
      * Similar to {@link #get(long, java.util.concurrent.TimeUnit)}, just catching the {@link InterruptedException} and throwing
-     * an {@link org.elasticsearch.ElasticsearchIllegalStateException} instead. Also catches
+     * an {@link IllegalStateException} instead. Also catches
      * {@link java.util.concurrent.ExecutionException} and throws the actual cause instead.
      * <p/>
      * <p>Note, the actual cause is unwrapped to the actual failure (for example, unwrapped
@@ -66,29 +66,29 @@ public interface ActionFuture<T> extends Future<T> {
      *
      * @param timeoutMillis Timeout in millis
      */
-    T actionGet(long timeoutMillis) throws ElasticsearchException;
+    T actionGet(long timeoutMillis);
 
     /**
      * Similar to {@link #get(long, java.util.concurrent.TimeUnit)}, just catching the {@link InterruptedException} and throwing
-     * an {@link org.elasticsearch.ElasticsearchIllegalStateException} instead. Also catches
+     * an {@link IllegalStateException} instead. Also catches
      * {@link java.util.concurrent.ExecutionException} and throws the actual cause instead.
      * <p/>
      * <p>Note, the actual cause is unwrapped to the actual failure (for example, unwrapped
      * from {@link org.elasticsearch.transport.RemoteTransportException}. The root failure is
      * still accessible using {@link #getRootFailure()}.
      */
-    T actionGet(long timeout, TimeUnit unit) throws ElasticsearchException;
+    T actionGet(long timeout, TimeUnit unit);
 
     /**
      * Similar to {@link #get(long, java.util.concurrent.TimeUnit)}, just catching the {@link InterruptedException} and throwing
-     * an {@link org.elasticsearch.ElasticsearchIllegalStateException} instead. Also catches
+     * an {@link IllegalStateException} instead. Also catches
      * {@link java.util.concurrent.ExecutionException} and throws the actual cause instead.
      * <p/>
      * <p>Note, the actual cause is unwrapped to the actual failure (for example, unwrapped
      * from {@link org.elasticsearch.transport.RemoteTransportException}. The root failure is
      * still accessible using {@link #getRootFailure()}.
      */
-    T actionGet(TimeValue timeout) throws ElasticsearchException;
+    T actionGet(TimeValue timeout);
 
     /**
      * The root (possibly) wrapped failure.

src/main/java/org/elasticsearch/action/ActionRequestBuilder.java

@@ -69,21 +69,21 @@ public ListenableActionFuture<Response> execute() {
     /**
      * Short version of execute().actionGet().
      */
-    public Response get() throws ElasticsearchException {
+    public Response get() {
         return execute().actionGet();
     }
 
     /**
      * Short version of execute().actionGet().
      */
-    public Response get(TimeValue timeout) throws ElasticsearchException {
+    public Response get(TimeValue timeout) {
         return execute().actionGet(timeout);
     }
 
     /**
      * Short version of execute().actionGet().
      */
-    public Response get(String timeout) throws ElasticsearchException {
+    public Response get(String timeout) {
         return execute().actionGet(timeout);
     }
 

src/main/java/org/elasticsearch/action/ActionRequestValidationException.java

@@ -19,20 +19,21 @@
 
 package org.elasticsearch.action;
 
-import org.elasticsearch.ElasticsearchIllegalArgumentException;
+import org.elasticsearch.ElasticsearchException;
+
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  *
  */
-public class ActionRequestValidationException extends ElasticsearchIllegalArgumentException {
+public class ActionRequestValidationException extends IllegalArgumentException {
 
     private final List<String> validationErrors = new ArrayList<>();
 
     public ActionRequestValidationException() {
-        super(null);
+        super("validation failed");
     }
 
     public void addValidationError(String error) {

src/main/java/org/elasticsearch/action/ThreadingModel.java

@@ -19,7 +19,6 @@
 
 package org.elasticsearch.action;
 
-import org.elasticsearch.ElasticsearchIllegalArgumentException;
 
 /**
  *
@@ -108,7 +107,7 @@ public static ThreadingModel fromId(byte id) {
         } else if (id == 3) {
             return OPERATION_LISTENER;
         } else {
-            throw new ElasticsearchIllegalArgumentException("No threading model for [" + id + "]");
+            throw new IllegalArgumentException("No threading model for [" + id + "]");
         }
     }
 }

src/main/java/org/elasticsearch/action/WriteConsistencyLevel.java

@@ -19,7 +19,6 @@
 
 package org.elasticsearch.action;
 
-import org.elasticsearch.ElasticsearchIllegalArgumentException;
 
 /**
  * Write Consistency Level control how many replicas should be active for a write operation to occur (a write operation
@@ -53,7 +52,7 @@ public static WriteConsistencyLevel fromId(byte value) {
         } else if (value == 3) {
             return ALL;
         }
-        throw new ElasticsearchIllegalArgumentException("No write consistency match [" + value + "]");
+        throw new IllegalArgumentException("No write consistency match [" + value + "]");
     }
 
     public static WriteConsistencyLevel fromString(String value) {
@@ -66,6 +65,6 @@ public static WriteConsistencyLevel fromString(String value) {
         } else if (value.equals("all")) {
             return ALL;
         }
-        throw new ElasticsearchIllegalArgumentException("No write consistency match [" + value + "]");
+        throw new IllegalArgumentException("No write consistency match [" + value + "]");
     }
 }

src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthStatus.java

@@ -19,7 +19,6 @@
 
 package org.elasticsearch.action.admin.cluster.health;
 
-import org.elasticsearch.ElasticsearchIllegalArgumentException;
 
 /**
  *
@@ -48,7 +47,7 @@ public static ClusterHealthStatus fromValue(byte value) {
             case 2:
                 return RED;
             default:
-                throw new ElasticsearchIllegalArgumentException("No cluster health status for value [" + value + "]");
+                throw new IllegalArgumentException("No cluster health status for value [" + value + "]");
         }
     }
 }

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

@@ -20,7 +20,6 @@
 package org.elasticsearch.action.admin.cluster.health;
 
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.ElasticsearchIllegalStateException;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;
 import org.elasticsearch.action.support.IndicesOptions;
@@ -66,7 +65,7 @@ protected ClusterHealthResponse newResponse() {
     }
 
     @Override
-    protected void masterOperation(final ClusterHealthRequest request, final ClusterState unusedState, final ActionListener<ClusterHealthResponse> listener) throws ElasticsearchException {
+    protected void masterOperation(final ClusterHealthRequest request, final ClusterState unusedState, final ActionListener<ClusterHealthResponse> listener) {
         if (request.waitForEvents() != null) {
             final long endTime = System.currentTimeMillis() + request.timeout().millis();
             clusterService.submitStateUpdateTask("cluster_health (wait_for_events [" + request.waitForEvents() + "])", request.waitForEvents(), new ProcessedClusterStateUpdateTask() {
@@ -141,7 +140,7 @@ public void onNewClusterState(ClusterState clusterState) {
 
             @Override
             public void onClusterServiceClose() {
-                listener.onFailure(new ElasticsearchIllegalStateException("ClusterService was close during health call"));
+                listener.onFailure(new IllegalStateException("ClusterService was close during health call"));
             }
 
             @Override

src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java

@@ -73,7 +73,7 @@ protected NodeHotThreads newNodeResponse() {
     }
 
     @Override
-    protected NodeHotThreads nodeOperation(NodeRequest request) throws ElasticsearchException {
+    protected NodeHotThreads nodeOperation(NodeRequest request) {
         HotThreads hotThreads = new HotThreads()
                 .busiestThreads(request.request.threads)
                 .type(request.request.type)

src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java

@@ -77,7 +77,7 @@ protected NodeInfo newNodeResponse() {
     }
 
     @Override
-    protected NodeInfo nodeOperation(NodeInfoRequest nodeRequest) throws ElasticsearchException {
+    protected NodeInfo nodeOperation(NodeInfoRequest nodeRequest) {
         NodesInfoRequest request = nodeRequest.request;
         return nodeService.info(request.settings(), request.os(), request.process(), request.jvm(), request.threadPool(),
                 request.network(), request.transport(), request.http(), request.plugins());

src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java

@@ -77,7 +77,7 @@ protected NodeStats newNodeResponse() {
     }
 
     @Override
-    protected NodeStats nodeOperation(NodeStatsRequest nodeStatsRequest) throws ElasticsearchException {
+    protected NodeStats nodeOperation(NodeStatsRequest nodeStatsRequest) {
         NodesStatsRequest request = nodeStatsRequest.request;
         return nodeService.stats(request.indices(), request.os(), request.process(), request.jvm(), request.threadPool(), request.network(),
                 request.fs(), request.transport(), request.http(), request.breaker());

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

@@ -64,7 +64,7 @@ protected ClusterBlockException checkBlock(DeleteRepositoryRequest request, Clus
     }
 
     @Override
-    protected void masterOperation(final DeleteRepositoryRequest request, ClusterState state, final ActionListener<DeleteRepositoryResponse> listener) throws ElasticsearchException {
+    protected void masterOperation(final DeleteRepositoryRequest request, ClusterState state, final ActionListener<DeleteRepositoryResponse> listener) {
         repositoriesService.unregisterRepository(
                 new RepositoriesService.UnregisterRepositoryRequest("delete_repository [" + request.name() + "]", request.name())
                         .masterNodeTimeout(request.masterNodeTimeout()).ackTimeout(request.timeout()),