Skip to content

JAV-245 content-type convert to low case && accept Type … #315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 27, 2017
Merged

JAV-245 content-type convert to low case && accept Type … #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...ommon-rest/src/main/java/io/servicecomb/common/rest/codec/param/BodyProcessorCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.io.InputStream;
import java.lang.reflect.Type;
import java.util.Locale;

import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.core.HttpHeaders;
Expand Down Expand Up @@ -63,7 +64,7 @@ public Object getValue(HttpServletRequest request) throws Exception {
}

String contentType = request.getContentType();
if (contentType != null && !contentType.startsWith(MediaType.APPLICATION_JSON)) {
if (contentType != null && !contentType.toLowerCase(Locale.US).startsWith(MediaType.APPLICATION_JSON)) {
// TODO: we should consider body encoding
return IOUtils.toString(inputStream, "UTF-8");
}
Expand Down
8 changes: 2 additions & 6 deletions ...on/common-rest/src/main/java/io/servicecomb/common/rest/definition/RestOperationMeta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@

import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
Expand Down Expand Up @@ -213,7 +209,7 @@ public ProduceProcessor ensureFindProduceProcessor(String acceptType) {
return defaultProcessor;
}

List<String> mimeTyps = Utils.getSortedAcceptableMimeTypes(acceptType);
List<String> mimeTyps = Utils.getSortedAcceptableMimeTypes(acceptType.toLowerCase(Locale.US));
for (String mime : mimeTyps) {
ProduceProcessor processor = this.produceProcessorMap.get(mime);
if (null != processor) {
Expand Down