Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion scanpipe/pipes/jvm.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,11 @@ def get_normalized_path(cls, path, extension):
)
path = Path(path.strip("/"))
class_name = path.name
if "$" in class_name: # inner class
# Handled generated logger class
# https://github.com/aboutcode-org/scancode.io/issues/1994
if class_name.endswith("_$logger.class"):
class_name, _, _ = class_name.partition("_$logger.class")
elif "$" in class_name: # inner class
class_name, _, _ = class_name.partition("$")
else:
class_name, _, _ = class_name.partition(".") # plain .class
Expand Down
6 changes: 6 additions & 0 deletions scanpipe/tests/pipes/test_jvm.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,12 @@ def test_scanpipe_pipes_jvm_get_normalized_java_path_with_inner_class(self):
)
self.assertEqual("foo/org/common/Bar.java", njp)

def test_scanpipe_pipes_jvm_get_normalized_java_path_with_logging_annotation(self):
njp = jvm.JavaLanguage.get_normalized_path(
"foo/org/common/Bar_$logger.class", ".java"
)
self.assertEqual("foo/org/common/Bar.java", njp)

def test_scanpipe_pipes_jvm_get_fully_qualified_java_path(self):
fqjp = jvm.get_fully_qualified_path("org.common", "Bar.java")
self.assertEqual("org/common/Bar.java", fqjp)
Expand Down