merge: Don't delete descriptions (#12)

DSD-DBS · Nov 18, 2024 · 0601005 · 0601005
2 parents d8d356d + 06aae32
commit 0601005
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 23 deletions.
diff --git a/capella_ros_tools/importer.py b/capella_ros_tools/importer.py
@@ -131,15 +131,14 @@ def _convert_class(
                 f"{field_def.type.package or pkg_name}.{field_def.type.name}"
             )
             self._promise_id_refs[promise_ref] = None
-            prop_yml = {
+            prop_yml: t.Any = {
                 "promise_id": prop_promise_id,
                 "find": {
                     "name": field_def.name,
                 },
                 "set": {
                     "type": decl.Promise(promise_ref),
                     "kind": "COMPOSITION",
-                    "description": field_def.description,
                     "min_card": decl.NewObject(
                         "LiteralNumericValue", value=field_def.type.card.min
                     ),
@@ -148,6 +147,8 @@ def _convert_class(
                     ),
                 },
             }
+            if field_def.description:
+                prop_yml["set"]["description"] = field_def.description
             props.append(prop_yml)
             self._needed_associations.setdefault(pkg_name, {})[
                 prop_promise_id
@@ -158,9 +159,11 @@ def _convert_class(
             "find": {
                 "name": msg_def.name,
             },
-            "set": {
-                "description": msg_def.description,
-            },
+            "set": (
+                {"description": msg_def.description}
+                if msg_def.description
+                else {}
+            ),
             "sync": {
                 "properties": props,
             },
@@ -174,26 +177,29 @@ def _convert_enum(
         self._promise_ids[promise_id] = None
         literals = []
         for literal in enum_def.literals:
-            literal_yml = {
+            literal_yml: t.Any = {
                 "find": {
                     "name": literal.name,
                 },
                 "set": {
-                    "description": literal.description,
                     "value": decl.NewObject(
                         "LiteralNumericValue", value=literal.value
                     ),
                 },
             }
+            if literal.description:
+                literal_yml["set"]["description"] = literal.description
             literals.append(literal_yml)
         yml = {
             "promise_id": promise_id,
             "find": {
                 "name": enum_def.name,
             },
-            "set": {
-                "description": enum_def.description,
-            },
+            "set": (
+                {"description": enum_def.description}
+                if enum_def.description
+                else {}
+            ),
             "sync": {
                 "literals": literals,
             },

diff --git a/tests/data/data_model/example_msgs.yaml b/tests/data/data_model/example_msgs.yaml
@@ -103,7 +103,6 @@
             - find:
                 name: RED
               set:
-                description: ''
                 value: !new_object
                   _type: LiteralNumericValue
                   value: '0'
@@ -143,28 +142,24 @@
             - find:
                 name: OK
               set:
-                description: ''
                 value: !new_object
                   _type: LiteralNumericValue
                   value: '0'
             - find:
                 name: WARN
               set:
-                description: ''
                 value: !new_object
                   _type: LiteralNumericValue
                   value: '1'
             - find:
                 name: ERROR
               set:
-                description: ''
                 value: !new_object
                   _type: LiteralNumericValue
                   value: '2'
             - find:
                 name: STALE
               set:
-                description: ''
                 value: !new_object
                   _type: LiteralNumericValue
                   value: '3'
@@ -259,7 +254,6 @@
                 name: field
               promise_id: package2.SampleClassEnum.field
               set:
-                description: ''
                 kind: COMPOSITION
                 max_card: !new_object
                   _type: LiteralNumericValue
@@ -279,28 +273,24 @@
             - find:
                 name: OK
               set:
-                description: ''
                 value: !new_object
                   _type: LiteralNumericValue
                   value: '0'
             - find:
                 name: WARN
               set:
-                description: ''
                 value: !new_object
                   _type: LiteralNumericValue
                   value: '1'
             - find:
                 name: ERROR
               set:
-                description: ''
                 value: !new_object
                   _type: LiteralNumericValue
                   value: '2'
             - find:
                 name: STALE
               set:
-                description: ''
                 value: !new_object
                   _type: LiteralNumericValue
                   value: '3'
@@ -314,21 +304,18 @@
             - find:
                 name: RED
               set:
-                description: ''
                 value: !new_object
                   _type: LiteralNumericValue
                   value: '0'
             - find:
                 name: BLUE
               set:
-                description: ''
                 value: !new_object
                   _type: LiteralNumericValue
                   value: '1'
             - find:
                 name: YELLOW
               set:
-                description: ''
                 value: !new_object
                   _type: LiteralNumericValue
                   value: '2'