pushing mediaTypes

Author: andrewwilsonnew

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java

@@ -20,8 +20,10 @@
 
 import java.io.File;
 import java.util.EnumSet;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 
 import static org.openapitools.codegen.utils.StringUtils.camelize;
 
@@ -111,11 +113,38 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<Mo
         List<CodegenOperation> operations = objectMap.getOperation();
 
         for (CodegenOperation operation : operations) {
+
+            if (operation.hasConsumes) {
+                for (Map<String, String> consumes : operation.consumes) {
+                    consumes.computeIfPresent("mediaType", (__, mediaType) -> mapMediaType(mediaType));
+                }
+            }
+
+            if (operation.hasProduces) {
+                for (Map<String, String> produces : operation.produces) {
+                    produces.computeIfPresent("mediaType", (__, mediaType) -> mapMediaType(mediaType));
+                }
+            }
+
             // http method verb conversion (e.g. PUT => Put)
             operation.httpMethod = camelize(operation.httpMethod.toLowerCase(Locale.ROOT));
         }
         return objs;
     }
+
+    private String mapMediaType(String mediaType) {
+        return MEDIA_MAPPING.get(mediaType);
+    }
+
+    private final static Map<String, String> MEDIA_MAPPING = getMappings();
+
+    private static Map<String, String> getMappings() {
+        Map<String, String> result = new HashMap<>();
+        // @todo add others as needed
+        result.put("application/json", "MediaTypes.APPLICATION_JSON");
+        result.put("application/xml", "MediaTypes.APPLICATION_XML");
+        return result;
+    }
 }
 
 

modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache

@@ -90,8 +90,8 @@ import misk.web.mediatype.MediaTypes
             value = [{{#responses}}ApiResponse(code = {{{code}}}, message = "{{{message}}}"{{#baseType}}, response = {{{.}}}::class{{/baseType}}{{#containerType}}, responseContainer = "{{{.}}}"{{/containerType}}){{^-last}},{{/-last}}{{/responses}}]){{/swagger1AnnotationLibrary}}
         @{{httpMethod}}("{{path}}")
         @Description("""{{{unescapedNotes}}}""")
-        @RequestContentType({{#hasConsumes}}{{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}}{{/hasConsumes}})
-        @ResponseContentType({{#hasProduces}}{{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}{{/hasProduces}})
+        @RequestContentType({{#hasConsumes}}{{#consumes}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/consumes}}{{/hasConsumes}})
+        @ResponseContentType({{#hasProduces}}{{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}{{/hasProduces}})
         @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0)
         @Suppress("unused")
         @RequestMapping(