lutaml 0.10.13 → 0.10.14

data/lib/lutaml/qea/factory/association_builder.rb

@@ -11,147 +11,42 @@ module Lutaml
         def load_class_associations(object_id, object_guid)
           return [] if object_id.nil?
 
-          associations = []
           normalized_owner_xmi_id = normalize_guid_to_xmi_format(object_guid,
                                                                  "EAID")
 
           assoc_connectors = database.connectors_for_object(object_id)
             .select { |c| ASSOC_TYPES.include?(c.connector_type) }
 
-          assoc_connectors.each do |ea_connector|
-            is_start = ea_connector.start_object_id == object_id
-
-            owner_end_attribute_name = if is_start
-                                         ea_connector.destrole
-                                       else
-                                         ea_connector.sourcerole
-                                       end
-
-            if owner_end_attribute_name.nil? || owner_end_attribute_name.empty?
-              next
-            end
-
-            member_obj = if is_start
-                           find_object_by_id(ea_connector.end_object_id)
-                         else
-                           find_object_by_id(ea_connector.start_object_id)
-                         end
-            next unless member_obj
-
-            member_end_attribute_name = if is_start
-                                          ea_connector.sourcerole
-                                        else
-                                          ea_connector.destrole
-                                        end
-            if member_end_attribute_name.nil? ||
-                member_end_attribute_name.empty?
-              member_end_attribute_name = member_obj.name
-            end
-
-            member_cardinality_str = if is_start
-                                       ea_connector.destcard
-                                     else
-                                       ea_connector.sourcecard
-                                     end
-
-            associations << Lutaml::Uml::Association.new.tap do |assoc|
-              assoc.xmi_id = normalize_guid_to_xmi_format(ea_connector.ea_guid,
-                                                          "EAID")
-              assoc.name = ea_connector.name unless ea_connector.name.nil? || ea_connector.name.empty?
-
-              assoc.owner_end = find_object_by_id(object_id)&.name
-              assoc.owner_end_xmi_id = normalized_owner_xmi_id
-              assoc.owner_end_attribute_name = owner_end_attribute_name
-
-              assoc.member_end = member_obj.name
-              assoc.member_end_xmi_id = normalize_guid_to_xmi_format(
-                member_obj.ea_guid, "EAID"
-              )
-              assoc.member_end_attribute_name = member_end_attribute_name
-
-              assoc.member_end_type = ea_connector.connector_type&.downcase
-
-              if member_cardinality_str && !member_cardinality_str.empty?
-                parsed = parse_cardinality(member_cardinality_str)
-                if parsed[:min] || parsed[:max]
-                  assoc.member_end_cardinality = Lutaml::Uml::Cardinality.new
-                    .tap do |card|
-                      card.min = parsed[:min]
-                      card.max = parsed[:max]
-                    end
-                end
-              end
-            end
+          assoc_connectors.filter_map do |ea_connector|
+            build_association(ea_connector, object_id, normalized_owner_xmi_id)
           end
-
-          associations.compact
         end
 
         def load_association_attributes(object_id)
           return [] if object_id.nil?
 
-          attributes = []
           assoc_connectors = database.connectors_for_object(object_id)
             .select { |c| ASSOC_TYPES.include?(c.connector_type) }
           obj = find_object_by_id(object_id)
           obj_pkg_name = find_package_name(obj&.package_id)
 
-          assoc_connectors.each do |ea_connector|
+          assoc_connectors.filter_map do |ea_connector|
             if ea_connector.start_object_id == object_id
-              next if ea_connector.destrole.nil? || ea_connector.destrole.empty?
-
-              target_obj = find_object_by_id(ea_connector.end_object_id)
-              next unless target_obj
-
-              target_obj_pkg_name = find_package_name(target_obj.package_id)
-
-              attributes << create_association_attribute(
-                name: ea_connector.destrole,
-                type: target_obj.name,
-                type_xmi_id: target_obj.ea_guid,
-                association_xmi_id: ea_connector.ea_guid,
-                cardinality: ea_connector.destcard,
-                definition: ea_connector.notes,
-                gen_name: obj.name,
-                name_ns: obj_pkg_name,
-                type_ns: target_obj_pkg_name,
-                is_src: false,
-              )
+              build_end_attribute(ea_connector, obj, obj_pkg_name)
             elsif ea_connector.end_object_id == object_id
-              next if ea_connector.sourcerole.nil? || ea_connector.sourcerole.empty?
-
-              source_obj = find_object_by_id(ea_connector.start_object_id)
-              next unless source_obj
-
-              source_obj_pkg_name = find_package_name(source_obj.package_id)
-
-              attributes << create_association_attribute(
-                name: ea_connector.sourcerole,
-                type: source_obj.name,
-                type_xmi_id: source_obj.ea_guid,
-                association_xmi_id: ea_connector.ea_guid,
-                cardinality: ea_connector.sourcecard,
-                definition: ea_connector.notes,
-                gen_name: obj.name,
-                name_ns: obj_pkg_name,
-                type_ns: source_obj_pkg_name,
-              )
+              build_start_attribute(ea_connector, obj, obj_pkg_name)
             end
           end
