From d47e08cf22db2cb1777e21c6d728f46e858c1d28 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Fri, 14 Mar 2025 12:47:33 +0000 Subject: [PATCH 001/102] first pass --- .../languages/KotlinMiskServerCodegen.java | 93 ++++ .../org.openapitools.codegen.CodegenConfig | 3 +- .../src/main/resources/kotlin-misk/Andrew.kt | 485 ++++++++++++++++++ .../resources/kotlin-misk/README.mustache | 59 +++ .../main/resources/kotlin-misk/api.mustache | 102 ++++ .../resources/kotlin-misk/bodyParams.mustache | 1 + .../kotlin-misk/cookieParams.mustache | 1 + .../resources/kotlin-misk/formParams.mustache | 1 + .../kotlin-misk/headerParams.mustache | 1 + .../main/resources/kotlin-misk/model.mustache | 1 + .../kotlin-misk/optionalDataType.mustache | 1 + .../resources/kotlin-misk/pathParams.mustache | 1 + .../kotlin-misk/queryParams.mustache | 1 + .../kotlin-misk/returnTypes.mustache | 1 + 14 files changed, 750 insertions(+), 1 deletion(-) create mode 100644 modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/Andrew.kt create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/README.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/api.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/bodyParams.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/cookieParams.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/formParams.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/optionalDataType.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/pathParams.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/queryParams.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/returnTypes.mustache diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java new file mode 100644 index 000000000000..221a641efbb5 --- /dev/null +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -0,0 +1,93 @@ +package org.openapitools.codegen.languages; + +import org.openapitools.codegen.CodegenConstants; +import org.openapitools.codegen.CodegenType; +import org.openapitools.codegen.SupportingFile; +import org.openapitools.codegen.meta.GeneratorMetadata; +import org.openapitools.codegen.meta.Stability; +import org.openapitools.codegen.meta.features.*; + import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.File; +import java.util.EnumSet; + +public class KotlinMiskServerCodegen extends AbstractKotlinCodegen { + + protected String rootPackage = "org.openapitools.server.api"; + protected String apiVersion = "1.0.0-SNAPSHOT"; + + public static final String ROOT_PACKAGE = "rootPackage"; + + public static final String PROJECT_NAME = "projectName"; + + final Logger LOGGER = LoggerFactory.getLogger(KotlinMiskServerCodegen.class); + + @Override + public CodegenType getTag() { + return CodegenType.SERVER; + } + + @Override + public String getName() { + return "kotlin-misk"; + } + + @Override + public String getHelp() { + return "Generates a kotlin-misk server."; + } + + public KotlinMiskServerCodegen() { + super(); + + modifyFeatureSet(features -> features + .includeDocumentationFeatures(DocumentationFeature.Readme) + .wireFormatFeatures(EnumSet.of(WireFormatFeature.JSON, WireFormatFeature.XML)) + .securityFeatures(EnumSet.noneOf( + SecurityFeature.class + )) + .excludeGlobalFeatures( + GlobalFeature.XMLStructureDefinitions, + GlobalFeature.Callbacks, + GlobalFeature.LinkObjects, + GlobalFeature.ParameterStyling + ) + .excludeSchemaSupportFeatures( + SchemaSupportFeature.Polymorphism + ) + .includeParameterFeatures( + ParameterFeature.Cookie + ) + ); + + generatorMetadata = GeneratorMetadata.newBuilder(generatorMetadata) + .stability(Stability.BETA) + .build(); + + outputFolder = "generated-code" + File.separator + "kotlin-misk"; + + apiTestTemplateFiles.clear(); + modelDocTemplateFiles.clear(); + supportingFiles.clear(); + + apiTemplateFiles.clear(); + apiTemplateFiles.put("api.mustache", ".kt"); + embeddedTemplateDir = templateDir = "kotlin-misk-server"; + apiPackage = rootPackage + ".api"; + modelPackage = rootPackage + ".model"; + artifactId = "openapi-kotlin-misk-server"; + artifactVersion = apiVersion; + + updateOption(CodegenConstants.API_PACKAGE, apiPackage); + updateOption(CodegenConstants.MODEL_PACKAGE, modelPackage); + additionalProperties.put(ROOT_PACKAGE, rootPackage); + + supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); + supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); + + } + +} + + diff --git a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig index d5189cf5c95e..fb16dc10f9f7 100644 --- a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig +++ b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig @@ -85,6 +85,7 @@ org.openapitools.codegen.languages.K6ClientCodegen org.openapitools.codegen.languages.LuaClientCodegen org.openapitools.codegen.languages.MarkdownDocumentationCodegen org.openapitools.codegen.languages.JavaMicroprofileServerCodegen +org.openapitools.codegen.languages.KotlinMiskServerCodegen org.openapitools.codegen.languages.MysqlSchemaCodegen org.openapitools.codegen.languages.PostgresqlSchemaCodegen org.openapitools.codegen.languages.N4jsClientCodegen @@ -155,4 +156,4 @@ org.openapitools.codegen.languages.TypeScriptReduxQueryClientCodegen org.openapitools.codegen.languages.TypeScriptRxjsClientCodegen org.openapitools.codegen.languages.WsdlSchemaCodegen org.openapitools.codegen.languages.XojoClientCodegen -org.openapitools.codegen.languages.ZapierClientCodegen \ No newline at end of file +org.openapitools.codegen.languages.ZapierClientCodegen diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/Andrew.kt b/modules/openapi-generator/src/main/resources/kotlin-misk/Andrew.kt new file mode 100644 index 000000000000..d8feb6b3745e --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/Andrew.kt @@ -0,0 +1,485 @@ +package com.squareup.cash.gaia.fdx.action + +import com.squareup.cash.gaia.AdminApiAccess +import com.squareup.protos.cash.fdx.model.v1.AccountContact +import com.squareup.protos.cash.fdx.model.v1.AccountPaymentNetworkList +import com.squareup.protos.cash.fdx.model.v1.AccountWithDetails +import com.squareup.protos.cash.fdx.model.v1.Accounts +import com.squareup.protos.cash.fdx.model.v1.AssetTransferNetworkList +import com.squareup.protos.cash.fdx.model.v1.ResultType +import com.squareup.protos.cash.fdx.model.v1.Statements +import com.squareup.protos.cash.fdx.model.v1.Transactions +import io.swagger.v3.oas.annotations.Parameter +import io.swagger.v3.oas.annotations.media.Schema +import javax.inject.Inject +import javax.inject.Singleton +import javax.validation.Valid +import javax.validation.constraints.Size +import misk.web.Description +import misk.web.Get +import misk.web.PathParam +import misk.web.QueryParam +import misk.web.RequestContentType +import misk.web.ResponseContentType +import misk.web.actions.WebAction +import misk.web.interceptors.LogRequestResponse +import misk.web.mediatype.MediaTypes + +/** + * Spring commented out. +@RestController +@Validated +@RequestMapping("\${api.base-path:/fdx/v6}") + */ +@Singleton +class AccountsApiAction @Inject constructor( +) : WebAction { + + + /** + * Spring commented out. + @Operation( + summary = "Retrieve account details", + operationId = "getAccount", + description = """Retrieve full details about the account identified by `{accountId}` parameter""", + responses = [ + ApiResponse( + responseCode = "200", + description = "This can be one of LoanAccount, DepositAccount, LineOfCreditAccount, InvestmentAccount, InsuranceAccount, AnnuityAccount, CommercialAccount, or DigitalWallet", + content = [Content(schema = Schema(implementation = AccountWithDetails::class))] + ), + ApiResponse( + responseCode = "404", + description = "Account with id not found", + content = [Content(schema = Schema(implementation = Error::class))] + ), + ApiResponse( + responseCode = "500", + description = "", + content = [Content(schema = Schema(implementation = Error::class))] + ), + ApiResponse( + responseCode = "501", + description = "", + content = [Content(schema = Schema(implementation = Error::class))] + ), + ApiResponse( + responseCode = "503", + description = "", + content = [Content(schema = Schema(implementation = Error::class))] + )] + ) + @RequestMapping( + method = [RequestMethod.GET], + value = ["/accounts/{accountId}"], + produces = ["application/json"] + ) + fun getAccount(@Parameter(description = "Account Identifier", required = true) @PathVariable("accountId") accountId: kotlin.String): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } + */ + @Get("/accounts/{accountId}") + @Description("Retrieve full details about the account identified by `{accountId}` parameter") + @AdminApiAccess + @RequestContentType(MediaTypes.APPLICATION_JSON) + @ResponseContentType(MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + fun getAccount(@PathParam("accountId") accountId: String): AccountWithDetails { + TODO() + } +} + +/** + * Spring doc +@Operation( +summary = "Get asset transfer details for this account", +operationId = "getAccountAssetTransferNetworks", +description = """...""", +responses = [ +ApiResponse(responseCode = "200", description = "Information required to facilitate asset transfer from this account", content = [Content(schema = Schema(implementation = AssetTransferNetworkList::class))]) ] +) +@RequestMapping( +method = [RequestMethod.GET], +value = ["/accounts/{accountId}/asset-transfer-networks"], +produces = ["application/json"] +) +fun getAccountAssetTransferNetworks(@Parameter(description = "Account Identifier", required = true) @PathVariable("accountId") accountId: kotlin.String): ResponseEntity { +return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) +} + */ +@Get("/accounts/{accountId}/asset-transfer-networks") +@Description("Get asset transfer details for this account") +@AdminApiAccess +@RequestContentType(MediaTypes.APPLICATION_JSON) +@ResponseContentType(MediaTypes.APPLICATION_JSON) +@LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) +@Suppress("unused") +fun getAccountAssetTransferNetworks( + @Parameter(description = "Account Identifier", required = true) + @PathParam("accountId") accountId: String +): AssetTransferNetworkList { + TODO() +} + +/* + @Operation( + summary = "Get an account's contact information", + operationId = "getAccountContact", + description = """Get contact information on the account""", + responses = [ + ApiResponse(responseCode = "200", description = "Details used to verify an account", content = [Content(schema = Schema(implementation = AccountContact::class))]), + ApiResponse(responseCode = "404", description = "Account with id not found", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "500", description = "", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "501", description = "", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "503", description = "", content = [Content(schema = Schema(implementation = Error::class))]) ] + ) + @RequestMapping( + method = [RequestMethod.GET], + value = ["/accounts/{accountId}/contact"], + produces = ["application/json"] + ) + fun getAccountContact(@Parameter(description = "Account Identifier", required = true) @PathVariable("accountId") accountId: kotlin.String): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) + } + */ +@Get("/accounts/{accountId}/contact") +@Description("Get contact information on the account") +@AdminApiAccess +@RequestContentType(MediaTypes.APPLICATION_JSON) +@ResponseContentType(MediaTypes.APPLICATION_JSON) +@LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) +@Suppress("unused") +fun getAccountContact( + @Parameter(description = "Account Identifier", required = true) + @PathParam("accountId") + accountId: String +): AccountContact { + TODO() +} + +/* +@Operation( + summary = "Get payment networks supported by the account", + operationId = "getAccountPaymentNetworks", + description = """Get payment networks supported by the account""", + responses = [ + ApiResponse(responseCode = "200", description = "Information required to execute a payment transaction against this account", content = [Content(schema = Schema(implementation = AccountPaymentNetworkList::class))]), + ApiResponse(responseCode = "404", description = "Account with id not found", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "500", description = "", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "501", description = "", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "503", description = "", content = [Content(schema = Schema(implementation = Error::class))]) ] +) +@RequestMapping( + method = [RequestMethod.GET], + value = ["/accounts/{accountId}/payment-networks"], + produces = ["application/json"] +) +fun getAccountPaymentNetworks(@Parameter(description = "Account Identifier", required = true) @PathVariable("accountId") accountId: kotlin.String,@Parameter(description = "Opaque cursor used by the provider to send the next set of records") @Valid @RequestParam(value = "offset", required = false) offset: kotlin.String?,@Parameter(description = "Number of elements that the consumer wishes to receive. Providers should implement reasonable default/maximum/minimum values based on their internal architecture and update their documentation accordingly") @Valid @RequestParam(value = "limit", required = false) limit: kotlin.Int?): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) +} + */ +@Get("/accounts/{accountId}/payment-networks") +@Description("Get payment networks supported by the account") +@AdminApiAccess +@RequestContentType(MediaTypes.APPLICATION_JSON) +@ResponseContentType(MediaTypes.APPLICATION_JSON) +@LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) +@Suppress("unused") +fun getAccountPaymentNetworks( + @Parameter(description = "Account Identifier", required = true) + @PathParam("accountId") + accountId: String, + + @Parameter(description = "Opaque cursor used by the provider to send the next set of records", required = false) + @Valid + @QueryParam(value = "offset") + offset: kotlin.String?, + + @Parameter(description = "Number of elements that the consumer wishes to receive. Providers should implement reasonable default/maximum/minimum values based on their internal architecture and update their documentation accordingly", required = false) + @Valid + @QueryParam(value = "limit") + limit: Int? +): AccountPaymentNetworkList { + TODO() +} + +/* +@Operation( + summary = "Get an account statement", + operationId = "getAccountStatement", + description = """Gets an account statement image file. Use [HTTP Accept request-header](https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html) to specify desired content types. See ContentTypes definition for typical values""", + responses = [ + ApiResponse(responseCode = "200", description = "An image of an account statement", content = [Content(schema = Schema(implementation = org.springframework.core.io.Resource::class))]), + ApiResponse(responseCode = "302", description = "Statement is available at specified location. URL is returned via the `Location` HTTP header"), + ApiResponse(responseCode = "400", description = "Statement is processing and is not yet available", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "404", description = "When account is present with no statements in it", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "406", description = "", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "500", description = "", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "501", description = "", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "503", description = "", content = [Content(schema = Schema(implementation = Error::class))]) ] +) +@RequestMapping( + method = [RequestMethod.GET], + value = ["/accounts/{accountId}/statements/{statementId}"], + produces = ["application/pdf", "image/gif", "image/jpeg", "image/tiff", "image/png", "application/json"] +) +fun getAccountStatement(@Parameter(description = "Account Identifier", required = true) @PathVariable("accountId") accountId: kotlin.String,@Parameter(description = "Statement Identifier", required = true) @PathVariable("statementId") statementId: kotlin.String): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) +} +*/ +@Get("/accounts/{accountId}/statements/{statementId}") +@Description("""Gets an account statement image file. Use [HTTP Accept request-header](https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html) to specify desired content types. See ContentTypes definition for typical values""") +@AdminApiAccess +@RequestContentType(MediaTypes.APPLICATION_JSON) +@ResponseContentType( + MediaTypes.IMAGE_GIF, + MediaTypes.IMAGE_JPEG, + MediaTypes.IMAGE_PNG, + MediaTypes.APPLICATION_JSON +) +@LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) +@Suppress("unused") +fun getAccountStatement( + @Parameter(description = "Account Identifier", required = true) + @PathParam("accountId") + accountId: String, + + @Parameter(description = "Statement Identifier", required = true) + @QueryParam("statementId") + statementId: String +): ByteArray { // TODO how do we return a file etc. + TODO() +} + +/* +@Operation( + summary = "Get account transaction image", + operationId = "getAccountTransactionImages", + description = """Get account transaction image""", + responses = [ + ApiResponse(responseCode = "200", description = "An image of transaction (such as a scanned check)", content = [Content(schema = Schema(implementation = org.springframework.core.io.Resource::class))]), + ApiResponse(responseCode = "404", description = "Account or image with id not found", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "406", description = "", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "500", description = "", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "501", description = "", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "503", description = "", content = [Content(schema = Schema(implementation = Error::class))]) ] +) +@RequestMapping( + method = [RequestMethod.GET], + value = ["/accounts/{accountId}/transaction-images/{imageId}"], + produces = ["application/pdf", "image/gif", "image/jpeg", "image/tiff", "image/png", "application/json"] +) +fun getAccountTransactionImages(@Parameter(description = "Account Identifier", required = true) @PathVariable("accountId") accountId: kotlin.String,@Parameter(description = "Image Identifier", required = true) @PathVariable("imageId") imageId: kotlin.String): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) +} + + */ +@Get("/accounts/{accountId}/transaction-images/{imageId}") +@Description("Get account transaction image") +@AdminApiAccess +@RequestContentType(MediaTypes.APPLICATION_JSON) +@ResponseContentType( + MediaTypes.IMAGE_GIF, + MediaTypes.IMAGE_JPEG, + MediaTypes.IMAGE_PNG, + MediaTypes.APPLICATION_JSON +) +@LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) +@Suppress("unused") +fun getAccountTransactionImages( + @Parameter(description = "Account Identifier", required = true) + @PathParam("accountId") + accountId: kotlin.String, + + @Parameter(description = "Image Identifier", required = true) + @PathParam("imageId") + imageId: String +): ByteArray { + TODO() +} + +/* +@Operation( + summary = "Search for statements", + operationId = "searchForAccountStatements", + description = """Get account statements. Example: GET /accounts/{accountId}/statements?startTime=value1&endTime=value2""", + responses = [ + ApiResponse(responseCode = "200", description = "Paginated list of available statements", content = [Content(schema = Schema(implementation = Statements::class))]), + ApiResponse(responseCode = "400", description = "Start or end date value is not in the ISO 8601 format", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "404", description = "Account with id not found", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "500", description = "", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "501", description = "", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "503", description = "", content = [Content(schema = Schema(implementation = Error::class))]) ] +) +@RequestMapping( + method = [RequestMethod.GET], + value = ["/accounts/{accountId}/statements"], + produces = ["application/json"] +) +fun searchForAccountStatements(@Parameter(description = "Account Identifier", required = true) @PathVariable("accountId") accountId: kotlin.String,@Size(max=10) @Parameter(description = "Start time for use in retrieval of elements (ISO 8601)") @Valid @RequestParam(value = "startTime", required = false) @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE) startTime: java.time.LocalDate?,@Size(max=10) @Parameter(description = "End time for use in retrieval of elements (ISO 8601)") @Valid @RequestParam(value = "endTime", required = false) @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE) endTime: java.time.LocalDate?,@Parameter(description = "Opaque cursor used by the provider to send the next set of records") @Valid @RequestParam(value = "offset", required = false) offset: kotlin.String?,@Parameter(description = "Number of elements that the consumer wishes to receive. Providers should implement reasonable default/maximum/minimum values based on their internal architecture and update their documentation accordingly") @Valid @RequestParam(value = "limit", required = false) limit: kotlin.Int?): ResponseEntity { + return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) +} +*/ +@Get("/accounts/{accountId}/statements") +@Description("""Get account statements. Example: GET /accounts/{accountId}/statements?startTime=value1&endTime=value2""") +@AdminApiAccess +@RequestContentType(MediaTypes.APPLICATION_JSON) +@ResponseContentType(MediaTypes.APPLICATION_JSON) +@LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) +@Suppress("unused") +fun searchForAccountStatements( + @Parameter(description = "Account Identifier", required = true) + @PathParam("accountId") + accountId: String, + + @Size(max=10) + @Parameter(description = "Start time for use in retrieval of elements (ISO 8601)", required = false) + @Valid + @QueryParam(value = "startTime") + //@org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE) + startTime: java.time.LocalDate?, + + @Size(max=10) + @Parameter(description = "End time for use in retrieval of elements (ISO 8601)", required = false) + @Valid + @QueryParam(value = "endTime") + //@org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE) + endTime: java.time.LocalDate?, + + @Parameter(description = "Opaque cursor used by the provider to send the next set of records", required = false) + @Valid + @QueryParam(value = "offset") + offset: String?, + + @Parameter(description = "Number of elements that the consumer wishes to receive. Providers should implement reasonable default/maximum/minimum values based on their internal architecture and update their documentation accordingly", required = false) + @Valid + @QueryParam(value = "limit") + limit: Int?): Statements { + TODO() +} + +/* +@Operation( + summary = "Search for account transactions", + operationId = "searchForAccountTransactions", + description = """Search for account transactions. Example: /accounts/{accountId}/transactions?startTime=value1&endTime=value2""", + responses = [ + ApiResponse(responseCode = "200", description = "Paginated collection of transactions, which can be one of DepositTransaction, LoanTransaction, LineOfCreditTransaction, InvestmentTransaction, InsuranceTransaction, CommercialTransaction, or DigitalWalletTransaction", content = [Content(schema = Schema(implementation = Transactions::class))]), + ApiResponse(responseCode = "400", description = "Start or end date value is not in the ISO 8601 format", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "404", description = "Account with id not found", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "500", description = "", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "501", description = "", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "503", description = "", content = [Content(schema = Schema(implementation = Error::class))]) ] +) +@RequestMapping( + method = [RequestMethod.GET], + value = ["/accounts/{accountId}/transactions"], + produces = ["application/json"] +) + */ +@Get("/accounts/{accountId}/transactions") +@Description("""Search for account transactions. Example: /accounts/{accountId}/transactions?startTime=value1&endTime=value2""") +@AdminApiAccess +@RequestContentType(MediaTypes.APPLICATION_JSON) +@ResponseContentType(MediaTypes.APPLICATION_JSON) +@LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) +@Suppress("unused") +fun searchForAccountTransactions( + @Parameter(description = "Account Identifier", required = true) + @PathParam("accountId") + accountId:String, + + @Size(max=10) + @Parameter(description = "Start time for use in retrieval of elements (ISO 8601)", required = false) + @Valid + @QueryParam(value = "startTime") + //@org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE) + startTime: java.time.LocalDate?, + + @Size(max=10) + @Parameter(description = "End time for use in retrieval of elements (ISO 8601)", required = false) + @Valid + @QueryParam(value = "endTime") + //@org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE) + endTime: java.time.LocalDate?, + + @Parameter(description = "Opaque cursor used by the provider to send the next set of records", required = false) + @Valid + @QueryParam(value = "offset") + offset: String?, + + @Parameter(description = "Number of elements that the consumer wishes to receive. Providers should implement reasonable default/maximum/minimum values based on their internal architecture and update their documentation accordingly", required = false) + @Valid + @QueryParam(value = "limit") + limit: Int? +): Transactions { + TODO() +} + +/* +@Operation( + summary = "Search for accounts", + operationId = "searchForAccounts", + description = """Return information for all of the customer's consented accounts or just those accounts identified in the `accountIds` request parameter. Use `ResultTypeQuery` parameter value of `lightweight` to retrieve minimal descriptive information and the `accountId` for each account. The `accountId` can then be used in the `getAccount` operation's path `/accounts/{accountId}` to retrieve full details about each account""", + responses = [ + ApiResponse(responseCode = "200", description = "Array of accounts (DepositAccount, LoanAccount, LineOfCreditAccount, InvestmentAccount, InsuranceAccount, AnnuityAccount, CommercialAccount, or DigitalWallet)", content = [Content(schema = Schema(implementation = Accounts::class))]), + ApiResponse(responseCode = "400", description = "Start or end date value is not in the ISO 8601 format", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "404", description = "", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "500", description = "", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "501", description = "", content = [Content(schema = Schema(implementation = Error::class))]), + ApiResponse(responseCode = "503", description = "", content = [Content(schema = Schema(implementation = Error::class))]) ] +) +@RequestMapping( + method = [RequestMethod.GET], + value = ["/accounts"], + produces = ["application/json"] +) +*/ +@AdminApiAccess +@Description("""Return information for all of the customer's consented accounts or just those accounts identified in the `accountIds` request parameter. Use `ResultTypeQuery` parameter value of `lightweight` to retrieve minimal descriptive information and the `accountId` for each account. The `accountId` can then be used in the `getAccount` operation's path `/accounts/{accountId}` to retrieve full details about each account""${'"'},""") +@Get("/accounts") +@RequestContentType(MediaTypes.APPLICATION_JSON) +@ResponseContentType(MediaTypes.APPLICATION_JSON) +@LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) +@Suppress("unused") +fun searchForAccounts( + @Parameter(description = "Comma separated list of account ids", required = false) + @Valid + @QueryParam(value = "accountIds") + accountIds: List?, + + @Parameter(description = "Start time for use in retrieval of transactions", required = false) + @Valid + @QueryParam(value = "startTime") + startTime: List?, + + @Parameter(description = "End time for use in retrieval of transactions", required = false) + @Valid + @QueryParam(value = "endTime") + endTime: List?, + + @Parameter(description = "Flag to indicate if you want a lightweight array of metadata (AccountDescriptor or Tax or Operations) or full item details (Account or a Tax subclass or Availability details). If set to 'lightweight', should only return the fields associated with the metadata entity. This field is not required, defaults to lightweight", + schema = Schema( + allowableValues = ["details", "lightweight"], + defaultValue = "lightweight" + ) + ) + @Valid + @QueryParam(value = "resultType") + resultType: ResultType, + + @Parameter(description = "Opaque cursor used by the provider to send the next set of records", required = false) + @Valid + @QueryParam(value = "offset") + offset: String?, + + @Parameter(description = "Number of elements that the consumer wishes to receive. Providers should implement reasonable default/maximum/minimum values based on their internal architecture and update their documentation accordingly", required = false) + @Valid + @QueryParam(value = "limit") + limit: Int? +): Accounts { + TODO() +} + + diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/README.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/README.mustache new file mode 100644 index 000000000000..7a1ef551eda1 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/README.mustache @@ -0,0 +1,59 @@ +# Documentation for {{appName}} + +{{#generateApiDocs}} + + ## Documentation for API Endpoints + + All URIs are relative to *{{{basePath}}}* + + Class | Method | HTTP request | Description + ------------ | ------------- | ------------- | ------------- + {{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}*{{classname}}* | [**{{operationId}}**](Apis/{{apiDocPath}}{{classname}}.md#{{operationIdLowerCase}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{{summary}}}{{/summary}} + {{/operation}}{{/operations}}{{/apis}}{{/apiInfo}} +{{/generateApiDocs}} + +{{#generateModelDocs}} + + ## Documentation for Models + + {{#modelPackage}} + {{#models}}{{#model}} - [{{{modelPackage}}}.{{{classname}}}](Models/{{modelDocPath}}{{{classname}}}.md) + {{/model}}{{/models}} + {{/modelPackage}} + {{^modelPackage}} + No model defined in this package + {{/modelPackage}} +{{/generateModelDocs}} + +{{! TODO: optional documentation for authorization? }} +## Documentation for Authorization + +{{^authMethods}}Endpoints do not require authorization.{{/authMethods}} +{{#hasAuthMethods}}Authentication schemes defined for the API:{{/hasAuthMethods}} +{{#authMethods}} + + ### {{name}} + + {{#isApiKey}}- **Type**: API key + - **API key parameter name**: {{keyParamName}} + - **Location**: {{#isKeyInQuery}}URL query string{{/isKeyInQuery}}{{#isKeyInHeader}}HTTP header{{/isKeyInHeader}} + {{/isApiKey}} + {{#isBasicBasic}}- **Type**: HTTP basic authentication + {{/isBasicBasic}} + {{#isBasicBearer}}- **Type**: HTTP Bearer Token authentication{{#bearerFormat}} ({{{.}}}){{/bearerFormat}} + {{/isBasicBearer}} + {{#isHttpSignature}}- **Type**: HTTP signature authentication + {{/isHttpSignature}} + {{#isOAuth}}- **Type**: OAuth + - **Flow**: {{flow}} + - **Authorization URL**: {{authorizationUrl}} + - **Scopes**: {{^scopes}}N/A{{/scopes}} + {{#scopes}} - {{scope}}: {{description}} + {{/scopes}} + {{/isOAuth}} + {{#isOpenId}}- **Type**: OpenIDConnect + - **Connect URL**: {{{openIdConnectUrl}}} + - **Bearer Format**: {{{bearerFormat}}} + {{/isOpenId}} + +{{/authMethods}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/api.mustache new file mode 100644 index 000000000000..47fd25696ef9 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/api.mustache @@ -0,0 +1,102 @@ +package {{package}} + +{{#imports}}import {{import}} +{{/imports}} +{{#swagger2AnnotationLibrary}} + import io.swagger.v3.oas.annotations.* + import io.swagger.v3.oas.annotations.enums.* + import io.swagger.v3.oas.annotations.media.* + import io.swagger.v3.oas.annotations.responses.* + import io.swagger.v3.oas.annotations.security.* +{{/swagger2AnnotationLibrary}} +{{#swagger1AnnotationLibrary}} + import io.swagger.annotations.Api + import io.swagger.annotations.ApiOperation + import io.swagger.annotations.ApiParam + import io.swagger.annotations.ApiResponse + import io.swagger.annotations.ApiResponses + import io.swagger.annotations.Authorization + import io.swagger.annotations.AuthorizationScope +{{/swagger1AnnotationLibrary}} + +import misk.web.Get +import misk.web.PathParam +import misk.web.QueryParam +import misk.web.RequestContentType +import misk.web.ResponseContentType +import misk.web.actions.WebAction +import misk.web.interceptors.LogRequestResponse +import misk.web.mediatype.MediaTypes + +{{#useBeanValidation}} + import {{javaxPackage}}.validation.Valid + import {{javaxPackage}}.validation.constraints.DecimalMax + import {{javaxPackage}}.validation.constraints.DecimalMin + import {{javaxPackage}}.validation.constraints.Email + import {{javaxPackage}}.validation.constraints.Max + import {{javaxPackage}}.validation.constraints.Min + import {{javaxPackage}}.validation.constraints.NotNull + import {{javaxPackage}}.validation.constraints.Pattern + import {{javaxPackage}}.validation.constraints.Size +{{/useBeanValidation}} + +{{#reactive}} + import kotlinx.coroutines.flow.Flow +{{/reactive}} +import kotlin.collections.List +import kotlin.collections.Map + +@RestController{{#beanQualifiers}}("{{package}}.{{classname}}Controller"){{/beanQualifiers}} +{{#useBeanValidation}} + @Validated +{{/useBeanValidation}} +{{#swagger1AnnotationLibrary}} + @Api(value = "{{{baseName}}}", description = "The {{{baseName}}} API") +{{/swagger1AnnotationLibrary}} +{{#useRequestMappingOnController}} + {{=<% %>=}} + @RequestMapping("\${api.base-path:<%contextPath%>}") + <%={{ }}=%> +{{/useRequestMappingOnController}} +{{#operations}} + class {{classname}}Controller({{#serviceInterface}}@Autowired(required = true) val service: {{classname}}Service{{/serviceInterface}}) { + {{#operation}} + + {{#swagger2AnnotationLibrary}} + @Operation( + summary = "{{{summary}}}", + operationId = "{{{operationId}}}", + description = """{{{unescapedNotes}}}""", + responses = [{{#responses}} + ApiResponse(responseCode = "{{{code}}}", description = "{{{message}}}"{{#baseType}}, content = [Content({{#isArray}}array = ArraySchema({{/isArray}}schema = Schema(implementation = {{{baseType}}}::class)){{#isArray}}){{/isArray}}]{{/baseType}}){{^-last}},{{/-last}}{{/responses}} ]{{#hasAuthMethods}}, + security = [ {{#authMethods}}SecurityRequirement(name = "{{name}}"{{#isOAuth}}, scopes = [ {{#scopes}}"{{scope}}"{{^-last}}, {{/-last}}{{/scopes}} ]{{/isOAuth}}){{^-last}},{{/-last}}{{/authMethods}} ]{{/hasAuthMethods}} + ){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}} + @ApiOperation( + value = "{{{summary}}}", + nickname = "{{{operationId}}}", + notes = "{{{notes}}}"{{#returnBaseType}}, + response = {{{.}}}::class{{/returnBaseType}}{{#returnContainer}}, + responseContainer = "{{{.}}}"{{/returnContainer}}{{#hasAuthMethods}}, + authorizations = [{{#authMethods}}Authorization(value = "{{name}}"{{#isOAuth}}, scopes = [{{#scopes}}AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{^-last}}, {{/-last}}{{/scopes}}]{{/isOAuth}}){{^-last}}, {{/-last}}{{/authMethods}}]{{/hasAuthMethods}}) + @ApiResponses( + value = [{{#responses}}ApiResponse(code = {{{code}}}, message = "{{{message}}}"{{#baseType}}, response = {{{.}}}::class{{/baseType}}{{#containerType}}, responseContainer = "{{{.}}}"{{/containerType}}){{^-last}},{{/-last}}{{/responses}}]){{/swagger1AnnotationLibrary}} + @{{httpMethod}}("{{path}}") + @Description("""{{{unescapedNotes}}}""") + @AdminApiAccess + @RequestContentType(MediaType.APPLICATION_JSON) + @ResponseContentType(MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + @RequestMapping( + value = ["{{#lambdaEscapeInNormalString}}{{{path}}}{{/lambdaEscapeInNormalString}}"]{{#singleContentTypes}}{{#hasProduces}}, + produces = [{{#vendorExtensions.x-accepts}}"{{{.}}}"{{^-last}}, {{/-last}}{{/vendorExtensions.x-accepts}}]{{/hasProduces}}{{#hasConsumes}}, + consumes = "{{{vendorExtensions.x-content-type}}}"{{/hasConsumes}}{{/singleContentTypes}}{{^singleContentTypes}}{{#hasProduces}}, + produces = [{{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}]{{/hasProduces}}{{#hasConsumes}}, + consumes = [{{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}}]{{/hasConsumes}}{{/singleContentTypes}} + ) + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}} { + TODO() + } + {{/operation}} + } +{{/operations}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParams.mustache new file mode 100644 index 000000000000..4ca6b20ca93d --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParams.mustache @@ -0,0 +1 @@ +{{#isBodyParam}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{^isContainer}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = ["{{{allowableValues}}}"], defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = ["{{{allowableValues}}}"]){{/defaultValue}}{{/allowableValues}}{{/isContainer}}){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{^isContainer}}{{#allowableValues}}, allowableValues = "{{{.}}}"{{/allowableValues}}{{/isContainer}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/swagger1AnnotationLibrary}}{{#useBeanValidation}} @Valid{{>beanValidationBodyParams}}{{/useBeanValidation}} @RequestBody{{^required}}(required = false){{/required}} {{{paramName}}}: {{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}{{>optionalDataType}}{{/isArray}}{{#isArray}}Flow<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/cookieParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/cookieParams.mustache new file mode 100644 index 000000000000..028264a18bcf --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/cookieParams.mustache @@ -0,0 +1 @@ +{{#isCookieParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}@CookieValue(name = "{{baseName}}"{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}) {{{paramName}}}: {{>optionalDataType}}{{/isCookieParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/formParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/formParams.mustache new file mode 100644 index 000000000000..3d1a5787e382 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/formParams.mustache @@ -0,0 +1 @@ +{{#isFormParam}}{{^isFile}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]{{^isContainer}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/isContainer}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}{{^isContainer}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/isContainer}}{{/defaultValue}}{{/allowableValues}}){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/swagger1AnnotationLibrary}} {{#isModel}}@RequestPart{{/isModel}}{{^isModel}}@RequestParam{{/isModel}}(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{{paramName}}}: {{>optionalDataType}} {{/isFile}}{{#isFile}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "file detail"){{/swagger1AnnotationLibrary}} {{#useBeanValidation}}@Valid{{/useBeanValidation}} @RequestPart("{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{{paramName}}}: {{>optionalDataType}}{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache new file mode 100644 index 000000000000..ed62c902c3d4 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache @@ -0,0 +1 @@ +{{#isHeaderParam}}{{#useBeanValidation}}{{>beanValidationCore}}{{/useBeanValidation}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}", `in` = ParameterIn.HEADER{{#required}}, required = true{{/required}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]{{^isContainer}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/isContainer}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}{{^isContainer}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/isContainer}}{{/defaultValue}}{{/allowableValues}}){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/swagger1AnnotationLibrary}} @RequestHeader(value = "{{baseName}}", required = {{#required}}true{{/required}}{{^required}}false{{/required}}) {{{paramName}}}: {{>optionalDataType}}{{/isHeaderParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache new file mode 100644 index 000000000000..8b137891791f --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache @@ -0,0 +1 @@ + diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/optionalDataType.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/optionalDataType.mustache new file mode 100644 index 000000000000..a6b059b8632a --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/optionalDataType.mustache @@ -0,0 +1 @@ +{{^isFile}}{{{dataType}}}{{^required}}{{^defaultValue}}?{{/defaultValue}}{{/required}}{{/isFile}}{{#isFile}}{{#isArray}}Array<{{/isArray}}org.springframework.web.multipart.MultipartFile{{#isArray}}>{{/isArray}}{{^isArray}}{{^required}}?{{/required}}{{/isArray}}{{/isFile}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/pathParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/pathParams.mustache new file mode 100644 index 000000000000..f5c66b37f67a --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/pathParams.mustache @@ -0,0 +1 @@ +{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#swagger2AnnotationLibrary}}@PathParam(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = [{{#enumVars}}"{{#lambdaEscapeInNormalString}}{{{value}}}{{/lambdaEscapeInNormalString}}"{{^-last}}, {{/-last}}{{/enumVars}}]{{^isContainer}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/isContainer}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = [{{#enumVars}}"{{#lambdaEscapeInNormalString}}{{{value}}}{{/lambdaEscapeInNormalString}}"{{^-last}}, {{/-last}}{{/enumVars}}]){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}{{^isContainer}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/isContainer}}{{/defaultValue}}{{/allowableValues}}){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#enumVars}}{{#lambda.escapeDoubleQuote}}{{{value}}}{{/lambda.escapeDoubleQuote}}{{^-last}}, {{/-last}}{{/enumVars}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/swagger1AnnotationLibrary}} @PathVariable("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/queryParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/queryParams.mustache new file mode 100644 index 000000000000..2bf764c99633 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/queryParams.mustache @@ -0,0 +1 @@ +{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]{{^isContainer}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/isContainer}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}{{^isContainer}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/isContainer}}{{/defaultValue}}{{/allowableValues}}){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}"{{/allowableValues}}{{^isContainer}}{{#defaultValue}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}){{/swagger1AnnotationLibrary}}{{#useBeanValidation}} @Valid{{/useBeanValidation}}{{^isModel}} @RequestParam(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{^isContainer}}{{#defaultValue}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}){{/isModel}}{{#isDate}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE){{/isDate}}{{#isDateTime}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME){{/isDateTime}} {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/returnTypes.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/returnTypes.mustache new file mode 100644 index 000000000000..612aa9ec0599 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/returnTypes.mustache @@ -0,0 +1 @@ +{{#isMap}}Map{{/isMap}}{{#isArray}}{{#reactive}}{{#useFlowForArrayReturnType}}Flow{{/useFlowForArrayReturnType}}{{^useFlowForArrayReturnType}}{{{returnContainer}}}{{/useFlowForArrayReturnType}}{{/reactive}}{{^reactive}}{{{returnContainer}}}{{/reactive}}<{{{returnType}}}>{{/isArray}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file From b12e2b7e9a693fe6e90afa024c99c35cde11e49a Mon Sep 17 00:00:00 2001 From: Guido Arnau Date: Mon, 17 Mar 2025 10:29:34 +0100 Subject: [PATCH 002/102] Fix extra new line --- .../META-INF/services/org.openapitools.codegen.CodegenConfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig index fb16dc10f9f7..a02ed7cbe92e 100644 --- a/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig +++ b/modules/openapi-generator/src/main/resources/META-INF/services/org.openapitools.codegen.CodegenConfig @@ -156,4 +156,4 @@ org.openapitools.codegen.languages.TypeScriptReduxQueryClientCodegen org.openapitools.codegen.languages.TypeScriptRxjsClientCodegen org.openapitools.codegen.languages.WsdlSchemaCodegen org.openapitools.codegen.languages.XojoClientCodegen -org.openapitools.codegen.languages.ZapierClientCodegen +org.openapitools.codegen.languages.ZapierClientCodegen \ No newline at end of file From ccf127da4f23f3ae25ec197460347a2f70665c1d Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Mon, 17 Mar 2025 13:19:42 +0000 Subject: [PATCH 003/102] adding generator file --- bin/configs/kotlin-misk-petstore.yaml | 6 ++++++ .../codegen/languages/KotlinMiskServerCodegen.java | 3 +++ 2 files changed, 9 insertions(+) create mode 100644 bin/configs/kotlin-misk-petstore.yaml diff --git a/bin/configs/kotlin-misk-petstore.yaml b/bin/configs/kotlin-misk-petstore.yaml new file mode 100644 index 000000000000..0deb0ae6a500 --- /dev/null +++ b/bin/configs/kotlin-misk-petstore.yaml @@ -0,0 +1,6 @@ +generatorName: kotlin-misk +outputDir: samples/server/petstore/kotlin/misk +inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml +templateDir: modules/openapi-generator/src/main/resources/kotlin-misk +additionalProperties: + hideGenerationTimestamp: "true" diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 221a641efbb5..6516a095f6c4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -73,6 +73,9 @@ public KotlinMiskServerCodegen() { apiTemplateFiles.clear(); apiTemplateFiles.put("api.mustache", ".kt"); + + modelTemplateFiles.put("model.mustache", ".proto"); + embeddedTemplateDir = templateDir = "kotlin-misk-server"; apiPackage = rootPackage + ".api"; modelPackage = rootPackage + ".model"; From 3e1411bad7e5e53f2a74568f660eaca02fdf6d1e Mon Sep 17 00:00:00 2001 From: Guido Arnau Date: Mon, 17 Mar 2025 14:49:09 +0100 Subject: [PATCH 004/102] Run new.sh script --- .../KotlinMiskServerCodegenModelTest.java | 29 +++++++++++++++++ .../KotlinMiskServerCodegenOptionsTest.java | 30 ++++++++++++++++++ .../misk/KotlinMiskServerCodegenTest.java | 19 ++++++++++++ ...otlinMiskServerCodegenOptionsProvider.java | 31 +++++++++++++++++++ 4 files changed, 109 insertions(+) create mode 100644 modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenModelTest.java create mode 100644 modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenOptionsTest.java create mode 100644 modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenTest.java create mode 100644 modules/openapi-generator/src/test/java/org/openapitools/codegen/options/KotlinMiskServerCodegenOptionsProvider.java diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenModelTest.java new file mode 100644 index 000000000000..1dae17989113 --- /dev/null +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenModelTest.java @@ -0,0 +1,29 @@ +package org.openapitools.codegen.kotlin.misk; + +import org.openapitools.codegen.*; +import org.openapitools.codegen.languages.KotlinMiskServerCodegen; +import io.swagger.models.*; +import io.swagger.models.properties.*; + +import org.testng.Assert; +import org.testng.annotations.Test; + +@SuppressWarnings("static-method") +public class KotlinMiskServerCodegenModelTest { + + @Test(description = "convert a simple java model") + public void simpleModelTest() { + final Model model = new ModelImpl() + .description("a sample model") + .property("id", new LongProperty()) + .property("name", new StringProperty()) + .required("id") + .required("name"); + final DefaultCodegen codegen = new KotlinMiskServerCodegen(); + + // TODO: Complete this test. + Assert.fail("Not implemented."); + } + +} + diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenOptionsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenOptionsTest.java new file mode 100644 index 000000000000..dd23cefe6f74 --- /dev/null +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenOptionsTest.java @@ -0,0 +1,30 @@ +package org.openapitools.codegen.kotlin.misk; + +import org.openapitools.codegen.AbstractOptionsTest; +import org.openapitools.codegen.CodegenConfig; +import org.openapitools.codegen.languages.KotlinMiskServerCodegen; +import org.openapitools.codegen.options.KotlinMiskServerCodegenOptionsProvider; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + +public class KotlinMiskServerCodegenOptionsTest extends AbstractOptionsTest { + private KotlinMiskServerCodegen codegen = mock(KotlinMiskServerCodegen.class, mockSettings); + + public KotlinMiskServerCodegenOptionsTest() { + super(new KotlinMiskServerCodegenOptionsProvider()); + } + + @Override + protected CodegenConfig getCodegenConfig() { + return codegen; + } + + @SuppressWarnings("unused") + @Override + protected void verifyOptions() { + // TODO: Complete options using Mockito + // verify(codegen).someMethod(arguments) + } +} + diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenTest.java new file mode 100644 index 000000000000..c7ed681873b3 --- /dev/null +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenTest.java @@ -0,0 +1,19 @@ +package org.openapitools.codegen.kotlin.misk; + +import org.openapitools.codegen.*; +import org.openapitools.codegen.languages.KotlinMiskServerCodegen; +import io.swagger.models.*; +import io.swagger.parser.SwaggerParser; +import org.testng.Assert; +import org.testng.annotations.Test; + +public class KotlinMiskServerCodegenTest { + + KotlinMiskServerCodegen codegen = new KotlinMiskServerCodegen(); + + @Test + public void shouldSucceed() throws Exception { + // TODO: Complete this test. + Assert.fail("Not implemented."); + } +} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/KotlinMiskServerCodegenOptionsProvider.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/KotlinMiskServerCodegenOptionsProvider.java new file mode 100644 index 000000000000..7da3c36f851a --- /dev/null +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/KotlinMiskServerCodegenOptionsProvider.java @@ -0,0 +1,31 @@ +package org.openapitools.codegen.options; + +import org.openapitools.codegen.CodegenConstants; +import org.openapitools.codegen.languages.KotlinMiskServerCodegen; + +import com.google.common.collect.ImmutableMap; + +import java.util.Map; + +public class KotlinMiskServerCodegenOptionsProvider implements OptionsProvider { + public static final String PROJECT_NAME_VALUE = "OpenAPI"; + + @Override + public String getLanguage() { + return "kotlin-misk"; + } + + @Override + public Map createOptions() { + ImmutableMap.Builder builder = new ImmutableMap.Builder(); + return builder + .put(KotlinMiskServerCodegen.PROJECT_NAME, PROJECT_NAME_VALUE) + .build(); + } + + @Override + public boolean isServer() { + return false; + } +} + From 0189a416dc628fd8b5b6d9d0314ce83209fbcf15 Mon Sep 17 00:00:00 2001 From: Guido Arnau Date: Mon, 17 Mar 2025 15:16:25 +0100 Subject: [PATCH 005/102] Fix template directory and ignore failing tests --- .../languages/KotlinMiskServerCodegen.java | 5 +- .../main/resources/kotlin-misk/model.mustache | 52 +++++++++++++++++++ .../KotlinMiskServerCodegenModelTest.java | 2 + .../misk/KotlinMiskServerCodegenTest.java | 2 + 4 files changed, 59 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 6516a095f6c4..e56af5436035 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -61,6 +61,8 @@ public KotlinMiskServerCodegen() { ) ); + embeddedTemplateDir = templateDir = "kotlin-misk"; + generatorMetadata = GeneratorMetadata.newBuilder(generatorMetadata) .stability(Stability.BETA) .build(); @@ -76,7 +78,6 @@ public KotlinMiskServerCodegen() { modelTemplateFiles.put("model.mustache", ".proto"); - embeddedTemplateDir = templateDir = "kotlin-misk-server"; apiPackage = rootPackage + ".api"; modelPackage = rootPackage + ".model"; artifactId = "openapi-kotlin-misk-server"; @@ -86,7 +87,7 @@ public KotlinMiskServerCodegen() { updateOption(CodegenConstants.MODEL_PACKAGE, modelPackage); additionalProperties.put(ROOT_PACKAGE, rootPackage); - supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); + //supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); } diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache index 8b137891791f..6872f57f18d7 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache @@ -1 +1,53 @@ +{{>partial_header}} +syntax = "proto3"; +package {{#lambda.lowercase}}{{{packageName}}};{{/lambda.lowercase}} + +{{#imports}} +{{#import}} +import public "{{{modelPackage}}}/{{{import}}}.proto"; +{{/import}} +{{/imports}} + +{{#models}} +{{#model}} +{{#isEnum}}{{>enum}}{{/isEnum}}{{^isEnum}}message {{classname}} { + +{{#oneOf}} +{{#-first}} + oneof {{classVarName}} { + {{#vars}} + {{#description}} + // {{{.}}} + {{/description}} + {{#vendorExtensions.x-protobuf-type}}{{{.}}} {{/vendorExtensions.x-protobuf-type}}{{{vendorExtensions.x-protobuf-data-type}}} {{{name}}} = {{vendorExtensions.x-protobuf-index}}{{#vendorExtensions.x-protobuf-packed}} [packed=true]{{/vendorExtensions.x-protobuf-packed}}; + {{/vars}} + } +{{/-first}} +{{/oneOf}} +{{^oneOf}} + {{#vars}} + {{#description}} + // {{{.}}} + {{/description}} + {{^isEnum}} + {{#vendorExtensions.x-protobuf-type}}{{{.}}} {{/vendorExtensions.x-protobuf-type}}{{{vendorExtensions.x-protobuf-data-type}}} {{{name}}} = {{vendorExtensions.x-protobuf-index}}{{#vendorExtensions.x-protobuf-packed}} [packed=true]{{/vendorExtensions.x-protobuf-packed}}{{#vendorExtensions.x-protobuf-json-name}} [json_name="{{vendorExtensions.x-protobuf-json-name}}"]{{/vendorExtensions.x-protobuf-json-name}}; + {{/isEnum}} + {{#isEnum}} + enum {{enumName}} { + {{#allowableValues}} + {{#enumVars}} + {{{name}}} = {{{protobuf-enum-index}}}; + {{/enumVars}} + {{/allowableValues}} + } + + {{enumName}} {{name}} = {{vendorExtensions.x-protobuf-index}}; + {{/isEnum}} + + {{/vars}} +{{/oneOf}} +} +{{/isEnum}} +{{/model}} +{{/models}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenModelTest.java index 1dae17989113..128aea33b8e4 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenModelTest.java @@ -6,12 +6,14 @@ import io.swagger.models.properties.*; import org.testng.Assert; +import org.testng.annotations.Ignore; import org.testng.annotations.Test; @SuppressWarnings("static-method") public class KotlinMiskServerCodegenModelTest { @Test(description = "convert a simple java model") + @Ignore public void simpleModelTest() { final Model model = new ModelImpl() .description("a sample model") diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenTest.java index c7ed681873b3..5fa06eba02a3 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenTest.java @@ -5,6 +5,7 @@ import io.swagger.models.*; import io.swagger.parser.SwaggerParser; import org.testng.Assert; +import org.testng.annotations.Ignore; import org.testng.annotations.Test; public class KotlinMiskServerCodegenTest { @@ -12,6 +13,7 @@ public class KotlinMiskServerCodegenTest { KotlinMiskServerCodegen codegen = new KotlinMiskServerCodegen(); @Test + @Ignore public void shouldSucceed() throws Exception { // TODO: Complete this test. Assert.fail("Not implemented."); From 24a057e8183892ebce26bb7ad5633c8144289143 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Mon, 17 Mar 2025 15:45:57 +0000 Subject: [PATCH 006/102] fixing up content type --- .../src/main/resources/kotlin-misk/api.mustache | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/api.mustache index 47fd25696ef9..2ce171764789 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/api.mustache @@ -83,16 +83,12 @@ import kotlin.collections.Map @{{httpMethod}}("{{path}}") @Description("""{{{unescapedNotes}}}""") @AdminApiAccess - @RequestContentType(MediaType.APPLICATION_JSON) - @ResponseContentType(MediaTypes.APPLICATION_JSON) + @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( - value = ["{{#lambdaEscapeInNormalString}}{{{path}}}{{/lambdaEscapeInNormalString}}"]{{#singleContentTypes}}{{#hasProduces}}, - produces = [{{#vendorExtensions.x-accepts}}"{{{.}}}"{{^-last}}, {{/-last}}{{/vendorExtensions.x-accepts}}]{{/hasProduces}}{{#hasConsumes}}, - consumes = "{{{vendorExtensions.x-content-type}}}"{{/hasConsumes}}{{/singleContentTypes}}{{^singleContentTypes}}{{#hasProduces}}, - produces = [{{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}]{{/hasProduces}}{{#hasConsumes}}, - consumes = [{{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}}]{{/hasConsumes}}{{/singleContentTypes}} + value = ["{{#lambdaEscapeInNormalString}}{{{path}}}{{/lambdaEscapeInNormalString}}"] ) {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}} { TODO() From db1df42621265412251de484a276251d3d009c80 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Tue, 18 Mar 2025 07:26:59 +0000 Subject: [PATCH 007/102] adding controller impl --- .../languages/KotlinMiskServerCodegen.java | 7 +++-- .../{api.mustache => apiController.mustache} | 10 +++++-- .../resources/kotlin-misk/apiImpl.mustache | 26 +++++++++++++++++++ .../kotlin-misk/apiInterface.mustache | 19 ++++++++++++++ .../kotlin-misk/bodyParamsSimple.mustache | 1 + .../kotlin-misk/cookieParamsSimple.mustache | 1 + .../kotlin-misk/formParamsSimple.mustache | 1 + .../kotlin-misk/headerParamsSimple.mustache | 1 + .../kotlin-misk/pathParamsSimple.mustache | 1 + .../kotlin-misk/queryParamsSimple.mustache | 1 + 10 files changed, 64 insertions(+), 4 deletions(-) rename modules/openapi-generator/src/main/resources/kotlin-misk/{api.mustache => apiController.mustache} (93%) create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/bodyParamsSimple.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/cookieParamsSimple.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/formParamsSimple.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/headerParamsSimple.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/pathParamsSimple.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/queryParamsSimple.mustache diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index e56af5436035..972525b65b14 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -74,9 +74,11 @@ public KotlinMiskServerCodegen() { supportingFiles.clear(); apiTemplateFiles.clear(); - apiTemplateFiles.put("api.mustache", ".kt"); + apiTemplateFiles.put("apiController.mustache", "Controller.kt"); + apiTemplateFiles.put("apiImpl.mustache", "Impl.kt"); + apiTemplateFiles.put("apiInterface.mustache", ".kt"); - modelTemplateFiles.put("model.mustache", ".proto"); + //modelTemplateFiles.put("model.mustache", ".proto"); apiPackage = rootPackage + ".api"; modelPackage = rootPackage + ".model"; @@ -92,6 +94,7 @@ public KotlinMiskServerCodegen() { } + } diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/api.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache similarity index 93% rename from modules/openapi-generator/src/main/resources/kotlin-misk/api.mustache rename to modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 2ce171764789..253f01c1faa6 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/api.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -46,6 +46,9 @@ import misk.web.mediatype.MediaTypes import kotlin.collections.List import kotlin.collections.Map +import javax.inject.Inject +import javax.inject.Singleton + @RestController{{#beanQualifiers}}("{{package}}.{{classname}}Controller"){{/beanQualifiers}} {{#useBeanValidation}} @Validated @@ -59,7 +62,10 @@ import kotlin.collections.Map <%={{ }}=%> {{/useRequestMappingOnController}} {{#operations}} - class {{classname}}Controller({{#serviceInterface}}@Autowired(required = true) val service: {{classname}}Service{{/serviceInterface}}) { + @Singleton + class {{classname}}Controller @Inject constructor( + private val {{classname}} : {{classname}} + ) : {{classname}} { {{#operation}} {{#swagger2AnnotationLibrary}} @@ -91,7 +97,7 @@ import kotlin.collections.Map value = ["{{#lambdaEscapeInNormalString}}{{{path}}}{{/lambdaEscapeInNormalString}}"] ) {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}} { - TODO() + return {{classname}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) } {{/operation}} } diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache new file mode 100644 index 000000000000..5b87924fdcb1 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -0,0 +1,26 @@ +package {{package}} + +{{#imports}}import {{import}} +{{/imports}} + +import kotlin.collections.List +import kotlin.collections.Map + +import javax.inject.Inject +import javax.inject.Singleton + +/** + * @TODO("Fill out implementation") + */ +{{#operations}} +@Singleton +class {{classname}}Impl @Inject constructor( +): {{classname}} { +{{#operation}} + + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams2}}{{>pathParams2}}{{>headerParams2}}{{>cookieParams2}}{{>bodyParams}}{{>formParams2}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}} { + TODO() + } +{{/operation}} +} +{{/operations}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache new file mode 100644 index 000000000000..3f27a55d3121 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache @@ -0,0 +1,19 @@ +package {{package}} + +{{#imports}}import {{import}} +{{/imports}} + +import kotlin.collections.List +import kotlin.collections.Map + +import javax.inject.Inject +import javax.inject.Singleton + +{{#operations}} + interface {{classname}}({{#serviceInterface}}@Autowired(required = true) val service: {{classname}}Service{{/serviceInterface}}) { + {{#operation}} + + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>bodyParams}}{{>formParamsSimple}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}} + {{/operation}} + } +{{/operations}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParamsSimple.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParamsSimple.mustache new file mode 100644 index 000000000000..4cb77f3fb94f --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParamsSimple.mustache @@ -0,0 +1 @@ +{{#isBodyParam}}{{{paramName}}}: {{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}{{>optionalDataType}}{{/isArray}}{{#isArray}}Flow<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/cookieParamsSimple.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/cookieParamsSimple.mustache new file mode 100644 index 000000000000..4a4816548059 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/cookieParamsSimple.mustache @@ -0,0 +1 @@ +{{#isCookieParam}}{{{paramName}}}: {{>optionalDataType}}{{/isCookieParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/formParamsSimple.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/formParamsSimple.mustache new file mode 100644 index 000000000000..669c2abe8832 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/formParamsSimple.mustache @@ -0,0 +1 @@ +{{#isFormParam}}{{^isFile}} {{{paramName}}}: {{>optionalDataType}}{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/headerParamsSimple.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/headerParamsSimple.mustache new file mode 100644 index 000000000000..27f58dc5e87f --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/headerParamsSimple.mustache @@ -0,0 +1 @@ +{{#isHeaderParam}}{{{paramName}}}: {{>optionalDataType}}{{/isHeaderParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/pathParamsSimple.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/pathParamsSimple.mustache new file mode 100644 index 000000000000..be77bbbb04ae --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/pathParamsSimple.mustache @@ -0,0 +1 @@ +{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/queryParamsSimple.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/queryParamsSimple.mustache new file mode 100644 index 000000000000..03de7b47d6ae --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/queryParamsSimple.mustache @@ -0,0 +1 @@ +{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}} \ No newline at end of file From 2a5462967a005619f7a204d49e98c793213cf128 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Tue, 18 Mar 2025 07:38:20 +0000 Subject: [PATCH 008/102] cleanup interface --- .../resources/kotlin-misk/apiInterface.mustache | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache index 3f27a55d3121..d5ad27c2a2f8 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache @@ -6,14 +6,11 @@ package {{package}} import kotlin.collections.List import kotlin.collections.Map -import javax.inject.Inject -import javax.inject.Singleton - {{#operations}} - interface {{classname}}({{#serviceInterface}}@Autowired(required = true) val service: {{classname}}Service{{/serviceInterface}}) { - {{#operation}} +interface {{classname}} { +{{#operation}} - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>bodyParams}}{{>formParamsSimple}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}} - {{/operation}} - } + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>bodyParams}}{{>formParamsSimple}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}} +{{/operation}} +} {{/operations}} From 20e09d1088f672ec6cf1d6714ceed1039d0e9b99 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Tue, 18 Mar 2025 07:49:38 +0000 Subject: [PATCH 009/102] typo --- .../src/main/resources/kotlin-misk/apiInterface.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache index d5ad27c2a2f8..536a0b668575 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache @@ -10,7 +10,7 @@ import kotlin.collections.Map interface {{classname}} { {{#operation}} - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>bodyParams}}{{>formParamsSimple}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}} + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>bodyParamsSimple}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}): {{>returnTypes}} {{/operation}} } {{/operations}} From 02d053c2ee0bb769a6787e09168c6ce265460b34 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Tue, 18 Mar 2025 09:11:11 +0000 Subject: [PATCH 010/102] removing bodytype --- .../src/main/resources/kotlin-misk/apiImpl.mustache | 2 +- .../src/main/resources/kotlin-misk/apiInterface.mustache | 2 +- .../src/main/resources/kotlin-misk/bodyParamsSimple.mustache | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/bodyParamsSimple.mustache diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index 5b87924fdcb1..1300cb772c3d 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -18,7 +18,7 @@ class {{classname}}Impl @Inject constructor( ): {{classname}} { {{#operation}} - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams2}}{{>pathParams2}}{{>headerParams2}}{{>cookieParams2}}{{>bodyParams}}{{>formParams2}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}} { + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams2}}{{>pathParams2}}{{>headerParams2}}{{>cookieParams2}}{{>formParams2}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}} { TODO() } {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache index 536a0b668575..fba4642e96cf 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache @@ -10,7 +10,7 @@ import kotlin.collections.Map interface {{classname}} { {{#operation}} - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>bodyParamsSimple}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}): {{>returnTypes}} + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}): {{>returnTypes}} {{/operation}} } {{/operations}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParamsSimple.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParamsSimple.mustache deleted file mode 100644 index 4cb77f3fb94f..000000000000 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParamsSimple.mustache +++ /dev/null @@ -1 +0,0 @@ -{{#isBodyParam}}{{{paramName}}}: {{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}{{>optionalDataType}}{{/isArray}}{{#isArray}}Flow<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}} \ No newline at end of file From 4b2bcd04a5a1227d6ca697f15a82be74ca798133 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Tue, 18 Mar 2025 09:45:00 +0000 Subject: [PATCH 011/102] adding protos --- .../languages/KotlinMiskServerCodegen.java | 1 + .../kotlin-misk/partial_header.mustache | 19 ++++++++ .../main/resources/kotlin-misk/proto.mustache | 46 +++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/partial_header.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/proto.mustache diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 972525b65b14..6b675d1c933f 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -77,6 +77,7 @@ public KotlinMiskServerCodegen() { apiTemplateFiles.put("apiController.mustache", "Controller.kt"); apiTemplateFiles.put("apiImpl.mustache", "Impl.kt"); apiTemplateFiles.put("apiInterface.mustache", ".kt"); + apiTemplateFiles.put("proto.mustache", ".proto"); //modelTemplateFiles.put("model.mustache", ".proto"); diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/partial_header.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/partial_header.mustache new file mode 100644 index 000000000000..038e725751a7 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/partial_header.mustache @@ -0,0 +1,19 @@ +/* + {{#appName}} + {{{.}}} + + {{/appName}} + {{#appDescription}} + {{{.}}} + + {{/appDescription}} + {{#version}} + The version of the OpenAPI document: {{{.}}} + + {{/version}} + {{#infoEmail}} + Contact: {{{.}}} + + {{/infoEmail}} + Generated by OpenAPI Generator: https://openapi-generator.tech +*/ diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/proto.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/proto.mustache new file mode 100644 index 000000000000..4e4518615ac9 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/proto.mustache @@ -0,0 +1,46 @@ +{{>partial_header}} +syntax = "proto3"; + +package {{#lambda.lowercase}}{{{packageName}}}.{{{apiPackage}}}.{{{classname}}};{{/lambda.lowercase}} + +import "google/protobuf/empty.proto"; +{{#imports}} +{{#import}} +import public "{{{modelPackage}}}/{{{.}}}.proto"; +{{/import}} +{{/imports}} + +service {{classname}} { +{{#operations}} +{{#operation}} + {{#description}} + // {{{.}}} + {{/description}} + rpc {{operationId}} ({{#hasParams}}{{operationId}}Request{{/hasParams}}{{^hasParams}}google.protobuf.Empty{{/hasParams}}) returns ({{#vendorExtensions.x-grpc-response}}{{.}}{{/vendorExtensions.x-grpc-response}}{{^vendorExtensions.x-grpc-response}}{{operationId}}Response{{/vendorExtensions.x-grpc-response}}); + +{{/operation}} +{{/operations}} +} + +{{#operations}} +{{#operation}} +{{#hasParams}} +message {{operationId}}Request { + {{#allParams}} + {{#description}} + // {{{.}}} + {{/description}} + {{#vendorExtensions.x-protobuf-type}}{{.}} {{/vendorExtensions.x-protobuf-type}}{{vendorExtensions.x-protobuf-data-type}} {{paramName}} = {{vendorExtensions.x-protobuf-index}}{{#vendorExtensions.x-protobuf-json-name}} [json_name="{{vendorExtensions.x-protobuf-json-name}}"]{{/vendorExtensions.x-protobuf-json-name}}; + {{/allParams}} + +} + +{{/hasParams}} +{{^vendorExtensions.x-grpc-response}} +message {{operationId}}Response { + {{{vendorExtensions.x-grpc-response-type}}} data = 1; +} + +{{/vendorExtensions.x-grpc-response}} +{{/operation}} +{{/operations}} From aad809d20478c336d9d513fe41c7a74b49951bf8 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Tue, 18 Mar 2025 10:17:48 +0000 Subject: [PATCH 012/102] fixing 2 --- .../src/main/resources/kotlin-misk/apiImpl.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index 1300cb772c3d..6dc38c2c471c 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -18,7 +18,7 @@ class {{classname}}Impl @Inject constructor( ): {{classname}} { {{#operation}} - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams2}}{{>pathParams2}}{{>headerParams2}}{{>cookieParams2}}{{>formParams2}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}} { + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParams2}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}} { TODO() } {{/operation}} From 770898208fa7b77a5604a4dace4aa13a64f48b6e Mon Sep 17 00:00:00 2001 From: Guido Arnau Date: Tue, 18 Mar 2025 11:26:22 +0100 Subject: [PATCH 013/102] Fix headerParamsSimple --- .../openapitools/codegen/languages/KotlinMiskServerCodegen.java | 2 +- .../src/main/resources/kotlin-misk/apiImpl.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 6b675d1c933f..733de9f442ea 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -6,7 +6,7 @@ import org.openapitools.codegen.meta.GeneratorMetadata; import org.openapitools.codegen.meta.Stability; import org.openapitools.codegen.meta.features.*; - import org.slf4j.Logger; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index 6dc38c2c471c..07ccdcedcd7a 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -18,7 +18,7 @@ class {{classname}}Impl @Inject constructor( ): {{classname}} { {{#operation}} - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParams2}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}} { + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}} { TODO() } {{/operation}} From f78df8bc4d13f5bfdc7ae65ddf1c2656fc1df63f Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Tue, 18 Mar 2025 10:37:38 +0000 Subject: [PATCH 014/102] removing protos etc. --- .../languages/KotlinMiskServerCodegen.java | 1 - .../src/main/resources/kotlin-misk/Andrew.kt | 485 ------------------ .../kotlin-misk/partial_header.mustache | 19 - .../main/resources/kotlin-misk/proto.mustache | 46 -- 4 files changed, 551 deletions(-) delete mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/Andrew.kt delete mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/partial_header.mustache delete mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/proto.mustache diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 733de9f442ea..e8fc5f9d0612 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -77,7 +77,6 @@ public KotlinMiskServerCodegen() { apiTemplateFiles.put("apiController.mustache", "Controller.kt"); apiTemplateFiles.put("apiImpl.mustache", "Impl.kt"); apiTemplateFiles.put("apiInterface.mustache", ".kt"); - apiTemplateFiles.put("proto.mustache", ".proto"); //modelTemplateFiles.put("model.mustache", ".proto"); diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/Andrew.kt b/modules/openapi-generator/src/main/resources/kotlin-misk/Andrew.kt deleted file mode 100644 index d8feb6b3745e..000000000000 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/Andrew.kt +++ /dev/null @@ -1,485 +0,0 @@ -package com.squareup.cash.gaia.fdx.action - -import com.squareup.cash.gaia.AdminApiAccess -import com.squareup.protos.cash.fdx.model.v1.AccountContact -import com.squareup.protos.cash.fdx.model.v1.AccountPaymentNetworkList -import com.squareup.protos.cash.fdx.model.v1.AccountWithDetails -import com.squareup.protos.cash.fdx.model.v1.Accounts -import com.squareup.protos.cash.fdx.model.v1.AssetTransferNetworkList -import com.squareup.protos.cash.fdx.model.v1.ResultType -import com.squareup.protos.cash.fdx.model.v1.Statements -import com.squareup.protos.cash.fdx.model.v1.Transactions -import io.swagger.v3.oas.annotations.Parameter -import io.swagger.v3.oas.annotations.media.Schema -import javax.inject.Inject -import javax.inject.Singleton -import javax.validation.Valid -import javax.validation.constraints.Size -import misk.web.Description -import misk.web.Get -import misk.web.PathParam -import misk.web.QueryParam -import misk.web.RequestContentType -import misk.web.ResponseContentType -import misk.web.actions.WebAction -import misk.web.interceptors.LogRequestResponse -import misk.web.mediatype.MediaTypes - -/** - * Spring commented out. -@RestController -@Validated -@RequestMapping("\${api.base-path:/fdx/v6}") - */ -@Singleton -class AccountsApiAction @Inject constructor( -) : WebAction { - - - /** - * Spring commented out. - @Operation( - summary = "Retrieve account details", - operationId = "getAccount", - description = """Retrieve full details about the account identified by `{accountId}` parameter""", - responses = [ - ApiResponse( - responseCode = "200", - description = "This can be one of LoanAccount, DepositAccount, LineOfCreditAccount, InvestmentAccount, InsuranceAccount, AnnuityAccount, CommercialAccount, or DigitalWallet", - content = [Content(schema = Schema(implementation = AccountWithDetails::class))] - ), - ApiResponse( - responseCode = "404", - description = "Account with id not found", - content = [Content(schema = Schema(implementation = Error::class))] - ), - ApiResponse( - responseCode = "500", - description = "", - content = [Content(schema = Schema(implementation = Error::class))] - ), - ApiResponse( - responseCode = "501", - description = "", - content = [Content(schema = Schema(implementation = Error::class))] - ), - ApiResponse( - responseCode = "503", - description = "", - content = [Content(schema = Schema(implementation = Error::class))] - )] - ) - @RequestMapping( - method = [RequestMethod.GET], - value = ["/accounts/{accountId}"], - produces = ["application/json"] - ) - fun getAccount(@Parameter(description = "Account Identifier", required = true) @PathVariable("accountId") accountId: kotlin.String): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } - */ - @Get("/accounts/{accountId}") - @Description("Retrieve full details about the account identified by `{accountId}` parameter") - @AdminApiAccess - @RequestContentType(MediaTypes.APPLICATION_JSON) - @ResponseContentType(MediaTypes.APPLICATION_JSON) - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") - fun getAccount(@PathParam("accountId") accountId: String): AccountWithDetails { - TODO() - } -} - -/** - * Spring doc -@Operation( -summary = "Get asset transfer details for this account", -operationId = "getAccountAssetTransferNetworks", -description = """...""", -responses = [ -ApiResponse(responseCode = "200", description = "Information required to facilitate asset transfer from this account", content = [Content(schema = Schema(implementation = AssetTransferNetworkList::class))]) ] -) -@RequestMapping( -method = [RequestMethod.GET], -value = ["/accounts/{accountId}/asset-transfer-networks"], -produces = ["application/json"] -) -fun getAccountAssetTransferNetworks(@Parameter(description = "Account Identifier", required = true) @PathVariable("accountId") accountId: kotlin.String): ResponseEntity { -return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) -} - */ -@Get("/accounts/{accountId}/asset-transfer-networks") -@Description("Get asset transfer details for this account") -@AdminApiAccess -@RequestContentType(MediaTypes.APPLICATION_JSON) -@ResponseContentType(MediaTypes.APPLICATION_JSON) -@LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) -@Suppress("unused") -fun getAccountAssetTransferNetworks( - @Parameter(description = "Account Identifier", required = true) - @PathParam("accountId") accountId: String -): AssetTransferNetworkList { - TODO() -} - -/* - @Operation( - summary = "Get an account's contact information", - operationId = "getAccountContact", - description = """Get contact information on the account""", - responses = [ - ApiResponse(responseCode = "200", description = "Details used to verify an account", content = [Content(schema = Schema(implementation = AccountContact::class))]), - ApiResponse(responseCode = "404", description = "Account with id not found", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "500", description = "", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "501", description = "", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "503", description = "", content = [Content(schema = Schema(implementation = Error::class))]) ] - ) - @RequestMapping( - method = [RequestMethod.GET], - value = ["/accounts/{accountId}/contact"], - produces = ["application/json"] - ) - fun getAccountContact(@Parameter(description = "Account Identifier", required = true) @PathVariable("accountId") accountId: kotlin.String): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) - } - */ -@Get("/accounts/{accountId}/contact") -@Description("Get contact information on the account") -@AdminApiAccess -@RequestContentType(MediaTypes.APPLICATION_JSON) -@ResponseContentType(MediaTypes.APPLICATION_JSON) -@LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) -@Suppress("unused") -fun getAccountContact( - @Parameter(description = "Account Identifier", required = true) - @PathParam("accountId") - accountId: String -): AccountContact { - TODO() -} - -/* -@Operation( - summary = "Get payment networks supported by the account", - operationId = "getAccountPaymentNetworks", - description = """Get payment networks supported by the account""", - responses = [ - ApiResponse(responseCode = "200", description = "Information required to execute a payment transaction against this account", content = [Content(schema = Schema(implementation = AccountPaymentNetworkList::class))]), - ApiResponse(responseCode = "404", description = "Account with id not found", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "500", description = "", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "501", description = "", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "503", description = "", content = [Content(schema = Schema(implementation = Error::class))]) ] -) -@RequestMapping( - method = [RequestMethod.GET], - value = ["/accounts/{accountId}/payment-networks"], - produces = ["application/json"] -) -fun getAccountPaymentNetworks(@Parameter(description = "Account Identifier", required = true) @PathVariable("accountId") accountId: kotlin.String,@Parameter(description = "Opaque cursor used by the provider to send the next set of records") @Valid @RequestParam(value = "offset", required = false) offset: kotlin.String?,@Parameter(description = "Number of elements that the consumer wishes to receive. Providers should implement reasonable default/maximum/minimum values based on their internal architecture and update their documentation accordingly") @Valid @RequestParam(value = "limit", required = false) limit: kotlin.Int?): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) -} - */ -@Get("/accounts/{accountId}/payment-networks") -@Description("Get payment networks supported by the account") -@AdminApiAccess -@RequestContentType(MediaTypes.APPLICATION_JSON) -@ResponseContentType(MediaTypes.APPLICATION_JSON) -@LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) -@Suppress("unused") -fun getAccountPaymentNetworks( - @Parameter(description = "Account Identifier", required = true) - @PathParam("accountId") - accountId: String, - - @Parameter(description = "Opaque cursor used by the provider to send the next set of records", required = false) - @Valid - @QueryParam(value = "offset") - offset: kotlin.String?, - - @Parameter(description = "Number of elements that the consumer wishes to receive. Providers should implement reasonable default/maximum/minimum values based on their internal architecture and update their documentation accordingly", required = false) - @Valid - @QueryParam(value = "limit") - limit: Int? -): AccountPaymentNetworkList { - TODO() -} - -/* -@Operation( - summary = "Get an account statement", - operationId = "getAccountStatement", - description = """Gets an account statement image file. Use [HTTP Accept request-header](https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html) to specify desired content types. See ContentTypes definition for typical values""", - responses = [ - ApiResponse(responseCode = "200", description = "An image of an account statement", content = [Content(schema = Schema(implementation = org.springframework.core.io.Resource::class))]), - ApiResponse(responseCode = "302", description = "Statement is available at specified location. URL is returned via the `Location` HTTP header"), - ApiResponse(responseCode = "400", description = "Statement is processing and is not yet available", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "404", description = "When account is present with no statements in it", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "406", description = "", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "500", description = "", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "501", description = "", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "503", description = "", content = [Content(schema = Schema(implementation = Error::class))]) ] -) -@RequestMapping( - method = [RequestMethod.GET], - value = ["/accounts/{accountId}/statements/{statementId}"], - produces = ["application/pdf", "image/gif", "image/jpeg", "image/tiff", "image/png", "application/json"] -) -fun getAccountStatement(@Parameter(description = "Account Identifier", required = true) @PathVariable("accountId") accountId: kotlin.String,@Parameter(description = "Statement Identifier", required = true) @PathVariable("statementId") statementId: kotlin.String): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) -} -*/ -@Get("/accounts/{accountId}/statements/{statementId}") -@Description("""Gets an account statement image file. Use [HTTP Accept request-header](https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html) to specify desired content types. See ContentTypes definition for typical values""") -@AdminApiAccess -@RequestContentType(MediaTypes.APPLICATION_JSON) -@ResponseContentType( - MediaTypes.IMAGE_GIF, - MediaTypes.IMAGE_JPEG, - MediaTypes.IMAGE_PNG, - MediaTypes.APPLICATION_JSON -) -@LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) -@Suppress("unused") -fun getAccountStatement( - @Parameter(description = "Account Identifier", required = true) - @PathParam("accountId") - accountId: String, - - @Parameter(description = "Statement Identifier", required = true) - @QueryParam("statementId") - statementId: String -): ByteArray { // TODO how do we return a file etc. - TODO() -} - -/* -@Operation( - summary = "Get account transaction image", - operationId = "getAccountTransactionImages", - description = """Get account transaction image""", - responses = [ - ApiResponse(responseCode = "200", description = "An image of transaction (such as a scanned check)", content = [Content(schema = Schema(implementation = org.springframework.core.io.Resource::class))]), - ApiResponse(responseCode = "404", description = "Account or image with id not found", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "406", description = "", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "500", description = "", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "501", description = "", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "503", description = "", content = [Content(schema = Schema(implementation = Error::class))]) ] -) -@RequestMapping( - method = [RequestMethod.GET], - value = ["/accounts/{accountId}/transaction-images/{imageId}"], - produces = ["application/pdf", "image/gif", "image/jpeg", "image/tiff", "image/png", "application/json"] -) -fun getAccountTransactionImages(@Parameter(description = "Account Identifier", required = true) @PathVariable("accountId") accountId: kotlin.String,@Parameter(description = "Image Identifier", required = true) @PathVariable("imageId") imageId: kotlin.String): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) -} - - */ -@Get("/accounts/{accountId}/transaction-images/{imageId}") -@Description("Get account transaction image") -@AdminApiAccess -@RequestContentType(MediaTypes.APPLICATION_JSON) -@ResponseContentType( - MediaTypes.IMAGE_GIF, - MediaTypes.IMAGE_JPEG, - MediaTypes.IMAGE_PNG, - MediaTypes.APPLICATION_JSON -) -@LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) -@Suppress("unused") -fun getAccountTransactionImages( - @Parameter(description = "Account Identifier", required = true) - @PathParam("accountId") - accountId: kotlin.String, - - @Parameter(description = "Image Identifier", required = true) - @PathParam("imageId") - imageId: String -): ByteArray { - TODO() -} - -/* -@Operation( - summary = "Search for statements", - operationId = "searchForAccountStatements", - description = """Get account statements. Example: GET /accounts/{accountId}/statements?startTime=value1&endTime=value2""", - responses = [ - ApiResponse(responseCode = "200", description = "Paginated list of available statements", content = [Content(schema = Schema(implementation = Statements::class))]), - ApiResponse(responseCode = "400", description = "Start or end date value is not in the ISO 8601 format", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "404", description = "Account with id not found", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "500", description = "", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "501", description = "", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "503", description = "", content = [Content(schema = Schema(implementation = Error::class))]) ] -) -@RequestMapping( - method = [RequestMethod.GET], - value = ["/accounts/{accountId}/statements"], - produces = ["application/json"] -) -fun searchForAccountStatements(@Parameter(description = "Account Identifier", required = true) @PathVariable("accountId") accountId: kotlin.String,@Size(max=10) @Parameter(description = "Start time for use in retrieval of elements (ISO 8601)") @Valid @RequestParam(value = "startTime", required = false) @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE) startTime: java.time.LocalDate?,@Size(max=10) @Parameter(description = "End time for use in retrieval of elements (ISO 8601)") @Valid @RequestParam(value = "endTime", required = false) @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE) endTime: java.time.LocalDate?,@Parameter(description = "Opaque cursor used by the provider to send the next set of records") @Valid @RequestParam(value = "offset", required = false) offset: kotlin.String?,@Parameter(description = "Number of elements that the consumer wishes to receive. Providers should implement reasonable default/maximum/minimum values based on their internal architecture and update their documentation accordingly") @Valid @RequestParam(value = "limit", required = false) limit: kotlin.Int?): ResponseEntity { - return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) -} -*/ -@Get("/accounts/{accountId}/statements") -@Description("""Get account statements. Example: GET /accounts/{accountId}/statements?startTime=value1&endTime=value2""") -@AdminApiAccess -@RequestContentType(MediaTypes.APPLICATION_JSON) -@ResponseContentType(MediaTypes.APPLICATION_JSON) -@LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) -@Suppress("unused") -fun searchForAccountStatements( - @Parameter(description = "Account Identifier", required = true) - @PathParam("accountId") - accountId: String, - - @Size(max=10) - @Parameter(description = "Start time for use in retrieval of elements (ISO 8601)", required = false) - @Valid - @QueryParam(value = "startTime") - //@org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE) - startTime: java.time.LocalDate?, - - @Size(max=10) - @Parameter(description = "End time for use in retrieval of elements (ISO 8601)", required = false) - @Valid - @QueryParam(value = "endTime") - //@org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE) - endTime: java.time.LocalDate?, - - @Parameter(description = "Opaque cursor used by the provider to send the next set of records", required = false) - @Valid - @QueryParam(value = "offset") - offset: String?, - - @Parameter(description = "Number of elements that the consumer wishes to receive. Providers should implement reasonable default/maximum/minimum values based on their internal architecture and update their documentation accordingly", required = false) - @Valid - @QueryParam(value = "limit") - limit: Int?): Statements { - TODO() -} - -/* -@Operation( - summary = "Search for account transactions", - operationId = "searchForAccountTransactions", - description = """Search for account transactions. Example: /accounts/{accountId}/transactions?startTime=value1&endTime=value2""", - responses = [ - ApiResponse(responseCode = "200", description = "Paginated collection of transactions, which can be one of DepositTransaction, LoanTransaction, LineOfCreditTransaction, InvestmentTransaction, InsuranceTransaction, CommercialTransaction, or DigitalWalletTransaction", content = [Content(schema = Schema(implementation = Transactions::class))]), - ApiResponse(responseCode = "400", description = "Start or end date value is not in the ISO 8601 format", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "404", description = "Account with id not found", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "500", description = "", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "501", description = "", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "503", description = "", content = [Content(schema = Schema(implementation = Error::class))]) ] -) -@RequestMapping( - method = [RequestMethod.GET], - value = ["/accounts/{accountId}/transactions"], - produces = ["application/json"] -) - */ -@Get("/accounts/{accountId}/transactions") -@Description("""Search for account transactions. Example: /accounts/{accountId}/transactions?startTime=value1&endTime=value2""") -@AdminApiAccess -@RequestContentType(MediaTypes.APPLICATION_JSON) -@ResponseContentType(MediaTypes.APPLICATION_JSON) -@LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) -@Suppress("unused") -fun searchForAccountTransactions( - @Parameter(description = "Account Identifier", required = true) - @PathParam("accountId") - accountId:String, - - @Size(max=10) - @Parameter(description = "Start time for use in retrieval of elements (ISO 8601)", required = false) - @Valid - @QueryParam(value = "startTime") - //@org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE) - startTime: java.time.LocalDate?, - - @Size(max=10) - @Parameter(description = "End time for use in retrieval of elements (ISO 8601)", required = false) - @Valid - @QueryParam(value = "endTime") - //@org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE) - endTime: java.time.LocalDate?, - - @Parameter(description = "Opaque cursor used by the provider to send the next set of records", required = false) - @Valid - @QueryParam(value = "offset") - offset: String?, - - @Parameter(description = "Number of elements that the consumer wishes to receive. Providers should implement reasonable default/maximum/minimum values based on their internal architecture and update their documentation accordingly", required = false) - @Valid - @QueryParam(value = "limit") - limit: Int? -): Transactions { - TODO() -} - -/* -@Operation( - summary = "Search for accounts", - operationId = "searchForAccounts", - description = """Return information for all of the customer's consented accounts or just those accounts identified in the `accountIds` request parameter. Use `ResultTypeQuery` parameter value of `lightweight` to retrieve minimal descriptive information and the `accountId` for each account. The `accountId` can then be used in the `getAccount` operation's path `/accounts/{accountId}` to retrieve full details about each account""", - responses = [ - ApiResponse(responseCode = "200", description = "Array of accounts (DepositAccount, LoanAccount, LineOfCreditAccount, InvestmentAccount, InsuranceAccount, AnnuityAccount, CommercialAccount, or DigitalWallet)", content = [Content(schema = Schema(implementation = Accounts::class))]), - ApiResponse(responseCode = "400", description = "Start or end date value is not in the ISO 8601 format", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "404", description = "", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "500", description = "", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "501", description = "", content = [Content(schema = Schema(implementation = Error::class))]), - ApiResponse(responseCode = "503", description = "", content = [Content(schema = Schema(implementation = Error::class))]) ] -) -@RequestMapping( - method = [RequestMethod.GET], - value = ["/accounts"], - produces = ["application/json"] -) -*/ -@AdminApiAccess -@Description("""Return information for all of the customer's consented accounts or just those accounts identified in the `accountIds` request parameter. Use `ResultTypeQuery` parameter value of `lightweight` to retrieve minimal descriptive information and the `accountId` for each account. The `accountId` can then be used in the `getAccount` operation's path `/accounts/{accountId}` to retrieve full details about each account""${'"'},""") -@Get("/accounts") -@RequestContentType(MediaTypes.APPLICATION_JSON) -@ResponseContentType(MediaTypes.APPLICATION_JSON) -@LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) -@Suppress("unused") -fun searchForAccounts( - @Parameter(description = "Comma separated list of account ids", required = false) - @Valid - @QueryParam(value = "accountIds") - accountIds: List?, - - @Parameter(description = "Start time for use in retrieval of transactions", required = false) - @Valid - @QueryParam(value = "startTime") - startTime: List?, - - @Parameter(description = "End time for use in retrieval of transactions", required = false) - @Valid - @QueryParam(value = "endTime") - endTime: List?, - - @Parameter(description = "Flag to indicate if you want a lightweight array of metadata (AccountDescriptor or Tax or Operations) or full item details (Account or a Tax subclass or Availability details). If set to 'lightweight', should only return the fields associated with the metadata entity. This field is not required, defaults to lightweight", - schema = Schema( - allowableValues = ["details", "lightweight"], - defaultValue = "lightweight" - ) - ) - @Valid - @QueryParam(value = "resultType") - resultType: ResultType, - - @Parameter(description = "Opaque cursor used by the provider to send the next set of records", required = false) - @Valid - @QueryParam(value = "offset") - offset: String?, - - @Parameter(description = "Number of elements that the consumer wishes to receive. Providers should implement reasonable default/maximum/minimum values based on their internal architecture and update their documentation accordingly", required = false) - @Valid - @QueryParam(value = "limit") - limit: Int? -): Accounts { - TODO() -} - - diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/partial_header.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/partial_header.mustache deleted file mode 100644 index 038e725751a7..000000000000 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/partial_header.mustache +++ /dev/null @@ -1,19 +0,0 @@ -/* - {{#appName}} - {{{.}}} - - {{/appName}} - {{#appDescription}} - {{{.}}} - - {{/appDescription}} - {{#version}} - The version of the OpenAPI document: {{{.}}} - - {{/version}} - {{#infoEmail}} - Contact: {{{.}}} - - {{/infoEmail}} - Generated by OpenAPI Generator: https://openapi-generator.tech -*/ diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/proto.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/proto.mustache deleted file mode 100644 index 4e4518615ac9..000000000000 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/proto.mustache +++ /dev/null @@ -1,46 +0,0 @@ -{{>partial_header}} -syntax = "proto3"; - -package {{#lambda.lowercase}}{{{packageName}}}.{{{apiPackage}}}.{{{classname}}};{{/lambda.lowercase}} - -import "google/protobuf/empty.proto"; -{{#imports}} -{{#import}} -import public "{{{modelPackage}}}/{{{.}}}.proto"; -{{/import}} -{{/imports}} - -service {{classname}} { -{{#operations}} -{{#operation}} - {{#description}} - // {{{.}}} - {{/description}} - rpc {{operationId}} ({{#hasParams}}{{operationId}}Request{{/hasParams}}{{^hasParams}}google.protobuf.Empty{{/hasParams}}) returns ({{#vendorExtensions.x-grpc-response}}{{.}}{{/vendorExtensions.x-grpc-response}}{{^vendorExtensions.x-grpc-response}}{{operationId}}Response{{/vendorExtensions.x-grpc-response}}); - -{{/operation}} -{{/operations}} -} - -{{#operations}} -{{#operation}} -{{#hasParams}} -message {{operationId}}Request { - {{#allParams}} - {{#description}} - // {{{.}}} - {{/description}} - {{#vendorExtensions.x-protobuf-type}}{{.}} {{/vendorExtensions.x-protobuf-type}}{{vendorExtensions.x-protobuf-data-type}} {{paramName}} = {{vendorExtensions.x-protobuf-index}}{{#vendorExtensions.x-protobuf-json-name}} [json_name="{{vendorExtensions.x-protobuf-json-name}}"]{{/vendorExtensions.x-protobuf-json-name}}; - {{/allParams}} - -} - -{{/hasParams}} -{{^vendorExtensions.x-grpc-response}} -message {{operationId}}Response { - {{{vendorExtensions.x-grpc-response-type}}} data = 1; -} - -{{/vendorExtensions.x-grpc-response}} -{{/operation}} -{{/operations}} From bb2c3bd4442d22d381c58a7b7625a7da7bb9c92b Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Tue, 18 Mar 2025 10:43:39 +0000 Subject: [PATCH 015/102] fixing imports --- .../codegen/languages/KotlinMiskServerCodegen.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index e8fc5f9d0612..a3bbb65bc455 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -5,7 +5,12 @@ import org.openapitools.codegen.SupportingFile; import org.openapitools.codegen.meta.GeneratorMetadata; import org.openapitools.codegen.meta.Stability; -import org.openapitools.codegen.meta.features.*; +import org.openapitools.codegen.meta.features.DocumentationFeature; +import org.openapitools.codegen.meta.features.GlobalFeature; +import org.openapitools.codegen.meta.features.ParameterFeature; +import org.openapitools.codegen.meta.features.SchemaSupportFeature; +import org.openapitools.codegen.meta.features.SecurityFeature; +import org.openapitools.codegen.meta.features.WireFormatFeature; import org.slf4j.Logger; import org.slf4j.LoggerFactory; From fbd2ffea11dfe9598fde751a99e5e223c19f1eed Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Tue, 18 Mar 2025 10:45:24 +0000 Subject: [PATCH 016/102] removing commented code --- .../openapitools/codegen/languages/KotlinMiskServerCodegen.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index a3bbb65bc455..f331e706f2a9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -83,8 +83,6 @@ public KotlinMiskServerCodegen() { apiTemplateFiles.put("apiImpl.mustache", "Impl.kt"); apiTemplateFiles.put("apiInterface.mustache", ".kt"); - //modelTemplateFiles.put("model.mustache", ".proto"); - apiPackage = rootPackage + ".api"; modelPackage = rootPackage + ".model"; artifactId = "openapi-kotlin-misk-server"; From 5b032544b8fef8330dec0b90e1931e7cb72ca2da Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Tue, 18 Mar 2025 12:09:16 +0000 Subject: [PATCH 017/102] fixing imports --- .../kotlin-misk/apiController.mustache | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 253f01c1faa6..ae68ad13b8cc 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -19,15 +19,6 @@ package {{package}} import io.swagger.annotations.AuthorizationScope {{/swagger1AnnotationLibrary}} -import misk.web.Get -import misk.web.PathParam -import misk.web.QueryParam -import misk.web.RequestContentType -import misk.web.ResponseContentType -import misk.web.actions.WebAction -import misk.web.interceptors.LogRequestResponse -import misk.web.mediatype.MediaTypes - {{#useBeanValidation}} import {{javaxPackage}}.validation.Valid import {{javaxPackage}}.validation.constraints.DecimalMax @@ -48,19 +39,25 @@ import kotlin.collections.Map import javax.inject.Inject import javax.inject.Singleton +import misk.web.Delete +import misk.web.Description +import misk.web.Get +import misk.web.PathParam +import misk.web.Post +import misk.web.Put +import misk.web.QueryParam +import misk.web.RequestBody +import misk.web.RequestContentType +import misk.web.ResponseContentType +import misk.web.interceptors.LogRequestResponse +import misk.web.mediatype.MediaTypes -@RestController{{#beanQualifiers}}("{{package}}.{{classname}}Controller"){{/beanQualifiers}} {{#useBeanValidation}} @Validated {{/useBeanValidation}} {{#swagger1AnnotationLibrary}} @Api(value = "{{{baseName}}}", description = "The {{{baseName}}} API") {{/swagger1AnnotationLibrary}} -{{#useRequestMappingOnController}} - {{=<% %>=}} - @RequestMapping("\${api.base-path:<%contextPath%>}") - <%={{ }}=%> -{{/useRequestMappingOnController}} {{#operations}} @Singleton class {{classname}}Controller @Inject constructor( From 97f995e5ad078d8c328e4ccf501624c4f344bd57 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Tue, 18 Mar 2025 12:22:51 +0000 Subject: [PATCH 018/102] fixing return --- .../src/main/resources/kotlin-misk/apiController.mustache | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index ae68ad13b8cc..51f69e40e0d6 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -93,9 +93,8 @@ import misk.web.mediatype.MediaTypes @RequestMapping( value = ["{{#lambdaEscapeInNormalString}}{{{path}}}{{/lambdaEscapeInNormalString}}"] ) - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}} { - return {{classname}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) - } + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}} = + {{classname}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) {{/operation}} } {{/operations}} From dc2b5240ad2b85f50bdf73f7fca6d38de3112def Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Tue, 18 Mar 2025 13:15:09 +0000 Subject: [PATCH 019/102] fixing file --- .../src/main/resources/kotlin-misk/apiController.mustache | 7 ++++++- .../main/resources/kotlin-misk/optionalDataType.mustache | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 51f69e40e0d6..89a121b3c8a5 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -39,8 +39,12 @@ import kotlin.collections.Map import javax.inject.Inject import javax.inject.Singleton + +// TODO("Only import what we need") import misk.web.Delete import misk.web.Description +import misk.web.FormField +import misk.web.FormValue import misk.web.Get import misk.web.PathParam import misk.web.Post @@ -49,6 +53,7 @@ import misk.web.QueryParam import misk.web.RequestBody import misk.web.RequestContentType import misk.web.ResponseContentType +import misk.web.actions.WebAction import misk.web.interceptors.LogRequestResponse import misk.web.mediatype.MediaTypes @@ -62,7 +67,7 @@ import misk.web.mediatype.MediaTypes @Singleton class {{classname}}Controller @Inject constructor( private val {{classname}} : {{classname}} - ) : {{classname}} { + ) : {{classname}}, WebAction { {{#operation}} {{#swagger2AnnotationLibrary}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/optionalDataType.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/optionalDataType.mustache index a6b059b8632a..c87ca04754d9 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/optionalDataType.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/optionalDataType.mustache @@ -1 +1 @@ -{{^isFile}}{{{dataType}}}{{^required}}{{^defaultValue}}?{{/defaultValue}}{{/required}}{{/isFile}}{{#isFile}}{{#isArray}}Array<{{/isArray}}org.springframework.web.multipart.MultipartFile{{#isArray}}>{{/isArray}}{{^isArray}}{{^required}}?{{/required}}{{/isArray}}{{/isFile}} \ No newline at end of file +{{#isFile}}HttpCall{{/isFile}} \ No newline at end of file From d98953cd95f83d3cc91ba1c497f6a8fab80ef7e8 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Tue, 18 Mar 2025 13:25:47 +0000 Subject: [PATCH 020/102] adding comment --- .../src/main/resources/kotlin-misk/apiController.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 89a121b3c8a5..81f6e97c16e1 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -40,7 +40,7 @@ import kotlin.collections.Map import javax.inject.Inject import javax.inject.Singleton -// TODO("Only import what we need") +{{! TODO("Only import what we need") }} import misk.web.Delete import misk.web.Description import misk.web.FormField From 1da1a68cc0d0ca488888bdd54551b7db610eb2df Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Tue, 18 Mar 2025 13:28:48 +0000 Subject: [PATCH 021/102] remove adminapi --- .../src/main/resources/kotlin-misk/apiController.mustache | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 81f6e97c16e1..106bd8ec5ca4 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -90,7 +90,6 @@ 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}}}""") - @AdminApiAccess @RequestContentType({{#hasConsumes}}{{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}}{{/hasConsumes}}) @ResponseContentType({{#hasProduces}}{{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}}{{/hasProduces}}) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) From b1fce2097a04d630af41768cff792a3a7985ecdf Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Tue, 18 Mar 2025 13:44:08 +0000 Subject: [PATCH 022/102] move to jakarta --- .../src/main/resources/kotlin-misk/apiController.mustache | 4 ++-- .../src/main/resources/kotlin-misk/apiImpl.mustache | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 106bd8ec5ca4..a9b06366d4f5 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -37,8 +37,8 @@ package {{package}} import kotlin.collections.List import kotlin.collections.Map -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton {{! TODO("Only import what we need") }} import misk.web.Delete diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index 07ccdcedcd7a..930bda07c19f 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -6,8 +6,8 @@ package {{package}} import kotlin.collections.List import kotlin.collections.Map -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * @TODO("Fill out implementation") From 2fe8aca61d38dec61bc91cfa153ccd1eff92559b Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Tue, 18 Mar 2025 14:22:36 +0000 Subject: [PATCH 023/102] reverting break --- .../src/main/resources/kotlin-misk/optionalDataType.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/optionalDataType.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/optionalDataType.mustache index c87ca04754d9..61b14936af59 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/optionalDataType.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/optionalDataType.mustache @@ -1 +1 @@ -{{#isFile}}HttpCall{{/isFile}} \ No newline at end of file +{{^isFile}}{{{dataType}}}{{^required}}{{^defaultValue}}?{{/defaultValue}}{{/required}}{{/isFile}}{{#isFile}}{{#isArray}}Array<{{/isArray}}HttpCall{{#isArray}}>{{/isArray}}{{^isArray}}{{^required}}{{/required}}{{/isArray}}{{/isFile}} \ No newline at end of file From 7622409799697f7978990424544b59942339cce4 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Tue, 18 Mar 2025 15:12:46 +0000 Subject: [PATCH 024/102] fixing httpMethods --- .../languages/KotlinMiskServerCodegen.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index f331e706f2a9..12b4cbf2f17b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -1,6 +1,7 @@ package org.openapitools.codegen.languages; import org.openapitools.codegen.CodegenConstants; +import org.openapitools.codegen.CodegenOperation; import org.openapitools.codegen.CodegenType; import org.openapitools.codegen.SupportingFile; import org.openapitools.codegen.meta.GeneratorMetadata; @@ -11,11 +12,18 @@ import org.openapitools.codegen.meta.features.SchemaSupportFeature; import org.openapitools.codegen.meta.features.SecurityFeature; import org.openapitools.codegen.meta.features.WireFormatFeature; +import org.openapitools.codegen.model.ModelMap; +import org.openapitools.codegen.model.OperationMap; +import org.openapitools.codegen.model.OperationsMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; import java.util.EnumSet; +import java.util.List; +import java.util.Locale; + +import static org.openapitools.codegen.utils.StringUtils.camelize; public class KotlinMiskServerCodegen extends AbstractKotlinCodegen { @@ -97,7 +105,17 @@ public KotlinMiskServerCodegen() { } - + @Override + public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List allModels) { + OperationMap objectMap = objs.getOperations(); + List operations = objectMap.getOperation(); + + for (CodegenOperation operation : operations) { + // http method verb conversion (e.g. PUT => Put) + operation.httpMethod = camelize(operation.httpMethod.toLowerCase(Locale.ROOT)); + } + return objs; + } } From 7b6ac072892a8b0638a7680cb5813aee233ca0a2 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Tue, 18 Mar 2025 16:33:44 +0000 Subject: [PATCH 025/102] pushing mediaTypes --- .../languages/KotlinMiskServerCodegen.java | 29 +++++++++++++++++++ .../kotlin-misk/apiController.mustache | 4 +-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 12b4cbf2f17b..a4208c3d943e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/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 operations = objectMap.getOperation(); for (CodegenOperation operation : operations) { + + if (operation.hasConsumes) { + for (Map consumes : operation.consumes) { + consumes.computeIfPresent("mediaType", (__, mediaType) -> mapMediaType(mediaType)); + } + } + + if (operation.hasProduces) { + for (Map 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 MEDIA_MAPPING = getMappings(); + + private static Map getMappings() { + Map result = new HashMap<>(); + // @todo add others as needed + result.put("application/json", "MediaTypes.APPLICATION_JSON"); + result.put("application/xml", "MediaTypes.APPLICATION_XML"); + return result; + } } diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index a9b06366d4f5..93b26353f7f3 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/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( From cbacdbdb30d5c6cca63008302aeb0ac6f15e9027 Mon Sep 17 00:00:00 2001 From: Guido Arnau Date: Mon, 17 Mar 2025 19:39:43 +0100 Subject: [PATCH 026/102] Adds gradle mustache templates --- .../kotlin-misk/build.gradle.mustache | 38 +++++++++++++++++++ .../kotlin-misk/proto.gradle.mustache | 17 +++++++++ 2 files changed, 55 insertions(+) create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/proto.gradle.mustache diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.mustache new file mode 100644 index 000000000000..b8d7941fd565 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.mustache @@ -0,0 +1,38 @@ +plugins { + id 'org.jetbrains.kotlin.jvm' version '1.8.20' + id 'com.squareup.wire' version '4.9.1' +} + +group '{{groupId}}' +version '{{artifactVersion}}' + +repositories { + mavenCentral() +} + +dependencies { + implementation 'com.squareup.misk:misk:{{miskVersion}}' + implementation 'com.squareup.wire:wire-runtime:4.9.1' + implementation 'com.squareup.wire:wire-moshi-adapter:4.9.1' + + testImplementation 'junit:junit:4.13.2' + testImplementation 'com.squareup.misk:misk-testing:{{miskVersion}}' +} + +wire { + kotlin { + rpcCallStyle = 'suspending' + singleMethodServices = true + protoPath { + srcDir 'proto' + } + } +} + +tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { + kotlinOptions { + jvmTarget = '17' + } +} + +apply from: 'proto.gradle' \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/proto.gradle.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/proto.gradle.mustache new file mode 100644 index 000000000000..825e2311f3a4 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/proto.gradle.mustache @@ -0,0 +1,17 @@ +// Wire-specific configuration +wire { + kotlin { + javaInterop = true + nameSuffix = 'Proto' + } +} + +// Clean task for generated code +tasks.register('cleanGeneratedCode', Delete) { + delete fileTree("${projectDir}/proto") { + include '**/*.proto' + } + delete fileTree("${projectDir}/src/main/kotlin") { + include '**/wire/**/*.kt' + } +} \ No newline at end of file From 48b3c2daf6a7ba8af93480b843784253ff22c991 Mon Sep 17 00:00:00 2001 From: Guido Arnau Date: Tue, 18 Mar 2025 17:14:08 +0100 Subject: [PATCH 027/102] Setup simple build.gradle.kts --- .../languages/KotlinMiskServerCodegen.java | 20 ++++-- .../kotlin-misk/build.gradle.kts.mustache | 42 +++++++++++ .../kotlin-misk/build.gradle.mustache | 38 ---------- .../main/resources/kotlin-misk/model.mustache | 70 +++++++------------ .../kotlin-misk/proto.gradle.mustache | 17 ----- .../kotlin-misk/settings.gradle.kts.mustache | 15 ++++ 6 files changed, 94 insertions(+), 108 deletions(-) create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache delete mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.mustache delete mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/proto.gradle.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/settings.gradle.kts.mustache diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index a4208c3d943e..2b2a8c5f73f9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -33,7 +33,6 @@ public class KotlinMiskServerCodegen extends AbstractKotlinCodegen { protected String apiVersion = "1.0.0-SNAPSHOT"; public static final String ROOT_PACKAGE = "rootPackage"; - public static final String PROJECT_NAME = "projectName"; final Logger LOGGER = LoggerFactory.getLogger(KotlinMiskServerCodegen.class); @@ -50,7 +49,7 @@ public String getName() { @Override public String getHelp() { - return "Generates a kotlin-misk server."; + return "Generates a kotlin-misk server with Protocol Buffers models."; } public KotlinMiskServerCodegen() { @@ -58,7 +57,7 @@ public KotlinMiskServerCodegen() { modifyFeatureSet(features -> features .includeDocumentationFeatures(DocumentationFeature.Readme) - .wireFormatFeatures(EnumSet.of(WireFormatFeature.JSON, WireFormatFeature.XML)) + .wireFormatFeatures(EnumSet.of(WireFormatFeature.PROTOBUF)) .securityFeatures(EnumSet.noneOf( SecurityFeature.class )) @@ -92,6 +91,8 @@ public KotlinMiskServerCodegen() { apiTemplateFiles.put("apiController.mustache", "Controller.kt"); apiTemplateFiles.put("apiImpl.mustache", "Impl.kt"); apiTemplateFiles.put("apiInterface.mustache", ".kt"); + //modelTemplateFiles.put("model.mustache", ".proto"); + modelTemplateFiles.put("model.mustache", ".kt"); apiPackage = rootPackage + ".api"; modelPackage = rootPackage + ".model"; @@ -102,9 +103,16 @@ public KotlinMiskServerCodegen() { updateOption(CodegenConstants.MODEL_PACKAGE, modelPackage); additionalProperties.put(ROOT_PACKAGE, rootPackage); - //supportingFiles.add(new SupportingFile("pom.mustache", "", "pom.xml")); + // Add supporting files supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); - + supportingFiles.add(new SupportingFile("build.gradle.kts.mustache", "", "build.gradle.kts")); + supportingFiles.add(new SupportingFile("settings.gradle.kts.mustache", "", "settings.gradle.kts")); + supportingFiles.add(new SupportingFile("gradle.properties.mustache", "", "gradle.properties")); + + // Create directories + supportingFiles.add(new SupportingFile("", "proto", ".gitkeep")); + supportingFiles.add(new SupportingFile("", "src/main/kotlin", ".gitkeep")); + supportingFiles.add(new SupportingFile("", "src/test/kotlin", ".gitkeep")); } @Override @@ -146,5 +154,3 @@ private static Map getMappings() { return result; } } - - diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache new file mode 100644 index 000000000000..f35d8bb5b8fc --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache @@ -0,0 +1,42 @@ +@Suppress("DSL_SCOPE_VIOLATION") +plugins { + id("org.jetbrains.kotlin.jvm") version "2.0.21" + //id("com.squareup.wire") version "5.2.1" +} + +group = "{{groupId}}" +version = "{{artifactVersion}}" + +dependencies { + implementation("com.squareup.misk:misk:2025.02.11.123913-8a41324") + //implementation("com.squareup.wire:wire-runtime:5.2.1") + + testImplementation("com.squareup.misk:misk-testing:2025.02.11.123913-8a41324") + testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") +} + +sourceSets { + main { + kotlin { + srcDirs("src/main/kotlin") + } + resources { + srcDirs("src/main/resources") + } + } +} + +/* +wire { + sourcePath { + srcDir("src/main/kotlin") + } + kotlin { + javaInterop = true + } +} +*/ + +kotlin { + jvmToolchain(17) +} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.mustache deleted file mode 100644 index b8d7941fd565..000000000000 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.mustache +++ /dev/null @@ -1,38 +0,0 @@ -plugins { - id 'org.jetbrains.kotlin.jvm' version '1.8.20' - id 'com.squareup.wire' version '4.9.1' -} - -group '{{groupId}}' -version '{{artifactVersion}}' - -repositories { - mavenCentral() -} - -dependencies { - implementation 'com.squareup.misk:misk:{{miskVersion}}' - implementation 'com.squareup.wire:wire-runtime:4.9.1' - implementation 'com.squareup.wire:wire-moshi-adapter:4.9.1' - - testImplementation 'junit:junit:4.13.2' - testImplementation 'com.squareup.misk:misk-testing:{{miskVersion}}' -} - -wire { - kotlin { - rpcCallStyle = 'suspending' - singleMethodServices = true - protoPath { - srcDir 'proto' - } - } -} - -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - jvmTarget = '17' - } -} - -apply from: 'proto.gradle' \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache index 6872f57f18d7..75aa97afd0de 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache @@ -1,53 +1,31 @@ -{{>partial_header}} -syntax = "proto3"; +package {{package}} -package {{#lambda.lowercase}}{{{packageName}}};{{/lambda.lowercase}} - -{{#imports}} -{{#import}} -import public "{{{modelPackage}}}/{{{import}}}.proto"; -{{/import}} +import java.util.Objects +{{#imports}}import {{import}} {{/imports}} +{{#serializableModel}} +import java.io.Serializable +{{/serializableModel}} +{{#useBeanValidation}} +import {{javaxPackage}}.validation.constraints.DecimalMax +import {{javaxPackage}}.validation.constraints.DecimalMin +import {{javaxPackage}}.validation.constraints.Email +import {{javaxPackage}}.validation.constraints.Max +import {{javaxPackage}}.validation.constraints.Min +import {{javaxPackage}}.validation.constraints.NotNull +import {{javaxPackage}}.validation.constraints.Pattern +import {{javaxPackage}}.validation.constraints.Size +import {{javaxPackage}}.validation.Valid +{{/useBeanValidation}} +{{#swagger2AnnotationLibrary}} +import io.swagger.v3.oas.annotations.media.Schema +{{/swagger2AnnotationLibrary}} +{{#swagger1AnnotationLibrary}} +import io.swagger.annotations.ApiModelProperty +{{/swagger1AnnotationLibrary}} {{#models}} {{#model}} -{{#isEnum}}{{>enum}}{{/isEnum}}{{^isEnum}}message {{classname}} { - -{{#oneOf}} -{{#-first}} - oneof {{classVarName}} { - {{#vars}} - {{#description}} - // {{{.}}} - {{/description}} - {{#vendorExtensions.x-protobuf-type}}{{{.}}} {{/vendorExtensions.x-protobuf-type}}{{{vendorExtensions.x-protobuf-data-type}}} {{{name}}} = {{vendorExtensions.x-protobuf-index}}{{#vendorExtensions.x-protobuf-packed}} [packed=true]{{/vendorExtensions.x-protobuf-packed}}; - {{/vars}} - } -{{/-first}} -{{/oneOf}} -{{^oneOf}} - {{#vars}} - {{#description}} - // {{{.}}} - {{/description}} - {{^isEnum}} - {{#vendorExtensions.x-protobuf-type}}{{{.}}} {{/vendorExtensions.x-protobuf-type}}{{{vendorExtensions.x-protobuf-data-type}}} {{{name}}} = {{vendorExtensions.x-protobuf-index}}{{#vendorExtensions.x-protobuf-packed}} [packed=true]{{/vendorExtensions.x-protobuf-packed}}{{#vendorExtensions.x-protobuf-json-name}} [json_name="{{vendorExtensions.x-protobuf-json-name}}"]{{/vendorExtensions.x-protobuf-json-name}}; - {{/isEnum}} - {{#isEnum}} - enum {{enumName}} { - {{#allowableValues}} - {{#enumVars}} - {{{name}}} = {{{protobuf-enum-index}}}; - {{/enumVars}} - {{/allowableValues}} - } - - {{enumName}} {{name}} = {{vendorExtensions.x-protobuf-index}}; - {{/isEnum}} - - {{/vars}} -{{/oneOf}} -} -{{/isEnum}} +{{#isEnum}}{{>enumClass}}{{/isEnum}}{{^isEnum}}{{>dataClass}}{{/isEnum}} {{/model}} {{/models}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/proto.gradle.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/proto.gradle.mustache deleted file mode 100644 index 825e2311f3a4..000000000000 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/proto.gradle.mustache +++ /dev/null @@ -1,17 +0,0 @@ -// Wire-specific configuration -wire { - kotlin { - javaInterop = true - nameSuffix = 'Proto' - } -} - -// Clean task for generated code -tasks.register('cleanGeneratedCode', Delete) { - delete fileTree("${projectDir}/proto") { - include '**/*.proto' - } - delete fileTree("${projectDir}/src/main/kotlin") { - include '**/wire/**/*.kt' - } -} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/settings.gradle.kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/settings.gradle.kts.mustache new file mode 100644 index 000000000000..c43b3eccdc6f --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/settings.gradle.kts.mustache @@ -0,0 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + mavenCentral() + } +} + +dependencyResolutionManagement { + repositories { + mavenCentral() + } +} + +include(":models") +rootProject.name = "{{artifactId}}" \ No newline at end of file From 1c1c3560200b60b6a1df67f12b115e1c21c7b1d1 Mon Sep 17 00:00:00 2001 From: Guido Arnau Date: Tue, 18 Mar 2025 17:40:14 +0100 Subject: [PATCH 028/102] Adds basic model.mustache for model generation --- .../main/resources/kotlin-misk/model.mustache | 48 +++++++++---------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache index 75aa97afd0de..d3b6eb37bea9 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache @@ -1,31 +1,29 @@ -package {{package}} +package {{modelPackage}} -import java.util.Objects -{{#imports}}import {{import}} +{{#imports}} +import {{import}} {{/imports}} -{{#serializableModel}} -import java.io.Serializable -{{/serializableModel}} -{{#useBeanValidation}} -import {{javaxPackage}}.validation.constraints.DecimalMax -import {{javaxPackage}}.validation.constraints.DecimalMin -import {{javaxPackage}}.validation.constraints.Email -import {{javaxPackage}}.validation.constraints.Max -import {{javaxPackage}}.validation.constraints.Min -import {{javaxPackage}}.validation.constraints.NotNull -import {{javaxPackage}}.validation.constraints.Pattern -import {{javaxPackage}}.validation.constraints.Size -import {{javaxPackage}}.validation.Valid -{{/useBeanValidation}} -{{#swagger2AnnotationLibrary}} -import io.swagger.v3.oas.annotations.media.Schema -{{/swagger2AnnotationLibrary}} -{{#swagger1AnnotationLibrary}} -import io.swagger.annotations.ApiModelProperty -{{/swagger1AnnotationLibrary}} {{#models}} {{#model}} -{{#isEnum}}{{>enumClass}}{{/isEnum}}{{^isEnum}}{{>dataClass}}{{/isEnum}} +{{#isEnum}} +enum class {{classname}} { + {{#allowableValues}} + {{#enumVars}} + {{name}}{{^-last}},{{/-last}} + {{/enumVars}} + {{/allowableValues}} +} +{{/isEnum}} +{{^isEnum}} +data class {{classname}}( + {{#vars}} + {{#description}} + /** {{description}} */ + {{/description}} + val {{name}}: {{{dataType}}}{{^required}}?{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{^-last}},{{/-last}} + {{/vars}} +) +{{/isEnum}} {{/model}} -{{/models}} +{{/models}} \ No newline at end of file From c59be0df77dde1bf62e3393a098aa5f6a6cca841 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Wed, 19 Mar 2025 09:15:35 +0000 Subject: [PATCH 029/102] fixing summary --- .../src/main/resources/kotlin-misk/apiController.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 93b26353f7f3..b7670cfc19d4 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -89,7 +89,7 @@ import misk.web.mediatype.MediaTypes @ApiResponses( value = [{{#responses}}ApiResponse(code = {{{code}}}, message = "{{{message}}}"{{#baseType}}, response = {{{.}}}::class{{/baseType}}{{#containerType}}, responseContainer = "{{{.}}}"{{/containerType}}){{^-last}},{{/-last}}{{/responses}}]){{/swagger1AnnotationLibrary}} @{{httpMethod}}("{{path}}") - @Description("""{{{unescapedNotes}}}""") + @Description("""{{{summary}}}""") @RequestContentType({{#hasConsumes}}{{#consumes}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/consumes}}{{/hasConsumes}}) @ResponseContentType({{#hasProduces}}{{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}{{/hasProduces}}) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) From 00ae587d3c32846152f0baabf9659833f3042683 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Wed, 19 Mar 2025 09:17:00 +0000 Subject: [PATCH 030/102] fixing summary 2 --- .../src/main/resources/kotlin-misk/apiController.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index b7670cfc19d4..fe8e3d6a348c 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -89,7 +89,7 @@ import misk.web.mediatype.MediaTypes @ApiResponses( value = [{{#responses}}ApiResponse(code = {{{code}}}, message = "{{{message}}}"{{#baseType}}, response = {{{.}}}::class{{/baseType}}{{#containerType}}, responseContainer = "{{{.}}}"{{/containerType}}){{^-last}},{{/-last}}{{/responses}}]){{/swagger1AnnotationLibrary}} @{{httpMethod}}("{{path}}") - @Description("""{{{summary}}}""") + @Description("{{{summary}}}") @RequestContentType({{#hasConsumes}}{{#consumes}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/consumes}}{{/hasConsumes}}) @ResponseContentType({{#hasProduces}}{{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}{{/hasProduces}}) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) From fecee52f8a0579a471c927d587f9e5c739129df5 Mon Sep 17 00:00:00 2001 From: Guido Arnau Date: Wed, 19 Mar 2025 10:26:54 +0100 Subject: [PATCH 031/102] Removes unnecesssary line --- .../openapitools/codegen/languages/KotlinMiskServerCodegen.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 2b2a8c5f73f9..7bb8cd0b1349 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -107,7 +107,6 @@ public KotlinMiskServerCodegen() { supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); supportingFiles.add(new SupportingFile("build.gradle.kts.mustache", "", "build.gradle.kts")); supportingFiles.add(new SupportingFile("settings.gradle.kts.mustache", "", "settings.gradle.kts")); - supportingFiles.add(new SupportingFile("gradle.properties.mustache", "", "gradle.properties")); // Create directories supportingFiles.add(new SupportingFile("", "proto", ".gitkeep")); From 87d18b860dc3736b108ff7800e59e1dfa7e7fc78 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Wed, 19 Mar 2025 09:29:07 +0000 Subject: [PATCH 032/102] fixing return type --- .../src/main/resources/kotlin-misk/apiController.mustache | 3 +-- .../src/main/resources/kotlin-misk/apiImpl.mustache | 2 +- .../src/main/resources/kotlin-misk/apiInterface.mustache | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index fe8e3d6a348c..5761e1cc5086 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -69,7 +69,6 @@ import misk.web.mediatype.MediaTypes private val {{classname}} : {{classname}} ) : {{classname}}, WebAction { {{#operation}} - {{#swagger2AnnotationLibrary}} @Operation( summary = "{{{summary}}}", @@ -97,7 +96,7 @@ import misk.web.mediatype.MediaTypes @RequestMapping( value = ["{{#lambdaEscapeInNormalString}}{{{path}}}{{/lambdaEscapeInNormalString}}"] ) - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}} = + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}}{{^returnType}}Void{{/returnType}} = {{classname}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) {{/operation}} } diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index 930bda07c19f..14ecaf0df01f 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -18,7 +18,7 @@ class {{classname}}Impl @Inject constructor( ): {{classname}} { {{#operation}} - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}} { + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}}{{^returnType}}Void{{/returnType}} { TODO() } {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache index fba4642e96cf..dcd062deb696 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache @@ -10,7 +10,7 @@ import kotlin.collections.Map interface {{classname}} { {{#operation}} - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}): {{>returnTypes}} + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}): {{>returnTypes}}{{^returnType}}Void{{/returnType}} {{/operation}} } {{/operations}} From 8c2a376cec0392414a972c0a3b28508c9ac04a29 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Wed, 19 Mar 2025 09:32:49 +0000 Subject: [PATCH 033/102] fixing override --- .../src/main/resources/kotlin-misk/apiController.mustache | 2 +- .../src/main/resources/kotlin-misk/apiImpl.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 5761e1cc5086..25c33f446db7 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -96,7 +96,7 @@ import misk.web.mediatype.MediaTypes @RequestMapping( value = ["{{#lambdaEscapeInNormalString}}{{{path}}}{{/lambdaEscapeInNormalString}}"] ) - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}}{{^returnType}}Void{{/returnType}} = + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}override fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}}{{^returnType}}Void{{/returnType}} = {{classname}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) {{/operation}} } diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index 14ecaf0df01f..4e72d5f88b88 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -18,7 +18,7 @@ class {{classname}}Impl @Inject constructor( ): {{classname}} { {{#operation}} - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}}{{^returnType}}Void{{/returnType}} { + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}override fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}}{{^returnType}}Void{{/returnType}} { TODO() } {{/operation}} From 1b92ddea69485d816d2bb85b32772510d977a0a1 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Wed, 19 Mar 2025 09:44:58 +0000 Subject: [PATCH 034/102] fixing httpcall --- .../src/main/resources/kotlin-misk/apiController.mustache | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 25c33f446db7..d75b985ae259 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -46,6 +46,7 @@ import misk.web.Description import misk.web.FormField import misk.web.FormValue import misk.web.Get +import misk.web.HttpCall import misk.web.PathParam import misk.web.Post import misk.web.Put From 406f6ee3eb6a4a022895af95526401034b3680e2 Mon Sep 17 00:00:00 2001 From: Guido Arnau Date: Wed, 19 Mar 2025 11:00:42 +0100 Subject: [PATCH 035/102] Delete proto folder creation --- .../codegen/languages/KotlinMiskServerCodegen.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 7bb8cd0b1349..8c4a25f9f699 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -107,11 +107,6 @@ public KotlinMiskServerCodegen() { supportingFiles.add(new SupportingFile("README.mustache", "", "README.md")); supportingFiles.add(new SupportingFile("build.gradle.kts.mustache", "", "build.gradle.kts")); supportingFiles.add(new SupportingFile("settings.gradle.kts.mustache", "", "settings.gradle.kts")); - - // Create directories - supportingFiles.add(new SupportingFile("", "proto", ".gitkeep")); - supportingFiles.add(new SupportingFile("", "src/main/kotlin", ".gitkeep")); - supportingFiles.add(new SupportingFile("", "src/test/kotlin", ".gitkeep")); } @Override From 617e36b863f4f45e868234dc0849d7f26d6724cb Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Wed, 19 Mar 2025 10:21:00 +0000 Subject: [PATCH 036/102] fixing return type --- .../src/main/resources/kotlin-misk/apiController.mustache | 2 +- .../src/main/resources/kotlin-misk/apiImpl.mustache | 2 +- .../src/main/resources/kotlin-misk/apiInterface.mustache | 2 +- .../src/main/resources/kotlin-misk/returnTypes.mustache | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/returnTypes.mustache diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index d75b985ae259..2f2d732f1663 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -97,7 +97,7 @@ import misk.web.mediatype.MediaTypes @RequestMapping( value = ["{{#lambdaEscapeInNormalString}}{{{path}}}{{/lambdaEscapeInNormalString}}"] ) - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}override fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}}{{^returnType}}Void{{/returnType}} = + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}override fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}): {{{returnType}}}{{^returnType}}Void{{/returnType}} = {{classname}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) {{/operation}} } diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index 4e72d5f88b88..f18990a0bad3 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -18,7 +18,7 @@ class {{classname}}Impl @Inject constructor( ): {{classname}} { {{#operation}} - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}override fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}},{{/-last}}{{/allParams}}): {{>returnTypes}}{{^returnType}}Void{{/returnType}} { + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}override fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}},{{/-last}}{{/allParams}}): {{{returnType}}}{{^returnType}}Void{{/returnType}} { TODO() } {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache index dcd062deb696..c35a57629df3 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache @@ -10,7 +10,7 @@ import kotlin.collections.Map interface {{classname}} { {{#operation}} - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}): {{>returnTypes}}{{^returnType}}Void{{/returnType}} + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}): {{{returnType}}}{{^returnType}}Void{{/returnType}} {{/operation}} } {{/operations}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/returnTypes.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/returnTypes.mustache deleted file mode 100644 index 612aa9ec0599..000000000000 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/returnTypes.mustache +++ /dev/null @@ -1 +0,0 @@ -{{#isMap}}Map{{/isMap}}{{#isArray}}{{#reactive}}{{#useFlowForArrayReturnType}}Flow{{/useFlowForArrayReturnType}}{{^useFlowForArrayReturnType}}{{{returnContainer}}}{{/useFlowForArrayReturnType}}{{/reactive}}{{^reactive}}{{{returnContainer}}}{{/reactive}}<{{{returnType}}}>{{/isArray}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file From f4473c120b0565df2b5d67a35dc7cef449224703 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Wed, 19 Mar 2025 10:32:02 +0000 Subject: [PATCH 037/102] fixing void return type --- .../src/main/resources/kotlin-misk/apiController.mustache | 2 +- .../src/main/resources/kotlin-misk/apiImpl.mustache | 2 +- .../src/main/resources/kotlin-misk/apiInterface.mustache | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 2f2d732f1663..995eb5db9739 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -97,7 +97,7 @@ import misk.web.mediatype.MediaTypes @RequestMapping( value = ["{{#lambdaEscapeInNormalString}}{{{path}}}{{/lambdaEscapeInNormalString}}"] ) - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}override fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}): {{{returnType}}}{{^returnType}}Void{{/returnType}} = + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}override fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}) = {{classname}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) {{/operation}} } diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index f18990a0bad3..a724e20a1836 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -18,7 +18,7 @@ class {{classname}}Impl @Inject constructor( ): {{classname}} { {{#operation}} - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}override fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}},{{/-last}}{{/allParams}}): {{{returnType}}}{{^returnType}}Void{{/returnType}} { + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}override fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}},{{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} { TODO() } {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache index c35a57629df3..63cdf5dc7cae 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache @@ -10,7 +10,7 @@ import kotlin.collections.Map interface {{classname}} { {{#operation}} - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}): {{{returnType}}}{{^returnType}}Void{{/returnType}} + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} {{/operation}} } {{/operations}} From 7d9020706d723b6bb7aff7ee9bec16cae0919ac4 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Wed, 19 Mar 2025 10:36:52 +0000 Subject: [PATCH 038/102] fixing space --- .../src/main/resources/kotlin-misk/apiImpl.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index a724e20a1836..20009cfcd660 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -18,7 +18,7 @@ class {{classname}}Impl @Inject constructor( ): {{classname}} { {{#operation}} - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}override fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}},{{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} { + {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}override fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} { TODO() } {{/operation}} From 8251e6e78f23a1057e987dd08868ec8dde15cd7e Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Wed, 19 Mar 2025 10:39:50 +0000 Subject: [PATCH 039/102] removing reactive --- .../src/main/resources/kotlin-misk/apiController.mustache | 2 +- .../src/main/resources/kotlin-misk/apiImpl.mustache | 2 +- .../src/main/resources/kotlin-misk/apiInterface.mustache | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 995eb5db9739..2b8fd74fb325 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -97,7 +97,7 @@ import misk.web.mediatype.MediaTypes @RequestMapping( value = ["{{#lambdaEscapeInNormalString}}{{{path}}}{{/lambdaEscapeInNormalString}}"] ) - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}override fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}) = + override fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}) = {{classname}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) {{/operation}} } diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index 20009cfcd660..aa30549571dc 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -18,7 +18,7 @@ class {{classname}}Impl @Inject constructor( ): {{classname}} { {{#operation}} - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}override fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} { + override fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} { TODO() } {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache index 63cdf5dc7cae..0d078db97ef5 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache @@ -10,7 +10,7 @@ import kotlin.collections.Map interface {{classname}} { {{#operation}} - {{#reactive}}{{^isArray}}suspend {{/isArray}}{{#isArray}}{{^useFlowForArrayReturnType}}suspend {{/useFlowForArrayReturnType}}{{/isArray}}{{/reactive}}fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} + fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} {{/operation}} } {{/operations}} From 663aac24503c2ea4264ba79ff27d0a6b3b3432dd Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Wed, 19 Mar 2025 10:49:33 +0000 Subject: [PATCH 040/102] removing imports --- .../main/resources/kotlin-misk/apiController.mustache | 11 ----------- .../src/main/resources/kotlin-misk/apiImpl.mustache | 3 --- .../main/resources/kotlin-misk/apiInterface.mustache | 3 --- 3 files changed, 17 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 2b8fd74fb325..90bff95e0e4d 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -31,20 +31,12 @@ package {{package}} import {{javaxPackage}}.validation.constraints.Size {{/useBeanValidation}} -{{#reactive}} - import kotlinx.coroutines.flow.Flow -{{/reactive}} -import kotlin.collections.List -import kotlin.collections.Map - import jakarta.inject.Inject import jakarta.inject.Singleton {{! TODO("Only import what we need") }} import misk.web.Delete import misk.web.Description -import misk.web.FormField -import misk.web.FormValue import misk.web.Get import misk.web.HttpCall import misk.web.PathParam @@ -94,9 +86,6 @@ import misk.web.mediatype.MediaTypes @ResponseContentType({{#hasProduces}}{{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}{{/hasProduces}}) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") - @RequestMapping( - value = ["{{#lambdaEscapeInNormalString}}{{{path}}}{{/lambdaEscapeInNormalString}}"] - ) override fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}) = {{classname}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index aa30549571dc..42b548711613 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -3,9 +3,6 @@ package {{package}} {{#imports}}import {{import}} {{/imports}} -import kotlin.collections.List -import kotlin.collections.Map - import jakarta.inject.Inject import jakarta.inject.Singleton diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache index 0d078db97ef5..d7436d1d92a4 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache @@ -3,9 +3,6 @@ package {{package}} {{#imports}}import {{import}} {{/imports}} -import kotlin.collections.List -import kotlin.collections.Map - {{#operations}} interface {{classname}} { {{#operation}} From 87efe7bb600f0686b0c4381b552fc3610d982c20 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Wed, 19 Mar 2025 10:52:45 +0000 Subject: [PATCH 041/102] Fixing spacing --- .../src/main/resources/kotlin-misk/apiImpl.mustache | 2 +- .../src/main/resources/kotlin-misk/pathParams.mustache | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index 42b548711613..17b561c5da3e 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -15,7 +15,7 @@ class {{classname}}Impl @Inject constructor( ): {{classname}} { {{#operation}} - override fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} { + override fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { TODO() } {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/pathParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/pathParams.mustache index f5c66b37f67a..1fb00bd25af3 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/pathParams.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/pathParams.mustache @@ -1 +1 @@ -{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#swagger2AnnotationLibrary}}@PathParam(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = [{{#enumVars}}"{{#lambdaEscapeInNormalString}}{{{value}}}{{/lambdaEscapeInNormalString}}"{{^-last}}, {{/-last}}{{/enumVars}}]{{^isContainer}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/isContainer}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = [{{#enumVars}}"{{#lambdaEscapeInNormalString}}{{{value}}}{{/lambdaEscapeInNormalString}}"{{^-last}}, {{/-last}}{{/enumVars}}]){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}{{^isContainer}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/isContainer}}{{/defaultValue}}{{/allowableValues}}){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#enumVars}}{{#lambda.escapeDoubleQuote}}{{{value}}}{{/lambda.escapeDoubleQuote}}{{^-last}}, {{/-last}}{{/enumVars}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/swagger1AnnotationLibrary}} @PathVariable("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}} \ No newline at end of file +{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#swagger2AnnotationLibrary}}@PathParam(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = [{{#enumVars}}"{{#lambdaEscapeInNormalString}}{{{value}}}{{/lambdaEscapeInNormalString}}"{{^-last}}, {{/-last}}{{/enumVars}}]{{^isContainer}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/isContainer}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = [{{#enumVars}}"{{#lambdaEscapeInNormalString}}{{{value}}}{{/lambdaEscapeInNormalString}}"{{^-last}}, {{/-last}}{{/enumVars}}]){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}{{^isContainer}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/isContainer}}{{/defaultValue}}{{/allowableValues}}){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#enumVars}}{{#lambda.escapeDoubleQuote}}{{{value}}}{{/lambda.escapeDoubleQuote}}{{^-last}}, {{/-last}}{{/enumVars}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/swagger1AnnotationLibrary}} @PathParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}} \ No newline at end of file From 88136341f7979eaa9578c5ff250173ae36e5254a Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Wed, 19 Mar 2025 11:25:58 +0000 Subject: [PATCH 042/102] Fixing tabbing --- .../src/main/resources/kotlin-misk/apiController.mustache | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 90bff95e0e4d..84d10f66cab3 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -81,9 +81,9 @@ import misk.web.mediatype.MediaTypes @ApiResponses( value = [{{#responses}}ApiResponse(code = {{{code}}}, message = "{{{message}}}"{{#baseType}}, response = {{{.}}}::class{{/baseType}}{{#containerType}}, responseContainer = "{{{.}}}"{{/containerType}}){{^-last}},{{/-last}}{{/responses}}]){{/swagger1AnnotationLibrary}} @{{httpMethod}}("{{path}}") - @Description("{{{summary}}}") - @RequestContentType({{#hasConsumes}}{{#consumes}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/consumes}}{{/hasConsumes}}) - @ResponseContentType({{#hasProduces}}{{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}{{/hasProduces}}) + @Description("{{{summary}}}"){{#hasConsumes}} + @RequestContentType({{#consumes}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/consumes}}){{/hasConsumes}}{{#hasProduces}} + @ResponseContentType({{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}){{/hasProduces}} @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}) = From b2d86b76298456322edb6bd5171f37f334e985b3 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Wed, 19 Mar 2025 11:56:10 +0000 Subject: [PATCH 043/102] fixing headers --- .../src/main/resources/kotlin-misk/apiController.mustache | 2 ++ .../src/main/resources/kotlin-misk/apiImpl.mustache | 1 + .../src/main/resources/kotlin-misk/apiInterface.mustache | 1 + .../src/main/resources/kotlin-misk/headerParams.mustache | 2 +- .../src/main/resources/kotlin-misk/headerParamsSimple.mustache | 2 +- .../src/main/resources/kotlin-misk/queryParams.mustache | 2 +- 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 84d10f66cab3..982c86258622 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -45,10 +45,12 @@ import misk.web.Put import misk.web.QueryParam import misk.web.RequestBody import misk.web.RequestContentType +import misk.web.RequestHeaders import misk.web.ResponseContentType import misk.web.actions.WebAction import misk.web.interceptors.LogRequestResponse import misk.web.mediatype.MediaTypes +import okhttp3.Headers {{#useBeanValidation}} @Validated diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index 17b561c5da3e..29455040c0c1 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -5,6 +5,7 @@ package {{package}} import jakarta.inject.Inject import jakarta.inject.Singleton +import okhttp3.Headers /** * @TODO("Fill out implementation") diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache index d7436d1d92a4..172d2ee47579 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache @@ -2,6 +2,7 @@ package {{package}} {{#imports}}import {{import}} {{/imports}} +import okhttp3.Headers {{#operations}} interface {{classname}} { diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache index ed62c902c3d4..e5eff05d9bb3 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache @@ -1 +1 @@ -{{#isHeaderParam}}{{#useBeanValidation}}{{>beanValidationCore}}{{/useBeanValidation}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}", `in` = ParameterIn.HEADER{{#required}}, required = true{{/required}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]{{^isContainer}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/isContainer}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}{{^isContainer}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/isContainer}}{{/defaultValue}}{{/allowableValues}}){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/swagger1AnnotationLibrary}} @RequestHeader(value = "{{baseName}}", required = {{#required}}true{{/required}}{{^required}}false{{/required}}) {{{paramName}}}: {{>optionalDataType}}{{/isHeaderParam}} \ No newline at end of file +{{#isHeaderParam}} @RequestHeaders headers: Headers{{/isHeaderParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/headerParamsSimple.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/headerParamsSimple.mustache index 27f58dc5e87f..6c08396de4ab 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/headerParamsSimple.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/headerParamsSimple.mustache @@ -1 +1 @@ -{{#isHeaderParam}}{{{paramName}}}: {{>optionalDataType}}{{/isHeaderParam}} \ No newline at end of file +{{#isHeaderParam}}headers: RequestHeaders{{/isHeaderParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/queryParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/queryParams.mustache index 2bf764c99633..03de7b47d6ae 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/queryParams.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/queryParams.mustache @@ -1 +1 @@ -{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]{{^isContainer}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/isContainer}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}{{^isContainer}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/isContainer}}{{/defaultValue}}{{/allowableValues}}){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}"{{/allowableValues}}{{^isContainer}}{{#defaultValue}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}){{/swagger1AnnotationLibrary}}{{#useBeanValidation}} @Valid{{/useBeanValidation}}{{^isModel}} @RequestParam(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{^isContainer}}{{#defaultValue}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}){{/isModel}}{{#isDate}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE){{/isDate}}{{#isDateTime}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME){{/isDateTime}} {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}} \ No newline at end of file +{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}} \ No newline at end of file From b2a57ef7f457e144bb73cabda33a6855ead41749 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Wed, 19 Mar 2025 12:13:30 +0000 Subject: [PATCH 044/102] add comment --- .../src/main/resources/kotlin-misk/apiController.mustache | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 982c86258622..2526e42e7854 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -61,6 +61,7 @@ import okhttp3.Headers {{#operations}} @Singleton class {{classname}}Controller @Inject constructor( + // @TODO("camelCase this") private val {{classname}} : {{classname}} ) : {{classname}}, WebAction { {{#operation}} From c815f17252a5f5463788e4b8bda0c40e6e7c8b80 Mon Sep 17 00:00:00 2001 From: Guido Arnau Date: Wed, 19 Mar 2025 13:35:20 +0100 Subject: [PATCH 045/102] Adds unit tests --- .../KotlinMiskServerCodegenModelTest.java | 45 ++++++++----- .../KotlinMiskServerCodegenOptionsTest.java | 30 --------- .../misk/KotlinMiskServerCodegenTest.java | 66 ++++++++++++++++--- 3 files changed, 85 insertions(+), 56 deletions(-) delete mode 100644 modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenOptionsTest.java diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenModelTest.java index 128aea33b8e4..04475cba399a 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenModelTest.java @@ -1,31 +1,44 @@ package org.openapitools.codegen.kotlin.misk; +import io.swagger.v3.oas.models.OpenAPI; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.util.List; import org.openapitools.codegen.*; import org.openapitools.codegen.languages.KotlinMiskServerCodegen; -import io.swagger.models.*; -import io.swagger.models.properties.*; import org.testng.Assert; -import org.testng.annotations.Ignore; import org.testng.annotations.Test; @SuppressWarnings("static-method") public class KotlinMiskServerCodegenModelTest { @Test(description = "convert a simple java model") - @Ignore - public void simpleModelTest() { - final Model model = new ModelImpl() - .description("a sample model") - .property("id", new LongProperty()) - .property("name", new StringProperty()) - .required("id") - .required("name"); - final DefaultCodegen codegen = new KotlinMiskServerCodegen(); - - // TODO: Complete this test. - Assert.fail("Not implemented."); - } + public void simpleModelTest() throws IOException { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + + OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/petstore.yaml"); + KotlinMiskServerCodegen codegen = new KotlinMiskServerCodegen(); + codegen.setOutputDir(output.getAbsolutePath()); + + ClientOptInput input = new ClientOptInput(); + input.openAPI(openAPI); + input.config(codegen); + DefaultGenerator generator = new DefaultGenerator(); + generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); + + List files = generator.opts(input).generate(); + + Assert.assertTrue(files.stream() + .filter(file -> file.getPath().contains("model")) + .anyMatch(file -> file.getName().endsWith(".kt"))); + } } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenOptionsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenOptionsTest.java deleted file mode 100644 index dd23cefe6f74..000000000000 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenOptionsTest.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.openapitools.codegen.kotlin.misk; - -import org.openapitools.codegen.AbstractOptionsTest; -import org.openapitools.codegen.CodegenConfig; -import org.openapitools.codegen.languages.KotlinMiskServerCodegen; -import org.openapitools.codegen.options.KotlinMiskServerCodegenOptionsProvider; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; - -public class KotlinMiskServerCodegenOptionsTest extends AbstractOptionsTest { - private KotlinMiskServerCodegen codegen = mock(KotlinMiskServerCodegen.class, mockSettings); - - public KotlinMiskServerCodegenOptionsTest() { - super(new KotlinMiskServerCodegenOptionsProvider()); - } - - @Override - protected CodegenConfig getCodegenConfig() { - return codegen; - } - - @SuppressWarnings("unused") - @Override - protected void verifyOptions() { - // TODO: Complete options using Mockito - // verify(codegen).someMethod(arguments) - } -} - diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenTest.java index 5fa06eba02a3..10c97da2b496 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenTest.java @@ -1,21 +1,67 @@ package org.openapitools.codegen.kotlin.misk; -import org.openapitools.codegen.*; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import org.openapitools.codegen.ClientOptInput; +import org.openapitools.codegen.CodegenConstants; +import org.openapitools.codegen.DefaultGenerator; import org.openapitools.codegen.languages.KotlinMiskServerCodegen; -import io.swagger.models.*; -import io.swagger.parser.SwaggerParser; +import org.openapitools.codegen.meta.features.WireFormatFeature; import org.testng.Assert; -import org.testng.annotations.Ignore; import org.testng.annotations.Test; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +import static org.openapitools.codegen.TestUtils.assertFileContains; + public class KotlinMiskServerCodegenTest { - KotlinMiskServerCodegen codegen = new KotlinMiskServerCodegen(); + @Test + public void testDefaultConfiguration() { + KotlinMiskServerCodegen codegen = new KotlinMiskServerCodegen(); + codegen.processOpts(); + + // Test basic properties + Assert.assertEquals(codegen.getName(), "kotlin-misk"); + Assert.assertEquals(codegen.getHelp(), "Generates a kotlin-misk server with Protocol Buffers models."); + + // Test package names + Assert.assertEquals(codegen.apiPackage(), "org.openapitools.server.api.api"); + Assert.assertEquals(codegen.modelPackage(), "org.openapitools.server.api.model"); + + // Test PROTOBUF wire format + Assert.assertTrue(codegen.getFeatureSet().getWireFormatFeatures().contains(WireFormatFeature.PROTOBUF)); + } @Test - @Ignore - public void shouldSucceed() throws Exception { - // TODO: Complete this test. - Assert.fail("Not implemented."); + public void testBuildGradleKts() throws IOException { + File output = Files.createTempDirectory("test").toFile().getCanonicalFile(); + output.deleteOnExit(); + + OpenAPI openAPI = new OpenAPI(); + openAPI.info(new Info()); + + KotlinMiskServerCodegen codegen = new KotlinMiskServerCodegen(); + codegen.setOutputDir(output.getAbsolutePath()); + + ClientOptInput input = new ClientOptInput(); + input.openAPI(openAPI); + input.config(codegen); + + DefaultGenerator generator = new DefaultGenerator(); + generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "true"); + + generator.opts(input).generate(); + + Path buildGradle = Paths.get(output + "/build.gradle.kts"); + Assert.assertTrue(buildGradle.toFile().exists()); + + // Verify build.gradle.kts content + assertFileContains(buildGradle, "id(\"org.jetbrains.kotlin.jvm\")"); + assertFileContains(buildGradle, "implementation(\"com.squareup.misk:misk:"); } -} +} \ No newline at end of file From dce747b8e5c94d1eb11e5984f58616d38c095389 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Wed, 19 Mar 2025 12:57:29 +0000 Subject: [PATCH 046/102] cleanup --- .../src/main/resources/kotlin-misk/cookieParams.mustache | 1 - .../src/main/resources/kotlin-misk/cookieParamsSimple.mustache | 1 - .../src/main/resources/kotlin-misk/formParams.mustache | 2 +- .../src/main/resources/kotlin-misk/headerParamsSimple.mustache | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/cookieParams.mustache delete mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/cookieParamsSimple.mustache diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/cookieParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/cookieParams.mustache deleted file mode 100644 index 028264a18bcf..000000000000 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/cookieParams.mustache +++ /dev/null @@ -1 +0,0 @@ -{{#isCookieParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}@CookieValue(name = "{{baseName}}"{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}) {{{paramName}}}: {{>optionalDataType}}{{/isCookieParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/cookieParamsSimple.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/cookieParamsSimple.mustache deleted file mode 100644 index 4a4816548059..000000000000 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/cookieParamsSimple.mustache +++ /dev/null @@ -1 +0,0 @@ -{{#isCookieParam}}{{{paramName}}}: {{>optionalDataType}}{{/isCookieParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/formParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/formParams.mustache index 3d1a5787e382..ee3b0391fca4 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/formParams.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/formParams.mustache @@ -1 +1 @@ -{{#isFormParam}}{{^isFile}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]{{^isContainer}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/isContainer}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}{{^isContainer}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/isContainer}}{{/defaultValue}}{{/allowableValues}}){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/swagger1AnnotationLibrary}} {{#isModel}}@RequestPart{{/isModel}}{{^isModel}}@RequestParam{{/isModel}}(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{{paramName}}}: {{>optionalDataType}} {{/isFile}}{{#isFile}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "file detail"){{/swagger1AnnotationLibrary}} {{#useBeanValidation}}@Valid{{/useBeanValidation}} @RequestPart("{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}) {{{paramName}}}: {{>optionalDataType}}{{/isFile}}{{/isFormParam}} \ No newline at end of file +{{#isFormParam}}{{^isFile}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]{{^isContainer}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/isContainer}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}{{^isContainer}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/isContainer}}{{/defaultValue}}{{/allowableValues}}){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/swagger1AnnotationLibrary}} {{#isModel}}@RequestPart{{/isModel}}{{^isModel}}@QueryParam{{/isModel}}(value = "{{baseName}}") {{{paramName}}}: {{>optionalDataType}} {{/isFile}}{{#isFile}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "file detail"){{/swagger1AnnotationLibrary}} {{{paramName}}}: {{>optionalDataType}}{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/headerParamsSimple.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/headerParamsSimple.mustache index 6c08396de4ab..61427004d94e 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/headerParamsSimple.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/headerParamsSimple.mustache @@ -1 +1 @@ -{{#isHeaderParam}}headers: RequestHeaders{{/isHeaderParam}} \ No newline at end of file +{{#isHeaderParam}}headers: Headers{{/isHeaderParam}} \ No newline at end of file From 6b2123bdf3ae0befe6fff6ce2a60daa65496eaa0 Mon Sep 17 00:00:00 2001 From: Guido Arnau Date: Wed, 19 Mar 2025 14:15:14 +0100 Subject: [PATCH 047/102] Correct getHelp() description --- .../openapitools/codegen/languages/KotlinMiskServerCodegen.java | 2 +- .../codegen/kotlin/misk/KotlinMiskServerCodegenTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 8c4a25f9f699..452995b6fd0c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -49,7 +49,7 @@ public String getName() { @Override public String getHelp() { - return "Generates a kotlin-misk server with Protocol Buffers models."; + return "Generates a kotlin-misk server."; } public KotlinMiskServerCodegen() { diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenTest.java index 10c97da2b496..54ce0ed9bf2b 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenTest.java @@ -27,7 +27,7 @@ public void testDefaultConfiguration() { // Test basic properties Assert.assertEquals(codegen.getName(), "kotlin-misk"); - Assert.assertEquals(codegen.getHelp(), "Generates a kotlin-misk server with Protocol Buffers models."); + Assert.assertEquals(codegen.getHelp(), "Generates a kotlin-misk server."); // Test package names Assert.assertEquals(codegen.apiPackage(), "org.openapitools.server.api.api"); From 49d8f0d746ceef1011079d41723792ee954b909d Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Wed, 19 Mar 2025 13:18:33 +0000 Subject: [PATCH 048/102] cleanup 2 --- .../src/main/resources/kotlin-misk/apiController.mustache | 2 +- .../src/main/resources/kotlin-misk/apiImpl.mustache | 2 +- .../src/main/resources/kotlin-misk/apiInterface.mustache | 2 +- .../src/main/resources/kotlin-misk/headerParams.mustache | 1 - .../src/main/resources/kotlin-misk/headerParamsSimple.mustache | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache delete mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/headerParamsSimple.mustache diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 2526e42e7854..199618a2578f 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -89,7 +89,7 @@ import okhttp3.Headers @ResponseContentType({{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}){{/hasProduces}} @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") - override fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}) = + override fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{#isHeaderParam}} @RequestHeaders headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}) = {{classname}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) {{/operation}} } diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index 29455040c0c1..d089cb4693c6 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -16,7 +16,7 @@ class {{classname}}Impl @Inject constructor( ): {{classname}} { {{#operation}} - override fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { + override fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { TODO() } {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache index 172d2ee47579..80ea539732bb 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache @@ -8,7 +8,7 @@ import okhttp3.Headers interface {{classname}} { {{#operation}} - fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{>headerParamsSimple}}{{>cookieParamsSimple}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} + fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} {{/operation}} } {{/operations}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache deleted file mode 100644 index e5eff05d9bb3..000000000000 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache +++ /dev/null @@ -1 +0,0 @@ -{{#isHeaderParam}} @RequestHeaders headers: Headers{{/isHeaderParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/headerParamsSimple.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/headerParamsSimple.mustache deleted file mode 100644 index 61427004d94e..000000000000 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/headerParamsSimple.mustache +++ /dev/null @@ -1 +0,0 @@ -{{#isHeaderParam}}headers: Headers{{/isHeaderParam}} \ No newline at end of file From ccb1d912e1ead9594766b32e5062314f7cdb9184 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Wed, 19 Mar 2025 13:21:25 +0000 Subject: [PATCH 049/102] removiing pathParams files --- .../src/main/resources/kotlin-misk/apiController.mustache | 2 +- .../src/main/resources/kotlin-misk/apiImpl.mustache | 2 +- .../src/main/resources/kotlin-misk/apiInterface.mustache | 2 +- .../src/main/resources/kotlin-misk/pathParams.mustache | 1 - .../src/main/resources/kotlin-misk/pathParamsSimple.mustache | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/pathParams.mustache delete mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/pathParamsSimple.mustache diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 199618a2578f..4bfd9b030708 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -89,7 +89,7 @@ import okhttp3.Headers @ResponseContentType({{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}){{/hasProduces}} @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") - override fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{#isHeaderParam}} @RequestHeaders headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}) = + override fun {{operationId}}({{#allParams}}{{>queryParams}}{{#isPathParam}}@PathParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}} @RequestHeaders headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}) = {{classname}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) {{/operation}} } diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index d089cb4693c6..e08d1fc458dc 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -16,7 +16,7 @@ class {{classname}}Impl @Inject constructor( ): {{classname}} { {{#operation}} - override fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { + override fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { TODO() } {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache index 80ea539732bb..c9bd94f9bd44 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache @@ -8,7 +8,7 @@ import okhttp3.Headers interface {{classname}} { {{#operation}} - fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{>pathParamsSimple}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} + fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} {{/operation}} } {{/operations}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/pathParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/pathParams.mustache deleted file mode 100644 index 1fb00bd25af3..000000000000 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/pathParams.mustache +++ /dev/null @@ -1 +0,0 @@ -{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}{{#swagger2AnnotationLibrary}}@PathParam(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = [{{#enumVars}}"{{#lambdaEscapeInNormalString}}{{{value}}}{{/lambdaEscapeInNormalString}}"{{^-last}}, {{/-last}}{{/enumVars}}]{{^isContainer}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/isContainer}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = [{{#enumVars}}"{{#lambdaEscapeInNormalString}}{{{value}}}{{/lambdaEscapeInNormalString}}"{{^-last}}, {{/-last}}{{/enumVars}}]){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}{{^isContainer}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/isContainer}}{{/defaultValue}}{{/allowableValues}}){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#enumVars}}{{#lambda.escapeDoubleQuote}}{{{value}}}{{/lambda.escapeDoubleQuote}}{{^-last}}, {{/-last}}{{/enumVars}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/swagger1AnnotationLibrary}} @PathParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/pathParamsSimple.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/pathParamsSimple.mustache deleted file mode 100644 index be77bbbb04ae..000000000000 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/pathParamsSimple.mustache +++ /dev/null @@ -1 +0,0 @@ -{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}} \ No newline at end of file From 70b2a3fb6b339133024e918ae2ede93b023136f0 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Wed, 19 Mar 2025 13:33:41 +0000 Subject: [PATCH 050/102] fixup --- .../src/main/resources/kotlin-misk/apiController.mustache | 2 +- .../src/main/resources/kotlin-misk/apiImpl.mustache | 2 +- .../src/main/resources/kotlin-misk/apiInterface.mustache | 2 +- .../src/main/resources/kotlin-misk/bodyParams.mustache | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 4bfd9b030708..c265fcf19551 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -89,7 +89,7 @@ import okhttp3.Headers @ResponseContentType({{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}){{/hasProduces}} @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") - override fun {{operationId}}({{#allParams}}{{>queryParams}}{{#isPathParam}}@PathParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}} @RequestHeaders headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}) = + override fun {{operationId}}({{#allParams}}{{#isQueryParam}}@QueryParam {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}@PathParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}} @RequestHeaders headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}) = {{classname}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) {{/operation}} } diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index e08d1fc458dc..bbecf0582483 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -16,7 +16,7 @@ class {{classname}}Impl @Inject constructor( ): {{classname}} { {{#operation}} - override fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { + override fun {{operationId}}({{#allParams}}{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { TODO() } {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache index c9bd94f9bd44..003932617070 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache @@ -8,7 +8,7 @@ import okhttp3.Headers interface {{classname}} { {{#operation}} - fun {{operationId}}({{#allParams}}{{>queryParamsSimple}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} + fun {{operationId}}({{#allParams}}{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} {{/operation}} } {{/operations}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParams.mustache index 4ca6b20ca93d..5ddb94d26d10 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParams.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParams.mustache @@ -1 +1 @@ -{{#isBodyParam}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{^isContainer}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = ["{{{allowableValues}}}"], defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = ["{{{allowableValues}}}"]){{/defaultValue}}{{/allowableValues}}{{/isContainer}}){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{^isContainer}}{{#allowableValues}}, allowableValues = "{{{.}}}"{{/allowableValues}}{{/isContainer}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/swagger1AnnotationLibrary}}{{#useBeanValidation}} @Valid{{>beanValidationBodyParams}}{{/useBeanValidation}} @RequestBody{{^required}}(required = false){{/required}} {{{paramName}}}: {{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}{{>optionalDataType}}{{/isArray}}{{#isArray}}Flow<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}} \ No newline at end of file +{{#isBodyParam}} @RequestBody{{^required}}(required = false){{/required}} {{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}} \ No newline at end of file From ac87f4813ed9591c347f380b374a1d2adc78c6ce Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Wed, 19 Mar 2025 13:37:39 +0000 Subject: [PATCH 051/102] fixup 3 --- .../src/main/resources/kotlin-misk/apiController.mustache | 2 +- .../src/main/resources/kotlin-misk/apiImpl.mustache | 2 +- .../src/main/resources/kotlin-misk/apiInterface.mustache | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index c265fcf19551..298523b4293d 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -89,7 +89,7 @@ import okhttp3.Headers @ResponseContentType({{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}){{/hasProduces}} @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") - override fun {{operationId}}({{#allParams}}{{#isQueryParam}}@QueryParam {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}@PathParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}} @RequestHeaders headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}) = + override fun {{operationId}}({{#allParams}}{{#isQueryParam}}@QueryParam {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}@PathParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}} @RequestHeaders headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{#isBodyParam}} @RequestBody{{^required}}(required = false){{/required}} {{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}) = {{classname}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) {{/operation}} } diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index bbecf0582483..fef523cc81aa 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -16,7 +16,7 @@ class {{classname}}Impl @Inject constructor( ): {{classname}} { {{#operation}} - override fun {{operationId}}({{#allParams}}{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { + override fun {{operationId}}({{#allParams}}{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>formParamsSimple}}{{#isBodyParam}} {{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { TODO() } {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache index 003932617070..df2bdd7401a4 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache @@ -8,7 +8,7 @@ import okhttp3.Headers interface {{classname}} { {{#operation}} - fun {{operationId}}({{#allParams}}{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>formParamsSimple}}{{^-last}}, {{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} + fun {{operationId}}({{#allParams}}{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>formParamsSimple}}{{#isBodyParam}} {{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{^-last}}, {{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} {{/operation}} } {{/operations}} From 27e300a330a45e0939c40492248fab5b9ad65ccb Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Wed, 19 Mar 2025 14:08:24 +0000 Subject: [PATCH 052/102] removing more files --- .../src/main/resources/kotlin-misk/apiController.mustache | 4 ++-- .../src/main/resources/kotlin-misk/apiImpl.mustache | 2 +- .../src/main/resources/kotlin-misk/apiInterface.mustache | 2 +- .../src/main/resources/kotlin-misk/bodyParams.mustache | 1 - .../src/main/resources/kotlin-misk/queryParams.mustache | 1 - .../src/main/resources/kotlin-misk/queryParamsSimple.mustache | 1 - 6 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/bodyParams.mustache delete mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/queryParams.mustache delete mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/queryParamsSimple.mustache diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 298523b4293d..38eaf8bb9387 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -34,7 +34,7 @@ package {{package}} import jakarta.inject.Inject import jakarta.inject.Singleton -{{! TODO("Only import what we need") }} +// TODO("Only import what we need") import misk.web.Delete import misk.web.Description import misk.web.Get @@ -89,7 +89,7 @@ import okhttp3.Headers @ResponseContentType({{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}){{/hasProduces}} @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") - override fun {{operationId}}({{#allParams}}{{#isQueryParam}}@QueryParam {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}@PathParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}} @RequestHeaders headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{#isBodyParam}} @RequestBody{{^required}}(required = false){{/required}} {{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}) = + override fun {{operationId}}({{#allParams}}{{#isQueryParam}}@QueryParam {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}@PathParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}} @RequestHeaders headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{#isBodyParam}}@RequestBody{{^required}}(required = false){{/required}} {{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}) = {{classname}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) {{/operation}} } diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index fef523cc81aa..65989e0a934c 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -16,7 +16,7 @@ class {{classname}}Impl @Inject constructor( ): {{classname}} { {{#operation}} - override fun {{operationId}}({{#allParams}}{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>formParamsSimple}}{{#isBodyParam}} {{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { + override fun {{operationId}}({{#allParams}}{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>formParamsSimple}}{{#isBodyParam}}{{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { TODO() } {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache index df2bdd7401a4..95676b5bb50d 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache @@ -8,7 +8,7 @@ import okhttp3.Headers interface {{classname}} { {{#operation}} - fun {{operationId}}({{#allParams}}{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>formParamsSimple}}{{#isBodyParam}} {{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{^-last}}, {{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} + fun {{operationId}}({{#allParams}}{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>formParamsSimple}}{{#isBodyParam}}{{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{^-last}}, {{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} {{/operation}} } {{/operations}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParams.mustache deleted file mode 100644 index 5ddb94d26d10..000000000000 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParams.mustache +++ /dev/null @@ -1 +0,0 @@ -{{#isBodyParam}} @RequestBody{{^required}}(required = false){{/required}} {{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/queryParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/queryParams.mustache deleted file mode 100644 index 03de7b47d6ae..000000000000 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/queryParams.mustache +++ /dev/null @@ -1 +0,0 @@ -{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/queryParamsSimple.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/queryParamsSimple.mustache deleted file mode 100644 index 03de7b47d6ae..000000000000 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/queryParamsSimple.mustache +++ /dev/null @@ -1 +0,0 @@ -{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}} \ No newline at end of file From bf277fdf8970b54f0e7981fd520ab4f1a3ecb0b1 Mon Sep 17 00:00:00 2001 From: Guido Arnau Date: Wed, 19 Mar 2025 15:57:27 +0100 Subject: [PATCH 053/102] Adds GitHub Workflow generation --- .../samples-kotlin-server-jdk17.yaml | 3 +- .../samples-kotlin-server-jdk21.yaml | 1 + .github/workflows/samples-kotlin-server.yaml | 3 +- bin/configs/kotlin-misk-petstore.yaml | 4 +- .../kotlin-misk/.openapi-generator-ignore | 23 +++++ .../kotlin-misk/.openapi-generator/FILES | 19 ++++ .../kotlin-misk/.openapi-generator/VERSION | 1 + samples/server/petstore/kotlin-misk/README.md | 64 ++++++++++++ .../petstore/kotlin-misk/build.gradle.kts | 42 ++++++++ .../petstore/kotlin-misk/settings.gradle.kts | 15 +++ .../org/openapitools/server/api/api/PetApi.kt | 24 +++++ .../server/api/api/PetApiController.kt | 99 +++++++++++++++++++ .../openapitools/server/api/api/PetApiImpl.kt | 48 +++++++++ .../openapitools/server/api/api/StoreApi.kt | 15 +++ .../server/api/api/StoreApiController.kt | 64 ++++++++++++ .../server/api/api/StoreApiImpl.kt | 31 ++++++ .../openapitools/server/api/api/UserApi.kt | 23 +++++ .../server/api/api/UserApiController.kt | 94 ++++++++++++++++++ .../server/api/api/UserApiImpl.kt | 47 +++++++++ .../openapitools/server/api/model/Category.kt | 7 ++ .../server/api/model/ModelApiResponse.kt | 8 ++ .../openapitools/server/api/model/Order.kt | 12 +++ .../org/openapitools/server/api/model/Pet.kt | 14 +++ .../org/openapitools/server/api/model/Tag.kt | 7 ++ .../org/openapitools/server/api/model/User.kt | 14 +++ 25 files changed, 678 insertions(+), 4 deletions(-) create mode 100644 samples/server/petstore/kotlin-misk/.openapi-generator-ignore create mode 100644 samples/server/petstore/kotlin-misk/.openapi-generator/FILES create mode 100644 samples/server/petstore/kotlin-misk/.openapi-generator/VERSION create mode 100644 samples/server/petstore/kotlin-misk/README.md create mode 100644 samples/server/petstore/kotlin-misk/build.gradle.kts create mode 100644 samples/server/petstore/kotlin-misk/settings.gradle.kts create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Category.kt create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/ModelApiResponse.kt create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Order.kt create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Pet.kt create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Tag.kt create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/User.kt diff --git a/.github/workflows/samples-kotlin-server-jdk17.yaml b/.github/workflows/samples-kotlin-server-jdk17.yaml index 3cda9e23224a..dee6aa9d2df9 100644 --- a/.github/workflows/samples-kotlin-server-jdk17.yaml +++ b/.github/workflows/samples-kotlin-server-jdk17.yaml @@ -42,6 +42,7 @@ jobs: - samples/server/petstore/kotlin-server/javalin-6 - samples/server/petstore/kotlin-server/ktor - samples/server/petstore/kotlin-server/ktor2 + - samples/server/petstore/kotlin-misk # comment out due to gradle build failure # - samples/server/petstore/kotlin-spring-default/ steps: @@ -66,4 +67,4 @@ jobs: arguments: wrapper - name: Build working-directory: ${{ matrix.sample }} - run: ./gradlew build -x test + run: ./gradlew build -x test \ No newline at end of file diff --git a/.github/workflows/samples-kotlin-server-jdk21.yaml b/.github/workflows/samples-kotlin-server-jdk21.yaml index cb9134a95b9d..c1315d929b61 100644 --- a/.github/workflows/samples-kotlin-server-jdk21.yaml +++ b/.github/workflows/samples-kotlin-server-jdk21.yaml @@ -25,6 +25,7 @@ jobs: - samples/server/petstore/kotlin-server/ktor - samples/server/petstore/kotlin-server/ktor2 - samples/server/petstore/kotlin-server-required-and-nullable-properties + - samples/server/petstore/kotlin-misk steps: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 diff --git a/.github/workflows/samples-kotlin-server.yaml b/.github/workflows/samples-kotlin-server.yaml index 07af163a810e..4b7912da1839 100644 --- a/.github/workflows/samples-kotlin-server.yaml +++ b/.github/workflows/samples-kotlin-server.yaml @@ -47,6 +47,7 @@ jobs: - samples/server/others/kotlin-server/jaxrs-spec - samples/server/others/kotlin-server/jaxrs-spec-array-response - samples/server/petstore/kotlin-spring-cloud + - samples/server/petstore/kotlin-misk # comment out due to gradle build failure #- samples/server/petstore/kotlin-spring-default # no build.gradle file @@ -73,4 +74,4 @@ jobs: arguments: wrapper - name: Build working-directory: ${{ matrix.sample }} - run: ./gradlew build -x test + run: ./gradlew build -x test \ No newline at end of file diff --git a/bin/configs/kotlin-misk-petstore.yaml b/bin/configs/kotlin-misk-petstore.yaml index 0deb0ae6a500..5fbd26caf0a0 100644 --- a/bin/configs/kotlin-misk-petstore.yaml +++ b/bin/configs/kotlin-misk-petstore.yaml @@ -1,6 +1,6 @@ generatorName: kotlin-misk -outputDir: samples/server/petstore/kotlin/misk +outputDir: samples/server/petstore/kotlin-misk inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-misk additionalProperties: - hideGenerationTimestamp: "true" + hideGenerationTimestamp: "true" \ No newline at end of file diff --git a/samples/server/petstore/kotlin-misk/.openapi-generator-ignore b/samples/server/petstore/kotlin-misk/.openapi-generator-ignore new file mode 100644 index 000000000000..7484ee590a38 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES new file mode 100644 index 000000000000..65bb27c7421a --- /dev/null +++ b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES @@ -0,0 +1,19 @@ +.openapi-generator-ignore +README.md +build.gradle.kts +settings.gradle.kts +src/main/kotlin/org/openapitools/server/api/api/PetApi.kt +src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt +src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt +src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt +src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt +src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt +src/main/kotlin/org/openapitools/server/api/api/UserApi.kt +src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt +src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt +src/main/kotlin/org/openapitools/server/api/model/Category.kt +src/main/kotlin/org/openapitools/server/api/model/ModelApiResponse.kt +src/main/kotlin/org/openapitools/server/api/model/Order.kt +src/main/kotlin/org/openapitools/server/api/model/Pet.kt +src/main/kotlin/org/openapitools/server/api/model/Tag.kt +src/main/kotlin/org/openapitools/server/api/model/User.kt diff --git a/samples/server/petstore/kotlin-misk/.openapi-generator/VERSION b/samples/server/petstore/kotlin-misk/.openapi-generator/VERSION new file mode 100644 index 000000000000..96cfbb19ae28 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/.openapi-generator/VERSION @@ -0,0 +1 @@ +7.13.0-SNAPSHOT diff --git a/samples/server/petstore/kotlin-misk/README.md b/samples/server/petstore/kotlin-misk/README.md new file mode 100644 index 000000000000..8fc27a719a91 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/README.md @@ -0,0 +1,64 @@ +# Documentation for OpenAPI Petstore + + + ## Documentation for API Endpoints + + All URIs are relative to *http://petstore.swagger.io/v2* + + Class | Method | HTTP request | Description + ------------ | ------------- | ------------- | ------------- + *PetApi* | [**addPet**](Apis/docs/PetApi.md#addpet) | **Post** /pet | Add a new pet to the store + *PetApi* | [**deletePet**](Apis/docs/PetApi.md#deletepet) | **Delete** /pet/{petId} | Deletes a pet + *PetApi* | [**findPetsByStatus**](Apis/docs/PetApi.md#findpetsbystatus) | **Get** /pet/findByStatus | Finds Pets by status + *PetApi* | [**findPetsByTags**](Apis/docs/PetApi.md#findpetsbytags) | **Get** /pet/findByTags | Finds Pets by tags + *PetApi* | [**getPetById**](Apis/docs/PetApi.md#getpetbyid) | **Get** /pet/{petId} | Find pet by ID + *PetApi* | [**updatePet**](Apis/docs/PetApi.md#updatepet) | **Put** /pet | Update an existing pet + *PetApi* | [**updatePetWithForm**](Apis/docs/PetApi.md#updatepetwithform) | **Post** /pet/{petId} | Updates a pet in the store with form data + *PetApi* | [**uploadFile**](Apis/docs/PetApi.md#uploadfile) | **Post** /pet/{petId}/uploadImage | uploads an image + *StoreApi* | [**deleteOrder**](Apis/docs/StoreApi.md#deleteorder) | **Delete** /store/order/{orderId} | Delete purchase order by ID + *StoreApi* | [**getInventory**](Apis/docs/StoreApi.md#getinventory) | **Get** /store/inventory | Returns pet inventories by status + *StoreApi* | [**getOrderById**](Apis/docs/StoreApi.md#getorderbyid) | **Get** /store/order/{orderId} | Find purchase order by ID + *StoreApi* | [**placeOrder**](Apis/docs/StoreApi.md#placeorder) | **Post** /store/order | Place an order for a pet + *UserApi* | [**createUser**](Apis/docs/UserApi.md#createuser) | **Post** /user | Create user + *UserApi* | [**createUsersWithArrayInput**](Apis/docs/UserApi.md#createuserswitharrayinput) | **Post** /user/createWithArray | Creates list of users with given input array + *UserApi* | [**createUsersWithListInput**](Apis/docs/UserApi.md#createuserswithlistinput) | **Post** /user/createWithList | Creates list of users with given input array + *UserApi* | [**deleteUser**](Apis/docs/UserApi.md#deleteuser) | **Delete** /user/{username} | Delete user + *UserApi* | [**getUserByName**](Apis/docs/UserApi.md#getuserbyname) | **Get** /user/{username} | Get user by user name + *UserApi* | [**loginUser**](Apis/docs/UserApi.md#loginuser) | **Get** /user/login | Logs user into the system + *UserApi* | [**logoutUser**](Apis/docs/UserApi.md#logoutuser) | **Get** /user/logout | Logs out current logged in user session + *UserApi* | [**updateUser**](Apis/docs/UserApi.md#updateuser) | **Put** /user/{username} | Updated user + + + + ## Documentation for Models + + - [org.openapitools.server.api.model.Category](Models/docs/Category.md) + - [org.openapitools.server.api.model.ModelApiResponse](Models/docs/ModelApiResponse.md) + - [org.openapitools.server.api.model.Order](Models/docs/Order.md) + - [org.openapitools.server.api.model.Pet](Models/docs/Pet.md) + - [org.openapitools.server.api.model.Tag](Models/docs/Tag.md) + - [org.openapitools.server.api.model.User](Models/docs/User.md) + + + +## Documentation for Authorization + + +Authentication schemes defined for the API: + + ### petstore_auth + + - **Type**: OAuth + - **Flow**: implicit + - **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog + - **Scopes**: + - write:pets: modify pets in your account + - read:pets: read your pets + + + ### api_key + + - **Type**: API key + - **API key parameter name**: api_key + - **Location**: HTTP header + diff --git a/samples/server/petstore/kotlin-misk/build.gradle.kts b/samples/server/petstore/kotlin-misk/build.gradle.kts new file mode 100644 index 000000000000..0765e2791830 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/build.gradle.kts @@ -0,0 +1,42 @@ +@Suppress("DSL_SCOPE_VIOLATION") +plugins { + id("org.jetbrains.kotlin.jvm") version "2.0.21" + //id("com.squareup.wire") version "5.2.1" +} + +group = "org.openapitools" +version = "1.0.0-SNAPSHOT" + +dependencies { + implementation("com.squareup.misk:misk:2025.02.11.123913-8a41324") + //implementation("com.squareup.wire:wire-runtime:5.2.1") + + testImplementation("com.squareup.misk:misk-testing:2025.02.11.123913-8a41324") + testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") +} + +sourceSets { + main { + kotlin { + srcDirs("src/main/kotlin") + } + resources { + srcDirs("src/main/resources") + } + } +} + +/* +wire { + sourcePath { + srcDir("src/main/kotlin") + } + kotlin { + javaInterop = true + } +} +*/ + +kotlin { + jvmToolchain(17) +} \ No newline at end of file diff --git a/samples/server/petstore/kotlin-misk/settings.gradle.kts b/samples/server/petstore/kotlin-misk/settings.gradle.kts new file mode 100644 index 000000000000..ac3678f99c1e --- /dev/null +++ b/samples/server/petstore/kotlin-misk/settings.gradle.kts @@ -0,0 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + mavenCentral() + } +} + +dependencyResolutionManagement { + repositories { + mavenCentral() + } +} + +include(":models") +rootProject.name = "openapi-kotlin-misk-server" \ No newline at end of file diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt new file mode 100644 index 000000000000..ce79edf141e2 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt @@ -0,0 +1,24 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.ModelApiResponse +import org.openapitools.server.api.model.Pet +import okhttp3.Headers + +interface PetApi { + + fun addPet(pet: Pet) : Pet + + fun deletePet(petId: kotlin.Long, headers: Headers) + + fun findPetsByStatus(status: kotlin.Array) : kotlin.Array + + fun findPetsByTags(tags: kotlin.Array) : kotlin.Array + + fun getPetById(petId: kotlin.Long) : Pet + + fun updatePet(pet: Pet) : Pet + + fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) + + fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, ) : ModelApiResponse +} diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt new file mode 100644 index 000000000000..2d83eca2cf66 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt @@ -0,0 +1,99 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.ModelApiResponse +import org.openapitools.server.api.model.Pet + + +import jakarta.inject.Inject +import jakarta.inject.Singleton + +// TODO("Only import what we need") +import misk.web.Delete +import misk.web.Description +import misk.web.Get +import misk.web.HttpCall +import misk.web.PathParam +import misk.web.Post +import misk.web.Put +import misk.web.QueryParam +import misk.web.RequestBody +import misk.web.RequestContentType +import misk.web.RequestHeaders +import misk.web.ResponseContentType +import misk.web.actions.WebAction +import misk.web.interceptors.LogRequestResponse +import misk.web.mediatype.MediaTypes +import okhttp3.Headers + + @Singleton + class PetApiController @Inject constructor( + // @TODO("camelCase this") + private val PetApi : PetApi + ) : PetApi, WebAction { + + @Post("/pet") + @Description("Add a new pet to the store") + @RequestContentType(MediaTypes.APPLICATION_JSON, MediaTypes.APPLICATION_XML) + @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + override fun addPet(@RequestBody pet: Pet) = + PetApi.addPet(pet) + + @Delete("/pet/{petId}") + @Description("Deletes a pet") + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + override fun deletePet(@PathParam("petId") petId: kotlin.Long, @RequestHeaders headers: Headers) = + PetApi.deletePet(petId, apiKey) + + @Get("/pet/findByStatus") + @Description("Finds Pets by status") + @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + override fun findPetsByStatus(@QueryParam status: kotlin.Array) = + PetApi.findPetsByStatus(status) + + @Get("/pet/findByTags") + @Description("Finds Pets by tags") + @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + override fun findPetsByTags(@QueryParam tags: kotlin.Array) = + PetApi.findPetsByTags(tags) + + @Get("/pet/{petId}") + @Description("Find pet by ID") + @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + override fun getPetById(@PathParam("petId") petId: kotlin.Long) = + PetApi.getPetById(petId) + + @Put("/pet") + @Description("Update an existing pet") + @RequestContentType(MediaTypes.APPLICATION_JSON, MediaTypes.APPLICATION_XML) + @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + override fun updatePet(@RequestBody pet: Pet) = + PetApi.updatePet(pet) + + @Post("/pet/{petId}") + @Description("Updates a pet in the store with form data") + @RequestContentType() + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + override fun updatePetWithForm(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "name") name: kotlin.String? , @QueryParam(value = "status") status: kotlin.String? ) = + PetApi.updatePetWithForm(petId, name, status) + + @Post("/pet/{petId}/uploadImage") + @Description("uploads an image") + @RequestContentType() + @ResponseContentType(MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + override fun uploadFile(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "additionalMetadata") additionalMetadata: kotlin.String? , file: HttpCall) = + PetApi.uploadFile(petId, additionalMetadata, file) + } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt new file mode 100644 index 000000000000..ab5a6c215f9f --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt @@ -0,0 +1,48 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.ModelApiResponse +import org.openapitools.server.api.model.Pet + +import jakarta.inject.Inject +import jakarta.inject.Singleton +import okhttp3.Headers + +/** + * @TODO("Fill out implementation") + */ +@Singleton +class PetApiImpl @Inject constructor( +): PetApi { + + override fun addPet(pet: Pet): Pet { + TODO() + } + + override fun deletePet(petId: kotlin.Long, headers: Headers) { + TODO() + } + + override fun findPetsByStatus(status: kotlin.Array): kotlin.Array { + TODO() + } + + override fun findPetsByTags(tags: kotlin.Array): kotlin.Array { + TODO() + } + + override fun getPetById(petId: kotlin.Long): Pet { + TODO() + } + + override fun updatePet(pet: Pet): Pet { + TODO() + } + + override fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) { + TODO() + } + + override fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, ): ModelApiResponse { + TODO() + } +} diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt new file mode 100644 index 000000000000..8610192ad477 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt @@ -0,0 +1,15 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.Order +import okhttp3.Headers + +interface StoreApi { + + fun deleteOrder(orderId: kotlin.String) + + fun getInventory() : kotlin.collections.Map + + fun getOrderById(orderId: kotlin.Long) : Order + + fun placeOrder(order: Order) : Order +} diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt new file mode 100644 index 000000000000..793fa0cdb932 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt @@ -0,0 +1,64 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.Order + + +import jakarta.inject.Inject +import jakarta.inject.Singleton + +// TODO("Only import what we need") +import misk.web.Delete +import misk.web.Description +import misk.web.Get +import misk.web.HttpCall +import misk.web.PathParam +import misk.web.Post +import misk.web.Put +import misk.web.QueryParam +import misk.web.RequestBody +import misk.web.RequestContentType +import misk.web.RequestHeaders +import misk.web.ResponseContentType +import misk.web.actions.WebAction +import misk.web.interceptors.LogRequestResponse +import misk.web.mediatype.MediaTypes +import okhttp3.Headers + + @Singleton + class StoreApiController @Inject constructor( + // @TODO("camelCase this") + private val StoreApi : StoreApi + ) : StoreApi, WebAction { + + @Delete("/store/order/{orderId}") + @Description("Delete purchase order by ID") + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + override fun deleteOrder(@PathParam("orderId") orderId: kotlin.String) = + StoreApi.deleteOrder(orderId) + + @Get("/store/inventory") + @Description("Returns pet inventories by status") + @ResponseContentType(MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + override fun getInventory() = + StoreApi.getInventory() + + @Get("/store/order/{orderId}") + @Description("Find purchase order by ID") + @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + override fun getOrderById(@PathParam("orderId") orderId: kotlin.Long) = + StoreApi.getOrderById(orderId) + + @Post("/store/order") + @Description("Place an order for a pet") + @RequestContentType(MediaTypes.APPLICATION_JSON) + @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + override fun placeOrder(@RequestBody order: Order) = + StoreApi.placeOrder(order) + } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt new file mode 100644 index 000000000000..20c3d95f3e2d --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt @@ -0,0 +1,31 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.Order + +import jakarta.inject.Inject +import jakarta.inject.Singleton +import okhttp3.Headers + +/** + * @TODO("Fill out implementation") + */ +@Singleton +class StoreApiImpl @Inject constructor( +): StoreApi { + + override fun deleteOrder(orderId: kotlin.String) { + TODO() + } + + override fun getInventory(): kotlin.collections.Map { + TODO() + } + + override fun getOrderById(orderId: kotlin.Long): Order { + TODO() + } + + override fun placeOrder(order: Order): Order { + TODO() + } +} diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt new file mode 100644 index 000000000000..dd1fd1a9fd3e --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt @@ -0,0 +1,23 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.User +import okhttp3.Headers + +interface UserApi { + + fun createUser(user: User) + + fun createUsersWithArrayInput(user: kotlin.Array) + + fun createUsersWithListInput(user: kotlin.Array) + + fun deleteUser(username: kotlin.String) + + fun getUserByName(username: kotlin.String) : User + + fun loginUser(username: kotlin.String, password: kotlin.String) : kotlin.String + + fun logoutUser() + + fun updateUser(username: kotlin.String, user: User) +} diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt new file mode 100644 index 000000000000..3dffbf663823 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt @@ -0,0 +1,94 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.User + + +import jakarta.inject.Inject +import jakarta.inject.Singleton + +// TODO("Only import what we need") +import misk.web.Delete +import misk.web.Description +import misk.web.Get +import misk.web.HttpCall +import misk.web.PathParam +import misk.web.Post +import misk.web.Put +import misk.web.QueryParam +import misk.web.RequestBody +import misk.web.RequestContentType +import misk.web.RequestHeaders +import misk.web.ResponseContentType +import misk.web.actions.WebAction +import misk.web.interceptors.LogRequestResponse +import misk.web.mediatype.MediaTypes +import okhttp3.Headers + + @Singleton + class UserApiController @Inject constructor( + // @TODO("camelCase this") + private val UserApi : UserApi + ) : UserApi, WebAction { + + @Post("/user") + @Description("Create user") + @RequestContentType(MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + override fun createUser(@RequestBody user: User) = + UserApi.createUser(user) + + @Post("/user/createWithArray") + @Description("Creates list of users with given input array") + @RequestContentType(MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + override fun createUsersWithArrayInput(@RequestBody user: kotlin.Array) = + UserApi.createUsersWithArrayInput(user) + + @Post("/user/createWithList") + @Description("Creates list of users with given input array") + @RequestContentType(MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + override fun createUsersWithListInput(@RequestBody user: kotlin.Array) = + UserApi.createUsersWithListInput(user) + + @Delete("/user/{username}") + @Description("Delete user") + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + override fun deleteUser(@PathParam("username") username: kotlin.String) = + UserApi.deleteUser(username) + + @Get("/user/{username}") + @Description("Get user by user name") + @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + override fun getUserByName(@PathParam("username") username: kotlin.String) = + UserApi.getUserByName(username) + + @Get("/user/login") + @Description("Logs user into the system") + @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + override fun loginUser(@QueryParam username: kotlin.String,@QueryParam password: kotlin.String) = + UserApi.loginUser(username, password) + + @Get("/user/logout") + @Description("Logs out current logged in user session") + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + override fun logoutUser() = + UserApi.logoutUser() + + @Put("/user/{username}") + @Description("Updated user") + @RequestContentType(MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + @Suppress("unused") + override fun updateUser(@PathParam("username") username: kotlin.String,@RequestBody user: User) = + UserApi.updateUser(username, user) + } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt new file mode 100644 index 000000000000..b6884e9a0feb --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt @@ -0,0 +1,47 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.User + +import jakarta.inject.Inject +import jakarta.inject.Singleton +import okhttp3.Headers + +/** + * @TODO("Fill out implementation") + */ +@Singleton +class UserApiImpl @Inject constructor( +): UserApi { + + override fun createUser(user: User) { + TODO() + } + + override fun createUsersWithArrayInput(user: kotlin.Array) { + TODO() + } + + override fun createUsersWithListInput(user: kotlin.Array) { + TODO() + } + + override fun deleteUser(username: kotlin.String) { + TODO() + } + + override fun getUserByName(username: kotlin.String): User { + TODO() + } + + override fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String { + TODO() + } + + override fun logoutUser() { + TODO() + } + + override fun updateUser(username: kotlin.String, user: User) { + TODO() + } +} diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Category.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Category.kt new file mode 100644 index 000000000000..02d3890cc4c3 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Category.kt @@ -0,0 +1,7 @@ +package org.openapitools.server.api.model + + +data class Category( + val id: kotlin.Long?, + val name: kotlin.String? +) diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/ModelApiResponse.kt new file mode 100644 index 000000000000..4596d740ed83 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/ModelApiResponse.kt @@ -0,0 +1,8 @@ +package org.openapitools.server.api.model + + +data class ModelApiResponse( + val code: kotlin.Int?, + val type: kotlin.String?, + val message: kotlin.String? +) diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Order.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Order.kt new file mode 100644 index 000000000000..af8e70e33976 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Order.kt @@ -0,0 +1,12 @@ +package org.openapitools.server.api.model + + +data class Order( + val id: kotlin.Long?, + val petId: kotlin.Long?, + val quantity: kotlin.Int?, + val shipDate: java.time.OffsetDateTime?, + /** Order Status */ + val status: kotlin.String?, + val complete: kotlin.Boolean? = false +) diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Pet.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Pet.kt new file mode 100644 index 000000000000..d7192ff9b63d --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Pet.kt @@ -0,0 +1,14 @@ +package org.openapitools.server.api.model + +import org.openapitools.server.api.model.Category +import org.openapitools.server.api.model.Tag + +data class Pet( + val name: kotlin.String, + val photoUrls: kotlin.Array, + val id: kotlin.Long?, + val category: Category?, + val tags: kotlin.Array?, + /** pet status in the store */ + val status: kotlin.String? +) diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Tag.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Tag.kt new file mode 100644 index 000000000000..8f2f002c41b9 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Tag.kt @@ -0,0 +1,7 @@ +package org.openapitools.server.api.model + + +data class Tag( + val id: kotlin.Long?, + val name: kotlin.String? +) diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/User.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/User.kt new file mode 100644 index 000000000000..eb0aa188589d --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/User.kt @@ -0,0 +1,14 @@ +package org.openapitools.server.api.model + + +data class User( + val id: kotlin.Long?, + val username: kotlin.String?, + val firstName: kotlin.String?, + val lastName: kotlin.String?, + val email: kotlin.String?, + val password: kotlin.String?, + val phone: kotlin.String?, + /** User Status */ + val userStatus: kotlin.Int? +) From abc4dd795383e8bf4d0eb2e59100a6daebcdb0f0 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Wed, 19 Mar 2025 15:01:55 +0000 Subject: [PATCH 054/102] removing form params as not required --- .../src/main/resources/kotlin-misk/apiController.mustache | 2 +- .../src/main/resources/kotlin-misk/apiImpl.mustache | 2 +- .../src/main/resources/kotlin-misk/apiInterface.mustache | 2 +- .../src/main/resources/kotlin-misk/formParams.mustache | 1 - .../src/main/resources/kotlin-misk/formParamsSimple.mustache | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/formParams.mustache delete mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/formParamsSimple.mustache diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 38eaf8bb9387..2a4166a5d62f 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -89,7 +89,7 @@ import okhttp3.Headers @ResponseContentType({{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}){{/hasProduces}} @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") - override fun {{operationId}}({{#allParams}}{{#isQueryParam}}@QueryParam {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}@PathParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}} @RequestHeaders headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{#isBodyParam}}@RequestBody{{^required}}(required = false){{/required}} {{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}) = + override fun {{operationId}}({{#allParams}}{{#isQueryParam}}@QueryParam {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}@PathParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}} @RequestHeaders headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{#isBodyParam}}@RequestBody{{^required}}(required = false){{/required}} {{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{^-last}},{{/-last}}{{/allParams}}) = {{classname}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) {{/operation}} } diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index 65989e0a934c..1762443ab74c 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -16,7 +16,7 @@ class {{classname}}Impl @Inject constructor( ): {{classname}} { {{#operation}} - override fun {{operationId}}({{#allParams}}{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>formParamsSimple}}{{#isBodyParam}}{{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { + override fun {{operationId}}({{#allParams}}{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{#isBodyParam}}{{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { TODO() } {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache index 95676b5bb50d..d77383960430 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache @@ -8,7 +8,7 @@ import okhttp3.Headers interface {{classname}} { {{#operation}} - fun {{operationId}}({{#allParams}}{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{>formParamsSimple}}{{#isBodyParam}}{{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{^-last}}, {{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} + fun {{operationId}}({{#allParams}}{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{#isBodyParam}}{{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{^-last}}, {{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} {{/operation}} } {{/operations}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/formParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/formParams.mustache deleted file mode 100644 index ee3b0391fca4..000000000000 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/formParams.mustache +++ /dev/null @@ -1 +0,0 @@ -{{#isFormParam}}{{^isFile}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]{{^isContainer}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/isContainer}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}{{^isContainer}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/isContainer}}{{/defaultValue}}{{/allowableValues}}){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}){{/swagger1AnnotationLibrary}} {{#isModel}}@RequestPart{{/isModel}}{{^isModel}}@QueryParam{{/isModel}}(value = "{{baseName}}") {{{paramName}}}: {{>optionalDataType}} {{/isFile}}{{#isFile}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "file detail"){{/swagger1AnnotationLibrary}} {{{paramName}}}: {{>optionalDataType}}{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/formParamsSimple.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/formParamsSimple.mustache deleted file mode 100644 index 669c2abe8832..000000000000 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/formParamsSimple.mustache +++ /dev/null @@ -1 +0,0 @@ -{{#isFormParam}}{{^isFile}} {{{paramName}}}: {{>optionalDataType}}{{/isFile}}{{/isFormParam}} \ No newline at end of file From 584e6ef57a1cd532c2001469215242bd7a0dc468 Mon Sep 17 00:00:00 2001 From: Guido Arnau Date: Wed, 19 Mar 2025 16:55:38 +0100 Subject: [PATCH 055/102] Adds tests for OptionsProvider --- .../KotlinMiskServerCodegenOptionsTest.java | 40 ++++++++++++++++++ ...otlinMiskServerCodegenOptionsProvider.java | 42 +++++++++++++++---- 2 files changed, 73 insertions(+), 9 deletions(-) create mode 100644 modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenOptionsTest.java diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenOptionsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenOptionsTest.java new file mode 100644 index 000000000000..5e176bdd6b4b --- /dev/null +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenOptionsTest.java @@ -0,0 +1,40 @@ +package org.openapitools.codegen.kotlin.misk; + +import java.util.List; +import org.openapitools.codegen.AbstractOptionsTest; +import org.openapitools.codegen.CodegenConfig; +import org.openapitools.codegen.languages.KotlinMiskServerCodegen; +import org.openapitools.codegen.options.KotlinMiskServerCodegenOptionsProvider; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + +public class KotlinMiskServerCodegenOptionsTest extends AbstractOptionsTest { + private KotlinMiskServerCodegen codegen = mock(KotlinMiskServerCodegen.class, mockSettings); + + public KotlinMiskServerCodegenOptionsTest() { + super(new KotlinMiskServerCodegenOptionsProvider()); + } + + @Override + protected CodegenConfig getCodegenConfig() { + return codegen; + } + + @SuppressWarnings("unused") + @Override + protected void verifyOptions() { + verify(codegen).setPackageName(KotlinMiskServerCodegenOptionsProvider.PACKAGE_NAME_VALUE); + verify(codegen).setGroupId(KotlinMiskServerCodegenOptionsProvider.GROUP_ID_VALUE); + verify(codegen).setArtifactId(KotlinMiskServerCodegenOptionsProvider.ARTIFACT_ID_VALUE); + verify(codegen).setArtifactVersion(KotlinMiskServerCodegenOptionsProvider.ARTIFACT_VERSION_VALUE); + verify(codegen).setSourceFolder(KotlinMiskServerCodegenOptionsProvider.SOURCE_FOLDER_VALUE); + verify(codegen).setSortParamsByRequiredFlag(Boolean.valueOf(KotlinMiskServerCodegenOptionsProvider.SORT_PARAMS_VALUE)); + verify(codegen).setSortModelPropertiesByRequiredFlag(Boolean.valueOf(KotlinMiskServerCodegenOptionsProvider.SORT_MODEL_PROPERTIES_VALUE)); + verify(codegen).setEnumPropertyNaming(KotlinMiskServerCodegenOptionsProvider.ENUM_PROPERTY_NAMING_VALUE); + verify(codegen).setSerializableModel(Boolean.valueOf(KotlinMiskServerCodegenOptionsProvider.SERIALIZABLE_MODEL_VALUE)); + verify(codegen).setParcelizeModels(Boolean.valueOf(KotlinMiskServerCodegenOptionsProvider.PARCELIZE_MODELS_VALUE)); + verify(codegen).setApiSuffix(KotlinMiskServerCodegenOptionsProvider.API_SUFFIX_VALUE); + verify(codegen).setAdditionalModelTypeAnnotations(List.of(KotlinMiskServerCodegenOptionsProvider.ADDITIONAL_MODEL_TYPE_ANNOTATIONS_VALUE)); + } +} \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/KotlinMiskServerCodegenOptionsProvider.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/KotlinMiskServerCodegenOptionsProvider.java index 7da3c36f851a..83b0313602cc 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/KotlinMiskServerCodegenOptionsProvider.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/KotlinMiskServerCodegenOptionsProvider.java @@ -1,14 +1,25 @@ package org.openapitools.codegen.options; import org.openapitools.codegen.CodegenConstants; -import org.openapitools.codegen.languages.KotlinMiskServerCodegen; - +import org.openapitools.codegen.languages.AbstractKotlinCodegen; import com.google.common.collect.ImmutableMap; import java.util.Map; public class KotlinMiskServerCodegenOptionsProvider implements OptionsProvider { - public static final String PROJECT_NAME_VALUE = "OpenAPI"; + public static final String PACKAGE_NAME_VALUE = "org.openapitools.server.api"; + public static final String GROUP_ID_VALUE = "org.openapitools"; + public static final String ARTIFACT_ID_VALUE = "kotlin-misk-server"; + public static final String ARTIFACT_VERSION_VALUE = "0.0.1"; + public static final String SOURCE_FOLDER_VALUE = "src/main/kotlin"; + public static final String ENUM_PROPERTY_NAMING_VALUE = "camelCase"; + public static final String SERIALIZABLE_MODEL_VALUE = "false"; + public static final String PARCELIZE_MODELS_VALUE = "false"; + public static final String MODEL_MUTABLE_VALUE = "false"; + public static final String SORT_PARAMS_VALUE = "false"; + public static final String SORT_MODEL_PROPERTIES_VALUE = "false"; + public static final String API_SUFFIX_VALUE = "Api"; + public static final String ADDITIONAL_MODEL_TYPE_ANNOTATIONS_VALUE = ""; @Override public String getLanguage() { @@ -17,15 +28,28 @@ public String getLanguage() { @Override public Map createOptions() { - ImmutableMap.Builder builder = new ImmutableMap.Builder(); + ImmutableMap.Builder builder = new ImmutableMap.Builder<>(); return builder - .put(KotlinMiskServerCodegen.PROJECT_NAME, PROJECT_NAME_VALUE) - .build(); + .put(CodegenConstants.PACKAGE_NAME, PACKAGE_NAME_VALUE) + .put(CodegenConstants.GROUP_ID, GROUP_ID_VALUE) + .put(CodegenConstants.ARTIFACT_ID, ARTIFACT_ID_VALUE) + .put(CodegenConstants.ARTIFACT_VERSION, ARTIFACT_VERSION_VALUE) + .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE) + .put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, SORT_PARAMS_VALUE) + .put(CodegenConstants.SORT_MODEL_PROPERTIES_BY_REQUIRED_FLAG, + SORT_MODEL_PROPERTIES_VALUE) + .put(CodegenConstants.ENUM_PROPERTY_NAMING, ENUM_PROPERTY_NAMING_VALUE) + .put(CodegenConstants.SERIALIZABLE_MODEL, SERIALIZABLE_MODEL_VALUE) + .put(CodegenConstants.PARCELIZE_MODELS, PARCELIZE_MODELS_VALUE) + .put(CodegenConstants.API_SUFFIX, API_SUFFIX_VALUE) + .put(AbstractKotlinCodegen.MODEL_MUTABLE, MODEL_MUTABLE_VALUE) + .put(AbstractKotlinCodegen.ADDITIONAL_MODEL_TYPE_ANNOTATIONS, + ADDITIONAL_MODEL_TYPE_ANNOTATIONS_VALUE) + .build(); } @Override public boolean isServer() { - return false; + return true; } -} - +} \ No newline at end of file From c3f38c7d024bb02ca61b43980fa2ba446f0cd223 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Thu, 20 Mar 2025 09:18:21 +0000 Subject: [PATCH 056/102] Renamed file to match --- bin/configs/{kotlin-misk-petstore.yaml => kotlin-misk.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename bin/configs/{kotlin-misk-petstore.yaml => kotlin-misk.yaml} (100%) diff --git a/bin/configs/kotlin-misk-petstore.yaml b/bin/configs/kotlin-misk.yaml similarity index 100% rename from bin/configs/kotlin-misk-petstore.yaml rename to bin/configs/kotlin-misk.yaml From c7b6fdbd92d7d7154e5c2f3161619bf8d6e667ee Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Thu, 20 Mar 2025 09:45:45 +0000 Subject: [PATCH 057/102] remove whitespace --- .../src/main/resources/kotlin-misk/apiInterface.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache index d77383960430..0b24a5406a63 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache @@ -8,7 +8,7 @@ import okhttp3.Headers interface {{classname}} { {{#operation}} - fun {{operationId}}({{#allParams}}{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{#isBodyParam}}{{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{^-last}}, {{/-last}}{{/allParams}}) {{#returnType}}: {{{returnType}}}{{/returnType}} + fun {{operationId}}({{#allParams}}{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{#isBodyParam}}{{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} {{/operation}} } {{/operations}} From 557edd2860508a1cf387fd4e03a003a8e88166c8 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Thu, 20 Mar 2025 10:15:16 +0000 Subject: [PATCH 058/102] remove whitespace --- .../org/openapitools/server/api/api/PetApi.kt | 16 ++++++++-------- .../org/openapitools/server/api/api/StoreApi.kt | 8 ++++---- .../org/openapitools/server/api/api/UserApi.kt | 16 ++++++++-------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt index ce79edf141e2..92a6af69a274 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt @@ -6,19 +6,19 @@ import okhttp3.Headers interface PetApi { - fun addPet(pet: Pet) : Pet + fun addPet(pet: Pet): Pet - fun deletePet(petId: kotlin.Long, headers: Headers) + fun deletePet(petId: kotlin.Long, headers: Headers) - fun findPetsByStatus(status: kotlin.Array) : kotlin.Array + fun findPetsByStatus(status: kotlin.Array): kotlin.Array - fun findPetsByTags(tags: kotlin.Array) : kotlin.Array + fun findPetsByTags(tags: kotlin.Array): kotlin.Array - fun getPetById(petId: kotlin.Long) : Pet + fun getPetById(petId: kotlin.Long): Pet - fun updatePet(pet: Pet) : Pet + fun updatePet(pet: Pet): Pet - fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) + fun updatePetWithForm(petId: kotlin.Long, , ) - fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, ) : ModelApiResponse + fun uploadFile(petId: kotlin.Long, , ): ModelApiResponse } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt index 8610192ad477..012f4e93ce97 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt @@ -5,11 +5,11 @@ import okhttp3.Headers interface StoreApi { - fun deleteOrder(orderId: kotlin.String) + fun deleteOrder(orderId: kotlin.String) - fun getInventory() : kotlin.collections.Map + fun getInventory(): kotlin.collections.Map - fun getOrderById(orderId: kotlin.Long) : Order + fun getOrderById(orderId: kotlin.Long): Order - fun placeOrder(order: Order) : Order + fun placeOrder(order: Order): Order } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt index dd1fd1a9fd3e..b14638ec8032 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt @@ -5,19 +5,19 @@ import okhttp3.Headers interface UserApi { - fun createUser(user: User) + fun createUser(user: User) - fun createUsersWithArrayInput(user: kotlin.Array) + fun createUsersWithArrayInput(user: kotlin.Array) - fun createUsersWithListInput(user: kotlin.Array) + fun createUsersWithListInput(user: kotlin.Array) - fun deleteUser(username: kotlin.String) + fun deleteUser(username: kotlin.String) - fun getUserByName(username: kotlin.String) : User + fun getUserByName(username: kotlin.String): User - fun loginUser(username: kotlin.String, password: kotlin.String) : kotlin.String + fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String - fun logoutUser() + fun logoutUser() - fun updateUser(username: kotlin.String, user: User) + fun updateUser(username: kotlin.String, user: User) } From 0b817e1c58b46dee9fee2fa70b18c6a5d515c3b6 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Thu, 20 Mar 2025 11:54:16 +0000 Subject: [PATCH 059/102] adding documentation --- .../resources/kotlin-misk/api_doc.mustache | 65 +++++++++++++++++++ .../resources/kotlin-misk/class_doc.mustache | 15 +++++ .../resources/kotlin-misk/enum_doc.mustache | 7 ++ .../resources/kotlin-misk/model_doc.mustache | 3 + .../petstore/kotlin-misk/docs/ApiResponse.md | 12 ++++ .../petstore/kotlin-misk/docs/Category.md | 11 ++++ .../server/petstore/kotlin-misk/docs/Order.md | 22 +++++++ .../server/petstore/kotlin-misk/docs/Pet.md | 22 +++++++ .../server/petstore/kotlin-misk/docs/Tag.md | 11 ++++ .../server/petstore/kotlin-misk/docs/User.md | 17 +++++ 10 files changed, 185 insertions(+) create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/api_doc.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/class_doc.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/enum_doc.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/model_doc.mustache create mode 100644 samples/server/petstore/kotlin-misk/docs/ApiResponse.md create mode 100644 samples/server/petstore/kotlin-misk/docs/Category.md create mode 100644 samples/server/petstore/kotlin-misk/docs/Order.md create mode 100644 samples/server/petstore/kotlin-misk/docs/Pet.md create mode 100644 samples/server/petstore/kotlin-misk/docs/Tag.md create mode 100644 samples/server/petstore/kotlin-misk/docs/User.md diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/api_doc.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/api_doc.mustache new file mode 100644 index 000000000000..6553762ac7cf --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/api_doc.mustache @@ -0,0 +1,65 @@ +# {{classname}}{{#description}} +{{.}}{{/description}} + +All URIs are relative to *{{basePath}}* + +Method | HTTP request | Description +------------- | ------------- | ------------- +{{#operations}}{{#operation}}[**{{operationId}}**]({{classname}}.md#{{operationId}}) | **{{httpMethod}}** {{path}} | {{summary}} +{{/operation}}{{/operations}} + +{{#operations}} +{{#operation}} + +# **{{operationId}}** +> {{#returnType}}{{.}} {{/returnType}}{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) + +{{summary}}{{#notes}} + +{{.}}{{/notes}} + +### Example +```kotlin +// Import classes: +//import {{{packageName}}}.infrastructure.* +//import {{{modelPackage}}}.* + +{{! TODO: Auth method documentation examples}} +val apiInstance = {{{classname}}}() +{{#allParams}} +val {{{paramName}}} : {{{dataType}}} = {{{example}}} // {{{dataType}}} | {{{description}}} +{{/allParams}} +try { + {{#returnType}}val result : {{{.}}} = {{/returnType}}apiInstance.{{{operationId}}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}} + println(result){{/returnType}} +} catch (e: ClientException) { + println("4xx response calling {{{classname}}}#{{{operationId}}}") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling {{{classname}}}#{{{operationId}}}") + e.printStackTrace() +} +``` + +### Parameters +{{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{#allParams}}{{#-last}} +Name | Type | Description | Notes +------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}} +{{#allParams}} **{{paramName}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}{{#generateModelDocs}}[**{{dataType}}**]({{baseType}}.md){{/generateModelDocs}}{{^generateModelDocs}}**{{dataType}}**{{/generateModelDocs}}{{/isFile}}{{/isPrimitiveType}}| {{description}} |{{^required}} [optional]{{/required}}{{#defaultValue}} [default to {{.}}]{{/defaultValue}}{{#allowableValues}} [enum: {{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}]{{/allowableValues}} +{{/allParams}} + +### Return type + +{{#returnType}}{{#returnTypeIsPrimitive}}**{{returnType}}**{{/returnTypeIsPrimitive}}{{^returnTypeIsPrimitive}}{{#generateModelDocs}}[**{{returnType}}**]({{returnBaseType}}.md){{/generateModelDocs}}{{^generateModelDocs}}**{{returnType}}**{{/generateModelDocs}}{{/returnTypeIsPrimitive}}{{/returnType}}{{^returnType}}null (empty response body){{/returnType}} + +### Authorization + +{{^authMethods}}No authorization required{{/authMethods}}{{#authMethods}}[{{name}}](../README.md#{{name}}){{^-last}}, {{/-last}}{{/authMethods}} + +### HTTP request headers + + - **Content-Type**: {{#consumes}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/consumes}}{{^consumes}}Not defined{{/consumes}} + - **Accept**: {{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}{{^produces}}Not defined{{/produces}} + +{{/operation}} +{{/operations}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/class_doc.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/class_doc.mustache new file mode 100644 index 000000000000..b6b482afb78b --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/class_doc.mustache @@ -0,0 +1,15 @@ +# {{classname}} + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +{{#vars}}**{{name}}** | {{#isEnum}}[**inline**](#{{datatypeWithEnum}}){{/isEnum}}{{^isEnum}}{{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{dataType}}**]({{complexType}}.md){{/isPrimitiveType}}{{/isEnum}} | {{description}} | {{^required}} [optional]{{/required}}{{#isReadOnly}} [readonly]{{/isReadOnly}} +{{/vars}} +{{#vars}}{{#isEnum}} + +{{!NOTE: see java's resources "pojo_doc.mustache" once enums are fully implemented}} +## Enum: {{baseName}} +Name | Value +---- | -----{{#allowableValues}} +{{name}} | {{#values}}{{.}}{{^-last}}, {{/-last}}{{/values}}{{/allowableValues}} +{{/isEnum}}{{/vars}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/enum_doc.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/enum_doc.mustache new file mode 100644 index 000000000000..fcb3d7e61aa6 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/enum_doc.mustache @@ -0,0 +1,7 @@ +# {{classname}} + +## Enum + +{{#allowableValues}}{{#enumVars}} + * `{{name}}` (value: `{{{value}}}`) +{{/enumVars}}{{/allowableValues}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/model_doc.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/model_doc.mustache new file mode 100644 index 000000000000..e3b718421188 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/model_doc.mustache @@ -0,0 +1,3 @@ +{{#models}}{{#model}} +{{#isEnum}}{{>enum_doc}}{{/isEnum}}{{^isEnum}}{{>class_doc}}{{/isEnum}} +{{/model}}{{/models}} diff --git a/samples/server/petstore/kotlin-misk/docs/ApiResponse.md b/samples/server/petstore/kotlin-misk/docs/ApiResponse.md new file mode 100644 index 000000000000..12f08d5cdef0 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/docs/ApiResponse.md @@ -0,0 +1,12 @@ + +# ModelApiResponse + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**code** | **kotlin.Int** | | [optional] +**type** | **kotlin.String** | | [optional] +**message** | **kotlin.String** | | [optional] + + + diff --git a/samples/server/petstore/kotlin-misk/docs/Category.md b/samples/server/petstore/kotlin-misk/docs/Category.md new file mode 100644 index 000000000000..2c28a670fc79 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/docs/Category.md @@ -0,0 +1,11 @@ + +# Category + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**id** | **kotlin.Long** | | [optional] +**name** | **kotlin.String** | | [optional] + + + diff --git a/samples/server/petstore/kotlin-misk/docs/Order.md b/samples/server/petstore/kotlin-misk/docs/Order.md new file mode 100644 index 000000000000..c0c951b22d33 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/docs/Order.md @@ -0,0 +1,22 @@ + +# Order + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**id** | **kotlin.Long** | | [optional] +**petId** | **kotlin.Long** | | [optional] +**quantity** | **kotlin.Int** | | [optional] +**shipDate** | [**java.time.OffsetDateTime**](java.time.OffsetDateTime.md) | | [optional] +**status** | [**inline**](#Status) | Order Status | [optional] +**complete** | **kotlin.Boolean** | | [optional] + + + +## Enum: status +Name | Value +---- | ----- +status | placed, approved, delivered + + + diff --git a/samples/server/petstore/kotlin-misk/docs/Pet.md b/samples/server/petstore/kotlin-misk/docs/Pet.md new file mode 100644 index 000000000000..e60adf1fc22f --- /dev/null +++ b/samples/server/petstore/kotlin-misk/docs/Pet.md @@ -0,0 +1,22 @@ + +# Pet + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**name** | **kotlin.String** | | +**photoUrls** | **kotlin.Array<kotlin.String>** | | +**id** | **kotlin.Long** | | [optional] +**category** | [**Category**](Category.md) | | [optional] +**tags** | [**kotlin.Array<Tag>**](Tag.md) | | [optional] +**status** | [**inline**](#Status) | pet status in the store | [optional] + + + +## Enum: status +Name | Value +---- | ----- +status | available, pending, sold + + + diff --git a/samples/server/petstore/kotlin-misk/docs/Tag.md b/samples/server/petstore/kotlin-misk/docs/Tag.md new file mode 100644 index 000000000000..60ce1bcdbad3 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/docs/Tag.md @@ -0,0 +1,11 @@ + +# Tag + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**id** | **kotlin.Long** | | [optional] +**name** | **kotlin.String** | | [optional] + + + diff --git a/samples/server/petstore/kotlin-misk/docs/User.md b/samples/server/petstore/kotlin-misk/docs/User.md new file mode 100644 index 000000000000..e801729b5ed1 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/docs/User.md @@ -0,0 +1,17 @@ + +# User + +## Properties +Name | Type | Description | Notes +------------ | ------------- | ------------- | ------------- +**id** | **kotlin.Long** | | [optional] +**username** | **kotlin.String** | | [optional] +**firstName** | **kotlin.String** | | [optional] +**lastName** | **kotlin.String** | | [optional] +**email** | **kotlin.String** | | [optional] +**password** | **kotlin.String** | | [optional] +**phone** | **kotlin.String** | | [optional] +**userStatus** | **kotlin.Int** | User Status | [optional] + + + From d132bcd61e45e9bc67abc06f7cbe4e2ba7399165 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Thu, 20 Mar 2025 11:55:45 +0000 Subject: [PATCH 060/102] adding documentation --- .../codegen/languages/KotlinMiskServerCodegen.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 452995b6fd0c..07ed533cab6c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -78,20 +78,25 @@ public KotlinMiskServerCodegen() { embeddedTemplateDir = templateDir = "kotlin-misk"; generatorMetadata = GeneratorMetadata.newBuilder(generatorMetadata) - .stability(Stability.BETA) + .stability(Stability.STABLE) .build(); outputFolder = "generated-code" + File.separator + "kotlin-misk"; apiTestTemplateFiles.clear(); + + apiDocTemplateFiles.clear(); + apiDocTemplateFiles.put("api_doc.md", ".md"); + modelDocTemplateFiles.clear(); + modelDocTemplateFiles.put("model_doc.mustache", ".md"); + supportingFiles.clear(); apiTemplateFiles.clear(); apiTemplateFiles.put("apiController.mustache", "Controller.kt"); apiTemplateFiles.put("apiImpl.mustache", "Impl.kt"); apiTemplateFiles.put("apiInterface.mustache", ".kt"); - //modelTemplateFiles.put("model.mustache", ".proto"); modelTemplateFiles.put("model.mustache", ".kt"); apiPackage = rootPackage + ".api"; From 553f791ca69c2f03106c422ae28b79d27e357dbb Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Thu, 20 Mar 2025 12:23:06 +0000 Subject: [PATCH 061/102] removing swagger annotations --- .../kotlin-misk/apiController.mustache | 21 ++------------- .../KotlinMiskServerCodegenModelTest.java | 1 + .../kotlin-misk/.openapi-generator/FILES | 7 ++++- .../server/api/api/PetApiController.kt | 26 +++++++++---------- .../openapitools/server/api/api/PetApiImpl.kt | 4 +-- .../server/api/api/StoreApiController.kt | 12 ++++----- .../server/api/api/UserApiController.kt | 26 +++++++++---------- 7 files changed, 43 insertions(+), 54 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 2a4166a5d62f..b128c3ee536d 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -65,31 +65,14 @@ import okhttp3.Headers private val {{classname}} : {{classname}} ) : {{classname}}, WebAction { {{#operation}} - {{#swagger2AnnotationLibrary}} - @Operation( - summary = "{{{summary}}}", - operationId = "{{{operationId}}}", - description = """{{{unescapedNotes}}}""", - responses = [{{#responses}} - ApiResponse(responseCode = "{{{code}}}", description = "{{{message}}}"{{#baseType}}, content = [Content({{#isArray}}array = ArraySchema({{/isArray}}schema = Schema(implementation = {{{baseType}}}::class)){{#isArray}}){{/isArray}}]{{/baseType}}){{^-last}},{{/-last}}{{/responses}} ]{{#hasAuthMethods}}, - security = [ {{#authMethods}}SecurityRequirement(name = "{{name}}"{{#isOAuth}}, scopes = [ {{#scopes}}"{{scope}}"{{^-last}}, {{/-last}}{{/scopes}} ]{{/isOAuth}}){{^-last}},{{/-last}}{{/authMethods}} ]{{/hasAuthMethods}} - ){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}} - @ApiOperation( - value = "{{{summary}}}", - nickname = "{{{operationId}}}", - notes = "{{{notes}}}"{{#returnBaseType}}, - response = {{{.}}}::class{{/returnBaseType}}{{#returnContainer}}, - responseContainer = "{{{.}}}"{{/returnContainer}}{{#hasAuthMethods}}, - authorizations = [{{#authMethods}}Authorization(value = "{{name}}"{{#isOAuth}}, scopes = [{{#scopes}}AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{^-last}}, {{/-last}}{{/scopes}}]{{/isOAuth}}){{^-last}}, {{/-last}}{{/authMethods}}]{{/hasAuthMethods}}) - @ApiResponses( - value = [{{#responses}}ApiResponse(code = {{{code}}}, message = "{{{message}}}"{{#baseType}}, response = {{{.}}}::class{{/baseType}}{{#containerType}}, responseContainer = "{{{.}}}"{{/containerType}}){{^-last}},{{/-last}}{{/responses}}]){{/swagger1AnnotationLibrary}} + @{{httpMethod}}("{{path}}") @Description("{{{summary}}}"){{#hasConsumes}} @RequestContentType({{#consumes}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/consumes}}){{/hasConsumes}}{{#hasProduces}} @ResponseContentType({{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}){{/hasProduces}} @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") - override fun {{operationId}}({{#allParams}}{{#isQueryParam}}@QueryParam {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}@PathParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}} @RequestHeaders headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{#isBodyParam}}@RequestBody{{^required}}(required = false){{/required}} {{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{^-last}},{{/-last}}{{/allParams}}) = + override fun {{operationId}}({{#allParams}}{{#isQueryParam}}@QueryParam {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}@PathParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}} @RequestHeaders headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{#isBodyParam}}@RequestBody(required = {{^required}}false{{/required}}{{#required}}false{{/required}}) {{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{^-last}},{{/-last}}{{/allParams}}) = {{classname}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) {{/operation}} } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenModelTest.java index 04475cba399a..a328b7441ebb 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenModelTest.java @@ -33,6 +33,7 @@ public void simpleModelTest() throws IOException { generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false"); generator.setGeneratorPropertyDefault(CodegenConstants.APIS, "false"); generator.setGeneratorPropertyDefault(CodegenConstants.SUPPORTING_FILES, "false"); + generator.setGeneratorPropertyDefault(CodegenConstants.ENABLE_POST_PROCESS_FILE, "true"); List files = generator.opts(input).generate(); diff --git a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES index 65bb27c7421a..463c69719c47 100644 --- a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES @@ -1,6 +1,11 @@ -.openapi-generator-ignore README.md build.gradle.kts +docs/ApiResponse.md +docs/Category.md +docs/Order.md +docs/Pet.md +docs/Tag.md +docs/User.md settings.gradle.kts src/main/kotlin/org/openapitools/server/api/api/PetApi.kt src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt index 2d83eca2cf66..1c9307fc9ab9 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt @@ -28,7 +28,7 @@ import okhttp3.Headers @Singleton class PetApiController @Inject constructor( // @TODO("camelCase this") - private val PetApi : PetApi + private val : PetApi ) : PetApi, WebAction { @Post("/pet") @@ -37,15 +37,15 @@ import okhttp3.Headers @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") - override fun addPet(@RequestBody pet: Pet) = - PetApi.addPet(pet) + override fun addPet(@RequestBody(required = false) pet: Pet) = + .addPet(pet) @Delete("/pet/{petId}") @Description("Deletes a pet") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun deletePet(@PathParam("petId") petId: kotlin.Long, @RequestHeaders headers: Headers) = - PetApi.deletePet(petId, apiKey) + .deletePet(petId, apiKey) @Get("/pet/findByStatus") @Description("Finds Pets by status") @@ -53,7 +53,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun findPetsByStatus(@QueryParam status: kotlin.Array) = - PetApi.findPetsByStatus(status) + .findPetsByStatus(status) @Get("/pet/findByTags") @Description("Finds Pets by tags") @@ -61,7 +61,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun findPetsByTags(@QueryParam tags: kotlin.Array) = - PetApi.findPetsByTags(tags) + .findPetsByTags(tags) @Get("/pet/{petId}") @Description("Find pet by ID") @@ -69,7 +69,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun getPetById(@PathParam("petId") petId: kotlin.Long) = - PetApi.getPetById(petId) + .getPetById(petId) @Put("/pet") @Description("Update an existing pet") @@ -77,16 +77,16 @@ import okhttp3.Headers @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") - override fun updatePet(@RequestBody pet: Pet) = - PetApi.updatePet(pet) + override fun updatePet(@RequestBody(required = false) pet: Pet) = + .updatePet(pet) @Post("/pet/{petId}") @Description("Updates a pet in the store with form data") @RequestContentType() @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") - override fun updatePetWithForm(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "name") name: kotlin.String? , @QueryParam(value = "status") status: kotlin.String? ) = - PetApi.updatePetWithForm(petId, name, status) + override fun updatePetWithForm(@PathParam("petId") petId: kotlin.Long,,) = + .updatePetWithForm(petId, name, status) @Post("/pet/{petId}/uploadImage") @Description("uploads an image") @@ -94,6 +94,6 @@ import okhttp3.Headers @ResponseContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") - override fun uploadFile(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "additionalMetadata") additionalMetadata: kotlin.String? , file: HttpCall) = - PetApi.uploadFile(petId, additionalMetadata, file) + override fun uploadFile(@PathParam("petId") petId: kotlin.Long,,) = + .uploadFile(petId, additionalMetadata, file) } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt index ab5a6c215f9f..ce271f22f50d 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt @@ -38,11 +38,11 @@ class PetApiImpl @Inject constructor( TODO() } - override fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) { + override fun updatePetWithForm(petId: kotlin.Long, , ) { TODO() } - override fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, ): ModelApiResponse { + override fun uploadFile(petId: kotlin.Long, , ): ModelApiResponse { TODO() } } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt index 793fa0cdb932..3c4cd1f33b84 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt @@ -27,7 +27,7 @@ import okhttp3.Headers @Singleton class StoreApiController @Inject constructor( // @TODO("camelCase this") - private val StoreApi : StoreApi + private val : StoreApi ) : StoreApi, WebAction { @Delete("/store/order/{orderId}") @@ -35,7 +35,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun deleteOrder(@PathParam("orderId") orderId: kotlin.String) = - StoreApi.deleteOrder(orderId) + .deleteOrder(orderId) @Get("/store/inventory") @Description("Returns pet inventories by status") @@ -43,7 +43,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun getInventory() = - StoreApi.getInventory() + .getInventory() @Get("/store/order/{orderId}") @Description("Find purchase order by ID") @@ -51,7 +51,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun getOrderById(@PathParam("orderId") orderId: kotlin.Long) = - StoreApi.getOrderById(orderId) + .getOrderById(orderId) @Post("/store/order") @Description("Place an order for a pet") @@ -59,6 +59,6 @@ import okhttp3.Headers @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") - override fun placeOrder(@RequestBody order: Order) = - StoreApi.placeOrder(order) + override fun placeOrder(@RequestBody(required = false) order: Order) = + .placeOrder(order) } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt index 3dffbf663823..9ecd888c2c93 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt @@ -27,7 +27,7 @@ import okhttp3.Headers @Singleton class UserApiController @Inject constructor( // @TODO("camelCase this") - private val UserApi : UserApi + private val : UserApi ) : UserApi, WebAction { @Post("/user") @@ -35,31 +35,31 @@ import okhttp3.Headers @RequestContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") - override fun createUser(@RequestBody user: User) = - UserApi.createUser(user) + override fun createUser(@RequestBody(required = false) user: User) = + .createUser(user) @Post("/user/createWithArray") @Description("Creates list of users with given input array") @RequestContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") - override fun createUsersWithArrayInput(@RequestBody user: kotlin.Array) = - UserApi.createUsersWithArrayInput(user) + override fun createUsersWithArrayInput(@RequestBody(required = false) user: kotlin.Array) = + .createUsersWithArrayInput(user) @Post("/user/createWithList") @Description("Creates list of users with given input array") @RequestContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") - override fun createUsersWithListInput(@RequestBody user: kotlin.Array) = - UserApi.createUsersWithListInput(user) + override fun createUsersWithListInput(@RequestBody(required = false) user: kotlin.Array) = + .createUsersWithListInput(user) @Delete("/user/{username}") @Description("Delete user") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun deleteUser(@PathParam("username") username: kotlin.String) = - UserApi.deleteUser(username) + .deleteUser(username) @Get("/user/{username}") @Description("Get user by user name") @@ -67,7 +67,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun getUserByName(@PathParam("username") username: kotlin.String) = - UserApi.getUserByName(username) + .getUserByName(username) @Get("/user/login") @Description("Logs user into the system") @@ -75,20 +75,20 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun loginUser(@QueryParam username: kotlin.String,@QueryParam password: kotlin.String) = - UserApi.loginUser(username, password) + .loginUser(username, password) @Get("/user/logout") @Description("Logs out current logged in user session") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun logoutUser() = - UserApi.logoutUser() + .logoutUser() @Put("/user/{username}") @Description("Updated user") @RequestContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") - override fun updateUser(@PathParam("username") username: kotlin.String,@RequestBody user: User) = - UserApi.updateUser(username, user) + override fun updateUser(@PathParam("username") username: kotlin.String,@RequestBody(required = false) user: User) = + .updateUser(username, user) } From d00d82ac7fe180befcedb133f4f265c9a43f661f Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Thu, 20 Mar 2025 12:54:11 +0000 Subject: [PATCH 062/102] adding tests --- .../languages/KotlinMiskServerCodegen.java | 3 +- .../resources/kotlin-misk/api_test.mustache | 35 ++ .../kotlin-misk/.openapi-generator/FILES | 6 + .../petstore/kotlin-misk/docs/PetApi.md | 400 ++++++++++++++++++ .../petstore/kotlin-misk/docs/StoreApi.md | 195 +++++++++ .../petstore/kotlin-misk/docs/UserApi.md | 386 +++++++++++++++++ .../server/api/api/PetApiController.kt | 18 +- .../server/api/api/StoreApiController.kt | 10 +- .../server/api/api/UserApiController.kt | 18 +- .../openapitools/server/api/api/PetApiTest.kt | 105 +++++ .../server/api/api/StoreApiTest.kt | 58 +++ .../server/api/api/UserApiTest.kt | 100 +++++ 12 files changed, 1310 insertions(+), 24 deletions(-) create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache create mode 100644 samples/server/petstore/kotlin-misk/docs/PetApi.md create mode 100644 samples/server/petstore/kotlin-misk/docs/StoreApi.md create mode 100644 samples/server/petstore/kotlin-misk/docs/UserApi.md create mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt create mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt create mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 07ed533cab6c..bb1840048669 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -84,9 +84,10 @@ public KotlinMiskServerCodegen() { outputFolder = "generated-code" + File.separator + "kotlin-misk"; apiTestTemplateFiles.clear(); + apiTestTemplateFiles.put("api_test.mustache", ".kt"); apiDocTemplateFiles.clear(); - apiDocTemplateFiles.put("api_doc.md", ".md"); + apiDocTemplateFiles.put("api_doc.mustache", ".md"); modelDocTemplateFiles.clear(); modelDocTemplateFiles.put("model_doc.mustache", ".md"); diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache new file mode 100644 index 000000000000..661dd2660b1e --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache @@ -0,0 +1,35 @@ +package {{package}} + +{{#imports}}import {{import}} +{{/imports}} +import jakarta.inject.Inject +import misk.testing.MiskTest +import misk.testing.MiskTestModule +import misk.web.WebTestClient + +import org.junit.jupiter.api.Test + +@MiskTest(startService = true) +internal class {{classname}}Test { + + @MiskTestModule val module = GambitTestingModule() + + @Inject private lateinit var webTestClient: WebTestClient + + {{#operations}} + {{#operation}} + /** + * To test {{classname}}Controller.{{operationId}} + */ + @Test + fun `should handle {{operationId}}`() { + {{#allParams}} + val {{{paramName}}}: {{>optionalDataType}} = TODO() + {{/allParams}} + val response: {{#returnType}}: {{{returnType}}}{{/returnType}} = webTestClient.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) + + TODO() + } + {{/operation}} + {{/operations}} +} diff --git a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES index 463c69719c47..03666ae7a7f2 100644 --- a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES @@ -4,8 +4,11 @@ docs/ApiResponse.md docs/Category.md docs/Order.md docs/Pet.md +docs/PetApi.md +docs/StoreApi.md docs/Tag.md docs/User.md +docs/UserApi.md settings.gradle.kts src/main/kotlin/org/openapitools/server/api/api/PetApi.kt src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt @@ -22,3 +25,6 @@ src/main/kotlin/org/openapitools/server/api/model/Order.kt src/main/kotlin/org/openapitools/server/api/model/Pet.kt src/main/kotlin/org/openapitools/server/api/model/Tag.kt src/main/kotlin/org/openapitools/server/api/model/User.kt +src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt +src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt +src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt diff --git a/samples/server/petstore/kotlin-misk/docs/PetApi.md b/samples/server/petstore/kotlin-misk/docs/PetApi.md new file mode 100644 index 000000000000..db516a07d4ac --- /dev/null +++ b/samples/server/petstore/kotlin-misk/docs/PetApi.md @@ -0,0 +1,400 @@ +# PetApi + +All URIs are relative to *http://petstore.swagger.io/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**addPet**](PetApi.md#addPet) | **Post** /pet | Add a new pet to the store +[**deletePet**](PetApi.md#deletePet) | **Delete** /pet/{petId} | Deletes a pet +[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **Get** /pet/findByStatus | Finds Pets by status +[**findPetsByTags**](PetApi.md#findPetsByTags) | **Get** /pet/findByTags | Finds Pets by tags +[**getPetById**](PetApi.md#getPetById) | **Get** /pet/{petId} | Find pet by ID +[**updatePet**](PetApi.md#updatePet) | **Put** /pet | Update an existing pet +[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **Post** /pet/{petId} | Updates a pet in the store with form data +[**uploadFile**](PetApi.md#uploadFile) | **Post** /pet/{petId}/uploadImage | uploads an image + + + +# **addPet** +> Pet addPet(pet) + +Add a new pet to the store + + + +### Example +```kotlin +// Import classes: +//import org.openapitools.infrastructure.* +//import org.openapitools.server.api.model.* + +val apiInstance = PetApi() +val pet : Pet = // Pet | Pet object that needs to be added to the store +try { + val result : Pet = apiInstance.addPet(pet) + println(result) +} catch (e: ClientException) { + println("4xx response calling PetApi#addPet") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling PetApi#addPet") + e.printStackTrace() +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **pet** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | + +### Return type + +[**Pet**](Pet.md) + +### Authorization + +[petstore_auth](../README.md#petstore_auth) + +### HTTP request headers + + - **Content-Type**: MediaTypes.APPLICATION_JSON, MediaTypes.APPLICATION_XML + - **Accept**: MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON + + +# **deletePet** +> deletePet(petId, apiKey) + +Deletes a pet + + + +### Example +```kotlin +// Import classes: +//import org.openapitools.infrastructure.* +//import org.openapitools.server.api.model.* + +val apiInstance = PetApi() +val petId : kotlin.Long = 789 // kotlin.Long | Pet id to delete +val apiKey : kotlin.String = apiKey_example // kotlin.String | +try { + apiInstance.deletePet(petId, apiKey) +} catch (e: ClientException) { + println("4xx response calling PetApi#deletePet") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling PetApi#deletePet") + e.printStackTrace() +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | **kotlin.Long**| Pet id to delete | + **apiKey** | **kotlin.String**| | [optional] + +### Return type + +null (empty response body) + +### Authorization + +[petstore_auth](../README.md#petstore_auth) + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: Not defined + + +# **findPetsByStatus** +> kotlin.Array<Pet> findPetsByStatus(status) + +Finds Pets by status + +Multiple status values can be provided with comma separated strings + +### Example +```kotlin +// Import classes: +//import org.openapitools.infrastructure.* +//import org.openapitools.server.api.model.* + +val apiInstance = PetApi() +val status : kotlin.Array = // kotlin.Array | Status values that need to be considered for filter +try { + val result : kotlin.Array = apiInstance.findPetsByStatus(status) + println(result) +} catch (e: ClientException) { + println("4xx response calling PetApi#findPetsByStatus") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling PetApi#findPetsByStatus") + e.printStackTrace() +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **status** | [**kotlin.Array<kotlin.String>**](kotlin.String.md)| Status values that need to be considered for filter | [enum: available, pending, sold] + +### Return type + +[**kotlin.Array<Pet>**](Pet.md) + +### Authorization + +[petstore_auth](../README.md#petstore_auth) + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON + + +# **findPetsByTags** +> kotlin.Array<Pet> findPetsByTags(tags) + +Finds Pets by tags + +Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + +### Example +```kotlin +// Import classes: +//import org.openapitools.infrastructure.* +//import org.openapitools.server.api.model.* + +val apiInstance = PetApi() +val tags : kotlin.Array = // kotlin.Array | Tags to filter by +try { + val result : kotlin.Array = apiInstance.findPetsByTags(tags) + println(result) +} catch (e: ClientException) { + println("4xx response calling PetApi#findPetsByTags") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling PetApi#findPetsByTags") + e.printStackTrace() +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **tags** | [**kotlin.Array<kotlin.String>**](kotlin.String.md)| Tags to filter by | + +### Return type + +[**kotlin.Array<Pet>**](Pet.md) + +### Authorization + +[petstore_auth](../README.md#petstore_auth) + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON + + +# **getPetById** +> Pet getPetById(petId) + +Find pet by ID + +Returns a single pet + +### Example +```kotlin +// Import classes: +//import org.openapitools.infrastructure.* +//import org.openapitools.server.api.model.* + +val apiInstance = PetApi() +val petId : kotlin.Long = 789 // kotlin.Long | ID of pet to return +try { + val result : Pet = apiInstance.getPetById(petId) + println(result) +} catch (e: ClientException) { + println("4xx response calling PetApi#getPetById") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling PetApi#getPetById") + e.printStackTrace() +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | **kotlin.Long**| ID of pet to return | + +### Return type + +[**Pet**](Pet.md) + +### Authorization + +[api_key](../README.md#api_key) + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON + + +# **updatePet** +> Pet updatePet(pet) + +Update an existing pet + + + +### Example +```kotlin +// Import classes: +//import org.openapitools.infrastructure.* +//import org.openapitools.server.api.model.* + +val apiInstance = PetApi() +val pet : Pet = // Pet | Pet object that needs to be added to the store +try { + val result : Pet = apiInstance.updatePet(pet) + println(result) +} catch (e: ClientException) { + println("4xx response calling PetApi#updatePet") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling PetApi#updatePet") + e.printStackTrace() +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **pet** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | + +### Return type + +[**Pet**](Pet.md) + +### Authorization + +[petstore_auth](../README.md#petstore_auth) + +### HTTP request headers + + - **Content-Type**: MediaTypes.APPLICATION_JSON, MediaTypes.APPLICATION_XML + - **Accept**: MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON + + +# **updatePetWithForm** +> updatePetWithForm(petId, name, status) + +Updates a pet in the store with form data + + + +### Example +```kotlin +// Import classes: +//import org.openapitools.infrastructure.* +//import org.openapitools.server.api.model.* + +val apiInstance = PetApi() +val petId : kotlin.Long = 789 // kotlin.Long | ID of pet that needs to be updated +val name : kotlin.String = name_example // kotlin.String | Updated name of the pet +val status : kotlin.String = status_example // kotlin.String | Updated status of the pet +try { + apiInstance.updatePetWithForm(petId, name, status) +} catch (e: ClientException) { + println("4xx response calling PetApi#updatePetWithForm") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling PetApi#updatePetWithForm") + e.printStackTrace() +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | **kotlin.Long**| ID of pet that needs to be updated | + **name** | **kotlin.String**| Updated name of the pet | [optional] + **status** | **kotlin.String**| Updated status of the pet | [optional] + +### Return type + +null (empty response body) + +### Authorization + +[petstore_auth](../README.md#petstore_auth) + +### HTTP request headers + + - **Content-Type**: + - **Accept**: Not defined + + +# **uploadFile** +> ModelApiResponse uploadFile(petId, additionalMetadata, file) + +uploads an image + + + +### Example +```kotlin +// Import classes: +//import org.openapitools.infrastructure.* +//import org.openapitools.server.api.model.* + +val apiInstance = PetApi() +val petId : kotlin.Long = 789 // kotlin.Long | ID of pet to update +val additionalMetadata : kotlin.String = additionalMetadata_example // kotlin.String | Additional data to pass to server +val file : java.io.File = BINARY_DATA_HERE // java.io.File | file to upload +try { + val result : ModelApiResponse = apiInstance.uploadFile(petId, additionalMetadata, file) + println(result) +} catch (e: ClientException) { + println("4xx response calling PetApi#uploadFile") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling PetApi#uploadFile") + e.printStackTrace() +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **petId** | **kotlin.Long**| ID of pet to update | + **additionalMetadata** | **kotlin.String**| Additional data to pass to server | [optional] + **file** | **java.io.File**| file to upload | [optional] + +### Return type + +[**ModelApiResponse**](ModelApiResponse.md) + +### Authorization + +[petstore_auth](../README.md#petstore_auth) + +### HTTP request headers + + - **Content-Type**: + - **Accept**: MediaTypes.APPLICATION_JSON + diff --git a/samples/server/petstore/kotlin-misk/docs/StoreApi.md b/samples/server/petstore/kotlin-misk/docs/StoreApi.md new file mode 100644 index 000000000000..9db1dbc5db63 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/docs/StoreApi.md @@ -0,0 +1,195 @@ +# StoreApi + +All URIs are relative to *http://petstore.swagger.io/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**deleteOrder**](StoreApi.md#deleteOrder) | **Delete** /store/order/{orderId} | Delete purchase order by ID +[**getInventory**](StoreApi.md#getInventory) | **Get** /store/inventory | Returns pet inventories by status +[**getOrderById**](StoreApi.md#getOrderById) | **Get** /store/order/{orderId} | Find purchase order by ID +[**placeOrder**](StoreApi.md#placeOrder) | **Post** /store/order | Place an order for a pet + + + +# **deleteOrder** +> deleteOrder(orderId) + +Delete purchase order by ID + +For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors + +### Example +```kotlin +// Import classes: +//import org.openapitools.infrastructure.* +//import org.openapitools.server.api.model.* + +val apiInstance = StoreApi() +val orderId : kotlin.String = orderId_example // kotlin.String | ID of the order that needs to be deleted +try { + apiInstance.deleteOrder(orderId) +} catch (e: ClientException) { + println("4xx response calling StoreApi#deleteOrder") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling StoreApi#deleteOrder") + e.printStackTrace() +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **orderId** | **kotlin.String**| ID of the order that needs to be deleted | + +### Return type + +null (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: Not defined + + +# **getInventory** +> kotlin.collections.Map<kotlin.String, kotlin.Int> getInventory() + +Returns pet inventories by status + +Returns a map of status codes to quantities + +### Example +```kotlin +// Import classes: +//import org.openapitools.infrastructure.* +//import org.openapitools.server.api.model.* + +val apiInstance = StoreApi() +try { + val result : kotlin.collections.Map = apiInstance.getInventory() + println(result) +} catch (e: ClientException) { + println("4xx response calling StoreApi#getInventory") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling StoreApi#getInventory") + e.printStackTrace() +} +``` + +### Parameters +This endpoint does not need any parameter. + +### Return type + +**kotlin.collections.Map<kotlin.String, kotlin.Int>** + +### Authorization + +[api_key](../README.md#api_key) + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: MediaTypes.APPLICATION_JSON + + +# **getOrderById** +> Order getOrderById(orderId) + +Find purchase order by ID + +For valid response try integer IDs with value <= 5 or > 10. Other values will generate exceptions + +### Example +```kotlin +// Import classes: +//import org.openapitools.infrastructure.* +//import org.openapitools.server.api.model.* + +val apiInstance = StoreApi() +val orderId : kotlin.Long = 789 // kotlin.Long | ID of pet that needs to be fetched +try { + val result : Order = apiInstance.getOrderById(orderId) + println(result) +} catch (e: ClientException) { + println("4xx response calling StoreApi#getOrderById") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling StoreApi#getOrderById") + e.printStackTrace() +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **orderId** | **kotlin.Long**| ID of pet that needs to be fetched | + +### Return type + +[**Order**](Order.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON + + +# **placeOrder** +> Order placeOrder(order) + +Place an order for a pet + + + +### Example +```kotlin +// Import classes: +//import org.openapitools.infrastructure.* +//import org.openapitools.server.api.model.* + +val apiInstance = StoreApi() +val order : Order = // Order | order placed for purchasing the pet +try { + val result : Order = apiInstance.placeOrder(order) + println(result) +} catch (e: ClientException) { + println("4xx response calling StoreApi#placeOrder") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling StoreApi#placeOrder") + e.printStackTrace() +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **order** | [**Order**](Order.md)| order placed for purchasing the pet | + +### Return type + +[**Order**](Order.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: MediaTypes.APPLICATION_JSON + - **Accept**: MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON + diff --git a/samples/server/petstore/kotlin-misk/docs/UserApi.md b/samples/server/petstore/kotlin-misk/docs/UserApi.md new file mode 100644 index 000000000000..ffa499929412 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/docs/UserApi.md @@ -0,0 +1,386 @@ +# UserApi + +All URIs are relative to *http://petstore.swagger.io/v2* + +Method | HTTP request | Description +------------- | ------------- | ------------- +[**createUser**](UserApi.md#createUser) | **Post** /user | Create user +[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **Post** /user/createWithArray | Creates list of users with given input array +[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **Post** /user/createWithList | Creates list of users with given input array +[**deleteUser**](UserApi.md#deleteUser) | **Delete** /user/{username} | Delete user +[**getUserByName**](UserApi.md#getUserByName) | **Get** /user/{username} | Get user by user name +[**loginUser**](UserApi.md#loginUser) | **Get** /user/login | Logs user into the system +[**logoutUser**](UserApi.md#logoutUser) | **Get** /user/logout | Logs out current logged in user session +[**updateUser**](UserApi.md#updateUser) | **Put** /user/{username} | Updated user + + + +# **createUser** +> createUser(user) + +Create user + +This can only be done by the logged in user. + +### Example +```kotlin +// Import classes: +//import org.openapitools.infrastructure.* +//import org.openapitools.server.api.model.* + +val apiInstance = UserApi() +val user : User = // User | Created user object +try { + apiInstance.createUser(user) +} catch (e: ClientException) { + println("4xx response calling UserApi#createUser") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling UserApi#createUser") + e.printStackTrace() +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | [**User**](User.md)| Created user object | + +### Return type + +null (empty response body) + +### Authorization + +[api_key](../README.md#api_key) + +### HTTP request headers + + - **Content-Type**: MediaTypes.APPLICATION_JSON + - **Accept**: Not defined + + +# **createUsersWithArrayInput** +> createUsersWithArrayInput(user) + +Creates list of users with given input array + + + +### Example +```kotlin +// Import classes: +//import org.openapitools.infrastructure.* +//import org.openapitools.server.api.model.* + +val apiInstance = UserApi() +val user : kotlin.Array = // kotlin.Array | List of user object +try { + apiInstance.createUsersWithArrayInput(user) +} catch (e: ClientException) { + println("4xx response calling UserApi#createUsersWithArrayInput") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling UserApi#createUsersWithArrayInput") + e.printStackTrace() +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | [**kotlin.Array<User>**](User.md)| List of user object | + +### Return type + +null (empty response body) + +### Authorization + +[api_key](../README.md#api_key) + +### HTTP request headers + + - **Content-Type**: MediaTypes.APPLICATION_JSON + - **Accept**: Not defined + + +# **createUsersWithListInput** +> createUsersWithListInput(user) + +Creates list of users with given input array + + + +### Example +```kotlin +// Import classes: +//import org.openapitools.infrastructure.* +//import org.openapitools.server.api.model.* + +val apiInstance = UserApi() +val user : kotlin.Array = // kotlin.Array | List of user object +try { + apiInstance.createUsersWithListInput(user) +} catch (e: ClientException) { + println("4xx response calling UserApi#createUsersWithListInput") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling UserApi#createUsersWithListInput") + e.printStackTrace() +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **user** | [**kotlin.Array<User>**](User.md)| List of user object | + +### Return type + +null (empty response body) + +### Authorization + +[api_key](../README.md#api_key) + +### HTTP request headers + + - **Content-Type**: MediaTypes.APPLICATION_JSON + - **Accept**: Not defined + + +# **deleteUser** +> deleteUser(username) + +Delete user + +This can only be done by the logged in user. + +### Example +```kotlin +// Import classes: +//import org.openapitools.infrastructure.* +//import org.openapitools.server.api.model.* + +val apiInstance = UserApi() +val username : kotlin.String = username_example // kotlin.String | The name that needs to be deleted +try { + apiInstance.deleteUser(username) +} catch (e: ClientException) { + println("4xx response calling UserApi#deleteUser") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling UserApi#deleteUser") + e.printStackTrace() +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | **kotlin.String**| The name that needs to be deleted | + +### Return type + +null (empty response body) + +### Authorization + +[api_key](../README.md#api_key) + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: Not defined + + +# **getUserByName** +> User getUserByName(username) + +Get user by user name + + + +### Example +```kotlin +// Import classes: +//import org.openapitools.infrastructure.* +//import org.openapitools.server.api.model.* + +val apiInstance = UserApi() +val username : kotlin.String = username_example // kotlin.String | The name that needs to be fetched. Use user1 for testing. +try { + val result : User = apiInstance.getUserByName(username) + println(result) +} catch (e: ClientException) { + println("4xx response calling UserApi#getUserByName") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling UserApi#getUserByName") + e.printStackTrace() +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | **kotlin.String**| The name that needs to be fetched. Use user1 for testing. | + +### Return type + +[**User**](User.md) + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON + + +# **loginUser** +> kotlin.String loginUser(username, password) + +Logs user into the system + + + +### Example +```kotlin +// Import classes: +//import org.openapitools.infrastructure.* +//import org.openapitools.server.api.model.* + +val apiInstance = UserApi() +val username : kotlin.String = username_example // kotlin.String | The user name for login +val password : kotlin.String = password_example // kotlin.String | The password for login in clear text +try { + val result : kotlin.String = apiInstance.loginUser(username, password) + println(result) +} catch (e: ClientException) { + println("4xx response calling UserApi#loginUser") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling UserApi#loginUser") + e.printStackTrace() +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | **kotlin.String**| The user name for login | + **password** | **kotlin.String**| The password for login in clear text | + +### Return type + +**kotlin.String** + +### Authorization + +No authorization required + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON + + +# **logoutUser** +> logoutUser() + +Logs out current logged in user session + + + +### Example +```kotlin +// Import classes: +//import org.openapitools.infrastructure.* +//import org.openapitools.server.api.model.* + +val apiInstance = UserApi() +try { + apiInstance.logoutUser() +} catch (e: ClientException) { + println("4xx response calling UserApi#logoutUser") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling UserApi#logoutUser") + e.printStackTrace() +} +``` + +### Parameters +This endpoint does not need any parameter. + +### Return type + +null (empty response body) + +### Authorization + +[api_key](../README.md#api_key) + +### HTTP request headers + + - **Content-Type**: Not defined + - **Accept**: Not defined + + +# **updateUser** +> updateUser(username, user) + +Updated user + +This can only be done by the logged in user. + +### Example +```kotlin +// Import classes: +//import org.openapitools.infrastructure.* +//import org.openapitools.server.api.model.* + +val apiInstance = UserApi() +val username : kotlin.String = username_example // kotlin.String | name that need to be deleted +val user : User = // User | Updated user object +try { + apiInstance.updateUser(username, user) +} catch (e: ClientException) { + println("4xx response calling UserApi#updateUser") + e.printStackTrace() +} catch (e: ServerException) { + println("5xx response calling UserApi#updateUser") + e.printStackTrace() +} +``` + +### Parameters + +Name | Type | Description | Notes +------------- | ------------- | ------------- | ------------- + **username** | **kotlin.String**| name that need to be deleted | + **user** | [**User**](User.md)| Updated user object | + +### Return type + +null (empty response body) + +### Authorization + +[api_key](../README.md#api_key) + +### HTTP request headers + + - **Content-Type**: MediaTypes.APPLICATION_JSON + - **Accept**: Not defined + diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt index 1c9307fc9ab9..1065971c7df6 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt @@ -28,7 +28,7 @@ import okhttp3.Headers @Singleton class PetApiController @Inject constructor( // @TODO("camelCase this") - private val : PetApi + private val PetApi : PetApi ) : PetApi, WebAction { @Post("/pet") @@ -38,14 +38,14 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun addPet(@RequestBody(required = false) pet: Pet) = - .addPet(pet) + PetApi.addPet(pet) @Delete("/pet/{petId}") @Description("Deletes a pet") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun deletePet(@PathParam("petId") petId: kotlin.Long, @RequestHeaders headers: Headers) = - .deletePet(petId, apiKey) + PetApi.deletePet(petId, apiKey) @Get("/pet/findByStatus") @Description("Finds Pets by status") @@ -53,7 +53,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun findPetsByStatus(@QueryParam status: kotlin.Array) = - .findPetsByStatus(status) + PetApi.findPetsByStatus(status) @Get("/pet/findByTags") @Description("Finds Pets by tags") @@ -61,7 +61,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun findPetsByTags(@QueryParam tags: kotlin.Array) = - .findPetsByTags(tags) + PetApi.findPetsByTags(tags) @Get("/pet/{petId}") @Description("Find pet by ID") @@ -69,7 +69,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun getPetById(@PathParam("petId") petId: kotlin.Long) = - .getPetById(petId) + PetApi.getPetById(petId) @Put("/pet") @Description("Update an existing pet") @@ -78,7 +78,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun updatePet(@RequestBody(required = false) pet: Pet) = - .updatePet(pet) + PetApi.updatePet(pet) @Post("/pet/{petId}") @Description("Updates a pet in the store with form data") @@ -86,7 +86,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun updatePetWithForm(@PathParam("petId") petId: kotlin.Long,,) = - .updatePetWithForm(petId, name, status) + PetApi.updatePetWithForm(petId, name, status) @Post("/pet/{petId}/uploadImage") @Description("uploads an image") @@ -95,5 +95,5 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun uploadFile(@PathParam("petId") petId: kotlin.Long,,) = - .uploadFile(petId, additionalMetadata, file) + PetApi.uploadFile(petId, additionalMetadata, file) } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt index 3c4cd1f33b84..4559205d5d88 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt @@ -27,7 +27,7 @@ import okhttp3.Headers @Singleton class StoreApiController @Inject constructor( // @TODO("camelCase this") - private val : StoreApi + private val StoreApi : StoreApi ) : StoreApi, WebAction { @Delete("/store/order/{orderId}") @@ -35,7 +35,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun deleteOrder(@PathParam("orderId") orderId: kotlin.String) = - .deleteOrder(orderId) + StoreApi.deleteOrder(orderId) @Get("/store/inventory") @Description("Returns pet inventories by status") @@ -43,7 +43,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun getInventory() = - .getInventory() + StoreApi.getInventory() @Get("/store/order/{orderId}") @Description("Find purchase order by ID") @@ -51,7 +51,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun getOrderById(@PathParam("orderId") orderId: kotlin.Long) = - .getOrderById(orderId) + StoreApi.getOrderById(orderId) @Post("/store/order") @Description("Place an order for a pet") @@ -60,5 +60,5 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun placeOrder(@RequestBody(required = false) order: Order) = - .placeOrder(order) + StoreApi.placeOrder(order) } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt index 9ecd888c2c93..384738c163b2 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt @@ -27,7 +27,7 @@ import okhttp3.Headers @Singleton class UserApiController @Inject constructor( // @TODO("camelCase this") - private val : UserApi + private val UserApi : UserApi ) : UserApi, WebAction { @Post("/user") @@ -36,7 +36,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun createUser(@RequestBody(required = false) user: User) = - .createUser(user) + UserApi.createUser(user) @Post("/user/createWithArray") @Description("Creates list of users with given input array") @@ -44,7 +44,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun createUsersWithArrayInput(@RequestBody(required = false) user: kotlin.Array) = - .createUsersWithArrayInput(user) + UserApi.createUsersWithArrayInput(user) @Post("/user/createWithList") @Description("Creates list of users with given input array") @@ -52,14 +52,14 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun createUsersWithListInput(@RequestBody(required = false) user: kotlin.Array) = - .createUsersWithListInput(user) + UserApi.createUsersWithListInput(user) @Delete("/user/{username}") @Description("Delete user") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun deleteUser(@PathParam("username") username: kotlin.String) = - .deleteUser(username) + UserApi.deleteUser(username) @Get("/user/{username}") @Description("Get user by user name") @@ -67,7 +67,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun getUserByName(@PathParam("username") username: kotlin.String) = - .getUserByName(username) + UserApi.getUserByName(username) @Get("/user/login") @Description("Logs user into the system") @@ -75,14 +75,14 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun loginUser(@QueryParam username: kotlin.String,@QueryParam password: kotlin.String) = - .loginUser(username, password) + UserApi.loginUser(username, password) @Get("/user/logout") @Description("Logs out current logged in user session") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun logoutUser() = - .logoutUser() + UserApi.logoutUser() @Put("/user/{username}") @Description("Updated user") @@ -90,5 +90,5 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun updateUser(@PathParam("username") username: kotlin.String,@RequestBody(required = false) user: User) = - .updateUser(username, user) + UserApi.updateUser(username, user) } diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt new file mode 100644 index 000000000000..0237602aff61 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt @@ -0,0 +1,105 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.ModelApiResponse +import org.openapitools.server.api.model.Pet +import jakarta.inject.Inject +import misk.testing.MiskTest +import misk.testing.MiskTestModule +import misk.web.WebTestClient + + +import org.junit.jupiter.api.Test + +@MiskTest(startService = true) +internal class PetApiTest { + + @MiskTestModule val module = GambitTestingModule() + + @Inject private lateinit var webTestClient: WebTestClient + + /** + * To test PetApiController.addPet + */ + @Test + fun `should handle addPet`() { + val pet: Pet = TODO() + val response: : Pet = webTestClient.addPet(pet) + + TODO() + } + /** + * To test PetApiController.deletePet + */ + @Test + fun `should handle deletePet`() { + val petId: kotlin.Long = TODO() + val apiKey: kotlin.String? = TODO() + val response: = webTestClient.deletePet(petId, apiKey) + + TODO() + } + /** + * To test PetApiController.findPetsByStatus + */ + @Test + fun `should handle findPetsByStatus`() { + val status: kotlin.Array = TODO() + val response: : kotlin.Array = webTestClient.findPetsByStatus(status) + + TODO() + } + /** + * To test PetApiController.findPetsByTags + */ + @Test + fun `should handle findPetsByTags`() { + val tags: kotlin.Array = TODO() + val response: : kotlin.Array = webTestClient.findPetsByTags(tags) + + TODO() + } + /** + * To test PetApiController.getPetById + */ + @Test + fun `should handle getPetById`() { + val petId: kotlin.Long = TODO() + val response: : Pet = webTestClient.getPetById(petId) + + TODO() + } + /** + * To test PetApiController.updatePet + */ + @Test + fun `should handle updatePet`() { + val pet: Pet = TODO() + val response: : Pet = webTestClient.updatePet(pet) + + TODO() + } + /** + * To test PetApiController.updatePetWithForm + */ + @Test + fun `should handle updatePetWithForm`() { + val petId: kotlin.Long = TODO() + val name: kotlin.String? = TODO() + val status: kotlin.String? = TODO() + val response: = webTestClient.updatePetWithForm(petId, name, status) + + TODO() + } + /** + * To test PetApiController.uploadFile + */ + @Test + fun `should handle uploadFile`() { + val petId: kotlin.Long = TODO() + val additionalMetadata: kotlin.String? = TODO() + val file: HttpCall = TODO() + val response: : ModelApiResponse = webTestClient.uploadFile(petId, additionalMetadata, file) + + TODO() + } +} diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt new file mode 100644 index 000000000000..7d312f2751ec --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt @@ -0,0 +1,58 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.Order +import jakarta.inject.Inject +import misk.testing.MiskTest +import misk.testing.MiskTestModule +import misk.web.WebTestClient + + +import org.junit.jupiter.api.Test + +@MiskTest(startService = true) +internal class StoreApiTest { + + @MiskTestModule val module = GambitTestingModule() + + @Inject private lateinit var webTestClient: WebTestClient + + /** + * To test StoreApiController.deleteOrder + */ + @Test + fun `should handle deleteOrder`() { + val orderId: kotlin.String = TODO() + val response: = webTestClient.deleteOrder(orderId) + + TODO() + } + /** + * To test StoreApiController.getInventory + */ + @Test + fun `should handle getInventory`() { + val response: : kotlin.collections.Map = webTestClient.getInventory() + + TODO() + } + /** + * To test StoreApiController.getOrderById + */ + @Test + fun `should handle getOrderById`() { + val orderId: kotlin.Long = TODO() + val response: : Order = webTestClient.getOrderById(orderId) + + TODO() + } + /** + * To test StoreApiController.placeOrder + */ + @Test + fun `should handle placeOrder`() { + val order: Order = TODO() + val response: : Order = webTestClient.placeOrder(order) + + TODO() + } +} diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt new file mode 100644 index 000000000000..aa2f4f33c32f --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt @@ -0,0 +1,100 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.User +import jakarta.inject.Inject +import misk.testing.MiskTest +import misk.testing.MiskTestModule +import misk.web.WebTestClient + + +import org.junit.jupiter.api.Test + +@MiskTest(startService = true) +internal class UserApiTest { + + @MiskTestModule val module = GambitTestingModule() + + @Inject private lateinit var webTestClient: WebTestClient + + /** + * To test UserApiController.createUser + */ + @Test + fun `should handle createUser`() { + val user: User = TODO() + val response: = webTestClient.createUser(user) + + TODO() + } + /** + * To test UserApiController.createUsersWithArrayInput + */ + @Test + fun `should handle createUsersWithArrayInput`() { + val user: kotlin.Array = TODO() + val response: = webTestClient.createUsersWithArrayInput(user) + + TODO() + } + /** + * To test UserApiController.createUsersWithListInput + */ + @Test + fun `should handle createUsersWithListInput`() { + val user: kotlin.Array = TODO() + val response: = webTestClient.createUsersWithListInput(user) + + TODO() + } + /** + * To test UserApiController.deleteUser + */ + @Test + fun `should handle deleteUser`() { + val username: kotlin.String = TODO() + val response: = webTestClient.deleteUser(username) + + TODO() + } + /** + * To test UserApiController.getUserByName + */ + @Test + fun `should handle getUserByName`() { + val username: kotlin.String = TODO() + val response: : User = webTestClient.getUserByName(username) + + TODO() + } + /** + * To test UserApiController.loginUser + */ + @Test + fun `should handle loginUser`() { + val username: kotlin.String = TODO() + val password: kotlin.String = TODO() + val response: : kotlin.String = webTestClient.loginUser(username, password) + + TODO() + } + /** + * To test UserApiController.logoutUser + */ + @Test + fun `should handle logoutUser`() { + val response: = webTestClient.logoutUser() + + TODO() + } + /** + * To test UserApiController.updateUser + */ + @Test + fun `should handle updateUser`() { + val username: kotlin.String = TODO() + val user: User = TODO() + val response: = webTestClient.updateUser(username, user) + + TODO() + } +} From e602d05258a71417b3a8953897a27472ac6a0ea1 Mon Sep 17 00:00:00 2001 From: Guido Arnau Date: Thu, 20 Mar 2025 13:33:09 +0100 Subject: [PATCH 063/102] Adds Guice Module --- .../languages/KotlinMiskServerCodegen.java | 31 ++++++++++++++++++- .../resources/kotlin-misk/miskModule.mustache | 25 +++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index bb1840048669..2348113534b1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -1,5 +1,7 @@ package org.openapitools.codegen.languages; +import lombok.Setter; +import org.openapitools.codegen.CliOption; import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenOperation; import org.openapitools.codegen.CodegenType; @@ -31,9 +33,13 @@ public class KotlinMiskServerCodegen extends AbstractKotlinCodegen { protected String rootPackage = "org.openapitools.server.api"; protected String apiVersion = "1.0.0-SNAPSHOT"; + @Setter protected String moduleClassName = "OpenApiModule"; + @Setter protected String moduleFileName = moduleClassName + ".kt"; public static final String ROOT_PACKAGE = "rootPackage"; public static final String PROJECT_NAME = "projectName"; + public static final String MODULE_CLASS_NAME = "moduleClassName"; + public static final String MODULE_FILE_NAME = "moduleFileName"; final Logger LOGGER = LoggerFactory.getLogger(KotlinMiskServerCodegen.class); @@ -83,6 +89,10 @@ public KotlinMiskServerCodegen() { outputFolder = "generated-code" + File.separator + "kotlin-misk"; + // Add CLI options for module customization + addOption(MODULE_CLASS_NAME, "Name of the generated module class", moduleClassName); + addOption(MODULE_FILE_NAME, "Name of the generated module file", moduleFileName); + apiTestTemplateFiles.clear(); apiTestTemplateFiles.put("api_test.mustache", ".kt"); @@ -115,6 +125,24 @@ public KotlinMiskServerCodegen() { supportingFiles.add(new SupportingFile("settings.gradle.kts.mustache", "", "settings.gradle.kts")); } + @Override + public void processOpts() { + super.processOpts(); + + if (additionalProperties.containsKey(MODULE_CLASS_NAME)) { + setModuleClassName((String) additionalProperties.get(MODULE_CLASS_NAME)); + } + additionalProperties.put(MODULE_CLASS_NAME, moduleClassName); + + if (additionalProperties.containsKey(MODULE_FILE_NAME)) { + setModuleFileName((String) additionalProperties.get(MODULE_FILE_NAME)); + } + additionalProperties.put(MODULE_FILE_NAME, moduleFileName); + + String apiModuleFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator); + supportingFiles.add(new SupportingFile("miskModule.mustache", apiModuleFolder, moduleFileName)); + } + @Override public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List allModels) { OperationMap objectMap = objs.getOperations(); @@ -137,6 +165,7 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List Put) operation.httpMethod = camelize(operation.httpMethod.toLowerCase(Locale.ROOT)); } + return objs; } @@ -153,4 +182,4 @@ private static Map getMappings() { result.put("application/xml", "MediaTypes.APPLICATION_XML"); return result; } -} +} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache new file mode 100644 index 000000000000..e0f8e42ae4e0 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache @@ -0,0 +1,25 @@ +package {{apiPackage}} + +import misk.inject.KAbstractModule +import misk.web.WebActionModule +import javax.inject.Singleton +{{#apiInfo}} +{{#apis}} +{{#operations}} +import {{apiPackage}}.{{classname}}Controller +{{/operations}} +{{/apis}} +{{/apiInfo}} + +@Singleton +class {{moduleClassName}}Module : KAbstractModule() { + override fun configure() { + {{#apiInfo}} + {{#apis}} + {{#operations}} + install(WebActionModule.create<{{classname}}Controller>()) + {{/operations}} + {{/apis}} + {{/apiInfo}} + } +} \ No newline at end of file From f69425fae13f015a1449808c749aa11e6e776ae8 Mon Sep 17 00:00:00 2001 From: Guido Arnau Date: Thu, 20 Mar 2025 14:16:59 +0100 Subject: [PATCH 064/102] Grab OpenAPI title to generate module name --- .../languages/KotlinMiskServerCodegen.java | 35 ++++++++++--------- .../resources/kotlin-misk/miskModule.mustache | 2 +- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 2348113534b1..3e04a715e991 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -1,7 +1,7 @@ package org.openapitools.codegen.languages; +import io.swagger.v3.oas.models.OpenAPI; import lombok.Setter; -import org.openapitools.codegen.CliOption; import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenOperation; import org.openapitools.codegen.CodegenType; @@ -34,12 +34,10 @@ public class KotlinMiskServerCodegen extends AbstractKotlinCodegen { protected String rootPackage = "org.openapitools.server.api"; protected String apiVersion = "1.0.0-SNAPSHOT"; @Setter protected String moduleClassName = "OpenApiModule"; - @Setter protected String moduleFileName = moduleClassName + ".kt"; public static final String ROOT_PACKAGE = "rootPackage"; public static final String PROJECT_NAME = "projectName"; public static final String MODULE_CLASS_NAME = "moduleClassName"; - public static final String MODULE_FILE_NAME = "moduleFileName"; final Logger LOGGER = LoggerFactory.getLogger(KotlinMiskServerCodegen.class); @@ -89,10 +87,6 @@ public KotlinMiskServerCodegen() { outputFolder = "generated-code" + File.separator + "kotlin-misk"; - // Add CLI options for module customization - addOption(MODULE_CLASS_NAME, "Name of the generated module class", moduleClassName); - addOption(MODULE_FILE_NAME, "Name of the generated module file", moduleFileName); - apiTestTemplateFiles.clear(); apiTestTemplateFiles.put("api_test.mustache", ".kt"); @@ -126,21 +120,24 @@ public KotlinMiskServerCodegen() { } @Override - public void processOpts() { - super.processOpts(); + public void preprocessOpenAPI(OpenAPI openAPI) { + super.preprocessOpenAPI(openAPI); - if (additionalProperties.containsKey(MODULE_CLASS_NAME)) { - setModuleClassName((String) additionalProperties.get(MODULE_CLASS_NAME)); - } - additionalProperties.put(MODULE_CLASS_NAME, moduleClassName); + if (!additionalProperties.containsKey(MODULE_CLASS_NAME)) { + String title = openAPI.getInfo().getTitle(); + if (title != null) { + title = title.trim(); + if (title.toUpperCase(Locale.ROOT).endsWith("API")) + title = title.substring(0, title.length() - 3); - if (additionalProperties.containsKey(MODULE_FILE_NAME)) { - setModuleFileName((String) additionalProperties.get(MODULE_FILE_NAME)); + this.moduleClassName = camelize(sanitizeName(title) + "Module"); + } + additionalProperties.put(MODULE_CLASS_NAME, this.moduleClassName); } - additionalProperties.put(MODULE_FILE_NAME, moduleFileName); String apiModuleFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator); - supportingFiles.add(new SupportingFile("miskModule.mustache", apiModuleFolder, moduleFileName)); + supportingFiles.add(new SupportingFile( + "miskModule.mustache", apiModuleFolder, formatModuleFileName(this.moduleClassName))); } @Override @@ -182,4 +179,8 @@ private static Map getMappings() { result.put("application/xml", "MediaTypes.APPLICATION_XML"); return result; } + + private static String formatModuleFileName(String moduleClassName) { + return moduleClassName.endsWith(".kt") ? moduleClassName : moduleClassName + ".kt"; + } } \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache index e0f8e42ae4e0..0b42b6c5b6e4 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache @@ -12,7 +12,7 @@ import {{apiPackage}}.{{classname}}Controller {{/apiInfo}} @Singleton -class {{moduleClassName}}Module : KAbstractModule() { +class {{moduleClassName}} : KAbstractModule() { override fun configure() { {{#apiInfo}} {{#apis}} From d9958fe60bfb3ea29dfcf0ba41d4bba1fea0e87d Mon Sep 17 00:00:00 2001 From: Guido Arnau Date: Thu, 20 Mar 2025 14:17:11 +0100 Subject: [PATCH 065/102] Revert "Grab OpenAPI title to generate module name" This reverts commit 9c9b935f5dbee6e0974ebf66b4f611f107df70c2. --- .../languages/KotlinMiskServerCodegen.java | 35 +++++++++---------- .../resources/kotlin-misk/miskModule.mustache | 2 +- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 3e04a715e991..2348113534b1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -1,7 +1,7 @@ package org.openapitools.codegen.languages; -import io.swagger.v3.oas.models.OpenAPI; import lombok.Setter; +import org.openapitools.codegen.CliOption; import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenOperation; import org.openapitools.codegen.CodegenType; @@ -34,10 +34,12 @@ public class KotlinMiskServerCodegen extends AbstractKotlinCodegen { protected String rootPackage = "org.openapitools.server.api"; protected String apiVersion = "1.0.0-SNAPSHOT"; @Setter protected String moduleClassName = "OpenApiModule"; + @Setter protected String moduleFileName = moduleClassName + ".kt"; public static final String ROOT_PACKAGE = "rootPackage"; public static final String PROJECT_NAME = "projectName"; public static final String MODULE_CLASS_NAME = "moduleClassName"; + public static final String MODULE_FILE_NAME = "moduleFileName"; final Logger LOGGER = LoggerFactory.getLogger(KotlinMiskServerCodegen.class); @@ -87,6 +89,10 @@ public KotlinMiskServerCodegen() { outputFolder = "generated-code" + File.separator + "kotlin-misk"; + // Add CLI options for module customization + addOption(MODULE_CLASS_NAME, "Name of the generated module class", moduleClassName); + addOption(MODULE_FILE_NAME, "Name of the generated module file", moduleFileName); + apiTestTemplateFiles.clear(); apiTestTemplateFiles.put("api_test.mustache", ".kt"); @@ -120,24 +126,21 @@ public KotlinMiskServerCodegen() { } @Override - public void preprocessOpenAPI(OpenAPI openAPI) { - super.preprocessOpenAPI(openAPI); + public void processOpts() { + super.processOpts(); - if (!additionalProperties.containsKey(MODULE_CLASS_NAME)) { - String title = openAPI.getInfo().getTitle(); - if (title != null) { - title = title.trim(); - if (title.toUpperCase(Locale.ROOT).endsWith("API")) - title = title.substring(0, title.length() - 3); + if (additionalProperties.containsKey(MODULE_CLASS_NAME)) { + setModuleClassName((String) additionalProperties.get(MODULE_CLASS_NAME)); + } + additionalProperties.put(MODULE_CLASS_NAME, moduleClassName); - this.moduleClassName = camelize(sanitizeName(title) + "Module"); - } - additionalProperties.put(MODULE_CLASS_NAME, this.moduleClassName); + if (additionalProperties.containsKey(MODULE_FILE_NAME)) { + setModuleFileName((String) additionalProperties.get(MODULE_FILE_NAME)); } + additionalProperties.put(MODULE_FILE_NAME, moduleFileName); String apiModuleFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator); - supportingFiles.add(new SupportingFile( - "miskModule.mustache", apiModuleFolder, formatModuleFileName(this.moduleClassName))); + supportingFiles.add(new SupportingFile("miskModule.mustache", apiModuleFolder, moduleFileName)); } @Override @@ -179,8 +182,4 @@ private static Map getMappings() { result.put("application/xml", "MediaTypes.APPLICATION_XML"); return result; } - - private static String formatModuleFileName(String moduleClassName) { - return moduleClassName.endsWith(".kt") ? moduleClassName : moduleClassName + ".kt"; - } } \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache index 0b42b6c5b6e4..e0f8e42ae4e0 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache @@ -12,7 +12,7 @@ import {{apiPackage}}.{{classname}}Controller {{/apiInfo}} @Singleton -class {{moduleClassName}} : KAbstractModule() { +class {{moduleClassName}}Module : KAbstractModule() { override fun configure() { {{#apiInfo}} {{#apis}} From 5b82849c86870eead65246aa212122ee03411502 Mon Sep 17 00:00:00 2001 From: Guido Arnau Date: Thu, 20 Mar 2025 14:20:11 +0100 Subject: [PATCH 066/102] Update sample --- bin/configs/kotlin-misk.yaml | 4 +++- .../codegen/languages/KotlinMiskServerCodegen.java | 1 - .../src/main/resources/kotlin-misk/miskModule.mustache | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/configs/kotlin-misk.yaml b/bin/configs/kotlin-misk.yaml index 5fbd26caf0a0..e4ff86f02eb7 100644 --- a/bin/configs/kotlin-misk.yaml +++ b/bin/configs/kotlin-misk.yaml @@ -3,4 +3,6 @@ outputDir: samples/server/petstore/kotlin-misk inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-misk additionalProperties: - hideGenerationTimestamp: "true" \ No newline at end of file + hideGenerationTimestamp: "true" + moduleClassName: "PetStore" + moduleFileName: "PetStoreModule.kt" \ No newline at end of file diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 2348113534b1..3baaf1801780 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -1,7 +1,6 @@ package org.openapitools.codegen.languages; import lombok.Setter; -import org.openapitools.codegen.CliOption; import org.openapitools.codegen.CodegenConstants; import org.openapitools.codegen.CodegenOperation; import org.openapitools.codegen.CodegenType; diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache index e0f8e42ae4e0..0b42b6c5b6e4 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache @@ -12,7 +12,7 @@ import {{apiPackage}}.{{classname}}Controller {{/apiInfo}} @Singleton -class {{moduleClassName}}Module : KAbstractModule() { +class {{moduleClassName}} : KAbstractModule() { override fun configure() { {{#apiInfo}} {{#apis}} From 9653b8226f688b3bebd0f4199174d9093670acb0 Mon Sep 17 00:00:00 2001 From: Guido Arnau Date: Thu, 20 Mar 2025 14:27:09 +0100 Subject: [PATCH 067/102] Removes moduleFileName additional property --- bin/configs/kotlin-misk.yaml | 3 +-- .../languages/KotlinMiskServerCodegen.java | 10 +--------- .../kotlin-misk/.openapi-generator/FILES | 4 +--- .../server/api/api/PetStoreModule.kt | 17 +++++++++++++++++ 4 files changed, 20 insertions(+), 14 deletions(-) create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetStoreModule.kt diff --git a/bin/configs/kotlin-misk.yaml b/bin/configs/kotlin-misk.yaml index e4ff86f02eb7..5593aad0b7a7 100644 --- a/bin/configs/kotlin-misk.yaml +++ b/bin/configs/kotlin-misk.yaml @@ -4,5 +4,4 @@ inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-misk additionalProperties: hideGenerationTimestamp: "true" - moduleClassName: "PetStore" - moduleFileName: "PetStoreModule.kt" \ No newline at end of file + moduleClassName: "PetStoreModule" \ No newline at end of file diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 3baaf1801780..97b3de9f2b75 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -33,12 +33,10 @@ public class KotlinMiskServerCodegen extends AbstractKotlinCodegen { protected String rootPackage = "org.openapitools.server.api"; protected String apiVersion = "1.0.0-SNAPSHOT"; @Setter protected String moduleClassName = "OpenApiModule"; - @Setter protected String moduleFileName = moduleClassName + ".kt"; public static final String ROOT_PACKAGE = "rootPackage"; public static final String PROJECT_NAME = "projectName"; public static final String MODULE_CLASS_NAME = "moduleClassName"; - public static final String MODULE_FILE_NAME = "moduleFileName"; final Logger LOGGER = LoggerFactory.getLogger(KotlinMiskServerCodegen.class); @@ -88,9 +86,7 @@ public KotlinMiskServerCodegen() { outputFolder = "generated-code" + File.separator + "kotlin-misk"; - // Add CLI options for module customization addOption(MODULE_CLASS_NAME, "Name of the generated module class", moduleClassName); - addOption(MODULE_FILE_NAME, "Name of the generated module file", moduleFileName); apiTestTemplateFiles.clear(); apiTestTemplateFiles.put("api_test.mustache", ".kt"); @@ -133,12 +129,8 @@ public void processOpts() { } additionalProperties.put(MODULE_CLASS_NAME, moduleClassName); - if (additionalProperties.containsKey(MODULE_FILE_NAME)) { - setModuleFileName((String) additionalProperties.get(MODULE_FILE_NAME)); - } - additionalProperties.put(MODULE_FILE_NAME, moduleFileName); - String apiModuleFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator); + String moduleFileName = moduleClassName + ".kt"; supportingFiles.add(new SupportingFile("miskModule.mustache", apiModuleFolder, moduleFileName)); } diff --git a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES index 03666ae7a7f2..6f07b4ceb390 100644 --- a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES @@ -13,6 +13,7 @@ settings.gradle.kts src/main/kotlin/org/openapitools/server/api/api/PetApi.kt src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt +src/main/kotlin/org/openapitools/server/api/api/PetStoreModule.kt src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt @@ -25,6 +26,3 @@ src/main/kotlin/org/openapitools/server/api/model/Order.kt src/main/kotlin/org/openapitools/server/api/model/Pet.kt src/main/kotlin/org/openapitools/server/api/model/Tag.kt src/main/kotlin/org/openapitools/server/api/model/User.kt -src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt -src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt -src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetStoreModule.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetStoreModule.kt new file mode 100644 index 000000000000..1fa349b51d58 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetStoreModule.kt @@ -0,0 +1,17 @@ +package org.openapitools.server.api.api + +import misk.inject.KAbstractModule +import misk.web.WebActionModule +import javax.inject.Singleton +import org.openapitools.server.api.api.PetApiController +import org.openapitools.server.api.api.StoreApiController +import org.openapitools.server.api.api.UserApiController + +@Singleton +class PetStoreModule : KAbstractModule() { + override fun configure() { + install(WebActionModule.create()) + install(WebActionModule.create()) + install(WebActionModule.create()) + } +} \ No newline at end of file From e1168ddce745750564e8ac11c34fbb4b7f958a6e Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Thu, 20 Mar 2025 13:31:45 +0000 Subject: [PATCH 068/102] adding tests --- .../kotlin-misk/apiController.mustache | 1 - .../resources/kotlin-misk/api_test.mustache | 7 ++-- .../server/api/api/PetApiController.kt | 1 - .../server/api/api/StoreApiController.kt | 1 - .../server/api/api/UserApiController.kt | 1 - .../openapitools/server/api/api/PetApiTest.kt | 35 +++++-------------- .../server/api/api/StoreApiTest.kt | 19 +++------- .../server/api/api/UserApiTest.kt | 35 +++++-------------- 8 files changed, 25 insertions(+), 75 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index b128c3ee536d..efb6a71382fb 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -61,7 +61,6 @@ import okhttp3.Headers {{#operations}} @Singleton class {{classname}}Controller @Inject constructor( - // @TODO("camelCase this") private val {{classname}} : {{classname}} ) : {{classname}}, WebAction { {{#operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache index 661dd2660b1e..40ae5b8da44a 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache @@ -5,7 +5,6 @@ package {{package}} import jakarta.inject.Inject import misk.testing.MiskTest import misk.testing.MiskTestModule -import misk.web.WebTestClient import org.junit.jupiter.api.Test @@ -14,7 +13,7 @@ internal class {{classname}}Test { @MiskTestModule val module = GambitTestingModule() - @Inject private lateinit var webTestClient: WebTestClient + @Inject private lateinit var {{classname}} : {{classname}} {{#operations}} {{#operation}} @@ -26,9 +25,7 @@ internal class {{classname}}Test { {{#allParams}} val {{{paramName}}}: {{>optionalDataType}} = TODO() {{/allParams}} - val response: {{#returnType}}: {{{returnType}}}{{/returnType}} = webTestClient.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) - - TODO() + val response{{#returnType}}: {{{returnType}}}{{/returnType}} = {{classname}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) } {{/operation}} {{/operations}} diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt index 1065971c7df6..1b0ba3a3c22d 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt @@ -27,7 +27,6 @@ import okhttp3.Headers @Singleton class PetApiController @Inject constructor( - // @TODO("camelCase this") private val PetApi : PetApi ) : PetApi, WebAction { diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt index 4559205d5d88..e37f259d1218 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt @@ -26,7 +26,6 @@ import okhttp3.Headers @Singleton class StoreApiController @Inject constructor( - // @TODO("camelCase this") private val StoreApi : StoreApi ) : StoreApi, WebAction { diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt index 384738c163b2..3a0bb922aeec 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt @@ -26,7 +26,6 @@ import okhttp3.Headers @Singleton class UserApiController @Inject constructor( - // @TODO("camelCase this") private val UserApi : UserApi ) : UserApi, WebAction { diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt index 0237602aff61..c8aecb91ff54 100644 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt @@ -7,7 +7,6 @@ import misk.testing.MiskTest import misk.testing.MiskTestModule import misk.web.WebTestClient - import org.junit.jupiter.api.Test @MiskTest(startService = true) @@ -15,7 +14,7 @@ internal class PetApiTest { @MiskTestModule val module = GambitTestingModule() - @Inject private lateinit var webTestClient: WebTestClient + @Inject private lateinit var PetApi : PetApi /** * To test PetApiController.addPet @@ -23,9 +22,7 @@ internal class PetApiTest { @Test fun `should handle addPet`() { val pet: Pet = TODO() - val response: : Pet = webTestClient.addPet(pet) - - TODO() + val response: Pet = PetApi.addPet(pet) } /** * To test PetApiController.deletePet @@ -34,9 +31,7 @@ internal class PetApiTest { fun `should handle deletePet`() { val petId: kotlin.Long = TODO() val apiKey: kotlin.String? = TODO() - val response: = webTestClient.deletePet(petId, apiKey) - - TODO() + val response = PetApi.deletePet(petId, apiKey) } /** * To test PetApiController.findPetsByStatus @@ -44,9 +39,7 @@ internal class PetApiTest { @Test fun `should handle findPetsByStatus`() { val status: kotlin.Array = TODO() - val response: : kotlin.Array = webTestClient.findPetsByStatus(status) - - TODO() + val response: kotlin.Array = PetApi.findPetsByStatus(status) } /** * To test PetApiController.findPetsByTags @@ -54,9 +47,7 @@ internal class PetApiTest { @Test fun `should handle findPetsByTags`() { val tags: kotlin.Array = TODO() - val response: : kotlin.Array = webTestClient.findPetsByTags(tags) - - TODO() + val response: kotlin.Array = PetApi.findPetsByTags(tags) } /** * To test PetApiController.getPetById @@ -64,9 +55,7 @@ internal class PetApiTest { @Test fun `should handle getPetById`() { val petId: kotlin.Long = TODO() - val response: : Pet = webTestClient.getPetById(petId) - - TODO() + val response: Pet = PetApi.getPetById(petId) } /** * To test PetApiController.updatePet @@ -74,9 +63,7 @@ internal class PetApiTest { @Test fun `should handle updatePet`() { val pet: Pet = TODO() - val response: : Pet = webTestClient.updatePet(pet) - - TODO() + val response: Pet = PetApi.updatePet(pet) } /** * To test PetApiController.updatePetWithForm @@ -86,9 +73,7 @@ internal class PetApiTest { val petId: kotlin.Long = TODO() val name: kotlin.String? = TODO() val status: kotlin.String? = TODO() - val response: = webTestClient.updatePetWithForm(petId, name, status) - - TODO() + val response = PetApi.updatePetWithForm(petId, name, status) } /** * To test PetApiController.uploadFile @@ -98,8 +83,6 @@ internal class PetApiTest { val petId: kotlin.Long = TODO() val additionalMetadata: kotlin.String? = TODO() val file: HttpCall = TODO() - val response: : ModelApiResponse = webTestClient.uploadFile(petId, additionalMetadata, file) - - TODO() + val response: ModelApiResponse = PetApi.uploadFile(petId, additionalMetadata, file) } } diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt index 7d312f2751ec..162d9c61f063 100644 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt @@ -6,7 +6,6 @@ import misk.testing.MiskTest import misk.testing.MiskTestModule import misk.web.WebTestClient - import org.junit.jupiter.api.Test @MiskTest(startService = true) @@ -14,7 +13,7 @@ internal class StoreApiTest { @MiskTestModule val module = GambitTestingModule() - @Inject private lateinit var webTestClient: WebTestClient + @Inject private lateinit var StoreApi : StoreApi /** * To test StoreApiController.deleteOrder @@ -22,18 +21,14 @@ internal class StoreApiTest { @Test fun `should handle deleteOrder`() { val orderId: kotlin.String = TODO() - val response: = webTestClient.deleteOrder(orderId) - - TODO() + val response = StoreApi.deleteOrder(orderId) } /** * To test StoreApiController.getInventory */ @Test fun `should handle getInventory`() { - val response: : kotlin.collections.Map = webTestClient.getInventory() - - TODO() + val response: kotlin.collections.Map = StoreApi.getInventory() } /** * To test StoreApiController.getOrderById @@ -41,9 +36,7 @@ internal class StoreApiTest { @Test fun `should handle getOrderById`() { val orderId: kotlin.Long = TODO() - val response: : Order = webTestClient.getOrderById(orderId) - - TODO() + val response: Order = StoreApi.getOrderById(orderId) } /** * To test StoreApiController.placeOrder @@ -51,8 +44,6 @@ internal class StoreApiTest { @Test fun `should handle placeOrder`() { val order: Order = TODO() - val response: : Order = webTestClient.placeOrder(order) - - TODO() + val response: Order = StoreApi.placeOrder(order) } } diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt index aa2f4f33c32f..49ff32d4b4c8 100644 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt @@ -6,7 +6,6 @@ import misk.testing.MiskTest import misk.testing.MiskTestModule import misk.web.WebTestClient - import org.junit.jupiter.api.Test @MiskTest(startService = true) @@ -14,7 +13,7 @@ internal class UserApiTest { @MiskTestModule val module = GambitTestingModule() - @Inject private lateinit var webTestClient: WebTestClient + @Inject private lateinit var UserApi : UserApi /** * To test UserApiController.createUser @@ -22,9 +21,7 @@ internal class UserApiTest { @Test fun `should handle createUser`() { val user: User = TODO() - val response: = webTestClient.createUser(user) - - TODO() + val response = UserApi.createUser(user) } /** * To test UserApiController.createUsersWithArrayInput @@ -32,9 +29,7 @@ internal class UserApiTest { @Test fun `should handle createUsersWithArrayInput`() { val user: kotlin.Array = TODO() - val response: = webTestClient.createUsersWithArrayInput(user) - - TODO() + val response = UserApi.createUsersWithArrayInput(user) } /** * To test UserApiController.createUsersWithListInput @@ -42,9 +37,7 @@ internal class UserApiTest { @Test fun `should handle createUsersWithListInput`() { val user: kotlin.Array = TODO() - val response: = webTestClient.createUsersWithListInput(user) - - TODO() + val response = UserApi.createUsersWithListInput(user) } /** * To test UserApiController.deleteUser @@ -52,9 +45,7 @@ internal class UserApiTest { @Test fun `should handle deleteUser`() { val username: kotlin.String = TODO() - val response: = webTestClient.deleteUser(username) - - TODO() + val response = UserApi.deleteUser(username) } /** * To test UserApiController.getUserByName @@ -62,9 +53,7 @@ internal class UserApiTest { @Test fun `should handle getUserByName`() { val username: kotlin.String = TODO() - val response: : User = webTestClient.getUserByName(username) - - TODO() + val response: User = UserApi.getUserByName(username) } /** * To test UserApiController.loginUser @@ -73,18 +62,14 @@ internal class UserApiTest { fun `should handle loginUser`() { val username: kotlin.String = TODO() val password: kotlin.String = TODO() - val response: : kotlin.String = webTestClient.loginUser(username, password) - - TODO() + val response: kotlin.String = UserApi.loginUser(username, password) } /** * To test UserApiController.logoutUser */ @Test fun `should handle logoutUser`() { - val response: = webTestClient.logoutUser() - - TODO() + val response = UserApi.logoutUser() } /** * To test UserApiController.updateUser @@ -93,8 +78,6 @@ internal class UserApiTest { fun `should handle updateUser`() { val username: kotlin.String = TODO() val user: User = TODO() - val response: = webTestClient.updateUser(username, user) - - TODO() + val response = UserApi.updateUser(username, user) } } From 6a87f91e01fbe2850b89c4bfa6833c8ad7f8ff21 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Thu, 20 Mar 2025 13:33:51 +0000 Subject: [PATCH 069/102] adding tests 2 --- .../src/main/resources/kotlin-misk/api_test.mustache | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache index 40ae5b8da44a..703cd8ddd07e 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache @@ -4,15 +4,12 @@ package {{package}} {{/imports}} import jakarta.inject.Inject import misk.testing.MiskTest -import misk.testing.MiskTestModule import org.junit.jupiter.api.Test @MiskTest(startService = true) internal class {{classname}}Test { - @MiskTestModule val module = GambitTestingModule() - @Inject private lateinit var {{classname}} : {{classname}} {{#operations}} From f5a64a1b9a5eb6d3fba971a25e453a8f6103e28c Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Thu, 20 Mar 2025 13:42:27 +0000 Subject: [PATCH 070/102] adding tests 3 --- samples/server/petstore/kotlin-misk/.openapi-generator/FILES | 4 +++- .../test/kotlin/org/openapitools/server/api/api/PetApiTest.kt | 4 ---- .../kotlin/org/openapitools/server/api/api/StoreApiTest.kt | 4 ---- .../kotlin/org/openapitools/server/api/api/UserApiTest.kt | 4 ---- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES index 6f07b4ceb390..03666ae7a7f2 100644 --- a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES @@ -13,7 +13,6 @@ settings.gradle.kts src/main/kotlin/org/openapitools/server/api/api/PetApi.kt src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt -src/main/kotlin/org/openapitools/server/api/api/PetStoreModule.kt src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt @@ -26,3 +25,6 @@ src/main/kotlin/org/openapitools/server/api/model/Order.kt src/main/kotlin/org/openapitools/server/api/model/Pet.kt src/main/kotlin/org/openapitools/server/api/model/Tag.kt src/main/kotlin/org/openapitools/server/api/model/User.kt +src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt +src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt +src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt index c8aecb91ff54..1d7b568ca26e 100644 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt @@ -4,16 +4,12 @@ import org.openapitools.server.api.model.ModelApiResponse import org.openapitools.server.api.model.Pet import jakarta.inject.Inject import misk.testing.MiskTest -import misk.testing.MiskTestModule -import misk.web.WebTestClient import org.junit.jupiter.api.Test @MiskTest(startService = true) internal class PetApiTest { - @MiskTestModule val module = GambitTestingModule() - @Inject private lateinit var PetApi : PetApi /** diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt index 162d9c61f063..edfa6167be1c 100644 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt @@ -3,16 +3,12 @@ package org.openapitools.server.api.api import org.openapitools.server.api.model.Order import jakarta.inject.Inject import misk.testing.MiskTest -import misk.testing.MiskTestModule -import misk.web.WebTestClient import org.junit.jupiter.api.Test @MiskTest(startService = true) internal class StoreApiTest { - @MiskTestModule val module = GambitTestingModule() - @Inject private lateinit var StoreApi : StoreApi /** diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt index 49ff32d4b4c8..944ab3aded58 100644 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt @@ -3,16 +3,12 @@ package org.openapitools.server.api.api import org.openapitools.server.api.model.User import jakarta.inject.Inject import misk.testing.MiskTest -import misk.testing.MiskTestModule -import misk.web.WebTestClient import org.junit.jupiter.api.Test @MiskTest(startService = true) internal class UserApiTest { - @MiskTestModule val module = GambitTestingModule() - @Inject private lateinit var UserApi : UserApi /** From 8ed681a6cb30c4a8fe3da6486ad21c150591bea7 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Thu, 20 Mar 2025 13:45:40 +0000 Subject: [PATCH 071/102] adding tests 4 --- .../resources/kotlin-misk/api_test.mustache | 1 + .../openapitools/server/api/api/PetApiTest.kt | 84 ------------------- .../server/api/api/StoreApiTest.kt | 45 ---------- .../server/api/api/UserApiTest.kt | 79 ----------------- 4 files changed, 1 insertion(+), 208 deletions(-) delete mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt delete mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt delete mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache index 703cd8ddd07e..959a2c800953 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache @@ -24,6 +24,7 @@ internal class {{classname}}Test { {{/allParams}} val response{{#returnType}}: {{{returnType}}}{{/returnType}} = {{classname}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) } + {{/operation}} {{/operations}} } diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt deleted file mode 100644 index 1d7b568ca26e..000000000000 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt +++ /dev/null @@ -1,84 +0,0 @@ -package org.openapitools.server.api.api - -import org.openapitools.server.api.model.ModelApiResponse -import org.openapitools.server.api.model.Pet -import jakarta.inject.Inject -import misk.testing.MiskTest - -import org.junit.jupiter.api.Test - -@MiskTest(startService = true) -internal class PetApiTest { - - @Inject private lateinit var PetApi : PetApi - - /** - * To test PetApiController.addPet - */ - @Test - fun `should handle addPet`() { - val pet: Pet = TODO() - val response: Pet = PetApi.addPet(pet) - } - /** - * To test PetApiController.deletePet - */ - @Test - fun `should handle deletePet`() { - val petId: kotlin.Long = TODO() - val apiKey: kotlin.String? = TODO() - val response = PetApi.deletePet(petId, apiKey) - } - /** - * To test PetApiController.findPetsByStatus - */ - @Test - fun `should handle findPetsByStatus`() { - val status: kotlin.Array = TODO() - val response: kotlin.Array = PetApi.findPetsByStatus(status) - } - /** - * To test PetApiController.findPetsByTags - */ - @Test - fun `should handle findPetsByTags`() { - val tags: kotlin.Array = TODO() - val response: kotlin.Array = PetApi.findPetsByTags(tags) - } - /** - * To test PetApiController.getPetById - */ - @Test - fun `should handle getPetById`() { - val petId: kotlin.Long = TODO() - val response: Pet = PetApi.getPetById(petId) - } - /** - * To test PetApiController.updatePet - */ - @Test - fun `should handle updatePet`() { - val pet: Pet = TODO() - val response: Pet = PetApi.updatePet(pet) - } - /** - * To test PetApiController.updatePetWithForm - */ - @Test - fun `should handle updatePetWithForm`() { - val petId: kotlin.Long = TODO() - val name: kotlin.String? = TODO() - val status: kotlin.String? = TODO() - val response = PetApi.updatePetWithForm(petId, name, status) - } - /** - * To test PetApiController.uploadFile - */ - @Test - fun `should handle uploadFile`() { - val petId: kotlin.Long = TODO() - val additionalMetadata: kotlin.String? = TODO() - val file: HttpCall = TODO() - val response: ModelApiResponse = PetApi.uploadFile(petId, additionalMetadata, file) - } -} diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt deleted file mode 100644 index edfa6167be1c..000000000000 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt +++ /dev/null @@ -1,45 +0,0 @@ -package org.openapitools.server.api.api - -import org.openapitools.server.api.model.Order -import jakarta.inject.Inject -import misk.testing.MiskTest - -import org.junit.jupiter.api.Test - -@MiskTest(startService = true) -internal class StoreApiTest { - - @Inject private lateinit var StoreApi : StoreApi - - /** - * To test StoreApiController.deleteOrder - */ - @Test - fun `should handle deleteOrder`() { - val orderId: kotlin.String = TODO() - val response = StoreApi.deleteOrder(orderId) - } - /** - * To test StoreApiController.getInventory - */ - @Test - fun `should handle getInventory`() { - val response: kotlin.collections.Map = StoreApi.getInventory() - } - /** - * To test StoreApiController.getOrderById - */ - @Test - fun `should handle getOrderById`() { - val orderId: kotlin.Long = TODO() - val response: Order = StoreApi.getOrderById(orderId) - } - /** - * To test StoreApiController.placeOrder - */ - @Test - fun `should handle placeOrder`() { - val order: Order = TODO() - val response: Order = StoreApi.placeOrder(order) - } -} diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt deleted file mode 100644 index 944ab3aded58..000000000000 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt +++ /dev/null @@ -1,79 +0,0 @@ -package org.openapitools.server.api.api - -import org.openapitools.server.api.model.User -import jakarta.inject.Inject -import misk.testing.MiskTest - -import org.junit.jupiter.api.Test - -@MiskTest(startService = true) -internal class UserApiTest { - - @Inject private lateinit var UserApi : UserApi - - /** - * To test UserApiController.createUser - */ - @Test - fun `should handle createUser`() { - val user: User = TODO() - val response = UserApi.createUser(user) - } - /** - * To test UserApiController.createUsersWithArrayInput - */ - @Test - fun `should handle createUsersWithArrayInput`() { - val user: kotlin.Array = TODO() - val response = UserApi.createUsersWithArrayInput(user) - } - /** - * To test UserApiController.createUsersWithListInput - */ - @Test - fun `should handle createUsersWithListInput`() { - val user: kotlin.Array = TODO() - val response = UserApi.createUsersWithListInput(user) - } - /** - * To test UserApiController.deleteUser - */ - @Test - fun `should handle deleteUser`() { - val username: kotlin.String = TODO() - val response = UserApi.deleteUser(username) - } - /** - * To test UserApiController.getUserByName - */ - @Test - fun `should handle getUserByName`() { - val username: kotlin.String = TODO() - val response: User = UserApi.getUserByName(username) - } - /** - * To test UserApiController.loginUser - */ - @Test - fun `should handle loginUser`() { - val username: kotlin.String = TODO() - val password: kotlin.String = TODO() - val response: kotlin.String = UserApi.loginUser(username, password) - } - /** - * To test UserApiController.logoutUser - */ - @Test - fun `should handle logoutUser`() { - val response = UserApi.logoutUser() - } - /** - * To test UserApiController.updateUser - */ - @Test - fun `should handle updateUser`() { - val username: kotlin.String = TODO() - val user: User = TODO() - val response = UserApi.updateUser(username, user) - } -} From 0e04ff0b82e9e9b0c00ba6be08624ce4b69ddabb Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Thu, 20 Mar 2025 14:08:48 +0000 Subject: [PATCH 072/102] added media types --- .../languages/KotlinMiskServerCodegen.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 97b3de9f2b75..6012483e2adf 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -168,9 +168,22 @@ private String mapMediaType(String mediaType) { private static Map getMappings() { Map result = new HashMap<>(); - // @todo add others as needed result.put("application/json", "MediaTypes.APPLICATION_JSON"); result.put("application/xml", "MediaTypes.APPLICATION_XML"); + result.put("application/javascript", "MediaTypes.APPLICATION_JAVASCRIPT"); + result.put("*/*", "MediaTypes.ALL"); + result.put("application/x-www-form-urlencoded", "MediaTypes.APPLICATION_FORM_URLENCODED"); + result.put("application/octetstream", "MediaTypes.APPLICATION_OCTETSTREAM"); + result.put("application/x-protobuf", "MediaTypes.APPLICATION_PROTOBUF"); + result.put("application/grpc", "MediaTypes.APPLICATION_GRPC"); + result.put("text/css", "MediaTypes.TEXT_CSS"); + result.put("text/html", "MediaTypes.TEXT_HTML"); + result.put("text/plain", "MediaTypes.TEXT_PLAIN_UTF8"); + result.put("image/png", "MediaTypes.IMAGE_PNG"); + result.put("image/svg+xml", "MediaTypes.IMAGE_SVG"); + result.put("image/jpeg", "MediaTypes.IMAGE_JPEG"); + result.put("image/gif", "MediaTypes.IMAGE_GIF"); + result.put("image/x-icon", "MediaTypes.IMAGE_ICO"); return result; } -} \ No newline at end of file +} From 431ed06c28549c4ecdffae8e09c531b202f70bc7 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Thu, 20 Mar 2025 14:09:14 +0000 Subject: [PATCH 073/102] re-adding tests --- .../openapitools/server/api/api/PetApiTest.kt | 92 +++++++++++++++++++ .../server/api/api/StoreApiTest.kt | 49 ++++++++++ .../server/api/api/UserApiTest.kt | 87 ++++++++++++++++++ 3 files changed, 228 insertions(+) create mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt create mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt create mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt new file mode 100644 index 000000000000..853e9b632b0e --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt @@ -0,0 +1,92 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.ModelApiResponse +import org.openapitools.server.api.model.Pet +import jakarta.inject.Inject +import misk.testing.MiskTest + +import org.junit.jupiter.api.Test + +@MiskTest(startService = true) +internal class PetApiTest { + + @Inject private lateinit var PetApi : PetApi + + /** + * To test PetApiController.addPet + */ + @Test + fun `should handle addPet`() { + val pet: Pet = TODO() + val response: Pet = PetApi.addPet(pet) + } + + /** + * To test PetApiController.deletePet + */ + @Test + fun `should handle deletePet`() { + val petId: kotlin.Long = TODO() + val apiKey: kotlin.String? = TODO() + val response = PetApi.deletePet(petId, apiKey) + } + + /** + * To test PetApiController.findPetsByStatus + */ + @Test + fun `should handle findPetsByStatus`() { + val status: kotlin.Array = TODO() + val response: kotlin.Array = PetApi.findPetsByStatus(status) + } + + /** + * To test PetApiController.findPetsByTags + */ + @Test + fun `should handle findPetsByTags`() { + val tags: kotlin.Array = TODO() + val response: kotlin.Array = PetApi.findPetsByTags(tags) + } + + /** + * To test PetApiController.getPetById + */ + @Test + fun `should handle getPetById`() { + val petId: kotlin.Long = TODO() + val response: Pet = PetApi.getPetById(petId) + } + + /** + * To test PetApiController.updatePet + */ + @Test + fun `should handle updatePet`() { + val pet: Pet = TODO() + val response: Pet = PetApi.updatePet(pet) + } + + /** + * To test PetApiController.updatePetWithForm + */ + @Test + fun `should handle updatePetWithForm`() { + val petId: kotlin.Long = TODO() + val name: kotlin.String? = TODO() + val status: kotlin.String? = TODO() + val response = PetApi.updatePetWithForm(petId, name, status) + } + + /** + * To test PetApiController.uploadFile + */ + @Test + fun `should handle uploadFile`() { + val petId: kotlin.Long = TODO() + val additionalMetadata: kotlin.String? = TODO() + val file: HttpCall = TODO() + val response: ModelApiResponse = PetApi.uploadFile(petId, additionalMetadata, file) + } + +} diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt new file mode 100644 index 000000000000..bc4a8b309e27 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt @@ -0,0 +1,49 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.Order +import jakarta.inject.Inject +import misk.testing.MiskTest + +import org.junit.jupiter.api.Test + +@MiskTest(startService = true) +internal class StoreApiTest { + + @Inject private lateinit var StoreApi : StoreApi + + /** + * To test StoreApiController.deleteOrder + */ + @Test + fun `should handle deleteOrder`() { + val orderId: kotlin.String = TODO() + val response = StoreApi.deleteOrder(orderId) + } + + /** + * To test StoreApiController.getInventory + */ + @Test + fun `should handle getInventory`() { + val response: kotlin.collections.Map = StoreApi.getInventory() + } + + /** + * To test StoreApiController.getOrderById + */ + @Test + fun `should handle getOrderById`() { + val orderId: kotlin.Long = TODO() + val response: Order = StoreApi.getOrderById(orderId) + } + + /** + * To test StoreApiController.placeOrder + */ + @Test + fun `should handle placeOrder`() { + val order: Order = TODO() + val response: Order = StoreApi.placeOrder(order) + } + +} diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt new file mode 100644 index 000000000000..484aaef511f7 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt @@ -0,0 +1,87 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.User +import jakarta.inject.Inject +import misk.testing.MiskTest + +import org.junit.jupiter.api.Test + +@MiskTest(startService = true) +internal class UserApiTest { + + @Inject private lateinit var UserApi : UserApi + + /** + * To test UserApiController.createUser + */ + @Test + fun `should handle createUser`() { + val user: User = TODO() + val response = UserApi.createUser(user) + } + + /** + * To test UserApiController.createUsersWithArrayInput + */ + @Test + fun `should handle createUsersWithArrayInput`() { + val user: kotlin.Array = TODO() + val response = UserApi.createUsersWithArrayInput(user) + } + + /** + * To test UserApiController.createUsersWithListInput + */ + @Test + fun `should handle createUsersWithListInput`() { + val user: kotlin.Array = TODO() + val response = UserApi.createUsersWithListInput(user) + } + + /** + * To test UserApiController.deleteUser + */ + @Test + fun `should handle deleteUser`() { + val username: kotlin.String = TODO() + val response = UserApi.deleteUser(username) + } + + /** + * To test UserApiController.getUserByName + */ + @Test + fun `should handle getUserByName`() { + val username: kotlin.String = TODO() + val response: User = UserApi.getUserByName(username) + } + + /** + * To test UserApiController.loginUser + */ + @Test + fun `should handle loginUser`() { + val username: kotlin.String = TODO() + val password: kotlin.String = TODO() + val response: kotlin.String = UserApi.loginUser(username, password) + } + + /** + * To test UserApiController.logoutUser + */ + @Test + fun `should handle logoutUser`() { + val response = UserApi.logoutUser() + } + + /** + * To test UserApiController.updateUser + */ + @Test + fun `should handle updateUser`() { + val username: kotlin.String = TODO() + val user: User = TODO() + val response = UserApi.updateUser(username, user) + } + +} From f73cc1017b5229cad1de02fb6a2931c28a478d8d Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Thu, 20 Mar 2025 15:03:25 +0000 Subject: [PATCH 074/102] fixing camelcase --- .../kotlin-misk/apiController.mustache | 4 ++-- .../kotlin-misk/.openapi-generator/FILES | 4 +--- .../petstore/kotlin-misk/docs/PetApi.md | 2 +- .../server/api/api/PetApiController.kt | 20 +++++++++---------- .../server/api/api/StoreApiController.kt | 10 +++++----- .../server/api/api/UserApiController.kt | 18 ++++++++--------- 6 files changed, 28 insertions(+), 30 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index efb6a71382fb..e79484034435 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -61,7 +61,7 @@ import okhttp3.Headers {{#operations}} @Singleton class {{classname}}Controller @Inject constructor( - private val {{classname}} : {{classname}} + private val {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}: {{classname}} ) : {{classname}}, WebAction { {{#operation}} @@ -72,7 +72,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun {{operationId}}({{#allParams}}{{#isQueryParam}}@QueryParam {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}@PathParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}} @RequestHeaders headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{#isBodyParam}}@RequestBody(required = {{^required}}false{{/required}}{{#required}}false{{/required}}) {{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{^-last}},{{/-last}}{{/allParams}}) = - {{classname}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) + {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) {{/operation}} } {{/operations}} diff --git a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES index 03666ae7a7f2..6f07b4ceb390 100644 --- a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES @@ -13,6 +13,7 @@ settings.gradle.kts src/main/kotlin/org/openapitools/server/api/api/PetApi.kt src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt +src/main/kotlin/org/openapitools/server/api/api/PetStoreModule.kt src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt @@ -25,6 +26,3 @@ src/main/kotlin/org/openapitools/server/api/model/Order.kt src/main/kotlin/org/openapitools/server/api/model/Pet.kt src/main/kotlin/org/openapitools/server/api/model/Tag.kt src/main/kotlin/org/openapitools/server/api/model/User.kt -src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt -src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt -src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt diff --git a/samples/server/petstore/kotlin-misk/docs/PetApi.md b/samples/server/petstore/kotlin-misk/docs/PetApi.md index db516a07d4ac..d853f8ea820c 100644 --- a/samples/server/petstore/kotlin-misk/docs/PetApi.md +++ b/samples/server/petstore/kotlin-misk/docs/PetApi.md @@ -344,7 +344,7 @@ null (empty response body) ### HTTP request headers - - **Content-Type**: + - **Content-Type**: MediaTypes.APPLICATION_FORM_URLENCODED - **Accept**: Not defined diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt index 1b0ba3a3c22d..d8abca8c978b 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt @@ -27,7 +27,7 @@ import okhttp3.Headers @Singleton class PetApiController @Inject constructor( - private val PetApi : PetApi + private val petApi: PetApi ) : PetApi, WebAction { @Post("/pet") @@ -37,14 +37,14 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun addPet(@RequestBody(required = false) pet: Pet) = - PetApi.addPet(pet) + petApi.addPet(pet) @Delete("/pet/{petId}") @Description("Deletes a pet") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun deletePet(@PathParam("petId") petId: kotlin.Long, @RequestHeaders headers: Headers) = - PetApi.deletePet(petId, apiKey) + petApi.deletePet(petId, apiKey) @Get("/pet/findByStatus") @Description("Finds Pets by status") @@ -52,7 +52,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun findPetsByStatus(@QueryParam status: kotlin.Array) = - PetApi.findPetsByStatus(status) + petApi.findPetsByStatus(status) @Get("/pet/findByTags") @Description("Finds Pets by tags") @@ -60,7 +60,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun findPetsByTags(@QueryParam tags: kotlin.Array) = - PetApi.findPetsByTags(tags) + petApi.findPetsByTags(tags) @Get("/pet/{petId}") @Description("Find pet by ID") @@ -68,7 +68,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun getPetById(@PathParam("petId") petId: kotlin.Long) = - PetApi.getPetById(petId) + petApi.getPetById(petId) @Put("/pet") @Description("Update an existing pet") @@ -77,15 +77,15 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun updatePet(@RequestBody(required = false) pet: Pet) = - PetApi.updatePet(pet) + petApi.updatePet(pet) @Post("/pet/{petId}") @Description("Updates a pet in the store with form data") - @RequestContentType() + @RequestContentType(MediaTypes.APPLICATION_FORM_URLENCODED) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun updatePetWithForm(@PathParam("petId") petId: kotlin.Long,,) = - PetApi.updatePetWithForm(petId, name, status) + petApi.updatePetWithForm(petId, name, status) @Post("/pet/{petId}/uploadImage") @Description("uploads an image") @@ -94,5 +94,5 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun uploadFile(@PathParam("petId") petId: kotlin.Long,,) = - PetApi.uploadFile(petId, additionalMetadata, file) + petApi.uploadFile(petId, additionalMetadata, file) } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt index e37f259d1218..71d75a66c35e 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt @@ -26,7 +26,7 @@ import okhttp3.Headers @Singleton class StoreApiController @Inject constructor( - private val StoreApi : StoreApi + private val storeApi: StoreApi ) : StoreApi, WebAction { @Delete("/store/order/{orderId}") @@ -34,7 +34,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun deleteOrder(@PathParam("orderId") orderId: kotlin.String) = - StoreApi.deleteOrder(orderId) + storeApi.deleteOrder(orderId) @Get("/store/inventory") @Description("Returns pet inventories by status") @@ -42,7 +42,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun getInventory() = - StoreApi.getInventory() + storeApi.getInventory() @Get("/store/order/{orderId}") @Description("Find purchase order by ID") @@ -50,7 +50,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun getOrderById(@PathParam("orderId") orderId: kotlin.Long) = - StoreApi.getOrderById(orderId) + storeApi.getOrderById(orderId) @Post("/store/order") @Description("Place an order for a pet") @@ -59,5 +59,5 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun placeOrder(@RequestBody(required = false) order: Order) = - StoreApi.placeOrder(order) + storeApi.placeOrder(order) } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt index 3a0bb922aeec..bd1acab47819 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt @@ -26,7 +26,7 @@ import okhttp3.Headers @Singleton class UserApiController @Inject constructor( - private val UserApi : UserApi + private val userApi: UserApi ) : UserApi, WebAction { @Post("/user") @@ -35,7 +35,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun createUser(@RequestBody(required = false) user: User) = - UserApi.createUser(user) + userApi.createUser(user) @Post("/user/createWithArray") @Description("Creates list of users with given input array") @@ -43,7 +43,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun createUsersWithArrayInput(@RequestBody(required = false) user: kotlin.Array) = - UserApi.createUsersWithArrayInput(user) + userApi.createUsersWithArrayInput(user) @Post("/user/createWithList") @Description("Creates list of users with given input array") @@ -51,14 +51,14 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun createUsersWithListInput(@RequestBody(required = false) user: kotlin.Array) = - UserApi.createUsersWithListInput(user) + userApi.createUsersWithListInput(user) @Delete("/user/{username}") @Description("Delete user") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun deleteUser(@PathParam("username") username: kotlin.String) = - UserApi.deleteUser(username) + userApi.deleteUser(username) @Get("/user/{username}") @Description("Get user by user name") @@ -66,7 +66,7 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun getUserByName(@PathParam("username") username: kotlin.String) = - UserApi.getUserByName(username) + userApi.getUserByName(username) @Get("/user/login") @Description("Logs user into the system") @@ -74,14 +74,14 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun loginUser(@QueryParam username: kotlin.String,@QueryParam password: kotlin.String) = - UserApi.loginUser(username, password) + userApi.loginUser(username, password) @Get("/user/logout") @Description("Logs out current logged in user session") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun logoutUser() = - UserApi.logoutUser() + userApi.logoutUser() @Put("/user/{username}") @Description("Updated user") @@ -89,5 +89,5 @@ import okhttp3.Headers @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) @Suppress("unused") override fun updateUser(@PathParam("username") username: kotlin.String,@RequestBody(required = false) user: User) = - UserApi.updateUser(username, user) + userApi.updateUser(username, user) } From 75061d785d9dca1d28f5a18a0c910336298edc1f Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Thu, 20 Mar 2025 18:46:16 +0000 Subject: [PATCH 075/102] fixing mediatypes --- .../codegen/languages/KotlinMiskServerCodegen.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 6012483e2adf..3211343341c1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -161,7 +161,7 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List MEDIA_MAPPING = getMappings(); @@ -174,6 +174,7 @@ private static Map getMappings() { result.put("*/*", "MediaTypes.ALL"); result.put("application/x-www-form-urlencoded", "MediaTypes.APPLICATION_FORM_URLENCODED"); result.put("application/octetstream", "MediaTypes.APPLICATION_OCTETSTREAM"); + result.put("application/pdf", "MediaTypes.APPLICATION_OCTETSTREAM"); result.put("application/x-protobuf", "MediaTypes.APPLICATION_PROTOBUF"); result.put("application/grpc", "MediaTypes.APPLICATION_GRPC"); result.put("text/css", "MediaTypes.TEXT_CSS"); From 9663da7932b4f641252eb7e081df315c18c55622 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Fri, 21 Mar 2025 08:10:08 +0000 Subject: [PATCH 076/102] default mediatype --- .../openapitools/codegen/languages/KotlinMiskServerCodegen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 3211343341c1..4e494ae0180e 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -161,7 +161,7 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List " + mediaType + "*/ "); } private final static Map MEDIA_MAPPING = getMappings(); From 7d67448052d975b21818ccf9a95836b4eb7de9dd Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Fri, 21 Mar 2025 08:28:23 +0000 Subject: [PATCH 077/102] adding validation --- .../languages/KotlinMiskServerCodegen.java | 35 ++++++++++++++----- .../petstore/kotlin-misk/docs/PetApi.md | 2 +- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 4e494ae0180e..587d6c7bacfb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -5,6 +5,7 @@ import org.openapitools.codegen.CodegenOperation; import org.openapitools.codegen.CodegenType; import org.openapitools.codegen.SupportingFile; +import org.openapitools.codegen.languages.features.BeanValidationFeatures; import org.openapitools.codegen.meta.GeneratorMetadata; import org.openapitools.codegen.meta.Stability; import org.openapitools.codegen.meta.features.DocumentationFeature; @@ -28,17 +29,19 @@ import static org.openapitools.codegen.utils.StringUtils.camelize; -public class KotlinMiskServerCodegen extends AbstractKotlinCodegen { +public class KotlinMiskServerCodegen extends AbstractKotlinCodegen implements BeanValidationFeatures { + + private static final Logger LOGGER = LoggerFactory.getLogger(KotlinMiskServerCodegen.class); + + private static final String ROOT_PACKAGE = "rootPackage"; + private static final String MODULE_CLASS_NAME = "moduleClassName"; + + private boolean useBeanValidation = true; protected String rootPackage = "org.openapitools.server.api"; protected String apiVersion = "1.0.0-SNAPSHOT"; - @Setter protected String moduleClassName = "OpenApiModule"; - public static final String ROOT_PACKAGE = "rootPackage"; - public static final String PROJECT_NAME = "projectName"; - public static final String MODULE_CLASS_NAME = "moduleClassName"; - - final Logger LOGGER = LoggerFactory.getLogger(KotlinMiskServerCodegen.class); + @Setter protected String moduleClassName = "OpenApiModule"; @Override public CodegenType getTag() { @@ -58,6 +61,8 @@ public String getHelp() { public KotlinMiskServerCodegen() { super(); + addSwitch(USE_BEANVALIDATION, "Use BeanValidation API annotations to validate data types", useBeanValidation); + modifyFeatureSet(features -> features .includeDocumentationFeatures(DocumentationFeature.Readme) .wireFormatFeatures(EnumSet.of(WireFormatFeature.PROTOBUF)) @@ -129,6 +134,11 @@ public void processOpts() { } additionalProperties.put(MODULE_CLASS_NAME, moduleClassName); + if (additionalProperties.containsKey(USE_BEANVALIDATION)) { + this.setUseBeanValidation(convertPropertyToBoolean(USE_BEANVALIDATION)); + } + writePropertyBack(USE_BEANVALIDATION, useBeanValidation); + String apiModuleFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator); String moduleFileName = moduleClassName + ".kt"; supportingFiles.add(new SupportingFile("miskModule.mustache", apiModuleFolder, moduleFileName)); @@ -160,8 +170,17 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List " + mediaType + "*/ "); + return MEDIA_MAPPING.getOrDefault(mediaType, "MediaTypes.APPLICATION_OCTETSTREAM /* unknown -> " + mediaType + " */ "); } private final static Map MEDIA_MAPPING = getMappings(); diff --git a/samples/server/petstore/kotlin-misk/docs/PetApi.md b/samples/server/petstore/kotlin-misk/docs/PetApi.md index d853f8ea820c..0e6c0c3b0613 100644 --- a/samples/server/petstore/kotlin-misk/docs/PetApi.md +++ b/samples/server/petstore/kotlin-misk/docs/PetApi.md @@ -395,6 +395,6 @@ Name | Type | Description | Notes ### HTTP request headers - - **Content-Type**: + - **Content-Type**: MediaTypes.APPLICATION_OCTETSTREAM /* unknown -> multipart/form-data */ - **Accept**: MediaTypes.APPLICATION_JSON From 165f1bfdb181f544ade0edb33897f677d09b08ac Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Fri, 21 Mar 2025 08:37:25 +0000 Subject: [PATCH 078/102] adding validation --- .../kotlin-misk/apiController.mustache | 25 +++++++----------- .../kotlin-spring/queryParams.mustache | 2 +- .../server/api/api/PetApiController.kt | 24 +++++++++-------- .../openapitools/server/api/api/PetApiImpl.kt | 16 ++++++------ .../server/api/api/StoreApiController.kt | 16 ++++++++---- .../server/api/api/StoreApiImpl.kt | 8 +++--- .../server/api/api/UserApiController.kt | 26 ++++++++++--------- .../server/api/api/UserApiImpl.kt | 16 ++++++------ 8 files changed, 69 insertions(+), 64 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index e79484034435..21f34052fe8e 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -20,21 +20,20 @@ package {{package}} {{/swagger1AnnotationLibrary}} {{#useBeanValidation}} - import {{javaxPackage}}.validation.Valid - import {{javaxPackage}}.validation.constraints.DecimalMax - import {{javaxPackage}}.validation.constraints.DecimalMin - import {{javaxPackage}}.validation.constraints.Email - import {{javaxPackage}}.validation.constraints.Max - import {{javaxPackage}}.validation.constraints.Min - import {{javaxPackage}}.validation.constraints.NotNull - import {{javaxPackage}}.validation.constraints.Pattern - import {{javaxPackage}}.validation.constraints.Size +import {{javaxPackage}}.validation.Valid +import {{javaxPackage}}.validation.constraints.DecimalMax +import {{javaxPackage}}.validation.constraints.DecimalMin +import {{javaxPackage}}.validation.constraints.Email +import {{javaxPackage}}.validation.constraints.Max +import {{javaxPackage}}.validation.constraints.Min +import {{javaxPackage}}.validation.constraints.NotNull +import {{javaxPackage}}.validation.constraints.Pattern +import {{javaxPackage}}.validation.constraints.Size {{/useBeanValidation}} import jakarta.inject.Inject import jakarta.inject.Singleton -// TODO("Only import what we need") import misk.web.Delete import misk.web.Description import misk.web.Get @@ -55,9 +54,6 @@ import okhttp3.Headers {{#useBeanValidation}} @Validated {{/useBeanValidation}} -{{#swagger1AnnotationLibrary}} - @Api(value = "{{{baseName}}}", description = "The {{{baseName}}} API") -{{/swagger1AnnotationLibrary}} {{#operations}} @Singleton class {{classname}}Controller @Inject constructor( @@ -70,8 +66,7 @@ import okhttp3.Headers @RequestContentType({{#consumes}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/consumes}}){{/hasConsumes}}{{#hasProduces}} @ResponseContentType({{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}){{/hasProduces}} @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") - override fun {{operationId}}({{#allParams}}{{#isQueryParam}}@QueryParam {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}@PathParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}} @RequestHeaders headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{#isBodyParam}}@RequestBody(required = {{^required}}false{{/required}}{{#required}}false{{/required}}) {{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{^-last}},{{/-last}}{{/allParams}}) = + override fun {{operationId}}({{#allParams}}{{#isQueryParam}}@QueryParam {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}@PathParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}} @RequestHeaders headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{#isBodyParam}}@RequestBody {{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{^-last}},{{/-last}}{{/allParams}}) = {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) {{/operation}} } diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/queryParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/queryParams.mustache index 2bf764c99633..0c9d5f154992 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-spring/queryParams.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-spring/queryParams.mustache @@ -1 +1 @@ -{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#swagger2AnnotationLibrary}}@Parameter(description = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}{{#defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]{{^isContainer}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/isContainer}}){{/defaultValue}}{{/allowableValues}}{{#allowableValues}}{{^defaultValue}}, schema = Schema(allowableValues = [{{#values}}"{{{.}}}"{{^-last}}, {{/-last}}{{/values}}]){{/defaultValue}}{{/allowableValues}}{{^allowableValues}}{{#defaultValue}}{{^isContainer}}, schema = Schema(defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}){{/isContainer}}{{/defaultValue}}{{/allowableValues}}){{/swagger2AnnotationLibrary}}{{#swagger1AnnotationLibrary}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{/values}}"{{/allowableValues}}{{^isContainer}}{{#defaultValue}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}){{/swagger1AnnotationLibrary}}{{#useBeanValidation}} @Valid{{/useBeanValidation}}{{^isModel}} @RequestParam(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{^isContainer}}{{#defaultValue}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}){{/isModel}}{{#isDate}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE){{/isDate}}{{#isDateTime}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME){{/isDateTime}} {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}} \ No newline at end of file +{{#isQueryParam}}{{^isModel}} @RequestParam(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{^isContainer}}{{#defaultValue}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}){{/isModel}}{{#isDate}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE){{/isDate}}{{#isDateTime}} @org.springframework.format.annotation.DateTimeFormat(iso = org.springframework.format.annotation.DateTimeFormat.ISO.DATE_TIME){{/isDateTime}} {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}} \ No newline at end of file diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt index d8abca8c978b..355bd09baacb 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt @@ -3,6 +3,15 @@ package org.openapitools.server.api.api import org.openapitools.server.api.model.ModelApiResponse import org.openapitools.server.api.model.Pet + import javax.validation.Valid + import javax.validation.constraints.DecimalMax + import javax.validation.constraints.DecimalMin + import javax.validation.constraints.Email + import javax.validation.constraints.Max + import javax.validation.constraints.Min + import javax.validation.constraints.NotNull + import javax.validation.constraints.Pattern + import javax.validation.constraints.Size import jakarta.inject.Inject import jakarta.inject.Singleton @@ -25,6 +34,7 @@ import misk.web.interceptors.LogRequestResponse import misk.web.mediatype.MediaTypes import okhttp3.Headers + @Validated @Singleton class PetApiController @Inject constructor( private val petApi: PetApi @@ -35,14 +45,12 @@ import okhttp3.Headers @RequestContentType(MediaTypes.APPLICATION_JSON, MediaTypes.APPLICATION_XML) @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") - override fun addPet(@RequestBody(required = false) pet: Pet) = + override fun addPet(@RequestBody pet: Pet) = petApi.addPet(pet) @Delete("/pet/{petId}") @Description("Deletes a pet") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") override fun deletePet(@PathParam("petId") petId: kotlin.Long, @RequestHeaders headers: Headers) = petApi.deletePet(petId, apiKey) @@ -50,7 +58,6 @@ import okhttp3.Headers @Description("Finds Pets by status") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") override fun findPetsByStatus(@QueryParam status: kotlin.Array) = petApi.findPetsByStatus(status) @@ -58,7 +65,6 @@ import okhttp3.Headers @Description("Finds Pets by tags") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") override fun findPetsByTags(@QueryParam tags: kotlin.Array) = petApi.findPetsByTags(tags) @@ -66,7 +72,6 @@ import okhttp3.Headers @Description("Find pet by ID") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") override fun getPetById(@PathParam("petId") petId: kotlin.Long) = petApi.getPetById(petId) @@ -75,24 +80,21 @@ import okhttp3.Headers @RequestContentType(MediaTypes.APPLICATION_JSON, MediaTypes.APPLICATION_XML) @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") - override fun updatePet(@RequestBody(required = false) pet: Pet) = + override fun updatePet(@RequestBody pet: Pet) = petApi.updatePet(pet) @Post("/pet/{petId}") @Description("Updates a pet in the store with form data") @RequestContentType(MediaTypes.APPLICATION_FORM_URLENCODED) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") override fun updatePetWithForm(@PathParam("petId") petId: kotlin.Long,,) = petApi.updatePetWithForm(petId, name, status) @Post("/pet/{petId}/uploadImage") @Description("uploads an image") - @RequestContentType() + @RequestContentType(MediaTypes.APPLICATION_OCTETSTREAM /* unknown -> multipart/form-data */ ) @ResponseContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") override fun uploadFile(@PathParam("petId") petId: kotlin.Long,,) = petApi.uploadFile(petId, additionalMetadata, file) } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt index ce271f22f50d..69bad440c9bf 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt @@ -14,35 +14,35 @@ import okhttp3.Headers class PetApiImpl @Inject constructor( ): PetApi { - override fun addPet(pet: Pet): Pet { + override fun addPet(pet: Pet) { TODO() } - override fun deletePet(petId: kotlin.Long, headers: Headers) { + override fun deletePet(petId: kotlin.Long, headers: Headers) { TODO() } - override fun findPetsByStatus(status: kotlin.Array): kotlin.Array { + override fun findPetsByStatus(status: kotlin.Array) { TODO() } - override fun findPetsByTags(tags: kotlin.Array): kotlin.Array { + override fun findPetsByTags(tags: kotlin.Array) { TODO() } - override fun getPetById(petId: kotlin.Long): Pet { + override fun getPetById(petId: kotlin.Long) { TODO() } - override fun updatePet(pet: Pet): Pet { + override fun updatePet(pet: Pet) { TODO() } - override fun updatePetWithForm(petId: kotlin.Long, , ) { + override fun updatePetWithForm(petId: kotlin.Long, , ) { TODO() } - override fun uploadFile(petId: kotlin.Long, , ): ModelApiResponse { + override fun uploadFile(petId: kotlin.Long, , ) { TODO() } } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt index 71d75a66c35e..f89256dc3da2 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt @@ -2,6 +2,15 @@ package org.openapitools.server.api.api import org.openapitools.server.api.model.Order + import javax.validation.Valid + import javax.validation.constraints.DecimalMax + import javax.validation.constraints.DecimalMin + import javax.validation.constraints.Email + import javax.validation.constraints.Max + import javax.validation.constraints.Min + import javax.validation.constraints.NotNull + import javax.validation.constraints.Pattern + import javax.validation.constraints.Size import jakarta.inject.Inject import jakarta.inject.Singleton @@ -24,6 +33,7 @@ import misk.web.interceptors.LogRequestResponse import misk.web.mediatype.MediaTypes import okhttp3.Headers + @Validated @Singleton class StoreApiController @Inject constructor( private val storeApi: StoreApi @@ -32,7 +42,6 @@ import okhttp3.Headers @Delete("/store/order/{orderId}") @Description("Delete purchase order by ID") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") override fun deleteOrder(@PathParam("orderId") orderId: kotlin.String) = storeApi.deleteOrder(orderId) @@ -40,7 +49,6 @@ import okhttp3.Headers @Description("Returns pet inventories by status") @ResponseContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") override fun getInventory() = storeApi.getInventory() @@ -48,7 +56,6 @@ import okhttp3.Headers @Description("Find purchase order by ID") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") override fun getOrderById(@PathParam("orderId") orderId: kotlin.Long) = storeApi.getOrderById(orderId) @@ -57,7 +64,6 @@ import okhttp3.Headers @RequestContentType(MediaTypes.APPLICATION_JSON) @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") - override fun placeOrder(@RequestBody(required = false) order: Order) = + override fun placeOrder(@RequestBody order: Order) = storeApi.placeOrder(order) } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt index 20c3d95f3e2d..13b5e709025c 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt @@ -13,19 +13,19 @@ import okhttp3.Headers class StoreApiImpl @Inject constructor( ): StoreApi { - override fun deleteOrder(orderId: kotlin.String) { + override fun deleteOrder(orderId: kotlin.String) { TODO() } - override fun getInventory(): kotlin.collections.Map { + override fun getInventory() { TODO() } - override fun getOrderById(orderId: kotlin.Long): Order { + override fun getOrderById(orderId: kotlin.Long) { TODO() } - override fun placeOrder(order: Order): Order { + override fun placeOrder(order: Order) { TODO() } } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt index bd1acab47819..9cd51d9ac2d5 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt @@ -2,6 +2,15 @@ package org.openapitools.server.api.api import org.openapitools.server.api.model.User + import javax.validation.Valid + import javax.validation.constraints.DecimalMax + import javax.validation.constraints.DecimalMin + import javax.validation.constraints.Email + import javax.validation.constraints.Max + import javax.validation.constraints.Min + import javax.validation.constraints.NotNull + import javax.validation.constraints.Pattern + import javax.validation.constraints.Size import jakarta.inject.Inject import jakarta.inject.Singleton @@ -24,6 +33,7 @@ import misk.web.interceptors.LogRequestResponse import misk.web.mediatype.MediaTypes import okhttp3.Headers + @Validated @Singleton class UserApiController @Inject constructor( private val userApi: UserApi @@ -33,30 +43,26 @@ import okhttp3.Headers @Description("Create user") @RequestContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") - override fun createUser(@RequestBody(required = false) user: User) = + override fun createUser(@RequestBody user: User) = userApi.createUser(user) @Post("/user/createWithArray") @Description("Creates list of users with given input array") @RequestContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") - override fun createUsersWithArrayInput(@RequestBody(required = false) user: kotlin.Array) = + override fun createUsersWithArrayInput(@RequestBody user: kotlin.Array) = userApi.createUsersWithArrayInput(user) @Post("/user/createWithList") @Description("Creates list of users with given input array") @RequestContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") - override fun createUsersWithListInput(@RequestBody(required = false) user: kotlin.Array) = + override fun createUsersWithListInput(@RequestBody user: kotlin.Array) = userApi.createUsersWithListInput(user) @Delete("/user/{username}") @Description("Delete user") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") override fun deleteUser(@PathParam("username") username: kotlin.String) = userApi.deleteUser(username) @@ -64,7 +70,6 @@ import okhttp3.Headers @Description("Get user by user name") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") override fun getUserByName(@PathParam("username") username: kotlin.String) = userApi.getUserByName(username) @@ -72,14 +77,12 @@ import okhttp3.Headers @Description("Logs user into the system") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") override fun loginUser(@QueryParam username: kotlin.String,@QueryParam password: kotlin.String) = userApi.loginUser(username, password) @Get("/user/logout") @Description("Logs out current logged in user session") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") override fun logoutUser() = userApi.logoutUser() @@ -87,7 +90,6 @@ import okhttp3.Headers @Description("Updated user") @RequestContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - @Suppress("unused") - override fun updateUser(@PathParam("username") username: kotlin.String,@RequestBody(required = false) user: User) = + override fun updateUser(@PathParam("username") username: kotlin.String,@RequestBody user: User) = userApi.updateUser(username, user) } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt index b6884e9a0feb..1bce2b4b19b5 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt @@ -13,35 +13,35 @@ import okhttp3.Headers class UserApiImpl @Inject constructor( ): UserApi { - override fun createUser(user: User) { + override fun createUser(user: User) { TODO() } - override fun createUsersWithArrayInput(user: kotlin.Array) { + override fun createUsersWithArrayInput(user: kotlin.Array) { TODO() } - override fun createUsersWithListInput(user: kotlin.Array) { + override fun createUsersWithListInput(user: kotlin.Array) { TODO() } - override fun deleteUser(username: kotlin.String) { + override fun deleteUser(username: kotlin.String) { TODO() } - override fun getUserByName(username: kotlin.String): User { + override fun getUserByName(username: kotlin.String) { TODO() } - override fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String { + override fun loginUser(username: kotlin.String, password: kotlin.String) { TODO() } - override fun logoutUser() { + override fun logoutUser() { TODO() } - override fun updateUser(username: kotlin.String, user: User) { + override fun updateUser(username: kotlin.String, user: User) { TODO() } } From f9a448ffd97e459fc2d7832730132c79dfb15f07 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Fri, 21 Mar 2025 08:42:00 +0000 Subject: [PATCH 079/102] removing swagger --- .../resources/kotlin-misk/apiController.mustache | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 21f34052fe8e..aa25cb75facc 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -2,22 +2,6 @@ package {{package}} {{#imports}}import {{import}} {{/imports}} -{{#swagger2AnnotationLibrary}} - import io.swagger.v3.oas.annotations.* - import io.swagger.v3.oas.annotations.enums.* - import io.swagger.v3.oas.annotations.media.* - import io.swagger.v3.oas.annotations.responses.* - import io.swagger.v3.oas.annotations.security.* -{{/swagger2AnnotationLibrary}} -{{#swagger1AnnotationLibrary}} - import io.swagger.annotations.Api - import io.swagger.annotations.ApiOperation - import io.swagger.annotations.ApiParam - import io.swagger.annotations.ApiResponse - import io.swagger.annotations.ApiResponses - import io.swagger.annotations.Authorization - import io.swagger.annotations.AuthorizationScope -{{/swagger1AnnotationLibrary}} {{#useBeanValidation}} import {{javaxPackage}}.validation.Valid From 1095540e1e6adb2e584d063e2229e9ae70e784f4 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Fri, 21 Mar 2025 08:45:59 +0000 Subject: [PATCH 080/102] adding gradle dependency --- samples/server/petstore/kotlin-misk/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/samples/server/petstore/kotlin-misk/build.gradle.kts b/samples/server/petstore/kotlin-misk/build.gradle.kts index 0765e2791830..470dece6d23e 100644 --- a/samples/server/petstore/kotlin-misk/build.gradle.kts +++ b/samples/server/petstore/kotlin-misk/build.gradle.kts @@ -8,6 +8,7 @@ group = "org.openapitools" version = "1.0.0-SNAPSHOT" dependencies { + implementation("javax.validation:validation-api:2.0.1.Final") implementation("com.squareup.misk:misk:2025.02.11.123913-8a41324") //implementation("com.squareup.wire:wire-runtime:5.2.1") From bdf13a64bef6d6b72883e31717e9673bcc4842e3 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Fri, 21 Mar 2025 08:47:01 +0000 Subject: [PATCH 081/102] adding gradle dependency --- .../src/main/resources/kotlin-misk/build.gradle.kts.mustache | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache index f35d8bb5b8fc..85b9aa73c737 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache @@ -8,6 +8,7 @@ group = "{{groupId}}" version = "{{artifactVersion}}" dependencies { + implementation("javax.validation:validation-api:2.0.1.Final") implementation("com.squareup.misk:misk:2025.02.11.123913-8a41324") //implementation("com.squareup.wire:wire-runtime:5.2.1") From 98705f9bf49e498d3bcf7086c10882de53fddba5 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Fri, 21 Mar 2025 09:48:18 +0000 Subject: [PATCH 082/102] fixing types --- .../languages/KotlinMiskServerCodegen.java | 4 +- .../kotlin-misk/apiController.mustache | 12 ++-- .../resources/kotlin-misk/api_test.mustache | 2 +- .../kotlin-misk/beanValidation.mustache | 4 ++ .../beanValidationBodyParams.mustache | 1 + .../kotlin-misk/beanValidationCore.mustache | 22 +++++++ .../kotlin-misk/beanValidationModel.mustache | 38 +++++++++++ .../beanValidationPathParams.mustache | 1 + .../beanValidationQueryParams.mustache | 1 + .../resources/kotlin-misk/bodyParams.mustache | 1 + .../kotlin-misk/cookieParams.mustache | 1 + .../resources/kotlin-misk/formParams.mustache | 1 + .../kotlin-misk/headerParams.mustache | 1 + .../resources/kotlin-misk/pathParams.mustache | 1 + .../kotlin-misk/queryParams.mustache | 1 + .../kotlin-misk/returnTypes.mustache | 1 + .../kotlin-misk/.openapi-generator/FILES | 6 -- .../org/openapitools/server/api/api/PetApi.kt | 24 ------- .../server/api/api/PetApiController.kt | 64 ++++++++++--------- .../openapitools/server/api/api/PetApiImpl.kt | 48 -------------- .../openapitools/server/api/api/StoreApi.kt | 15 ----- .../server/api/api/StoreApiController.kt | 44 +++++++------ .../server/api/api/StoreApiImpl.kt | 31 --------- .../openapitools/server/api/api/UserApi.kt | 23 ------- .../server/api/api/UserApiController.kt | 64 ++++++++++--------- .../server/api/api/UserApiImpl.kt | 47 -------------- .../openapitools/server/api/api/PetApiTest.kt | 2 +- .../server/api/api/StoreApiTest.kt | 2 +- .../server/api/api/UserApiTest.kt | 2 +- 29 files changed, 178 insertions(+), 286 deletions(-) create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/beanValidation.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/beanValidationBodyParams.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/beanValidationCore.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/beanValidationModel.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/beanValidationPathParams.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/beanValidationQueryParams.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/bodyParams.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/cookieParams.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/formParams.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/pathParams.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/queryParams.mustache create mode 100644 modules/openapi-generator/src/main/resources/kotlin-misk/returnTypes.mustache delete mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt delete mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt delete mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt delete mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt delete mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt delete mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 587d6c7bacfb..82470273b25a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -106,8 +106,8 @@ public KotlinMiskServerCodegen() { apiTemplateFiles.clear(); apiTemplateFiles.put("apiController.mustache", "Controller.kt"); - apiTemplateFiles.put("apiImpl.mustache", "Impl.kt"); - apiTemplateFiles.put("apiInterface.mustache", ".kt"); + //apiTemplateFiles.put("apiImpl.mustache", "Impl.kt"); + //apiTemplateFiles.put("apiInterface.mustache", ".kt"); modelTemplateFiles.put("model.mustache", ".kt"); apiPackage = rootPackage + ".api"; diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index aa25cb75facc..6276bc3e585e 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -35,14 +35,11 @@ import misk.web.interceptors.LogRequestResponse import misk.web.mediatype.MediaTypes import okhttp3.Headers -{{#useBeanValidation}} - @Validated -{{/useBeanValidation}} {{#operations}} @Singleton class {{classname}}Controller @Inject constructor( - private val {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}: {{classname}} - ) : {{classname}}, WebAction { + //private val {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}: {{classname}} + ) : WebAction { {{#operation}} @{{httpMethod}}("{{path}}") @@ -50,8 +47,9 @@ import okhttp3.Headers @RequestContentType({{#consumes}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/consumes}}){{/hasConsumes}}{{#hasProduces}} @ResponseContentType({{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}){{/hasProduces}} @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun {{operationId}}({{#allParams}}{{#isQueryParam}}@QueryParam {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}@PathParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}} @RequestHeaders headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{#isBodyParam}}@RequestBody {{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{^-last}},{{/-last}}{{/allParams}}) = - {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) + fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}) { + TODO() + } {{/operation}} } {{/operations}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache index 959a2c800953..c7614d34badc 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test @MiskTest(startService = true) internal class {{classname}}Test { - @Inject private lateinit var {{classname}} : {{classname}} + @Inject private lateinit var {{classname}} : {{classname}}Controller {{#operations}} {{#operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/beanValidation.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/beanValidation.mustache new file mode 100644 index 000000000000..ee25df4a96a9 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/beanValidation.mustache @@ -0,0 +1,4 @@ +{{#isContainer}}{{^isPrimitiveType}}{{^isEnum}} + @field:Valid{{/isEnum}}{{/isPrimitiveType}}{{/isContainer}}{{! +}}{{^isContainer}}{{^isPrimitiveType}}{{^isNumber}}{{^isUuid}}{{^isDateTime}} + @field:Valid{{/isDateTime}}{{/isUuid}}{{/isNumber}}{{/isPrimitiveType}}{{/isContainer}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/beanValidationBodyParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/beanValidationBodyParams.mustache new file mode 100644 index 000000000000..71bc546835e4 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/beanValidationBodyParams.mustache @@ -0,0 +1 @@ +{{! RequestBody required param is responsible for optional and nullability }}{{>beanValidationCore}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/beanValidationCore.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/beanValidationCore.mustache new file mode 100644 index 000000000000..8eb9029b9809 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/beanValidationCore.mustache @@ -0,0 +1,22 @@ +{{#isEmail}}@Email {{/isEmail}}{{! +pattern set +}}{{#pattern}}@Pattern(regexp="{{{.}}}") {{/pattern}}{{! +minLength && maxLength set +}}{{#minLength}}{{#maxLength}}@Size(min={{minLength}},max={{maxLength}}) {{/maxLength}}{{/minLength}}{{! +minLength set, maxLength not +}}{{#minLength}}{{^maxLength}}@Size(min={{minLength}}) {{/maxLength}}{{/minLength}}{{! +minLength not set, maxLength set +}}{{^minLength}}{{#maxLength}}@Size(max={{.}}) {{/maxLength}}{{/minLength}}{{! +@Size: minItems && maxItems set +}}{{#minItems}}{{#maxItems}}@Size(min={{minItems}},max={{maxItems}}) {{/maxItems}}{{/minItems}}{{! +@Size: minItems set, maxItems not +}}{{#minItems}}{{^maxItems}}@Size(min={{minItems}}) {{/maxItems}}{{/minItems}}{{! +@Size: minItems not set && maxItems set +}}{{^minItems}}{{#maxItems}}@Size(max={{.}}) {{/maxItems}}{{/minItems}}{{! +check for integer or long / all others=decimal type with @Decimal* +isInteger set +}}{{#isInteger}}{{#minimum}}@Min({{.}}){{/minimum}}{{#maximum}} @Max({{.}}) {{/maximum}}{{/isInteger}}{{! +isLong set +}}{{#isLong}}{{#minimum}}@Min({{.}}L){{/minimum}}{{#maximum}} @Max({{.}}L) {{/maximum}}{{/isLong}}{{! +Not Integer, not Long => we have a decimal value! +}}{{^isInteger}}{{^isLong}}{{#minimum}}@DecimalMin("{{.}}"){{/minimum}}{{#maximum}} @DecimalMax("{{.}}") {{/maximum}}{{/isLong}}{{/isInteger}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/beanValidationModel.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/beanValidationModel.mustache new file mode 100644 index 000000000000..583ee37f90e0 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/beanValidationModel.mustache @@ -0,0 +1,38 @@ +{{! +format: email +}}{{#isEmail}} + @get:Email{{/isEmail}}{{! +pattern set +}}{{#pattern}} + @get:Pattern(regexp="{{{pattern}}}"{{#vendorExtensions.x-pattern-message}}, message="{{vendorExtensions.x-pattern-message}}"{{/vendorExtensions.x-pattern-message}}){{/pattern}}{{! +minLength && maxLength set +}}{{#minLength}}{{#maxLength}} + @get:Size(min={{minLength}},max={{maxLength}}){{/maxLength}}{{/minLength}}{{! +minLength set, maxLength not +}}{{#minLength}}{{^maxLength}} + @get:Size(min={{minLength}}){{/maxLength}}{{/minLength}}{{! +minLength not set, maxLength set +}}{{^minLength}}{{#maxLength}} + @get:Size(max={{.}}){{/maxLength}}{{/minLength}}{{! +@Size: minItems && maxItems set +}}{{#minItems}}{{#maxItems}} + @get:Size(min={{minItems}},max={{maxItems}}) {{/maxItems}}{{/minItems}}{{! +@Size: minItems set, maxItems not +}}{{#minItems}}{{^maxItems}} + @get:Size(min={{minItems}}){{/maxItems}}{{/minItems}}{{! +@Size: minItems not set && maxItems set +}}{{^minItems}}{{#maxItems}} + @get:Size(max={{.}}){{/maxItems}}{{/minItems}}{{! +check for integer or long / all others=decimal type with @Decimal* +isInteger set +}}{{#isInteger}}{{#minimum}} + @get:Min({{.}}){{/minimum}}{{#maximum}} + @get:Max({{.}}){{/maximum}}{{/isInteger}}{{! +isLong set +}}{{#isLong}}{{#minimum}} + @get:Min({{.}}L){{/minimum}}{{#maximum}} + @get:Max({{.}}L){{/maximum}}{{/isLong}}{{! +Not Integer, not Long => we have a decimal value! +}}{{^isInteger}}{{^isLong}}{{#minimum}} + @get:DecimalMin("{{.}}"){{/minimum}}{{#maximum}} + @get:DecimalMax("{{.}}"){{/maximum}}{{/isLong}}{{/isInteger}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/beanValidationPathParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/beanValidationPathParams.mustache new file mode 100644 index 000000000000..051bd53c0a58 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/beanValidationPathParams.mustache @@ -0,0 +1 @@ +{{! PathParam is always required, no @NotNull necessary }}{{>beanValidationCore}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/beanValidationQueryParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/beanValidationQueryParams.mustache new file mode 100644 index 000000000000..9cca8cb88748 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/beanValidationQueryParams.mustache @@ -0,0 +1 @@ +{{#required}}@NotNull {{/required}}{{>beanValidationCore}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParams.mustache new file mode 100644 index 000000000000..93f0d240aeaf --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParams.mustache @@ -0,0 +1 @@ +{{#isBodyParam}}{{#useBeanValidation}}@Valid{{>beanValidationBodyParams}}{{/useBeanValidation}} @RequestBody{{^required}}(required = false){{/required}} {{{paramName}}}: {{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}{{>optionalDataType}}{{/isArray}}{{#isArray}}Flow<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/cookieParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/cookieParams.mustache new file mode 100644 index 000000000000..028264a18bcf --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/cookieParams.mustache @@ -0,0 +1 @@ +{{#isCookieParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}@CookieValue(name = "{{baseName}}"{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue = "{{{.}}}"{{/defaultValue}}) {{{paramName}}}: {{>optionalDataType}}{{/isCookieParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/formParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/formParams.mustache new file mode 100644 index 000000000000..9ee63c5ec473 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/formParams.mustache @@ -0,0 +1 @@ +{{#isFormParam}}{{^isFile}}{{#useBeanValidation}}@Valid{{/useBeanValidation}}@QueryParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache new file mode 100644 index 000000000000..490421fd278c --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache @@ -0,0 +1 @@ +{{#isHeaderParam}}{{#useBeanValidation}}{{>beanValidationCore}}{{/useBeanValidation}} {{{paramName}}}: Headers{{/isHeaderParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/pathParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/pathParams.mustache new file mode 100644 index 000000000000..032e0725d58d --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/pathParams.mustache @@ -0,0 +1 @@ +{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}} @PathParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/queryParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/queryParams.mustache new file mode 100644 index 000000000000..9127780653dd --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/queryParams.mustache @@ -0,0 +1 @@ +{{#isQueryParam}}{{^isModel}} @QueryParam(value = "{{baseName}}"{{^isContainer}}{{#defaultValue}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}){{/isModel}} {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/returnTypes.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/returnTypes.mustache new file mode 100644 index 000000000000..857f5545becc --- /dev/null +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/returnTypes.mustache @@ -0,0 +1 @@ +{{#isMap}}Map{{/isMap}}{{#isArray}}{{{returnContainer}}}<{{{returnType}}}>{{/isArray}}{{^returnContainer}}{{{returnType}}}{{/returnContainer}} \ No newline at end of file diff --git a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES index 6f07b4ceb390..2643a9198606 100644 --- a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES @@ -10,16 +10,10 @@ docs/Tag.md docs/User.md docs/UserApi.md settings.gradle.kts -src/main/kotlin/org/openapitools/server/api/api/PetApi.kt src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt -src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt src/main/kotlin/org/openapitools/server/api/api/PetStoreModule.kt -src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt -src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt -src/main/kotlin/org/openapitools/server/api/api/UserApi.kt src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt -src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt src/main/kotlin/org/openapitools/server/api/model/Category.kt src/main/kotlin/org/openapitools/server/api/model/ModelApiResponse.kt src/main/kotlin/org/openapitools/server/api/model/Order.kt diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt deleted file mode 100644 index 92a6af69a274..000000000000 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt +++ /dev/null @@ -1,24 +0,0 @@ -package org.openapitools.server.api.api - -import org.openapitools.server.api.model.ModelApiResponse -import org.openapitools.server.api.model.Pet -import okhttp3.Headers - -interface PetApi { - - fun addPet(pet: Pet): Pet - - fun deletePet(petId: kotlin.Long, headers: Headers) - - fun findPetsByStatus(status: kotlin.Array): kotlin.Array - - fun findPetsByTags(tags: kotlin.Array): kotlin.Array - - fun getPetById(petId: kotlin.Long): Pet - - fun updatePet(pet: Pet): Pet - - fun updatePetWithForm(petId: kotlin.Long, , ) - - fun uploadFile(petId: kotlin.Long, , ): ModelApiResponse -} diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt index 355bd09baacb..eb01fc50d752 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt @@ -3,20 +3,19 @@ package org.openapitools.server.api.api import org.openapitools.server.api.model.ModelApiResponse import org.openapitools.server.api.model.Pet - import javax.validation.Valid - import javax.validation.constraints.DecimalMax - import javax.validation.constraints.DecimalMin - import javax.validation.constraints.Email - import javax.validation.constraints.Max - import javax.validation.constraints.Min - import javax.validation.constraints.NotNull - import javax.validation.constraints.Pattern - import javax.validation.constraints.Size +import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import jakarta.inject.Inject import jakarta.inject.Singleton -// TODO("Only import what we need") import misk.web.Delete import misk.web.Description import misk.web.Get @@ -34,67 +33,74 @@ import misk.web.interceptors.LogRequestResponse import misk.web.mediatype.MediaTypes import okhttp3.Headers - @Validated @Singleton class PetApiController @Inject constructor( - private val petApi: PetApi - ) : PetApi, WebAction { + //private val petApi: PetApi + ) : WebAction { @Post("/pet") @Description("Add a new pet to the store") @RequestContentType(MediaTypes.APPLICATION_JSON, MediaTypes.APPLICATION_XML) @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun addPet(@RequestBody pet: Pet) = - petApi.addPet(pet) + fun addPet(@Valid @RequestBody pet: Pet) { + TODO() + } @Delete("/pet/{petId}") @Description("Deletes a pet") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun deletePet(@PathParam("petId") petId: kotlin.Long, @RequestHeaders headers: Headers) = - petApi.deletePet(petId, apiKey) + fun deletePet( @PathParam("petId") petId: kotlin.Long, apiKey: Headers) { + TODO() + } @Get("/pet/findByStatus") @Description("Finds Pets by status") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun findPetsByStatus(@QueryParam status: kotlin.Array) = - petApi.findPetsByStatus(status) + fun findPetsByStatus( @QueryParam(value = "status") status: kotlin.Array) { + TODO() + } @Get("/pet/findByTags") @Description("Finds Pets by tags") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun findPetsByTags(@QueryParam tags: kotlin.Array) = - petApi.findPetsByTags(tags) + fun findPetsByTags( @QueryParam(value = "tags") tags: kotlin.Array) { + TODO() + } @Get("/pet/{petId}") @Description("Find pet by ID") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun getPetById(@PathParam("petId") petId: kotlin.Long) = - petApi.getPetById(petId) + fun getPetById( @PathParam("petId") petId: kotlin.Long) { + TODO() + } @Put("/pet") @Description("Update an existing pet") @RequestContentType(MediaTypes.APPLICATION_JSON, MediaTypes.APPLICATION_XML) @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun updatePet(@RequestBody pet: Pet) = - petApi.updatePet(pet) + fun updatePet(@Valid @RequestBody pet: Pet) { + TODO() + } @Post("/pet/{petId}") @Description("Updates a pet in the store with form data") @RequestContentType(MediaTypes.APPLICATION_FORM_URLENCODED) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun updatePetWithForm(@PathParam("petId") petId: kotlin.Long,,) = - petApi.updatePetWithForm(petId, name, status) + fun updatePetWithForm( @PathParam("petId") petId: kotlin.Long,@Valid@QueryParam("name") name: kotlin.String?,@Valid@QueryParam("status") status: kotlin.String?) { + TODO() + } @Post("/pet/{petId}/uploadImage") @Description("uploads an image") @RequestContentType(MediaTypes.APPLICATION_OCTETSTREAM /* unknown -> multipart/form-data */ ) @ResponseContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun uploadFile(@PathParam("petId") petId: kotlin.Long,,) = - petApi.uploadFile(petId, additionalMetadata, file) + fun uploadFile( @PathParam("petId") petId: kotlin.Long,@Valid@QueryParam("additionalMetadata") additionalMetadata: kotlin.String?,) { + TODO() + } } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt deleted file mode 100644 index 69bad440c9bf..000000000000 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt +++ /dev/null @@ -1,48 +0,0 @@ -package org.openapitools.server.api.api - -import org.openapitools.server.api.model.ModelApiResponse -import org.openapitools.server.api.model.Pet - -import jakarta.inject.Inject -import jakarta.inject.Singleton -import okhttp3.Headers - -/** - * @TODO("Fill out implementation") - */ -@Singleton -class PetApiImpl @Inject constructor( -): PetApi { - - override fun addPet(pet: Pet) { - TODO() - } - - override fun deletePet(petId: kotlin.Long, headers: Headers) { - TODO() - } - - override fun findPetsByStatus(status: kotlin.Array) { - TODO() - } - - override fun findPetsByTags(tags: kotlin.Array) { - TODO() - } - - override fun getPetById(petId: kotlin.Long) { - TODO() - } - - override fun updatePet(pet: Pet) { - TODO() - } - - override fun updatePetWithForm(petId: kotlin.Long, , ) { - TODO() - } - - override fun uploadFile(petId: kotlin.Long, , ) { - TODO() - } -} diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt deleted file mode 100644 index 012f4e93ce97..000000000000 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt +++ /dev/null @@ -1,15 +0,0 @@ -package org.openapitools.server.api.api - -import org.openapitools.server.api.model.Order -import okhttp3.Headers - -interface StoreApi { - - fun deleteOrder(orderId: kotlin.String) - - fun getInventory(): kotlin.collections.Map - - fun getOrderById(orderId: kotlin.Long): Order - - fun placeOrder(order: Order): Order -} diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt index f89256dc3da2..4232137a44bf 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt @@ -2,20 +2,19 @@ package org.openapitools.server.api.api import org.openapitools.server.api.model.Order - import javax.validation.Valid - import javax.validation.constraints.DecimalMax - import javax.validation.constraints.DecimalMin - import javax.validation.constraints.Email - import javax.validation.constraints.Max - import javax.validation.constraints.Min - import javax.validation.constraints.NotNull - import javax.validation.constraints.Pattern - import javax.validation.constraints.Size +import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import jakarta.inject.Inject import jakarta.inject.Singleton -// TODO("Only import what we need") import misk.web.Delete import misk.web.Description import misk.web.Get @@ -33,37 +32,40 @@ import misk.web.interceptors.LogRequestResponse import misk.web.mediatype.MediaTypes import okhttp3.Headers - @Validated @Singleton class StoreApiController @Inject constructor( - private val storeApi: StoreApi - ) : StoreApi, WebAction { + //private val storeApi: StoreApi + ) : WebAction { @Delete("/store/order/{orderId}") @Description("Delete purchase order by ID") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun deleteOrder(@PathParam("orderId") orderId: kotlin.String) = - storeApi.deleteOrder(orderId) + fun deleteOrder( @PathParam("orderId") orderId: kotlin.String) { + TODO() + } @Get("/store/inventory") @Description("Returns pet inventories by status") @ResponseContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun getInventory() = - storeApi.getInventory() + fun getInventory() { + TODO() + } @Get("/store/order/{orderId}") @Description("Find purchase order by ID") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun getOrderById(@PathParam("orderId") orderId: kotlin.Long) = - storeApi.getOrderById(orderId) + fun getOrderById(@Min(1L) @Max(5L) @PathParam("orderId") orderId: kotlin.Long) { + TODO() + } @Post("/store/order") @Description("Place an order for a pet") @RequestContentType(MediaTypes.APPLICATION_JSON) @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun placeOrder(@RequestBody order: Order) = - storeApi.placeOrder(order) + fun placeOrder(@Valid @RequestBody order: Order) { + TODO() + } } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt deleted file mode 100644 index 13b5e709025c..000000000000 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt +++ /dev/null @@ -1,31 +0,0 @@ -package org.openapitools.server.api.api - -import org.openapitools.server.api.model.Order - -import jakarta.inject.Inject -import jakarta.inject.Singleton -import okhttp3.Headers - -/** - * @TODO("Fill out implementation") - */ -@Singleton -class StoreApiImpl @Inject constructor( -): StoreApi { - - override fun deleteOrder(orderId: kotlin.String) { - TODO() - } - - override fun getInventory() { - TODO() - } - - override fun getOrderById(orderId: kotlin.Long) { - TODO() - } - - override fun placeOrder(order: Order) { - TODO() - } -} diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt deleted file mode 100644 index b14638ec8032..000000000000 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt +++ /dev/null @@ -1,23 +0,0 @@ -package org.openapitools.server.api.api - -import org.openapitools.server.api.model.User -import okhttp3.Headers - -interface UserApi { - - fun createUser(user: User) - - fun createUsersWithArrayInput(user: kotlin.Array) - - fun createUsersWithListInput(user: kotlin.Array) - - fun deleteUser(username: kotlin.String) - - fun getUserByName(username: kotlin.String): User - - fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String - - fun logoutUser() - - fun updateUser(username: kotlin.String, user: User) -} diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt index 9cd51d9ac2d5..cb3d26151c9f 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt @@ -2,20 +2,19 @@ package org.openapitools.server.api.api import org.openapitools.server.api.model.User - import javax.validation.Valid - import javax.validation.constraints.DecimalMax - import javax.validation.constraints.DecimalMin - import javax.validation.constraints.Email - import javax.validation.constraints.Max - import javax.validation.constraints.Min - import javax.validation.constraints.NotNull - import javax.validation.constraints.Pattern - import javax.validation.constraints.Size +import javax.validation.Valid +import javax.validation.constraints.DecimalMax +import javax.validation.constraints.DecimalMin +import javax.validation.constraints.Email +import javax.validation.constraints.Max +import javax.validation.constraints.Min +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size import jakarta.inject.Inject import jakarta.inject.Singleton -// TODO("Only import what we need") import misk.web.Delete import misk.web.Description import misk.web.Get @@ -33,63 +32,70 @@ import misk.web.interceptors.LogRequestResponse import misk.web.mediatype.MediaTypes import okhttp3.Headers - @Validated @Singleton class UserApiController @Inject constructor( - private val userApi: UserApi - ) : UserApi, WebAction { + //private val userApi: UserApi + ) : WebAction { @Post("/user") @Description("Create user") @RequestContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun createUser(@RequestBody user: User) = - userApi.createUser(user) + fun createUser(@Valid @RequestBody user: User) { + TODO() + } @Post("/user/createWithArray") @Description("Creates list of users with given input array") @RequestContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun createUsersWithArrayInput(@RequestBody user: kotlin.Array) = - userApi.createUsersWithArrayInput(user) + fun createUsersWithArrayInput(@Valid @RequestBody user: kotlin.Array) { + TODO() + } @Post("/user/createWithList") @Description("Creates list of users with given input array") @RequestContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun createUsersWithListInput(@RequestBody user: kotlin.Array) = - userApi.createUsersWithListInput(user) + fun createUsersWithListInput(@Valid @RequestBody user: kotlin.Array) { + TODO() + } @Delete("/user/{username}") @Description("Delete user") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun deleteUser(@PathParam("username") username: kotlin.String) = - userApi.deleteUser(username) + fun deleteUser( @PathParam("username") username: kotlin.String) { + TODO() + } @Get("/user/{username}") @Description("Get user by user name") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun getUserByName(@PathParam("username") username: kotlin.String) = - userApi.getUserByName(username) + fun getUserByName( @PathParam("username") username: kotlin.String) { + TODO() + } @Get("/user/login") @Description("Logs user into the system") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun loginUser(@QueryParam username: kotlin.String,@QueryParam password: kotlin.String) = - userApi.loginUser(username, password) + fun loginUser( @QueryParam(value = "username") username: kotlin.String, @QueryParam(value = "password") password: kotlin.String) { + TODO() + } @Get("/user/logout") @Description("Logs out current logged in user session") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun logoutUser() = - userApi.logoutUser() + fun logoutUser() { + TODO() + } @Put("/user/{username}") @Description("Updated user") @RequestContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun updateUser(@PathParam("username") username: kotlin.String,@RequestBody user: User) = - userApi.updateUser(username, user) + fun updateUser( @PathParam("username") username: kotlin.String,@Valid @RequestBody user: User) { + TODO() + } } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt deleted file mode 100644 index 1bce2b4b19b5..000000000000 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt +++ /dev/null @@ -1,47 +0,0 @@ -package org.openapitools.server.api.api - -import org.openapitools.server.api.model.User - -import jakarta.inject.Inject -import jakarta.inject.Singleton -import okhttp3.Headers - -/** - * @TODO("Fill out implementation") - */ -@Singleton -class UserApiImpl @Inject constructor( -): UserApi { - - override fun createUser(user: User) { - TODO() - } - - override fun createUsersWithArrayInput(user: kotlin.Array) { - TODO() - } - - override fun createUsersWithListInput(user: kotlin.Array) { - TODO() - } - - override fun deleteUser(username: kotlin.String) { - TODO() - } - - override fun getUserByName(username: kotlin.String) { - TODO() - } - - override fun loginUser(username: kotlin.String, password: kotlin.String) { - TODO() - } - - override fun logoutUser() { - TODO() - } - - override fun updateUser(username: kotlin.String, user: User) { - TODO() - } -} diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt index 853e9b632b0e..b9f03827bd5f 100644 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt @@ -10,7 +10,7 @@ import org.junit.jupiter.api.Test @MiskTest(startService = true) internal class PetApiTest { - @Inject private lateinit var PetApi : PetApi + @Inject private lateinit var PetApi : PetApiController /** * To test PetApiController.addPet diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt index bc4a8b309e27..0acf9ce1c8fe 100644 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test @MiskTest(startService = true) internal class StoreApiTest { - @Inject private lateinit var StoreApi : StoreApi + @Inject private lateinit var StoreApi : StoreApiController /** * To test StoreApiController.deleteOrder diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt index 484aaef511f7..66a34ea94f50 100644 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test @MiskTest(startService = true) internal class UserApiTest { - @Inject private lateinit var UserApi : UserApi + @Inject private lateinit var UserApi : UserApiController /** * To test UserApiController.createUser From 3c09cebd0016cd99379d44ff59ac100a19aa79f9 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Fri, 21 Mar 2025 10:07:18 +0000 Subject: [PATCH 083/102] fixing return types --- .../kotlin-misk/apiController.mustache | 2 +- .../resources/kotlin-misk/api_test.mustache | 1 + .../kotlin-misk/headerParams.mustache | 2 +- .../kotlin-misk/optionalDataType.mustache | 2 +- .../kotlin-misk/.openapi-generator/FILES | 3 + .../server/api/api/PetApiController.kt | 14 +-- .../server/api/api/StoreApiController.kt | 6 +- .../server/api/api/UserApiController.kt | 4 +- .../openapitools/server/api/api/PetApiTest.kt | 3 +- .../server/api/api/StoreApiTest.kt | 3 + .../server/api/api/UserApiTest.kt | 87 ------------------- 11 files changed, 24 insertions(+), 103 deletions(-) delete mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 6276bc3e585e..37a5560e2610 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -47,7 +47,7 @@ import okhttp3.Headers @RequestContentType({{#consumes}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/consumes}}){{/hasConsumes}}{{#hasProduces}} @ResponseContentType({{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}){{/hasProduces}} @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}) { + fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { TODO() } {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache index c7614d34badc..b84f2fc5cdbf 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache @@ -4,6 +4,7 @@ package {{package}} {{/imports}} import jakarta.inject.Inject import misk.testing.MiskTest +import okhttp3.Headers import org.junit.jupiter.api.Test diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache index 490421fd278c..7c1bb3c062b2 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache @@ -1 +1 @@ -{{#isHeaderParam}}{{#useBeanValidation}}{{>beanValidationCore}}{{/useBeanValidation}} {{{paramName}}}: Headers{{/isHeaderParam}} \ No newline at end of file +{{#isHeaderParam}}{{#useBeanValidation}}{{>beanValidationCore}}{{/useBeanValidation}}{{{paramName}}}: Headers{{/isHeaderParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/optionalDataType.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/optionalDataType.mustache index 61b14936af59..bc69a923dbc7 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/optionalDataType.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/optionalDataType.mustache @@ -1 +1 @@ -{{^isFile}}{{{dataType}}}{{^required}}{{^defaultValue}}?{{/defaultValue}}{{/required}}{{/isFile}}{{#isFile}}{{#isArray}}Array<{{/isArray}}HttpCall{{#isArray}}>{{/isArray}}{{^isArray}}{{^required}}{{/required}}{{/isArray}}{{/isFile}} \ No newline at end of file +{{^isFile}}{{{dataType}}}{{^required}}{{^defaultValue}}?{{/defaultValue}}{{/required}}{{/isFile}}{{#isFile}}{{#isArray}}Array<{{/isArray}}Headers{{#isArray}}>{{/isArray}}{{^isArray}}{{^required}}{{/required}}{{/isArray}}{{/isFile}} \ No newline at end of file diff --git a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES index 2643a9198606..bb77acfe797a 100644 --- a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES @@ -20,3 +20,6 @@ src/main/kotlin/org/openapitools/server/api/model/Order.kt src/main/kotlin/org/openapitools/server/api/model/Pet.kt src/main/kotlin/org/openapitools/server/api/model/Tag.kt src/main/kotlin/org/openapitools/server/api/model/User.kt +src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt +src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt +src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt index eb01fc50d752..58df056f6d81 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt @@ -43,14 +43,14 @@ import okhttp3.Headers @RequestContentType(MediaTypes.APPLICATION_JSON, MediaTypes.APPLICATION_XML) @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun addPet(@Valid @RequestBody pet: Pet) { + fun addPet(@Valid @RequestBody pet: Pet): Pet { TODO() } @Delete("/pet/{petId}") @Description("Deletes a pet") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun deletePet( @PathParam("petId") petId: kotlin.Long, apiKey: Headers) { + fun deletePet( @PathParam("petId") petId: kotlin.Long,apiKey: Headers) { TODO() } @@ -58,7 +58,7 @@ import okhttp3.Headers @Description("Finds Pets by status") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun findPetsByStatus( @QueryParam(value = "status") status: kotlin.Array) { + fun findPetsByStatus( @QueryParam(value = "status") status: kotlin.Array): kotlin.Array { TODO() } @@ -66,7 +66,7 @@ import okhttp3.Headers @Description("Finds Pets by tags") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun findPetsByTags( @QueryParam(value = "tags") tags: kotlin.Array) { + fun findPetsByTags( @QueryParam(value = "tags") tags: kotlin.Array): kotlin.Array { TODO() } @@ -74,7 +74,7 @@ import okhttp3.Headers @Description("Find pet by ID") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun getPetById( @PathParam("petId") petId: kotlin.Long) { + fun getPetById( @PathParam("petId") petId: kotlin.Long): Pet { TODO() } @@ -83,7 +83,7 @@ import okhttp3.Headers @RequestContentType(MediaTypes.APPLICATION_JSON, MediaTypes.APPLICATION_XML) @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun updatePet(@Valid @RequestBody pet: Pet) { + fun updatePet(@Valid @RequestBody pet: Pet): Pet { TODO() } @@ -100,7 +100,7 @@ import okhttp3.Headers @RequestContentType(MediaTypes.APPLICATION_OCTETSTREAM /* unknown -> multipart/form-data */ ) @ResponseContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun uploadFile( @PathParam("petId") petId: kotlin.Long,@Valid@QueryParam("additionalMetadata") additionalMetadata: kotlin.String?,) { + fun uploadFile( @PathParam("petId") petId: kotlin.Long,@Valid@QueryParam("additionalMetadata") additionalMetadata: kotlin.String?,): ModelApiResponse { TODO() } } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt index 4232137a44bf..30f830df6a54 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt @@ -48,7 +48,7 @@ import okhttp3.Headers @Description("Returns pet inventories by status") @ResponseContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun getInventory() { + fun getInventory(): kotlin.collections.Map { TODO() } @@ -56,7 +56,7 @@ import okhttp3.Headers @Description("Find purchase order by ID") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun getOrderById(@Min(1L) @Max(5L) @PathParam("orderId") orderId: kotlin.Long) { + fun getOrderById(@Min(1L) @Max(5L) @PathParam("orderId") orderId: kotlin.Long): Order { TODO() } @@ -65,7 +65,7 @@ import okhttp3.Headers @RequestContentType(MediaTypes.APPLICATION_JSON) @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun placeOrder(@Valid @RequestBody order: Order) { + fun placeOrder(@Valid @RequestBody order: Order): Order { TODO() } } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt index cb3d26151c9f..483fc361feee 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt @@ -72,7 +72,7 @@ import okhttp3.Headers @Description("Get user by user name") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun getUserByName( @PathParam("username") username: kotlin.String) { + fun getUserByName( @PathParam("username") username: kotlin.String): User { TODO() } @@ -80,7 +80,7 @@ import okhttp3.Headers @Description("Logs user into the system") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun loginUser( @QueryParam(value = "username") username: kotlin.String, @QueryParam(value = "password") password: kotlin.String) { + fun loginUser( @QueryParam(value = "username") username: kotlin.String, @QueryParam(value = "password") password: kotlin.String): kotlin.String { TODO() } diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt index b9f03827bd5f..a0d37b282b85 100644 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt @@ -4,6 +4,7 @@ import org.openapitools.server.api.model.ModelApiResponse import org.openapitools.server.api.model.Pet import jakarta.inject.Inject import misk.testing.MiskTest +import okhttp3.Headers import org.junit.jupiter.api.Test @@ -85,7 +86,7 @@ internal class PetApiTest { fun `should handle uploadFile`() { val petId: kotlin.Long = TODO() val additionalMetadata: kotlin.String? = TODO() - val file: HttpCall = TODO() + val file: Headers = TODO() val response: ModelApiResponse = PetApi.uploadFile(petId, additionalMetadata, file) } diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt index 0acf9ce1c8fe..871cdfd100f5 100644 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt @@ -1,8 +1,11 @@ + + package org.openapitools.server.api.api import org.openapitools.server.api.model.Order import jakarta.inject.Inject import misk.testing.MiskTest +import okhttp3.Headers import org.junit.jupiter.api.Test diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt deleted file mode 100644 index 66a34ea94f50..000000000000 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt +++ /dev/null @@ -1,87 +0,0 @@ -package org.openapitools.server.api.api - -import org.openapitools.server.api.model.User -import jakarta.inject.Inject -import misk.testing.MiskTest - -import org.junit.jupiter.api.Test - -@MiskTest(startService = true) -internal class UserApiTest { - - @Inject private lateinit var UserApi : UserApiController - - /** - * To test UserApiController.createUser - */ - @Test - fun `should handle createUser`() { - val user: User = TODO() - val response = UserApi.createUser(user) - } - - /** - * To test UserApiController.createUsersWithArrayInput - */ - @Test - fun `should handle createUsersWithArrayInput`() { - val user: kotlin.Array = TODO() - val response = UserApi.createUsersWithArrayInput(user) - } - - /** - * To test UserApiController.createUsersWithListInput - */ - @Test - fun `should handle createUsersWithListInput`() { - val user: kotlin.Array = TODO() - val response = UserApi.createUsersWithListInput(user) - } - - /** - * To test UserApiController.deleteUser - */ - @Test - fun `should handle deleteUser`() { - val username: kotlin.String = TODO() - val response = UserApi.deleteUser(username) - } - - /** - * To test UserApiController.getUserByName - */ - @Test - fun `should handle getUserByName`() { - val username: kotlin.String = TODO() - val response: User = UserApi.getUserByName(username) - } - - /** - * To test UserApiController.loginUser - */ - @Test - fun `should handle loginUser`() { - val username: kotlin.String = TODO() - val password: kotlin.String = TODO() - val response: kotlin.String = UserApi.loginUser(username, password) - } - - /** - * To test UserApiController.logoutUser - */ - @Test - fun `should handle logoutUser`() { - val response = UserApi.logoutUser() - } - - /** - * To test UserApiController.updateUser - */ - @Test - fun `should handle updateUser`() { - val username: kotlin.String = TODO() - val user: User = TODO() - val response = UserApi.updateUser(username, user) - } - -} From 68dd9a3501dd978742919d8d0399de2dbdb857a5 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Fri, 21 Mar 2025 10:10:12 +0000 Subject: [PATCH 084/102] fixing tests --- .../resources/kotlin-misk/api_test.mustache | 4 +- .../openapitools/server/api/api/PetApiTest.kt | 93 ------------------- .../server/api/api/StoreApiTest.kt | 52 ----------- .../server/api/api/UserApiTest.kt | 88 ++++++++++++++++++ 4 files changed, 90 insertions(+), 147 deletions(-) delete mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt delete mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt create mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache index b84f2fc5cdbf..317c75806a53 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache @@ -11,7 +11,7 @@ import org.junit.jupiter.api.Test @MiskTest(startService = true) internal class {{classname}}Test { - @Inject private lateinit var {{classname}} : {{classname}}Controller + @Inject private lateinit var {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}: {{classname}}Controller {{#operations}} {{#operation}} @@ -23,7 +23,7 @@ internal class {{classname}}Test { {{#allParams}} val {{{paramName}}}: {{>optionalDataType}} = TODO() {{/allParams}} - val response{{#returnType}}: {{{returnType}}}{{/returnType}} = {{classname}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) + val response{{#returnType}}: {{{returnType}}}{{/returnType}} = {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) } {{/operation}} diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt deleted file mode 100644 index a0d37b282b85..000000000000 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt +++ /dev/null @@ -1,93 +0,0 @@ -package org.openapitools.server.api.api - -import org.openapitools.server.api.model.ModelApiResponse -import org.openapitools.server.api.model.Pet -import jakarta.inject.Inject -import misk.testing.MiskTest -import okhttp3.Headers - -import org.junit.jupiter.api.Test - -@MiskTest(startService = true) -internal class PetApiTest { - - @Inject private lateinit var PetApi : PetApiController - - /** - * To test PetApiController.addPet - */ - @Test - fun `should handle addPet`() { - val pet: Pet = TODO() - val response: Pet = PetApi.addPet(pet) - } - - /** - * To test PetApiController.deletePet - */ - @Test - fun `should handle deletePet`() { - val petId: kotlin.Long = TODO() - val apiKey: kotlin.String? = TODO() - val response = PetApi.deletePet(petId, apiKey) - } - - /** - * To test PetApiController.findPetsByStatus - */ - @Test - fun `should handle findPetsByStatus`() { - val status: kotlin.Array = TODO() - val response: kotlin.Array = PetApi.findPetsByStatus(status) - } - - /** - * To test PetApiController.findPetsByTags - */ - @Test - fun `should handle findPetsByTags`() { - val tags: kotlin.Array = TODO() - val response: kotlin.Array = PetApi.findPetsByTags(tags) - } - - /** - * To test PetApiController.getPetById - */ - @Test - fun `should handle getPetById`() { - val petId: kotlin.Long = TODO() - val response: Pet = PetApi.getPetById(petId) - } - - /** - * To test PetApiController.updatePet - */ - @Test - fun `should handle updatePet`() { - val pet: Pet = TODO() - val response: Pet = PetApi.updatePet(pet) - } - - /** - * To test PetApiController.updatePetWithForm - */ - @Test - fun `should handle updatePetWithForm`() { - val petId: kotlin.Long = TODO() - val name: kotlin.String? = TODO() - val status: kotlin.String? = TODO() - val response = PetApi.updatePetWithForm(petId, name, status) - } - - /** - * To test PetApiController.uploadFile - */ - @Test - fun `should handle uploadFile`() { - val petId: kotlin.Long = TODO() - val additionalMetadata: kotlin.String? = TODO() - val file: Headers = TODO() - val response: ModelApiResponse = PetApi.uploadFile(petId, additionalMetadata, file) - } - -} diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt deleted file mode 100644 index 871cdfd100f5..000000000000 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt +++ /dev/null @@ -1,52 +0,0 @@ - - -package org.openapitools.server.api.api - -import org.openapitools.server.api.model.Order -import jakarta.inject.Inject -import misk.testing.MiskTest -import okhttp3.Headers - -import org.junit.jupiter.api.Test - -@MiskTest(startService = true) -internal class StoreApiTest { - - @Inject private lateinit var StoreApi : StoreApiController - - /** - * To test StoreApiController.deleteOrder - */ - @Test - fun `should handle deleteOrder`() { - val orderId: kotlin.String = TODO() - val response = StoreApi.deleteOrder(orderId) - } - - /** - * To test StoreApiController.getInventory - */ - @Test - fun `should handle getInventory`() { - val response: kotlin.collections.Map = StoreApi.getInventory() - } - - /** - * To test StoreApiController.getOrderById - */ - @Test - fun `should handle getOrderById`() { - val orderId: kotlin.Long = TODO() - val response: Order = StoreApi.getOrderById(orderId) - } - - /** - * To test StoreApiController.placeOrder - */ - @Test - fun `should handle placeOrder`() { - val order: Order = TODO() - val response: Order = StoreApi.placeOrder(order) - } - -} diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt new file mode 100644 index 000000000000..2305f97e9938 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt @@ -0,0 +1,88 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.User +import jakarta.inject.Inject +import misk.testing.MiskTest +import okhttp3.Headers + +import org.junit.jupiter.api.Test + +@MiskTest(startService = true) +internal class UserApiTest { + + @Inject private lateinit var userApi: UserApiController + + /** + * To test UserApiController.createUser + */ + @Test + fun `should handle createUser`() { + val user: User = TODO() + val response = userApi.createUser(user) + } + + /** + * To test UserApiController.createUsersWithArrayInput + */ + @Test + fun `should handle createUsersWithArrayInput`() { + val user: kotlin.Array = TODO() + val response = userApi.createUsersWithArrayInput(user) + } + + /** + * To test UserApiController.createUsersWithListInput + */ + @Test + fun `should handle createUsersWithListInput`() { + val user: kotlin.Array = TODO() + val response = userApi.createUsersWithListInput(user) + } + + /** + * To test UserApiController.deleteUser + */ + @Test + fun `should handle deleteUser`() { + val username: kotlin.String = TODO() + val response = userApi.deleteUser(username) + } + + /** + * To test UserApiController.getUserByName + */ + @Test + fun `should handle getUserByName`() { + val username: kotlin.String = TODO() + val response: User = userApi.getUserByName(username) + } + + /** + * To test UserApiController.loginUser + */ + @Test + fun `should handle loginUser`() { + val username: kotlin.String = TODO() + val password: kotlin.String = TODO() + val response: kotlin.String = userApi.loginUser(username, password) + } + + /** + * To test UserApiController.logoutUser + */ + @Test + fun `should handle logoutUser`() { + val response = userApi.logoutUser() + } + + /** + * To test UserApiController.updateUser + */ + @Test + fun `should handle updateUser`() { + val username: kotlin.String = TODO() + val user: User = TODO() + val response = userApi.updateUser(username, user) + } + +} From d56f80849969a46feab86c65caa2b07d4c58c59a Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Fri, 21 Mar 2025 10:58:37 +0000 Subject: [PATCH 085/102] final fixes --- .../src/main/resources/kotlin-misk/apiController.mustache | 1 + .../src/main/resources/kotlin-misk/api_test.mustache | 2 +- .../src/main/resources/kotlin-misk/bodyParams.mustache | 2 +- .../src/main/resources/kotlin-misk/model.mustache | 2 +- .../src/main/resources/kotlin-misk/pathParams.mustache | 2 +- .../src/main/resources/kotlin-misk/queryParams.mustache | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 37a5560e2610..e8a43b532795 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -22,6 +22,7 @@ import misk.web.Delete import misk.web.Description import misk.web.Get import misk.web.HttpCall +import misk.web.Patch import misk.web.PathParam import misk.web.Post import misk.web.Put diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache index 317c75806a53..411f46a0c3d5 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache @@ -21,7 +21,7 @@ internal class {{classname}}Test { @Test fun `should handle {{operationId}}`() { {{#allParams}} - val {{{paramName}}}: {{>optionalDataType}} = TODO() + val {{{paramName}}} = TODO() {{/allParams}} val response{{#returnType}}: {{{returnType}}}{{/returnType}} = {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}.{{operationId}}({{#allParams}}{{{paramName}}}{{^-last}}, {{/-last}}{{/allParams}}) } diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParams.mustache index 93f0d240aeaf..4553d22d7653 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParams.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/bodyParams.mustache @@ -1 +1 @@ -{{#isBodyParam}}{{#useBeanValidation}}@Valid{{>beanValidationBodyParams}}{{/useBeanValidation}} @RequestBody{{^required}}(required = false){{/required}} {{{paramName}}}: {{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}{{>optionalDataType}}{{/isArray}}{{#isArray}}Flow<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}} \ No newline at end of file +{{#isBodyParam}}{{#useBeanValidation}}@Valid{{>beanValidationBodyParams}}{{/useBeanValidation}} @RequestBody {{{paramName}}}: {{^reactive}}{{>optionalDataType}}{{/reactive}}{{#reactive}}{{^isArray}}{{>optionalDataType}}{{/isArray}}{{#isArray}}Flow<{{{baseType}}}>{{/isArray}}{{/reactive}}{{/isBodyParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache index d3b6eb37bea9..74b75e10e2b6 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache @@ -21,7 +21,7 @@ data class {{classname}}( {{#description}} /** {{description}} */ {{/description}} - val {{name}}: {{{dataType}}}{{^required}}?{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{^-last}},{{/-last}} + val {{{name}}}: {{{dataType}}}{{^required}}?{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{^-last}},{{/-last}} {{/vars}} ) {{/isEnum}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/pathParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/pathParams.mustache index 032e0725d58d..518c78fbd844 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/pathParams.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/pathParams.mustache @@ -1 +1 @@ -{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}} @PathParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}} \ No newline at end of file +{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}@PathParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isPathParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/queryParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/queryParams.mustache index 9127780653dd..17363f56d699 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/queryParams.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/queryParams.mustache @@ -1 +1 @@ -{{#isQueryParam}}{{^isModel}} @QueryParam(value = "{{baseName}}"{{^isContainer}}{{#defaultValue}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}){{/isModel}} {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}} \ No newline at end of file +{{#isQueryParam}}{{^isModel}} @QueryParam(value = "{{baseName}}"){{/isModel}} {{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}} \ No newline at end of file From 1bcff51d21b38d1564dd2e2a31d03d64aa1db49e Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Fri, 21 Mar 2025 11:24:04 +0000 Subject: [PATCH 086/102] tweaks --- .../server/petstore/kotlin-misk/.openapi-generator/FILES | 3 --- .../org/openapitools/server/api/api/PetApiController.kt | 9 +++++---- .../openapitools/server/api/api/StoreApiController.kt | 5 +++-- .../org/openapitools/server/api/api/UserApiController.kt | 7 ++++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES index bb77acfe797a..2643a9198606 100644 --- a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES @@ -20,6 +20,3 @@ src/main/kotlin/org/openapitools/server/api/model/Order.kt src/main/kotlin/org/openapitools/server/api/model/Pet.kt src/main/kotlin/org/openapitools/server/api/model/Tag.kt src/main/kotlin/org/openapitools/server/api/model/User.kt -src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt -src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt -src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt index 58df056f6d81..3cb2b7238b03 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt @@ -20,6 +20,7 @@ import misk.web.Delete import misk.web.Description import misk.web.Get import misk.web.HttpCall +import misk.web.Patch import misk.web.PathParam import misk.web.Post import misk.web.Put @@ -50,7 +51,7 @@ import okhttp3.Headers @Delete("/pet/{petId}") @Description("Deletes a pet") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun deletePet( @PathParam("petId") petId: kotlin.Long,apiKey: Headers) { + fun deletePet(@PathParam("petId") petId: kotlin.Long,apiKey: Headers) { TODO() } @@ -74,7 +75,7 @@ import okhttp3.Headers @Description("Find pet by ID") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun getPetById( @PathParam("petId") petId: kotlin.Long): Pet { + fun getPetById(@PathParam("petId") petId: kotlin.Long): Pet { TODO() } @@ -91,7 +92,7 @@ import okhttp3.Headers @Description("Updates a pet in the store with form data") @RequestContentType(MediaTypes.APPLICATION_FORM_URLENCODED) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun updatePetWithForm( @PathParam("petId") petId: kotlin.Long,@Valid@QueryParam("name") name: kotlin.String?,@Valid@QueryParam("status") status: kotlin.String?) { + fun updatePetWithForm(@PathParam("petId") petId: kotlin.Long,@Valid@QueryParam("name") name: kotlin.String?,@Valid@QueryParam("status") status: kotlin.String?) { TODO() } @@ -100,7 +101,7 @@ import okhttp3.Headers @RequestContentType(MediaTypes.APPLICATION_OCTETSTREAM /* unknown -> multipart/form-data */ ) @ResponseContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun uploadFile( @PathParam("petId") petId: kotlin.Long,@Valid@QueryParam("additionalMetadata") additionalMetadata: kotlin.String?,): ModelApiResponse { + fun uploadFile(@PathParam("petId") petId: kotlin.Long,@Valid@QueryParam("additionalMetadata") additionalMetadata: kotlin.String?,): ModelApiResponse { TODO() } } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt index 30f830df6a54..298bad2e5abf 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt @@ -19,6 +19,7 @@ import misk.web.Delete import misk.web.Description import misk.web.Get import misk.web.HttpCall +import misk.web.Patch import misk.web.PathParam import misk.web.Post import misk.web.Put @@ -40,7 +41,7 @@ import okhttp3.Headers @Delete("/store/order/{orderId}") @Description("Delete purchase order by ID") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun deleteOrder( @PathParam("orderId") orderId: kotlin.String) { + fun deleteOrder(@PathParam("orderId") orderId: kotlin.String) { TODO() } @@ -56,7 +57,7 @@ import okhttp3.Headers @Description("Find purchase order by ID") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun getOrderById(@Min(1L) @Max(5L) @PathParam("orderId") orderId: kotlin.Long): Order { + fun getOrderById(@Min(1L) @Max(5L) @PathParam("orderId") orderId: kotlin.Long): Order { TODO() } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt index 483fc361feee..4f6110831bef 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt @@ -19,6 +19,7 @@ import misk.web.Delete import misk.web.Description import misk.web.Get import misk.web.HttpCall +import misk.web.Patch import misk.web.PathParam import misk.web.Post import misk.web.Put @@ -64,7 +65,7 @@ import okhttp3.Headers @Delete("/user/{username}") @Description("Delete user") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun deleteUser( @PathParam("username") username: kotlin.String) { + fun deleteUser(@PathParam("username") username: kotlin.String) { TODO() } @@ -72,7 +73,7 @@ import okhttp3.Headers @Description("Get user by user name") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun getUserByName( @PathParam("username") username: kotlin.String): User { + fun getUserByName(@PathParam("username") username: kotlin.String): User { TODO() } @@ -95,7 +96,7 @@ import okhttp3.Headers @Description("Updated user") @RequestContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun updateUser( @PathParam("username") username: kotlin.String,@Valid @RequestBody user: User) { + fun updateUser(@PathParam("username") username: kotlin.String,@Valid @RequestBody user: User) { TODO() } } From 754c7d2039059af0865823614971b3d03925a507 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Fri, 21 Mar 2025 11:52:44 +0000 Subject: [PATCH 087/102] fixing file etc. --- .../src/main/resources/kotlin-misk/apiController.mustache | 2 +- .../src/main/resources/kotlin-misk/formParams.mustache | 2 +- .../main/resources/kotlin-misk/optionalDataType.mustache | 2 +- .../org/openapitools/server/api/api/PetApiController.kt | 6 +++--- .../org/openapitools/server/api/api/UserApiController.kt | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index e8a43b532795..d24bf770a795 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -48,7 +48,7 @@ import okhttp3.Headers @RequestContentType({{#consumes}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/consumes}}){{/hasConsumes}}{{#hasProduces}} @ResponseContentType({{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}){{/hasProduces}} @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}},{{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { + fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { TODO() } {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/formParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/formParams.mustache index 9ee63c5ec473..ad960ccdb724 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/formParams.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/formParams.mustache @@ -1 +1 @@ -{{#isFormParam}}{{^isFile}}{{#useBeanValidation}}@Valid{{/useBeanValidation}}@QueryParam("{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isFile}}{{/isFormParam}} \ No newline at end of file +{{#isFormParam}}{{^isFile}}{{#isModel}}@RequestPart{{/isModel}}{{^isModel}}@QueryParam{{/isModel}}(value = "{{baseName}}") {{{paramName}}}: {{>optionalDataType}} {{/isFile}}{{#isFile}}{{#useBeanValidation}}@Valid{{/useBeanValidation}} {{{paramName}}}: {{>optionalDataType}}HttpCall{{/isFile}}{{/isFormParam}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/optionalDataType.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/optionalDataType.mustache index bc69a923dbc7..96a2ec611e60 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/optionalDataType.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/optionalDataType.mustache @@ -1 +1 @@ -{{^isFile}}{{{dataType}}}{{^required}}{{^defaultValue}}?{{/defaultValue}}{{/required}}{{/isFile}}{{#isFile}}{{#isArray}}Array<{{/isArray}}Headers{{#isArray}}>{{/isArray}}{{^isArray}}{{^required}}{{/required}}{{/isArray}}{{/isFile}} \ No newline at end of file +{{^isFile}}{{{dataType}}}{{^required}}{{^defaultValue}}?{{/defaultValue}}{{/required}}{{/isFile}}{{#isFile}}{{#isArray}}Array<{{/isArray}}{{#isArray}}>{{/isArray}}{{^isArray}}{{^required}}{{/required}}{{/isArray}}{{/isFile}} \ No newline at end of file diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt index 3cb2b7238b03..5527801a0f4a 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt @@ -51,7 +51,7 @@ import okhttp3.Headers @Delete("/pet/{petId}") @Description("Deletes a pet") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun deletePet(@PathParam("petId") petId: kotlin.Long,apiKey: Headers) { + fun deletePet(@PathParam("petId") petId: kotlin.Long, apiKey: Headers) { TODO() } @@ -92,7 +92,7 @@ import okhttp3.Headers @Description("Updates a pet in the store with form data") @RequestContentType(MediaTypes.APPLICATION_FORM_URLENCODED) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun updatePetWithForm(@PathParam("petId") petId: kotlin.Long,@Valid@QueryParam("name") name: kotlin.String?,@Valid@QueryParam("status") status: kotlin.String?) { + fun updatePetWithForm(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "name") name: kotlin.String? , @QueryParam(value = "status") status: kotlin.String? ) { TODO() } @@ -101,7 +101,7 @@ import okhttp3.Headers @RequestContentType(MediaTypes.APPLICATION_OCTETSTREAM /* unknown -> multipart/form-data */ ) @ResponseContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun uploadFile(@PathParam("petId") petId: kotlin.Long,@Valid@QueryParam("additionalMetadata") additionalMetadata: kotlin.String?,): ModelApiResponse { + fun uploadFile(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "additionalMetadata") additionalMetadata: kotlin.String? , @Valid file: HttpCall): ModelApiResponse { TODO() } } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt index 4f6110831bef..3fdab12dd891 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt @@ -81,7 +81,7 @@ import okhttp3.Headers @Description("Logs user into the system") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun loginUser( @QueryParam(value = "username") username: kotlin.String, @QueryParam(value = "password") password: kotlin.String): kotlin.String { + fun loginUser( @QueryParam(value = "username") username: kotlin.String, @QueryParam(value = "password") password: kotlin.String): kotlin.String { TODO() } @@ -96,7 +96,7 @@ import okhttp3.Headers @Description("Updated user") @RequestContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun updateUser(@PathParam("username") username: kotlin.String,@Valid @RequestBody user: User) { + fun updateUser(@PathParam("username") username: kotlin.String, @Valid @RequestBody user: User) { TODO() } } From f0c0c523abe40a951a650c4991316b0da1a6f9ad Mon Sep 17 00:00:00 2001 From: Guido Arnau Date: Fri, 21 Mar 2025 12:55:24 +0100 Subject: [PATCH 088/102] Update samples/ folder --- .../org/openapitools/server/api/api/PetApi.kt | 24 +++++ .../openapitools/server/api/api/PetApiImpl.kt | 48 ++++++++++ .../openapitools/server/api/api/StoreApi.kt | 15 +++ .../server/api/api/StoreApiImpl.kt | 31 +++++++ .../openapitools/server/api/api/UserApi.kt | 23 +++++ .../server/api/api/UserApiImpl.kt | 47 ++++++++++ .../openapitools/server/api/api/PetApiTest.kt | 93 +++++++++++++++++++ .../server/api/api/StoreApiTest.kt | 50 ++++++++++ 8 files changed, 331 insertions(+) create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt create mode 100644 samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt create mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt create mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt new file mode 100644 index 000000000000..92a6af69a274 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt @@ -0,0 +1,24 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.ModelApiResponse +import org.openapitools.server.api.model.Pet +import okhttp3.Headers + +interface PetApi { + + fun addPet(pet: Pet): Pet + + fun deletePet(petId: kotlin.Long, headers: Headers) + + fun findPetsByStatus(status: kotlin.Array): kotlin.Array + + fun findPetsByTags(tags: kotlin.Array): kotlin.Array + + fun getPetById(petId: kotlin.Long): Pet + + fun updatePet(pet: Pet): Pet + + fun updatePetWithForm(petId: kotlin.Long, , ) + + fun uploadFile(petId: kotlin.Long, , ): ModelApiResponse +} diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt new file mode 100644 index 000000000000..ce271f22f50d --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt @@ -0,0 +1,48 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.ModelApiResponse +import org.openapitools.server.api.model.Pet + +import jakarta.inject.Inject +import jakarta.inject.Singleton +import okhttp3.Headers + +/** + * @TODO("Fill out implementation") + */ +@Singleton +class PetApiImpl @Inject constructor( +): PetApi { + + override fun addPet(pet: Pet): Pet { + TODO() + } + + override fun deletePet(petId: kotlin.Long, headers: Headers) { + TODO() + } + + override fun findPetsByStatus(status: kotlin.Array): kotlin.Array { + TODO() + } + + override fun findPetsByTags(tags: kotlin.Array): kotlin.Array { + TODO() + } + + override fun getPetById(petId: kotlin.Long): Pet { + TODO() + } + + override fun updatePet(pet: Pet): Pet { + TODO() + } + + override fun updatePetWithForm(petId: kotlin.Long, , ) { + TODO() + } + + override fun uploadFile(petId: kotlin.Long, , ): ModelApiResponse { + TODO() + } +} diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt new file mode 100644 index 000000000000..012f4e93ce97 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt @@ -0,0 +1,15 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.Order +import okhttp3.Headers + +interface StoreApi { + + fun deleteOrder(orderId: kotlin.String) + + fun getInventory(): kotlin.collections.Map + + fun getOrderById(orderId: kotlin.Long): Order + + fun placeOrder(order: Order): Order +} diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt new file mode 100644 index 000000000000..20c3d95f3e2d --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt @@ -0,0 +1,31 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.Order + +import jakarta.inject.Inject +import jakarta.inject.Singleton +import okhttp3.Headers + +/** + * @TODO("Fill out implementation") + */ +@Singleton +class StoreApiImpl @Inject constructor( +): StoreApi { + + override fun deleteOrder(orderId: kotlin.String) { + TODO() + } + + override fun getInventory(): kotlin.collections.Map { + TODO() + } + + override fun getOrderById(orderId: kotlin.Long): Order { + TODO() + } + + override fun placeOrder(order: Order): Order { + TODO() + } +} diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt new file mode 100644 index 000000000000..b14638ec8032 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt @@ -0,0 +1,23 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.User +import okhttp3.Headers + +interface UserApi { + + fun createUser(user: User) + + fun createUsersWithArrayInput(user: kotlin.Array) + + fun createUsersWithListInput(user: kotlin.Array) + + fun deleteUser(username: kotlin.String) + + fun getUserByName(username: kotlin.String): User + + fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String + + fun logoutUser() + + fun updateUser(username: kotlin.String, user: User) +} diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt new file mode 100644 index 000000000000..b6884e9a0feb --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt @@ -0,0 +1,47 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.User + +import jakarta.inject.Inject +import jakarta.inject.Singleton +import okhttp3.Headers + +/** + * @TODO("Fill out implementation") + */ +@Singleton +class UserApiImpl @Inject constructor( +): UserApi { + + override fun createUser(user: User) { + TODO() + } + + override fun createUsersWithArrayInput(user: kotlin.Array) { + TODO() + } + + override fun createUsersWithListInput(user: kotlin.Array) { + TODO() + } + + override fun deleteUser(username: kotlin.String) { + TODO() + } + + override fun getUserByName(username: kotlin.String): User { + TODO() + } + + override fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String { + TODO() + } + + override fun logoutUser() { + TODO() + } + + override fun updateUser(username: kotlin.String, user: User) { + TODO() + } +} diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt new file mode 100644 index 000000000000..1382c7b50d35 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt @@ -0,0 +1,93 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.ModelApiResponse +import org.openapitools.server.api.model.Pet +import jakarta.inject.Inject +import misk.testing.MiskTest +import okhttp3.Headers + +import org.junit.jupiter.api.Test + +@MiskTest(startService = true) +internal class PetApiTest { + + @Inject private lateinit var petApi: PetApiController + + /** + * To test PetApiController.addPet + */ + @Test + fun `should handle addPet`() { + val pet: Pet = TODO() + val response: Pet = petApi.addPet(pet) + } + + /** + * To test PetApiController.deletePet + */ + @Test + fun `should handle deletePet`() { + val petId: kotlin.Long = TODO() + val apiKey: kotlin.String? = TODO() + val response = petApi.deletePet(petId, apiKey) + } + + /** + * To test PetApiController.findPetsByStatus + */ + @Test + fun `should handle findPetsByStatus`() { + val status: kotlin.Array = TODO() + val response: kotlin.Array = petApi.findPetsByStatus(status) + } + + /** + * To test PetApiController.findPetsByTags + */ + @Test + fun `should handle findPetsByTags`() { + val tags: kotlin.Array = TODO() + val response: kotlin.Array = petApi.findPetsByTags(tags) + } + + /** + * To test PetApiController.getPetById + */ + @Test + fun `should handle getPetById`() { + val petId: kotlin.Long = TODO() + val response: Pet = petApi.getPetById(petId) + } + + /** + * To test PetApiController.updatePet + */ + @Test + fun `should handle updatePet`() { + val pet: Pet = TODO() + val response: Pet = petApi.updatePet(pet) + } + + /** + * To test PetApiController.updatePetWithForm + */ + @Test + fun `should handle updatePetWithForm`() { + val petId: kotlin.Long = TODO() + val name: kotlin.String? = TODO() + val status: kotlin.String? = TODO() + val response = petApi.updatePetWithForm(petId, name, status) + } + + /** + * To test PetApiController.uploadFile + */ + @Test + fun `should handle uploadFile`() { + val petId: kotlin.Long = TODO() + val additionalMetadata: kotlin.String? = TODO() + val file: Headers = TODO() + val response: ModelApiResponse = petApi.uploadFile(petId, additionalMetadata, file) + } + +} diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt new file mode 100644 index 000000000000..a446e6d9cb7c --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt @@ -0,0 +1,50 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.Order +import jakarta.inject.Inject +import misk.testing.MiskTest +import okhttp3.Headers + +import org.junit.jupiter.api.Test + +@MiskTest(startService = true) +internal class StoreApiTest { + + @Inject private lateinit var storeApi: StoreApiController + + /** + * To test StoreApiController.deleteOrder + */ + @Test + fun `should handle deleteOrder`() { + val orderId: kotlin.String = TODO() + val response = storeApi.deleteOrder(orderId) + } + + /** + * To test StoreApiController.getInventory + */ + @Test + fun `should handle getInventory`() { + val response: kotlin.collections.Map = storeApi.getInventory() + } + + /** + * To test StoreApiController.getOrderById + */ + @Test + fun `should handle getOrderById`() { + val orderId: kotlin.Long = TODO() + val response: Order = storeApi.getOrderById(orderId) + } + + /** + * To test StoreApiController.placeOrder + */ + @Test + fun `should handle placeOrder`() { + val order: Order = TODO() + val response: Order = storeApi.placeOrder(order) + } + +} From c8fbb247cad643e3f995b597a1d1551ab830e629 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Fri, 21 Mar 2025 11:58:02 +0000 Subject: [PATCH 089/102] fixing jakarta --- .../kotlin-misk/apiController.mustache | 18 ++-- .../kotlin-misk/build.gradle.kts.mustache | 2 +- .../resources/kotlin-misk/miskModule.mustache | 2 +- .../kotlin-misk/.openapi-generator/FILES | 3 + .../petstore/kotlin-misk/build.gradle.kts | 2 +- .../server/api/api/PetApiController.kt | 18 ++-- .../server/api/api/PetStoreModule.kt | 2 +- .../server/api/api/StoreApiController.kt | 18 ++-- .../server/api/api/UserApiController.kt | 18 ++-- .../openapitools/server/api/api/PetApiTest.kt | 93 +++++++++++++++++++ .../server/api/api/StoreApiTest.kt | 50 ++++++++++ .../server/api/api/UserApiTest.kt | 18 ++-- 12 files changed, 195 insertions(+), 49 deletions(-) create mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt create mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index d24bf770a795..3adc3914c930 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -4,15 +4,15 @@ package {{package}} {{/imports}} {{#useBeanValidation}} -import {{javaxPackage}}.validation.Valid -import {{javaxPackage}}.validation.constraints.DecimalMax -import {{javaxPackage}}.validation.constraints.DecimalMin -import {{javaxPackage}}.validation.constraints.Email -import {{javaxPackage}}.validation.constraints.Max -import {{javaxPackage}}.validation.constraints.Min -import {{javaxPackage}}.validation.constraints.NotNull -import {{javaxPackage}}.validation.constraints.Pattern -import {{javaxPackage}}.validation.constraints.Size +import {{jakartaPackage}}.validation.Valid +import {{jakartaPackage}}.validation.constraints.DecimalMax +import {{jakartaPackage}}.validation.constraints.DecimalMin +import {{jakartaPackage}}.validation.constraints.Email +import {{jakartaPackage}}.validation.constraints.Max +import {{jakartaPackage}}.validation.constraints.Min +import {{jakartaPackage}}.validation.constraints.NotNull +import {{jakartaPackage}}.validation.constraints.Pattern +import {{jakartaPackage}}.validation.constraints.Size {{/useBeanValidation}} import jakarta.inject.Inject diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache index 85b9aa73c737..c57faaff32aa 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache @@ -8,7 +8,7 @@ group = "{{groupId}}" version = "{{artifactVersion}}" dependencies { - implementation("javax.validation:validation-api:2.0.1.Final") + implementation("jakarta.validation:validation-api:2.0.1.Final") implementation("com.squareup.misk:misk:2025.02.11.123913-8a41324") //implementation("com.squareup.wire:wire-runtime:5.2.1") diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache index 0b42b6c5b6e4..750e2031bad9 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache @@ -2,7 +2,7 @@ package {{apiPackage}} import misk.inject.KAbstractModule import misk.web.WebActionModule -import javax.inject.Singleton +import jakarta.inject.Singleton {{#apiInfo}} {{#apis}} {{#operations}} diff --git a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES index 2643a9198606..bb77acfe797a 100644 --- a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES @@ -20,3 +20,6 @@ src/main/kotlin/org/openapitools/server/api/model/Order.kt src/main/kotlin/org/openapitools/server/api/model/Pet.kt src/main/kotlin/org/openapitools/server/api/model/Tag.kt src/main/kotlin/org/openapitools/server/api/model/User.kt +src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt +src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt +src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt diff --git a/samples/server/petstore/kotlin-misk/build.gradle.kts b/samples/server/petstore/kotlin-misk/build.gradle.kts index 470dece6d23e..d5060c5f65d4 100644 --- a/samples/server/petstore/kotlin-misk/build.gradle.kts +++ b/samples/server/petstore/kotlin-misk/build.gradle.kts @@ -8,7 +8,7 @@ group = "org.openapitools" version = "1.0.0-SNAPSHOT" dependencies { - implementation("javax.validation:validation-api:2.0.1.Final") + implementation("jakarta.validation:validation-api:2.0.1.Final") implementation("com.squareup.misk:misk:2025.02.11.123913-8a41324") //implementation("com.squareup.wire:wire-runtime:5.2.1") diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt index 5527801a0f4a..8c858d53ec45 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt @@ -3,15 +3,15 @@ package org.openapitools.server.api.api import org.openapitools.server.api.model.ModelApiResponse import org.openapitools.server.api.model.Pet -import javax.validation.Valid -import javax.validation.constraints.DecimalMax -import javax.validation.constraints.DecimalMin -import javax.validation.constraints.Email -import javax.validation.constraints.Max -import javax.validation.constraints.Min -import javax.validation.constraints.NotNull -import javax.validation.constraints.Pattern -import javax.validation.constraints.Size +import .validation.Valid +import .validation.constraints.DecimalMax +import .validation.constraints.DecimalMin +import .validation.constraints.Email +import .validation.constraints.Max +import .validation.constraints.Min +import .validation.constraints.NotNull +import .validation.constraints.Pattern +import .validation.constraints.Size import jakarta.inject.Inject import jakarta.inject.Singleton diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetStoreModule.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetStoreModule.kt index 1fa349b51d58..dd7be9862195 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetStoreModule.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetStoreModule.kt @@ -2,7 +2,7 @@ package org.openapitools.server.api.api import misk.inject.KAbstractModule import misk.web.WebActionModule -import javax.inject.Singleton +import jakarta.inject.Singleton import org.openapitools.server.api.api.PetApiController import org.openapitools.server.api.api.StoreApiController import org.openapitools.server.api.api.UserApiController diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt index 298bad2e5abf..418bf7dada85 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt @@ -2,15 +2,15 @@ package org.openapitools.server.api.api import org.openapitools.server.api.model.Order -import javax.validation.Valid -import javax.validation.constraints.DecimalMax -import javax.validation.constraints.DecimalMin -import javax.validation.constraints.Email -import javax.validation.constraints.Max -import javax.validation.constraints.Min -import javax.validation.constraints.NotNull -import javax.validation.constraints.Pattern -import javax.validation.constraints.Size +import .validation.Valid +import .validation.constraints.DecimalMax +import .validation.constraints.DecimalMin +import .validation.constraints.Email +import .validation.constraints.Max +import .validation.constraints.Min +import .validation.constraints.NotNull +import .validation.constraints.Pattern +import .validation.constraints.Size import jakarta.inject.Inject import jakarta.inject.Singleton diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt index 3fdab12dd891..2a22a695e31e 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt @@ -2,15 +2,15 @@ package org.openapitools.server.api.api import org.openapitools.server.api.model.User -import javax.validation.Valid -import javax.validation.constraints.DecimalMax -import javax.validation.constraints.DecimalMin -import javax.validation.constraints.Email -import javax.validation.constraints.Max -import javax.validation.constraints.Min -import javax.validation.constraints.NotNull -import javax.validation.constraints.Pattern -import javax.validation.constraints.Size +import .validation.Valid +import .validation.constraints.DecimalMax +import .validation.constraints.DecimalMin +import .validation.constraints.Email +import .validation.constraints.Max +import .validation.constraints.Min +import .validation.constraints.NotNull +import .validation.constraints.Pattern +import .validation.constraints.Size import jakarta.inject.Inject import jakarta.inject.Singleton diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt new file mode 100644 index 000000000000..e07d02271a2e --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt @@ -0,0 +1,93 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.ModelApiResponse +import org.openapitools.server.api.model.Pet +import jakarta.inject.Inject +import misk.testing.MiskTest +import okhttp3.Headers + +import org.junit.jupiter.api.Test + +@MiskTest(startService = true) +internal class PetApiTest { + + @Inject private lateinit var petApi: PetApiController + + /** + * To test PetApiController.addPet + */ + @Test + fun `should handle addPet`() { + val pet = TODO() + val response: Pet = petApi.addPet(pet) + } + + /** + * To test PetApiController.deletePet + */ + @Test + fun `should handle deletePet`() { + val petId = TODO() + val apiKey = TODO() + val response = petApi.deletePet(petId, apiKey) + } + + /** + * To test PetApiController.findPetsByStatus + */ + @Test + fun `should handle findPetsByStatus`() { + val status = TODO() + val response: kotlin.Array = petApi.findPetsByStatus(status) + } + + /** + * To test PetApiController.findPetsByTags + */ + @Test + fun `should handle findPetsByTags`() { + val tags = TODO() + val response: kotlin.Array = petApi.findPetsByTags(tags) + } + + /** + * To test PetApiController.getPetById + */ + @Test + fun `should handle getPetById`() { + val petId = TODO() + val response: Pet = petApi.getPetById(petId) + } + + /** + * To test PetApiController.updatePet + */ + @Test + fun `should handle updatePet`() { + val pet = TODO() + val response: Pet = petApi.updatePet(pet) + } + + /** + * To test PetApiController.updatePetWithForm + */ + @Test + fun `should handle updatePetWithForm`() { + val petId = TODO() + val name = TODO() + val status = TODO() + val response = petApi.updatePetWithForm(petId, name, status) + } + + /** + * To test PetApiController.uploadFile + */ + @Test + fun `should handle uploadFile`() { + val petId = TODO() + val additionalMetadata = TODO() + val file = TODO() + val response: ModelApiResponse = petApi.uploadFile(petId, additionalMetadata, file) + } + +} diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt new file mode 100644 index 000000000000..c75293a6410f --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt @@ -0,0 +1,50 @@ +package org.openapitools.server.api.api + +import org.openapitools.server.api.model.Order +import jakarta.inject.Inject +import misk.testing.MiskTest +import okhttp3.Headers + +import org.junit.jupiter.api.Test + +@MiskTest(startService = true) +internal class StoreApiTest { + + @Inject private lateinit var storeApi: StoreApiController + + /** + * To test StoreApiController.deleteOrder + */ + @Test + fun `should handle deleteOrder`() { + val orderId = TODO() + val response = storeApi.deleteOrder(orderId) + } + + /** + * To test StoreApiController.getInventory + */ + @Test + fun `should handle getInventory`() { + val response: kotlin.collections.Map = storeApi.getInventory() + } + + /** + * To test StoreApiController.getOrderById + */ + @Test + fun `should handle getOrderById`() { + val orderId = TODO() + val response: Order = storeApi.getOrderById(orderId) + } + + /** + * To test StoreApiController.placeOrder + */ + @Test + fun `should handle placeOrder`() { + val order = TODO() + val response: Order = storeApi.placeOrder(order) + } + +} diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt index 2305f97e9938..238494e12bd7 100644 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt @@ -17,7 +17,7 @@ internal class UserApiTest { */ @Test fun `should handle createUser`() { - val user: User = TODO() + val user = TODO() val response = userApi.createUser(user) } @@ -26,7 +26,7 @@ internal class UserApiTest { */ @Test fun `should handle createUsersWithArrayInput`() { - val user: kotlin.Array = TODO() + val user = TODO() val response = userApi.createUsersWithArrayInput(user) } @@ -35,7 +35,7 @@ internal class UserApiTest { */ @Test fun `should handle createUsersWithListInput`() { - val user: kotlin.Array = TODO() + val user = TODO() val response = userApi.createUsersWithListInput(user) } @@ -44,7 +44,7 @@ internal class UserApiTest { */ @Test fun `should handle deleteUser`() { - val username: kotlin.String = TODO() + val username = TODO() val response = userApi.deleteUser(username) } @@ -53,7 +53,7 @@ internal class UserApiTest { */ @Test fun `should handle getUserByName`() { - val username: kotlin.String = TODO() + val username = TODO() val response: User = userApi.getUserByName(username) } @@ -62,8 +62,8 @@ internal class UserApiTest { */ @Test fun `should handle loginUser`() { - val username: kotlin.String = TODO() - val password: kotlin.String = TODO() + val username = TODO() + val password = TODO() val response: kotlin.String = userApi.loginUser(username, password) } @@ -80,8 +80,8 @@ internal class UserApiTest { */ @Test fun `should handle updateUser`() { - val username: kotlin.String = TODO() - val user: User = TODO() + val username = TODO() + val user = TODO() val response = userApi.updateUser(username, user) } From d4974b76367c06233d3eb7aac5603daa6fab2996 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Fri, 21 Mar 2025 12:00:30 +0000 Subject: [PATCH 090/102] fixing jakarta 2 --- .../src/main/resources/kotlin-misk/build.gradle.kts.mustache | 2 +- samples/server/petstore/kotlin-misk/.openapi-generator/FILES | 3 --- samples/server/petstore/kotlin-misk/build.gradle.kts | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache index c57faaff32aa..3283fff305ec 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache @@ -8,7 +8,7 @@ group = "{{groupId}}" version = "{{artifactVersion}}" dependencies { - implementation("jakarta.validation:validation-api:2.0.1.Final") + implementation("jakarta.validation:validation-api:3.1.1") implementation("com.squareup.misk:misk:2025.02.11.123913-8a41324") //implementation("com.squareup.wire:wire-runtime:5.2.1") diff --git a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES index bb77acfe797a..2643a9198606 100644 --- a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES @@ -20,6 +20,3 @@ src/main/kotlin/org/openapitools/server/api/model/Order.kt src/main/kotlin/org/openapitools/server/api/model/Pet.kt src/main/kotlin/org/openapitools/server/api/model/Tag.kt src/main/kotlin/org/openapitools/server/api/model/User.kt -src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt -src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt -src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt diff --git a/samples/server/petstore/kotlin-misk/build.gradle.kts b/samples/server/petstore/kotlin-misk/build.gradle.kts index d5060c5f65d4..4d21badf22ca 100644 --- a/samples/server/petstore/kotlin-misk/build.gradle.kts +++ b/samples/server/petstore/kotlin-misk/build.gradle.kts @@ -8,7 +8,7 @@ group = "org.openapitools" version = "1.0.0-SNAPSHOT" dependencies { - implementation("jakarta.validation:validation-api:2.0.1.Final") + implementation("jakarta.validation:validation-api:3.1.1") implementation("com.squareup.misk:misk:2025.02.11.123913-8a41324") //implementation("com.squareup.wire:wire-runtime:5.2.1") From 9a25d7e55b41d6c6643c5bde2fdb618603175c3b Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Fri, 21 Mar 2025 12:32:18 +0000 Subject: [PATCH 091/102] fixing impl --- .../languages/KotlinMiskServerCodegen.java | 4 ++-- .../kotlin-misk/apiController.mustache | 6 +++--- .../resources/kotlin-misk/apiImpl.mustache | 2 +- .../kotlin-misk/apiInterface.mustache | 2 +- .../resources/kotlin-misk/api_test.mustache | 9 ++++----- .../kotlin-misk/.openapi-generator/FILES | 9 +++++++++ .../org/openapitools/server/api/api/PetApi.kt | 16 +++++++-------- .../server/api/api/PetApiController.kt | 20 +++++++++---------- .../openapitools/server/api/api/PetApiImpl.kt | 16 +++++++-------- .../openapitools/server/api/api/StoreApi.kt | 8 ++++---- .../server/api/api/StoreApiController.kt | 12 +++++------ .../server/api/api/StoreApiImpl.kt | 6 +++--- .../openapitools/server/api/api/UserApi.kt | 16 +++++++-------- .../server/api/api/UserApiController.kt | 20 +++++++++---------- .../server/api/api/UserApiImpl.kt | 14 ++++++------- .../openapitools/server/api/api/PetApiTest.kt | 9 ++++----- .../server/api/api/StoreApiTest.kt | 7 +++---- .../server/api/api/UserApiTest.kt | 7 +++---- 18 files changed, 94 insertions(+), 89 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 82470273b25a..587d6c7bacfb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -106,8 +106,8 @@ public KotlinMiskServerCodegen() { apiTemplateFiles.clear(); apiTemplateFiles.put("apiController.mustache", "Controller.kt"); - //apiTemplateFiles.put("apiImpl.mustache", "Impl.kt"); - //apiTemplateFiles.put("apiInterface.mustache", ".kt"); + apiTemplateFiles.put("apiImpl.mustache", "Impl.kt"); + apiTemplateFiles.put("apiInterface.mustache", ".kt"); modelTemplateFiles.put("model.mustache", ".kt"); apiPackage = rootPackage + ".api"; diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 3adc3914c930..2fc4e26bc8e4 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -39,8 +39,8 @@ import okhttp3.Headers {{#operations}} @Singleton class {{classname}}Controller @Inject constructor( - //private val {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}: {{classname}} - ) : WebAction { + private val {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}: {{classname}} + ) : WebAction, {{classname}} { {{#operation}} @{{httpMethod}}("{{path}}") @@ -48,7 +48,7 @@ import okhttp3.Headers @RequestContentType({{#consumes}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/consumes}}){{/hasConsumes}}{{#hasProduces}} @ResponseContentType({{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}){{/hasProduces}} @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { + override fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { TODO() } {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index 1762443ab74c..e0119c9e7fb6 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -16,7 +16,7 @@ class {{classname}}Impl @Inject constructor( ): {{classname}} { {{#operation}} - override fun {{operationId}}({{#allParams}}{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{#isBodyParam}}{{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { + override fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { TODO() } {{/operation}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache index 0b24a5406a63..78efdbe2710a 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache @@ -8,7 +8,7 @@ import okhttp3.Headers interface {{classname}} { {{#operation}} - fun {{operationId}}({{#allParams}}{{#isQueryParam}}{{{paramName}}}: {{>optionalDataType}}{{/isQueryParam}}{{#isPathParam}}{{{paramName}}}: {{>optionalDataType}}{{/isPathParam}}{{#isHeaderParam}}headers: Headers{{/isHeaderParam}}{{#isCookieParam}}{{{paramName}}}: HttpCall{{/isCookieParam}}{{#isBodyParam}}{{{paramName}}}: {{>optionalDataType}}{{/isBodyParam}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} + fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { {{/operation}} } {{/operations}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache index 411f46a0c3d5..7fd290d0ea4d 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache @@ -1,17 +1,16 @@ package {{package}} -{{#imports}}import {{import}} -{{/imports}} import jakarta.inject.Inject import misk.testing.MiskTest -import okhttp3.Headers - import org.junit.jupiter.api.Test +{{#imports}}import {{import}} +{{/imports}} +import okhttp3.Headers @MiskTest(startService = true) internal class {{classname}}Test { - @Inject private lateinit var {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}: {{classname}}Controller + @Inject private lateinit var {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}: {{classname}} {{#operations}} {{#operation}} diff --git a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES index 2643a9198606..9063ccb4ff0f 100644 --- a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES @@ -10,13 +10,22 @@ docs/Tag.md docs/User.md docs/UserApi.md settings.gradle.kts +src/main/kotlin/org/openapitools/server/api/api/PetApi.kt src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt +src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt src/main/kotlin/org/openapitools/server/api/api/PetStoreModule.kt +src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt +src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt +src/main/kotlin/org/openapitools/server/api/api/UserApi.kt src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt +src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt src/main/kotlin/org/openapitools/server/api/model/Category.kt src/main/kotlin/org/openapitools/server/api/model/ModelApiResponse.kt src/main/kotlin/org/openapitools/server/api/model/Order.kt src/main/kotlin/org/openapitools/server/api/model/Pet.kt src/main/kotlin/org/openapitools/server/api/model/Tag.kt src/main/kotlin/org/openapitools/server/api/model/User.kt +src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt +src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt +src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt index 92a6af69a274..9c21356cc221 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt @@ -6,19 +6,19 @@ import okhttp3.Headers interface PetApi { - fun addPet(pet: Pet): Pet + fun addPet(@Valid @RequestBody pet: Pet): Pet { - fun deletePet(petId: kotlin.Long, headers: Headers) + fun deletePet(@PathParam("petId") petId: kotlin.Long, apiKey: Headers) { - fun findPetsByStatus(status: kotlin.Array): kotlin.Array + fun findPetsByStatus( @QueryParam(value = "status") status: kotlin.Array): kotlin.Array { - fun findPetsByTags(tags: kotlin.Array): kotlin.Array + fun findPetsByTags( @QueryParam(value = "tags") tags: kotlin.Array): kotlin.Array { - fun getPetById(petId: kotlin.Long): Pet + fun getPetById(@PathParam("petId") petId: kotlin.Long): Pet { - fun updatePet(pet: Pet): Pet + fun updatePet(@Valid @RequestBody pet: Pet): Pet { - fun updatePetWithForm(petId: kotlin.Long, , ) + fun updatePetWithForm(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "name") name: kotlin.String? , @QueryParam(value = "status") status: kotlin.String? ) { - fun uploadFile(petId: kotlin.Long, , ): ModelApiResponse + fun uploadFile(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "additionalMetadata") additionalMetadata: kotlin.String? , @Valid file: HttpCall): ModelApiResponse { } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt index 8c858d53ec45..e0c772770fc5 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt @@ -36,22 +36,22 @@ import okhttp3.Headers @Singleton class PetApiController @Inject constructor( - //private val petApi: PetApi - ) : WebAction { + private val petApi: PetApi + ) : WebAction, PetApi { @Post("/pet") @Description("Add a new pet to the store") @RequestContentType(MediaTypes.APPLICATION_JSON, MediaTypes.APPLICATION_XML) @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun addPet(@Valid @RequestBody pet: Pet): Pet { + override fun addPet(@Valid @RequestBody pet: Pet): Pet { TODO() } @Delete("/pet/{petId}") @Description("Deletes a pet") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun deletePet(@PathParam("petId") petId: kotlin.Long, apiKey: Headers) { + override fun deletePet(@PathParam("petId") petId: kotlin.Long, apiKey: Headers) { TODO() } @@ -59,7 +59,7 @@ import okhttp3.Headers @Description("Finds Pets by status") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun findPetsByStatus( @QueryParam(value = "status") status: kotlin.Array): kotlin.Array { + override fun findPetsByStatus( @QueryParam(value = "status") status: kotlin.Array): kotlin.Array { TODO() } @@ -67,7 +67,7 @@ import okhttp3.Headers @Description("Finds Pets by tags") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun findPetsByTags( @QueryParam(value = "tags") tags: kotlin.Array): kotlin.Array { + override fun findPetsByTags( @QueryParam(value = "tags") tags: kotlin.Array): kotlin.Array { TODO() } @@ -75,7 +75,7 @@ import okhttp3.Headers @Description("Find pet by ID") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun getPetById(@PathParam("petId") petId: kotlin.Long): Pet { + override fun getPetById(@PathParam("petId") petId: kotlin.Long): Pet { TODO() } @@ -84,7 +84,7 @@ import okhttp3.Headers @RequestContentType(MediaTypes.APPLICATION_JSON, MediaTypes.APPLICATION_XML) @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun updatePet(@Valid @RequestBody pet: Pet): Pet { + override fun updatePet(@Valid @RequestBody pet: Pet): Pet { TODO() } @@ -92,7 +92,7 @@ import okhttp3.Headers @Description("Updates a pet in the store with form data") @RequestContentType(MediaTypes.APPLICATION_FORM_URLENCODED) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun updatePetWithForm(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "name") name: kotlin.String? , @QueryParam(value = "status") status: kotlin.String? ) { + override fun updatePetWithForm(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "name") name: kotlin.String? , @QueryParam(value = "status") status: kotlin.String? ) { TODO() } @@ -101,7 +101,7 @@ import okhttp3.Headers @RequestContentType(MediaTypes.APPLICATION_OCTETSTREAM /* unknown -> multipart/form-data */ ) @ResponseContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun uploadFile(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "additionalMetadata") additionalMetadata: kotlin.String? , @Valid file: HttpCall): ModelApiResponse { + override fun uploadFile(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "additionalMetadata") additionalMetadata: kotlin.String? , @Valid file: HttpCall): ModelApiResponse { TODO() } } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt index ce271f22f50d..b8db53b91e0f 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt @@ -14,35 +14,35 @@ import okhttp3.Headers class PetApiImpl @Inject constructor( ): PetApi { - override fun addPet(pet: Pet): Pet { + override fun addPet(@Valid @RequestBody pet: Pet): Pet { TODO() } - override fun deletePet(petId: kotlin.Long, headers: Headers) { + override fun deletePet(@PathParam("petId") petId: kotlin.Long, apiKey: Headers) { TODO() } - override fun findPetsByStatus(status: kotlin.Array): kotlin.Array { + override fun findPetsByStatus( @QueryParam(value = "status") status: kotlin.Array): kotlin.Array { TODO() } - override fun findPetsByTags(tags: kotlin.Array): kotlin.Array { + override fun findPetsByTags( @QueryParam(value = "tags") tags: kotlin.Array): kotlin.Array { TODO() } - override fun getPetById(petId: kotlin.Long): Pet { + override fun getPetById(@PathParam("petId") petId: kotlin.Long): Pet { TODO() } - override fun updatePet(pet: Pet): Pet { + override fun updatePet(@Valid @RequestBody pet: Pet): Pet { TODO() } - override fun updatePetWithForm(petId: kotlin.Long, , ) { + override fun updatePetWithForm(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "name") name: kotlin.String? , @QueryParam(value = "status") status: kotlin.String? ) { TODO() } - override fun uploadFile(petId: kotlin.Long, , ): ModelApiResponse { + override fun uploadFile(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "additionalMetadata") additionalMetadata: kotlin.String? , @Valid file: HttpCall): ModelApiResponse { TODO() } } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt index 012f4e93ce97..77b727256276 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt @@ -5,11 +5,11 @@ import okhttp3.Headers interface StoreApi { - fun deleteOrder(orderId: kotlin.String) + fun deleteOrder(@PathParam("orderId") orderId: kotlin.String) { - fun getInventory(): kotlin.collections.Map + fun getInventory(): kotlin.collections.Map { - fun getOrderById(orderId: kotlin.Long): Order + fun getOrderById(@Min(1L) @Max(5L) @PathParam("orderId") orderId: kotlin.Long): Order { - fun placeOrder(order: Order): Order + fun placeOrder(@Valid @RequestBody order: Order): Order { } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt index 418bf7dada85..ff0072fbf395 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt @@ -35,13 +35,13 @@ import okhttp3.Headers @Singleton class StoreApiController @Inject constructor( - //private val storeApi: StoreApi - ) : WebAction { + private val storeApi: StoreApi + ) : WebAction, StoreApi { @Delete("/store/order/{orderId}") @Description("Delete purchase order by ID") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun deleteOrder(@PathParam("orderId") orderId: kotlin.String) { + override fun deleteOrder(@PathParam("orderId") orderId: kotlin.String) { TODO() } @@ -49,7 +49,7 @@ import okhttp3.Headers @Description("Returns pet inventories by status") @ResponseContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun getInventory(): kotlin.collections.Map { + override fun getInventory(): kotlin.collections.Map { TODO() } @@ -57,7 +57,7 @@ import okhttp3.Headers @Description("Find purchase order by ID") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun getOrderById(@Min(1L) @Max(5L) @PathParam("orderId") orderId: kotlin.Long): Order { + override fun getOrderById(@Min(1L) @Max(5L) @PathParam("orderId") orderId: kotlin.Long): Order { TODO() } @@ -66,7 +66,7 @@ import okhttp3.Headers @RequestContentType(MediaTypes.APPLICATION_JSON) @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun placeOrder(@Valid @RequestBody order: Order): Order { + override fun placeOrder(@Valid @RequestBody order: Order): Order { TODO() } } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt index 20c3d95f3e2d..8b081eb55c4e 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt @@ -13,7 +13,7 @@ import okhttp3.Headers class StoreApiImpl @Inject constructor( ): StoreApi { - override fun deleteOrder(orderId: kotlin.String) { + override fun deleteOrder(@PathParam("orderId") orderId: kotlin.String) { TODO() } @@ -21,11 +21,11 @@ class StoreApiImpl @Inject constructor( TODO() } - override fun getOrderById(orderId: kotlin.Long): Order { + override fun getOrderById(@Min(1L) @Max(5L) @PathParam("orderId") orderId: kotlin.Long): Order { TODO() } - override fun placeOrder(order: Order): Order { + override fun placeOrder(@Valid @RequestBody order: Order): Order { TODO() } } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt index b14638ec8032..0cbc0f15fe7a 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt @@ -5,19 +5,19 @@ import okhttp3.Headers interface UserApi { - fun createUser(user: User) + fun createUser(@Valid @RequestBody user: User) { - fun createUsersWithArrayInput(user: kotlin.Array) + fun createUsersWithArrayInput(@Valid @RequestBody user: kotlin.Array) { - fun createUsersWithListInput(user: kotlin.Array) + fun createUsersWithListInput(@Valid @RequestBody user: kotlin.Array) { - fun deleteUser(username: kotlin.String) + fun deleteUser(@PathParam("username") username: kotlin.String) { - fun getUserByName(username: kotlin.String): User + fun getUserByName(@PathParam("username") username: kotlin.String): User { - fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String + fun loginUser( @QueryParam(value = "username") username: kotlin.String, @QueryParam(value = "password") password: kotlin.String): kotlin.String { - fun logoutUser() + fun logoutUser() { - fun updateUser(username: kotlin.String, user: User) + fun updateUser(@PathParam("username") username: kotlin.String, @Valid @RequestBody user: User) { } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt index 2a22a695e31e..dd99ea614f86 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt @@ -35,14 +35,14 @@ import okhttp3.Headers @Singleton class UserApiController @Inject constructor( - //private val userApi: UserApi - ) : WebAction { + private val userApi: UserApi + ) : WebAction, UserApi { @Post("/user") @Description("Create user") @RequestContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun createUser(@Valid @RequestBody user: User) { + override fun createUser(@Valid @RequestBody user: User) { TODO() } @@ -50,7 +50,7 @@ import okhttp3.Headers @Description("Creates list of users with given input array") @RequestContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun createUsersWithArrayInput(@Valid @RequestBody user: kotlin.Array) { + override fun createUsersWithArrayInput(@Valid @RequestBody user: kotlin.Array) { TODO() } @@ -58,14 +58,14 @@ import okhttp3.Headers @Description("Creates list of users with given input array") @RequestContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun createUsersWithListInput(@Valid @RequestBody user: kotlin.Array) { + override fun createUsersWithListInput(@Valid @RequestBody user: kotlin.Array) { TODO() } @Delete("/user/{username}") @Description("Delete user") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun deleteUser(@PathParam("username") username: kotlin.String) { + override fun deleteUser(@PathParam("username") username: kotlin.String) { TODO() } @@ -73,7 +73,7 @@ import okhttp3.Headers @Description("Get user by user name") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun getUserByName(@PathParam("username") username: kotlin.String): User { + override fun getUserByName(@PathParam("username") username: kotlin.String): User { TODO() } @@ -81,14 +81,14 @@ import okhttp3.Headers @Description("Logs user into the system") @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun loginUser( @QueryParam(value = "username") username: kotlin.String, @QueryParam(value = "password") password: kotlin.String): kotlin.String { + override fun loginUser( @QueryParam(value = "username") username: kotlin.String, @QueryParam(value = "password") password: kotlin.String): kotlin.String { TODO() } @Get("/user/logout") @Description("Logs out current logged in user session") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun logoutUser() { + override fun logoutUser() { TODO() } @@ -96,7 +96,7 @@ import okhttp3.Headers @Description("Updated user") @RequestContentType(MediaTypes.APPLICATION_JSON) @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - fun updateUser(@PathParam("username") username: kotlin.String, @Valid @RequestBody user: User) { + override fun updateUser(@PathParam("username") username: kotlin.String, @Valid @RequestBody user: User) { TODO() } } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt index b6884e9a0feb..369e56ac2801 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt @@ -13,27 +13,27 @@ import okhttp3.Headers class UserApiImpl @Inject constructor( ): UserApi { - override fun createUser(user: User) { + override fun createUser(@Valid @RequestBody user: User) { TODO() } - override fun createUsersWithArrayInput(user: kotlin.Array) { + override fun createUsersWithArrayInput(@Valid @RequestBody user: kotlin.Array) { TODO() } - override fun createUsersWithListInput(user: kotlin.Array) { + override fun createUsersWithListInput(@Valid @RequestBody user: kotlin.Array) { TODO() } - override fun deleteUser(username: kotlin.String) { + override fun deleteUser(@PathParam("username") username: kotlin.String) { TODO() } - override fun getUserByName(username: kotlin.String): User { + override fun getUserByName(@PathParam("username") username: kotlin.String): User { TODO() } - override fun loginUser(username: kotlin.String, password: kotlin.String): kotlin.String { + override fun loginUser( @QueryParam(value = "username") username: kotlin.String, @QueryParam(value = "password") password: kotlin.String): kotlin.String { TODO() } @@ -41,7 +41,7 @@ class UserApiImpl @Inject constructor( TODO() } - override fun updateUser(username: kotlin.String, user: User) { + override fun updateUser(@PathParam("username") username: kotlin.String, @Valid @RequestBody user: User) { TODO() } } diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt index e07d02271a2e..e783e2899418 100644 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt @@ -1,17 +1,16 @@ package org.openapitools.server.api.api -import org.openapitools.server.api.model.ModelApiResponse -import org.openapitools.server.api.model.Pet import jakarta.inject.Inject import misk.testing.MiskTest -import okhttp3.Headers - import org.junit.jupiter.api.Test +import org.openapitools.server.api.model.ModelApiResponse +import org.openapitools.server.api.model.Pet +import okhttp3.Headers @MiskTest(startService = true) internal class PetApiTest { - @Inject private lateinit var petApi: PetApiController + @Inject private lateinit var petApi: PetApi /** * To test PetApiController.addPet diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt index c75293a6410f..e7e6cfb0ef18 100644 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt @@ -1,16 +1,15 @@ package org.openapitools.server.api.api -import org.openapitools.server.api.model.Order import jakarta.inject.Inject import misk.testing.MiskTest -import okhttp3.Headers - import org.junit.jupiter.api.Test +import org.openapitools.server.api.model.Order +import okhttp3.Headers @MiskTest(startService = true) internal class StoreApiTest { - @Inject private lateinit var storeApi: StoreApiController + @Inject private lateinit var storeApi: StoreApi /** * To test StoreApiController.deleteOrder diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt index 238494e12bd7..ad943b244bde 100644 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt @@ -1,16 +1,15 @@ package org.openapitools.server.api.api -import org.openapitools.server.api.model.User import jakarta.inject.Inject import misk.testing.MiskTest -import okhttp3.Headers - import org.junit.jupiter.api.Test +import org.openapitools.server.api.model.User +import okhttp3.Headers @MiskTest(startService = true) internal class UserApiTest { - @Inject private lateinit var userApi: UserApiController + @Inject private lateinit var userApi: UserApi /** * To test UserApiController.createUser From 17a006ad11f763224fc05c381a89d64a9331af37 Mon Sep 17 00:00:00 2001 From: Guido Arnau Date: Fri, 21 Mar 2025 13:36:44 +0100 Subject: [PATCH 092/102] Fix unit tests --- .../codegen/languages/KotlinMiskServerCodegen.java | 4 ++-- .../kotlin/misk/KotlinMiskServerCodegenOptionsTest.java | 2 ++ .../options/KotlinMiskServerCodegenOptionsProvider.java | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 587d6c7bacfb..8e87660be6de 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -31,10 +31,10 @@ public class KotlinMiskServerCodegen extends AbstractKotlinCodegen implements BeanValidationFeatures { - private static final Logger LOGGER = LoggerFactory.getLogger(KotlinMiskServerCodegen.class); + public static final String MODULE_CLASS_NAME = "moduleClassName"; + private final Logger LOGGER = LoggerFactory.getLogger(KotlinMiskServerCodegen.class); private static final String ROOT_PACKAGE = "rootPackage"; - private static final String MODULE_CLASS_NAME = "moduleClassName"; private boolean useBeanValidation = true; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenOptionsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenOptionsTest.java index 5e176bdd6b4b..2b338b9324ad 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenOptionsTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/misk/KotlinMiskServerCodegenOptionsTest.java @@ -36,5 +36,7 @@ protected void verifyOptions() { verify(codegen).setParcelizeModels(Boolean.valueOf(KotlinMiskServerCodegenOptionsProvider.PARCELIZE_MODELS_VALUE)); verify(codegen).setApiSuffix(KotlinMiskServerCodegenOptionsProvider.API_SUFFIX_VALUE); verify(codegen).setAdditionalModelTypeAnnotations(List.of(KotlinMiskServerCodegenOptionsProvider.ADDITIONAL_MODEL_TYPE_ANNOTATIONS_VALUE)); + verify(codegen).setUseBeanValidation(Boolean.valueOf(KotlinMiskServerCodegenOptionsProvider.USE_BEAN_VALIDATION)); + verify(codegen).setModuleClassName(KotlinMiskServerCodegenOptionsProvider.MODULE_CLASS_NAME); } } \ No newline at end of file diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/KotlinMiskServerCodegenOptionsProvider.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/KotlinMiskServerCodegenOptionsProvider.java index 83b0313602cc..a4d36e5bec2c 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/KotlinMiskServerCodegenOptionsProvider.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/KotlinMiskServerCodegenOptionsProvider.java @@ -5,6 +5,8 @@ import com.google.common.collect.ImmutableMap; import java.util.Map; +import org.openapitools.codegen.languages.KotlinMiskServerCodegen; +import org.openapitools.codegen.languages.features.BeanValidationFeatures; public class KotlinMiskServerCodegenOptionsProvider implements OptionsProvider { public static final String PACKAGE_NAME_VALUE = "org.openapitools.server.api"; @@ -20,6 +22,8 @@ public class KotlinMiskServerCodegenOptionsProvider implements OptionsProvider { public static final String SORT_MODEL_PROPERTIES_VALUE = "false"; public static final String API_SUFFIX_VALUE = "Api"; public static final String ADDITIONAL_MODEL_TYPE_ANNOTATIONS_VALUE = ""; + public static final String USE_BEAN_VALIDATION = "false"; + public static final String MODULE_CLASS_NAME = "OpenApiModule"; @Override public String getLanguage() { @@ -45,6 +49,8 @@ public Map createOptions() { .put(AbstractKotlinCodegen.MODEL_MUTABLE, MODEL_MUTABLE_VALUE) .put(AbstractKotlinCodegen.ADDITIONAL_MODEL_TYPE_ANNOTATIONS, ADDITIONAL_MODEL_TYPE_ANNOTATIONS_VALUE) + .put(KotlinMiskServerCodegen.MODULE_CLASS_NAME, MODULE_CLASS_NAME) + .put(BeanValidationFeatures.USE_BEANVALIDATION, USE_BEAN_VALIDATION) .build(); } From ffae64f8d60de5b06efd2f19fb26c22f176fdf45 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Fri, 21 Mar 2025 12:54:55 +0000 Subject: [PATCH 093/102] fixing jakarta --- .../languages/KotlinMiskServerCodegen.java | 2 ++ .../kotlin-misk/apiController.mustache | 24 +++++++++---------- .../resources/kotlin-misk/apiImpl.mustache | 16 +++++++++++-- .../kotlin-misk/apiInterface.mustache | 12 ++++++++++ .../resources/kotlin-misk/api_test.mustache | 2 +- .../kotlin-misk/build.gradle.kts.mustache | 2 +- .../resources/kotlin-misk/miskModule.mustache | 2 +- .../kotlin-misk/.openapi-generator/FILES | 3 --- .../petstore/kotlin-misk/build.gradle.kts | 2 +- .../org/openapitools/server/api/api/PetApi.kt | 10 ++++++++ .../server/api/api/PetApiController.kt | 20 ++++++++-------- .../openapitools/server/api/api/PetApiImpl.kt | 10 ++++++++ .../openapitools/server/api/api/StoreApi.kt | 10 ++++++++ .../server/api/api/StoreApiController.kt | 20 ++++++++-------- .../server/api/api/StoreApiImpl.kt | 10 ++++++++ .../openapitools/server/api/api/UserApi.kt | 10 ++++++++ .../server/api/api/UserApiController.kt | 20 ++++++++-------- .../server/api/api/UserApiImpl.kt | 10 ++++++++ 18 files changed, 134 insertions(+), 51 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java index 8e87660be6de..006c0caab3eb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinMiskServerCodegen.java @@ -139,6 +139,8 @@ public void processOpts() { } writePropertyBack(USE_BEANVALIDATION, useBeanValidation); + applyJakartaPackage(); + String apiModuleFolder = (sourceFolder + File.separator + apiPackage).replace(".", File.separator); String moduleFileName = moduleClassName + ".kt"; supportingFiles.add(new SupportingFile("miskModule.mustache", apiModuleFolder, moduleFileName)); diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 2fc4e26bc8e4..159a53a29aee 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -4,19 +4,19 @@ package {{package}} {{/imports}} {{#useBeanValidation}} -import {{jakartaPackage}}.validation.Valid -import {{jakartaPackage}}.validation.constraints.DecimalMax -import {{jakartaPackage}}.validation.constraints.DecimalMin -import {{jakartaPackage}}.validation.constraints.Email -import {{jakartaPackage}}.validation.constraints.Max -import {{jakartaPackage}}.validation.constraints.Min -import {{jakartaPackage}}.validation.constraints.NotNull -import {{jakartaPackage}}.validation.constraints.Pattern -import {{jakartaPackage}}.validation.constraints.Size +import {{javaxPackage}}.validation.Valid +import {{javaxPackage}}.validation.constraints.DecimalMax +import {{javaxPackage}}.validation.constraints.DecimalMin +import {{javaxPackage}}.validation.constraints.Email +import {{javaxPackage}}.validation.constraints.Max +import {{javaxPackage}}.validation.constraints.Min +import {{javaxPackage}}.validation.constraints.NotNull +import {{javaxPackage}}.validation.constraints.Pattern +import {{javaxPackage}}.validation.constraints.Size {{/useBeanValidation}} -import jakarta.inject.Inject -import jakarta.inject.Singleton +import {{javaxPackage}}.inject.Inject +import {{javaxPackage}}.inject.Singleton import misk.web.Delete import misk.web.Description @@ -40,7 +40,7 @@ import okhttp3.Headers @Singleton class {{classname}}Controller @Inject constructor( private val {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}: {{classname}} - ) : WebAction, {{classname}} { + ) : WebAction implements {{classname}} { {{#operation}} @{{httpMethod}}("{{path}}") diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index e0119c9e7fb6..5d281715d498 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -3,8 +3,20 @@ package {{package}} {{#imports}}import {{import}} {{/imports}} -import jakarta.inject.Inject -import jakarta.inject.Singleton +{{#useBeanValidation}} +import {{javaxPackage}}.validation.Valid +import {{javaxPackage}}.validation.constraints.DecimalMax +import {{javaxPackage}}.validation.constraints.DecimalMin +import {{javaxPackage}}.validation.constraints.Email +import {{javaxPackage}}.validation.constraints.Max +import {{javaxPackage}}.validation.constraints.Min +import {{javaxPackage}}.validation.constraints.NotNull +import {{javaxPackage}}.validation.constraints.Pattern +import {{javaxPackage}}.validation.constraints.Size +{{/useBeanValidation}} + +import {{javaxPackage}}.inject.Inject +import {{javaxPackage}}.inject.Singleton import okhttp3.Headers /** diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache index 78efdbe2710a..9b0cfa6637b0 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache @@ -1,5 +1,17 @@ package {{package}} +{{#useBeanValidation}} + import {{javaxPackage}}.validation.Valid + import {{javaxPackage}}.validation.constraints.DecimalMax + import {{javaxPackage}}.validation.constraints.DecimalMin + import {{javaxPackage}}.validation.constraints.Email + import {{javaxPackage}}.validation.constraints.Max + import {{javaxPackage}}.validation.constraints.Min + import {{javaxPackage}}.validation.constraints.NotNull + import {{javaxPackage}}.validation.constraints.Pattern + import {{javaxPackage}}.validation.constraints.Size +{{/useBeanValidation}} + {{#imports}}import {{import}} {{/imports}} import okhttp3.Headers diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache index 7fd290d0ea4d..df5813255615 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache @@ -1,6 +1,6 @@ package {{package}} -import jakarta.inject.Inject +import {{javaxPackage}}.inject.Inject import misk.testing.MiskTest import org.junit.jupiter.api.Test {{#imports}}import {{import}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache index 3283fff305ec..03ac6b0b2c67 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache @@ -8,7 +8,7 @@ group = "{{groupId}}" version = "{{artifactVersion}}" dependencies { - implementation("jakarta.validation:validation-api:3.1.1") + implementation("jakarta.validation:jakarta.validation-api:3.1.1") implementation("com.squareup.misk:misk:2025.02.11.123913-8a41324") //implementation("com.squareup.wire:wire-runtime:5.2.1") diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache index 750e2031bad9..38d235b33a50 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/miskModule.mustache @@ -2,7 +2,7 @@ package {{apiPackage}} import misk.inject.KAbstractModule import misk.web.WebActionModule -import jakarta.inject.Singleton +import {{javaxPackage}}.inject.Singleton {{#apiInfo}} {{#apis}} {{#operations}} diff --git a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES index 9063ccb4ff0f..6f07b4ceb390 100644 --- a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES @@ -26,6 +26,3 @@ src/main/kotlin/org/openapitools/server/api/model/Order.kt src/main/kotlin/org/openapitools/server/api/model/Pet.kt src/main/kotlin/org/openapitools/server/api/model/Tag.kt src/main/kotlin/org/openapitools/server/api/model/User.kt -src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt -src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt -src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt diff --git a/samples/server/petstore/kotlin-misk/build.gradle.kts b/samples/server/petstore/kotlin-misk/build.gradle.kts index 4d21badf22ca..d75e21111536 100644 --- a/samples/server/petstore/kotlin-misk/build.gradle.kts +++ b/samples/server/petstore/kotlin-misk/build.gradle.kts @@ -8,7 +8,7 @@ group = "org.openapitools" version = "1.0.0-SNAPSHOT" dependencies { - implementation("jakarta.validation:validation-api:3.1.1") + implementation("jakarta.validation:jakarta.validation-api:3.1.1") implementation("com.squareup.misk:misk:2025.02.11.123913-8a41324") //implementation("com.squareup.wire:wire-runtime:5.2.1") diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt index 9c21356cc221..856dd48d7ba7 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt @@ -1,5 +1,15 @@ package org.openapitools.server.api.api + import jakarta.validation.Valid + import jakarta.validation.constraints.DecimalMax + import jakarta.validation.constraints.DecimalMin + import jakarta.validation.constraints.Email + import jakarta.validation.constraints.Max + import jakarta.validation.constraints.Min + import jakarta.validation.constraints.NotNull + import jakarta.validation.constraints.Pattern + import jakarta.validation.constraints.Size + import org.openapitools.server.api.model.ModelApiResponse import org.openapitools.server.api.model.Pet import okhttp3.Headers diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt index e0c772770fc5..507420fd0db8 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt @@ -3,15 +3,15 @@ package org.openapitools.server.api.api import org.openapitools.server.api.model.ModelApiResponse import org.openapitools.server.api.model.Pet -import .validation.Valid -import .validation.constraints.DecimalMax -import .validation.constraints.DecimalMin -import .validation.constraints.Email -import .validation.constraints.Max -import .validation.constraints.Min -import .validation.constraints.NotNull -import .validation.constraints.Pattern -import .validation.constraints.Size +import jakarta.validation.Valid +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size import jakarta.inject.Inject import jakarta.inject.Singleton @@ -37,7 +37,7 @@ import okhttp3.Headers @Singleton class PetApiController @Inject constructor( private val petApi: PetApi - ) : WebAction, PetApi { + ) : WebAction implements PetApi { @Post("/pet") @Description("Add a new pet to the store") diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt index b8db53b91e0f..0cb27175510c 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt @@ -3,6 +3,16 @@ package org.openapitools.server.api.api import org.openapitools.server.api.model.ModelApiResponse import org.openapitools.server.api.model.Pet +import jakarta.validation.Valid +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size + import jakarta.inject.Inject import jakarta.inject.Singleton import okhttp3.Headers diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt index 77b727256276..dd2524d8748f 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt @@ -1,5 +1,15 @@ package org.openapitools.server.api.api + import jakarta.validation.Valid + import jakarta.validation.constraints.DecimalMax + import jakarta.validation.constraints.DecimalMin + import jakarta.validation.constraints.Email + import jakarta.validation.constraints.Max + import jakarta.validation.constraints.Min + import jakarta.validation.constraints.NotNull + import jakarta.validation.constraints.Pattern + import jakarta.validation.constraints.Size + import org.openapitools.server.api.model.Order import okhttp3.Headers diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt index ff0072fbf395..b2226961a1fc 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt @@ -2,15 +2,15 @@ package org.openapitools.server.api.api import org.openapitools.server.api.model.Order -import .validation.Valid -import .validation.constraints.DecimalMax -import .validation.constraints.DecimalMin -import .validation.constraints.Email -import .validation.constraints.Max -import .validation.constraints.Min -import .validation.constraints.NotNull -import .validation.constraints.Pattern -import .validation.constraints.Size +import jakarta.validation.Valid +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size import jakarta.inject.Inject import jakarta.inject.Singleton @@ -36,7 +36,7 @@ import okhttp3.Headers @Singleton class StoreApiController @Inject constructor( private val storeApi: StoreApi - ) : WebAction, StoreApi { + ) : WebAction implements StoreApi { @Delete("/store/order/{orderId}") @Description("Delete purchase order by ID") diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt index 8b081eb55c4e..648daf763219 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt @@ -2,6 +2,16 @@ package org.openapitools.server.api.api import org.openapitools.server.api.model.Order +import jakarta.validation.Valid +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size + import jakarta.inject.Inject import jakarta.inject.Singleton import okhttp3.Headers diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt index 0cbc0f15fe7a..65ce47229c98 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt @@ -1,5 +1,15 @@ package org.openapitools.server.api.api + import jakarta.validation.Valid + import jakarta.validation.constraints.DecimalMax + import jakarta.validation.constraints.DecimalMin + import jakarta.validation.constraints.Email + import jakarta.validation.constraints.Max + import jakarta.validation.constraints.Min + import jakarta.validation.constraints.NotNull + import jakarta.validation.constraints.Pattern + import jakarta.validation.constraints.Size + import org.openapitools.server.api.model.User import okhttp3.Headers diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt index dd99ea614f86..6eb450946165 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt @@ -2,15 +2,15 @@ package org.openapitools.server.api.api import org.openapitools.server.api.model.User -import .validation.Valid -import .validation.constraints.DecimalMax -import .validation.constraints.DecimalMin -import .validation.constraints.Email -import .validation.constraints.Max -import .validation.constraints.Min -import .validation.constraints.NotNull -import .validation.constraints.Pattern -import .validation.constraints.Size +import jakarta.validation.Valid +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size import jakarta.inject.Inject import jakarta.inject.Singleton @@ -36,7 +36,7 @@ import okhttp3.Headers @Singleton class UserApiController @Inject constructor( private val userApi: UserApi - ) : WebAction, UserApi { + ) : WebAction implements UserApi { @Post("/user") @Description("Create user") diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt index 369e56ac2801..56066bde6e24 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt @@ -2,6 +2,16 @@ package org.openapitools.server.api.api import org.openapitools.server.api.model.User +import jakarta.validation.Valid +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size + import jakarta.inject.Inject import jakarta.inject.Singleton import okhttp3.Headers From 10f2915635e6b4bcda694589b4c77afba43323d4 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Fri, 21 Mar 2025 12:57:18 +0000 Subject: [PATCH 094/102] fixing jakarta 2 --- .../src/main/resources/kotlin-misk/apiImpl.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index 5d281715d498..88dc5a4d225f 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -25,7 +25,7 @@ import okhttp3.Headers {{#operations}} @Singleton class {{classname}}Impl @Inject constructor( -): {{classname}} { +) implements {{classname}} { {{#operation}} override fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { From f41e5bbd38c32b2b9f6f3fd41a7b6a6074a9553e Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Fri, 21 Mar 2025 13:09:26 +0000 Subject: [PATCH 095/102] final final final changes --- .../kotlin-misk/apiController.mustache | 42 +++--- .../resources/kotlin-misk/apiImpl.mustache | 17 ++- .../kotlin-misk/apiInterface.mustache | 28 ++-- .../resources/kotlin-misk/api_test.mustache | 7 + .../kotlin-misk/.openapi-generator/FILES | 3 + .../org/openapitools/server/api/api/PetApi.kt | 42 +++--- .../server/api/api/PetApiController.kt | 138 +++++++++--------- .../openapitools/server/api/api/PetApiImpl.kt | 15 +- .../openapitools/server/api/api/StoreApi.kt | 34 +++-- .../server/api/api/StoreApiController.kt | 76 +++++----- .../server/api/api/StoreApiImpl.kt | 13 +- .../openapitools/server/api/api/UserApi.kt | 42 +++--- .../server/api/api/UserApiController.kt | 128 ++++++++-------- .../server/api/api/UserApiImpl.kt | 13 +- .../openapitools/server/api/api/PetApiTest.kt | 7 + .../server/api/api/StoreApiTest.kt | 7 + .../server/api/api/UserApiTest.kt | 7 + 17 files changed, 339 insertions(+), 280 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index 159a53a29aee..c9e366abb985 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -1,8 +1,7 @@ package {{package}} -{{#imports}}import {{import}} -{{/imports}} - +import {{javaxPackage}}.inject.Inject +import {{javaxPackage}}.inject.Singleton {{#useBeanValidation}} import {{javaxPackage}}.validation.Valid import {{javaxPackage}}.validation.constraints.DecimalMax @@ -14,10 +13,6 @@ import {{javaxPackage}}.validation.constraints.NotNull import {{javaxPackage}}.validation.constraints.Pattern import {{javaxPackage}}.validation.constraints.Size {{/useBeanValidation}} - -import {{javaxPackage}}.inject.Inject -import {{javaxPackage}}.inject.Singleton - import misk.web.Delete import misk.web.Description import misk.web.Get @@ -35,22 +30,27 @@ import misk.web.actions.WebAction import misk.web.interceptors.LogRequestResponse import misk.web.mediatype.MediaTypes import okhttp3.Headers +{{#imports}}import {{import}} +{{/imports}} {{#operations}} - @Singleton - class {{classname}}Controller @Inject constructor( - private val {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}: {{classname}} - ) : WebAction implements {{classname}} { - {{#operation}} +/** + * Generated file, please change {{classname}}Controller. + */ +@Singleton +class {{classname}}Controller @Inject constructor( + private val {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}: {{classname}} +) : WebAction, {{classname}} { +{{#operation}} - @{{httpMethod}}("{{path}}") - @Description("{{{summary}}}"){{#hasConsumes}} - @RequestContentType({{#consumes}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/consumes}}){{/hasConsumes}}{{#hasProduces}} - @ResponseContentType({{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}){{/hasProduces}} - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { - TODO() - } - {{/operation}} + @{{httpMethod}}("{{path}}") + @Description("{{{summary}}}"){{#hasConsumes}} + @RequestContentType({{#consumes}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/consumes}}){{/hasConsumes}}{{#hasProduces}} + @ResponseContentType({{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}){{/hasProduces}} + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + override fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { + TODO() } +{{/operation}} +} {{/operations}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index 88dc5a4d225f..a75f3e131eaa 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -1,8 +1,7 @@ package {{package}} -{{#imports}}import {{import}} -{{/imports}} - +import {{javaxPackage}}.inject.Inject +import {{javaxPackage}}.inject.Singleton {{#useBeanValidation}} import {{javaxPackage}}.validation.Valid import {{javaxPackage}}.validation.constraints.DecimalMax @@ -14,10 +13,14 @@ import {{javaxPackage}}.validation.constraints.NotNull import {{javaxPackage}}.validation.constraints.Pattern import {{javaxPackage}}.validation.constraints.Size {{/useBeanValidation}} - -import {{javaxPackage}}.inject.Inject -import {{javaxPackage}}.inject.Singleton +import misk.web.HttpCall +import misk.web.PathParam +import misk.web.QueryParam +import misk.web.RequestBody +import misk.web.RequestHeaders import okhttp3.Headers +{{#imports}}import {{import}} +{{/imports}} /** * @TODO("Fill out implementation") @@ -25,7 +28,7 @@ import okhttp3.Headers {{#operations}} @Singleton class {{classname}}Impl @Inject constructor( -) implements {{classname}} { +): {{classname}} { {{#operation}} override fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache index 9b0cfa6637b0..f8fddc978c3c 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache @@ -1,26 +1,30 @@ package {{package}} {{#useBeanValidation}} - import {{javaxPackage}}.validation.Valid - import {{javaxPackage}}.validation.constraints.DecimalMax - import {{javaxPackage}}.validation.constraints.DecimalMin - import {{javaxPackage}}.validation.constraints.Email - import {{javaxPackage}}.validation.constraints.Max - import {{javaxPackage}}.validation.constraints.Min - import {{javaxPackage}}.validation.constraints.NotNull - import {{javaxPackage}}.validation.constraints.Pattern - import {{javaxPackage}}.validation.constraints.Size +import {{javaxPackage}}.validation.Valid +import {{javaxPackage}}.validation.constraints.DecimalMax +import {{javaxPackage}}.validation.constraints.DecimalMin +import {{javaxPackage}}.validation.constraints.Email +import {{javaxPackage}}.validation.constraints.Max +import {{javaxPackage}}.validation.constraints.Min +import {{javaxPackage}}.validation.constraints.NotNull +import {{javaxPackage}}.validation.constraints.Pattern +import {{javaxPackage}}.validation.constraints.Size {{/useBeanValidation}} - +import misk.web.HttpCall +import misk.web.PathParam +import misk.web.QueryParam +import misk.web.RequestBody +import misk.web.RequestHeaders +import okhttp3.Headers {{#imports}}import {{import}} {{/imports}} -import okhttp3.Headers {{#operations}} interface {{classname}} { {{#operation}} - fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} { + fun {{operationId}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>cookieParams}}{{>bodyParams}}{{>formParams}}{{^-last}}, {{/-last}}{{/allParams}}){{#returnType}}: {{{returnType}}}{{/returnType}} {{/operation}} } {{/operations}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache index df5813255615..13fcefe26a94 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache @@ -3,6 +3,13 @@ package {{package}} import {{javaxPackage}}.inject.Inject import misk.testing.MiskTest import org.junit.jupiter.api.Test + +import misk.web.HttpCall +import misk.web.PathParam +import misk.web.QueryParam +import misk.web.RequestBody +import misk.web.RequestHeaders + {{#imports}}import {{import}} {{/imports}} import okhttp3.Headers diff --git a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES index 6f07b4ceb390..9063ccb4ff0f 100644 --- a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES @@ -26,3 +26,6 @@ src/main/kotlin/org/openapitools/server/api/model/Order.kt src/main/kotlin/org/openapitools/server/api/model/Pet.kt src/main/kotlin/org/openapitools/server/api/model/Tag.kt src/main/kotlin/org/openapitools/server/api/model/User.kt +src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt +src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt +src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt index 856dd48d7ba7..aa040a3d441f 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt @@ -1,34 +1,38 @@ package org.openapitools.server.api.api - import jakarta.validation.Valid - import jakarta.validation.constraints.DecimalMax - import jakarta.validation.constraints.DecimalMin - import jakarta.validation.constraints.Email - import jakarta.validation.constraints.Max - import jakarta.validation.constraints.Min - import jakarta.validation.constraints.NotNull - import jakarta.validation.constraints.Pattern - import jakarta.validation.constraints.Size - +import jakarta.validation.Valid +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size +import misk.web.HttpCall +import misk.web.PathParam +import misk.web.QueryParam +import misk.web.RequestBody +import misk.web.RequestHeaders +import okhttp3.Headers import org.openapitools.server.api.model.ModelApiResponse import org.openapitools.server.api.model.Pet -import okhttp3.Headers interface PetApi { - fun addPet(@Valid @RequestBody pet: Pet): Pet { + fun addPet(@Valid @RequestBody pet: Pet): Pet - fun deletePet(@PathParam("petId") petId: kotlin.Long, apiKey: Headers) { + fun deletePet(@PathParam("petId") petId: kotlin.Long, apiKey: Headers) - fun findPetsByStatus( @QueryParam(value = "status") status: kotlin.Array): kotlin.Array { + fun findPetsByStatus( @QueryParam(value = "status") status: kotlin.Array): kotlin.Array - fun findPetsByTags( @QueryParam(value = "tags") tags: kotlin.Array): kotlin.Array { + fun findPetsByTags( @QueryParam(value = "tags") tags: kotlin.Array): kotlin.Array - fun getPetById(@PathParam("petId") petId: kotlin.Long): Pet { + fun getPetById(@PathParam("petId") petId: kotlin.Long): Pet - fun updatePet(@Valid @RequestBody pet: Pet): Pet { + fun updatePet(@Valid @RequestBody pet: Pet): Pet - fun updatePetWithForm(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "name") name: kotlin.String? , @QueryParam(value = "status") status: kotlin.String? ) { + fun updatePetWithForm(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "name") name: kotlin.String? , @QueryParam(value = "status") status: kotlin.String? ) - fun uploadFile(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "additionalMetadata") additionalMetadata: kotlin.String? , @Valid file: HttpCall): ModelApiResponse { + fun uploadFile(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "additionalMetadata") additionalMetadata: kotlin.String? , @Valid file: HttpCall): ModelApiResponse } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt index 507420fd0db8..ec3c342b0c87 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt @@ -1,8 +1,7 @@ package org.openapitools.server.api.api -import org.openapitools.server.api.model.ModelApiResponse -import org.openapitools.server.api.model.Pet - +import jakarta.inject.Inject +import jakarta.inject.Singleton import jakarta.validation.Valid import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -12,10 +11,6 @@ import jakarta.validation.constraints.Min import jakarta.validation.constraints.NotNull import jakarta.validation.constraints.Pattern import jakarta.validation.constraints.Size - -import jakarta.inject.Inject -import jakarta.inject.Singleton - import misk.web.Delete import misk.web.Description import misk.web.Get @@ -33,75 +28,80 @@ import misk.web.actions.WebAction import misk.web.interceptors.LogRequestResponse import misk.web.mediatype.MediaTypes import okhttp3.Headers +import org.openapitools.server.api.model.ModelApiResponse +import org.openapitools.server.api.model.Pet - @Singleton - class PetApiController @Inject constructor( - private val petApi: PetApi - ) : WebAction implements PetApi { +/** + * Generated file, please change PetApiController. + */ +@Singleton +class PetApiController @Inject constructor( + private val petApi: PetApi +) : WebAction, PetApi { - @Post("/pet") - @Description("Add a new pet to the store") - @RequestContentType(MediaTypes.APPLICATION_JSON, MediaTypes.APPLICATION_XML) - @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun addPet(@Valid @RequestBody pet: Pet): Pet { - TODO() - } + @Post("/pet") + @Description("Add a new pet to the store") + @RequestContentType(MediaTypes.APPLICATION_JSON, MediaTypes.APPLICATION_XML) + @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + override fun addPet(@Valid @RequestBody pet: Pet): Pet { + TODO() + } - @Delete("/pet/{petId}") - @Description("Deletes a pet") - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun deletePet(@PathParam("petId") petId: kotlin.Long, apiKey: Headers) { - TODO() - } + @Delete("/pet/{petId}") + @Description("Deletes a pet") + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + override fun deletePet(@PathParam("petId") petId: kotlin.Long, apiKey: Headers) { + TODO() + } - @Get("/pet/findByStatus") - @Description("Finds Pets by status") - @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun findPetsByStatus( @QueryParam(value = "status") status: kotlin.Array): kotlin.Array { - TODO() - } + @Get("/pet/findByStatus") + @Description("Finds Pets by status") + @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + override fun findPetsByStatus( @QueryParam(value = "status") status: kotlin.Array): kotlin.Array { + TODO() + } - @Get("/pet/findByTags") - @Description("Finds Pets by tags") - @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun findPetsByTags( @QueryParam(value = "tags") tags: kotlin.Array): kotlin.Array { - TODO() - } + @Get("/pet/findByTags") + @Description("Finds Pets by tags") + @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + override fun findPetsByTags( @QueryParam(value = "tags") tags: kotlin.Array): kotlin.Array { + TODO() + } - @Get("/pet/{petId}") - @Description("Find pet by ID") - @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun getPetById(@PathParam("petId") petId: kotlin.Long): Pet { - TODO() - } + @Get("/pet/{petId}") + @Description("Find pet by ID") + @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + override fun getPetById(@PathParam("petId") petId: kotlin.Long): Pet { + TODO() + } - @Put("/pet") - @Description("Update an existing pet") - @RequestContentType(MediaTypes.APPLICATION_JSON, MediaTypes.APPLICATION_XML) - @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun updatePet(@Valid @RequestBody pet: Pet): Pet { - TODO() - } + @Put("/pet") + @Description("Update an existing pet") + @RequestContentType(MediaTypes.APPLICATION_JSON, MediaTypes.APPLICATION_XML) + @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + override fun updatePet(@Valid @RequestBody pet: Pet): Pet { + TODO() + } - @Post("/pet/{petId}") - @Description("Updates a pet in the store with form data") - @RequestContentType(MediaTypes.APPLICATION_FORM_URLENCODED) - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun updatePetWithForm(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "name") name: kotlin.String? , @QueryParam(value = "status") status: kotlin.String? ) { - TODO() - } + @Post("/pet/{petId}") + @Description("Updates a pet in the store with form data") + @RequestContentType(MediaTypes.APPLICATION_FORM_URLENCODED) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + override fun updatePetWithForm(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "name") name: kotlin.String? , @QueryParam(value = "status") status: kotlin.String? ) { + TODO() + } - @Post("/pet/{petId}/uploadImage") - @Description("uploads an image") - @RequestContentType(MediaTypes.APPLICATION_OCTETSTREAM /* unknown -> multipart/form-data */ ) - @ResponseContentType(MediaTypes.APPLICATION_JSON) - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun uploadFile(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "additionalMetadata") additionalMetadata: kotlin.String? , @Valid file: HttpCall): ModelApiResponse { - TODO() - } + @Post("/pet/{petId}/uploadImage") + @Description("uploads an image") + @RequestContentType(MediaTypes.APPLICATION_OCTETSTREAM /* unknown -> multipart/form-data */ ) + @ResponseContentType(MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + override fun uploadFile(@PathParam("petId") petId: kotlin.Long, @QueryParam(value = "additionalMetadata") additionalMetadata: kotlin.String? , @Valid file: HttpCall): ModelApiResponse { + TODO() } +} diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt index 0cb27175510c..19221ff736cc 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt @@ -1,8 +1,7 @@ package org.openapitools.server.api.api -import org.openapitools.server.api.model.ModelApiResponse -import org.openapitools.server.api.model.Pet - +import jakarta.inject.Inject +import jakarta.inject.Singleton import jakarta.validation.Valid import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -12,10 +11,14 @@ import jakarta.validation.constraints.Min import jakarta.validation.constraints.NotNull import jakarta.validation.constraints.Pattern import jakarta.validation.constraints.Size - -import jakarta.inject.Inject -import jakarta.inject.Singleton +import misk.web.HttpCall +import misk.web.PathParam +import misk.web.QueryParam +import misk.web.RequestBody +import misk.web.RequestHeaders import okhttp3.Headers +import org.openapitools.server.api.model.ModelApiResponse +import org.openapitools.server.api.model.Pet /** * @TODO("Fill out implementation") diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt index dd2524d8748f..0617f6e75f22 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt @@ -1,25 +1,29 @@ package org.openapitools.server.api.api - import jakarta.validation.Valid - import jakarta.validation.constraints.DecimalMax - import jakarta.validation.constraints.DecimalMin - import jakarta.validation.constraints.Email - import jakarta.validation.constraints.Max - import jakarta.validation.constraints.Min - import jakarta.validation.constraints.NotNull - import jakarta.validation.constraints.Pattern - import jakarta.validation.constraints.Size - -import org.openapitools.server.api.model.Order +import jakarta.validation.Valid +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size +import misk.web.HttpCall +import misk.web.PathParam +import misk.web.QueryParam +import misk.web.RequestBody +import misk.web.RequestHeaders import okhttp3.Headers +import org.openapitools.server.api.model.Order interface StoreApi { - fun deleteOrder(@PathParam("orderId") orderId: kotlin.String) { + fun deleteOrder(@PathParam("orderId") orderId: kotlin.String) - fun getInventory(): kotlin.collections.Map { + fun getInventory(): kotlin.collections.Map - fun getOrderById(@Min(1L) @Max(5L) @PathParam("orderId") orderId: kotlin.Long): Order { + fun getOrderById(@Min(1L) @Max(5L) @PathParam("orderId") orderId: kotlin.Long): Order - fun placeOrder(@Valid @RequestBody order: Order): Order { + fun placeOrder(@Valid @RequestBody order: Order): Order } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt index b2226961a1fc..156a079446a0 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt @@ -1,7 +1,7 @@ package org.openapitools.server.api.api -import org.openapitools.server.api.model.Order - +import jakarta.inject.Inject +import jakarta.inject.Singleton import jakarta.validation.Valid import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -11,10 +11,6 @@ import jakarta.validation.constraints.Min import jakarta.validation.constraints.NotNull import jakarta.validation.constraints.Pattern import jakarta.validation.constraints.Size - -import jakarta.inject.Inject -import jakarta.inject.Singleton - import misk.web.Delete import misk.web.Description import misk.web.Get @@ -32,41 +28,45 @@ import misk.web.actions.WebAction import misk.web.interceptors.LogRequestResponse import misk.web.mediatype.MediaTypes import okhttp3.Headers +import org.openapitools.server.api.model.Order - @Singleton - class StoreApiController @Inject constructor( - private val storeApi: StoreApi - ) : WebAction implements StoreApi { +/** + * Generated file, please change StoreApiController. + */ +@Singleton +class StoreApiController @Inject constructor( + private val storeApi: StoreApi +) : WebAction, StoreApi { - @Delete("/store/order/{orderId}") - @Description("Delete purchase order by ID") - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun deleteOrder(@PathParam("orderId") orderId: kotlin.String) { - TODO() - } + @Delete("/store/order/{orderId}") + @Description("Delete purchase order by ID") + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + override fun deleteOrder(@PathParam("orderId") orderId: kotlin.String) { + TODO() + } - @Get("/store/inventory") - @Description("Returns pet inventories by status") - @ResponseContentType(MediaTypes.APPLICATION_JSON) - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun getInventory(): kotlin.collections.Map { - TODO() - } + @Get("/store/inventory") + @Description("Returns pet inventories by status") + @ResponseContentType(MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + override fun getInventory(): kotlin.collections.Map { + TODO() + } - @Get("/store/order/{orderId}") - @Description("Find purchase order by ID") - @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun getOrderById(@Min(1L) @Max(5L) @PathParam("orderId") orderId: kotlin.Long): Order { - TODO() - } + @Get("/store/order/{orderId}") + @Description("Find purchase order by ID") + @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + override fun getOrderById(@Min(1L) @Max(5L) @PathParam("orderId") orderId: kotlin.Long): Order { + TODO() + } - @Post("/store/order") - @Description("Place an order for a pet") - @RequestContentType(MediaTypes.APPLICATION_JSON) - @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun placeOrder(@Valid @RequestBody order: Order): Order { - TODO() - } + @Post("/store/order") + @Description("Place an order for a pet") + @RequestContentType(MediaTypes.APPLICATION_JSON) + @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + override fun placeOrder(@Valid @RequestBody order: Order): Order { + TODO() } +} diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt index 648daf763219..3a527371b0d0 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt @@ -1,7 +1,7 @@ package org.openapitools.server.api.api -import org.openapitools.server.api.model.Order - +import jakarta.inject.Inject +import jakarta.inject.Singleton import jakarta.validation.Valid import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -11,10 +11,13 @@ import jakarta.validation.constraints.Min import jakarta.validation.constraints.NotNull import jakarta.validation.constraints.Pattern import jakarta.validation.constraints.Size - -import jakarta.inject.Inject -import jakarta.inject.Singleton +import misk.web.HttpCall +import misk.web.PathParam +import misk.web.QueryParam +import misk.web.RequestBody +import misk.web.RequestHeaders import okhttp3.Headers +import org.openapitools.server.api.model.Order /** * @TODO("Fill out implementation") diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt index 65ce47229c98..ecced905dcae 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt @@ -1,33 +1,37 @@ package org.openapitools.server.api.api - import jakarta.validation.Valid - import jakarta.validation.constraints.DecimalMax - import jakarta.validation.constraints.DecimalMin - import jakarta.validation.constraints.Email - import jakarta.validation.constraints.Max - import jakarta.validation.constraints.Min - import jakarta.validation.constraints.NotNull - import jakarta.validation.constraints.Pattern - import jakarta.validation.constraints.Size - -import org.openapitools.server.api.model.User +import jakarta.validation.Valid +import jakarta.validation.constraints.DecimalMax +import jakarta.validation.constraints.DecimalMin +import jakarta.validation.constraints.Email +import jakarta.validation.constraints.Max +import jakarta.validation.constraints.Min +import jakarta.validation.constraints.NotNull +import jakarta.validation.constraints.Pattern +import jakarta.validation.constraints.Size +import misk.web.HttpCall +import misk.web.PathParam +import misk.web.QueryParam +import misk.web.RequestBody +import misk.web.RequestHeaders import okhttp3.Headers +import org.openapitools.server.api.model.User interface UserApi { - fun createUser(@Valid @RequestBody user: User) { + fun createUser(@Valid @RequestBody user: User) - fun createUsersWithArrayInput(@Valid @RequestBody user: kotlin.Array) { + fun createUsersWithArrayInput(@Valid @RequestBody user: kotlin.Array) - fun createUsersWithListInput(@Valid @RequestBody user: kotlin.Array) { + fun createUsersWithListInput(@Valid @RequestBody user: kotlin.Array) - fun deleteUser(@PathParam("username") username: kotlin.String) { + fun deleteUser(@PathParam("username") username: kotlin.String) - fun getUserByName(@PathParam("username") username: kotlin.String): User { + fun getUserByName(@PathParam("username") username: kotlin.String): User - fun loginUser( @QueryParam(value = "username") username: kotlin.String, @QueryParam(value = "password") password: kotlin.String): kotlin.String { + fun loginUser( @QueryParam(value = "username") username: kotlin.String, @QueryParam(value = "password") password: kotlin.String): kotlin.String - fun logoutUser() { + fun logoutUser() - fun updateUser(@PathParam("username") username: kotlin.String, @Valid @RequestBody user: User) { + fun updateUser(@PathParam("username") username: kotlin.String, @Valid @RequestBody user: User) } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt index 6eb450946165..2301c3ae1550 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt @@ -1,7 +1,7 @@ package org.openapitools.server.api.api -import org.openapitools.server.api.model.User - +import jakarta.inject.Inject +import jakarta.inject.Singleton import jakarta.validation.Valid import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -11,10 +11,6 @@ import jakarta.validation.constraints.Min import jakarta.validation.constraints.NotNull import jakarta.validation.constraints.Pattern import jakarta.validation.constraints.Size - -import jakarta.inject.Inject -import jakarta.inject.Singleton - import misk.web.Delete import misk.web.Description import misk.web.Get @@ -32,71 +28,75 @@ import misk.web.actions.WebAction import misk.web.interceptors.LogRequestResponse import misk.web.mediatype.MediaTypes import okhttp3.Headers +import org.openapitools.server.api.model.User - @Singleton - class UserApiController @Inject constructor( - private val userApi: UserApi - ) : WebAction implements UserApi { +/** + * Generated file, please change UserApiController. + */ +@Singleton +class UserApiController @Inject constructor( + private val userApi: UserApi +) : WebAction, UserApi { - @Post("/user") - @Description("Create user") - @RequestContentType(MediaTypes.APPLICATION_JSON) - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun createUser(@Valid @RequestBody user: User) { - TODO() - } + @Post("/user") + @Description("Create user") + @RequestContentType(MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + override fun createUser(@Valid @RequestBody user: User) { + TODO() + } - @Post("/user/createWithArray") - @Description("Creates list of users with given input array") - @RequestContentType(MediaTypes.APPLICATION_JSON) - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun createUsersWithArrayInput(@Valid @RequestBody user: kotlin.Array) { - TODO() - } + @Post("/user/createWithArray") + @Description("Creates list of users with given input array") + @RequestContentType(MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + override fun createUsersWithArrayInput(@Valid @RequestBody user: kotlin.Array) { + TODO() + } - @Post("/user/createWithList") - @Description("Creates list of users with given input array") - @RequestContentType(MediaTypes.APPLICATION_JSON) - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun createUsersWithListInput(@Valid @RequestBody user: kotlin.Array) { - TODO() - } + @Post("/user/createWithList") + @Description("Creates list of users with given input array") + @RequestContentType(MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + override fun createUsersWithListInput(@Valid @RequestBody user: kotlin.Array) { + TODO() + } - @Delete("/user/{username}") - @Description("Delete user") - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun deleteUser(@PathParam("username") username: kotlin.String) { - TODO() - } + @Delete("/user/{username}") + @Description("Delete user") + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + override fun deleteUser(@PathParam("username") username: kotlin.String) { + TODO() + } - @Get("/user/{username}") - @Description("Get user by user name") - @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun getUserByName(@PathParam("username") username: kotlin.String): User { - TODO() - } + @Get("/user/{username}") + @Description("Get user by user name") + @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + override fun getUserByName(@PathParam("username") username: kotlin.String): User { + TODO() + } - @Get("/user/login") - @Description("Logs user into the system") - @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun loginUser( @QueryParam(value = "username") username: kotlin.String, @QueryParam(value = "password") password: kotlin.String): kotlin.String { - TODO() - } + @Get("/user/login") + @Description("Logs user into the system") + @ResponseContentType(MediaTypes.APPLICATION_XML, MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + override fun loginUser( @QueryParam(value = "username") username: kotlin.String, @QueryParam(value = "password") password: kotlin.String): kotlin.String { + TODO() + } - @Get("/user/logout") - @Description("Logs out current logged in user session") - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun logoutUser() { - TODO() - } + @Get("/user/logout") + @Description("Logs out current logged in user session") + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + override fun logoutUser() { + TODO() + } - @Put("/user/{username}") - @Description("Updated user") - @RequestContentType(MediaTypes.APPLICATION_JSON) - @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun updateUser(@PathParam("username") username: kotlin.String, @Valid @RequestBody user: User) { - TODO() - } + @Put("/user/{username}") + @Description("Updated user") + @RequestContentType(MediaTypes.APPLICATION_JSON) + @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) + override fun updateUser(@PathParam("username") username: kotlin.String, @Valid @RequestBody user: User) { + TODO() } +} diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt index 56066bde6e24..c52d27105fa2 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt @@ -1,7 +1,7 @@ package org.openapitools.server.api.api -import org.openapitools.server.api.model.User - +import jakarta.inject.Inject +import jakarta.inject.Singleton import jakarta.validation.Valid import jakarta.validation.constraints.DecimalMax import jakarta.validation.constraints.DecimalMin @@ -11,10 +11,13 @@ import jakarta.validation.constraints.Min import jakarta.validation.constraints.NotNull import jakarta.validation.constraints.Pattern import jakarta.validation.constraints.Size - -import jakarta.inject.Inject -import jakarta.inject.Singleton +import misk.web.HttpCall +import misk.web.PathParam +import misk.web.QueryParam +import misk.web.RequestBody +import misk.web.RequestHeaders import okhttp3.Headers +import org.openapitools.server.api.model.User /** * @TODO("Fill out implementation") diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt index e783e2899418..d51e7e9550cd 100644 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt @@ -3,6 +3,13 @@ package org.openapitools.server.api.api import jakarta.inject.Inject import misk.testing.MiskTest import org.junit.jupiter.api.Test + +import misk.web.HttpCall +import misk.web.PathParam +import misk.web.QueryParam +import misk.web.RequestBody +import misk.web.RequestHeaders + import org.openapitools.server.api.model.ModelApiResponse import org.openapitools.server.api.model.Pet import okhttp3.Headers diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt index e7e6cfb0ef18..01b451fba3ed 100644 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt @@ -3,6 +3,13 @@ package org.openapitools.server.api.api import jakarta.inject.Inject import misk.testing.MiskTest import org.junit.jupiter.api.Test + +import misk.web.HttpCall +import misk.web.PathParam +import misk.web.QueryParam +import misk.web.RequestBody +import misk.web.RequestHeaders + import org.openapitools.server.api.model.Order import okhttp3.Headers diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt index ad943b244bde..6a833403f988 100644 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt @@ -3,6 +3,13 @@ package org.openapitools.server.api.api import jakarta.inject.Inject import misk.testing.MiskTest import org.junit.jupiter.api.Test + +import misk.web.HttpCall +import misk.web.PathParam +import misk.web.QueryParam +import misk.web.RequestBody +import misk.web.RequestHeaders + import org.openapitools.server.api.model.User import okhttp3.Headers From de8ea3b6f72197e3fd6768495ef2944747676fa2 Mon Sep 17 00:00:00 2001 From: Guido Arnau Date: Fri, 21 Mar 2025 14:35:59 +0100 Subject: [PATCH 096/102] Fix initialization of BigDecimal for default values --- .../src/main/resources/kotlin-misk/model.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache index 74b75e10e2b6..863731d44833 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/model.mustache @@ -21,7 +21,7 @@ data class {{classname}}( {{#description}} /** {{description}} */ {{/description}} - val {{{name}}}: {{{dataType}}}{{^required}}?{{/required}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}{{^-last}},{{/-last}} + val {{{name}}}: {{{dataType}}}{{^required}}?{{/required}}{{#defaultValue}}{{#isNumber}} = {{{dataType}}}("{{{defaultValue}}}"){{/isNumber}}{{^isNumber}} = {{{defaultValue}}}{{/isNumber}}{{/defaultValue}}{{^defaultValue}}{{^required}} = null{{/required}}{{/defaultValue}}{{^-last}},{{/-last}} {{/vars}} ) {{/isEnum}} From 9b60c4682365fa3297e51908aa44272f152185b6 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sun, 23 Mar 2025 18:49:03 +0800 Subject: [PATCH 097/102] update samples, docs --- docs/generators.md | 1 + docs/generators/kotlin-misk.md | 279 ++++++++++++++++++ .../kotlin-misk/.openapi-generator/FILES | 3 - .../openapitools/server/api/model/Category.kt | 4 +- .../server/api/model/ModelApiResponse.kt | 6 +- .../openapitools/server/api/model/Order.kt | 10 +- .../org/openapitools/server/api/model/Pet.kt | 8 +- .../org/openapitools/server/api/model/Tag.kt | 4 +- .../org/openapitools/server/api/model/User.kt | 16 +- .../kotlin/org/openapitools/api/PetApi.kt | 4 +- .../kotlin/org/openapitools/api/UserApi.kt | 2 +- .../org/openapitools/api/PetApiController.kt | 4 +- .../org/openapitools/api/UserApiController.kt | 2 +- .../org/openapitools/api/PetApiController.kt | 4 +- .../org/openapitools/api/UserApiController.kt | 2 +- .../kotlin/org/openapitools/api/PetApi.kt | 4 +- .../kotlin/org/openapitools/api/UserApi.kt | 2 +- .../kotlin/org/openapitools/api/PetApi.kt | 4 +- .../kotlin/org/openapitools/api/UserApi.kt | 2 +- .../org/openapitools/api/PetApiController.kt | 4 +- .../org/openapitools/api/UserApiController.kt | 2 +- .../org/openapitools/api/PetApiController.kt | 4 +- .../org/openapitools/api/UserApiController.kt | 2 +- .../org/openapitools/api/PetApiController.kt | 4 +- .../org/openapitools/api/UserApiController.kt | 2 +- .../kotlin/org/openapitools/api/PetApi.kt | 4 +- .../kotlin/org/openapitools/api/UserApi.kt | 2 +- .../org/openapitools/api/PetApiController.kt | 4 +- .../org/openapitools/api/UserApiController.kt | 2 +- .../org/openapitools/api/PetApiController.kt | 4 +- .../org/openapitools/api/UserApiController.kt | 2 +- .../org/openapitools/api/PetApiController.kt | 4 +- .../org/openapitools/api/UserApiController.kt | 2 +- .../org/openapitools/api/PetApiController.kt | 4 +- .../org/openapitools/api/UserApiController.kt | 2 +- 35 files changed, 343 insertions(+), 66 deletions(-) create mode 100644 docs/generators/kotlin-misk.md diff --git a/docs/generators.md b/docs/generators.md index 2d29254e2d49..c74dfe531722 100644 --- a/docs/generators.md +++ b/docs/generators.md @@ -122,6 +122,7 @@ The following generators are available: * [jaxrs-resteasy-eap](generators/jaxrs-resteasy-eap.md) * [jaxrs-spec](generators/jaxrs-spec.md) * [julia-server (beta)](generators/julia-server.md) +* [kotlin-misk](generators/kotlin-misk.md) * [kotlin-server](generators/kotlin-server.md) * [kotlin-spring](generators/kotlin-spring.md) * [kotlin-vertx (beta)](generators/kotlin-vertx.md) diff --git a/docs/generators/kotlin-misk.md b/docs/generators/kotlin-misk.md new file mode 100644 index 000000000000..e9d7649880b6 --- /dev/null +++ b/docs/generators/kotlin-misk.md @@ -0,0 +1,279 @@ +--- +title: Documentation for the kotlin-misk Generator +--- + +## METADATA + +| Property | Value | Notes | +| -------- | ----- | ----- | +| generator name | kotlin-misk | pass this to the generate command after -g | +| generator stability | STABLE | | +| generator type | SERVER | | +| generator language | Kotlin | | +| generator default templating engine | mustache | | +| helpTxt | Generates a kotlin-misk server. | | + +## CONFIG OPTIONS +These options may be applied as additional-properties (cli) or configOptions (plugins). Refer to [configuration docs](https://openapi-generator.tech/docs/configuration) for more details. + +| Option | Description | Values | Default | +| ------ | ----------- | ------ | ------- | +|additionalModelTypeAnnotations|Additional annotations for model type(class level annotations). List separated by semicolon(;) or new line (Linux or Windows)| |null| +|apiSuffix|suffix for api classes| |Api| +|artifactId|Generated artifact id (name of jar).| |null| +|artifactVersion|Generated artifact's package version.| |1.0.0| +|enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |original| +|groupId|Generated artifact package's organization (i.e. maven groupId).| |org.openapitools| +|modelMutable|Create mutable models| |false| +|moduleClassName|Name of the generated module class| |OpenApiModule| +|packageName|Generated artifact package name.| |org.openapitools| +|parcelizeModels|toggle "@Parcelize" for generated models| |null| +|serializableModel|boolean - toggle "implements Serializable" for generated models| |null| +|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |null| +|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |null| +|sourceFolder|source folder for generated code| |src/main/kotlin| +|useBeanValidation|Use BeanValidation API annotations to validate data types| |true| + +## IMPORT MAPPING + +| Type/Alias | Imports | +| ---------- | ------- | +|BigDecimal|java.math.BigDecimal| +|Date|java.time.LocalDate| +|DateTime|java.time.OffsetDateTime| +|File|java.io.File| +|LocalDate|java.time.LocalDate| +|LocalDateTime|java.time.LocalDateTime| +|LocalTime|java.time.LocalTime| +|Timestamp|java.sql.Timestamp| +|URI|java.net.URI| +|UUID|java.util.UUID| + + +## INSTANTIATION TYPES + +| Type/Alias | Instantiated By | +| ---------- | --------------- | +|array|kotlin.collections.ArrayList| +|list|kotlin.collections.ArrayList| +|map|kotlin.collections.HashMap| + + +## LANGUAGE PRIMITIVES + +
    +
  • kotlin.Array
    • +
  • kotlin.Boolean
    • +
  • kotlin.Byte
    • +
  • kotlin.ByteArray
    • +
  • kotlin.Char
    • +
  • kotlin.Double
    • +
  • kotlin.Float
    • +
  • kotlin.Int
    • +
  • kotlin.Long
    • +
  • kotlin.Short
    • +
  • kotlin.String
    • +
  • kotlin.collections.List
    • +
  • kotlin.collections.Map
    • +
  • kotlin.collections.MutableList
    • +
  • kotlin.collections.MutableMap
    • +
  • kotlin.collections.MutableSet
    • +
  • kotlin.collections.Set
    • +
+ +## RESERVED WORDS + +
    +
  • ApiResponse
    • +
  • abstract
    • +
  • actual
    • +
  • annotation
    • +
  • as
    • +
  • break
    • +
  • class
    • +
  • companion
    • +
  • const
    • +
  • constructor
    • +
  • continue
    • +
  • contract
    • +
  • crossinline
    • +
  • data
    • +
  • delegate
    • +
  • do
    • +
  • dynamic
    • +
  • else
    • +
  • enum
    • +
  • expect
    • +
  • external
    • +
  • false
    • +
  • field
    • +
  • final
    • +
  • finally
    • +
  • for
    • +
  • fun
    • +
  • if
    • +
  • import
    • +
  • in
    • +
  • infix
    • +
  • init
    • +
  • inline
    • +
  • inner
    • +
  • interface
    • +
  • internal
    • +
  • is
    • +
  • it
    • +
  • lateinit
    • +
  • noinline
    • +
  • null
    • +
  • object
    • +
  • open
    • +
  • operator
    • +
  • out
    • +
  • override
    • +
  • package
    • +
  • param
    • +
  • private
    • +
  • property
    • +
  • protected
    • +
  • public
    • +
  • receiver
    • +
  • reified
    • +
  • return
    • +
  • sealed
    • +
  • setparam
    • +
  • super
    • +
  • suspend
    • +
  • tailrec
    • +
  • this
    • +
  • throw
    • +
  • true
    • +
  • try
    • +
  • typealias
    • +
  • typeof
    • +
  • val
    • +
  • value
    • +
  • var
    • +
  • vararg
    • +
  • when
    • +
  • where
    • +
  • while
    • +
+ +## FEATURE SET + + +### Client Modification Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|BasePath|✗|ToolingExtension +|Authorizations|✗|ToolingExtension +|UserAgent|✗|ToolingExtension +|MockServer|✗|ToolingExtension + +### Data Type Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|Custom|✗|OAS2,OAS3 +|Int32|✓|OAS2,OAS3 +|Int64|✓|OAS2,OAS3 +|Float|✓|OAS2,OAS3 +|Double|✓|OAS2,OAS3 +|Decimal|✓|ToolingExtension +|String|✓|OAS2,OAS3 +|Byte|✓|OAS2,OAS3 +|Binary|✓|OAS2,OAS3 +|Boolean|✓|OAS2,OAS3 +|Date|✓|OAS2,OAS3 +|DateTime|✓|OAS2,OAS3 +|Password|✓|OAS2,OAS3 +|File|✓|OAS2 +|Uuid|✗| +|Array|✓|OAS2,OAS3 +|Null|✗|OAS3 +|AnyType|✗|OAS2,OAS3 +|Object|✓|OAS2,OAS3 +|Maps|✓|ToolingExtension +|CollectionFormat|✓|OAS2 +|CollectionFormatMulti|✓|OAS2 +|Enum|✓|OAS2,OAS3 +|ArrayOfEnum|✓|ToolingExtension +|ArrayOfModel|✓|ToolingExtension +|ArrayOfCollectionOfPrimitives|✓|ToolingExtension +|ArrayOfCollectionOfModel|✓|ToolingExtension +|ArrayOfCollectionOfEnum|✓|ToolingExtension +|MapOfEnum|✓|ToolingExtension +|MapOfModel|✓|ToolingExtension +|MapOfCollectionOfPrimitives|✓|ToolingExtension +|MapOfCollectionOfModel|✓|ToolingExtension +|MapOfCollectionOfEnum|✓|ToolingExtension + +### Documentation Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|Readme|✓|ToolingExtension +|Model|✓|ToolingExtension +|Api|✓|ToolingExtension + +### Global Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|Host|✓|OAS2,OAS3 +|BasePath|✓|OAS2,OAS3 +|Info|✓|OAS2,OAS3 +|Schemes|✗|OAS2,OAS3 +|PartialSchemes|✓|OAS2,OAS3 +|Consumes|✓|OAS2 +|Produces|✓|OAS2 +|ExternalDocumentation|✓|OAS2,OAS3 +|Examples|✓|OAS2,OAS3 +|XMLStructureDefinitions|✗|OAS2,OAS3 +|MultiServer|✗|OAS3 +|ParameterizedServer|✗|OAS3 +|ParameterStyling|✗|OAS3 +|Callbacks|✗|OAS3 +|LinkObjects|✗|OAS3 + +### Parameter Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|Path|✓|OAS2,OAS3 +|Query|✓|OAS2,OAS3 +|Header|✓|OAS2,OAS3 +|Body|✓|OAS2 +|FormUnencoded|✓|OAS2 +|FormMultipart|✓|OAS2 +|Cookie|✓|OAS3 + +### Schema Support Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|Simple|✓|OAS2,OAS3 +|Composite|✓|OAS2,OAS3 +|Polymorphism|✗|OAS2,OAS3 +|Union|✗|OAS3 +|allOf|✗|OAS2,OAS3 +|anyOf|✗|OAS3 +|oneOf|✗|OAS3 +|not|✗|OAS3 + +### Security Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|BasicAuth|✗|OAS2,OAS3 +|ApiKey|✗|OAS2,OAS3 +|OpenIDConnect|✗|OAS3 +|BearerToken|✗|OAS3 +|OAuth2_Implicit|✗|OAS2,OAS3 +|OAuth2_Password|✗|OAS2,OAS3 +|OAuth2_ClientCredentials|✗|OAS2,OAS3 +|OAuth2_AuthorizationCode|✗|OAS2,OAS3 +|SignatureAuth|✗|OAS3 +|AWSV4Signature|✗|ToolingExtension + +### Wire Format Feature +| Name | Supported | Defined By | +| ---- | --------- | ---------- | +|JSON|✗|OAS2,OAS3 +|XML|✗|OAS2,OAS3 +|PROTOBUF|✓|ToolingExtension +|Custom|✗|OAS2,OAS3 diff --git a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES index 9063ccb4ff0f..6f07b4ceb390 100644 --- a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES @@ -26,6 +26,3 @@ src/main/kotlin/org/openapitools/server/api/model/Order.kt src/main/kotlin/org/openapitools/server/api/model/Pet.kt src/main/kotlin/org/openapitools/server/api/model/Tag.kt src/main/kotlin/org/openapitools/server/api/model/User.kt -src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt -src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt -src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Category.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Category.kt index 02d3890cc4c3..c644ae4fa871 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Category.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Category.kt @@ -2,6 +2,6 @@ package org.openapitools.server.api.model data class Category( - val id: kotlin.Long?, - val name: kotlin.String? + val id: kotlin.Long? = null, + val name: kotlin.String? = null ) diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/ModelApiResponse.kt index 4596d740ed83..ea896053fddd 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/ModelApiResponse.kt @@ -2,7 +2,7 @@ package org.openapitools.server.api.model data class ModelApiResponse( - val code: kotlin.Int?, - val type: kotlin.String?, - val message: kotlin.String? + val code: kotlin.Int? = null, + val type: kotlin.String? = null, + val message: kotlin.String? = null ) diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Order.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Order.kt index af8e70e33976..5291b0fee3ab 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Order.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Order.kt @@ -2,11 +2,11 @@ package org.openapitools.server.api.model data class Order( - val id: kotlin.Long?, - val petId: kotlin.Long?, - val quantity: kotlin.Int?, - val shipDate: java.time.OffsetDateTime?, + val id: kotlin.Long? = null, + val petId: kotlin.Long? = null, + val quantity: kotlin.Int? = null, + val shipDate: java.time.OffsetDateTime? = null, /** Order Status */ - val status: kotlin.String?, + val status: kotlin.String? = null, val complete: kotlin.Boolean? = false ) diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Pet.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Pet.kt index d7192ff9b63d..f5595bd1607e 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Pet.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Pet.kt @@ -6,9 +6,9 @@ import org.openapitools.server.api.model.Tag data class Pet( val name: kotlin.String, val photoUrls: kotlin.Array, - val id: kotlin.Long?, - val category: Category?, - val tags: kotlin.Array?, + val id: kotlin.Long? = null, + val category: Category? = null, + val tags: kotlin.Array? = null, /** pet status in the store */ - val status: kotlin.String? + val status: kotlin.String? = null ) diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Tag.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Tag.kt index 8f2f002c41b9..4cccf63c02c1 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Tag.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Tag.kt @@ -2,6 +2,6 @@ package org.openapitools.server.api.model data class Tag( - val id: kotlin.Long?, - val name: kotlin.String? + val id: kotlin.Long? = null, + val name: kotlin.String? = null ) diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/User.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/User.kt index eb0aa188589d..9ae43d194a0a 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/User.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/User.kt @@ -2,13 +2,13 @@ package org.openapitools.server.api.model data class User( - val id: kotlin.Long?, - val username: kotlin.String?, - val firstName: kotlin.String?, - val lastName: kotlin.String?, - val email: kotlin.String?, - val password: kotlin.String?, - val phone: kotlin.String?, + val id: kotlin.Long? = null, + val username: kotlin.String? = null, + val firstName: kotlin.String? = null, + val lastName: kotlin.String? = null, + val email: kotlin.String? = null, + val password: kotlin.String? = null, + val phone: kotlin.String? = null, /** User Status */ - val userStatus: kotlin.Int? + val userStatus: kotlin.Int? = null ) diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/PetApi.kt index 9a637671c4f3..0718f0cc0da0 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -58,7 +58,7 @@ interface PetApi { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -68,7 +68,7 @@ interface PetApi { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } diff --git a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/UserApi.kt index 83cdb8e8fb21..444dec066334 100644 --- a/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-spring-cloud/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -86,7 +86,7 @@ interface UserApi { value = ["/user/login"], produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + fun loginUser( @RequestParam(value = "username", required = true) username: kotlin.String, @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/PetApiController.kt index fc44c9d500ab..bdb751825a91 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -83,7 +83,7 @@ class PetApiController() { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -101,7 +101,7 @@ class PetApiController() { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } diff --git a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/UserApiController.kt index 6577de75e45f..16d71e61198e 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-spring-default/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -132,7 +132,7 @@ class UserApiController() { value = ["/user/login"], produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + fun loginUser( @RequestParam(value = "username", required = true) username: kotlin.String, @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/PetApiController.kt index 41c0da8045e0..fb31d51b29d1 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -54,7 +54,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) } @@ -64,7 +64,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) } diff --git a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/UserApiController.kt index ce2c67c60423..e17ce507943d 100644 --- a/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-3/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -82,7 +82,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/login"], produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + fun loginUser( @RequestParam(value = "username", required = true) username: kotlin.String, @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) } diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/PetApi.kt index 737cdc1cad7d..40731213d3aa 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -96,7 +96,7 @@ interface PetApi { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { return getDelegate().findPetsByStatus(status) } @@ -116,7 +116,7 @@ interface PetApi { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { return getDelegate().findPetsByTags(tags) } diff --git a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/UserApi.kt index eed7370f2fea..c207cd69f32c 100644 --- a/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate-nodefaults/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -151,7 +151,7 @@ interface UserApi { value = ["/user/login"], produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + fun loginUser( @RequestParam(value = "username", required = true) username: kotlin.String, @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { return getDelegate().loginUser(username, password) } diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt index 6992ef95f2a5..70ad3df0b79c 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -95,7 +95,7 @@ interface PetApi { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { return getDelegate().findPetsByStatus(status) } @@ -115,7 +115,7 @@ interface PetApi { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { return getDelegate().findPetsByTags(tags) } diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt index 0dd3f8374ce8..0edac19befe7 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -150,7 +150,7 @@ interface UserApi { value = ["/user/login"], produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + fun loginUser( @RequestParam(value = "username", required = true) username: kotlin.String, @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { return getDelegate().loginUser(username, password) } diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt index ad45a6ad8be2..15226a9f3e99 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -81,7 +81,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) } @@ -99,7 +99,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) } diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt index 08160bfaf0fc..122134a7ce99 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -125,7 +125,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/login"], produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + fun loginUser( @RequestParam(value = "username", required = true) username: kotlin.String, @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) } diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/PetApiController.kt index 1394293cc69a..8f86435a2b42 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -84,7 +84,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - suspend fun findPetsByStatus(@NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + suspend fun findPetsByStatus( @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) } @@ -102,7 +102,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - suspend fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + suspend fun findPetsByTags( @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) } diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/UserApiController.kt index 8884b2a1a70f..7cca92230af0 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -133,7 +133,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/login"], produces = ["application/xml", "application/json"] ) - suspend fun loginUser(@NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + suspend fun loginUser( @RequestParam(value = "username", required = true) username: kotlin.String, @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) } diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt index a2263f9ac22c..bbaa944d0515 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -84,7 +84,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) } @@ -102,7 +102,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) } diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt index 8884b2a1a70f..7cca92230af0 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -133,7 +133,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/login"], produces = ["application/xml", "application/json"] ) - suspend fun loginUser(@NotNull @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + suspend fun loginUser( @RequestParam(value = "username", required = true) username: kotlin.String, @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/PetApi.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/PetApi.kt index a234cc63049a..e0e67a306cf5 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/PetApi.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/PetApi.kt @@ -93,7 +93,7 @@ interface PetApi { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } @@ -113,7 +113,7 @@ interface PetApi { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } diff --git a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/UserApi.kt b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/UserApi.kt index fe248e402dcc..52026ddc2d23 100644 --- a/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/UserApi.kt +++ b/samples/server/petstore/kotlin-springboot-request-cookie/src/main/kotlin/org/openapitools/api/UserApi.kt @@ -144,7 +144,7 @@ interface UserApi { value = ["/user/login"], produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + fun loginUser( @RequestParam(value = "username", required = true) username: kotlin.String, @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { return ResponseEntity(HttpStatus.NOT_IMPLEMENTED) } diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt index c8dcb731d8ac..af06cc7ef17d 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -85,7 +85,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) } @@ -104,7 +104,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) } diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt index 5e7076f405c7..ef1713dbf1a9 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -126,7 +126,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/login"], produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + fun loginUser( @RequestParam(value = "username", required = true) username: kotlin.String, @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) } diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt index ad45a6ad8be2..15226a9f3e99 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -81,7 +81,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Parameter(description = "Status values that need to be considered for filter", required = true, schema = Schema(allowableValues = ["available", "pending", "sold"])) @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) } @@ -99,7 +99,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Parameter(description = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) } diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt index 08160bfaf0fc..122134a7ce99 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -125,7 +125,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/login"], produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @Parameter(description = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Parameter(description = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + fun loginUser( @RequestParam(value = "username", required = true) username: kotlin.String, @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) } diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt index c8dcb731d8ac..af06cc7ef17d 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -85,7 +85,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @ApiParam(value = "Status values that need to be considered for filter", required = true, allowableValues = "available, pending, sold") @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) } @@ -104,7 +104,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @ApiParam(value = "Tags to filter by", required = true) @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) } diff --git a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt index 5e7076f405c7..ef1713dbf1a9 100644 --- a/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot-springfox/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -126,7 +126,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/login"], produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @ApiParam(value = "The user name for login", required = true) @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @ApiParam(value = "The password for login in clear text", required = true) @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + fun loginUser( @RequestParam(value = "username", required = true) username: kotlin.String, @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) } diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt index ee8089e3b344..f8c7ae048a6c 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt @@ -54,7 +54,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByStatus"], produces = ["application/xml", "application/json"] ) - fun findPetsByStatus(@NotNull @Valid @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { + fun findPetsByStatus( @RequestParam(value = "status", required = true) status: kotlin.collections.List): ResponseEntity> { return ResponseEntity(service.findPetsByStatus(status), HttpStatus.valueOf(200)) } @@ -64,7 +64,7 @@ class PetApiController(@Autowired(required = true) val service: PetApiService) { value = ["/pet/findByTags"], produces = ["application/xml", "application/json"] ) - fun findPetsByTags(@NotNull @Valid @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { + fun findPetsByTags( @RequestParam(value = "tags", required = true) tags: kotlin.collections.List): ResponseEntity> { return ResponseEntity(service.findPetsByTags(tags), HttpStatus.valueOf(200)) } diff --git a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt index daf5c943c2ec..1d811c533843 100644 --- a/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt @@ -80,7 +80,7 @@ class UserApiController(@Autowired(required = true) val service: UserApiService) value = ["/user/login"], produces = ["application/xml", "application/json"] ) - fun loginUser(@NotNull @Valid @RequestParam(value = "username", required = true) username: kotlin.String,@NotNull @Valid @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { + fun loginUser( @RequestParam(value = "username", required = true) username: kotlin.String, @RequestParam(value = "password", required = true) password: kotlin.String): ResponseEntity { return ResponseEntity(service.loginUser(username, password), HttpStatus.valueOf(200)) } From 30fab8aa8ad2df1f3898caed740544e53368ab32 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Mon, 24 Mar 2025 09:52:20 +0000 Subject: [PATCH 098/102] fixing RequestHeader --- .../resources/kotlin-misk/apiController.mustache | 3 +-- .../main/resources/kotlin-misk/apiImpl.mustache | 3 +-- .../resources/kotlin-misk/apiInterface.mustache | 3 +-- .../main/resources/kotlin-misk/api_test.mustache | 3 +-- .../resources/kotlin-misk/headerParams.mustache | 2 +- .../kotlin-misk/.openapi-generator/FILES | 3 --- .../org/openapitools/server/api/api/PetApi.kt | 5 ++--- .../server/api/api/PetApiController.kt | 5 ++--- .../openapitools/server/api/api/PetApiImpl.kt | 5 ++--- .../org/openapitools/server/api/api/StoreApi.kt | 3 +-- .../server/api/api/StoreApiController.kt | 3 +-- .../openapitools/server/api/api/StoreApiImpl.kt | 3 +-- .../org/openapitools/server/api/api/UserApi.kt | 3 +-- .../server/api/api/UserApiController.kt | 3 +-- .../openapitools/server/api/api/UserApiImpl.kt | 3 +-- .../openapitools/server/api/model/Category.kt | 4 ++-- .../server/api/model/ModelApiResponse.kt | 6 +++--- .../org/openapitools/server/api/model/Order.kt | 10 +++++----- .../org/openapitools/server/api/model/Pet.kt | 8 ++++---- .../org/openapitools/server/api/model/Tag.kt | 4 ++-- .../org/openapitools/server/api/model/User.kt | 16 ++++++++-------- 21 files changed, 41 insertions(+), 57 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache index c9e366abb985..9c655f72d3a3 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiController.mustache @@ -24,12 +24,11 @@ import misk.web.Put import misk.web.QueryParam import misk.web.RequestBody import misk.web.RequestContentType -import misk.web.RequestHeaders +import misk.web.RequestHeader import misk.web.ResponseContentType import misk.web.actions.WebAction import misk.web.interceptors.LogRequestResponse import misk.web.mediatype.MediaTypes -import okhttp3.Headers {{#imports}}import {{import}} {{/imports}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache index a75f3e131eaa..da1065f22edb 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiImpl.mustache @@ -17,8 +17,7 @@ import misk.web.HttpCall import misk.web.PathParam import misk.web.QueryParam import misk.web.RequestBody -import misk.web.RequestHeaders -import okhttp3.Headers +import misk.web.RequestHeader {{#imports}}import {{import}} {{/imports}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache index f8fddc978c3c..235230e2f212 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/apiInterface.mustache @@ -15,8 +15,7 @@ import misk.web.HttpCall import misk.web.PathParam import misk.web.QueryParam import misk.web.RequestBody -import misk.web.RequestHeaders -import okhttp3.Headers +import misk.web.RequestHeader {{#imports}}import {{import}} {{/imports}} diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache index 13fcefe26a94..a54748ce0bf2 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/api_test.mustache @@ -8,11 +8,10 @@ import misk.web.HttpCall import misk.web.PathParam import misk.web.QueryParam import misk.web.RequestBody -import misk.web.RequestHeaders +import misk.web.RequestHeader {{#imports}}import {{import}} {{/imports}} -import okhttp3.Headers @MiskTest(startService = true) internal class {{classname}}Test { diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache index 7c1bb3c062b2..5ca30b045c63 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/headerParams.mustache @@ -1 +1 @@ -{{#isHeaderParam}}{{#useBeanValidation}}{{>beanValidationCore}}{{/useBeanValidation}}{{{paramName}}}: Headers{{/isHeaderParam}} \ No newline at end of file +{{#isHeaderParam}}{{#useBeanValidation}}{{>beanValidationCore}}{{/useBeanValidation}}@RequestHeader(value = "{{baseName}}") {{{paramName}}}: {{>optionalDataType}}{{/isHeaderParam}} \ No newline at end of file diff --git a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES index 9063ccb4ff0f..6f07b4ceb390 100644 --- a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES @@ -26,6 +26,3 @@ src/main/kotlin/org/openapitools/server/api/model/Order.kt src/main/kotlin/org/openapitools/server/api/model/Pet.kt src/main/kotlin/org/openapitools/server/api/model/Tag.kt src/main/kotlin/org/openapitools/server/api/model/User.kt -src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt -src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt -src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt index aa040a3d441f..788c07bf1c54 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApi.kt @@ -13,8 +13,7 @@ import misk.web.HttpCall import misk.web.PathParam import misk.web.QueryParam import misk.web.RequestBody -import misk.web.RequestHeaders -import okhttp3.Headers +import misk.web.RequestHeader import org.openapitools.server.api.model.ModelApiResponse import org.openapitools.server.api.model.Pet @@ -22,7 +21,7 @@ interface PetApi { fun addPet(@Valid @RequestBody pet: Pet): Pet - fun deletePet(@PathParam("petId") petId: kotlin.Long, apiKey: Headers) + fun deletePet(@PathParam("petId") petId: kotlin.Long, @RequestHeader(value = "api_key") apiKey: kotlin.String?) fun findPetsByStatus( @QueryParam(value = "status") status: kotlin.Array): kotlin.Array diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt index ec3c342b0c87..2f302f2410db 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiController.kt @@ -22,12 +22,11 @@ import misk.web.Put import misk.web.QueryParam import misk.web.RequestBody import misk.web.RequestContentType -import misk.web.RequestHeaders +import misk.web.RequestHeader import misk.web.ResponseContentType import misk.web.actions.WebAction import misk.web.interceptors.LogRequestResponse import misk.web.mediatype.MediaTypes -import okhttp3.Headers import org.openapitools.server.api.model.ModelApiResponse import org.openapitools.server.api.model.Pet @@ -51,7 +50,7 @@ class PetApiController @Inject constructor( @Delete("/pet/{petId}") @Description("Deletes a pet") @LogRequestResponse(bodySampling = 1.0, errorBodySampling = 1.0) - override fun deletePet(@PathParam("petId") petId: kotlin.Long, apiKey: Headers) { + override fun deletePet(@PathParam("petId") petId: kotlin.Long, @RequestHeader(value = "api_key") apiKey: kotlin.String?) { TODO() } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt index 19221ff736cc..28f351fad098 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/PetApiImpl.kt @@ -15,8 +15,7 @@ import misk.web.HttpCall import misk.web.PathParam import misk.web.QueryParam import misk.web.RequestBody -import misk.web.RequestHeaders -import okhttp3.Headers +import misk.web.RequestHeader import org.openapitools.server.api.model.ModelApiResponse import org.openapitools.server.api.model.Pet @@ -31,7 +30,7 @@ class PetApiImpl @Inject constructor( TODO() } - override fun deletePet(@PathParam("petId") petId: kotlin.Long, apiKey: Headers) { + override fun deletePet(@PathParam("petId") petId: kotlin.Long, @RequestHeader(value = "api_key") apiKey: kotlin.String?) { TODO() } diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt index 0617f6e75f22..178f1c9cdff8 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApi.kt @@ -13,8 +13,7 @@ import misk.web.HttpCall import misk.web.PathParam import misk.web.QueryParam import misk.web.RequestBody -import misk.web.RequestHeaders -import okhttp3.Headers +import misk.web.RequestHeader import org.openapitools.server.api.model.Order interface StoreApi { diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt index 156a079446a0..9d206cf5ae14 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiController.kt @@ -22,12 +22,11 @@ import misk.web.Put import misk.web.QueryParam import misk.web.RequestBody import misk.web.RequestContentType -import misk.web.RequestHeaders +import misk.web.RequestHeader import misk.web.ResponseContentType import misk.web.actions.WebAction import misk.web.interceptors.LogRequestResponse import misk.web.mediatype.MediaTypes -import okhttp3.Headers import org.openapitools.server.api.model.Order /** diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt index 3a527371b0d0..e44f8bfb7ed6 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/StoreApiImpl.kt @@ -15,8 +15,7 @@ import misk.web.HttpCall import misk.web.PathParam import misk.web.QueryParam import misk.web.RequestBody -import misk.web.RequestHeaders -import okhttp3.Headers +import misk.web.RequestHeader import org.openapitools.server.api.model.Order /** diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt index ecced905dcae..a0e71973d2bd 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApi.kt @@ -13,8 +13,7 @@ import misk.web.HttpCall import misk.web.PathParam import misk.web.QueryParam import misk.web.RequestBody -import misk.web.RequestHeaders -import okhttp3.Headers +import misk.web.RequestHeader import org.openapitools.server.api.model.User interface UserApi { diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt index 2301c3ae1550..423d6f7bebd8 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiController.kt @@ -22,12 +22,11 @@ import misk.web.Put import misk.web.QueryParam import misk.web.RequestBody import misk.web.RequestContentType -import misk.web.RequestHeaders +import misk.web.RequestHeader import misk.web.ResponseContentType import misk.web.actions.WebAction import misk.web.interceptors.LogRequestResponse import misk.web.mediatype.MediaTypes -import okhttp3.Headers import org.openapitools.server.api.model.User /** diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt index c52d27105fa2..3c0843372ca2 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/api/UserApiImpl.kt @@ -15,8 +15,7 @@ import misk.web.HttpCall import misk.web.PathParam import misk.web.QueryParam import misk.web.RequestBody -import misk.web.RequestHeaders -import okhttp3.Headers +import misk.web.RequestHeader import org.openapitools.server.api.model.User /** diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Category.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Category.kt index 02d3890cc4c3..c644ae4fa871 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Category.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Category.kt @@ -2,6 +2,6 @@ package org.openapitools.server.api.model data class Category( - val id: kotlin.Long?, - val name: kotlin.String? + val id: kotlin.Long? = null, + val name: kotlin.String? = null ) diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/ModelApiResponse.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/ModelApiResponse.kt index 4596d740ed83..ea896053fddd 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/ModelApiResponse.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/ModelApiResponse.kt @@ -2,7 +2,7 @@ package org.openapitools.server.api.model data class ModelApiResponse( - val code: kotlin.Int?, - val type: kotlin.String?, - val message: kotlin.String? + val code: kotlin.Int? = null, + val type: kotlin.String? = null, + val message: kotlin.String? = null ) diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Order.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Order.kt index af8e70e33976..5291b0fee3ab 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Order.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Order.kt @@ -2,11 +2,11 @@ package org.openapitools.server.api.model data class Order( - val id: kotlin.Long?, - val petId: kotlin.Long?, - val quantity: kotlin.Int?, - val shipDate: java.time.OffsetDateTime?, + val id: kotlin.Long? = null, + val petId: kotlin.Long? = null, + val quantity: kotlin.Int? = null, + val shipDate: java.time.OffsetDateTime? = null, /** Order Status */ - val status: kotlin.String?, + val status: kotlin.String? = null, val complete: kotlin.Boolean? = false ) diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Pet.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Pet.kt index d7192ff9b63d..f5595bd1607e 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Pet.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Pet.kt @@ -6,9 +6,9 @@ import org.openapitools.server.api.model.Tag data class Pet( val name: kotlin.String, val photoUrls: kotlin.Array, - val id: kotlin.Long?, - val category: Category?, - val tags: kotlin.Array?, + val id: kotlin.Long? = null, + val category: Category? = null, + val tags: kotlin.Array? = null, /** pet status in the store */ - val status: kotlin.String? + val status: kotlin.String? = null ) diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Tag.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Tag.kt index 8f2f002c41b9..4cccf63c02c1 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Tag.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/Tag.kt @@ -2,6 +2,6 @@ package org.openapitools.server.api.model data class Tag( - val id: kotlin.Long?, - val name: kotlin.String? + val id: kotlin.Long? = null, + val name: kotlin.String? = null ) diff --git a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/User.kt b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/User.kt index eb0aa188589d..9ae43d194a0a 100644 --- a/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/User.kt +++ b/samples/server/petstore/kotlin-misk/src/main/kotlin/org/openapitools/server/api/model/User.kt @@ -2,13 +2,13 @@ package org.openapitools.server.api.model data class User( - val id: kotlin.Long?, - val username: kotlin.String?, - val firstName: kotlin.String?, - val lastName: kotlin.String?, - val email: kotlin.String?, - val password: kotlin.String?, - val phone: kotlin.String?, + val id: kotlin.Long? = null, + val username: kotlin.String? = null, + val firstName: kotlin.String? = null, + val lastName: kotlin.String? = null, + val email: kotlin.String? = null, + val password: kotlin.String? = null, + val phone: kotlin.String? = null, /** User Status */ - val userStatus: kotlin.Int? + val userStatus: kotlin.Int? = null ) From 609f2bae4e0a9dbd210e023a9894eb52482777ae Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Mon, 24 Mar 2025 09:53:14 +0000 Subject: [PATCH 099/102] fixing RequestHeader 2 --- .../kotlin-misk/.openapi-generator/FILES | 3 + .../openapitools/server/api/api/PetApiTest.kt | 99 ------------------- .../server/api/api/StoreApiTest.kt | 56 ----------- .../server/api/api/UserApiTest.kt | 94 ------------------ 4 files changed, 3 insertions(+), 249 deletions(-) delete mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt delete mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt delete mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt diff --git a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES index 6f07b4ceb390..9063ccb4ff0f 100644 --- a/samples/server/petstore/kotlin-misk/.openapi-generator/FILES +++ b/samples/server/petstore/kotlin-misk/.openapi-generator/FILES @@ -26,3 +26,6 @@ src/main/kotlin/org/openapitools/server/api/model/Order.kt src/main/kotlin/org/openapitools/server/api/model/Pet.kt src/main/kotlin/org/openapitools/server/api/model/Tag.kt src/main/kotlin/org/openapitools/server/api/model/User.kt +src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt +src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt +src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt deleted file mode 100644 index d51e7e9550cd..000000000000 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt +++ /dev/null @@ -1,99 +0,0 @@ -package org.openapitools.server.api.api - -import jakarta.inject.Inject -import misk.testing.MiskTest -import org.junit.jupiter.api.Test - -import misk.web.HttpCall -import misk.web.PathParam -import misk.web.QueryParam -import misk.web.RequestBody -import misk.web.RequestHeaders - -import org.openapitools.server.api.model.ModelApiResponse -import org.openapitools.server.api.model.Pet -import okhttp3.Headers - -@MiskTest(startService = true) -internal class PetApiTest { - - @Inject private lateinit var petApi: PetApi - - /** - * To test PetApiController.addPet - */ - @Test - fun `should handle addPet`() { - val pet = TODO() - val response: Pet = petApi.addPet(pet) - } - - /** - * To test PetApiController.deletePet - */ - @Test - fun `should handle deletePet`() { - val petId = TODO() - val apiKey = TODO() - val response = petApi.deletePet(petId, apiKey) - } - - /** - * To test PetApiController.findPetsByStatus - */ - @Test - fun `should handle findPetsByStatus`() { - val status = TODO() - val response: kotlin.Array = petApi.findPetsByStatus(status) - } - - /** - * To test PetApiController.findPetsByTags - */ - @Test - fun `should handle findPetsByTags`() { - val tags = TODO() - val response: kotlin.Array = petApi.findPetsByTags(tags) - } - - /** - * To test PetApiController.getPetById - */ - @Test - fun `should handle getPetById`() { - val petId = TODO() - val response: Pet = petApi.getPetById(petId) - } - - /** - * To test PetApiController.updatePet - */ - @Test - fun `should handle updatePet`() { - val pet = TODO() - val response: Pet = petApi.updatePet(pet) - } - - /** - * To test PetApiController.updatePetWithForm - */ - @Test - fun `should handle updatePetWithForm`() { - val petId = TODO() - val name = TODO() - val status = TODO() - val response = petApi.updatePetWithForm(petId, name, status) - } - - /** - * To test PetApiController.uploadFile - */ - @Test - fun `should handle uploadFile`() { - val petId = TODO() - val additionalMetadata = TODO() - val file = TODO() - val response: ModelApiResponse = petApi.uploadFile(petId, additionalMetadata, file) - } - -} diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt deleted file mode 100644 index 01b451fba3ed..000000000000 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt +++ /dev/null @@ -1,56 +0,0 @@ -package org.openapitools.server.api.api - -import jakarta.inject.Inject -import misk.testing.MiskTest -import org.junit.jupiter.api.Test - -import misk.web.HttpCall -import misk.web.PathParam -import misk.web.QueryParam -import misk.web.RequestBody -import misk.web.RequestHeaders - -import org.openapitools.server.api.model.Order -import okhttp3.Headers - -@MiskTest(startService = true) -internal class StoreApiTest { - - @Inject private lateinit var storeApi: StoreApi - - /** - * To test StoreApiController.deleteOrder - */ - @Test - fun `should handle deleteOrder`() { - val orderId = TODO() - val response = storeApi.deleteOrder(orderId) - } - - /** - * To test StoreApiController.getInventory - */ - @Test - fun `should handle getInventory`() { - val response: kotlin.collections.Map = storeApi.getInventory() - } - - /** - * To test StoreApiController.getOrderById - */ - @Test - fun `should handle getOrderById`() { - val orderId = TODO() - val response: Order = storeApi.getOrderById(orderId) - } - - /** - * To test StoreApiController.placeOrder - */ - @Test - fun `should handle placeOrder`() { - val order = TODO() - val response: Order = storeApi.placeOrder(order) - } - -} diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt deleted file mode 100644 index 6a833403f988..000000000000 --- a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt +++ /dev/null @@ -1,94 +0,0 @@ -package org.openapitools.server.api.api - -import jakarta.inject.Inject -import misk.testing.MiskTest -import org.junit.jupiter.api.Test - -import misk.web.HttpCall -import misk.web.PathParam -import misk.web.QueryParam -import misk.web.RequestBody -import misk.web.RequestHeaders - -import org.openapitools.server.api.model.User -import okhttp3.Headers - -@MiskTest(startService = true) -internal class UserApiTest { - - @Inject private lateinit var userApi: UserApi - - /** - * To test UserApiController.createUser - */ - @Test - fun `should handle createUser`() { - val user = TODO() - val response = userApi.createUser(user) - } - - /** - * To test UserApiController.createUsersWithArrayInput - */ - @Test - fun `should handle createUsersWithArrayInput`() { - val user = TODO() - val response = userApi.createUsersWithArrayInput(user) - } - - /** - * To test UserApiController.createUsersWithListInput - */ - @Test - fun `should handle createUsersWithListInput`() { - val user = TODO() - val response = userApi.createUsersWithListInput(user) - } - - /** - * To test UserApiController.deleteUser - */ - @Test - fun `should handle deleteUser`() { - val username = TODO() - val response = userApi.deleteUser(username) - } - - /** - * To test UserApiController.getUserByName - */ - @Test - fun `should handle getUserByName`() { - val username = TODO() - val response: User = userApi.getUserByName(username) - } - - /** - * To test UserApiController.loginUser - */ - @Test - fun `should handle loginUser`() { - val username = TODO() - val password = TODO() - val response: kotlin.String = userApi.loginUser(username, password) - } - - /** - * To test UserApiController.logoutUser - */ - @Test - fun `should handle logoutUser`() { - val response = userApi.logoutUser() - } - - /** - * To test UserApiController.updateUser - */ - @Test - fun `should handle updateUser`() { - val username = TODO() - val user = TODO() - val response = userApi.updateUser(username, user) - } - -} From 6dec9522aa15384c1169f2f05c1be62d920bc62a Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Mon, 24 Mar 2025 09:54:41 +0000 Subject: [PATCH 100/102] fixing RequestHeader 2 --- .../openapitools/server/api/api/PetApiTest.kt | 98 +++++++++++++++++++ .../server/api/api/StoreApiTest.kt | 55 +++++++++++ .../server/api/api/UserApiTest.kt | 93 ++++++++++++++++++ 3 files changed, 246 insertions(+) create mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt create mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt create mode 100644 samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt new file mode 100644 index 000000000000..7df329bf7f66 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/PetApiTest.kt @@ -0,0 +1,98 @@ +package org.openapitools.server.api.api + +import jakarta.inject.Inject +import misk.testing.MiskTest +import org.junit.jupiter.api.Test + +import misk.web.HttpCall +import misk.web.PathParam +import misk.web.QueryParam +import misk.web.RequestBody +import misk.web.RequestHeader + +import org.openapitools.server.api.model.ModelApiResponse +import org.openapitools.server.api.model.Pet + +@MiskTest(startService = true) +internal class PetApiTest { + + @Inject private lateinit var petApi: PetApi + + /** + * To test PetApiController.addPet + */ + @Test + fun `should handle addPet`() { + val pet = TODO() + val response: Pet = petApi.addPet(pet) + } + + /** + * To test PetApiController.deletePet + */ + @Test + fun `should handle deletePet`() { + val petId = TODO() + val apiKey = TODO() + val response = petApi.deletePet(petId, apiKey) + } + + /** + * To test PetApiController.findPetsByStatus + */ + @Test + fun `should handle findPetsByStatus`() { + val status = TODO() + val response: kotlin.Array = petApi.findPetsByStatus(status) + } + + /** + * To test PetApiController.findPetsByTags + */ + @Test + fun `should handle findPetsByTags`() { + val tags = TODO() + val response: kotlin.Array = petApi.findPetsByTags(tags) + } + + /** + * To test PetApiController.getPetById + */ + @Test + fun `should handle getPetById`() { + val petId = TODO() + val response: Pet = petApi.getPetById(petId) + } + + /** + * To test PetApiController.updatePet + */ + @Test + fun `should handle updatePet`() { + val pet = TODO() + val response: Pet = petApi.updatePet(pet) + } + + /** + * To test PetApiController.updatePetWithForm + */ + @Test + fun `should handle updatePetWithForm`() { + val petId = TODO() + val name = TODO() + val status = TODO() + val response = petApi.updatePetWithForm(petId, name, status) + } + + /** + * To test PetApiController.uploadFile + */ + @Test + fun `should handle uploadFile`() { + val petId = TODO() + val additionalMetadata = TODO() + val file = TODO() + val response: ModelApiResponse = petApi.uploadFile(petId, additionalMetadata, file) + } + +} diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt new file mode 100644 index 000000000000..bc831cf9a2fd --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/StoreApiTest.kt @@ -0,0 +1,55 @@ +package org.openapitools.server.api.api + +import jakarta.inject.Inject +import misk.testing.MiskTest +import org.junit.jupiter.api.Test + +import misk.web.HttpCall +import misk.web.PathParam +import misk.web.QueryParam +import misk.web.RequestBody +import misk.web.RequestHeader + +import org.openapitools.server.api.model.Order + +@MiskTest(startService = true) +internal class StoreApiTest { + + @Inject private lateinit var storeApi: StoreApi + + /** + * To test StoreApiController.deleteOrder + */ + @Test + fun `should handle deleteOrder`() { + val orderId = TODO() + val response = storeApi.deleteOrder(orderId) + } + + /** + * To test StoreApiController.getInventory + */ + @Test + fun `should handle getInventory`() { + val response: kotlin.collections.Map = storeApi.getInventory() + } + + /** + * To test StoreApiController.getOrderById + */ + @Test + fun `should handle getOrderById`() { + val orderId = TODO() + val response: Order = storeApi.getOrderById(orderId) + } + + /** + * To test StoreApiController.placeOrder + */ + @Test + fun `should handle placeOrder`() { + val order = TODO() + val response: Order = storeApi.placeOrder(order) + } + +} diff --git a/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt new file mode 100644 index 000000000000..d3b5efc46c29 --- /dev/null +++ b/samples/server/petstore/kotlin-misk/src/test/kotlin/org/openapitools/server/api/api/UserApiTest.kt @@ -0,0 +1,93 @@ +package org.openapitools.server.api.api + +import jakarta.inject.Inject +import misk.testing.MiskTest +import org.junit.jupiter.api.Test + +import misk.web.HttpCall +import misk.web.PathParam +import misk.web.QueryParam +import misk.web.RequestBody +import misk.web.RequestHeader + +import org.openapitools.server.api.model.User + +@MiskTest(startService = true) +internal class UserApiTest { + + @Inject private lateinit var userApi: UserApi + + /** + * To test UserApiController.createUser + */ + @Test + fun `should handle createUser`() { + val user = TODO() + val response = userApi.createUser(user) + } + + /** + * To test UserApiController.createUsersWithArrayInput + */ + @Test + fun `should handle createUsersWithArrayInput`() { + val user = TODO() + val response = userApi.createUsersWithArrayInput(user) + } + + /** + * To test UserApiController.createUsersWithListInput + */ + @Test + fun `should handle createUsersWithListInput`() { + val user = TODO() + val response = userApi.createUsersWithListInput(user) + } + + /** + * To test UserApiController.deleteUser + */ + @Test + fun `should handle deleteUser`() { + val username = TODO() + val response = userApi.deleteUser(username) + } + + /** + * To test UserApiController.getUserByName + */ + @Test + fun `should handle getUserByName`() { + val username = TODO() + val response: User = userApi.getUserByName(username) + } + + /** + * To test UserApiController.loginUser + */ + @Test + fun `should handle loginUser`() { + val username = TODO() + val password = TODO() + val response: kotlin.String = userApi.loginUser(username, password) + } + + /** + * To test UserApiController.logoutUser + */ + @Test + fun `should handle logoutUser`() { + val response = userApi.logoutUser() + } + + /** + * To test UserApiController.updateUser + */ + @Test + fun `should handle updateUser`() { + val username = TODO() + val user = TODO() + val response = userApi.updateUser(username, user) + } + +} From 18d0ac0e523d502a63979b1c701f14bde50550d4 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Mon, 24 Mar 2025 10:04:46 +0000 Subject: [PATCH 101/102] add validateSpec=false --- bin/configs/kotlin-misk.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/configs/kotlin-misk.yaml b/bin/configs/kotlin-misk.yaml index 5593aad0b7a7..b13c962bb3fb 100644 --- a/bin/configs/kotlin-misk.yaml +++ b/bin/configs/kotlin-misk.yaml @@ -2,6 +2,7 @@ generatorName: kotlin-misk outputDir: samples/server/petstore/kotlin-misk inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/kotlin-misk +validateSpec: false additionalProperties: hideGenerationTimestamp: "true" moduleClassName: "PetStoreModule" \ No newline at end of file From 413db651936317236b7c02ad2fe989b8e35b7100 Mon Sep 17 00:00:00 2001 From: andrewwilsonnew Date: Mon, 24 Mar 2025 10:14:44 +0000 Subject: [PATCH 102/102] fix pom version --- .../src/main/resources/kotlin-misk/build.gradle.kts.mustache | 2 +- samples/server/petstore/kotlin-misk/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache b/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache index 03ac6b0b2c67..0f5d4e865624 100644 --- a/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache +++ b/modules/openapi-generator/src/main/resources/kotlin-misk/build.gradle.kts.mustache @@ -9,7 +9,7 @@ version = "{{artifactVersion}}" dependencies { implementation("jakarta.validation:jakarta.validation-api:3.1.1") - implementation("com.squareup.misk:misk:2025.02.11.123913-8a41324") + implementation("com.squareup.misk:misk:2025.03.17.160337-2c6953c") //implementation("com.squareup.wire:wire-runtime:5.2.1") testImplementation("com.squareup.misk:misk-testing:2025.02.11.123913-8a41324") diff --git a/samples/server/petstore/kotlin-misk/build.gradle.kts b/samples/server/petstore/kotlin-misk/build.gradle.kts index d75e21111536..e831fc00dc94 100644 --- a/samples/server/petstore/kotlin-misk/build.gradle.kts +++ b/samples/server/petstore/kotlin-misk/build.gradle.kts @@ -9,7 +9,7 @@ version = "1.0.0-SNAPSHOT" dependencies { implementation("jakarta.validation:jakarta.validation-api:3.1.1") - implementation("com.squareup.misk:misk:2025.02.11.123913-8a41324") + implementation("com.squareup.misk:misk:2025.03.17.160337-2c6953c") //implementation("com.squareup.wire:wire-runtime:5.2.1") testImplementation("com.squareup.misk:misk-testing:2025.02.11.123913-8a41324")