This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 226426cd1 [INLONG-4852][Manager] Replace deprecated
APPLICATION_JSON_UTF8 with APPLICATION_JSON (#4853)
226426cd1 is described below
commit 226426cd13d44f1e5574fac5636bee6f24e18d29
Author: ciscozhou <[email protected]>
AuthorDate: Mon Jul 4 09:48:05 2022 +0800
[INLONG-4852][Manager] Replace deprecated APPLICATION_JSON_UTF8 with
APPLICATION_JSON (#4853)
---
.../test/java/org/apache/inlong/manager/web/WebBaseTest.java | 10 +++++-----
.../inlong/manager/web/controller/AnnoControllerTest.java | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/web/WebBaseTest.java
b/inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/web/WebBaseTest.java
index 6a9d3b45c..bed3738f0 100644
---
a/inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/web/WebBaseTest.java
+++
b/inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/web/WebBaseTest.java
@@ -91,7 +91,7 @@ public abstract class WebBaseTest extends BaseTest {
MvcResult mvcResult = mockMvc.perform(
post("/anno/login")
.content(JsonUtils.toJsonString(loginUser))
- .contentType(MediaType.APPLICATION_JSON_UTF8)
+ .contentType(MediaType.APPLICATION_JSON)
.accept(MediaType.APPLICATION_JSON)
)
.andExpect(status().isOk())
@@ -108,7 +108,7 @@ public abstract class WebBaseTest extends BaseTest {
return mockMvc.perform(
post(url)
.content(JsonUtils.toJsonString(body))
- .contentType(MediaType.APPLICATION_JSON_UTF8)
+ .contentType(MediaType.APPLICATION_JSON)
.accept(MediaType.APPLICATION_JSON)
)
.andExpect(status().isOk())
@@ -119,7 +119,7 @@ public abstract class WebBaseTest extends BaseTest {
protected MvcResult getForSuccessMvcResult(String url, Object...
pathVariable) {
return mockMvc.perform(
get(url, pathVariable)
- .contentType(MediaType.APPLICATION_JSON_UTF8)
+ .contentType(MediaType.APPLICATION_JSON)
.accept(MediaType.APPLICATION_JSON)
)
.andExpect(status().isOk())
@@ -130,7 +130,7 @@ public abstract class WebBaseTest extends BaseTest {
protected MvcResult deleteForSuccessMvcResult(String url, Object...
pathVariable) {
return mockMvc.perform(
delete(url, pathVariable)
- .contentType(MediaType.APPLICATION_JSON_UTF8)
+ .contentType(MediaType.APPLICATION_JSON)
.accept(MediaType.APPLICATION_JSON)
)
.andExpect(status().isOk())
@@ -145,7 +145,7 @@ public abstract class WebBaseTest extends BaseTest {
MvcResult mvcResult = mockMvc.perform(
post("/anno/login")
.content(JsonUtils.toJsonString(loginUser))
- .contentType(MediaType.APPLICATION_JSON_UTF8)
+ .contentType(MediaType.APPLICATION_JSON)
.accept(MediaType.APPLICATION_JSON)
)
.andExpect(status().isOk())
diff --git
a/inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/web/controller/AnnoControllerTest.java
b/inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/web/controller/AnnoControllerTest.java
index a779ba72c..d9243e6ac 100644
---
a/inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/web/controller/AnnoControllerTest.java
+++
b/inlong-manager/manager-web/src/test/java/org/apache/inlong/manager/web/controller/AnnoControllerTest.java
@@ -62,7 +62,7 @@ class AnnoControllerTest extends WebBaseTest {
MvcResult mvcResult = mockMvc.perform(
post("/anno/login")
.content(JsonUtils.toJsonString(loginUser))
- .contentType(MediaType.APPLICATION_JSON_UTF8)
+ .contentType(MediaType.APPLICATION_JSON)
.accept(MediaType.APPLICATION_JSON)
)
.andExpect(status().isOk())
@@ -85,7 +85,7 @@ class AnnoControllerTest extends WebBaseTest {
MvcResult mvcResult = mockMvc.perform(
post("/anno/doRegister")
.content(JsonUtils.toJsonString(userInfo))
- .contentType(MediaType.APPLICATION_JSON_UTF8)
+ .contentType(MediaType.APPLICATION_JSON)
.accept(MediaType.APPLICATION_JSON)
)
.andExpect(status().isOk())
@@ -108,7 +108,7 @@ class AnnoControllerTest extends WebBaseTest {
MvcResult mvcResult = mockMvc.perform(
post("/anno/doRegister")
.content(JsonUtils.toJsonString(userInfo))
- .contentType(MediaType.APPLICATION_JSON_UTF8)
+ .contentType(MediaType.APPLICATION_JSON)
.accept(MediaType.APPLICATION_JSON)
)
.andExpect(status().isOk())
@@ -125,7 +125,7 @@ class AnnoControllerTest extends WebBaseTest {
MvcResult mvcResult = mockMvc.perform(
get("/anno/logout")
- .contentType(MediaType.APPLICATION_JSON_UTF8)
+ .contentType(MediaType.APPLICATION_JSON)
.accept(MediaType.APPLICATION_JSON)
)
.andExpect(status().isOk())
@@ -149,7 +149,7 @@ class AnnoControllerTest extends WebBaseTest {
MvcResult mvcResult = mockMvc.perform(
post("/anno/doRegister")
.content(JsonUtils.toJsonString(userInfo))
- .contentType(MediaType.APPLICATION_JSON_UTF8)
+ .contentType(MediaType.APPLICATION_JSON)
.accept(MediaType.APPLICATION_JSON)
)
.andExpect(status().isOk())