-
-          attributes.compact
         end
 
-        def create_association_attribute( # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/ParameterLists
+        def create_association_attribute( # rubocop:disable Metrics/ParameterLists
           name:, type:, type_xmi_id:,
           association_xmi_id:, cardinality:, definition:,
           gen_name:, name_ns:, type_ns:, is_src: true
         )
           Lutaml::Uml::GeneralAttribute.new.tap do |attr|
-            attr.name = name
-            attr.type = type
-            attr.gen_name = gen_name
-            attr.definition = definition
+            assign_assoc_attr_basic(attr, name, type, gen_name, definition,
+                                    name_ns, type_ns)
             attr.xmi_id = normalize_guid_to_xmi_format(type_xmi_id, "EAID")
             attr.association = normalize_guid_to_xmi_format(
               association_xmi_id, "EAID"
@@ -160,23 +55,117 @@ module Lutaml
             attr.id = normalize_guid_to_xmi_src_dst_format(
               association_xmi_id, "EAID", is_src
             )
-            attr.name_ns = name_ns
-            attr.type_ns = type_ns
-
-            if cardinality && !cardinality.empty?
-              parsed = parse_cardinality(cardinality)
-              if parsed[:min] || parsed[:max]
-                attr.cardinality = Lutaml::Uml::Cardinality.new.tap do |card|
-                  card.min = parsed[:min]
-                  card.max = parsed[:max]
-                end
-              end
-            end
+            attr.cardinality = build_cardinality(cardinality)
           end
         end
 
         private
 
+        def assign_assoc_attr_basic(attr, name, type, gen_name,
+                                    definition, name_ns, type_ns)
+          attr.name = name
+          attr.type = type
+          attr.gen_name = gen_name
+          attr.definition = definition
+          attr.name_ns = name_ns
+          attr.type_ns = type_ns
+        end
+
+        def build_association(ea_connector, object_id, normalized_owner_xmi_id)
+          is_start = ea_connector.start_object_id == object_id
+          owner_role = is_start ? ea_connector.destrole : ea_connector.sourcerole
+          return nil if owner_role.nil? || owner_role.empty?
+
+          member_obj = resolve_member_object(ea_connector, is_start)
+          return nil unless member_obj
+
+          member_role = resolve_member_role(ea_connector, is_start, member_obj)
+          cardinality_str = is_start ? ea_connector.destcard : ea_connector.sourcecard
+
+          Lutaml::Uml::Association.new.tap do |assoc|
+            assoc.xmi_id = normalize_guid_to_xmi_format(ea_connector.ea_guid,
+                                                        "EAID")
+            assoc.name = ea_connector.name unless ea_connector.name.nil? || ea_connector.name.empty?
+            assign_association_ends(assoc, object_id, normalized_owner_xmi_id,
+                                    owner_role, member_obj, member_role)
+            assoc.member_end_type = ea_connector.connector_type&.downcase
+            assoc.member_end_cardinality = build_cardinality(cardinality_str)
+          end
+        end
+
+        def assign_association_ends(assoc, object_id, owner_xmi_id,
+                                    owner_role, member_obj, member_role)
+          assoc.owner_end = find_object_by_id(object_id)&.name
+          assoc.owner_end_xmi_id = owner_xmi_id
+          assoc.owner_end_attribute_name = owner_role
+          assoc.member_end = member_obj.name
+          assoc.member_end_xmi_id = normalize_guid_to_xmi_format(
+            member_obj.ea_guid, "EAID"
+          )
+          assoc.member_end_attribute_name = member_role
+        end
+
+        def resolve_member_object(ea_connector, is_start)
+          peer_id = is_start ? ea_connector.end_object_id : ea_connector.start_object_id
+          find_object_by_id(peer_id)
+        end
+
+        def resolve_member_role(ea_connector, is_start, member_obj)
+          role = is_start ? ea_connector.sourcerole : ea_connector.destrole
+          role.nil? || role.empty? ? member_obj.name : role
+        end
+
+        def build_end_attribute(ea_connector, obj, obj_pkg_name)
+          return nil if ea_connector.destrole.nil? || ea_connector.destrole.empty?
+
+          target_obj = find_object_by_id(ea_connector.end_object_id)
+          return nil unless target_obj
+
+          create_association_attribute(
+            name: ea_connector.destrole,
+            type: target_obj.name,
+            type_xmi_id: target_obj.ea_guid,
+            association_xmi_id: ea_connector.ea_guid,
+            cardinality: ea_connector.destcard,
+            definition: ea_connector.notes,
+            gen_name: obj.name,
+            name_ns: obj_pkg_name,
+            type_ns: find_package_name(target_obj.package_id),
+            is_src: false,
+          )
+        end
+
+        def build_start_attribute(ea_connector, obj, obj_pkg_name)
+          return nil if ea_connector.sourcerole.nil? || ea_connector.sourcerole.empty?
+
+          source_obj = find_object_by_id(ea_connector.start_object_id)
+          return nil unless source_obj
+
+          create_association_attribute(
+            name: ea_connector.sourcerole,
+            type: source_obj.name,
+            type_xmi_id: source_obj.ea_guid,
+            association_xmi_id: ea_connector.ea_guid,
+            cardinality: ea_connector.sourcecard,
+            definition: ea_connector.notes,
+            gen_name: obj.name,
+            name_ns: obj_pkg_name,
+            type_ns: find_package_name(source_obj.package_id),
+          )
+        end
+
+        def build_cardinality(cardinality_str)
+          return nil unless cardinality_str && !cardinality_str.empty?
+
+          parsed = parse_cardinality(cardinality_str)
+          return nil unless parsed[:min] || parsed[:max]
+
+          Lutaml::Uml::Cardinality.new.tap do |card|
+            card.min = parsed[:min]
+            card.max = parsed[:max]
+          end
+        end
+
         def find_package_name(package_id)
           return nil if package_id.nil?
 

data/lib/lutaml/qea/factory/class_transformer.rb

@@ -17,56 +17,80 @@ module Lutaml
       class ClassTransformer < BaseTransformer
         def transform(ea_object)
           return nil if ea_object.nil?
-
-          is_class_type = ea_object.uml_class? || ea_object.interface?
-          is_proxy = ea_object.object_type == "ProxyConnector"
-          is_text_class = ea_object.object_type == "Text"
-          return nil unless is_class_type || is_proxy || is_text_class
+          return nil unless transformable?(ea_object)
 
           Lutaml::Uml::Class.new.tap do |klass|
-            klass.name = ea_object.name
-            klass.xmi_id = normalize_guid_to_xmi_format(ea_object.ea_guid,
-                                                        "EAID")
-            klass.is_abstract = ea_object.abstract?
-            klass.type = "Class"
-            klass.visibility = map_visibility(ea_object.visibility)
-
-            stereotypes = build_stereotypes(ea_object)
-            klass.stereotype = stereotypes unless stereotypes.empty?
-
-            klass.definition = normalize_line_endings(ea_object.note) unless
-              ea_object.note.nil? || ea_object.note.empty?
-
-            gen_builder = GeneralizationBuilder.new(database)
-            assoc_builder = AssociationBuilder.new(database)
-
-            attrs = load_attributes(ea_object.ea_object_id)
-            assoc_attrs = gen_builder.convert_to_top_element_attributes(
-              assoc_builder.load_association_attributes(ea_object.ea_object_id),
-            )
-            klass.attributes = attrs + assoc_attrs
-
-            klass.operations = load_operations(ea_object.ea_object_id)
-            klass.constraints = load_constraints(ea_object.ea_object_id)
-            klass.tagged_values = load_tagged_values(ea_object.ea_guid)
-            klass.tagged_values.concat(
-              load_object_properties(ea_object.ea_object_id),
-            )
-
-            klass.generalization = gen_builder.load_generalization(
-              ea_object.ea_object_id,
-            )
-            klass.association_generalization = gen_builder
-              .load_association_generalizations(ea_object.ea_object_id)
-
-            klass.associations = assoc_builder.load_class_associations(
-              ea_object.ea_object_id, ea_object.ea_guid
-            )
+            assign_basic_properties(klass, ea_object)
+            assign_features(klass, ea_object)
+            assign_relationships(klass, ea_object)
           end
         end
 
         private
 
+        def transformable?(ea_object)
+          ea_object.uml_class? || ea_object.interface? ||
+            ea_object.object_type == "ProxyConnector" ||
+            ea_object.object_type == "Text"
+        end
+
+        def assign_basic_properties(klass, ea_object)
+          klass.name = ea_object.name
+          klass.xmi_id = normalize_guid_to_xmi_format(ea_object.ea_guid, "EAID")
+          klass.is_abstract = ea_object.abstract?
+          klass.type = "Class"
+          klass.visibility = map_visibility(ea_object.visibility)
+          assign_stereotypes(klass, ea_object)
+          assign_definition(klass, ea_object)
+        end
+
+        def assign_stereotypes(klass, ea_object)
+          stereotypes = build_stereotypes(ea_object)
+          klass.stereotype = stereotypes unless stereotypes.empty?
+        end
+
+        def assign_definition(klass, ea_object)
+          return if ea_object.note.nil? || ea_object.note.empty?
+
+          klass.definition = normalize_line_endings(ea_object.note)
+        end
+
+        def assign_features(klass, ea_object)
+          klass.attributes = load_all_attributes(ea_object)
+          klass.operations = load_operations(ea_object.ea_object_id)
+          klass.constraints = load_constraints(ea_object.ea_object_id)
+          klass.tagged_values = load_tagged_values(ea_object.ea_guid)
+          klass.tagged_values.concat(
+            load_object_properties(ea_object.ea_object_id),
+          )
+        end
+
+        def assign_relationships(klass, ea_object)
+          gen_builder = GeneralizationBuilder.new(database)
+          assoc_builder = AssociationBuilder.new(database)
+
+          klass.generalization = gen_builder.load_generalization(
+            ea_object.ea_object_id,
+          )
+          klass.association_generalization = gen_builder
+            .load_association_generalizations(ea_object.ea_object_id)
+
+          klass.associations = assoc_builder.load_class_associations(
+            ea_object.ea_object_id, ea_object.ea_guid
+          )
+        end
+
+        def load_all_attributes(ea_object)
+          gen_builder = GeneralizationBuilder.new(database)
+          assoc_builder = AssociationBuilder.new(database)
+
+          attrs = load_attributes(ea_object.ea_object_id)
+          assoc_attrs = gen_builder.convert_to_top_element_attributes(
+            assoc_builder.load_association_attributes(ea_object.ea_object_id),
+          )
+          attrs + assoc_attrs
+        end
+
         def build_stereotypes(ea_object)
           stereotypes = []
           if ea_object.stereotype && !ea_object.stereotype.empty?

data/lib/lutaml/qea/factory/enum_transformer.rb

@@ -13,53 +13,52 @@ module Lutaml
         # Transform EA object to UML enum
         # @param ea_object [EaObject] EA object model
         # @return [Lutaml::Uml::Enum] UML enum
-        def transform(ea_object) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength
+        def transform(ea_object)
           return nil if ea_object.nil?
-          return nil unless ea_object.enumeration? ||
-            (ea_object.stereotype && ea_object.stereotype.downcase == "enumeration")
+          return nil unless enum?(ea_object)
 
           Lutaml::Uml::Enum.new.tap do |enum|
-            # Map basic properties
             enum.name = ea_object.name
             enum.xmi_id = normalize_guid_to_xmi_format(ea_object.ea_guid,
                                                        "EAID")
             enum.visibility = map_visibility(ea_object.visibility)
-
-            # Map stereotype
-            if ea_object.stereotype && !ea_object.stereotype.empty?
-              enum.stereotype = [ea_object.stereotype]
-            end
-
-            # Map definition/notes
+            enum.stereotype = [ea_object.stereotype] if valid_stereotype?(ea_object)
             enum.definition = ea_object.note unless
               ea_object.note.nil? || ea_object.note.empty?
-
-            # Load enum values (stored as attributes in EA)
             enum.values = load_enum_values(ea_object.ea_object_id)
-
-            # Load and transform tagged values
             enum.tagged_values = load_tagged_values(ea_object.ea_guid)
           end
         end
 
         private
 
+        def enum?(ea_object)
+          ea_object.enumeration? ||
+            (ea_object.stereotype && ea_object.stereotype.downcase == "enumeration")
+        end
+
+        def valid_stereotype?(ea_object)
+          ea_object.stereotype && !ea_object.stereotype.empty?
+        end
+
         # Load enum values (literals) from attributes
         # @param object_id [Integer] Object ID
         # @return [Array<Lutaml::Uml::Value>] Enum values
-        def load_enum_values(object_id) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+        def load_enum_values(object_id)
           return [] if object_id.nil?
 
           ea_attrs = database.attributes_for_object(object_id)
             .sort_by { |a| a.pos || 0 }
 
-          ea_attrs.filter_map do |ea_attr|
-            Lutaml::Uml::Value.new.tap do |value|
-              value.name = ea_attr.name
-              value.id = normalize_guid_to_xmi_format(ea_attr.ea_guid, "EAID")
-              value.definition = ea_attr.notes unless
-                ea_attr.notes.nil? || ea_attr.notes.empty?
-            end
+          ea_attrs.filter_map { |ea_attr| build_enum_value(ea_attr) }
+        end
+
+        def build_enum_value(ea_attr)
+          Lutaml::Uml::Value.new.tap do |value|
+            value.name = ea_attr.name
+            value.id = normalize_guid_to_xmi_format(ea_attr.ea_guid, "EAID")
+            value.definition = ea_attr.notes unless
+              ea_attr.notes.nil? || ea_attr.notes.empty?
           end
         end