apply new indent() and render_javadoc() functions

Author: MrMaydo

src/enum_generator.py

@@ -1,8 +1,8 @@
 import re
 from typing import List
 
-from src.java_model import EnumClass, indent_lvl1, indent_lvl2, indent_lvl3
-from src.header_generator import set_package
+from src.java_model import EnumClass, indent
+from src.header_generator import set_package, render_javadoc
 
 
 def to_java_constant(value: str) -> str:
@@ -22,14 +22,14 @@ def generate_enum_class(enum_class: EnumClass, package: str) -> str:
         f"import java.util.HashMap;",
         f"import java.util.Map;",
         f"",
-        _get_javadoc(enum_class.description),
+        render_javadoc(enum_class.description, indent_lvl=0),
         f"public enum {enum_class.name} {{",
         _get_constants(enum_class.values),
         f"",
-        f"{indent_lvl1}private final static Map<String, {enum_class.name}> CONSTANTS = new HashMap<String, {enum_class.name}>();",
+        f"{indent(1)}private final static Map<String, {enum_class.name}> CONSTANTS = new HashMap<String, {enum_class.name}>();",
         _get_static_method(enum_class.name),
         f"",
-        f"{indent_lvl1}private final String value;",
+        f"{indent(1)}private final String value;",
         _get_constructor(enum_class.name),
         _get_from_value_method(enum_class.name),
         _get_to_string_method(),
@@ -41,81 +41,69 @@ def generate_enum_class(enum_class: EnumClass, package: str) -> str:
     return "\n".join(enum_body)
 
 
-def _get_javadoc(description: str) -> str:
-    javadoc = [""]
-    if description is not None:
-        javadoc = [
-            "",
-            "/**",
-            f" * {description}",
-            " */"
-        ]
-    return "\n".join(javadoc)
-
-
 def _get_constants(constants: List[str]) -> str:
     values = []
     for i, value in enumerate(constants):
         line_end = ";" if i == (len(constants) - 1) else ","
         values.append(
-            f'{indent_lvl1}{to_java_constant(value)}("{value}"){line_end}'
+            f'{indent(1)}{to_java_constant(value)}("{value}"){line_end}'
         )
     return "\n".join(values)
 
 
 def _get_static_method(class_name: str) -> str:
     body = [
         "",
-        f"{indent_lvl1}static {{",
-        f"{indent_lvl2}for ({class_name} c : values()) {{",
-        f"{indent_lvl3}CONSTANTS.put(c.value, c);",
-        f"{indent_lvl2}}}",
-        f"{indent_lvl1}}}"
+        f"{indent(1)}static {{",
+        f"{indent(2)}for ({class_name} c : values()) {{",
+        f"{indent(3)}CONSTANTS.put(c.value, c);",
+        f"{indent(2)}}}",
+        f"{indent(1)}}}"
     ]
     return "\n".join(body)
 
 
 def _get_constructor(class_name: str) -> str:
     body = [
         "",
-        f"{indent_lvl1}{class_name}(String value) {{",
-        f"{indent_lvl2}this.value = value;",
-        f"{indent_lvl1}}}"
+        f"{indent(1)}{class_name}(String value) {{",
+        f"{indent(2)}this.value = value;",
+        f"{indent(1)}}}"
     ]
     return "\n".join(body)
 
 
 def _get_from_value_method(class_name: str) -> str:
     body = [
         "",
-        f"{indent_lvl1}public static {class_name} fromValue(String value) {{",
-        f"{indent_lvl2}{class_name} constant = CONSTANTS.get(value);",
-        f"{indent_lvl2}if (constant == null) {{",
-        f"{indent_lvl3}throw new IllegalArgumentException(value);",
-        f"{indent_lvl2}}} else {{",
-        f"{indent_lvl3}return constant;",
-        f"{indent_lvl2}}}",
-        f"{indent_lvl1}}}"
+        f"{indent(1)}public static {class_name} fromValue(String value) {{",
+        f"{indent(2)}{class_name} constant = CONSTANTS.get(value);",
+        f"{indent(2)}if (constant == null) {{",
+        f"{indent(3)}throw new IllegalArgumentException(value);",
+        f"{indent(2)}}} else {{",
+        f"{indent(3)}return constant;",
+        f"{indent(2)}}}",
+        f"{indent(1)}}}"
     ]
     return "\n".join(body)
 
 
 def _get_to_string_method() -> str:
     body = [
         "",
-        f"{indent_lvl1}@Override",
-        f"{indent_lvl1}public String toString() {{",
-        f"{indent_lvl2}return this.value;",
-        f"{indent_lvl1}}}"
+        f"{indent(1)}@Override",
+        f"{indent(1)}public String toString() {{",
+        f"{indent(2)}return this.value;",
+        f"{indent(1)}}}"
     ]
     return "\n".join(body)
 
 
 def _get_value_method() -> str:
     body = [
         "",
-        f"{indent_lvl1}public String value() {{",
-        f"{indent_lvl2}return this.value;",
-        f"{indent_lvl1}}}"
+        f"{indent(1)}public String value() {{",
+        f"{indent(2)}return this.value;",
+        f"{indent(1)}}}"
     ]
     return "\n".join(body)

