Merge pull request #1466 from rsvoboda/openapi-default-content-type

OpenAPI - different default content type for pojo and primitives

spring/spring-web-reactive/src/test/java/io/quarkus/ts/spring/web/reactive/openapi/AbstractSpringWebOpenApiReactiveIT.java

@@ -49,9 +49,9 @@ private void checkType(Stream<String> jsonPathStream, String type) {
                 .map(pathChunk -> "'" + pathChunk + "'")
                 .collect(Collectors.joining("."));
         final Map<String, Object> objectMap = response.jsonPath().getMap(jsonPath);
-        Assertions.assertNotNull(objectMap);
-        Assertions.assertEquals(1, objectMap.keySet().size());
-        Assertions.assertEquals(type, objectMap.keySet().iterator().next());
+        Assertions.assertNotNull(objectMap, "Fails on " + jsonPath);
+        Assertions.assertEquals(1, objectMap.keySet().size(), "Fails on " + jsonPath);
+        Assertions.assertEquals(type, objectMap.keySet().iterator().next(), "Fails on " + jsonPath);
     }
 
 }

spring/spring-web-reactive/src/test/resources/request-types.csv

@@ -1,20 +1,21 @@
 /delete-text-plain,delete,text/plain
-/delete/no-type,delete,application/json
+# TODO uncomment once https://github.com/quarkusio/quarkus/issues/36297 is fixed
+#/delete/no-type,delete,text/plain
 /delete/text-plain,delete,text/plain
 /delete/json,delete,application/json
 /delete/octet-stream,delete,application/octet-stream
 /patch-text-plain,patch,text/plain
-/patch/no-type,patch,application/json
+#/patch/no-type,patch,text/plain
 /patch/text-plain,patch,text/plain
 /patch/json,patch,application/json
 /patch/octet-stream,patch,application/octet-stream
 /post-text-plain,post,text/plain
-/post/no-type,post,application/json
+#/post/no-type,post,text/plain
 /post/text-plain,post,text/plain
 /post/json,post,application/json
 /post/octet-stream,post,application/octet-stream
 /put-text-plain,put,text/plain
-/put/no-type,put,application/json
+#/put/no-type,put,text/plain
 /put/text-plain,put,text/plain
 /put/json,put,application/json
 /put/octet-stream,put,application/octet-stream

spring/spring-web-reactive/src/test/resources/response-types.csv

@@ -1,25 +1,25 @@
 /delete-text-plain,delete,text/plain
-/delete/no-type,delete,application/json
+/delete/no-type,delete,text/plain
 /delete/text-plain,delete,text/plain
 /delete/json,delete,application/json
 /delete/octet-stream,delete,application/octet-stream
 /get-text-plain,get,text/plain
-/get/no-type,get,application/json
+/get/no-type,get,text/plain
 /get/text-plain,get,text/plain
 /get/json,get,application/json
 /get/octet-stream,get,application/octet-stream
 /patch-text-plain,patch,text/plain
-/patch/no-type,patch,application/json
+/patch/no-type,patch,text/plain
 /patch/text-plain,patch,text/plain
 /patch/json,patch,application/json
 /patch/octet-stream,patch,application/octet-stream
 /post-text-plain,post,text/plain
-/post/no-type,post,application/json
+/post/no-type,post,text/plain
 /post/text-plain,post,text/plain
 /post/json,post,application/json
 /post/octet-stream,post,application/octet-stream
 /put-text-plain,put,text/plain
-/put/no-type,put,application/json
+/put/no-type,put,text/plain
 /put/text-plain,put,text/plain
 /put/json,put,application/json
 /put/octet-stream,put,application/octet-stream

spring/spring-web/src/test/java/io/quarkus/ts/spring/web/openapi/AbstractSpringWebOpenApiIT.java

@@ -49,9 +49,9 @@ private void checkType(Stream<String> jsonPathStream, String type) {
                 .map(pathChunk -> "'" + pathChunk + "'")
                 .collect(Collectors.joining("."));
         final Map<String, Object> objectMap = response.jsonPath().getMap(jsonPath);
-        Assertions.assertNotNull(objectMap);
-        Assertions.assertEquals(1, objectMap.keySet().size());
-        Assertions.assertEquals(type, objectMap.keySet().iterator().next());
+        Assertions.assertNotNull(objectMap, "Fails on " + jsonPath);
+        Assertions.assertEquals(1, objectMap.keySet().size(), "Fails on " + jsonPath);
+        Assertions.assertEquals(type, objectMap.keySet().iterator().next(), "Fails on " + jsonPath);
     }
 
 }

spring/spring-web/src/test/resources/request-types.csv

@@ -1,20 +1,21 @@
 /delete-text-plain,delete,text/plain
-/delete/no-type,delete,application/json
+# TODO uncomment once https://github.com/quarkusio/quarkus/issues/36297 is fixed
+#/delete/no-type,delete,text/plain
 /delete/text-plain,delete,text/plain
 /delete/json,delete,application/json
 /delete/octet-stream,delete,application/octet-stream
 /patch-text-plain,patch,text/plain
-/patch/no-type,patch,application/json
+#/patch/no-type,patch,text/plain
 /patch/text-plain,patch,text/plain
 /patch/json,patch,application/json
 /patch/octet-stream,patch,application/octet-stream
 /post-text-plain,post,text/plain
-/post/no-type,post,application/json
+#/post/no-type,post,text/plain
 /post/text-plain,post,text/plain
 /post/json,post,application/json
 /post/octet-stream,post,application/octet-stream
 /put-text-plain,put,text/plain
-/put/no-type,put,application/json
+#/put/no-type,put,text/plain
 /put/text-plain,put,text/plain
 /put/json,put,application/json
 /put/octet-stream,put,application/octet-stream

spring/spring-web/src/test/resources/response-types.csv

@@ -1,25 +1,25 @@
 /delete-text-plain,delete,text/plain
-/delete/no-type,delete,application/json
+/delete/no-type,delete,text/plain
 /delete/text-plain,delete,text/plain
 /delete/json,delete,application/json
 /delete/octet-stream,delete,application/octet-stream
 /get-text-plain,get,text/plain
-/get/no-type,get,application/json
+/get/no-type,get,text/plain
 /get/text-plain,get,text/plain
 /get/json,get,application/json
 /get/octet-stream,get,application/octet-stream
 /patch-text-plain,patch,text/plain
-/patch/no-type,patch,application/json
+/patch/no-type,patch,text/plain
 /patch/text-plain,patch,text/plain
 /patch/json,patch,application/json
 /patch/octet-stream,patch,application/octet-stream
 /post-text-plain,post,text/plain
-/post/no-type,post,application/json
+/post/no-type,post,text/plain
 /post/text-plain,post,text/plain
 /post/json,post,application/json
 /post/octet-stream,post,application/octet-stream
 /put-text-plain,put,text/plain
-/put/no-type,put,application/json
+/put/no-type,put,text/plain
 /put/text-plain,put,text/plain
 /put/json,put,application/json
 /put/octet-stream,put,application/octet-stream