handling method calls too

apache · Jan 2, 2021 · 1c77483 · 1c77483
1 parent b7cdc67
commit 1c77483
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/main/java/org/apache/tomcat/jakartaee/profile/XmlExclusionAwareProfile.java b/src/main/java/org/apache/tomcat/jakartaee/profile/XmlExclusionAwareProfile.java
@@ -4,6 +4,7 @@
 import org.apache.tomcat.jakartaee.XmlExclusionListBuilder;
 
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 
 public class XmlExclusionAwareProfile implements Predicate<String> {
     private final Predicate<String> delegate;
@@ -16,17 +17,20 @@ public XmlExclusionAwareProfile(final Predicate<String> delegate, final XmlExclu
 
     @Override
     public boolean test(final String s) {
-        return !xmlExclusions.getStayInJavax().contains(toClassName(s)) && delegate.test(s);
+        return toClassNames(s).noneMatch(xmlExclusions.getStayInJavax()::contains) && delegate.test(s);
     }
 
-    private String toClassName(String str) {
+    private Stream<String> toClassNames(final String str) {
         if (str.startsWith("<") && str.endsWith(">")) {
-            return str;
+            return Stream.empty();
         }
         try {
-            return Utility.typeSignatureToString(str, false);
+            if (str.startsWith("(")) {
+                return Stream.of(Utility.methodSignatureArgumentTypes(str, false));
+            }
+            return Stream.of(Utility.typeSignatureToString(str, false));
         } catch (final RuntimeException re) {
-            return ""; // will never match
+            return Stream.of();
         }
     }
 }