create_java model file

Author: MrMaydo

src/enum_generator.py

@@ -1,22 +1,10 @@
 import re
-from dataclasses import dataclass
-from typing import List, Optional
+from typing import List
 
+from src.java_model import EnumClass, indent_lvl1, indent_lvl2, indent_lvl3
 from src.header_generator import set_package
 
 
-@dataclass
-class EnumClass:
-    name: str
-    values: List[str]
-    description: Optional[str] = None
-
-
-indent_lvl1 = "    "
-indent_lvl2 = indent_lvl1 * 2
-indent_lvl3 = indent_lvl1 * 3
-
-
 def to_java_constant(value: str) -> str:
     value = re.sub(r"[^A-Za-z0-9]", "_", value)  # delimiters a-a -> A_A
     value = re.sub(r"([a-z])[_]?([A-Z])([A-Z])([a-z])", r"\1_\2_\3\4", value)  # aBCd / a_BCd-> a_B_CD
@@ -34,15 +22,16 @@ def generate_enum_class(enum_class: EnumClass, package: str) -> str:
         f"import java.util.HashMap;",
         f"import java.util.Map;",
         f""
-        ]
+    ]
 
     enum_body.extend(_get_javadoc(enum_class.description))
 
     enum_body.append(f"public enum {enum_class.name} {{")
     enum_body.extend(_get_constants(enum_class.values))
 
     enum_body.append(f"")
-    enum_body.append(f"{indent_lvl1}private final static Map<String, {enum_class.name}> CONSTANTS = new HashMap<String, {enum_class.name}>();")
+    enum_body.append(
+        f"{indent_lvl1}private final static Map<String, {enum_class.name}> CONSTANTS = new HashMap<String, {enum_class.name}>();")
     enum_body.append(f"")
     enum_body.extend(_get_static_method(enum_class.name))
 
@@ -52,10 +41,10 @@ def generate_enum_class(enum_class: EnumClass, package: str) -> str:
     enum_body.extend(_get_constructor(enum_class.name))
 
     enum_body.append(f"")
-    enum_body.extend(_get_fromValue_method(enum_class.name))
+    enum_body.extend(_get_from_value_method(enum_class.name))
 
     enum_body.append(f"")
-    enum_body.extend(_get_toString_method())
+    enum_body.extend(_get_to_string_method())
 
     enum_body.append(f"")
     enum_body.extend(_get_value_method())
@@ -107,7 +96,7 @@ def _get_constructor(class_name: str) -> List[str]:
     return body
 
 
-def _get_fromValue_method(class_name: str) -> List[str]:
+def _get_from_value_method(class_name: str) -> List[str]:
     body = [
         f"{indent_lvl1}public static {class_name} fromValue(String value) {{",
         f"{indent_lvl2}{class_name} constant = CONSTANTS.get(value);",
@@ -121,7 +110,7 @@ def _get_fromValue_method(class_name: str) -> List[str]:
     return body
 
 
-def _get_toString_method() -> List[str]:
+def _get_to_string_method() -> List[str]:
     body = [
         f"{indent_lvl1}@Override",
         f"{indent_lvl1}public String toString() {{",

src/method_generator.py src/java_method_generator.pysrc/method_generator.py renamed to src/java_method_generator.py

@@ -1,38 +1,8 @@
 import re
-from dataclasses import dataclass
-from typing import List, Optional
-
-JAVA_KEYWORDS = {
-    "abstract", "assert", "boolean", "break", "byte", "case", "catch",
-    "char", "class", "const", "continue", "default", "do", "double",
-    "else", "enum", "extends", "final", "finally", "float", "for",
-    "goto", "if", "implements", "import", "instanceof", "int",
-    "interface", "long", "native", "new", "package", "private",
-    "protected", "public", "return", "short", "static", "strictfp",
-    "super", "switch", "synchronized", "this", "throw", "throws",
-    "transient", "try", "void", "volatile", "while"
-}
-
-JAVA_BUILTIN_TYPES = {
-    "Boolean", "Byte", "Character", "Double", "Float", "Integer", "List", "Long", "Short",
-    "Class", "Object", "String", "Void"
-}
-
-JAVA_LITERALS = {
-    "null", "true", "false"
-}
-
-indent_lvl1 = "    "
-indent_lvl2 = indent_lvl1 * 2
-indent_lvl3 = indent_lvl1 * 3
-return_indent = "        "
-
-
-@dataclass
-class Field:
-    name: str
-    type: str
-    description: Optional[str] = None
+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
 
 
 def generate_fields_block(fields: List[Field]) -> str:
@@ -129,7 +99,8 @@ def generate_equals(class_name: str, fields: List[Field]) -> str:
         if i == 0:
             equals.append(f"{indent_lvl2}return Objects.equals({getter_name}(), that.{getter_name}()){semicolon}")
         else:
-            equals.append(f"{indent_lvl2}{return_indent}&& Objects.equals({getter_name}(), that.{getter_name}()){semicolon}")
+            equals.append(
+                f"{indent_lvl2}{return_indent}&& Objects.equals({getter_name}(), that.{getter_name}()){semicolon}")
     equals.append(f"{indent_lvl1}}}")
 
     return "\n".join(equals)
@@ -186,4 +157,3 @@ def _validate_java_identifier(name: str) -> None:
 
     if not re.match(r"^[A-Za-z_][A-Za-z0-9_]*$", name):
         raise ValueError(f"Invalid Java identifier: '{name}'")
-

src/java_model.py

@@ -0,0 +1,38 @@
+from dataclasses import dataclass
+from typing import List, Optional
+
+JAVA_KEYWORDS = {
+    "abstract", "assert", "boolean", "break", "byte", "case", "catch",
+    "char", "class", "const", "continue", "default", "do", "double",
+    "else", "enum", "extends", "final", "finally", "float", "for",
+    "goto", "if", "implements", "import", "instanceof", "int",
+    "interface", "long", "native", "new", "package", "private",
+    "protected", "public", "return", "short", "static", "strictfp",
+    "super", "switch", "synchronized", "this", "throw", "throws",
+    "transient", "try", "void", "volatile", "while"
+}
+JAVA_BUILTIN_TYPES = {
+    "Boolean", "Byte", "Character", "Double", "Float", "Integer", "List", "Long", "Short",
+    "Class", "Object", "String", "Void"
+}
+JAVA_LITERALS = {
+    "null", "true", "false"
+}
+indent_lvl1 = " " * 4
+indent_lvl2 = indent_lvl1 * 2
+indent_lvl3 = indent_lvl1 * 3
+return_indent = "        "
+
+
+@dataclass
+class EnumClass:
+    name: str
+    values: List[str]
+    description: Optional[str] = None
+
+
+@dataclass
+class Field:
+    name: str
+    type: str
+    description: Optional[str] = None

tests/reference_data.py

@@ -1,4 +1,4 @@
-from src.method_generator import Field
+from src.java_model import Field
 
 field_exampleAttribute_int = Field(name="exampleAttribute", type="int", description="javadoc description")
 field_someName_String = Field(name="someName", type="String")

tests/test_method_generator.py tests/test_java_method_generator.pytests/test_method_generator.py renamed to tests/test_java_method_generator.py

@@ -1,7 +1,7 @@
 import pytest
 
 from tests.reference_data import *
-from src.method_generator import *
+from src.java_method_generator import *
 
 JAVA_KEYWORDS = {
     "abstract", "assert", "boolean", "break", "byte", "case", "catch",