fix more complie warnings and javadoc issues

Machine-Maker · Machine-Maker · commit a1680d080e67 · 2025-06-08T11:37:02.000-07:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -76,6 +76,11 @@ allprojects {
         testImplementation(rootProject.libs.jupiterParams)
         testRuntimeOnly(rootProject.libs.jupiterEngine)
     }
+
+    javadocLinks {
+        override(startsWithAnyOf("org.ow2.asm:asm"), JavadocLinksExtension.LinkOverride.Simple("https://asm.ow2.io/javadoc"))
+        override(rootProject.libs.checkerQual, "https://checkerframework.org/api/")
+    }
 }
 val mainForNewTargets = sourceSets.create("mainForNewTargets")
 
@@ -96,9 +101,6 @@ dependencies {
     testDataNewTargets.implementationConfigurationName(mainForNewTargets.output)
 }
 
-javadocLinks {
-    override(startsWithAnyOf("org.ow2.asm:"), JavadocLinksExtension.LinkOverride.Simple("https://asm.ow2.io/javadoc"))
-}
 
 abstract class FilterTestClasspath : DefaultTask() {
     @get:InputFiles
diff --git a/src/main/java/io/papermc/asm/rules/field/FieldToMethodRewrite.java b/src/main/java/io/papermc/asm/rules/field/FieldToMethodRewrite.java
@@ -105,7 +105,7 @@ public record Versioned(Set<ClassDesc> owners, @Nullable String getterName, @Nul
         }
 
         @Override
-        public RewriteRule createRule(final ApiVersion apiVersion) {
+        public RewriteRule createRule(final ApiVersion<?> apiVersion) {
             return this.versions.ruleForVersion(apiVersion, matcher -> new FieldToMethodRewrite(this.owners(), matcher, this.getterName(), this.setterName(), this.isInterfaceMethod()));
         }
     }
diff --git a/src/main/java/io/papermc/asm/rules/method/DirectStaticRewrite.java b/src/main/java/io/papermc/asm/rules/method/DirectStaticRewrite.java
@@ -57,7 +57,7 @@ public ClassDesc staticRedirectOwner(final ClassProcessingContext context) {
     public record Versioned(Set<ClassDesc> owners, ClassDesc staticRedirectOwner, @Nullable String staticMethodName, VersionedMatcher<MethodMatcher> versions) implements VersionedRuleFactory {
 
         @Override
-        public RewriteRule createRule(final ApiVersion apiVersion) {
+        public RewriteRule createRule(final ApiVersion<?> apiVersion) {
             return this.versions.ruleForVersion(apiVersion, match -> new DirectStaticRewrite(this.owners(), this.staticMethodName(), match, this.staticRedirectOwner()));
         }
     }
diff --git a/src/main/java/io/papermc/asm/rules/method/MoveInstanceMethod.java b/src/main/java/io/papermc/asm/rules/method/MoveInstanceMethod.java
@@ -64,7 +64,7 @@ public void generateConstructor(final GeneratorAdapterFactory factory, final Met
     public record Versioned(Set<ClassDesc> owners, ClassDesc newOwner, String newMethodName, VersionedMatcher<MethodMatcher> versions) implements VersionedRuleFactory {
 
         @Override
-        public RewriteRule createRule(final ApiVersion apiVersion) {
+        public RewriteRule createRule(final ApiVersion<?> apiVersion) {
             return this.versions.ruleForVersion(apiVersion, match -> new MoveInstanceMethod(this.owners(), match, this.newOwner(), this.newMethodName()));
         }
     }
diff --git a/src/main/java/io/papermc/asm/rules/method/params/DirectParameterRewrite.java b/src/main/java/io/papermc/asm/rules/method/params/DirectParameterRewrite.java
@@ -26,7 +26,7 @@ public record DirectParameterRewrite(Set<ClassDesc> owners, ClassDesc existingTy
     public record Versioned(Set<ClassDesc> owners, ClassDesc existingType, VersionedMatcher<TargetedMethodMatcherWithHandler> versions) implements VersionedRuleFactory {
 
         @Override
-        public RewriteRule createRule(final ApiVersion apiVersion) {
+        public RewriteRule createRule(final ApiVersion<?> apiVersion) {
             return this.versions.ruleForVersion(apiVersion, pair -> new DirectParameterRewrite(this.owners, this.existingType, pair.matcher(), pair.staticHandler()));
         }
     }
diff --git a/src/main/java/io/papermc/asm/rules/method/params/FuzzyParameterRewrite.java b/src/main/java/io/papermc/asm/rules/method/params/FuzzyParameterRewrite.java
@@ -63,7 +63,7 @@ public MethodRewrite<MethodCallData> createRewrite(final ClassProcessingContext
     public record Versioned(Set<ClassDesc> owners, ClassDesc existingType, VersionedMatcher<TargetedMethodMatcherWithHandler> versions) implements VersionedRuleFactory {
 
         @Override
-        public RewriteRule createRule(final ApiVersion apiVersion) {
+        public RewriteRule createRule(final ApiVersion<?> apiVersion) {
             return this.versions.ruleForVersion(apiVersion, pair -> new FuzzyParameterRewrite(this.owners, this.existingType, pair.matcher(), pair.staticHandler()));
         }
     }
diff --git a/src/main/java/io/papermc/asm/rules/method/params/SuperTypeParamRewrite.java b/src/main/java/io/papermc/asm/rules/method/params/SuperTypeParamRewrite.java
@@ -42,7 +42,7 @@ private MethodTypeDesc modifyMethodDescriptor(final MethodTypeDesc methodDescrip
     public record Versioned(Set<ClassDesc> owners, ClassDesc newParamType, VersionedMatcher<TargetedMethodMatcher> versions) implements VersionedRuleFactory {
 
         @Override
-        public RewriteRule createRule(final ApiVersion apiVersion) {
+        public RewriteRule createRule(final ApiVersion<?> apiVersion) {
             return this.versions.ruleForVersion(apiVersion, matcher -> new SuperTypeParamRewrite(this.owners(), matcher, this.newParamType()));
         }
     }
diff --git a/src/main/java/io/papermc/asm/rules/method/returns/DirectReturnRewrite.java b/src/main/java/io/papermc/asm/rules/method/returns/DirectReturnRewrite.java
@@ -39,7 +39,7 @@ public record DirectReturnRewrite(Set<ClassDesc> owners, ClassDesc existingType,
     public record Versioned(Set<ClassDesc> owners, ClassDesc existingType, VersionedMatcher<TargetedMethodMatcherWithHandler> versions, boolean includeOwnerContext) implements VersionedRuleFactory {
 
         @Override
-        public RewriteRule createRule(final ApiVersion apiVersion) {
+        public RewriteRule createRule(final ApiVersion<?> apiVersion) {
             return this.versions.ruleForVersion(apiVersion, pair -> new DirectReturnRewrite(this.owners(), this.existingType(), pair.matcher(), pair.staticHandler(), this.includeOwnerContext()));
         }
     }
diff --git a/src/main/java/io/papermc/asm/rules/method/returns/SubTypeReturnRewrite.java b/src/main/java/io/papermc/asm/rules/method/returns/SubTypeReturnRewrite.java
@@ -43,7 +43,7 @@ private MethodTypeDesc modifyMethodDescriptor(final MethodTypeDesc methodDescrip
     public record Versioned(Set<ClassDesc> owners, ClassDesc newReturnType, VersionedMatcher<TargetedMethodMatcher> versions) implements VersionedRuleFactory {
 
         @Override
-        public RewriteRule createRule(final ApiVersion apiVersion) {
+        public RewriteRule createRule(final ApiVersion<?> apiVersion) {
             return this.versions.ruleForVersion(apiVersion, matcher -> new SubTypeReturnRewrite(this.owners(), matcher, this.newReturnType()));
         }
     }
diff --git a/src/main/java/io/papermc/asm/versioned/CachingVersionedRuleFactory.java b/src/main/java/io/papermc/asm/versioned/CachingVersionedRuleFactory.java
@@ -11,7 +11,7 @@
  */
 public abstract class CachingVersionedRuleFactory implements VersionedRuleFactory {
 
-    private final Map<ApiVersion, RewriteRule> cache = new ConcurrentHashMap<>();
+    private final Map<ApiVersion<?>, RewriteRule> cache = new ConcurrentHashMap<>();
     private @MonotonicNonNull VersionedRuleFactory rootFactory;
 
     @ApiStatus.OverrideOnly
@@ -25,7 +25,7 @@ protected final VersionedRuleFactory rootFactory() {
     }
 
     @Override
-    public final RewriteRule createRule(final ApiVersion apiVersion) {
+    public final RewriteRule createRule(final ApiVersion<?> apiVersion) {
         return this.cache.computeIfAbsent(apiVersion, this.rootFactory()::createRule);
     }
 }
diff --git a/src/main/java/io/papermc/asm/versioned/MappedVersionRuleFactory.java b/src/main/java/io/papermc/asm/versioned/MappedVersionRuleFactory.java
@@ -7,14 +7,14 @@
 import java.util.NavigableMap;
 import java.util.function.BinaryOperator;
 
-public record MappedVersionRuleFactory<R extends RewriteRule>(NavigableMap<ApiVersion, ? extends R> versions, BinaryOperator<R> mergeFunction) implements VersionedRuleFactory {
+public record MappedVersionRuleFactory<R extends RewriteRule>(NavigableMap<ApiVersion<?>, ? extends R> versions, BinaryOperator<R> mergeFunction) implements VersionedRuleFactory {
 
-    public static <M extends RewriteRule & Mergeable<M>> MappedVersionRuleFactory<M> mergeable(final NavigableMap<ApiVersion, M> versions) {
+    public static <M extends RewriteRule & Mergeable<M>> MappedVersionRuleFactory<M> mergeable(final NavigableMap<ApiVersion<?>, M> versions) {
         return new MappedVersionRuleFactory<>(versions, Mergeable::merge);
     }
 
     @Override
-    public RewriteRule createRule(final ApiVersion apiVersion) {
+    public RewriteRule createRule(final ApiVersion<?> apiVersion) {
         final List<R> toMerge = new ArrayList<>(this.versions.tailMap(apiVersion, true).values());
         if (toMerge.isEmpty()) {
             return RewriteRule.EMPTY;
diff --git a/src/main/java/io/papermc/asm/versioned/OwnedVersionedRuleFactoryFactory.java b/src/main/java/io/papermc/asm/versioned/OwnedVersionedRuleFactoryFactory.java
@@ -21,19 +21,19 @@ static OwnedVersionedRuleFactoryFactory create(final Set<ClassDesc> owners) {
     }
 
     //<editor-fold desc="changeParamToSuper" defaultstate="collapsed">
-    default void plainStaticRewrite(final ClassDesc newOwner, final @Nullable String staticMethodName, final ApiVersion apiVersion, final MethodMatcher matcher) {
+    default void plainStaticRewrite(final ClassDesc newOwner, final @Nullable String staticMethodName, final ApiVersion<?> apiVersion, final MethodMatcher matcher) {
         this.plainStaticRewrite(newOwner, staticMethodName, VersionedMatcher.single(apiVersion, matcher));
     }
 
     void plainStaticRewrite(ClassDesc newOwner, @Nullable String staticMethodName, VersionedMatcher<MethodMatcher> versions);
     //</editor-fold>
 
     //<editor-fold desc="changeParamToSuper" defaultstate="collapsed">
-    default void changeParamToSuper(final Class<?> newParamType, final ApiVersion apiVersion, final TargetedMethodMatcher methodMatcher) {
+    default void changeParamToSuper(final Class<?> newParamType, final ApiVersion<?> apiVersion, final TargetedMethodMatcher methodMatcher) {
         this.changeParamToSuper(desc(newParamType), apiVersion, methodMatcher);
     }
 
-    default void changeParamToSuper(final ClassDesc newParamType, final ApiVersion apiVersion, final TargetedMethodMatcher methodMatcher) {
+    default void changeParamToSuper(final ClassDesc newParamType, final ApiVersion<?> apiVersion, final TargetedMethodMatcher methodMatcher) {
         this.changeParamToSuper(newParamType, VersionedMatcher.single(apiVersion, methodMatcher));
     }
 
@@ -45,11 +45,11 @@ default void changeParamToSuper(final Class<?> newParamType, final VersionedMatc
     //</editor-fold>
 
     //<editor-fold desc="changeParamFuzzy" defaultstate="collapsed">
-    default void changeParamFuzzy(final Class<?> newParamType, final ApiVersion apiVersion, final Method staticHandler, final TargetedMethodMatcher targetedMethodMatcher) {
+    default void changeParamFuzzy(final Class<?> newParamType, final ApiVersion<?> apiVersion, final Method staticHandler, final TargetedMethodMatcher targetedMethodMatcher) {
         this.changeParamFuzzy(desc(newParamType), apiVersion, staticHandler, targetedMethodMatcher);
     }
 
-    default void changeParamFuzzy(final ClassDesc newParamType, final ApiVersion apiVersion, final Method staticHandler, final TargetedMethodMatcher targetedMethodMatcher) {
+    default void changeParamFuzzy(final ClassDesc newParamType, final ApiVersion<?> apiVersion, final Method staticHandler, final TargetedMethodMatcher targetedMethodMatcher) {
         this.changeParamFuzzy(newParamType, VersionedMatcher.single(apiVersion, new TargetedMethodMatcherWithHandler(targetedMethodMatcher, staticHandler)));
     }
 
@@ -61,11 +61,11 @@ default void changeParamFuzzy(final Class<?> newParamType, final VersionedMatche
     //</editor-fold>
 
     //<editor-fold desc="changeParamDirect" defaultstate="collapsed">
-    default void changeParamDirect(final Class<?> newParamType, final ApiVersion apiVersion, final Method staticHandler, final TargetedMethodMatcher methodMatcher) {
+    default void changeParamDirect(final Class<?> newParamType, final ApiVersion<?> apiVersion, final Method staticHandler, final TargetedMethodMatcher methodMatcher) {
         this.changeParamDirect(desc(newParamType), apiVersion, staticHandler, methodMatcher);
     }
 
-    default void changeParamDirect(final ClassDesc newParamType, final ApiVersion apiVersion, final Method staticHandler, final TargetedMethodMatcher methodMatcher) {
+    default void changeParamDirect(final ClassDesc newParamType, final ApiVersion<?> apiVersion, final Method staticHandler, final TargetedMethodMatcher methodMatcher) {
         this.changeParamDirect(newParamType, VersionedMatcher.single(apiVersion, new TargetedMethodMatcherWithHandler(methodMatcher, staticHandler)));
     }
 
@@ -77,11 +77,11 @@ default void changeParamDirect(final Class<?> newParamType, final VersionedMatch
     //</editor-fold>
 
     //<editor-fold desc="changeReturnTypeToSub" defaultstate="collapsed">
-    default void changeReturnTypeToSub(final Class<?> newReturnType, final ApiVersion apiVersion, final TargetedMethodMatcher methodMatcher) {
+    default void changeReturnTypeToSub(final Class<?> newReturnType, final ApiVersion<?> apiVersion, final TargetedMethodMatcher methodMatcher) {
         this.changeReturnTypeToSub(desc(newReturnType), apiVersion, methodMatcher);
     }
 
-    default void changeReturnTypeToSub(final ClassDesc newReturnType, final ApiVersion apiVersion, final TargetedMethodMatcher methodMatcher) {
+    default void changeReturnTypeToSub(final ClassDesc newReturnType, final ApiVersion<?> apiVersion, final TargetedMethodMatcher methodMatcher) {
         this.changeReturnTypeToSub(newReturnType, VersionedMatcher.single(apiVersion, methodMatcher));
     }
 
@@ -93,11 +93,11 @@ default void changeReturnTypeToSub(final Class<?> newReturnType, final Versioned
     //</editor-fold>
 
     //<editor-fold desc="changeReturnTypeDirect" defaultstate="collapsed">
-    default void changeReturnTypeDirect(final Class<?> newReturnType, final ApiVersion apiVersion, final Method staticHandler, final TargetedMethodMatcher methodMatcher) {
+    default void changeReturnTypeDirect(final Class<?> newReturnType, final ApiVersion<?> apiVersion, final Method staticHandler, final TargetedMethodMatcher methodMatcher) {
         this.changeReturnTypeDirect(desc(newReturnType), apiVersion, staticHandler, methodMatcher);
     }
 
-    default void changeReturnTypeDirect(final ClassDesc newReturnType, final ApiVersion apiVersion, final Method staticHandler, final TargetedMethodMatcher methodMatcher) {
+    default void changeReturnTypeDirect(final ClassDesc newReturnType, final ApiVersion<?> apiVersion, final Method staticHandler, final TargetedMethodMatcher methodMatcher) {
         this.changeReturnTypeDirect(newReturnType, VersionedMatcher.single(apiVersion, new TargetedMethodMatcherWithHandler(methodMatcher, staticHandler)));
     }
 
@@ -109,11 +109,11 @@ default void changeReturnTypeDirect(final Class<?> newReturnType, final Versione
     //</editor-fold>
 
     //<editor-fold desc="changeReturnTypeDirectWithContext" defaultstate="collapsed">
-    default void changeReturnTypeDirectWithContext(final Class<?> newReturnType, final ApiVersion apiVersion, final Method staticHandler, final TargetedMethodMatcher methodMatcher) {
+    default void changeReturnTypeDirectWithContext(final Class<?> newReturnType, final ApiVersion<?> apiVersion, final Method staticHandler, final TargetedMethodMatcher methodMatcher) {
         this.changeReturnTypeDirectWithContext(desc(newReturnType), apiVersion, staticHandler, methodMatcher);
     }
 
-    default void changeReturnTypeDirectWithContext(final ClassDesc newReturnType, final ApiVersion apiVersion, final Method staticHandler, final TargetedMethodMatcher methodMatcher) {
+    default void changeReturnTypeDirectWithContext(final ClassDesc newReturnType, final ApiVersion<?> apiVersion, final Method staticHandler, final TargetedMethodMatcher methodMatcher) {
         this.changeReturnTypeDirectWithContext(newReturnType, VersionedMatcher.single(apiVersion, new TargetedMethodMatcherWithHandler(methodMatcher, staticHandler)));
     }
 
@@ -125,19 +125,19 @@ default void changeReturnTypeDirectWithContext(final Class<?> newReturnType, fin
     //</editor-fold>
 
     //<editor-fold desc="changeFieldToMethod" defaultstate="collapsed">
-    default void changeFieldToMethod(final @Nullable String getterName, final @Nullable String setterName, final boolean isInterfaceMethod, final ApiVersion apiVersion, final FieldMatcher matcher) {
+    default void changeFieldToMethod(final @Nullable String getterName, final @Nullable String setterName, final boolean isInterfaceMethod, final ApiVersion<?> apiVersion, final FieldMatcher matcher) {
         this.changeFieldToMethod(getterName, setterName, isInterfaceMethod, VersionedMatcher.single(apiVersion, matcher));
     }
 
     void changeFieldToMethod(@Nullable String getterName, @Nullable String setterName, boolean isInterfaceMethod, VersionedMatcher<FieldMatcher> versions);
     //</editor-fold>
 
     //<editor-fold desc="moveInstanceMethod" defaultstate="collapsed">
-    default void moveInstanceMethod(final Class<?> newOwner, final String newMethodName, final ApiVersion apiVersion, final MethodMatcher matcher) {
+    default void moveInstanceMethod(final Class<?> newOwner, final String newMethodName, final ApiVersion<?> apiVersion, final MethodMatcher matcher) {
         this.moveInstanceMethod(desc(newOwner), newMethodName, apiVersion, matcher);
     }
 
-    default void moveInstanceMethod(final ClassDesc newOwner, final String newMethodName, final ApiVersion apiVersion, final MethodMatcher matcher) {
+    default void moveInstanceMethod(final ClassDesc newOwner, final String newMethodName, final ApiVersion<?> apiVersion, final MethodMatcher matcher) {
         this.moveInstanceMethod(newOwner, newMethodName, VersionedMatcher.single(apiVersion, matcher));
     }
 
@@ -148,9 +148,9 @@ default void moveInstanceMethod(final Class<?> newOwner, final String newMethodN
     void moveInstanceMethod(ClassDesc newOwner, String newMethodName, VersionedMatcher<MethodMatcher> versions);
     //</editor-fold>
 
-    <R extends RewriteRule & Mergeable<R>> void addMergeableRuleFactory(NavigableMap<ApiVersion, R> versions);
+    <R extends RewriteRule & Mergeable<R>> void addMergeableRuleFactory(NavigableMap<ApiVersion<?>, R> versions);
 
-    void addChainableRuleFactory(NavigableMap<ApiVersion, ? extends RewriteRule> versions);
+    void addChainableRuleFactory(NavigableMap<ApiVersion<?>, ? extends RewriteRule> versions);
 
     void addRuleFactory(VersionedRuleFactory factory);
 
diff --git a/src/main/java/io/papermc/asm/versioned/OwnedVersionedRuleFactoryFactoryImpl.java b/src/main/java/io/papermc/asm/versioned/OwnedVersionedRuleFactoryFactoryImpl.java
@@ -76,12 +76,12 @@ public void moveInstanceMethod(final ClassDesc newOwner, final String newMethodN
     }
 
     @Override
-    public <R extends RewriteRule & Mergeable<R>> void addMergeableRuleFactory(final NavigableMap<ApiVersion, R> versions) {
+    public <R extends RewriteRule & Mergeable<R>> void addMergeableRuleFactory(final NavigableMap<ApiVersion<?>, R> versions) {
         this.factories.add(new MappedVersionRuleFactory<>(versions, Mergeable::merge));
     }
 
     @Override
-    public void addChainableRuleFactory(final NavigableMap<ApiVersion, ? extends RewriteRule> versions) {
+    public void addChainableRuleFactory(final NavigableMap<ApiVersion<?>, ? extends RewriteRule> versions) {
         this.factories.add(new MappedVersionRuleFactory<RewriteRule>(versions, RewriteRule::chain));
     }
 
diff --git a/src/main/java/io/papermc/asm/versioned/VersionedRuleFactory.java b/src/main/java/io/papermc/asm/versioned/VersionedRuleFactory.java
@@ -59,7 +59,7 @@ static VersionedRuleFactory chain(final Collection<? extends VersionedRuleFactor
         return new Chain(List.copyOf(factories));
     }
 
-    RewriteRule createRule(ApiVersion apiVersion);
+    RewriteRule createRule(ApiVersion<?> apiVersion);
 
     record Chain(List<VersionedRuleFactory> factories) implements VersionedRuleFactory {
 
@@ -68,7 +68,7 @@ record Chain(List<VersionedRuleFactory> factories) implements VersionedRuleFacto
         }
 
         @Override
-        public RewriteRule createRule(final ApiVersion apiVersion) {
+        public RewriteRule createRule(final ApiVersion<?> apiVersion) {
             final List<RewriteRule> rules = new ArrayList<>();
             for (final VersionedRuleFactory factory : this.factories) {
                 final @Nullable RewriteRule rule = factory.createRule(apiVersion);
diff --git a/src/main/java/io/papermc/asm/versioned/matcher/VersionedMatcher.java b/src/main/java/io/papermc/asm/versioned/matcher/VersionedMatcher.java
diff --git a/src/main/java/io/papermc/asm/versioned/matcher/VersionedMatcherBuilder.java b/src/main/java/io/papermc/asm/versioned/matcher/VersionedMatcherBuilder.java
diff --git a/src/main/java/io/papermc/asm/versioned/matcher/VersionedMatcherBuilderImpl.java b/src/main/java/io/papermc/asm/versioned/matcher/VersionedMatcherBuilderImpl.java
diff --git a/src/main/java/io/papermc/asm/versioned/matcher/VersionedTargetedMethodMatcherWithHandlerBuilder.java b/src/main/java/io/papermc/asm/versioned/matcher/VersionedTargetedMethodMatcherWithHandlerBuilder.java
diff --git a/src/main/java/io/papermc/asm/versioned/matcher/VersionedTargetedMethodMatcherWithHandlerBuilderImpl.java b/src/main/java/io/papermc/asm/versioned/matcher/VersionedTargetedMethodMatcherWithHandlerBuilderImpl.java

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,11 @@ allprojects {`
`76`	`76`	`testImplementation(rootProject.libs.jupiterParams)`
`77`	`77`	`testRuntimeOnly(rootProject.libs.jupiterEngine)`
`78`	`78`	`}`
	`79`	`+`
	`80`	`+ javadocLinks {`
	`81`	`+ override(startsWithAnyOf("org.ow2.asm:asm"), JavadocLinksExtension.LinkOverride.Simple("https://asm.ow2.io/javadoc"))`
	`82`	`+ override(rootProject.libs.checkerQual, "https://checkerframework.org/api/")`
	`83`	`+ }`
`79`	`84`	`}`
`80`	`85`	`val mainForNewTargets = sourceSets.create("mainForNewTargets")`
`81`	`86`
`@@ -96,9 +101,6 @@ dependencies {`
`96`	`101`	`testDataNewTargets.implementationConfigurationName(mainForNewTargets.output)`
`97`	`102`	`}`
`98`	`103`
`99`		`-javadocLinks {`
`100`		`- override(startsWithAnyOf("org.ow2.asm:"), JavadocLinksExtension.LinkOverride.Simple("https://asm.ow2.io/javadoc"))`
`101`		`-}`
`102`	`104`
`103`	`105`	`abstract class FilterTestClasspath : DefaultTask() {`
`104`	`106`	`@get:InputFiles`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public record Versioned(Set<ClassDesc> owners, @Nullable String getterName, @Nul`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`@Override`
`108`		`- public RewriteRule createRule(final ApiVersion apiVersion) {`
	`108`	`+ public RewriteRule createRule(final ApiVersion<?> apiVersion) {`
`109`	`109`	`return this.versions.ruleForVersion(apiVersion, matcher -> new FieldToMethodRewrite(this.owners(), matcher, this.getterName(), this.setterName(), this.isInterfaceMethod()));`
`110`	`110`	`}`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public ClassDesc staticRedirectOwner(final ClassProcessingContext context) {`
`57`	`57`	`public record Versioned(Set<ClassDesc> owners, ClassDesc staticRedirectOwner, @Nullable String staticMethodName, VersionedMatcher<MethodMatcher> versions) implements VersionedRuleFactory {`
`58`	`58`
`59`	`59`	`@Override`
`60`		`- public RewriteRule createRule(final ApiVersion apiVersion) {`
	`60`	`+ public RewriteRule createRule(final ApiVersion<?> apiVersion) {`
`61`	`61`	`return this.versions.ruleForVersion(apiVersion, match -> new DirectStaticRewrite(this.owners(), this.staticMethodName(), match, this.staticRedirectOwner()));`
`62`	`62`	`}`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public void generateConstructor(final GeneratorAdapterFactory factory, final Met`
`64`	`64`	`public record Versioned(Set<ClassDesc> owners, ClassDesc newOwner, String newMethodName, VersionedMatcher<MethodMatcher> versions) implements VersionedRuleFactory {`
`65`	`65`
`66`	`66`	`@Override`
`67`		`- public RewriteRule createRule(final ApiVersion apiVersion) {`
	`67`	`+ public RewriteRule createRule(final ApiVersion<?> apiVersion) {`
`68`	`68`	`return this.versions.ruleForVersion(apiVersion, match -> new MoveInstanceMethod(this.owners(), match, this.newOwner(), this.newMethodName()));`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public record DirectParameterRewrite(Set<ClassDesc> owners, ClassDesc existingTy`
`26`	`26`	`public record Versioned(Set<ClassDesc> owners, ClassDesc existingType, VersionedMatcher<TargetedMethodMatcherWithHandler> versions) implements VersionedRuleFactory {`
`27`	`27`
`28`	`28`	`@Override`
`29`		`- public RewriteRule createRule(final ApiVersion apiVersion) {`
	`29`	`+ public RewriteRule createRule(final ApiVersion<?> apiVersion) {`
`30`	`30`	`return this.versions.ruleForVersion(apiVersion, pair -> new DirectParameterRewrite(this.owners, this.existingType, pair.matcher(), pair.staticHandler()));`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public MethodRewrite<MethodCallData> createRewrite(final ClassProcessingContext`
`63`	`63`	`public record Versioned(Set<ClassDesc> owners, ClassDesc existingType, VersionedMatcher<TargetedMethodMatcherWithHandler> versions) implements VersionedRuleFactory {`
`64`	`64`
`65`	`65`	`@Override`
`66`		`- public RewriteRule createRule(final ApiVersion apiVersion) {`
	`66`	`+ public RewriteRule createRule(final ApiVersion<?> apiVersion) {`
`67`	`67`	`return this.versions.ruleForVersion(apiVersion, pair -> new FuzzyParameterRewrite(this.owners, this.existingType, pair.matcher(), pair.staticHandler()));`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ private MethodTypeDesc modifyMethodDescriptor(final MethodTypeDesc methodDescrip`
`42`	`42`	`public record Versioned(Set<ClassDesc> owners, ClassDesc newParamType, VersionedMatcher<TargetedMethodMatcher> versions) implements VersionedRuleFactory {`
`43`	`43`
`44`	`44`	`@Override`
`45`		`- public RewriteRule createRule(final ApiVersion apiVersion) {`
	`45`	`+ public RewriteRule createRule(final ApiVersion<?> apiVersion) {`
`46`	`46`	`return this.versions.ruleForVersion(apiVersion, matcher -> new SuperTypeParamRewrite(this.owners(), matcher, this.newParamType()));`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public record DirectReturnRewrite(Set<ClassDesc> owners, ClassDesc existingType,`
`39`	`39`	`public record Versioned(Set<ClassDesc> owners, ClassDesc existingType, VersionedMatcher<TargetedMethodMatcherWithHandler> versions, boolean includeOwnerContext) implements VersionedRuleFactory {`
`40`	`40`
`41`	`41`	`@Override`
`42`		`- public RewriteRule createRule(final ApiVersion apiVersion) {`
	`42`	`+ public RewriteRule createRule(final ApiVersion<?> apiVersion) {`
`43`	`43`	`return this.versions.ruleForVersion(apiVersion, pair -> new DirectReturnRewrite(this.owners(), this.existingType(), pair.matcher(), pair.staticHandler(), this.includeOwnerContext()));`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ private MethodTypeDesc modifyMethodDescriptor(final MethodTypeDesc methodDescrip`
`43`	`43`	`public record Versioned(Set<ClassDesc> owners, ClassDesc newReturnType, VersionedMatcher<TargetedMethodMatcher> versions) implements VersionedRuleFactory {`
`44`	`44`
`45`	`45`	`@Override`
`46`		`- public RewriteRule createRule(final ApiVersion apiVersion) {`
	`46`	`+ public RewriteRule createRule(final ApiVersion<?> apiVersion) {`
`47`	`47`	`return this.versions.ruleForVersion(apiVersion, matcher -> new SubTypeReturnRewrite(this.owners(), matcher, this.newReturnType()));`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*/`
`12`	`12`	`public abstract class CachingVersionedRuleFactory implements VersionedRuleFactory {`
`13`	`13`
`14`		`- private final Map<ApiVersion, RewriteRule> cache = new ConcurrentHashMap<>();`
	`14`	`+ private final Map<ApiVersion<?>, RewriteRule> cache = new ConcurrentHashMap<>();`
`15`	`15`	`private @MonotonicNonNull VersionedRuleFactory rootFactory;`
`16`	`16`
`17`	`17`	`@ApiStatus.OverrideOnly`
`@@ -25,7 +25,7 @@ protected final VersionedRuleFactory rootFactory() {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`@Override`
`28`		`- public final RewriteRule createRule(final ApiVersion apiVersion) {`
	`28`	`+ public final RewriteRule createRule(final ApiVersion<?> apiVersion) {`
`29`	`29`	`return this.cache.computeIfAbsent(apiVersion, this.rootFactory()::createRule);`
`30`	`30`	`}`
`31`	`31`	`}`