Skip to content
This repository was archived by the owner on Dec 25, 2024. It is now read-only.

Commit 6712a12

Browse files
committed
Kotlin makes contenttype generation conditional
1 parent 96c597b commit 6712a12

5 files changed

Lines changed: 18 additions & 70 deletions

File tree

samples/client/3_0_3_unit_test/kotlin/.openapi-generator/FILES

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,6 @@ src/main/kotlin/org/openapijsonschematools/client/components/schemas/UriTemplate
182182
src/main/kotlin/org/openapijsonschematools/client/configurations/ApiConfiguration.kt
183183
src/main/kotlin/org/openapijsonschematools/client/configurations/JsonSchemaKeywordFlags.kt
184184
src/main/kotlin/org/openapijsonschematools/client/configurations/SchemaConfiguration.kt
185-
src/main/kotlin/org/openapijsonschematools/client/contenttype/ContentTypeDeserializer.kt
186-
src/main/kotlin/org/openapijsonschematools/client/contenttype/ContentTypeDetector.kt
187-
src/main/kotlin/org/openapijsonschematools/client/contenttype/ContentTypeSerializer.kt
188185
src/main/kotlin/org/openapijsonschematools/client/exceptions/ApiException.kt
189186
src/main/kotlin/org/openapijsonschematools/client/exceptions/BaseException.kt
190187
src/main/kotlin/org/openapijsonschematools/client/exceptions/InvalidAdditionalPropertyException.kt

samples/client/3_0_3_unit_test/kotlin/src/main/kotlin/org/openapijsonschematools/client/contenttype/ContentTypeDeserializer.kt

Lines changed: 0 additions & 18 deletions
This file was deleted.

samples/client/3_0_3_unit_test/kotlin/src/main/kotlin/org/openapijsonschematools/client/contenttype/ContentTypeDetector.kt

Lines changed: 0 additions & 18 deletions
This file was deleted.

samples/client/3_0_3_unit_test/kotlin/src/main/kotlin/org/openapijsonschematools/client/contenttype/ContentTypeSerializer.kt

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/main/java/org/openapijsonschematools/codegen/generators/KotlinClientGenerator.java

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -753,19 +753,6 @@ public void processOpts() {
753753
"src/main/kotlin/packagename/configurations/ApiConfiguration.hbs",
754754
packagePath() + File.separatorChar + "configurations",
755755
"ApiConfiguration.kt"));
756-
// contenttype
757-
supportingFiles.add(new SupportingFile(
758-
"src/main/kotlin/packagename/contenttype/ContentTypeDetector.hbs",
759-
packagePath() + File.separatorChar + "contenttype",
760-
"ContentTypeDetector.kt"));
761-
supportingFiles.add(new SupportingFile(
762-
"src/main/kotlin/packagename/contenttype/ContentTypeSerializer.hbs",
763-
packagePath() + File.separatorChar + "contenttype",
764-
"ContentTypeSerializer.kt"));
765-
supportingFiles.add(new SupportingFile(
766-
"src/main/kotlin/packagename/contenttype/ContentTypeDeserializer.hbs",
767-
packagePath() + File.separatorChar + "contenttype",
768-
"ContentTypeDeserializer.kt"));
769756

770757
// jsonPaths
771758
// requestbodies
@@ -2926,9 +2913,27 @@ public void setOpenAPI(OpenAPI openAPI) {
29262913
}
29272914
if (pathsExist || componentHeadersExist || componentParametersExist || componentRequestBodiesExist || componentResponsesExist) {
29282915
addMediaTypeSupportingFiles();
2916+
addContentTypeSupportingFiles();
29292917
}
29302918
}
29312919

2920+
private void addContentTypeSupportingFiles() {
2921+
// contenttype
2922+
supportingFiles.add(new SupportingFile(
2923+
"src/main/kotlin/packagename/contenttype/ContentTypeDetector.hbs",
2924+
packagePath() + File.separatorChar + "contenttype",
2925+
"ContentTypeDetector.kt"));
2926+
supportingFiles.add(new SupportingFile(
2927+
"src/main/kotlin/packagename/contenttype/ContentTypeSerializer.hbs",
2928+
packagePath() + File.separatorChar + "contenttype",
2929+
"ContentTypeSerializer.kt"));
2930+
supportingFiles.add(new SupportingFile(
2931+
"src/main/kotlin/packagename/contenttype/ContentTypeDeserializer.hbs",
2932+
packagePath() + File.separatorChar + "contenttype",
2933+
"ContentTypeDeserializer.kt"));
2934+
2935+
}
2936+
29322937
private void addPathsSupportingFiles() {
29332938
// apiclient
29342939
supportingFiles.add(new SupportingFile(

0 commit comments

Comments
 (0)