Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • O openapi-generator
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 3,476
    • Issues 3,476
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 402
    • Merge requests 402
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • OpenAPI Tools
  • openapi-generator
  • Merge requests
  • !14899
An error occurred while fetching the assigned milestone of the selected merge_request.

[Kotlin-Spring] Remove wildcard imports from mustache templates [#14652]

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Administrator requested to merge github/fork/volsusdev/BUG#14652 into master 2 years ago
  • Overview 3
  • Commits 2
  • Pipelines 0
  • Changes 75

Created by: volsusdev

This PR will remove wildcard imports introduced with 6.3.0 release. @jimschubert, @dr4ke616, @karismann, @Zomzog, @andrewemery, @4brunu, @yutaka0m, can one of you please have a look? See #14369 for more details.

PR checklist

  • [/] Read the contribution guidelines.
  • [/] Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
  • [/] Run the following to build the project and update samples:
    ./mvnw clean package 
    ./bin/generate-samples.sh
    ./bin/utils/export_docs_generators.sh
    Commit all changed files. This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*. For Windows users, please run the script in Git BASH.
  • [/] In case you are adding a new generator, run the following additional script :
    ./bin/utils/ensure-up-to-date.sh
    Commit all changed files.
  • [/] File the PR against the correct branch: master (6.3.0) (minor release - breaking changes with fallbacks), 7.0.x (breaking changes without fallbacks)
  • [/] If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.
Compare
  • master (base)

and
  • latest version
    144f8bc8
    2 commits, 2 years ago

75 files
+ 600
- 75

    Preferences

    File browser
    Compare changes
modules/…/…/…/‎…/kotlin-spring‎
api.mu‎stache‎ +8 -1
apiInterfa‎ce.mustache‎ +8 -1
model.m‎ustache‎ +8 -1
samples/ser‎ver/petstore‎
kotlin-springb‎oot-3/…/…/…/…/…‎
a‎pi‎
PetApiCon‎troller.kt‎ +8 -1
StoreApiCo‎ntroller.kt‎ +8 -1
UserApiCon‎troller.kt‎ +8 -1
mo‎del‎
Categ‎ory.kt‎ +8 -1
ModelApiR‎esponse.kt‎ +8 -1
Orde‎r.kt‎ +8 -1
Pet‎.kt‎ +8 -1
Tag‎.kt‎ +8 -1
Use‎r.kt‎ +8 -1
kotlin-springboot-‎delegate/…/…/…/…/…‎
a‎pi‎
PetA‎pi.kt‎ +8 -1
Store‎Api.kt‎ +8 -1
UserA‎pi.kt‎ +8 -1
mo‎del‎
Categ‎ory.kt‎ +8 -1
ModelApiR‎esponse.kt‎ +8 -1
Orde‎r.kt‎ +8 -1
Pet‎.kt‎ +8 -1
Tag‎.kt‎ +8 -1
Use‎r.kt‎ +8 -1
kotlin-springboot-‎reactive/…/…/…/…/…‎
a‎pi‎
PetApiCon‎troller.kt‎ +8 -1
StoreApiCo‎ntroller.kt‎ +8 -1
UserApiCon‎troller.kt‎ +8 -1
mo‎del‎
Categ‎ory.kt‎ +8 -1
ModelApiR‎esponse.kt‎ +8 -1
Orde‎r.kt‎ +8 -1
Pet‎.kt‎ +8 -1
Tag‎.kt‎ +8 -1
Use‎r.kt‎ +8 -1
kotlin-springboot-‎springfox/…/…/…/…/…‎
a‎pi‎
PetApiCon‎troller.kt‎ +8 -1
StoreApiCo‎ntroller.kt‎ +8 -1
UserApiCon‎troller.kt‎ +8 -1
mo‎del‎
Categ‎ory.kt‎ +8 -1
ModelApiR‎esponse.kt‎ +8 -1
Orde‎r.kt‎ +8 -1
Pet‎.kt‎ +8 -1
Tag‎.kt‎ +8 -1
Use‎r.kt‎ +8 -1
kotlin-springboot/…‎/…/…/…/openapitools‎
a‎pi‎
PetApiCon‎troller.kt‎ +8 -1
StoreApiCo‎ntroller.kt‎ +8 -1
UserApiCon‎troller.kt‎ +8 -1
mo‎del‎
Categ‎ory.kt‎ +8 -1
ModelApiR‎esponse.kt‎ +8 -1
Orde‎r.kt‎ +8 -1
Pet‎.kt‎ +8 -1
Tag‎.kt‎ +8 -1
Use‎r.kt‎ +8 -1
…/…/…‎/…/…/…‎
a‎pi‎
PetApiCon‎troller.kt‎ +8 -1
StoreApiCo‎ntroller.kt‎ +8 -1
UserApiCon‎troller.kt‎ +8 -1
mo‎del‎
Categ‎ory.kt‎ +8 -1
ModelApiR‎esponse.kt‎ +8 -1
Orde‎r.kt‎ +8 -1
Pet‎.kt‎ +8 -1
Tag‎.kt‎ +8 -1
Use‎r.kt‎ +8 -1
…/…/…‎/…/…/…‎
a‎pi‎
PetApiCon‎troller.kt‎ +8 -1
StoreApiCo‎ntroller.kt‎ +8 -1
UserApiCon‎troller.kt‎ +8 -1
mo‎del‎
Categ‎ory.kt‎ +8 -1
ModelApiR‎esponse.kt‎ +8 -1
Orde‎r.kt‎ +8 -1
Pet‎.kt‎ +8 -1
Tag‎.kt‎ +8 -1
Use‎r.kt‎ +8 -1
…/…/…‎/…/…/…‎
a‎pi‎
PetApiCon‎troller.kt‎ +8 -1
StoreApiCo‎ntroller.kt‎ +8 -1
UserApiCon‎troller.kt‎ +8 -1
mo‎del‎
Categ‎ory.kt‎ +8 -1
ModelApiR‎esponse.kt‎ +8 -1
Orde‎r.kt‎ +8 -1
Pet‎.kt‎ +8 -1
Tag‎.kt‎ +8 -1
Use‎r.kt‎ +8 -1
modules/openapi-generator/src/main/resources/kotlin-spring/api.mustache
+ 8
- 1
  • View file @ 144f8bc8

  • Edit in single-file editor

  • Open in Web IDE


@@ -30,8 +30,15 @@ import org.springframework.web.context.request.NativeWebRequest
import org.springframework.beans.factory.annotation.Autowired
{{#useBeanValidation}}
import {{javaxPackage}}.validation.constraints.*
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}}
modules/openapi-generator/src/main/resources/kotlin-spring/apiInterface.mustache
+ 8
- 1
  • View file @ 144f8bc8

  • Edit in single-file editor

  • Open in Web IDE


@@ -35,7 +35,14 @@ import org.springframework.web.context.request.NativeWebRequest
import org.springframework.beans.factory.annotation.Autowired
{{#useBeanValidation}}
import {{javaxPackage}}.validation.constraints.*
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}}
modules/openapi-generator/src/main/resources/kotlin-spring/model.mustache
+ 8
- 1
  • View file @ 144f8bc8

  • Edit in single-file editor

  • Open in Web IDE


@@ -4,7 +4,14 @@ import java.util.Objects
{{#imports}}import {{import}}
{{/imports}}
{{#useBeanValidation}}
import {{javaxPackage}}.validation.constraints.*
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}}
samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/PetApiController.kt
+ 8
- 1
  • View file @ 144f8bc8

  • Edit in single-file editor

  • Open in Web IDE


@@ -11,8 +11,15 @@ import org.springframework.validation.annotation.Validated
import org.springframework.web.context.request.NativeWebRequest
import org.springframework.beans.factory.annotation.Autowired
import javax.validation.constraints.*
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 kotlin.collections.List
import kotlin.collections.Map
samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/StoreApiController.kt
+ 8
- 1
  • View file @ 144f8bc8

  • Edit in single-file editor

  • Open in Web IDE


@@ -10,8 +10,15 @@ import org.springframework.validation.annotation.Validated
import org.springframework.web.context.request.NativeWebRequest
import org.springframework.beans.factory.annotation.Autowired
import javax.validation.constraints.*
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 kotlin.collections.List
import kotlin.collections.Map
samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/api/UserApiController.kt
+ 8
- 1
  • View file @ 144f8bc8

  • Edit in single-file editor

  • Open in Web IDE


@@ -10,8 +10,15 @@ import org.springframework.validation.annotation.Validated
import org.springframework.web.context.request.NativeWebRequest
import org.springframework.beans.factory.annotation.Autowired
import javax.validation.constraints.*
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 kotlin.collections.List
import kotlin.collections.Map
samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Category.kt
+ 8
- 1
  • View file @ 144f8bc8

  • Edit in single-file editor

  • Open in Web IDE


@@ -2,7 +2,14 @@ package org.openapitools.model
import java.util.Objects
import com.fasterxml.jackson.annotation.JsonProperty
import javax.validation.constraints.*
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
/**
samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/ModelApiResponse.kt
+ 8
- 1
  • View file @ 144f8bc8

  • Edit in single-file editor

  • Open in Web IDE


@@ -2,7 +2,14 @@ package org.openapitools.model
import java.util.Objects
import com.fasterxml.jackson.annotation.JsonProperty
import javax.validation.constraints.*
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
/**
samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Order.kt
+ 8
- 1
  • View file @ 144f8bc8

  • Edit in single-file editor

  • Open in Web IDE


@@ -3,7 +3,14 @@ package org.openapitools.model
import java.util.Objects
import com.fasterxml.jackson.annotation.JsonProperty
import com.fasterxml.jackson.annotation.JsonValue
import javax.validation.constraints.*
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
/**
samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Pet.kt
+ 8
- 1
  • View file @ 144f8bc8

  • Edit in single-file editor

  • Open in Web IDE


@@ -5,7 +5,14 @@ import com.fasterxml.jackson.annotation.JsonProperty
import com.fasterxml.jackson.annotation.JsonValue
import org.openapitools.model.Category
import org.openapitools.model.Tag
import javax.validation.constraints.*
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
/**
samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/Tag.kt
+ 8
- 1
  • View file @ 144f8bc8

  • Edit in single-file editor

  • Open in Web IDE


@@ -2,7 +2,14 @@ package org.openapitools.model
import java.util.Objects
import com.fasterxml.jackson.annotation.JsonProperty
import javax.validation.constraints.*
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
/**
samples/server/petstore/kotlin-springboot/src/main/kotlin/org/openapitools/model/User.kt
+ 8
- 1
  • View file @ 144f8bc8

  • Edit in single-file editor

  • Open in Web IDE


@@ -2,7 +2,14 @@ package org.openapitools.model
import java.util.Objects
import com.fasterxml.jackson.annotation.JsonProperty
import javax.validation.constraints.*
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
/**
0 Assignees
None
Assign to
0 Reviewers
None
Request review from
Labels
0
None
0
None
    Assign labels
  • Manage project labels

Milestone
No milestone
None
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
0
0 participants
Reference:
Source branch: github/fork/volsusdev/BUG#14652

Menu

Explore Projects Groups Snippets