Fix syntax

Author: s-heppner

sdk/basyx/aas/adapter/json/json_serialization.py

@@ -637,11 +637,6 @@ def _entity_to_json(cls, obj: model.Entity) -> Dict[str, object]:
         data = cls._abstract_classes_to_json(obj)
         if not cls.stripped and obj.statement:
             data['statements'] = list(obj.statement)
-        if obj.entity_type:
-            data['entityType'] = _generic.ENTITY_TYPES[obj.entity_type]
-        if obj.global_asset_id:
-            data['globalAssetId'] = obj.global_asset_id
-        if obj.specific_asset_id:
         if obj.entity_type is not None:
             data['entityType'] = _generic.ENTITY_TYPES[obj.entity_type]
         if obj.global_asset_id is not None:

sdk/basyx/aas/model/submodel.py

@@ -736,7 +736,7 @@ def _generate_id_short(self, new: _SE) -> None:
             self._uuid_seq += 1
 
     def _unset_id_short(self, old: _SE) -> None:
-        if old.id_short.startswith("generated_submodel_list_hack_"):
+        if old.id_short is not None and old.id_short.startswith("generated_submodel_list_hack_"):
             old.id_short = None
 
     def _check_constraints(self, new: _SE, existing: Iterable[_SE]) -> None: