From 49a1544d8cd0d1b070ccfe35fa09742907dcf93c Mon Sep 17 00:00:00 2001 From: Justin Black Date: Wed, 6 Mar 2024 10:29:42 -0800 Subject: [PATCH 1/2] Fixes enum variable names when disallowed characters are first and later --- .../generators/JavaClientGenerator.java | 14 ++++++++-- .../generators/PythonClientGenerator.java | 14 ++++++++-- .../generators/JavaClientGeneratorTest.java | 27 +++++++++++++++++++ .../generators/PythonClientGeneratorTest.java | 8 ++---- .../resources/3_0/70_schema_enum_names.yaml | 3 ++- 5 files changed, 55 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java index 6e31f15923d..662f473dc2d 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java @@ -2168,12 +2168,22 @@ public String toEnumVarName(String value, Schema prop) { usedValue = usedValue.replaceAll("[ ]+", "_"); // replace all invalid characters with their character name descriptions - Pattern nonWordCharPattern = Pattern.compile("\\W+"); - Matcher matcher = nonWordCharPattern.matcher(usedValue); + // replace all invalid characters with their character name descriptions Stack> matchStartToGroup = new Stack<>(); + Pattern nonLetterCharPattern = Pattern.compile("^[^a-zA-Z]"); + Matcher matcher = nonLetterCharPattern.matcher(usedValue); while (matcher.find()) { matchStartToGroup.add(new AbstractMap.SimpleEntry<>(matcher.start(), matcher.group())); } + Pattern nonWordPattern = Pattern.compile("\\W+"); + matcher = nonWordPattern.matcher(usedValue); + while (matcher.find()) { + if (matcher.start() == 0) { + // skip adding first because it was already added + continue; + } + matchStartToGroup.add(new AbstractMap.SimpleEntry<>(matcher.start(), matcher.group())); + } char underscore = '_'; while (!matchStartToGroup.isEmpty()) { AbstractMap.SimpleEntry entry = matchStartToGroup.pop(); diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java b/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java index 675ecfe8832..d9fc8dd5482 100644 --- a/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java +++ b/src/main/java/org/openapijsonschematools/codegen/generators/PythonClientGenerator.java @@ -1113,12 +1113,22 @@ public String toEnumVarName(String value, Schema prop) { usedValue = usedValue.replaceAll("[ ]+", "_"); // replace all invalid characters with their character name descriptions - Pattern nonWordCharPattern = Pattern.compile("\\W+"); - Matcher matcher = nonWordCharPattern.matcher(usedValue); Stack> matchStartToGroup = new Stack<>(); + Pattern nonLetterCharPattern = Pattern.compile("^[^a-zA-Z]"); + Matcher matcher = nonLetterCharPattern.matcher(usedValue); while (matcher.find()) { matchStartToGroup.add(new AbstractMap.SimpleEntry<>(matcher.start(), matcher.group())); } + Pattern nonWordPattern = Pattern.compile("\\W+"); + matcher = nonWordPattern.matcher(usedValue); + while (matcher.find()) { + if (matcher.start() == 0) { + // skip adding first because it was already added + continue; + } + matchStartToGroup.add(new AbstractMap.SimpleEntry<>(matcher.start(), matcher.group())); + } + char underscore = '_'; while (!matchStartToGroup.isEmpty()) { AbstractMap.SimpleEntry entry = matchStartToGroup.pop(); diff --git a/src/test/java/org/openapijsonschematools/codegen/generators/JavaClientGeneratorTest.java b/src/test/java/org/openapijsonschematools/codegen/generators/JavaClientGeneratorTest.java index d151fcef291..2094eab129e 100644 --- a/src/test/java/org/openapijsonschematools/codegen/generators/JavaClientGeneratorTest.java +++ b/src/test/java/org/openapijsonschematools/codegen/generators/JavaClientGeneratorTest.java @@ -17,14 +17,19 @@ package org.openapijsonschematools.codegen.generators; +import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.media.ArraySchema; import io.swagger.v3.oas.models.media.Schema; import io.swagger.v3.oas.models.parameters.Parameter; +import org.openapijsonschematools.codegen.TestUtils; import org.openapijsonschematools.codegen.generators.openapimodels.CodegenParameter; +import org.openapijsonschematools.codegen.generators.openapimodels.CodegenSchema; +import org.openapijsonschematools.codegen.generators.openapimodels.EnumValue; import org.testng.Assert; import org.testng.annotations.Test; import java.util.Arrays; +import java.util.Map; public class JavaClientGeneratorTest { @@ -126,4 +131,26 @@ void uuidGivenExample() { final CodegenParameter p = generator.fromParameter(parameter, "#/components/parameters/uuidGivenExample"); Assert.assertEquals(p.example, "UUID.fromString(\"13b48713-b931-45ea-bd60-b07491245960\")"); } + + @Test + public void testEnumNames() { + OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/70_schema_enum_names.yaml"); + var javaGenerator = new JavaClientGenerator(); + javaGenerator.setOpenAPI(openAPI); + + String modelName = "StringEnum"; + Schema schema = openAPI.getComponents().getSchemas().get(modelName); + + CodegenSchema cm = javaGenerator.fromSchema( + schema, + "#/components/schemas/" + modelName, + "#/components/schemas/" + modelName + ); + + Map enumVars = cm.enumInfo.valueToName; + Assert.assertEquals(enumVars.size(), 3); + Assert.assertEquals(enumVars.get(new EnumValue("#367B9C", "string", null)), "NUMBER_SIGN_367B9C"); + Assert.assertEquals(enumVars.get(new EnumValue("#FFA5A4", "string", null)), "NUMBER_SIGN_FFA5A4"); + Assert.assertEquals(enumVars.get(new EnumValue("2D_Object", "string", null)), "DIGIT_TWO_D_OBJECT"); + } } diff --git a/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java b/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java index 81169b9d5b2..5fffba76b33 100644 --- a/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java +++ b/src/test/java/org/openapijsonschematools/codegen/generators/PythonClientGeneratorTest.java @@ -224,15 +224,11 @@ public void testEnumNames() { "#/components/schemas/" + modelName ); - TreeMap schemas = new TreeMap<>(); - schemas.put("StringEnum", cm); - - codegen.postProcessModels(schemas); - Map enumVars = cm.enumInfo.valueToName; - Assert.assertEquals(enumVars.size(), 2); + Assert.assertEquals(enumVars.size(), 3); Assert.assertEquals(enumVars.get(new EnumValue("#367B9C", "string", null)), "NUMBER_SIGN_367B9C"); Assert.assertEquals(enumVars.get(new EnumValue("#FFA5A4", "string", null)), "NUMBER_SIGN_FFA5A4"); + Assert.assertEquals(enumVars.get(new EnumValue("2D_Object", "string", null)), "DIGIT_TWO_D_OBJECT"); } @Test(description = "format imports of models using a package containing dots") diff --git a/src/test/resources/3_0/70_schema_enum_names.yaml b/src/test/resources/3_0/70_schema_enum_names.yaml index 8c441ea0325..1969a1eef13 100644 --- a/src/test/resources/3_0/70_schema_enum_names.yaml +++ b/src/test/resources/3_0/70_schema_enum_names.yaml @@ -9,4 +9,5 @@ components: type: string enum: - "#367B9C" - - "#FFA5A4" \ No newline at end of file + - "#FFA5A4" + - "2D_Object" \ No newline at end of file From 8b32e3e64e2fc6c32ef87b5b89c521c1ad90e695 Mon Sep 17 00:00:00 2001 From: Justin Black Date: Wed, 6 Mar 2024 10:48:59 -0800 Subject: [PATCH 2/2] Samples regenerated --- ...seNamesAreJavascriptObjectPropertyNames.md | 8 +-- ...seNamesAreJavascriptObjectPropertyNames.md | 72 +++++++++---------- ...NamesAreJavascriptObjectPropertyNames.java | 8 +-- ...NamesAreJavascriptObjectPropertyNames.java | 18 ++--- .../docs/components/schemas/ClassModel.md | 2 +- .../java/docs/components/schemas/EnumClass.md | 2 +- .../ObjectWithDifficultlyNamedProps.md | 14 ++-- .../fake/get/parameters/parameter1/Schema1.md | 2 +- .../fake/get/parameters/parameter3/Schema3.md | 2 +- .../ApplicationxwwwformurlencodedSchema.md | 2 +- .../client/components/schemas/ClassModel.java | 2 +- .../client/components/schemas/EnumClass.java | 2 +- .../ObjectWithDifficultlyNamedProps.java | 10 +-- .../get/parameters/parameter1/Schema1.java | 2 +- .../get/parameters/parameter3/Schema3.java | 2 +- .../ApplicationxwwwformurlencodedSchema.java | 2 +- .../components/schema/enum_class.py | 4 +- .../fake/get/parameters/parameter_1/schema.py | 4 +- .../fake/get/parameters/parameter_3/schema.py | 4 +- .../schema.py | 4 +- 20 files changed, 83 insertions(+), 83 deletions(-) diff --git a/samples/client/3_1_0_unit_test/java/docs/components/schemas/PropertiesWhoseNamesAreJavascriptObjectPropertyNames.md b/samples/client/3_1_0_unit_test/java/docs/components/schemas/PropertiesWhoseNamesAreJavascriptObjectPropertyNames.md index 12521dedf71..afd02472dd3 100644 --- a/samples/client/3_1_0_unit_test/java/docs/components/schemas/PropertiesWhoseNamesAreJavascriptObjectPropertyNames.md +++ b/samples/client/3_1_0_unit_test/java/docs/components/schemas/PropertiesWhoseNamesAreJavascriptObjectPropertyNames.md @@ -204,10 +204,10 @@ A class that builds the Map input type | Modifier and Type | Method and Description | | ----------------- | ---------------------- | | Map | build()
Returns map input that should be used with Schema.validate | -| [PropertiesWhoseNamesAreJavascriptObjectPropertyNamesMapBuilder](#propertieswhosenamesarejavascriptobjectpropertynamesmapbuilder) | setProto(int value) | -| [PropertiesWhoseNamesAreJavascriptObjectPropertyNamesMapBuilder](#propertieswhosenamesarejavascriptobjectpropertynamesmapbuilder) | setProto(float value) | -| [PropertiesWhoseNamesAreJavascriptObjectPropertyNamesMapBuilder](#propertieswhosenamesarejavascriptobjectpropertynamesmapbuilder) | setProto(long value) | -| [PropertiesWhoseNamesAreJavascriptObjectPropertyNamesMapBuilder](#propertieswhosenamesarejavascriptobjectpropertynamesmapbuilder) | setProto(double value) | +| [PropertiesWhoseNamesAreJavascriptObjectPropertyNamesMapBuilder](#propertieswhosenamesarejavascriptobjectpropertynamesmapbuilder) | setLowLineProto(int value) | +| [PropertiesWhoseNamesAreJavascriptObjectPropertyNamesMapBuilder](#propertieswhosenamesarejavascriptobjectpropertynamesmapbuilder) | setLowLineProto(float value) | +| [PropertiesWhoseNamesAreJavascriptObjectPropertyNamesMapBuilder](#propertieswhosenamesarejavascriptobjectpropertynamesmapbuilder) | setLowLineProto(long value) | +| [PropertiesWhoseNamesAreJavascriptObjectPropertyNamesMapBuilder](#propertieswhosenamesarejavascriptobjectpropertynamesmapbuilder) | setLowLineProto(double value) | | [PropertiesWhoseNamesAreJavascriptObjectPropertyNamesMapBuilder](#propertieswhosenamesarejavascriptobjectpropertynamesmapbuilder) | setToString(Void value) | | [PropertiesWhoseNamesAreJavascriptObjectPropertyNamesMapBuilder](#propertieswhosenamesarejavascriptobjectpropertynamesmapbuilder) | setToString(boolean value) | | [PropertiesWhoseNamesAreJavascriptObjectPropertyNamesMapBuilder](#propertieswhosenamesarejavascriptobjectpropertynamesmapbuilder) | setToString(String value) | diff --git a/samples/client/3_1_0_unit_test/java/docs/components/schemas/RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNames.md b/samples/client/3_1_0_unit_test/java/docs/components/schemas/RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNames.md index 9fe35d634ae..4cfb575d7a1 100644 --- a/samples/client/3_1_0_unit_test/java/docs/components/schemas/RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNames.md +++ b/samples/client/3_1_0_unit_test/java/docs/components/schemas/RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNames.md @@ -290,15 +290,15 @@ A class that builds the Map input type ### Method Summary | Modifier and Type | Method and Description | | ----------------- | ---------------------- | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap000Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap000builder) | setProto(Void value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap000Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap000builder) | setProto(boolean value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap000Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap000builder) | setProto(String value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap000Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap000builder) | setProto(int value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap000Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap000builder) | setProto(float value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap000Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap000builder) | setProto(long value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap000Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap000builder) | setProto(double value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap000Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap000builder) | setProto(List value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap000Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap000builder) | setProto(Map value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap000Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap000builder) | setLowLineProto(Void value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap000Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap000builder) | setLowLineProto(boolean value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap000Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap000builder) | setLowLineProto(String value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap000Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap000builder) | setLowLineProto(int value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap000Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap000builder) | setLowLineProto(float value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap000Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap000builder) | setLowLineProto(long value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap000Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap000builder) | setLowLineProto(double value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap000Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap000builder) | setLowLineProto(List value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap000Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap000builder) | setLowLineProto(Map value) | ## RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap101Builder public class RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap101Builder
@@ -314,15 +314,15 @@ A class that builds the Map input type ### Method Summary | Modifier and Type | Method and Description | | ----------------- | ---------------------- | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap001Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap001builder) | setProto(Void value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap001Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap001builder) | setProto(boolean value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap001Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap001builder) | setProto(String value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap001Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap001builder) | setProto(int value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap001Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap001builder) | setProto(float value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap001Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap001builder) | setProto(long value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap001Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap001builder) | setProto(double value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap001Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap001builder) | setProto(List value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap001Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap001builder) | setProto(Map value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap001Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap001builder) | setLowLineProto(Void value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap001Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap001builder) | setLowLineProto(boolean value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap001Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap001builder) | setLowLineProto(String value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap001Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap001builder) | setLowLineProto(int value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap001Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap001builder) | setLowLineProto(float value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap001Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap001builder) | setLowLineProto(long value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap001Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap001builder) | setLowLineProto(double value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap001Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap001builder) | setLowLineProto(List value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap001Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap001builder) | setLowLineProto(Map value) | | [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap100Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap100builder) | setToString(Void value) | | [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap100Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap100builder) | setToString(boolean value) | | [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap100Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap100builder) | setToString(String value) | @@ -347,15 +347,15 @@ A class that builds the Map input type ### Method Summary | Modifier and Type | Method and Description | | ----------------- | ---------------------- | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap010Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap010builder) | setProto(Void value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap010Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap010builder) | setProto(boolean value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap010Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap010builder) | setProto(String value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap010Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap010builder) | setProto(int value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap010Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap010builder) | setProto(float value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap010Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap010builder) | setProto(long value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap010Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap010builder) | setProto(double value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap010Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap010builder) | setProto(List value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap010Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap010builder) | setProto(Map value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap010Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap010builder) | setLowLineProto(Void value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap010Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap010builder) | setLowLineProto(boolean value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap010Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap010builder) | setLowLineProto(String value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap010Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap010builder) | setLowLineProto(int value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap010Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap010builder) | setLowLineProto(float value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap010Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap010builder) | setLowLineProto(long value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap010Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap010builder) | setLowLineProto(double value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap010Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap010builder) | setLowLineProto(List value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap010Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap010builder) | setLowLineProto(Map value) | | [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap100Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap100builder) | constructor(Void value) | | [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap100Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap100builder) | constructor(boolean value) | | [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap100Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap100builder) | constructor(String value) | @@ -380,15 +380,15 @@ A class that builds the Map input type ### Method Summary | Modifier and Type | Method and Description | | ----------------- | ---------------------- | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap011Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap011builder) | setProto(Void value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap011Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap011builder) | setProto(boolean value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap011Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap011builder) | setProto(String value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap011Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap011builder) | setProto(int value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap011Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap011builder) | setProto(float value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap011Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap011builder) | setProto(long value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap011Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap011builder) | setProto(double value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap011Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap011builder) | setProto(List value) | -| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap011Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap011builder) | setProto(Map value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap011Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap011builder) | setLowLineProto(Void value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap011Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap011builder) | setLowLineProto(boolean value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap011Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap011builder) | setLowLineProto(String value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap011Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap011builder) | setLowLineProto(int value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap011Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap011builder) | setLowLineProto(float value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap011Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap011builder) | setLowLineProto(long value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap011Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap011builder) | setLowLineProto(double value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap011Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap011builder) | setLowLineProto(List value) | +| [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap011Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap011builder) | setLowLineProto(Map value) | | [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap101Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap101builder) | constructor(Void value) | | [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap101Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap101builder) | constructor(boolean value) | | [RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNamesMap101Builder](#requiredpropertieswhosenamesarejavascriptobjectpropertynamesmap101builder) | constructor(String value) | diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesWhoseNamesAreJavascriptObjectPropertyNames.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesWhoseNamesAreJavascriptObjectPropertyNames.java index f727766a051..f7ad88b9db4 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesWhoseNamesAreJavascriptObjectPropertyNames.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/PropertiesWhoseNamesAreJavascriptObjectPropertyNames.java @@ -460,25 +460,25 @@ public interface SetterForProto { Map getInstance(); T getBuilderAfterProto(Map instance); - default T setProto(int value) { + default T setLowLineProto(int value) { var instance = getInstance(); instance.put("__proto__", value); return getBuilderAfterProto(instance); } - default T setProto(float value) { + default T setLowLineProto(float value) { var instance = getInstance(); instance.put("__proto__", value); return getBuilderAfterProto(instance); } - default T setProto(long value) { + default T setLowLineProto(long value) { var instance = getInstance(); instance.put("__proto__", value); return getBuilderAfterProto(instance); } - default T setProto(double value) { + default T setLowLineProto(double value) { var instance = getInstance(); instance.put("__proto__", value); return getBuilderAfterProto(instance); diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNames.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNames.java index cba00121cd8..64e3a9bf9ed 100644 --- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNames.java +++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/components/schemas/RequiredPropertiesWhoseNamesAreJavascriptObjectPropertyNames.java @@ -65,55 +65,55 @@ public interface SetterForProto { Map getInstance(); T getBuilderAfterProto(Map instance); - default T setProto(Void value) { + default T setLowLineProto(Void value) { var instance = getInstance(); instance.put("__proto__", null); return getBuilderAfterProto(instance); } - default T setProto(boolean value) { + default T setLowLineProto(boolean value) { var instance = getInstance(); instance.put("__proto__", value); return getBuilderAfterProto(instance); } - default T setProto(String value) { + default T setLowLineProto(String value) { var instance = getInstance(); instance.put("__proto__", value); return getBuilderAfterProto(instance); } - default T setProto(int value) { + default T setLowLineProto(int value) { var instance = getInstance(); instance.put("__proto__", value); return getBuilderAfterProto(instance); } - default T setProto(float value) { + default T setLowLineProto(float value) { var instance = getInstance(); instance.put("__proto__", value); return getBuilderAfterProto(instance); } - default T setProto(long value) { + default T setLowLineProto(long value) { var instance = getInstance(); instance.put("__proto__", value); return getBuilderAfterProto(instance); } - default T setProto(double value) { + default T setLowLineProto(double value) { var instance = getInstance(); instance.put("__proto__", value); return getBuilderAfterProto(instance); } - default T setProto(List value) { + default T setLowLineProto(List value) { var instance = getInstance(); instance.put("__proto__", value); return getBuilderAfterProto(instance); } - default T setProto(Map value) { + default T setLowLineProto(Map value) { var instance = getInstance(); instance.put("__proto__", value); return getBuilderAfterProto(instance); diff --git a/samples/client/petstore/java/docs/components/schemas/ClassModel.md b/samples/client/petstore/java/docs/components/schemas/ClassModel.md index 1d7f1150a3b..4d9702f2d3f 100644 --- a/samples/client/petstore/java/docs/components/schemas/ClassModel.md +++ b/samples/client/petstore/java/docs/components/schemas/ClassModel.md @@ -191,7 +191,7 @@ A class that builds the Map input type | Modifier and Type | Method and Description | | ----------------- | ---------------------- | | Map | build()
Returns map input that should be used with Schema.validate | -| [ClassModelMapBuilder](#classmodelmapbuilder) | setClass(String value) | +| [ClassModelMapBuilder](#classmodelmapbuilder) | setLowLineClass(String value) | | [ClassModelMapBuilder](#classmodelmapbuilder) | additionalProperty(String key, Void value) | | [ClassModelMapBuilder](#classmodelmapbuilder) | additionalProperty(String key, boolean value) | | [ClassModelMapBuilder](#classmodelmapbuilder) | additionalProperty(String key, String value) | diff --git a/samples/client/petstore/java/docs/components/schemas/EnumClass.md b/samples/client/petstore/java/docs/components/schemas/EnumClass.md index ca9dcb51ce6..bd1f7b84281 100644 --- a/samples/client/petstore/java/docs/components/schemas/EnumClass.md +++ b/samples/client/petstore/java/docs/components/schemas/EnumClass.md @@ -94,7 +94,7 @@ A class that stores String enum values ### Enum Constant Summary | Enum Constant | Description | | ------------- | ----------- | -| _ABC | value = "_abc" | +| LOW_LINE_ABC | value = "_abc" | | HYPHEN_MINUS_EFG | value = "-efg" | | LEFT_PARENTHESIS_XYZ_RIGHT_PARENTHESIS | value = "(xyz)" | | COUNT_1M | value = "COUNT_1M" | diff --git a/samples/client/petstore/java/docs/components/schemas/ObjectWithDifficultlyNamedProps.md b/samples/client/petstore/java/docs/components/schemas/ObjectWithDifficultlyNamedProps.md index 253bab9484f..7f4af2b5b62 100644 --- a/samples/client/petstore/java/docs/components/schemas/ObjectWithDifficultlyNamedProps.md +++ b/samples/client/petstore/java/docs/components/schemas/ObjectWithDifficultlyNamedProps.md @@ -80,11 +80,11 @@ static final SchemaConfiguration configuration = new SchemaConfiguration(JsonSch ObjectWithDifficultlyNamedProps.ObjectWithDifficultlyNamedPropsMap validatedPayload = ObjectWithDifficultlyNamedProps.ObjectWithDifficultlyNamedProps1.validate( new ObjectWithDifficultlyNamedProps.ObjectWithDifficultlyNamedPropsMapBuilder() - .set123HyphenMinusList("a") + .setDigitOne23HyphenMinusList("a") .setDollarSignSpecialLeftSquareBracketPropertyFullStopNameRightSquareBracket(1L) - .set123number(1) + .setDigitOne23number(1) .build(), configuration @@ -125,10 +125,10 @@ A class that builds the Map input type | [ObjectWithDifficultlyNamedPropsMap0Builder](#objectwithdifficultlynamedpropsmap0builder) | setDollarSignSpecialLeftSquareBracketPropertyFullStopNameRightSquareBracket(float value) | | [ObjectWithDifficultlyNamedPropsMap0Builder](#objectwithdifficultlynamedpropsmap0builder) | setDollarSignSpecialLeftSquareBracketPropertyFullStopNameRightSquareBracket(long value) | | [ObjectWithDifficultlyNamedPropsMap0Builder](#objectwithdifficultlynamedpropsmap0builder) | setDollarSignSpecialLeftSquareBracketPropertyFullStopNameRightSquareBracket(double value) | -| [ObjectWithDifficultlyNamedPropsMap0Builder](#objectwithdifficultlynamedpropsmap0builder) | set123number(int value) | -| [ObjectWithDifficultlyNamedPropsMap0Builder](#objectwithdifficultlynamedpropsmap0builder) | set123number(float value) | -| [ObjectWithDifficultlyNamedPropsMap0Builder](#objectwithdifficultlynamedpropsmap0builder) | set123number(long value) | -| [ObjectWithDifficultlyNamedPropsMap0Builder](#objectwithdifficultlynamedpropsmap0builder) | set123number(double value) | +| [ObjectWithDifficultlyNamedPropsMap0Builder](#objectwithdifficultlynamedpropsmap0builder) | setDigitOne23number(int value) | +| [ObjectWithDifficultlyNamedPropsMap0Builder](#objectwithdifficultlynamedpropsmap0builder) | setDigitOne23number(float value) | +| [ObjectWithDifficultlyNamedPropsMap0Builder](#objectwithdifficultlynamedpropsmap0builder) | setDigitOne23number(long value) | +| [ObjectWithDifficultlyNamedPropsMap0Builder](#objectwithdifficultlynamedpropsmap0builder) | setDigitOne23number(double value) | | [ObjectWithDifficultlyNamedPropsMap0Builder](#objectwithdifficultlynamedpropsmap0builder) | additionalProperty(String key, Void value) | | [ObjectWithDifficultlyNamedPropsMap0Builder](#objectwithdifficultlynamedpropsmap0builder) | additionalProperty(String key, boolean value) | | [ObjectWithDifficultlyNamedPropsMap0Builder](#objectwithdifficultlynamedpropsmap0builder) | additionalProperty(String key, String value) | @@ -153,7 +153,7 @@ A class that builds the Map input type ### Method Summary | Modifier and Type | Method and Description | | ----------------- | ---------------------- | -| [ObjectWithDifficultlyNamedPropsMap0Builder](#objectwithdifficultlynamedpropsmap0builder) | set123HyphenMinusList(String value) | +| [ObjectWithDifficultlyNamedPropsMap0Builder](#objectwithdifficultlynamedpropsmap0builder) | setDigitOne23HyphenMinusList(String value) | ## ObjectWithDifficultlyNamedPropsMap public static class ObjectWithDifficultlyNamedPropsMap
diff --git a/samples/client/petstore/java/docs/paths/fake/get/parameters/parameter1/Schema1.md b/samples/client/petstore/java/docs/paths/fake/get/parameters/parameter1/Schema1.md index 67fc0aad161..9531ac6629d 100644 --- a/samples/client/petstore/java/docs/paths/fake/get/parameters/parameter1/Schema1.md +++ b/samples/client/petstore/java/docs/paths/fake/get/parameters/parameter1/Schema1.md @@ -93,6 +93,6 @@ A class that stores String enum values ### Enum Constant Summary | Enum Constant | Description | | ------------- | ----------- | -| _ABC | value = "_abc" | +| LOW_LINE_ABC | value = "_abc" | | HYPHEN_MINUS_EFG | value = "-efg" | | LEFT_PARENTHESIS_XYZ_RIGHT_PARENTHESIS | value = "(xyz)" | diff --git a/samples/client/petstore/java/docs/paths/fake/get/parameters/parameter3/Schema3.md b/samples/client/petstore/java/docs/paths/fake/get/parameters/parameter3/Schema3.md index 1af612553c5..79ec964dfa5 100644 --- a/samples/client/petstore/java/docs/paths/fake/get/parameters/parameter3/Schema3.md +++ b/samples/client/petstore/java/docs/paths/fake/get/parameters/parameter3/Schema3.md @@ -93,6 +93,6 @@ A class that stores String enum values ### Enum Constant Summary | Enum Constant | Description | | ------------- | ----------- | -| _ABC | value = "_abc" | +| LOW_LINE_ABC | value = "_abc" | | HYPHEN_MINUS_EFG | value = "-efg" | | LEFT_PARENTHESIS_XYZ_RIGHT_PARENTHESIS | value = "(xyz)" | diff --git a/samples/client/petstore/java/docs/paths/fake/get/requestbody/content/applicationxwwwformurlencoded/ApplicationxwwwformurlencodedSchema.md b/samples/client/petstore/java/docs/paths/fake/get/requestbody/content/applicationxwwwformurlencoded/ApplicationxwwwformurlencodedSchema.md index d1cce3f100f..b522c4ad33c 100644 --- a/samples/client/petstore/java/docs/paths/fake/get/requestbody/content/applicationxwwwformurlencoded/ApplicationxwwwformurlencodedSchema.md +++ b/samples/client/petstore/java/docs/paths/fake/get/requestbody/content/applicationxwwwformurlencoded/ApplicationxwwwformurlencodedSchema.md @@ -232,7 +232,7 @@ A class that stores String enum values ### Enum Constant Summary | Enum Constant | Description | | ------------- | ----------- | -| _ABC | value = "_abc" | +| LOW_LINE_ABC | value = "_abc" | | HYPHEN_MINUS_EFG | value = "-efg" | | LEFT_PARENTHESIS_XYZ_RIGHT_PARENTHESIS | value = "(xyz)" | diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ClassModel.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ClassModel.java index 65855781634..b4814cedbaf 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ClassModel.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ClassModel.java @@ -72,7 +72,7 @@ public interface SetterForClassSchema { Map getInstance(); T getBuilderAfterClassSchema(Map instance); - default T setClass(String value) { + default T setLowLineClass(String value) { var instance = getInstance(); instance.put("_class", value); return getBuilderAfterClassSchema(instance); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/EnumClass.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/EnumClass.java index bea73702102..2e135af5e31 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/EnumClass.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/EnumClass.java @@ -23,7 +23,7 @@ public class EnumClass { // nest classes so all schemas and input/output classes can be public public enum StringEnumClassEnums implements StringValueMethod { - _ABC("_abc"), + LOW_LINE_ABC("_abc"), HYPHEN_MINUS_EFG("-efg"), LEFT_PARENTHESIS_XYZ_RIGHT_PARENTHESIS("(xyz)"), COUNT_1M("COUNT_1M"), diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithDifficultlyNamedProps.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithDifficultlyNamedProps.java index 2d7d1e7104f..d307e7c6d38 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithDifficultlyNamedProps.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/components/schemas/ObjectWithDifficultlyNamedProps.java @@ -90,7 +90,7 @@ public interface SetterForSchema123list { Map getInstance(); T getBuilderAfterSchema123list(Map instance); - default T set123HyphenMinusList(String value) { + default T setDigitOne23HyphenMinusList(String value) { var instance = getInstance(); instance.put("123-list", value); return getBuilderAfterSchema123list(instance); @@ -130,25 +130,25 @@ public interface SetterForSchema123Number { Map getInstance(); T getBuilderAfterSchema123Number(Map instance); - default T set123number(int value) { + default T setDigitOne23number(int value) { var instance = getInstance(); instance.put("123Number", value); return getBuilderAfterSchema123Number(instance); } - default T set123number(float value) { + default T setDigitOne23number(float value) { var instance = getInstance(); instance.put("123Number", value); return getBuilderAfterSchema123Number(instance); } - default T set123number(long value) { + default T setDigitOne23number(long value) { var instance = getInstance(); instance.put("123Number", value); return getBuilderAfterSchema123Number(instance); } - default T set123number(double value) { + default T setDigitOne23number(double value) { var instance = getInstance(); instance.put("123Number", value); return getBuilderAfterSchema123Number(instance); diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter1/Schema1.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter1/Schema1.java index c81dd30723a..d3e4cdf4429 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter1/Schema1.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter1/Schema1.java @@ -23,7 +23,7 @@ public class Schema1 { // nest classes so all schemas and input/output classes can be public public enum StringSchemaEnums1 implements StringValueMethod { - _ABC("_abc"), + LOW_LINE_ABC("_abc"), HYPHEN_MINUS_EFG("-efg"), LEFT_PARENTHESIS_XYZ_RIGHT_PARENTHESIS("(xyz)"); private final String value; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter3/Schema3.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter3/Schema3.java index 200f9aea989..cdf9d19c5f3 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter3/Schema3.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/parameters/parameter3/Schema3.java @@ -23,7 +23,7 @@ public class Schema3 { // nest classes so all schemas and input/output classes can be public public enum StringSchemaEnums3 implements StringValueMethod { - _ABC("_abc"), + LOW_LINE_ABC("_abc"), HYPHEN_MINUS_EFG("-efg"), LEFT_PARENTHESIS_XYZ_RIGHT_PARENTHESIS("(xyz)"); private final String value; diff --git a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/requestbody/content/applicationxwwwformurlencoded/ApplicationxwwwformurlencodedSchema.java b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/requestbody/content/applicationxwwwformurlencoded/ApplicationxwwwformurlencodedSchema.java index 373f41b31b0..bbe2de005a6 100644 --- a/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/requestbody/content/applicationxwwwformurlencoded/ApplicationxwwwformurlencodedSchema.java +++ b/samples/client/petstore/java/src/main/java/org/openapijsonschematools/client/paths/fake/get/requestbody/content/applicationxwwwformurlencoded/ApplicationxwwwformurlencodedSchema.java @@ -260,7 +260,7 @@ public ApplicationxwwwformurlencodedEnumFormStringArrayBoxed validateAndBox(@Nul } } public enum StringApplicationxwwwformurlencodedEnumFormStringEnums implements StringValueMethod { - _ABC("_abc"), + LOW_LINE_ABC("_abc"), HYPHEN_MINUS_EFG("-efg"), LEFT_PARENTHESIS_XYZ_RIGHT_PARENTHESIS("(xyz)"); private final String value; diff --git a/samples/client/petstore/python/src/petstore_api/components/schema/enum_class.py b/samples/client/petstore/python/src/petstore_api/components/schema/enum_class.py index 52682c01fac..8acb2ac30a1 100644 --- a/samples/client/petstore/python/src/petstore_api/components/schema/enum_class.py +++ b/samples/client/petstore/python/src/petstore_api/components/schema/enum_class.py @@ -15,7 +15,7 @@ class EnumClassEnums: @schemas.classproperty - def _ABC(cls) -> typing.Literal["_abc"]: + def LOW_LINE_ABC(cls) -> typing.Literal["_abc"]: return EnumClass.validate("_abc") @schemas.classproperty @@ -50,7 +50,7 @@ class EnumClass( default: typing.Literal["-efg"] = "-efg" enum_value_to_name: typing.Mapping[typing.Union[int, float, str, schemas.Bool, None], str] = dataclasses.field( default_factory=lambda: { - "_abc": "_ABC", + "_abc": "LOW_LINE_ABC", "-efg": "HYPHEN_MINUS_EFG", "(xyz)": "LEFT_PARENTHESIS_XYZ_RIGHT_PARENTHESIS", "COUNT_1M": "COUNT_1M", diff --git a/samples/client/petstore/python/src/petstore_api/paths/fake/get/parameters/parameter_1/schema.py b/samples/client/petstore/python/src/petstore_api/paths/fake/get/parameters/parameter_1/schema.py index cb90d134232..2c3393989ea 100644 --- a/samples/client/petstore/python/src/petstore_api/paths/fake/get/parameters/parameter_1/schema.py +++ b/samples/client/petstore/python/src/petstore_api/paths/fake/get/parameters/parameter_1/schema.py @@ -15,7 +15,7 @@ class SchemaEnums: @schemas.classproperty - def _ABC(cls) -> typing.Literal["_abc"]: + def LOW_LINE_ABC(cls) -> typing.Literal["_abc"]: return Schema.validate("_abc") @schemas.classproperty @@ -37,7 +37,7 @@ class Schema( default: typing.Literal["-efg"] = "-efg" enum_value_to_name: typing.Mapping[typing.Union[int, float, str, schemas.Bool, None], str] = dataclasses.field( default_factory=lambda: { - "_abc": "_ABC", + "_abc": "LOW_LINE_ABC", "-efg": "HYPHEN_MINUS_EFG", "(xyz)": "LEFT_PARENTHESIS_XYZ_RIGHT_PARENTHESIS", } diff --git a/samples/client/petstore/python/src/petstore_api/paths/fake/get/parameters/parameter_3/schema.py b/samples/client/petstore/python/src/petstore_api/paths/fake/get/parameters/parameter_3/schema.py index cb90d134232..2c3393989ea 100644 --- a/samples/client/petstore/python/src/petstore_api/paths/fake/get/parameters/parameter_3/schema.py +++ b/samples/client/petstore/python/src/petstore_api/paths/fake/get/parameters/parameter_3/schema.py @@ -15,7 +15,7 @@ class SchemaEnums: @schemas.classproperty - def _ABC(cls) -> typing.Literal["_abc"]: + def LOW_LINE_ABC(cls) -> typing.Literal["_abc"]: return Schema.validate("_abc") @schemas.classproperty @@ -37,7 +37,7 @@ class Schema( default: typing.Literal["-efg"] = "-efg" enum_value_to_name: typing.Mapping[typing.Union[int, float, str, schemas.Bool, None], str] = dataclasses.field( default_factory=lambda: { - "_abc": "_ABC", + "_abc": "LOW_LINE_ABC", "-efg": "HYPHEN_MINUS_EFG", "(xyz)": "LEFT_PARENTHESIS_XYZ_RIGHT_PARENTHESIS", } diff --git a/samples/client/petstore/python/src/petstore_api/paths/fake/get/request_body/content/application_x_www_form_urlencoded/schema.py b/samples/client/petstore/python/src/petstore_api/paths/fake/get/request_body/content/application_x_www_form_urlencoded/schema.py index 2e406e53f3f..3a68496f6fe 100644 --- a/samples/client/petstore/python/src/petstore_api/paths/fake/get/request_body/content/application_x_www_form_urlencoded/schema.py +++ b/samples/client/petstore/python/src/petstore_api/paths/fake/get/request_body/content/application_x_www_form_urlencoded/schema.py @@ -140,7 +140,7 @@ def validate( class EnumFormStringEnums: @schemas.classproperty - def _ABC(cls) -> typing.Literal["_abc"]: + def LOW_LINE_ABC(cls) -> typing.Literal["_abc"]: return EnumFormString.validate("_abc") @schemas.classproperty @@ -162,7 +162,7 @@ class EnumFormString( default: typing.Literal["-efg"] = "-efg" enum_value_to_name: typing.Mapping[typing.Union[int, float, str, schemas.Bool, None], str] = dataclasses.field( default_factory=lambda: { - "_abc": "_ABC", + "_abc": "LOW_LINE_ABC", "-efg": "HYPHEN_MINUS_EFG", "(xyz)": "LEFT_PARENTHESIS_XYZ_RIGHT_PARENTHESIS", }