loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-06 00:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] Enum should match spec (#18062)

Browse Source 
* [kotlin] Enum should match spec

Adjust the enum generation to match what is in the spec, rather than
camel-casing it.
Add tests for capitalization scenarios, including for kotlin keywords

* [kotlin] export docs generators for enum change

* [kotlin] export docs generators for enum change

* fix conflicts

---------

Co-authored-by: Tyler B. Thrailkill <tylerbthrailkill@gmail.com>
Co-authored-by: Jari Nystedt <jari.nystedt@tietoevry.com>
This commit is contained in:
William Cheng
2024-03-09 17:42:33 +08:00
committed by GitHub
parent 81e33ede6e
commit 494fc7d182
40 changed files with 336 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/infrastructure/SerializerHelper.kt
View File

@@ -7,12 +7,12 @@ object SerializerHelper {
fun addEnumUnknownDefaultCase(moshiBuilder: Moshi.Builder): Moshi.Builder {
return moshiBuilder
.add(org.openapitools.client.models.ModelWithEnumPropertyHavingDefault.PropertyName::class.java, EnumJsonAdapter.create(org.openapitools.client.models.ModelWithEnumPropertyHavingDefault.PropertyName::class.java)
.withUnknownFallback(org.openapitools.client.models.ModelWithEnumPropertyHavingDefault.PropertyName.unknownDefaultOpenApi))
.withUnknownFallback(org.openapitools.client.models.ModelWithEnumPropertyHavingDefault.PropertyName.unknown_default_open_api))
.add(org.openapitools.client.models.PropertyOfDay.DaysOfWeek::class.java, EnumJsonAdapter.create(org.openapitools.client.models.PropertyOfDay.DaysOfWeek::class.java)
.withUnknownFallback(org.openapitools.client.models.PropertyOfDay.DaysOfWeek.unknownDefaultOpenApi))
.withUnknownFallback(org.openapitools.client.models.PropertyOfDay.DaysOfWeek.unknown_default_open_api))
.add(org.openapitools.client.models.PropertyOfDay.MonthOfYear::class.java, EnumJsonAdapter.create(org.openapitools.client.models.PropertyOfDay.MonthOfYear::class.java)
.withUnknownFallback(org.openapitools.client.models.PropertyOfDay.MonthOfYear.unknownDefaultOpenApi))
.withUnknownFallback(org.openapitools.client.models.PropertyOfDay.MonthOfYear.unknown_default_open_api))
.add(org.openapitools.client.models.PropertyOfDay.HolidayTypes::class.java, EnumJsonAdapter.create(org.openapitools.client.models.PropertyOfDay.HolidayTypes::class.java)
.withUnknownFallback(org.openapitools.client.models.PropertyOfDay.HolidayTypes.unknownDefaultOpenApi))
.withUnknownFallback(org.openapitools.client.models.PropertyOfDay.HolidayTypes.unknown_default_open_api))
}
}

8
samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/models/ModelWithEnumPropertyHavingDefault.kt
View File

