Skip to content

Commit 318e0c9

Browse files
committed
handle enum string starting with numbers
1 parent 16531c8 commit 318e0c9

7 files changed

Lines changed: 20 additions & 19 deletions

File tree

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1530,7 +1530,7 @@ public GeneratorLanguage generatorLanguage() {
15301530

15311531
@Override
15321532
public String toEnumVarName(String name, String datatype) {
1533-
if (name.length() == 0) {
1533+
if (name.isEmpty()) {
15341534
return "EMPTY";
15351535
}
15361536

@@ -1539,8 +1539,9 @@ public String toEnumVarName(String name, String datatype) {
15391539
return (getSymbolName(name)).toUpperCase(Locale.ROOT);
15401540
}
15411541

1542-
// number
1543-
if ("Int16".equals(datatype) || "Int32".equals(datatype) || "Int64".equals(datatype) ||
1542+
if (name.matches("^\\d.*") || // any data type (including string) starting with a number
1543+
// numeric data type
1544+
"Int16".equals(datatype) || "Int32".equals(datatype) || "Int64".equals(datatype) ||
15441545
"UInt16".equals(datatype) || "UInt32".equals(datatype) || "UInt64".equals(datatype) ||
15451546
"Double".equals(datatype) || "Single".equals(datatype) || "Decimal".equals(datatype)) {
15461547
String varName = name;

modules/openapi-generator/src/main/resources/powershell/model_enum.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ enum {{{classname}}} {
1212
{{#allowableValues}}
1313
{{#enumVars}}
1414
# enum value: {{{value}}}
15-
"{{{name}}}"
15+
{{{name}}}
1616
{{/enumVars}}
1717
{{/allowableValues}}
1818
}

samples/client/petstore/powershell/src/PSPetstore/Model/OuterEnum.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ No description available.
1717

1818
enum OuterEnum {
1919
# enum value: "placed"
20-
"placed"
20+
placed
2121
# enum value: "approved"
22-
"approved"
22+
approved
2323
# enum value: "delivered"
24-
"delivered"
24+
delivered
2525
}
2626

samples/client/petstore/powershell/src/PSPetstore/Model/OuterEnumDefaultValue.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ No description available.
1717

1818
enum OuterEnumDefaultValue {
1919
# enum value: "placed"
20-
"placed"
20+
placed
2121
# enum value: "approved"
22-
"approved"
22+
approved
2323
# enum value: "delivered"
24-
"delivered"
24+
delivered
2525
}
2626

samples/client/petstore/powershell/src/PSPetstore/Model/OuterEnumInteger.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ No description available.
1717

1818
enum OuterEnumInteger {
1919
# enum value: "0"
20-
"NUMBER_0"
20+
NUMBER_0
2121
# enum value: "1"
22-
"NUMBER_1"
22+
NUMBER_1
2323
# enum value: "2"
24-
"NUMBER_2"
24+
NUMBER_2
2525
}
2626

samples/client/petstore/powershell/src/PSPetstore/Model/OuterEnumIntegerDefaultValue.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ No description available.
1717

1818
enum OuterEnumIntegerDefaultValue {
1919
# enum value: "0"
20-
"NUMBER_0"
20+
NUMBER_0
2121
# enum value: "1"
22-
"NUMBER_1"
22+
NUMBER_1
2323
# enum value: "2"
24-
"NUMBER_2"
24+
NUMBER_2
2525
}
2626

samples/client/petstore/powershell/src/PSPetstore/Model/OuterEnumStringStartingWithNumber.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ No description available.
1717

1818
enum OuterEnumStringStartingWithNumber {
1919
# enum value: "0"
20-
"0"
20+
NUMBER_0
2121
# enum value: "1"
22-
"1"
22+
NUMBER_1
2323
# enum value: "2"
24-
"2"
24+
NUMBER_2
2525
}
2626

0 commit comments

Comments
 (0)