Throw IllegalArgumentException when shape field is missing during fetch (#136737)

 throw an IllegalArgumentException which translates into a 400 error.

Author: iverase

server/src/main/java/org/elasticsearch/index/query/AbstractGeometryQueryBuilder.java

@@ -362,7 +362,7 @@ private static void fetch(Client client, GetRequest getRequest, String path, Act
                             }
                         }
                     }
-                    throw new IllegalStateException("Shape with name [" + getRequest.id() + "] found but missing " + path + " field");
+                    throw new IllegalArgumentException("Shape with name [" + getRequest.id() + "] found but missing " + path + " field");
                 }
             } catch (Exception e) {
                 l.onFailure(e);

x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/FieldLevelSecurityTests.java

@@ -601,10 +601,10 @@ public void testGeoQueryWithIndexedShapeWithFLS() {
         final ShapeQueryBuilder shapeQuery2 = new ShapeQueryBuilder("field", "2").relation(ShapeRelation.WITHIN)
             .indexedShapeIndex("shape_index")
             .indexedShapePath("other");
-        IllegalStateException e;
+        IllegalArgumentException e;
         if (randomBoolean()) {
             e = expectThrows(
-                IllegalStateException.class,
+                IllegalArgumentException.class,
                 () -> client().filterWithHeader(Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("user6", USERS_PASSWD)))
                     .prepareSearch("search_index")
                     .setQuery(QueryBuilders.matchAllQuery())
@@ -613,7 +613,7 @@ public void testGeoQueryWithIndexedShapeWithFLS() {
             );
         } else {
             e = expectThrows(
-                IllegalStateException.class,
+                IllegalArgumentException.class,
                 () -> client().filterWithHeader(Collections.singletonMap(BASIC_AUTH_HEADER, basicAuthHeaderValue("user6", USERS_PASSWD)))
                     .prepareSearch("search_index")
                     .setQuery(shapeQuery2)