@@ -30,7 +30,7 @@ import java.io.Serializable
data class ModelWithEnumPropertyHavingDefault (
@Json(name = "propertyName")
val propertyName: ModelWithEnumPropertyHavingDefault.PropertyName = PropertyName.vALUE
val propertyName: ModelWithEnumPropertyHavingDefault.PropertyName = PropertyName.VALUE
) : Serializable {
companion object {
@@ -40,12 +40,12 @@ data class ModelWithEnumPropertyHavingDefault (
/**
*
*
* Values: vALUE,unknownDefaultOpenApi
* Values: VALUE,unknown_default_open_api
*/
@JsonClass(generateAdapter = false)
enum class PropertyName(val value: kotlin.String) {
@Json(name = "VALUE") vALUE("VALUE"),
@Json(name = "unknown_default_open_api") unknownDefaultOpenApi("unknown_default_open_api");
@Json(name = "VALUE") VALUE("VALUE"),
@Json(name = "unknown_default_open_api") unknown_default_open_api("unknown_default_open_api");
}
}

68
samples/client/petstore/kotlin-enum-default-value/src/main/kotlin/org/openapitools/client/models/PropertyOfDay.kt
View File

@@ -66,26 +66,26 @@ data class PropertyOfDay (
/**
* Days of week
*
* Values: mONDAY,tUESDAY,wEDNESDAY,tHURSDAY,fRIDAY,sATURDAY,sUNDAY,wEEKDAYS,wEEKEND,eVERYDAY,unknownDefaultOpenApi
* Values: MONDAY,TUESDAY,WEDNESDAY,THURSDAY,FRIDAY,SATURDAY,SUNDAY,WEEKDAYS,WEEKEND,EVERYDAY,unknown_default_open_api
*/
@JsonClass(generateAdapter = false)
enum class DaysOfWeek(val value: kotlin.Any) {
@Json(name = "MONDAY") mONDAY("MONDAY"),
@Json(name = "TUESDAY") tUESDAY("TUESDAY"),
@Json(name = "WEDNESDAY") wEDNESDAY("WEDNESDAY"),
@Json(name = "THURSDAY") tHURSDAY("THURSDAY"),
@Json(name = "FRIDAY") fRIDAY("FRIDAY"),
@Json(name = "SATURDAY") sATURDAY("SATURDAY"),
@Json(name = "SUNDAY") sUNDAY("SUNDAY"),
@Json(name = "WEEKDAYS") wEEKDAYS("WEEKDAYS"),
@Json(name = "WEEKEND") wEEKEND("WEEKEND"),
@Json(name = "EVERYDAY") eVERYDAY("EVERYDAY"),
@Json(name = "11184809") unknownDefaultOpenApi("11184809");
@Json(name = "MONDAY") MONDAY("MONDAY"),
@Json(name = "TUESDAY") TUESDAY("TUESDAY"),
@Json(name = "WEDNESDAY") WEDNESDAY("WEDNESDAY"),
@Json(name = "THURSDAY") THURSDAY("THURSDAY"),
@Json(name = "FRIDAY") FRIDAY("FRIDAY"),
@Json(name = "SATURDAY") SATURDAY("SATURDAY"),
@Json(name = "SUNDAY") SUNDAY("SUNDAY"),
@Json(name = "WEEKDAYS") WEEKDAYS("WEEKDAYS"),
@Json(name = "WEEKEND") WEEKEND("WEEKEND"),
@Json(name = "EVERYDAY") EVERYDAY("EVERYDAY"),
@Json(name = "11184809") unknown_default_open_api("11184809");
}
/**
* Month of year
*
* Values: _1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12,unknownDefaultOpenApi
* Values: _1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11,_12,unknown_default_open_api
*/
@JsonClass(generateAdapter = false)
enum class MonthOfYear(val value: kotlin.Int) {
@@ -101,35 +101,35 @@ data class PropertyOfDay (
@Json(name = "10") _10(10),
@Json(name = "11") _11(11),
@Json(name = "12") _12(12),
@Json(name = "11184809") unknownDefaultOpenApi(11184809);
@Json(name = "11184809") unknown_default_open_api(11184809);
}
/**
* Holiday types
*
* Values: nOTHOLIDAY,lOCALHOLIDAY,nATIONALHOLIDAY,aNYHOLIDAY,wORKINGDAY,aNYDAY,nEWYEARSDAY,pALMSUNDAY,mAUNDYTHURSDAY,gOODFRIDAY,eASTERSUNDAY,eASTERMONDAY,lABOURDAY,cONSTITUTIONDAY,aSCENSIONDAY,wHITSUNDAY,wHITMONDAY,XMAS_DAY,bOXINGDAY,unknownDefaultOpenApi
* Values: NOT_HOLIDAY,LOCAL_HOLIDAY,NATIONAL_HOLIDAY,ANY_HOLIDAY,WORKING_DAY,ANY_DAY,NEW_YEARS_DAY,PALM_SUNDAY,MAUNDY_THURSDAY,GOOD_FRIDAY,EASTER_SUNDAY,EASTER_MONDAY,LABOUR_DAY,CONSTITUTION_DAY,ASCENSION_DAY,WHIT_SUNDAY,WHIT_MONDAY,XMAS_DAY,BOXING_DAY,unknown_default_open_api
*/
@JsonClass(generateAdapter = false)
enum class HolidayTypes(val value: kotlin.Any) {
@Json(name = "NOT_HOLIDAY") nOTHOLIDAY("NOT_HOLIDAY"),
@Json(name = "LOCAL_HOLIDAY") lOCALHOLIDAY("LOCAL_HOLIDAY"),
@Json(name = "NATIONAL_HOLIDAY") nATIONALHOLIDAY("NATIONAL_HOLIDAY"),
@Json(name = "ANY_HOLIDAY") aNYHOLIDAY("ANY_HOLIDAY"),
@Json(name = "WORKING_DAY") wORKINGDAY("WORKING_DAY"),
@Json(name = "ANY_DAY") aNYDAY("ANY_DAY"),
@Json(name = "NEW_YEARS_DAY") nEWYEARSDAY("NEW_YEARS_DAY"),
@Json(name = "PALM_SUNDAY") pALMSUNDAY("PALM_SUNDAY"),
@Json(name = "MAUNDY_THURSDAY") mAUNDYTHURSDAY("MAUNDY_THURSDAY"),
@Json(name = "GOOD_FRIDAY") gOODFRIDAY("GOOD_FRIDAY"),
@Json(name = "EASTER_SUNDAY") eASTERSUNDAY("EASTER_SUNDAY"),
@Json(name = "EASTER_MONDAY") eASTERMONDAY("EASTER_MONDAY"),
@Json(name = "LABOUR_DAY") lABOURDAY("LABOUR_DAY"),
@Json(name = "CONSTITUTION_DAY") cONSTITUTIONDAY("CONSTITUTION_DAY"),
@Json(name = "ASCENSION_DAY") aSCENSIONDAY("ASCENSION_DAY"),
@Json(name = "WHIT_SUNDAY") wHITSUNDAY("WHIT_SUNDAY"),
@Json(name = "WHIT_MONDAY") wHITMONDAY("WHIT_MONDAY"),
@Json(name = "NOT_HOLIDAY") NOT_HOLIDAY("NOT_HOLIDAY"),
@Json(name = "LOCAL_HOLIDAY") LOCAL_HOLIDAY("LOCAL_HOLIDAY"),
@Json(name = "NATIONAL_HOLIDAY") NATIONAL_HOLIDAY("NATIONAL_HOLIDAY"),
@Json(name = "ANY_HOLIDAY") ANY_HOLIDAY("ANY_HOLIDAY"),
@Json(name = "WORKING_DAY") WORKING_DAY("WORKING_DAY"),
@Json(name = "ANY_DAY") ANY_DAY("ANY_DAY"),
@Json(name = "NEW_YEARS_DAY") NEW_YEARS_DAY("NEW_YEARS_DAY"),
@Json(name = "PALM_SUNDAY") PALM_SUNDAY("PALM_SUNDAY"),
@Json(name = "MAUNDY_THURSDAY") MAUNDY_THURSDAY("MAUNDY_THURSDAY"),
@Json(name = "GOOD_FRIDAY") GOOD_FRIDAY("GOOD_FRIDAY"),
@Json(name = "EASTER_SUNDAY") EASTER_SUNDAY("EASTER_SUNDAY"),
@Json(name = "EASTER_MONDAY") EASTER_MONDAY("EASTER_MONDAY"),
@Json(name = "LABOUR_DAY") LABOUR_DAY("LABOUR_DAY"),
@Json(name = "CONSTITUTION_DAY") CONSTITUTION_DAY("CONSTITUTION_DAY"),
@Json(name = "ASCENSION_DAY") ASCENSION_DAY("ASCENSION_DAY"),
@Json(name = "WHIT_SUNDAY") WHIT_SUNDAY("WHIT_SUNDAY"),
@Json(name = "WHIT_MONDAY") WHIT_MONDAY("WHIT_MONDAY"),
@Json(name = "CHRISTMAS_DAY") XMAS_DAY("CHRISTMAS_DAY"),
@Json(name = "BOXING_DAY") bOXINGDAY("BOXING_DAY"),
@Json(name = "11184809") unknownDefaultOpenApi("11184809");
@Json(name = "BOXING_DAY") BOXING_DAY("BOXING_DAY"),
@Json(name = "11184809") unknown_default_open_api("11184809");
}
}