diff --git a/licenses/netty-buffer-4.1.86.Final.jar.sha1 b/licenses/netty-buffer-4.1.86.Final.jar.sha1 deleted file mode 100644 index c477a0d3..00000000 --- a/licenses/netty-buffer-4.1.86.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a66fa0ed2687eb33a2e53a17a6df61bfe3b3f2bd \ No newline at end of file diff --git a/licenses/netty-buffer-4.1.90.Final.jar.sha1 b/licenses/netty-buffer-4.1.90.Final.jar.sha1 new file mode 100644 index 00000000..67604d11 --- /dev/null +++ b/licenses/netty-buffer-4.1.90.Final.jar.sha1 @@ -0,0 +1 @@ +937eb60c19c5f5c1326b96123c9ec3d33238d4d5 \ No newline at end of file diff --git a/licenses/netty-codec-4.1.86.Final.jar.sha1 b/licenses/netty-codec-4.1.86.Final.jar.sha1 deleted file mode 100644 index b2bd3058..00000000 --- a/licenses/netty-codec-4.1.86.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ee126da926ea202da3b21eb737788ef83b1db772 \ No newline at end of file diff --git a/licenses/netty-codec-4.1.90.Final.jar.sha1 b/licenses/netty-codec-4.1.90.Final.jar.sha1 new file mode 100644 index 00000000..c8fb04a0 --- /dev/null +++ b/licenses/netty-codec-4.1.90.Final.jar.sha1 @@ -0,0 +1 @@ +9992a22c82e18b8fd4f34989535f3e504e55aa37 \ No newline at end of file diff --git a/licenses/netty-codec-http-4.1.86.Final.jar.sha1 b/licenses/netty-codec-http-4.1.86.Final.jar.sha1 deleted file mode 100644 index 60affc4a..00000000 --- a/licenses/netty-codec-http-4.1.86.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -23674593f004959ae002ec348626eecf677191ae \ No newline at end of file diff --git a/licenses/netty-codec-http-4.1.90.Final.jar.sha1 b/licenses/netty-codec-http-4.1.90.Final.jar.sha1 new file mode 100644 index 00000000..861599ce --- /dev/null +++ b/licenses/netty-codec-http-4.1.90.Final.jar.sha1 @@ -0,0 +1 @@ +19bbcd46f8ee0d118486f98eff22fe665b9689e5 \ No newline at end of file diff --git a/licenses/netty-codec-http2-4.1.86.Final.jar.sha1 b/licenses/netty-codec-http2-4.1.86.Final.jar.sha1 deleted file mode 100644 index e0fb5c63..00000000 --- a/licenses/netty-codec-http2-4.1.86.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ac0ca067e4118533ad1038776fcd9d5f3058b7d4 \ No newline at end of file diff --git a/licenses/netty-codec-http2-4.1.90.Final.jar.sha1 b/licenses/netty-codec-http2-4.1.90.Final.jar.sha1 new file mode 100644 index 00000000..64caa309 --- /dev/null +++ b/licenses/netty-codec-http2-4.1.90.Final.jar.sha1 @@ -0,0 +1 @@ +ea3be877ea976b3d71e1a872958d32854b24db66 \ No newline at end of file diff --git a/licenses/netty-codec-socks-4.1.86.Final.jar.sha1 b/licenses/netty-codec-socks-4.1.86.Final.jar.sha1 deleted file mode 100644 index 6544ba99..00000000 --- a/licenses/netty-codec-socks-4.1.86.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -854264e7ad75887bc25b82eb38e4ee65c8b44dc3 \ No newline at end of file diff --git a/licenses/netty-codec-socks-4.1.90.Final.jar.sha1 b/licenses/netty-codec-socks-4.1.90.Final.jar.sha1 new file mode 100644 index 00000000..2738db8a --- /dev/null +++ b/licenses/netty-codec-socks-4.1.90.Final.jar.sha1 @@ -0,0 +1 @@ +7397535a4e03d2f74c71aa2282eb7a2760ffc37b \ No newline at end of file diff --git a/licenses/netty-common-4.1.86.Final.jar.sha1 b/licenses/netty-common-4.1.86.Final.jar.sha1 deleted file mode 100644 index 48c07b3c..00000000 --- a/licenses/netty-common-4.1.86.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1dceab4662a9cc93faf87b237bb41103b1bc7f0e \ No newline at end of file diff --git a/licenses/netty-common-4.1.90.Final.jar.sha1 b/licenses/netty-common-4.1.90.Final.jar.sha1 new file mode 100644 index 00000000..afb53180 --- /dev/null +++ b/licenses/netty-common-4.1.90.Final.jar.sha1 @@ -0,0 +1 @@ +43597a09382c6ae2bef469a9b3a41e8a17850638 \ No newline at end of file diff --git a/licenses/netty-handler-4.1.86.Final.jar.sha1 b/licenses/netty-handler-4.1.86.Final.jar.sha1 deleted file mode 100644 index 7c036b19..00000000 --- a/licenses/netty-handler-4.1.86.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0bcb65230218286e6456b5d085cb42e67776eb70 \ No newline at end of file diff --git a/licenses/netty-handler-4.1.90.Final.jar.sha1 b/licenses/netty-handler-4.1.90.Final.jar.sha1 new file mode 100644 index 00000000..c98bfb52 --- /dev/null +++ b/licenses/netty-handler-4.1.90.Final.jar.sha1 @@ -0,0 +1 @@ +64f6946ce4d9189cec5341d3f5f86ac5653099b5 \ No newline at end of file diff --git a/licenses/netty-handler-proxy-4.1.86.Final.jar.sha1 b/licenses/netty-handler-proxy-4.1.86.Final.jar.sha1 deleted file mode 100644 index 5f8a3056..00000000 --- a/licenses/netty-handler-proxy-4.1.86.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -2515d76be9671cc248bab77352edddd16bfa9436 \ No newline at end of file diff --git a/licenses/netty-handler-proxy-4.1.90.Final.jar.sha1 b/licenses/netty-handler-proxy-4.1.90.Final.jar.sha1 new file mode 100644 index 00000000..60bde875 --- /dev/null +++ b/licenses/netty-handler-proxy-4.1.90.Final.jar.sha1 @@ -0,0 +1 @@ +6ab526a43a14f7796434fa6a705c34201603235f \ No newline at end of file diff --git a/licenses/netty-resolver-4.1.86.Final.jar.sha1 b/licenses/netty-resolver-4.1.86.Final.jar.sha1 deleted file mode 100644 index f5258c46..00000000 --- a/licenses/netty-resolver-4.1.86.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bad83d479f7bd8ea84eefd77c316435be4c97270 \ No newline at end of file diff --git a/licenses/netty-resolver-4.1.90.Final.jar.sha1 b/licenses/netty-resolver-4.1.90.Final.jar.sha1 new file mode 100644 index 00000000..b9217782 --- /dev/null +++ b/licenses/netty-resolver-4.1.90.Final.jar.sha1 @@ -0,0 +1 @@ +47c415d8c83f08b820ba00e6497a6cf19dd0155f \ No newline at end of file diff --git a/licenses/netty-transport-4.1.86.Final.jar.sha1 b/licenses/netty-transport-4.1.86.Final.jar.sha1 deleted file mode 100644 index 1fa4ab02..00000000 --- a/licenses/netty-transport-4.1.86.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -7c7739c41fd110c3576e9faace332ee957f27203 \ No newline at end of file diff --git a/licenses/netty-transport-4.1.90.Final.jar.sha1 b/licenses/netty-transport-4.1.90.Final.jar.sha1 new file mode 100644 index 00000000..c7a77dbf --- /dev/null +++ b/licenses/netty-transport-4.1.90.Final.jar.sha1 @@ -0,0 +1 @@ +82d68da212f62b076c763f5efa9b072d2abc018f \ No newline at end of file diff --git a/licenses/netty-transport-native-unix-common-4.1.86.Final.jar.sha1 b/licenses/netty-transport-native-unix-common-4.1.86.Final.jar.sha1 deleted file mode 100644 index 3701a94d..00000000 --- a/licenses/netty-transport-native-unix-common-4.1.86.Final.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5e0e7fc1c337485cabcf7971faefe692b76f93a2 \ No newline at end of file diff --git a/licenses/netty-transport-native-unix-common-4.1.90.Final.jar.sha1 b/licenses/netty-transport-native-unix-common-4.1.90.Final.jar.sha1 new file mode 100644 index 00000000..5f954b25 --- /dev/null +++ b/licenses/netty-transport-native-unix-common-4.1.90.Final.jar.sha1 @@ -0,0 +1 @@ +e42282002cf22105e7e993651aead231246d0220 \ No newline at end of file diff --git a/licenses/performanceanalyzer-rca-2.5.0.0-SNAPSHOT.jar.sha1 b/licenses/performanceanalyzer-rca-2.5.0.0-SNAPSHOT.jar.sha1 deleted file mode 100644 index 63f8bcf3..00000000 --- a/licenses/performanceanalyzer-rca-2.5.0.0-SNAPSHOT.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c5a5b4def36e55aad4028c9877abd91975972e8c \ No newline at end of file diff --git a/licenses/performanceanalyzer-rca-2.7.0.0-SNAPSHOT.jar.sha1 b/licenses/performanceanalyzer-rca-2.7.0.0-SNAPSHOT.jar.sha1 new file mode 100644 index 00000000..81fefffc --- /dev/null +++ b/licenses/performanceanalyzer-rca-2.7.0.0-SNAPSHOT.jar.sha1 @@ -0,0 +1 @@ +5b6981ded955c77a09b5f241cbbefe68e5663c24 \ No newline at end of file diff --git a/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPlugin.java b/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPlugin.java index a9f83e01..c0de1ef7 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPlugin.java +++ b/src/main/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPlugin.java @@ -39,7 +39,7 @@ import org.opensearch.common.settings.SettingsFilter; import org.opensearch.common.util.PageCacheRecycler; import org.opensearch.common.util.concurrent.ThreadContext; -import org.opensearch.common.xcontent.NamedXContentRegistry; +import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.discovery.Discovery; import org.opensearch.env.Environment; import org.opensearch.env.NodeEnvironment; diff --git a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java index 37a3ea1f..0688f514 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java +++ b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigAction.java @@ -15,9 +15,9 @@ import org.apache.logging.log4j.Logger; import org.opensearch.client.node.NodeClient; import org.opensearch.common.settings.Settings; -import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.performanceanalyzer.config.PluginSettings; import org.opensearch.performanceanalyzer.config.setting.handler.NodeStatsSettingHandler; import org.opensearch.performanceanalyzer.config.setting.handler.PerformanceAnalyzerClusterSettingHandler; diff --git a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigAction.java b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigAction.java index 0e17283c..a2dac15d 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigAction.java +++ b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigAction.java @@ -15,8 +15,8 @@ import org.apache.logging.log4j.Logger; import org.opensearch.client.node.NodeClient; import org.opensearch.common.inject.Inject; -import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentHelper; +import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController; import org.opensearch.performanceanalyzer.config.PluginSettings; import org.opensearch.rest.BaseRestHandler; diff --git a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigAction.java b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigAction.java index 177139a3..7316f891 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigAction.java +++ b/src/main/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigAction.java @@ -15,9 +15,9 @@ import org.apache.logging.log4j.Logger; import org.opensearch.client.node.NodeClient; import org.opensearch.common.settings.Settings; -import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentHelper; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.performanceanalyzer.config.overrides.ConfigOverrides; import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesHelper; import org.opensearch.performanceanalyzer.config.overrides.ConfigOverridesWrapper; diff --git a/src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmIResponse.java b/src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmIResponse.java index 0bac68ba..86e4f801 100644 --- a/src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmIResponse.java +++ b/src/main/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmIResponse.java @@ -9,8 +9,8 @@ import java.io.IOException; import org.opensearch.action.ActionResponse; import org.opensearch.common.io.stream.StreamOutput; -import org.opensearch.common.xcontent.ToXContent; -import org.opensearch.common.xcontent.XContentBuilder; +import org.opensearch.core.xcontent.ToXContent; +import org.opensearch.core.xcontent.XContentBuilder; public class WhoAmIResponse extends ActionResponse implements ToXContent { @Override diff --git a/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigActionTests.java b/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigActionTests.java index 0cd2f597..f53155dc 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigActionTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigActionTests.java @@ -21,9 +21,10 @@ import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; -import org.opensearch.common.xcontent.NamedXContentRegistry; -import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; +import org.opensearch.common.xcontent.XContentType; +import org.opensearch.core.xcontent.NamedXContentRegistry; +import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.indices.breaker.BreakerSettings; import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.indices.breaker.HierarchyCircuitBreakerService; @@ -178,7 +179,9 @@ private FakeRestRequest buildRequest(String requestPath) throws IOException { return new FakeRestRequest.Builder(NamedXContentRegistry.EMPTY) .withMethod(RestRequest.Method.POST) .withPath(requestPath) - .withContent(BytesReference.bytes(builder), builder.contentType()) + .withContent( + BytesReference.bytes(builder), + XContentType.fromMediaType(builder.contentType())) .build(); } } diff --git a/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigActionTests.java b/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigActionTests.java index 7b21ef87..1d251846 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigActionTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigActionTests.java @@ -22,9 +22,10 @@ import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; -import org.opensearch.common.xcontent.NamedXContentRegistry; -import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentFactory; +import org.opensearch.common.xcontent.XContentType; +import org.opensearch.core.xcontent.NamedXContentRegistry; +import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.indices.breaker.BreakerSettings; import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.indices.breaker.HierarchyCircuitBreakerService; @@ -310,7 +311,9 @@ private FakeRestRequest buildRequest(String requestPath, boolean shouldEnable) return new FakeRestRequest.Builder(NamedXContentRegistry.EMPTY) .withMethod(RestRequest.Method.POST) .withPath(requestPath) - .withContent(BytesReference.bytes(builder), builder.contentType()) + .withContent( + BytesReference.bytes(builder), + XContentType.fromMediaType(builder.contentType())) .build(); } } diff --git a/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigActionTests.java b/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigActionTests.java index ccb9b74a..df2fb2c2 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigActionTests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigActionTests.java @@ -22,8 +22,8 @@ import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.common.util.concurrent.ThreadContext; -import org.opensearch.common.xcontent.NamedXContentRegistry; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.core.xcontent.NamedXContentRegistry; import org.opensearch.indices.breaker.BreakerSettings; import org.opensearch.indices.breaker.CircuitBreakerService; import org.opensearch.indices.breaker.HierarchyCircuitBreakerService; diff --git a/src/test/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmITests.java b/src/test/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmITests.java index fd271480..5aa5dd0f 100644 --- a/src/test/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmITests.java +++ b/src/test/java/org/opensearch/performanceanalyzer/http_action/whoami/WhoAmITests.java @@ -18,8 +18,8 @@ import org.opensearch.action.ActionListener; import org.opensearch.action.support.ActionFilters; import org.opensearch.common.io.stream.Writeable.Reader; -import org.opensearch.common.xcontent.XContentBuilder; import org.opensearch.common.xcontent.XContentType; +import org.opensearch.core.xcontent.XContentBuilder; import org.opensearch.indices.IndicesService; import org.opensearch.performanceanalyzer.OpenSearchResources; import org.opensearch.tasks.Task;