Skip to content

Commit b971379

Browse files
author
andrewwilsonnew
committed
guido's feedback
1 parent c3439f8 commit b971379

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

bin/configs/kotlin-misk-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ additionalProperties:
1414
import misk.web.actions.WebAction
1515
import misk.web.interceptors.LogRequestResponse
1616
actionParentClass: "WebAction"
17-
actionRequestContentType: "@RequestContentType("
18-
actionRequestContentTypePrefix: "MediaTypes."
17+
actionRequestContentType: "@RequestContentType"
18+
actionRequestContentTypePrefix: "MediaTypes"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ public class KotlinMiskServerCodegen extends AbstractKotlinCodegen implements Be
7777
@Setter protected String actionAnnotations = "";
7878
@Setter protected String actionImports = "import misk.web.actions.WebAction";
7979
@Setter protected String actionParentClass = "WebAction";
80-
@Setter protected String actionRequestContentType = "@RequestContentType(";
81-
@Setter protected String actionRequestContentTypePrefix = "MediaTypes.";
80+
@Setter protected String actionRequestContentType = "@RequestContentType";
81+
@Setter protected String actionRequestContentTypePrefix = "MediaTypes";
8282

8383
@Override
8484
public CodegenType getTag() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class {{classname}}Action @Inject constructor(
4545

4646
@{{httpMethod}}("{{{actionPathPrefix}}}{{path}}")
4747
@Description("{{{summary}}}"){{#hasConsumes}}
48-
{{{actionRequestContentType}}}{{#consumes}}{{{actionRequestContentTypePrefix}}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/consumes}}){{/hasConsumes}}{{#hasProduces}}
48+
{{{actionRequestContentType}}}({{#consumes}}{{{actionRequestContentTypePrefix}}}.{{{mediaType}}}{{^-last}}, {{/-last}}{{/consumes}}){{/hasConsumes}}{{#hasProduces}}
4949
@ResponseContentType({{#produces}}MediaTypes.{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}){{/hasProduces}}
5050
{{#actionAnnotations}}
5151
{{{.}}}

0 commit comments

Comments
 (0)