Update "find_jvm_packages" to include all resources

- Ensure extra_data is populated in "find_jvm_packages()" for all resources for mapping purposes
- Adjust test logic to update extra_data after map_checksum, matching d2d pipeline sequence

Signed-off-by: Chin Yeung Li <[email protected]>

Author: chinyeungli

scanpipe/pipes/d2d.py

@@ -263,7 +263,7 @@ def find_jvm_packages(project, jvm_lang: jvm.JvmLanguage, logger=None):
     Note: we use the same API as the ScanCode scans by design
     """
     resources = (
-        project.codebaseresources.files().no_status().from_codebase().has_no_relation()
+        project.codebaseresources.files().no_status().from_codebase()
     )
 
     from_jvm_resources = resources.filter(extension__in=jvm_lang.source_extensions)

scanpipe/tests/pipes/test_d2d.py

@@ -399,7 +399,6 @@ def test_scanpipe_pipes_d2d_map_java_to_class_with_java_in_deploy(self):
             self.project1,
             path="from/flume-ng-node-1.9.0-sources.jar-extract/org/apache/flume/node/"
             "AbstractConfigurationProvider.java",
-            extra_data={"java_package": "org.apache.flume.node"},
             sha1=sha1,
         )
         to1 = make_resource_file(
@@ -425,6 +424,14 @@ def test_scanpipe_pipes_d2d_map_java_to_class_with_java_in_deploy(self):
         self.assertEqual("sha1", relation1.map_type)
         self.assertEqual(from1, relation1.from_resource)
 
+        # The "java_package" field in extra_data is required for mapping
+        # Java packages to classes.
+        # Simulate the "find_jvm_packages" call by updating extra_data in
+        # the from1 resource
+        # Note that "find_java_packages" is called before
+        # "map_java_to_class"
+        from1.update_extra_data({"java_package": "org.apache.flume.node"})
+
         # Now run map_java_to_class
         d2d.map_jvm_to_class(
             self.project1, logger=buffer.write, jvm_lang=jvm.JavaLanguage