Address xcontent changes in core (#526)

Signed-off-by: Khushboo Rajput <khushbr@amazon.com>
opensearch-project · Sep 5, 2023 · 8a2a8e2 · 8a2a8e2
1 parent 3612f2f
commit 8a2a8e2
Show file tree

Hide file tree

Showing 31 changed files with 14 additions and 264 deletions.
diff --git a/build.gradle b/build.gradle
@@ -301,7 +301,7 @@ dependencies {
 
     implementation 'org.jooq:jooq:3.10.8'
     implementation 'org.apache.commons:commons-lang3:3.9'
-    implementation 'org.bouncycastle:bcprov-jdk15to18:1.74'
+    implementation 'org.bouncycastle:bcprov-jdk15to18:1.75'
     implementation 'org.bouncycastle:bcpkix-jdk15on:1.70'
     implementation "org.opensearch:performance-analyzer-commons:${paCommonsVersion}"
     implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"

diff --git a/licenses/bcprov-jdk15to18-1.74.jar.sha1 b/licenses/bcprov-jdk15to18-1.74.jar.sha1
diff --git a/licenses/bcprov-jdk15to18-LICENSE.txt b/licenses/bcprov-jdk15to18-LICENSE.txt
diff --git a/licenses/bcprov-jdk15to18-NOTICE.txt b/licenses/bcprov-jdk15to18-NOTICE.txt
diff --git a/licenses/commons-lang3-3.12.0.jar.sha1 b/licenses/commons-lang3-3.12.0.jar.sha1
diff --git a/licenses/commons-lang3-LICENSE.txt b/licenses/commons-lang3-LICENSE.txt
diff --git a/licenses/commons-lang3-NOTICE.txt b/licenses/commons-lang3-NOTICE.txt
diff --git a/licenses/netty-buffer-4.1.96.Final.jar.sha1 b/licenses/netty-buffer-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-buffer-4.1.97.Final.jar.sha1 b/licenses/netty-buffer-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+f8f3d8644afa5e6e1a40a3a6aeb9d9aa970ecb4f
diff --git a/licenses/netty-codec-4.1.96.Final.jar.sha1 b/licenses/netty-codec-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-codec-4.1.97.Final.jar.sha1 b/licenses/netty-codec-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+384ba4d75670befbedb45c4d3b497a93639c206d
diff --git a/licenses/netty-codec-http-4.1.96.Final.jar.sha1 b/licenses/netty-codec-http-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-codec-http-4.1.97.Final.jar.sha1 b/licenses/netty-codec-http-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+af78acec783ffd77c63d8aeecc21041fd39ac54f
diff --git a/licenses/netty-codec-http2-4.1.96.Final.jar.sha1 b/licenses/netty-codec-http2-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-codec-http2-4.1.97.Final.jar.sha1 b/licenses/netty-codec-http2-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+893888d09a7bef0d0ba973d7471943e765d0fd08
diff --git a/licenses/netty-codec-socks-4.1.96.Final.jar.sha1 b/licenses/netty-codec-socks-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-codec-socks-4.1.97.Final.jar.sha1 b/licenses/netty-codec-socks-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+30e8fa29a349db5a933225d61891b8802836bb79
diff --git a/licenses/netty-common-4.1.96.Final.jar.sha1 b/licenses/netty-common-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-common-4.1.97.Final.jar.sha1 b/licenses/netty-common-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+7cceacaf11df8dc63f23d0fb58e9d4640fc88404
diff --git a/licenses/netty-handler-4.1.96.Final.jar.sha1 b/licenses/netty-handler-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-handler-4.1.97.Final.jar.sha1 b/licenses/netty-handler-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+abb86c6906bf512bf2b797a41cd7d2e8d3cd7c36
diff --git a/licenses/netty-handler-proxy-4.1.96.Final.jar.sha1 b/licenses/netty-handler-proxy-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-handler-proxy-4.1.97.Final.jar.sha1 b/licenses/netty-handler-proxy-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+a99ecef0e1d86a92e40a7c89805c236d9cd7493e
diff --git a/licenses/netty-resolver-4.1.96.Final.jar.sha1 b/licenses/netty-resolver-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-resolver-4.1.97.Final.jar.sha1 b/licenses/netty-resolver-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+cec8348108dc76c47cf87c669d514be52c922144
diff --git a/licenses/netty-transport-4.1.96.Final.jar.sha1 b/licenses/netty-transport-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-transport-4.1.97.Final.jar.sha1 b/licenses/netty-transport-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+f37380d23c9bb079bc702910833b2fd532c9abd0
diff --git a/licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1 b/licenses/netty-transport-native-unix-common-4.1.96.Final.jar.sha1
diff --git a/licenses/netty-transport-native-unix-common-4.1.97.Final.jar.sha1 b/licenses/netty-transport-native-unix-common-4.1.97.Final.jar.sha1
@@ -0,0 +1 @@
+d469d84265ab70095b01b40886cabdd433b6e664
diff --git a/...h/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigActionTests.java b/...h/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigActionTests.java
@@ -184,9 +184,7 @@ private FakeRestRequest buildRequest(String requestPath) throws IOException {
         return new FakeRestRequest.Builder(NamedXContentRegistry.EMPTY)
                 .withMethod(RestRequest.Method.POST)
                 .withPath(requestPath)
-                .withContent(
-                        BytesReference.bytes(builder),
-                        XContentType.fromMediaType(builder.contentType()))
+                .withContent(BytesReference.bytes(builder), XContentType.JSON)
                 .build();
     }
 }
diff --git a/...ensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigActionTests.java b/...ensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigActionTests.java
@@ -316,9 +316,7 @@ private FakeRestRequest buildRequest(String requestPath, boolean shouldEnable)
         return new FakeRestRequest.Builder(NamedXContentRegistry.EMPTY)
                 .withMethod(RestRequest.Method.POST)
                 .withPath(requestPath)
-                .withContent(
-                        BytesReference.bytes(builder),
-                        XContentType.fromMediaType(builder.contentType()))
+                .withContent(BytesReference.bytes(builder), XContentType.JSON)
                 .build();
     }
 }