Fix Scala case class and inner class mapping to source files

Author: pradhyum6144

scanpipe/pipes/d2d.py

@@ -168,24 +168,28 @@ def _map_jvm_to_class_resource(
         normalized_path = jvm_lang.get_normalized_path(
             path=to_resource.path, extension=extension
         )
+
         match = pathmap.find_paths(path=normalized_path, index=from_classes_index)
-        if not match:
-            if jvm_lang.name == "scala":
-                package_path = str(Path(normalized_path).parent)
-                potential_sources = from_resources.filter(
-                    path__startswith=package_path,
-                    extension__in=jvm_lang.source_extensions
+
+        if not match and jvm_lang.name == "scala":
+            package_path = str(Path(to_resource.path).parent)
+            potential_sources = from_resources.filter(
+                path__startswith=package_path.replace("to/", "from/"),
+                extension__in=jvm_lang.source_extensions,
+            )
+            for from_resource in potential_sources:
+                from_source_root_parts = from_resource.path.strip("/").split("/")
+                from_source_root = "/".join(from_source_root_parts[:-1])
+                pipes.make_relation(
+                    from_resource=from_resource,
+                    to_resource=to_resource,
+                    map_type=jvm_lang.binary_map_type,
+                    extra_data={"from_source_root": f"{from_source_root}/"},
                 )
-                for from_resource in potential_sources:
-                    from_source_root_parts = from_resource.path.strip("/").split("/")
-                    from_source_root = "/".join(from_source_root_parts[:-1])
-                    pipes.make_relation(
-                        from_resource=from_resource,
-                        to_resource=to_resource,
-                        map_type=jvm_lang.binary_map_type,
-                        extra_data={"from_source_root": f"{from_source_root}/"},
-                    )
-            return
+            continue
+
+        if not match:
+            continue
 
         for resource_id in match.resource_ids:
             from_resource = from_resources.get(id=resource_id)

scanpipe/pipes/jvm.py

@@ -186,12 +186,12 @@ def get_normalized_path(cls, path, extension):
             )
         path_obj = Path(path.strip("/"))
         class_name = path_obj.name
-        
+
         if "$" in class_name:
             class_name, _, _ = class_name.partition("$")
         else:
             class_name, _, _ = class_name.partition(".")
-        
+
         return str(path_obj.parent / f"{class_name}{extension}")
 
 

scanpipe/pipes/resolve.py

@@ -108,7 +108,7 @@ def get_data_from_manifests(project, package_registry, manifest_resources, model
     if "pypi" in manifests_by_type:
         pypi_resources = manifests_by_type["pypi"]
         pypi_locations = [resource.location for resource in pypi_resources]
-        
+
         resolver = package_registry.get("pypi")
         if resolver:
             try:
@@ -117,7 +117,7 @@ def get_data_from_manifests(project, package_registry, manifest_resources, model
                     for package_data in packages:
                         package_data["codebase_resources"] = pypi_resources
                     resolved_packages.extend(packages)
-                    
+
                     for resource in pypi_resources:
                         if headers := get_manifest_headers(resource):
                             sboms_headers[resource.name] = headers
@@ -135,7 +135,7 @@ def get_data_from_manifests(project, package_registry, manifest_resources, model
                         model=model,
                         object_instance=resource,
                     )
-        
+
         del manifests_by_type["pypi"]
 
     for package_type, resources in manifests_by_type.items():
@@ -267,13 +267,14 @@ def get_manifest_resources(project):
 def resolve_pypi_packages(input_location=None, input_locations=None):
     """
     Resolve the PyPI packages from requirement file(s).
-    
+
     Args:
         input_location: Single requirement file path (for backward compatibility)
         input_locations: List of requirement file paths (for batch processing)
-    
+
     Returns:
         List of resolved package data dictionaries
+
     """
     # Handle both single file and multiple files
     if input_locations:
@@ -282,7 +283,7 @@ def resolve_pypi_packages(input_location=None, input_locations=None):
         requirement_files = [input_location]
     else:
         raise ValueError("Either input_location or input_locations must be provided")
-    
+
     python_version = f"{sys.version_info.major}{sys.version_info.minor}"
     operating_system = "linux"
 

scanpipe/tests/pipes/test_d2d.py

@@ -649,7 +649,6 @@ def test_scanpipe_pipes_d2d_map_scala_case_classes_to_source(self):
             self.assertEqual(from1, relation.from_resource)
             self.assertEqual("scala_to_class", relation.map_type)
 
-
     def test_scanpipe_pipes_d2d_map_jar_to_kotlin_source(self):
         from1 = make_resource_file(
             self.project1,

scanpipe/tests/pipes/test_resolve.py

@@ -390,19 +390,22 @@ def test_scanpipe_pipes_resolve_pypi_packages_multiple_files(self, mock_resolve)
 
         req_files = ["requirements1.txt", "requirements2.txt"]
         packages = resolve.resolve_pypi_packages(input_locations=req_files)
-        
+
         mock_resolve.assert_called_once()
         call_args = mock_resolve.call_args
         self.assertEqual(req_files, call_args.kwargs["requirement_files"])
-        
+
         self.assertEqual(2, len(packages))
         self.assertEqual("pip", packages[0]["name"])
 
     @mock.patch("scanpipe.pipes.resolve.python_inspector.resolve_dependencies")
     def test_scanpipe_pipes_resolve_pypi_packages_backward_compatibility(
         self, mock_resolve
     ):
-        """Test that resolve_pypi_packages still works with single file (backward compatibility)."""
+        """
+        Test that resolve_pypi_packages still works with single file
+        (backward compatibility).
+        """
         inspector_output_location = (
             self.data / "resolve" / "python_inspector_resolve_dependencies.json"
         )
@@ -412,10 +415,9 @@ def test_scanpipe_pipes_resolve_pypi_packages_backward_compatibility(
         mock_resolve.return_value = mock.Mock(packages=inspector_output["packages"])
 
         packages = resolve.resolve_pypi_packages(input_location="requirements.txt")
-        
+
         mock_resolve.assert_called_once()
         call_args = mock_resolve.call_args
         self.assertEqual(["requirements.txt"], call_args.kwargs["requirement_files"])
-        
-        self.assertEqual(2, len(packages))
 
+        self.assertEqual(2, len(packages))