Checkstyle updates from ASM master

Issue: SPR-17267

Author: jhoeller

spring-core/src/main/java/org/springframework/asm/ByteVector.java

@@ -239,6 +239,7 @@ public ByteVector putLong(final long longValue) {
    * @param stringValue a String whose UTF8 encoded length must be less than 65536.
    * @return this byte vector.
    */
+  // DontCheck(AbbreviationAsWordInName): can't be renamed (for backward binary compatibility).
   public ByteVector putUTF8(final String stringValue) {
     int charLength = stringValue.length();
     if (charLength > 65535) {
@@ -261,7 +262,7 @@ public ByteVector putUTF8(final String stringValue) {
         currentData[currentLength++] = (byte) charValue;
       } else {
         length = currentLength;
-        return encodeUTF8(stringValue, i, 65535);
+        return encodeUtf8(stringValue, i, 65535);
       }
     }
     length = currentLength;
@@ -280,14 +281,14 @@ public ByteVector putUTF8(final String stringValue) {
    *     encoded characters.
    * @return this byte vector.
    */
-  final ByteVector encodeUTF8(final String stringValue, final int offset, final int maxByteLength) {
+  final ByteVector encodeUtf8(final String stringValue, final int offset, final int maxByteLength) {
     int charLength = stringValue.length();
     int byteLength = offset;
     for (int i = offset; i < charLength; ++i) {
       char charValue = stringValue.charAt(i);
-      if (charValue >= '\u0001' && charValue <= '\u007F') {
+      if (charValue >= 0x0001 && charValue <= 0x007F) {
         byteLength++;
-      } else if (charValue <= '\u07FF') {
+      } else if (charValue <= 0x07FF) {
         byteLength += 2;
       } else {
         byteLength += 3;
@@ -308,9 +309,9 @@ final ByteVector encodeUTF8(final String stringValue, final int offset, final in
     int currentLength = length;
     for (int i = offset; i < charLength; ++i) {
       char charValue = stringValue.charAt(i);
-      if (charValue >= '\u0001' && charValue <= '\u007F') {
+      if (charValue >= 0x0001 && charValue <= 0x007F) {
         data[currentLength++] = (byte) charValue;
-      } else if (charValue <= '\u07FF') {
+      } else if (charValue <= 0x07FF) {
         data[currentLength++] = (byte) (0xC0 | charValue >> 6 & 0x1F);
         data[currentLength++] = (byte) (0x80 | charValue & 0x3F);
       } else {

spring-core/src/main/java/org/springframework/asm/ClassReader.java

@@ -99,6 +99,7 @@ public class ClassReader {
    * necessarily start at offset 0. Use {@link #getItem} and {@link #header} to get correct
    * ClassFile element offsets within this byte array.
    */
+  // DontCheck(MemberName): can't be renamed (for backward binary compatibility).
   public final byte[] b;
 
   /**
@@ -488,7 +489,7 @@ public void accept(
         accessFlags |= Opcodes.ACC_SYNTHETIC;
       } else if (Constants.SOURCE_DEBUG_EXTENSION.equals(attributeName)) {
         sourceDebugExtension =
-            readUTF(currentAttributeOffset, attributeLength, new char[attributeLength]);
+            readUtf(currentAttributeOffset, attributeLength, new char[attributeLength]);
       } else if (Constants.RUNTIME_INVISIBLE_ANNOTATIONS.equals(attributeName)) {
         runtimeInvisibleAnnotationsOffset = currentAttributeOffset;
       } else if (Constants.RUNTIME_INVISIBLE_TYPE_ANNOTATIONS.equals(attributeName)) {
@@ -530,7 +531,8 @@ public void accept(
 
     // Visit the Module, ModulePackages and ModuleMainClass attributes.
     if (moduleOffset != 0) {
-      readModule(classVisitor, context, moduleOffset, modulePackagesOffset, moduleMainClass);
+      readModuleAttributes(
+          classVisitor, context, moduleOffset, modulePackagesOffset, moduleMainClass);
     }
 
     // Visit the NestHost attribute.
@@ -685,7 +687,7 @@ public void accept(
   // ----------------------------------------------------------------------------------------------
 
   /**
-   * Reads the module attribute and visit it.
+   * Reads the Module, ModulePackages and ModuleMainClass attributes and visit them.
    *
    * @param classVisitor the current class visitor
    * @param context information about the class being parsed.
@@ -695,7 +697,7 @@ public void accept(
    *     attribute_info's attribute_name_index and attribute_length fields), or 0.
    * @param moduleMainClass the string corresponding to the ModuleMainClass attribute, or null.
    */
-  private void readModule(
+  private void readModuleAttributes(
       final ClassVisitor classVisitor,
       final Context context,
       final int moduleOffset,
@@ -1111,7 +1113,7 @@ private int readMethod(
             context.currentMethodAccessFlags,
             context.currentMethodName,
             context.currentMethodDescriptor,
-            signatureIndex == 0 ? null : readUTF(signatureIndex, charBuffer),
+            signatureIndex == 0 ? null : readUtf(signatureIndex, charBuffer),
             exceptions);
     if (methodVisitor == null) {
       return currentOffset;
@@ -1601,18 +1603,15 @@ private void readCode(
 
     // Read the 'exception_table_length' and 'exception_table' field to create a label for each
     // referenced instruction, and to make methodVisitor visit the corresponding try catch blocks.
-    {
-      int exceptionTableLength = readUnsignedShort(currentOffset);
-      currentOffset += 2;
-      while (exceptionTableLength-- > 0) {
-        Label start = createLabel(readUnsignedShort(currentOffset), labels);
-        Label end = createLabel(readUnsignedShort(currentOffset + 2), labels);
-        Label handler = createLabel(readUnsignedShort(currentOffset + 4), labels);
-        String catchType =
-            readUTF8(cpInfoOffsets[readUnsignedShort(currentOffset + 6)], charBuffer);
-        currentOffset += 8;
-        methodVisitor.visitTryCatchBlock(start, end, handler, catchType);
-      }
+    int exceptionTableLength = readUnsignedShort(currentOffset);
+    currentOffset += 2;
+    while (exceptionTableLength-- > 0) {
+      Label start = createLabel(readUnsignedShort(currentOffset), labels);
+      Label end = createLabel(readUnsignedShort(currentOffset + 2), labels);
+      Label handler = createLabel(readUnsignedShort(currentOffset + 4), labels);
+      String catchType = readUTF8(cpInfoOffsets[readUnsignedShort(currentOffset + 6)], charBuffer);
+      currentOffset += 8;
+      methodVisitor.visitTryCatchBlock(start, end, handler, catchType);
     }
 
     // Read the Code attributes to create a label for each referenced instruction (the variables
@@ -2142,11 +2141,11 @@ private void readCode(
             currentOffset += 4 - (currentBytecodeOffset & 3);
             // Read the instruction.
             Label defaultLabel = labels[currentBytecodeOffset + readInt(currentOffset)];
-            int nPairs = readInt(currentOffset + 4);
+            int numPairs = readInt(currentOffset + 4);
             currentOffset += 8;
-            int[] keys = new int[nPairs];
-            Label[] values = new Label[nPairs];
-            for (int i = 0; i < nPairs; ++i) {
+            int[] keys = new int[numPairs];
+            Label[] values = new Label[numPairs];
+            for (int i = 0; i < numPairs; ++i) {
               keys[i] = readInt(currentOffset);
               values[i] = labels[currentBytecodeOffset + readInt(currentOffset + 4)];
               currentOffset += 8;
@@ -2958,12 +2957,12 @@ private int readElementValue(
   private void computeImplicitFrame(final Context context) {
     String methodDescriptor = context.currentMethodDescriptor;
     Object[] locals = context.currentFrameLocalTypes;
-    int nLocal = 0;
+    int numLocal = 0;
     if ((context.currentMethodAccessFlags & Opcodes.ACC_STATIC) == 0) {
       if ("<init>".equals(context.currentMethodName)) {
-        locals[nLocal++] = Opcodes.UNINITIALIZED_THIS;
+        locals[numLocal++] = Opcodes.UNINITIALIZED_THIS;
       } else {
-        locals[nLocal++] = readClass(header + 2, context.charBuffer);
+        locals[numLocal++] = readClass(header + 2, context.charBuffer);
       }
     }
     // Parse the method descriptor, one argument type descriptor at each iteration. Start by
@@ -2977,16 +2976,16 @@ private void computeImplicitFrame(final Context context) {
         case 'B':
         case 'S':
         case 'I':
-          locals[nLocal++] = Opcodes.INTEGER;
+          locals[numLocal++] = Opcodes.INTEGER;
           break;
         case 'F':
-          locals[nLocal++] = Opcodes.FLOAT;
+          locals[numLocal++] = Opcodes.FLOAT;
           break;
         case 'J':
-          locals[nLocal++] = Opcodes.LONG;
+          locals[numLocal++] = Opcodes.LONG;
           break;
         case 'D':
-          locals[nLocal++] = Opcodes.DOUBLE;
+          locals[numLocal++] = Opcodes.DOUBLE;
           break;
         case '[':
           while (methodDescriptor.charAt(currentMethodDescritorOffset) == '[') {
@@ -2998,20 +2997,20 @@ private void computeImplicitFrame(final Context context) {
               ++currentMethodDescritorOffset;
             }
           }
-          locals[nLocal++] =
+          locals[numLocal++] =
               methodDescriptor.substring(
                   currentArgumentDescriptorStartOffset, ++currentMethodDescritorOffset);
           break;
         case 'L':
           while (methodDescriptor.charAt(currentMethodDescritorOffset) != ';') {
             ++currentMethodDescritorOffset;
           }
-          locals[nLocal++] =
+          locals[numLocal++] =
               methodDescriptor.substring(
                   currentArgumentDescriptorStartOffset + 1, currentMethodDescritorOffset++);
           break;
         default:
-          context.currentFrameLocalCount = nLocal;
+          context.currentFrameLocalCount = numLocal;
           return;
       }
     }
@@ -3178,7 +3177,11 @@ private int readVerificationTypeInfo(
   // Methods to parse attributes
   // ----------------------------------------------------------------------------------------------
 
-  /** @return the offset in {@link #b} of the first ClassFile's 'attributes' array field entry. */
+  /**
+   * Returns the offset in {@link #b} of the first ClassFile's 'attributes' array field entry.
+   *
+   * @return the offset in {@link #b} of the first ClassFile's 'attributes' array field entry.
+   */
   final int getFirstAttributeOffset() {
     // Skip the access_flags, this_class, super_class, and interfaces_count fields (using 2 bytes
     // each), as well as the interfaces array field (2 bytes per interface).
@@ -3399,12 +3402,13 @@ public long readLong(final int offset) {
    *     large. It is not automatically resized.
    * @return the String corresponding to the specified CONSTANT_Utf8 entry.
    */
+  // DontCheck(AbbreviationAsWordInName): can't be renamed (for backward binary compatibility).
   public String readUTF8(final int offset, final char[] charBuffer) {
     int constantPoolEntryIndex = readUnsignedShort(offset);
     if (offset == 0 || constantPoolEntryIndex == 0) {
       return null;
     }
-    return readUTF(constantPoolEntryIndex, charBuffer);
+    return readUtf(constantPoolEntryIndex, charBuffer);
   }
 
   /**
@@ -3416,14 +3420,14 @@ public String readUTF8(final int offset, final char[] charBuffer) {
    *     large. It is not automatically resized.
    * @return the String corresponding to the specified CONSTANT_Utf8 entry.
    */
-  final String readUTF(final int constantPoolEntryIndex, final char[] charBuffer) {
+  final String readUtf(final int constantPoolEntryIndex, final char[] charBuffer) {
     String value = constantUtf8Values[constantPoolEntryIndex];
     if (value != null) {
       return value;
     }
     int cpInfoOffset = cpInfoOffsets[constantPoolEntryIndex];
     return constantUtf8Values[constantPoolEntryIndex] =
-        readUTF(cpInfoOffset + 2, readUnsignedShort(cpInfoOffset), charBuffer);
+        readUtf(cpInfoOffset + 2, readUnsignedShort(cpInfoOffset), charBuffer);
   }
 
   /**
@@ -3435,7 +3439,7 @@ final String readUTF(final int constantPoolEntryIndex, final char[] charBuffer)
    *     large. It is not automatically resized.
    * @return the String corresponding to the specified UTF8 string.
    */
-  private String readUTF(final int utfOffset, final int utfLength, final char[] charBuffer) {
+  private String readUtf(final int utfOffset, final int utfLength, final char[] charBuffer) {
     int currentOffset = utfOffset;
     int endOffset = currentOffset + utfLength;
     int strLength = 0;

spring-core/src/main/java/org/springframework/asm/ClassTooLargeException.java

@@ -51,12 +51,20 @@ public ClassTooLargeException(final String className, final int constantPoolCoun
     this.constantPoolCount = constantPoolCount;
   }
 
-  /** @return the internal name of the class. */
+  /**
+   * Returns the internal name of the class.
+   *
+   * @return the internal name of the class.
+   */
   public String getClassName() {
     return className;
   }
 
-  /** @return the number of constant pool items of the class. */
+  /**
+   * Returns the number of constant pool items of the class.
+   *
+   * @return the number of constant pool items of the class.
+   */
   public int getConstantPoolCount() {
     return constantPoolCount;
   }

spring-core/src/main/java/org/springframework/asm/ClassWriter.java

@@ -282,7 +282,7 @@ public final void visitSource(final String file, final String debug) {
       sourceFileIndex = symbolTable.addConstantUtf8(file);
     }
     if (debug != null) {
-      debugExtension = new ByteVector().encodeUTF8(debug, 0, Integer.MAX_VALUE);
+      debugExtension = new ByteVector().encodeUtf8(debug, 0, Integer.MAX_VALUE);
     }
   }
 
@@ -674,7 +674,7 @@ public byte[] toByteArray() throws ClassTooLargeException, MethodTooLargeExcepti
    *     ones.
    */
   private byte[] replaceAsmInstructions(final byte[] classFile, final boolean hasFrames) {
-    Attribute[] attributes = getAttributePrototypes();
+    final Attribute[] attributes = getAttributePrototypes();
     firstField = null;
     lastField = null;
     firstMethod = null;
@@ -743,6 +743,7 @@ public int newConst(final Object value) {
    * @param value the String value.
    * @return the index of a new or already existing UTF8 item.
    */
+  // DontCheck(AbbreviationAsWordInName): can't be renamed (for backward binary compatibility).
   public int newUTF8(final String value) {
     return symbolTable.addConstantUtf8(value);
   }
@@ -947,13 +948,13 @@ protected String getCommonSuperClass(final String type1, final String type2) {
     Class<?> class1;
     try {
       class1 = Class.forName(type1.replace('/', '.'), false, classLoader);
-    } catch (Exception e) {
+    } catch (ClassNotFoundException e) {
       throw new TypeNotPresentException(type1, e);
     }
     Class<?> class2;
     try {
       class2 = Class.forName(type2.replace('/', '.'), false, classLoader);
-    } catch (Exception e) {
+    } catch (ClassNotFoundException e) {
       throw new TypeNotPresentException(type2, e);
     }
     if (class1.isAssignableFrom(class2)) {

spring-core/src/main/java/org/springframework/asm/Constants.java

@@ -36,8 +36,6 @@
  */
 final class Constants implements Opcodes {
 
-  private Constants() {}
-
   // The ClassFile attribute names, in the order they are defined in
   // https://docs.oracle.com/javase/specs/jvms/se11/html/jvms-4.html#jvms-4.7-300.
 
@@ -173,4 +171,6 @@ private Constants() {}
   static final int ASM_IFNULL = IFNULL + ASM_IFNULL_OPCODE_DELTA;
   static final int ASM_IFNONNULL = IFNONNULL + ASM_IFNULL_OPCODE_DELTA;
   static final int ASM_GOTO_W = 220;
+
+  private Constants() {}
 }