fixing param name

Author: andrewwilsonnew

bin/configs/protobuf-schema-config.yaml

@@ -10,7 +10,7 @@ additionalProperties:
   wrapComplexType: false
   supportMultipleResponses: false
   aggregateModelsName: data
-  enumSimpleName: true
+  useSimplifiedEnumNames: true
 typeMappings:
   object: "google.protobuf.Struct"
 importMappings:

docs/generators/protobuf-schema.md

@@ -20,7 +20,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 | ------ | ----------- | ------ | ------- |
 |addJsonNameAnnotation|Append "json_name" annotation to message field when the specification name differs from the protobuf field name| |false|
 |aggregateModelsName|Aggregated model filename. If set, all generated models will be combined into this single file.| |null|
-|enumSimpleName|Use a simple name for enums| |false|
+|useSimplifiedEnumNames|Use a simple name for enums| |false|
 |numberedFieldNumberList|Field numbers in order.| |false|
 |startEnumsWithUnspecified|Introduces "UNSPECIFIED" as the first element of enumerations.| |false|
 |supportMultipleResponses|Support multiple responses| |true|

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

@@ -66,7 +66,7 @@ public class ProtobufSchemaCodegen extends DefaultCodegen implements CodegenConf
 
     public static final String WRAP_COMPLEX_TYPE = "wrapComplexType";
 
-    public static final String SIMPLE_ENUM_NAME = "enumSimpleName";
+    public static final String USE_SIMPLIFIED_ENUM_NAMES = "useSimplifiedEnumNames";
 
     public static final String AGGREGATE_MODELS_NAME = "aggregateModelsName";
 
@@ -86,7 +86,7 @@ public class ProtobufSchemaCodegen extends DefaultCodegen implements CodegenConf
 
     private boolean wrapComplexType = true;
 
-    private boolean simpleEnumName = false;
+    private boolean useSimplifiedEnumNames = false;
 
     private boolean supportMultipleResponses = true;
 
@@ -200,7 +200,7 @@ public ProtobufSchemaCodegen() {
         addSwitch(START_ENUMS_WITH_UNSPECIFIED, "Introduces \"UNSPECIFIED\" as the first element of enumerations.", startEnumsWithUnspecified);
         addSwitch(ADD_JSON_NAME_ANNOTATION, "Append \"json_name\" annotation to message field when the specification name differs from the protobuf field name", addJsonNameAnnotation);
         addSwitch(WRAP_COMPLEX_TYPE, "Generate Additional message for complex type", wrapComplexType);
-        addSwitch(SIMPLE_ENUM_NAME, "Use a simple name for enums", simpleEnumName);
+        addSwitch(USE_SIMPLIFIED_ENUM_NAMES, "Use a simple name for enums", useSimplifiedEnumNames);
         addSwitch(SUPPORT_MULTIPLE_RESPONSES, "Support multiple responses", supportMultipleResponses);
         addOption(AGGREGATE_MODELS_NAME, "Aggregated model filename. If set, all generated models will be combined into this single file.", null);
     }
@@ -245,8 +245,8 @@ public void processOpts() {
             this.wrapComplexType = convertPropertyToBooleanAndWriteBack(WRAP_COMPLEX_TYPE);
         }
 
-        if (additionalProperties.containsKey(SIMPLE_ENUM_NAME)) {
-            this.simpleEnumName = convertPropertyToBooleanAndWriteBack(SIMPLE_ENUM_NAME);
+        if (additionalProperties.containsKey(USE_SIMPLIFIED_ENUM_NAMES)) {
+            this.useSimplifiedEnumNames = convertPropertyToBooleanAndWriteBack(USE_SIMPLIFIED_ENUM_NAMES);
         }
 
         if (additionalProperties.containsKey(AGGREGATE_MODELS_NAME)) {
@@ -507,15 +507,15 @@ public void addEnumValuesPrefix(Map<String, Object> allowableValues, String pref
             prefix = CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_UNDERSCORE, prefix);
             for (Map<String, Object> value : enumVars) {
                 String name = (String) value.get("name");
-                value.put("name", simpleEnumName ? name : prefix + "_" + name);
-                value.put("value", simpleEnumName ? name : "\"" + prefix + "_" + name + "\"");
+                value.put("name", useSimplifiedEnumNames ? name : prefix + "_" + name);
+                value.put("value", useSimplifiedEnumNames ? name : "\"" + prefix + "_" + name + "\"");
             }
         }
 
         if (allowableValues.containsKey("values")) {
             List<Object> values = (List<Object>) allowableValues.get("values");
             for (Object value : values) {
-                value = simpleEnumName ? value : prefix + "_" + value;
+                value = useSimplifiedEnumNames ? value : prefix + "_" + value;
             }
         }
     }

modules/openapi-generator/src/test/java/org/openapitools/codegen/protobuf/ProtobufSchemaCodegenTest.java

@@ -43,7 +43,7 @@
 import java.util.Map;
 
 import static org.openapitools.codegen.TestUtils.createCodegenModelWrapper;
-import static org.openapitools.codegen.languages.ProtobufSchemaCodegen.SIMPLE_ENUM_NAME;
+import static org.openapitools.codegen.languages.ProtobufSchemaCodegen.USE_SIMPLIFIED_ENUM_NAMES;
 import static org.testng.Assert.assertEquals;
 
 public class ProtobufSchemaCodegenTest {
@@ -169,7 +169,7 @@ private void testEnumValues(boolean simpleEnumValue) {
         OpenAPI openAPI = TestUtils.createOpenAPIWithOneSchema("sample", model);
         codegen.setOpenAPI(openAPI);
         final CodegenModel cm = codegen.fromModel("sample", model);
-        codegen.additionalProperties().put(SIMPLE_ENUM_NAME, simpleEnumValue);
+        codegen.additionalProperties().put(USE_SIMPLIFIED_ENUM_NAMES, simpleEnumValue);
         codegen.processOpts();
         codegen.postProcessModels(createCodegenModelWrapper(cm));