Skip to content

Commit 951b7a9

Browse files
committed
Do not use JSON as default Accept header when no produces present
1 parent aa03be7 commit 951b7a9

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public class ApiInvoker {
108108
}
109109

110110
public static String selectHeaderAccept(String[] accepts) {
111-
if (accepts.length == 0) return "application/json";
111+
if (accepts.length == 0) return null;
112112
if (StringUtil.containsIgnoreCase(accepts, "application/json")) return "application/json";
113113
return StringUtil.join(accepts, ",");
114114
}
@@ -194,7 +194,11 @@ public class ApiInvoker {
194194
}
195195
String querystring = b.toString();
196196

197-
Builder builder = client.resource(host + path + querystring).accept(accept);
197+
Builder builder;
198+
if (accept == null)
199+
builder = client.resource(host + path + querystring).getRequestBuilder();
200+
else
201+
builder = client.resource(host + path + querystring).accept(accept);
198202
for(String key : headerParams.keySet()) {
199203
builder = builder.header(key, headerParams.get(key));
200204
}

samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public static String parameterToString(Object param) {
108108
}
109109

110110
public static String selectHeaderAccept(String[] accepts) {
111-
if (accepts.length == 0) return "application/json";
111+
if (accepts.length == 0) return null;
112112
if (StringUtil.containsIgnoreCase(accepts, "application/json")) return "application/json";
113113
return StringUtil.join(accepts, ",");
114114
}
@@ -194,7 +194,11 @@ public String invokeAPI(String host, String path, String method, Map<String, Str
194194
}
195195
String querystring = b.toString();
196196

197-
Builder builder = client.resource(host + path + querystring).accept(accept);
197+
Builder builder;
198+
if (accept == null)
199+
builder = client.resource(host + path + querystring).getRequestBuilder();
200+
else
201+
builder = client.resource(host + path + querystring).accept(accept);
198202
for(String key : headerParams.keySet()) {
199203
builder = builder.header(key, headerParams.get(key));
200204
}

samples/client/petstore/java/src/test/java/io/swagger/client/ApiInvokerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public void testSelectHeaderAccept() {
1919
assertEquals("text/plain,application/xml", ApiInvoker.selectHeaderAccept(accepts));
2020

2121
accepts = new String[] { };
22-
assertEquals("application/json", ApiInvoker.selectHeaderAccept(accepts));
22+
assertNull(ApiInvoker.selectHeaderAccept(accepts));
2323
}
2424

2525
@Test

0 commit comments

Comments
 (0)