pr change 1

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
opensearch-project · Jan 25, 2023 · 93e3cef · 93e3cef
1 parent ed67a95
commit 93e3cef
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/libs/x-content/src/main/java/org/opensearch/common/xcontent/MediaType.java b/libs/x-content/src/main/java/org/opensearch/common/xcontent/MediaType.java
@@ -65,5 +65,7 @@ default String typeWithSubtype() {
         return type() + "/" + subtype();
     }
 
+    XContent xContent();
+
     XContentBuilder contentBuilder() throws IOException;
 }
diff --git a/libs/x-content/src/main/java/org/opensearch/common/xcontent/XContentType.java b/libs/x-content/src/main/java/org/opensearch/common/xcontent/XContentType.java
@@ -211,8 +211,6 @@ public String mediaType() {
         return mediaTypeWithoutParameters();
     }
 
-    public abstract XContent xContent();
-
     public abstract String mediaTypeWithoutParameters();
 
     @Override

diff --git a/server/src/main/java/org/opensearch/common/Strings.java b/server/src/main/java/org/opensearch/common/Strings.java
@@ -776,7 +776,7 @@ private static String toString(MediaType mediaType, ToXContent toXContent, ToXCo
     }
 
     private static XContentBuilder createBuilder(MediaType mediaType, boolean pretty, boolean human) throws IOException {
-        XContentBuilder builder = mediaType.contentBuilder();
+        XContentBuilder builder = XContentBuilder.builder(mediaType.xContent());
         if (pretty) {
             builder.prettyPrint();
         }