1

.gitlab-ci.yml

@@ -16,11 +16,17 @@ build-job:
   stage: build
   script:
     - $GRADLE build
+  artifacts:
+    untracked: true
+    expire_in: 1 hour
 
 test-job:
   stage: test
   script:
-    - $GRADLE test jacocoTestCoverageVerification
+    - $GRADLE --info test jacocoTestCoverageVerification jacocoTestReport
+  artifacts:
+    untracked: true
+    expire_in: 1 hour
 
 deploy-job:
   stage: deploy
@@ -32,4 +38,4 @@ sonar-job:
   stage: deploy
   allow_failure: true
   script:
-    - if [ $SONAR_LOGIN ]; then $GRADLE -Dorg.gradle.jvmargs='-XX:MetaspaceSize=1024M -XX:MaxMetaspaceSize=1024M' jacocoTestReport sonar -Dsonar.host.url=$SONAR -Dsonar.login=${SONAR_LOGIN}; fi
+    - if [ $SONAR_LOGIN ]; then $GRADLE --info -Dorg.gradle.jvmargs='-XX:MetaspaceSize=1024M -XX:MaxMetaspaceSize=1024M' sonar -Dsonar.host.url=$SONAR -Dsonar.token=${SONAR_LOGIN}; fi

README.md

@@ -48,6 +48,14 @@ with [googleJavaFormat](https://github.com/google/google-java-format),
 [Checkstyle](https://checkstyle.sourceforge.io)
 and [PMD](https://pmd.github.io).
 
+To fix code formatting errors, you can run the reformat task:
+
+```shell
+./gradle/gradlew spotlessApply
+```
+
+For more details, see the [Developer Guide](https://asm.ow2.io/developer-guide.html)
+
 ## Reporting Issues
 
 If you encounter any issues with the ASM project, please create a new issue

asm-analysis/src/test/java/org/objectweb/asm/tree/analysis/AnalyzerWithBasicInterpreterTest.java

@@ -46,7 +46,6 @@
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.test.AsmTest;
-import org.objectweb.asm.test.AsmTest.PrecompiledClass;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
 

asm-analysis/src/test/java/org/objectweb/asm/tree/analysis/AnalyzerWithSimpleVerifierTest.java

@@ -193,7 +193,7 @@ void testAnalyze_classNotFound() {
   }
 
   @Test
-  void testAnalyze_mergeStackFrames() throws AnalyzerException {
+  void testAnalyze_mergeStackFrames() {
     Label loopLabel = new Label();
     MethodNode methodNode =
         new MethodNodeBuilder(1, 4)
@@ -223,7 +223,7 @@ void testAnalyze_mergeStackFrames() throws AnalyzerException {
   }
 
   @Test
-  void testAnalyze_mergeStackFramesWithExceptionHandlers() throws AnalyzerException {
+  void testAnalyze_mergeStackFramesWithExceptionHandlers() {
     Label startTry0Label = new Label();
     Label endTry0Label = new Label();
     Label catch0Label = new Label();

asm-analysis/src/test/java/org/objectweb/asm/tree/analysis/MethodNodeBuilder.java

@@ -94,8 +94,7 @@ MethodNodeBuilder nop() {
   }
 
   MethodNodeBuilder push() {
-    methodNode.visitInsn(Opcodes.ICONST_0);
-    return this;
+    return iconst_0();
   }
 
   MethodNodeBuilder pop() {

asm-analysis/src/test/java/org/objectweb/asm/tree/analysis/SmallSetTest.java

@@ -149,7 +149,7 @@ void testIterator_next_noSuchElement() {
     iterator.next();
     iterator.next();
 
-    Executable next = () -> iterator.next();
+    Executable next = iterator::next;
 
     assertThrows(NoSuchElementException.class, next);
   }
@@ -159,7 +159,7 @@ void testIterator_remove() {
     Iterator<Object> iterator = newSmallSet(ELEMENT1, ELEMENT2).iterator();
     iterator.next();
 
-    assertThrows(UnsupportedOperationException.class, () -> iterator.remove());
+    assertThrows(UnsupportedOperationException.class, iterator::remove);
   }
 
   private static SmallSet<Object> newSmallSet(final Object element1, final Object element2) {

asm-commons/src/main/java/org/objectweb/asm/commons/AnnotationRemapper.java

@@ -57,7 +57,7 @@ public class AnnotationRemapper extends AnnotationVisitor {
    * @param remapper the remapper to use to remap the types in the visited annotation.
    * @deprecated use {@link #AnnotationRemapper(String, AnnotationVisitor, Remapper)} instead.
    */
-  @Deprecated
+  @Deprecated(forRemoval = false)
   public AnnotationRemapper(final AnnotationVisitor annotationVisitor, final Remapper remapper) {
     this(/* descriptor= */ null, annotationVisitor, remapper);
   }
@@ -85,7 +85,7 @@ public AnnotationRemapper(
    * @param remapper the remapper to use to remap the types in the visited annotation.
    * @deprecated use {@link #AnnotationRemapper(int, String, AnnotationVisitor, Remapper)} instead.
    */
-  @Deprecated
+  @Deprecated(forRemoval = false)
   protected AnnotationRemapper(
       final int api, final AnnotationVisitor annotationVisitor, final Remapper remapper) {
     this(api, /* descriptor= */ null, annotationVisitor, remapper);
@@ -153,7 +153,7 @@ public AnnotationVisitor visitArray(final @Identifier String name) {
    * @return the newly created remapper.
    * @deprecated use {@link #createAnnotationRemapper(String, AnnotationVisitor)} instead.
    */
-  @Deprecated
+  @Deprecated(forRemoval = false)
   protected AnnotationVisitor createAnnotationRemapper(final AnnotationVisitor annotationVisitor) {
     return new AnnotationRemapper(api, /* descriptor= */ null, annotationVisitor, remapper);
   }

asm-commons/src/main/java/org/objectweb/asm/commons/ClassRemapper.java

@@ -264,7 +264,7 @@ protected MethodVisitor createMethodRemapper(final MethodVisitor methodVisitor)
    * @return the newly created remapper.
    * @deprecated use {@link #createAnnotationRemapper(String, AnnotationVisitor)} instead.
    */
-  @Deprecated
+  @Deprecated(forRemoval = false)
   protected AnnotationVisitor createAnnotationRemapper(final AnnotationVisitor annotationVisitor) {
     return new AnnotationRemapper(api, /* descriptor= */ null, annotationVisitor, remapper);
   }

asm-commons/src/main/java/org/objectweb/asm/commons/FieldRemapper.java

@@ -95,7 +95,7 @@ public AnnotationVisitor visitTypeAnnotation(
    * @return the newly created remapper.
    * @deprecated use {@link #createAnnotationRemapper(String, AnnotationVisitor)} instead.
    */
-  @Deprecated
+  @Deprecated(forRemoval = false)
   protected AnnotationVisitor createAnnotationRemapper(final AnnotationVisitor annotationVisitor) {
     return new AnnotationRemapper(api, /* descriptor= */ null, annotationVisitor, remapper);
   }

asm-commons/src/main/java/org/objectweb/asm/commons/InstructionAdapter.java

@@ -549,6 +549,9 @@ public void visitInvokeDynamicInsn(
       final @MethodDescriptor String descriptor,
       final Handle bootstrapMethodHandle,
       final Object... bootstrapMethodArguments) {
+    if (api < Opcodes.ASM5) {
+      throw new UnsupportedOperationException("This feature requires ASM5");
+    }
     invokedynamic(name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);
   }
 
@@ -1074,8 +1077,8 @@ public void putfield(final @InternalForm String owner, final @Identifier String
    * @param descriptor the method's descriptor (see {@link Type}).
    * @deprecated use {@link #invokevirtual(String, String, String, boolean)} instead.
    */
-  @Deprecated
-  public void invokevirtual(final @InternalForm String owner, final @Identifier String name, final @MethodDescriptor String descriptor) {
+  @Deprecated(forRemoval = false)
+  public void invokevirtual(final String owner, final String name, final String descriptor) {
     if (api >= Opcodes.ASM5) {
       invokevirtual(owner, name, descriptor, false);
       return;
@@ -1113,8 +1116,8 @@ public void invokevirtual(
    * @param descriptor the method's descriptor (see {@link Type}).
    * @deprecated use {@link #invokespecial(String, String, String, boolean)} instead.
    */
-  @Deprecated
-  public void invokespecial(final @InternalForm String owner, final @Identifier String name, final @MethodDescriptor String descriptor) {
+  @Deprecated(forRemoval = false)
+  public void invokespecial(final String owner, final String name, final String descriptor) {
     if (api >= Opcodes.ASM5) {
       invokespecial(owner, name, descriptor, false);
       return;
@@ -1152,8 +1155,8 @@ public void invokespecial(
    * @param descriptor the method's descriptor (see {@link Type}).
    * @deprecated use {@link #invokestatic(String, String, String, boolean)} instead.
    */
-  @Deprecated
-  public void invokestatic(final @InternalForm String owner, final @Identifier String name, final @MethodDescriptor String descriptor) {
+  @Deprecated(forRemoval = false)
+  public void invokestatic(final String owner, final String name, final String descriptor) {
     if (api >= Opcodes.ASM5) {
       invokestatic(owner, name, descriptor, false);
       return;

asm-commons/src/main/java/org/objectweb/asm/commons/MethodRemapper.java

@@ -175,17 +175,26 @@ public void visitMethodInsn(
   }
 
   @Override
+  @SuppressWarnings("deprecation")
   public void visitInvokeDynamicInsn(
       final String name,
       final @MethodDescriptor String descriptor,
       final Handle bootstrapMethodHandle,
       final Object... bootstrapMethodArguments) {
+    String remappedName;
+    if (remapper.api == 0) {
+      remappedName = remapper.mapInvokeDynamicMethodName(name, descriptor);
+    } else {
+      remappedName =
+          remapper.mapInvokeDynamicMethodName(
+              name, descriptor, bootstrapMethodHandle, bootstrapMethodArguments);
+    }
     Object[] remappedBootstrapMethodArguments = new Object[bootstrapMethodArguments.length];
     for (int i = 0; i < bootstrapMethodArguments.length; ++i) {
       remappedBootstrapMethodArguments[i] = remapper.mapValue(bootstrapMethodArguments[i]);
     }
     super.visitInvokeDynamicInsn(
-        remapper.mapInvokeDynamicMethodName(name, descriptor),
+        remappedName,
         remapper.mapMethodDesc(descriptor),
         (Handle) remapper.mapValue(bootstrapMethodHandle),
         remappedBootstrapMethodArguments);
@@ -274,7 +283,7 @@ public AnnotationVisitor visitLocalVariableAnnotation(
    * @return the newly created remapper.
    * @deprecated use {@link #createAnnotationRemapper(String, AnnotationVisitor)} instead.
    */
-  @Deprecated
+  @Deprecated(forRemoval = false)
   protected AnnotationVisitor createAnnotationRemapper(final AnnotationVisitor annotationVisitor) {
     return new AnnotationRemapper(api, /* descriptor= */ null, annotationVisitor, remapper);
   }

asm-commons/src/main/java/org/objectweb/asm/commons/RecordComponentRemapper.java

@@ -98,7 +98,7 @@ public AnnotationVisitor visitTypeAnnotation(
    * @return the newly created remapper.
    * @deprecated use {@link #createAnnotationRemapper(String, AnnotationVisitor)} instead.
    */
-  @Deprecated
+  @Deprecated(forRemoval = false)
   protected AnnotationVisitor createAnnotationRemapper(final AnnotationVisitor annotationVisitor) {
     return new AnnotationRemapper(api, /* descriptor= */ null, annotationVisitor, remapper);
   }