Skip to content

Commit

Permalink
[issue-305, review] delete handling of fileDependencies
Browse files Browse the repository at this point in the history
Signed-off-by: Meret Behrens <meret.behrens@tngtech.com>
  • Loading branch information
meretp committed Dec 28, 2022
1 parent c7c8b8f commit c3925a1
Showing 1 changed file with 5 additions and 20 deletions.
25 changes: 5 additions & 20 deletions src/parser/json/relationship_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,9 @@ def parse_all_relationships(self, input_doc_dict: Dict) -> List[Relationship]:

file_dicts: List[Dict] = input_doc_dict.get("files", [])

# not implemented yet: deal with deprecated fields in file
relationships.extend(
parse_field_or_log_error(self.logger, file_dicts, self.parse_file_dependencies, []))
# not implemented yet: deal with deprecated fields in file: https://github.com/spdx/tools-python/issues/294 & https://github.com/spdx/tools-python/issues/387
generated_relationships = self.parse_artifact_of(file_dicts=file_dicts)
dependency_relationships = self.parse_file_dependencies(file_dicts=file_dicts)

raise_parsing_error_if_logger_has_messages(self.logger)

Expand Down Expand Up @@ -154,24 +153,10 @@ def invert_relationship(self, relationship: Relationship) -> Relationship:
RelationshipType.CONTAINED_BY: RelationshipType.CONTAINS}

@staticmethod
def parse_file_dependencies(file_dicts: List[Dict]) -> List[Relationship]:
logger = Logger()
def parse_file_dependencies(file_dicts: List[Dict]) -> List[
Relationship]:
dependency_relationships = []
for file in file_dicts:
file_spdx_id: str = file.get("SPDXID")
dependency_of: List[str] = file.get("fileDependencies")
if not dependency_of:
continue
for dependency in dependency_of:
try:
dependency_relationship = Relationship(spdx_element_id=dependency,
relationship_type=RelationshipType.DEPENDENCY_OF,
related_spdx_element_id=file_spdx_id)
except ConstructorTypeErrors as err:
logger.extend(err.get_messages())
continue
dependency_relationships.append(dependency_relationship)
raise_parsing_error_if_logger_has_messages(logger, "file dependency relationships")
# the field fileDependencies is deprecated and should be converted to a relationship (https://github.com/spdx/tools-python/issues/387)
return dependency_relationships

@staticmethod
Expand Down

0 comments on commit c3925a1

Please sign in to comment.