[#4638]fixbug content type is not case insensitive (#4641)

Author: SweetWuXiaoMei

common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/BodyProcessorCreator.java

@@ -169,8 +169,10 @@ private Object getValueImpl(HttpServletRequest request) throws IOException {
 
       // 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 @@ private Object getValueImpl(HttpServletRequest request) throws IOException {
         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 @@ private Object getValueImpl(HttpServletRequest request) throws IOException {
         }
       }
 
-      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 @@ private Object getValueImpl(HttpServletRequest request) throws IOException {
         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);

demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/ConsumerController.java

@@ -19,9 +19,13 @@
 
 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 String sayHello(@RequestParam("name") String name) {
   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);
+  }
 }

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);
 }

demo/demo-etcd/consumer/src/main/java/org/apache/servicecomb/samples/User.java

@@ -0,0 +1,41 @@
+/*
+ * 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;
+
+
+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;
+  }
+}

demo/demo-etcd/provider/src/main/java/org/apache/servicecomb/samples/ProviderController.java

@@ -21,9 +21,13 @@
 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 String getConfig(@RequestParam("key") String key) {
     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 {
   }

demo/demo-etcd/provider/src/main/java/org/apache/servicecomb/samples/User.java

@@ -0,0 +1,40 @@
+/*
+ * 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;
+
+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;
+  }
+}

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;
+  }
+}

demo/demo-etcd/test-client/src/main/java/org/apache/servicecomb/samples/User.java

@@ -0,0 +1,41 @@
+/*
+ * 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;
+
+
+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;
+  }
+}