Skip to content

Commit 356732d

Browse files
authored
[kotlin-spring] Adding DocumentationProvider and SwaggerUI (OpenAPITools#12184)
* Adding DocumentationProvider and SwaggerUI to Kotlin Spring * Fixing annotation errors * Fixes to homeController * Minor stylistic fixes * Removing parameter from docs * Structuring pom, making gradle file similar to pom * Updating samples
1 parent 074010e commit 356732d

File tree

211 files changed

+11950
-1338
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+11950
-1338
lines changed

.github/workflows/samples-kotlin-server.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,12 @@ jobs:
2121
sample:
2222
# server
2323
- samples/server/petstore/kotlin-springboot
24-
- samples/server/petstore/kotlin-springboot-modelMutable
2524
- samples/server/petstore/kotlin-springboot-delegate
25+
- samples/server/petstore/kotlin-springboot-modelMutable
2626
- samples/server/petstore/kotlin-springboot-reactive
27+
- samples/server/petstore/kotlin-springboot-source-swagger1
28+
- samples/server/petstore/kotlin-springboot-source-swagger2
29+
- samples/server/petstore/kotlin-springboot-springfox
2730
- samples/server/petstore/kotlin-server/ktor
2831
- samples/server/petstore/kotlin-server/jaxrs-spec
2932
- samples/server/petstore/kotlin-server-modelMutable

bin/configs/kotlin-spring-boot-delegate.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ library: spring-boot
44
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
55
templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
66
additionalProperties:
7+
documentationProvider: springdoc
8+
annotationLibrary: swagger2
9+
useSwaggerUI: "true"
710
delegatePattern: "true"
8-
swaggerAnnotations: "true"
911
beanValidations: "true"

bin/configs/kotlin-spring-boot-modelMutable.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ library: spring-boot
44
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
55
templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
66
additionalProperties:
7+
documentationProvider: springdoc
8+
annotationLibrary: swagger2
9+
useSwaggerUI: "true"
710
serializableModel: "true"
8-
swaggerAnnotations: "true"
911
serviceImplementation: "true"
1012
beanValidations: "true"
1113
modelMutable: "true"

bin/configs/kotlin-spring-boot-reactive.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ library: spring-boot
44
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
55
templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
66
additionalProperties:
7+
documentationProvider: springdoc
8+
annotationLibrary: swagger2
9+
useSwaggerUI: "true"
710
serviceImplementation: "true"
811
reactive: "true"
9-
swaggerAnnotations: "true"
1012
beanValidations: "true"
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
generatorName: kotlin-spring
2+
outputDir: samples/server/petstore/kotlin-springboot-source-swagger1
3+
library: spring-boot
4+
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
5+
templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
6+
additionalProperties:
7+
documentationProvider: source
8+
annotationLibrary: swagger1
9+
useSwaggerUI: "true"
10+
serviceImplementation: "true"
11+
serializableModel: "true"
12+
beanValidations: "true"
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
generatorName: kotlin-spring
2+
outputDir: samples/server/petstore/kotlin-springboot-source-swagger2
3+
library: spring-boot
4+
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
5+
templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
6+
additionalProperties:
7+
documentationProvider: source
8+
annotationLibrary: swagger2
9+
useSwaggerUI: "true"
10+
serviceImplementation: "true"
11+
serializableModel: "true"
12+
beanValidations: "true"
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
generatorName: kotlin-spring
2+
outputDir: samples/server/petstore/kotlin-springboot-springfox
3+
library: spring-boot
4+
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
5+
templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
6+
additionalProperties:
7+
documentationProvider: springfox
8+
annotationLibrary: swagger1
9+
useSwaggerUI: "true"
10+
serviceImplementation: "true"
11+
serializableModel: "true"
12+
beanValidations: "true"

bin/configs/kotlin-spring-boot.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ library: spring-boot
44
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
55
templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
66
additionalProperties:
7+
documentationProvider: none
8+
annotationLibrary: none
9+
useSwaggerUI: "false"
710
serviceImplementation: "true"
811
serializableModel: "true"
9-
swaggerAnnotations: "true"
1012
beanValidations: "true"

bin/configs/other/kotlin-spring-boot-reactive.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ library: spring-boot
44
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
55
templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
66
additionalProperties:
7+
documentationProvider: springdoc
8+
annotationLibrary: swagger2
9+
useSwaggerUI: "true"
710
serviceImplementation: "true"
811
reactive: "true"
9-
swaggerAnnotations: "true"
1012
beanValidations: "true"

bin/configs/other/kotlin-spring-boot.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ library: spring-boot
44
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
55
templateDir: modules/openapi-generator/src/main/resources/kotlin-spring
66
additionalProperties:
7+
documentationProvider: none
8+
annotationLibrary: none
9+
useSwaggerUI: "false"
710
serviceImplementation: "true"
811
serializableModel: "true"
9-
swaggerAnnotations: "true"
1012
beanValidations: "true"

0 commit comments

Comments
 (0)