change IllegalStateException to IllegalArgumentException

Author: danhermann

modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/290_versioned_update.yml

@@ -47,7 +47,7 @@
 
   # required version does not match specified version
   - do:
-      catch: /.*version conflict, required version \[99\] for pipeline \[my_pipeline\] but current version is \[1\].*/
+      catch: bad_request
       ingest.put_pipeline:
         id: "my_pipeline"
         if_version: 99
@@ -66,7 +66,7 @@
 
   # may not update to same version
   - do:
-      catch: /.*cannot update pipeline \[my_pipeline\] with the same version \[1\].*/
+      catch: bad_request
       ingest.put_pipeline:
         id: "my_pipeline"
         if_version: 1
@@ -86,7 +86,7 @@
 
   # cannot conditionally update non-existent pipeline
   - do:
-      catch: /.*version conflict, required version \[1\] for pipeline \[my_pipeline2\] but no pipeline was found.*/
+      catch: bad_request
       ingest.put_pipeline:
         id: "my_pipeline2"
         if_version: 1

server/src/main/java/org/elasticsearch/ingest/IngestService.java

@@ -446,7 +446,7 @@ static ClusterState innerPut(PutPipelineRequest request, ClusterState currentSta
         if (request.isVersionedUpdate()) {
             var currentPipeline = currentIngestMetadata != null ? currentIngestMetadata.getPipelines().get(request.getId()) : null;
             if (currentPipeline == null) {
-                throw new IllegalStateException(String.format(
+                throw new IllegalArgumentException(String.format(
                     Locale.ROOT,
                     "version conflict, required version [%s] for pipeline [%s] but no pipeline was found",
                     request.getVersion(),
@@ -456,7 +456,7 @@ static ClusterState innerPut(PutPipelineRequest request, ClusterState currentSta
 
             final Integer currentVersion = currentPipeline.getVersion();
             if (Objects.equals(request.getVersion(), currentVersion) == false) {
-                throw new IllegalStateException(String.format(
+                throw new IllegalArgumentException(String.format(
                     Locale.ROOT,
                     "version conflict, required version [%s] for pipeline [%s] but current version is [%s]",
                     request.getVersion(),
@@ -468,7 +468,7 @@ static ClusterState innerPut(PutPipelineRequest request, ClusterState currentSta
             var pipelineConfig = XContentHelper.convertToMap(request.getSource(), false, request.getXContentType()).v2();
             final Integer specifiedVersion = (Integer) pipelineConfig.get("version");
             if (pipelineConfig.containsKey("version") && Objects.equals(specifiedVersion, currentVersion)) {
-                throw new IllegalStateException(String.format(
+                throw new IllegalArgumentException(String.format(
                     Locale.ROOT,
                     "cannot update pipeline [%s] with the same version [%s]",
                     request.getId(),

server/src/test/java/org/elasticsearch/ingest/IngestServiceTests.java

@@ -1557,7 +1557,7 @@ public void testPutPipelineWithVersionedUpdateWithoutExistingPipeline() throws E
         var request = new PutPipelineRequest(pipelineId, new BytesArray(pipelineString), XContentType.JSON);
         request.setVersionedUpdate(true);
         request.setVersion(version);
-        IllegalStateException e = expectThrows(IllegalStateException.class, () -> IngestService.innerPut(request, clusterState));
+        IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> IngestService.innerPut(request, clusterState));
         assertThat(
             e.getMessage(),
             equalTo(String.format(
@@ -1585,7 +1585,7 @@ public void testPutPipelineWithVersionedUpdateDoesNotMatchExistingPipeline() {
         var request = new PutPipelineRequest(pipelineId, new BytesArray(pipelineString), XContentType.JSON);
         request.setVersionedUpdate(true);
         request.setVersion(requestedVersion);
-        IllegalStateException e = expectThrows(IllegalStateException.class, () -> IngestService.innerPut(request, clusterState));
+        IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> IngestService.innerPut(request, clusterState));
         assertThat(
             e.getMessage(),
             equalTo(String.format(
@@ -1613,7 +1613,7 @@ public void testPutPipelineWithVersionedUpdateSpecifiesSameVersion() throws Exce
         var request = new PutPipelineRequest(pipelineId, new BytesArray(pipelineString), XContentType.JSON);
         request.setVersionedUpdate(true);
         request.setVersion(version);
-        IllegalStateException e = expectThrows(IllegalStateException.class, () -> IngestService.innerPut(request, clusterState));
+        IllegalArgumentException e = expectThrows(IllegalArgumentException.class, () -> IngestService.innerPut(request, clusterState));
         assertThat(
             e.getMessage(),
             equalTo(String.format(