Add support for new main methods.

Author: raphw

byte-buddy-dep/src/main/java/net/bytebuddy/matcher/ElementMatchers.java

@@ -1595,13 +1595,36 @@ public static <T extends MethodDescription> ElementMatcher.Junction<T> isDefault
     }
 
     /**
-     * Matches a Java <i>main</i> method as an application entry point.
+     * Matches a Java <i>main</i> method as an application entry point. This method matches all methods that
+     * qualify as main method since Java 25.
      *
      * @param <T> The type of the matched object.
      * @return A matcher that matches a Java <i>main</i> method.
      */
     public static <T extends MethodDescription> ElementMatcher.Junction<T> isMain() {
-        return named("main").and(takesArguments(String[].class)).and(returns(TypeDescription.ForLoadedType.of(void.class)).and(isStatic()).and(isPublic()));
+        return isMain(true);
+    }
+
+    /**
+     * Matches a Java <i>main</i> method as an application entry point.
+     *
+     * @param modernized {@code true} if modernized main methods as specified since Java 25 should be matched.
+     * @param <T> The type of the matched object.
+     * @return A matcher that matches a Java <i>main</i> method.
+     */
+    public static <T extends MethodDescription> ElementMatcher.Junction<T> isMain(boolean modernized) {
+        if (modernized) {
+            return named("main")
+                    .and(takesArguments(String[].class).or(takesArguments(0)))
+                    .and(returns(TypeDescription.ForLoadedType.of(void.class)))
+                    .and(not(isPrivate()));
+        } else {
+            return named("main")
+                    .and(takesArguments(String[].class))
+                    .and(returns(TypeDescription.ForLoadedType.of(void.class)))
+                    .and(isStatic())
+                    .and(isPublic());
+        }
     }
 
     /**

byte-buddy-dep/src/test/java/net/bytebuddy/matcher/ElementMatchersTest.java

@@ -938,9 +938,17 @@ public void testIsVirtual() throws Exception {
 
     @Test
     public void testIsMain() throws Exception {
+        assertThat(ElementMatchers.isMain(false)
+                .matches(new MethodDescription.ForLoadedMethod(MainMethod.class.getDeclaredMethod("main", String[].class))), is(true));
         assertThat(ElementMatchers.isMain()
                 .matches(new MethodDescription.ForLoadedMethod(MainMethod.class.getDeclaredMethod("main", String[].class))), is(true));
-        assertThat(ElementMatchers.isFinalizer()
+        assertThat(ElementMatchers.isMain(false)
+                .matches(new MethodDescription.ForLoadedMethod(MainMethod.class.getDeclaredMethod("main"))), is(false));
+        assertThat(ElementMatchers.isMain()
+                .matches(new MethodDescription.ForLoadedMethod(MainMethod.class.getDeclaredMethod("main"))), is(true));
+        assertThat(ElementMatchers.isMain(false)
+                .matches(new MethodDescription.ForLoadedMethod(Object.class.getDeclaredMethod("toString"))), is(false));
+        assertThat(ElementMatchers.isMain()
                 .matches(new MethodDescription.ForLoadedMethod(Object.class.getDeclaredMethod("toString"))), is(false));
     }
 
@@ -1577,6 +1585,10 @@ void method() {
 
     private static class MainMethod {
 
+        void main() {
+            /* empty */
+        }
+
         public static void main(String[] args) {
             /* empty */
         }