From 397796d67610961245eea74f4aba5f479bf1ebd5 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Tue, 17 Jan 2023 15:16:32 +0100 Subject: [PATCH] WildTypePattern.toString: do not parenthesesise generic type list It is unnecessary to represent a pattern list 'A,B,C' as '(A,B,C)'. Not only does it look ugly in a type signature like 'org.acme.Foo<(A,B,C)>', but also is it not valid Java syntax. While the latter might not be strictly necessary in a String representation, it certainly is desirable, if such representations are ever used to generate code or @AspectJ pointcut annotations. Signed-off-by: Alexander Kriegisch --- .../main/java/org/aspectj/weaver/patterns/WildTypePattern.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildTypePattern.java index 407b2f8d1..a77421e56 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildTypePattern.java @@ -1196,7 +1196,7 @@ public class WildTypePattern extends TypePattern { } if (typeParameters != null && typeParameters.size() != 0) { buf.append("<"); - buf.append(typeParameters.toString()); + buf.append(typeParameters.toString().replaceFirst("^.(.*).$", "$1")); buf.append(">"); } if (includeSubtypes) { -- 2.39.5