Iteration after the reviews

karapace/protobuf/compare_type_lists.py

@@ -11,12 +11,12 @@
 from karapace.protobuf.exception import IllegalStateException
 from karapace.protobuf.message_element import MessageElement
 from karapace.protobuf.type_element import TypeElement
-from typing import List
+from typing import Sequence
 
 
 def compare_type_lists(
-    self_types_list: List[TypeElement],
-    other_types_list: List[TypeElement],
+    self_types_list: Sequence[TypeElement],
+    other_types_list: Sequence[TypeElement],
     result: CompareResult,
     compare_types: CompareTypes,
 ) -> CompareResult:

karapace/protobuf/enum_element.py

@@ -14,6 +14,7 @@
 from karapace.protobuf.option_element import OptionElement
 from karapace.protobuf.type_element import TypeElement
 from karapace.protobuf.utils import append_documentation, append_indented
+from typing import Sequence
 
 
 class EnumElement(TypeElement):
@@ -22,8 +23,8 @@ def __init__(
         location: Location,
         name: str,
         documentation: str = "",
-        options: list[OptionElement] | None = None,
-        constants: list[EnumConstantElement] | None = None,
+        options: Sequence[OptionElement] | None = None,
+        constants: Sequence[EnumConstantElement] | None = None,
     ) -> None:
         # Enums do not allow nested type declarations.
         super().__init__(location, name, documentation, options or [], [])

karapace/protobuf/extend_element.py

@@ -10,14 +10,15 @@
 from karapace.protobuf.field_element import FieldElement
 from karapace.protobuf.location import Location
 from karapace.protobuf.utils import append_documentation, append_indented
+from typing import Sequence
 
 
 @dataclass
 class ExtendElement:
     location: Location
     name: str
     documentation: str = ""
-    fields: list[FieldElement] | None = None
+    fields: Sequence[FieldElement] | None = None
 
     def to_schema(self) -> str:
         result: list[str] = []

karapace/protobuf/group_element.py

@@ -11,6 +11,7 @@
 from karapace.protobuf.field_element import FieldElement
 from karapace.protobuf.location import Location
 from karapace.protobuf.utils import append_documentation, append_indented
+from typing import Sequence
 
 
 @dataclass
@@ -20,7 +21,7 @@ class GroupElement:
     name: str
     tag: int
     documentation: str = ""
-    fields: list[FieldElement] | None = None
+    fields: Sequence[FieldElement] | None = None
 
     def to_schema(self) -> str:
         result: list[str] = []

karapace/protobuf/message_element.py

@@ -19,21 +19,27 @@
 from karapace.protobuf.reserved_element import ReservedElement
 from karapace.protobuf.type_element import TypeElement
 from karapace.protobuf.utils import append_documentation, append_indented
+from typing import Sequence
 
 
 class MessageElement(TypeElement):
+    nested_types: Sequence[TypeElement]
+    fields: Sequence[FieldElement]
+    one_ofs: Sequence[OneOfElement]
+    groups: Sequence[GroupElement]
+
     def __init__(
         self,
         location: Location,
         name: str,
         documentation: str = "",
-        nested_types: list[TypeElement] | None = None,
-        options: list[OptionElement] | None = None,
-        reserveds: list[ReservedElement] | None = None,
-        fields: list[FieldElement] | None = None,
-        one_ofs: list[OneOfElement] | None = None,
-        extensions: list[ExtensionsElement] | None = None,
-        groups: list[GroupElement] | None = None,
+        nested_types: Sequence[TypeElement] | None = None,
+        options: Sequence[OptionElement] | None = None,
+        reserveds: Sequence[ReservedElement] | None = None,
+        fields: Sequence[FieldElement] | None = None,
+        one_ofs: Sequence[OneOfElement] | None = None,
+        extensions: Sequence[ExtensionsElement] | None = None,
+        groups: Sequence[GroupElement] | None = None,
     ) -> None:
         super().__init__(location, name, documentation, options or [], nested_types or [])
         self.reserveds = reserveds or []

karapace/protobuf/one_of_element.py

@@ -14,16 +14,17 @@
 from karapace.protobuf.group_element import GroupElement
 from karapace.protobuf.option_element import OptionElement
 from karapace.protobuf.utils import append_documentation, append_indented
+from typing import Sequence
 
 
 class OneOfElement:
     def __init__(
         self,
         name: str,
         documentation: str = "",
-        fields: list[FieldElement] | None = None,
-        groups: list[GroupElement] | None = None,
-        options: list[OptionElement] | None = None,
+        fields: Sequence[FieldElement] | None = None,
+        groups: Sequence[GroupElement] | None = None,
+        options: Sequence[OptionElement] | None = None,
     ) -> None:
         self.name = name
         self.documentation = documentation

karapace/protobuf/proto_file_element.py

@@ -13,7 +13,7 @@
 from karapace.protobuf.service_element import ServiceElement
 from karapace.protobuf.syntax import Syntax
 from karapace.protobuf.type_element import TypeElement
-from typing import Dict, List, NewType, Optional
+from typing import Dict, List, NewType, Optional, Sequence
 
 
 def _collect_dependencies_types(compare_types: CompareTypes, dependencies: Optional[Dict[str, Dependency]], is_self: bool):
@@ -37,17 +37,21 @@ def _collect_dependencies_types(compare_types: CompareTypes, dependencies: Optio
 
 
 class ProtoFileElement:
+    types: Sequence[TypeElement]
+    services: Sequence[ServiceElement]
+    extend_declarations: Sequence[ExtendElement]
+
     def __init__(
         self,
         location: Location,
         package_name: Optional[PackageName] = None,
         syntax: Optional[Syntax] = None,
-        imports: Optional[List[TypeName]] = None,
-        public_imports: Optional[List[TypeName]] = None,
-        types: Optional[List[TypeElement]] = None,
-        services: Optional[List[ServiceElement]] = None,
-        extend_declarations: Optional[List[ExtendElement]] = None,
-        options: Optional[List[OptionElement]] = None,
+        imports: Optional[Sequence[TypeName]] = None,
+        public_imports: Optional[Sequence[TypeName]] = None,
+        types: Optional[Sequence[TypeElement]] = None,
+        services: Optional[Sequence[ServiceElement]] = None,
+        extend_declarations: Optional[Sequence[ExtendElement]] = None,
+        options: Optional[Sequence[OptionElement]] = None,
     ) -> None:
         if types is None:
             types = list()