Skip to content

Update Java D2D Pipeline to Include Checksum Mapped Sources for Accurate Java Mapping #1870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update Java D2D Pipeline to Include Checksum Mapped Sources for Accurate Java Mapping #1870

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions scanpipe/pipes/d2d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,15 @@ def map_java_to_class(project, logger=None):
Map to/ compiled Java .class(es) to from/ .java source using Java fully
qualified paths and indexing from/ .java files.
"""
project_files = project.codebaseresources.files().no_status()
project_files = project.codebaseresources.files()
# Collect all files from "from_codebase", even if they already have a
# status or are mapped. This is necessary because the deploy codebase
# may contain sources that match "from_codebase" via checksum. If those
# checksum-matched files are excluded from mapping, it can result in
# .class files failing to resolve. See
# https://github.com/aboutcode-org/scancode.io/issues/1854#issuecomment-3273472895
from_resources = project_files.from_codebase()
to_resources = project_files.to_codebase().has_no_relation()
to_resources = project_files.to_codebase().no_status().has_no_relation()

to_resources_dot_class = to_resources.filter(extension=".class")
from_resources_dot_java = (
Expand All @@ -205,7 +211,6 @@ def map_java_to_class(project, logger=None):
)
to_resource_count = to_resources_dot_class.count()
from_resource_count = from_resources_dot_java.count()

if not from_resource_count:
logger("No .java resources to map.")
return
Expand Down Expand Up @@ -270,11 +275,7 @@ def find_java_packages(project, logger=None):
Note: we use the same API as the ScanCode scans by design
"""
from_java_resources = (
project.codebaseresources.files()
.no_status()
.from_codebase()
.has_no_relation()
.filter(extension=".java")
project.codebaseresources.files().from_codebase().filter(extension=".java")
)

if logger:
Expand Down