fix names

Author: nogates

.generator/conftest.py

@@ -24,7 +24,7 @@
     format_data_with_schema,
     get_response_type,
     upperfirst,
-    escape_method_reserved_names,
+    escape_method_reserved_name,
 )
 
 
@@ -76,7 +76,7 @@ def lookup(value, path):
 JINJA_ENV.globals["format_parameters"] = format_parameters
 JINJA_ENV.globals["get_response_type"] = get_response_type
 JINJA_ENV.globals["get_type_at_path"] = openapi.get_type_at_path
-JINJA_ENV.filters["escape_method_reserved_names"] = escape_method_reserved_names
+JINJA_ENV.filters["escape_method_reserved_name"] = escape_method_reserved_name
 
 JAVA_EXAMPLE_J2 = JINJA_ENV.get_template("example.j2")
 

.generator/src/generator/formatter.py

@@ -131,7 +131,7 @@ def untitle_case(value):
 def upperfirst(value):
     return value[0].upper() + value[1:]
 
-def escape_method_reserved_names(method_name):
+def escape_method_reserved_name(method_name):
     """
     Escape reserved language keywords for method names like getClass, setClass, isClass, etc.
     """

.generator/src/generator/templates/modelSimple.j2

@@ -216,7 +216,7 @@ public class {{ name }} {%- if model.get("x-generate-alias-as-model") %} extends
         {%- if schema.additionalProperties is defined and schema.additionalProperties is not false %}{%- if schema.additionalProperties.nullable %}content = JsonInclude.Include.ALWAYS,{%- endif %}{%- endif %}
         value = JsonInclude.Include.{%- if isRequired %}ALWAYS{%- else %}USE_DEFAULTS{%- endif %})
     {%- endif %}
-      public {{ dataType }} get{{ attr|camel_case|upperfirst|escape_reserved_keyword }}() {
+      public {{ dataType }} get{{ attr|camel_case|upperfirst|escape_method_reserved_name }}() {
         {%- if not isRequired and isNullable %}
         {%- if schema.get("readOnly", False) %}
 
@@ -247,7 +247,7 @@ public class {{ name }} {%- if model.get("x-generate-alias-as-model") %} extends
   {%- endif %}
 
   {%- if not schema.get("readOnly", False) %}
-  public void set{{ attr|camel_case|upperfirst|escape_reserved_keyword }}({{  dataType }} {{ variableName }}) {
+  public void set{{ attr|camel_case|upperfirst|escape_method_reserved_name }}({{  dataType }} {{ variableName }}) {
     {%- if schema.enum is defined %}
     if (!{{ variableName }}.isValid()) {
         this.unparsed = true;