src/header_generator.py

@@ -21,7 +21,7 @@ def set_imports(fields: List[Field]) -> str:
 
 
 def render_javadoc(description: Union[str, None], indent_lvl: int) -> str:
-    if description is None or description == "":
+    if not description:
         return ""
 
     return "\n".join([

src/java_method_generator.py

@@ -1,8 +1,8 @@
 import re
 from typing import List
 
-from src.java_model import JAVA_KEYWORDS, JAVA_BUILTIN_TYPES, JAVA_LITERALS, indent_lvl1, indent_lvl2, indent_lvl3, \
-    return_indent, Field
+from src.header_generator import render_javadoc
+from src.java_model import JAVA_KEYWORDS, JAVA_BUILTIN_TYPES, JAVA_LITERALS, Field, indent
 
 
 def generate_fields_block(fields: List[Field]) -> str:
@@ -17,24 +17,12 @@ def generate_field_declaration(field: Field) -> str:
     _validate_java_field_name(field.name)
 
     declaration = [
-        _render_javadoc(field),
-        f"{indent_lvl1}private {field.type} {field.name};"
+        render_javadoc(field.description, indent_lvl=1),
+        f"{indent(1)}private {field.type} {field.name};"
     ]
     return "\n".join(declaration)
 
 
-def _render_javadoc(field: Field) -> str:
-    if field.description is None:
-        return ""
-
-    return "\n".join([
-        "",
-        f"{indent_lvl1}/**",
-        f"{indent_lvl1} * {field.description}",
-        f"{indent_lvl1} */"
-    ])
-
-
 def generate_getters_and_setters(fields: List[Field]) -> str:
     methods = []
     for field in fields:
@@ -49,9 +37,9 @@ def generate_getter(field: Field) -> str:
 
     getter = [
         "",
-        f"{indent_lvl1}public {field.type} {getter_name}() {{",
-        f"{indent_lvl2}return {field.name};",
-        f"{indent_lvl1}}}"
+        f"{indent(1)}public {field.type} {getter_name}() {{",
+        f"{indent(2)}return {field.name};",
+        f"{indent(1)}}}"
     ]
     return "\n".join(getter)
 
@@ -61,29 +49,29 @@ def generate_setter(field: Field) -> str:
 
     setter = [
         "",
-        f"{indent_lvl1}public void {setter_name}({field.type} {field.name}) {{",
-        f"{indent_lvl2}this.{field.name} = {field.name};",
-        f"{indent_lvl1}}}"
+        f"{indent(1)}public void {setter_name}({field.type} {field.name}) {{",
+        f"{indent(2)}this.{field.name} = {field.name};",
+        f"{indent(1)}}}"
     ]
     return "\n".join(setter)
 
 
 def generate_equals(class_name: str, fields: List[Field]) -> str:
     equals = [
         "",
-        f"{indent_lvl1}@Override",
-        f"{indent_lvl1}public boolean equals(Object obj) {{",
+        f"{indent(1)}@Override",
+        f"{indent(1)}public boolean equals(Object obj) {{",
 
-        f"{indent_lvl2}if (this == obj)",
-        f"{indent_lvl3}return true;",
+        f"{indent(2)}if (this == obj)",
+        f"{indent(3)}return true;",
 
-        f"{indent_lvl2}if (!(obj instanceof {class_name}))",
-        f"{indent_lvl3}return false;",
+        f"{indent(2)}if (!(obj instanceof {class_name}))",
+        f"{indent(3)}return false;",
 
-        f"{indent_lvl2}{class_name} that = ({class_name}) obj;",
+        f"{indent(2)}{class_name} that = ({class_name}) obj;",
 
         _render_equals_return_statement(fields),
-        f"{indent_lvl1}}}"
+        f"{indent(1)}}}"
     ]
 
     return "\n".join(equals)
@@ -95,20 +83,20 @@ def _render_equals_return_statement(fields: List[Field]) -> str:
         getter_name = _build_getter_name(field.name)
         end_line = ";" if i == (len(fields) - 1) else ""
         if i == 0:
-            return_statement.append(f"{indent_lvl2}return Objects.equals({getter_name}(), that.{getter_name}()){end_line}")
+            return_statement.append(f"{indent(2)}return Objects.equals({getter_name}(), that.{getter_name}()){end_line}")
         else:
             return_statement.append(
-                f"{indent_lvl2}{return_indent}&& Objects.equals({getter_name}(), that.{getter_name}()){end_line}")
+                f"{indent(4)}&& Objects.equals({getter_name}(), that.{getter_name}()){end_line}")
     return "\n".join(return_statement)
 
 
 def generate_hash_code(fields: List[Field]) -> str:
     hash_code = [
         "",
-        f"{indent_lvl1}@Override",
-        f"{indent_lvl1}public int hashCode() {{",
+        f"{indent(1)}@Override",
+        f"{indent(1)}public int hashCode() {{",
         _render_hashcode_return_statement(fields),
-        f"{indent_lvl1}}}"
+        f"{indent(1)}}}"
     ]
 
     return "\n".join(hash_code)
@@ -124,17 +112,17 @@ def _render_hashcode_return_statement(fields: List[Field]) -> str:
 def _render_hashcode_return_statement_single_field(fields: List[Field]) -> str:
     field_name = fields[0].name
     getter_name = _build_getter_name(field_name)
-    return f"{indent_lvl2}return Objects.hash({getter_name}());"
+    return f"{indent(2)}return Objects.hash({getter_name}());"
 
 
 def _render_hashcode_return_statement_multiple_field(fields: List[Field]) -> str:
-    return_statement = [f"{indent_lvl2}return Objects.hash("]
+    return_statement = [f"{indent(2)}return Objects.hash("]
     for index, field in enumerate(fields):
         getter_name = _build_getter_name(field.name)
         comma = "," if index < (len(fields) - 1) else ""
-        return_statement.append(f"{indent_lvl2}{return_indent}{getter_name}(){comma}")
+        return_statement.append(f"{indent(4)}{getter_name}(){comma}")
 
-    return_statement.append(f"{indent_lvl2});")
+    return_statement.append(f"{indent(2)});")
 
     return "\n".join(return_statement)
 

src/java_model.py

@@ -18,10 +18,6 @@
 JAVA_LITERALS = {
     "null", "true", "false"
 }
-indent_lvl1 = " " * 4
-indent_lvl2 = indent_lvl1 * 2
-indent_lvl3 = indent_lvl1 * 3
-return_indent = "        "
 
 
 @dataclass