Fix'

Author: Tim-Brooks

server/src/main/java/org/elasticsearch/action/index/IndexRequest.java

@@ -965,7 +965,9 @@ public Index getConcreteWriteIndex(IndexAbstraction ia, ProjectMetadata project)
     public int route(IndexRouting indexRouting) {
         if (useStructuredSource) {
             assert structuredSource != null;
-            return indexRouting.indexShard(id, routing, contentType, structuredSource);
+            // TODO: Need to implement filtering
+            // return indexRouting.indexShard(id, routing, contentType, structuredSource);
+            return indexRouting.indexShard(id, routing, contentType, source());
         } else {
             return indexRouting.indexShard(id, routing, contentType, source());
         }

server/src/main/java/org/elasticsearch/cluster/routing/IndexRouting.java

@@ -54,6 +54,7 @@
 import java.util.function.Predicate;
 
 import static org.elasticsearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
+import static org.elasticsearch.common.xcontent.XContentParserUtils.expectValueToken;
 
 /**
  * Generates the shard id for {@code (id, routing)} pairs.
@@ -448,9 +449,7 @@ private void extractObject(@Nullable String path, XContentParser source) throws
 
             private void extractArray(@Nullable String path, XContentParser source) throws IOException {
                 while (source.currentToken() != Token.END_ARRAY) {
-                    // TODO: Fails on nested objects. I think this might work with the current implementation due to filtering which is not
-                    // implemented for ESON
-                    // expectValueToken(source.currentToken(), source);
+                    expectValueToken(source.currentToken(), source);
                     extractItem(path, source);
                 }
             }