This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 27552d28a [#4638]fixbug content type is not case insensitive (#4641)
27552d28a is described below
commit 27552d28ac0d16eb73b9c0023833aa753fd09173
Author: SweetWuXiaoMei <[email protected]>
AuthorDate: Thu Dec 12 21:06:07 2024 +0800
[#4638]fixbug content type is not case insensitive (#4641)
---
.../rest/codec/param/BodyProcessorCreator.java | 12 ++--
.../servicecomb/samples/ConsumerController.java | 10 +++
.../servicecomb/samples/ProviderService.java | 2 +
.../samples/{ProviderService.java => User.java} | 25 +++++--
.../servicecomb/samples/ProviderController.java | 10 +++
.../java/org/apache/servicecomb/samples/User.java} | 24 +++++--
.../org/apache/servicecomb/samples/ProviderIT.java | 78 ++++++++++++++++++++++
.../java/org/apache/servicecomb/samples/User.java} | 25 +++++--
8 files changed, 169 insertions(+), 17 deletions(-)
diff --git
a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/BodyProcessorCreator.java
b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/BodyProcessorCreator.java
index 44a4d3467..e789038c4 100644
---
a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/BodyProcessorCreator.java
+++
b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/BodyProcessorCreator.java
@@ -169,8 +169,10 @@ public class BodyProcessorCreator implements
ParamValueProcessorCreator<RequestB
// edge support convert from form-data or x-www-form-urlencoded to json
automatically
String contentType = validContentType(request.getContentType());
- if (contentType.equals(MediaType.MULTIPART_FORM_DATA)
- || contentType.equals(MediaType.APPLICATION_FORM_URLENCODED)) {
+
+ // support RFC 7231, ignore case for content-type
+ if (StringUtils.equalsIgnoreCase(contentType,
MediaType.MULTIPART_FORM_DATA)
+ || StringUtils.equalsIgnoreCase(contentType,
MediaType.APPLICATION_FORM_URLENCODED)) {
return convertValue(request.getParameterMap(), targetType);
}
@@ -182,7 +184,7 @@ public class BodyProcessorCreator implements
ParamValueProcessorCreator<RequestB
return null;
}
- if (MediaType.APPLICATION_JSON.equals(contentType)) {
+ if (StringUtils.equalsIgnoreCase(contentType,
MediaType.APPLICATION_JSON)) {
try {
ObjectReader reader = serialViewClass != null
?
RestObjectMapperFactory.getRestObjectMapper().readerWithView(serialViewClass)
@@ -202,7 +204,7 @@ public class BodyProcessorCreator implements
ParamValueProcessorCreator<RequestB
}
}
- if (SwaggerConst.PROTOBUF_TYPE.equals(contentType)) {
+ if (StringUtils.equalsIgnoreCase(contentType,
SwaggerConst.PROTOBUF_TYPE)) {
ProtoMapper protoMapper = scopedProtobufSchemaManager
.getOrCreateProtoMapper(openAPI, operationMeta.getSchemaId(),
REQUEST_BODY_NAME,
@@ -214,7 +216,7 @@ public class BodyProcessorCreator implements
ParamValueProcessorCreator<RequestB
return result.getValue();
}
- if (MediaType.TEXT_PLAIN.equals(contentType)) {
+ if (StringUtils.equalsIgnoreCase(contentType, MediaType.TEXT_PLAIN)) {
try {
if (targetType != null &&
String.class.equals(targetType.getRawClass())) {
return IOUtils.toString(inputStream, StandardCharsets.UTF_8);
diff --git
a/demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerController.java
b/demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerController.java
index e5dd86d9d..e66fb2cb3 100644
---
a/demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerController.java
+++
b/demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerController.java
@@ -19,9 +19,13 @@ package org.apache.servicecomb.samples;
import org.apache.servicecomb.provider.pojo.RpcReference;
import org.apache.servicecomb.provider.rest.common.RestSchema;
+import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
@RestSchema(schemaId = "ConsumerController")
@RequestMapping(path = "/")
@@ -39,4 +43,10 @@ public class ConsumerController {
public String getConfig(@RequestParam("key") String key) {
return providerService.getConfig(key);
}
+
+ @PostMapping(path = "/testContentType", consumes =
MediaType.APPLICATION_JSON_VALUE)
+ @ResponseBody
+ public User testContentType(@RequestBody User user) {
+ return providerService.testContentType(user);
+ }
}
diff --git
a/demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/ProviderService.java
b/demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/ProviderService.java
index fe71314c9..2899546c7 100644
---
a/demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/ProviderService.java
+++
b/demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/ProviderService.java
@@ -21,4 +21,6 @@ public interface ProviderService {
String sayHello(String name);
String getConfig(String key);
+
+ User testContentType(User user);
}
diff --git
a/demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/ProviderService.java
b/demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/User.java
similarity index 75%
copy from
demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/ProviderService.java
copy to
demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/User.java
index fe71314c9..ff421930e 100644
---
a/demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/ProviderService.java
+++
b/demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/User.java
@@ -14,11 +14,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.servicecomb.samples;
-public interface ProviderService {
- String sayHello(String name);
- String getConfig(String key);
+public class User {
+
+ private Long id;
+
+ private String name;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
}
diff --git
a/demo/demo-etcd/provider/src/main/java/org/apache/servicecomb/samples/ProviderController.java
b/demo/demo-etcd/provider/src/main/java/org/apache/servicecomb/samples/ProviderController.java
index 8fc333cee..677c20ed1 100644
---
a/demo/demo-etcd/provider/src/main/java/org/apache/servicecomb/samples/ProviderController.java
+++
b/demo/demo-etcd/provider/src/main/java/org/apache/servicecomb/samples/ProviderController.java
@@ -21,9 +21,13 @@ import
org.apache.servicecomb.provider.rest.common.RestSchema;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
+import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
@RestSchema(schemaId = "ProviderController")
@RequestMapping(path = "/")
@@ -47,6 +51,12 @@ public class ProviderController implements InitializingBean {
return environment.getProperty(key);
}
+ @PostMapping(path = "/testContentType", consumes =
MediaType.APPLICATION_JSON_VALUE)
+ @ResponseBody
+ public User testContentType(@RequestBody User user) {
+ return user;
+ }
+
@Override
public void afterPropertiesSet() throws Exception {
}
diff --git
a/demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/ProviderService.java
b/demo/demo-etcd/provider/src/main/java/org/apache/servicecomb/samples/User.java
similarity index 75%
copy from
demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/ProviderService.java
copy to
demo/demo-etcd/provider/src/main/java/org/apache/servicecomb/samples/User.java
index fe71314c9..ca12402d6 100644
---
a/demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/ProviderService.java
+++
b/demo/demo-etcd/provider/src/main/java/org/apache/servicecomb/samples/User.java
@@ -14,11 +14,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.servicecomb.samples;
-public interface ProviderService {
- String sayHello(String name);
+public class User {
+
+ private Long id;
+
+ private String name;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
- String getConfig(String key);
+ public void setName(String name) {
+ this.name = name;
+ }
}
diff --git
a/demo/demo-etcd/test-client/src/main/java/org/apache/servicecomb/samples/ProviderIT.java
b/demo/demo-etcd/test-client/src/main/java/org/apache/servicecomb/samples/ProviderIT.java
new file mode 100644
index 000000000..2bdd0ca42
--- /dev/null
+++
b/demo/demo-etcd/test-client/src/main/java/org/apache/servicecomb/samples/ProviderIT.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.servicecomb.samples;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.servicecomb.demo.CategorizedTestCase;
+import org.apache.servicecomb.demo.TestMgr;
+import org.apache.servicecomb.foundation.common.utils.JsonUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestOperations;
+import org.springframework.web.client.RestTemplate;
+
+@Component
+public class ProviderIT implements CategorizedTestCase {
+
+ RestOperations template = new RestTemplate();
+
+ private static final Logger LOGGER =
LoggerFactory.getLogger(ProviderIT.class);
+
+ @Override
+ public void testRestTransport() throws Exception {
+
+ User user = getUser("Application/json");
+ TestMgr.check(1L, user.getId());
+ TestMgr.check("czd", user.getName());
+
+ User user2 = getUser("application/json");
+ TestMgr.check(1L, user2.getId());
+ TestMgr.check("czd", user2.getName());
+
+ User user3 = getUser("APPLICATION/JSON");
+ TestMgr.check(1L, user3.getId());
+ TestMgr.check("czd", user3.getName());
+ }
+
+ private User getUser(String contentType) throws IOException {
+ HttpHeaders headers = new HttpHeaders();
+ headers.set("Content-Type", contentType);
+
+ String requestBody = """
+ {
+ "id": 1,
+ "name": "czd"
+ }
+ """;
+
+ HttpEntity<String> entity = new HttpEntity<>(requestBody, headers);
+
+ String url = Config.GATEWAY_URL + "/testContentType";
+ ResponseEntity<String> response = template.exchange(
+ url, HttpMethod.POST, entity, String.class);
+
+ User user =
JsonUtils.readValue(response.getBody().getBytes(StandardCharsets.UTF_8),
User.class);
+ return user;
+ }
+}
diff --git
a/demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/ProviderService.java
b/demo/demo-etcd/test-client/src/main/java/org/apache/servicecomb/samples/User.java
similarity index 75%
copy from
demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/ProviderService.java
copy to
demo/demo-etcd/test-client/src/main/java/org/apache/servicecomb/samples/User.java
index fe71314c9..ff421930e 100644
---
a/demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/ProviderService.java
+++
b/demo/demo-etcd/test-client/src/main/java/org/apache/servicecomb/samples/User.java
@@ -14,11 +14,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.servicecomb.samples;
-public interface ProviderService {
- String sayHello(String name);
- String getConfig(String key);
+public class User {
+
+ private Long id;
+
+ private String name;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
}
