Fix

Author: Tim-Brooks

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

@@ -437,15 +437,18 @@ public void setStructuredSource(ESONSource.ESONObject esonSource) {
     public void ensureStructureSource() {
         if (useStructuredSource == false) {
             this.useStructuredSource = true;
-            ESONSource.Builder builder = new ESONSource.Builder((int) (source.length() * 0.70));
-            try {
-                XContentParser parser = XContentHelper.createParser(XContentParserConfiguration.EMPTY, source, contentType);
-                structuredSource = builder.parse(parser);
-            } catch (IOException e) {
-                throw new UncheckedIOException(e);
-            }
+            createdStructuredSource();
         }
+    }
 
+    private void createdStructuredSource() {
+        ESONSource.Builder builder = new ESONSource.Builder((int) (source.length() * 0.70));
+        try {
+            XContentParser parser = XContentHelper.createParser(XContentParserConfiguration.EMPTY, source, contentType);
+            structuredSource = builder.parse(parser);
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
     }
 
     public boolean isStructuredSource() {
@@ -582,7 +585,7 @@ public IndexRequest source(BytesReference source, XContentType xContentType) {
         this.source = Objects.requireNonNull(source);
         this.contentType = Objects.requireNonNull(xContentType);
         if (useStructuredSource) {
-            ensureStructureSource();
+            createdStructuredSource();
         }
         return this;
     }

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

@@ -22,6 +22,7 @@
 import java.io.OutputStream;
 import java.nio.CharBuffer;
 import java.util.ArrayDeque;
+import java.util.Base64;
 import java.util.Deque;
 import java.util.List;
 
@@ -493,8 +494,10 @@ public byte[] binaryValue() throws IOException {
         getCurrentValue();
         if (currentValue instanceof byte[] bytes) {
             return bytes;
+        } else {
+            // TODO: Research correct approach
+            return Base64.getDecoder().decode(currentValue.toString());
         }
-        throw new IllegalStateException("Current token is not a binary value");
     }
 
     @Override