Sort members

apache · Apr 21, 2024 · 8083fb5 · 8083fb5
1 parent d18eae6
commit 8083fb5
Show file tree

Hide file tree

Showing 10 changed files with 160 additions and 160 deletions.
diff --git a/src/main/java/org/apache/bcel/classfile/DescendingVisitor.java b/src/main/java/org/apache/bcel/classfile/DescendingVisitor.java
@@ -504,6 +504,21 @@ public void visitParameterAnnotationEntry(final ParameterAnnotationEntry obj) {
         stack.pop();
     }
 
+    @Override
+    public void visitRecord(Record record) {
+        stack.push(record);
+        record.accept(visitor);
+        accept(record.getComponents());
+        stack.pop();
+    }
+
+    @Override
+    public void visitRecordComponent(RecordComponentInfo recordComponentInfo) {
+        stack.push(recordComponentInfo);
+        recordComponentInfo.accept(visitor);
+        stack.pop();
+    }
+
     @Override
     public void visitSignature(final Signature attribute) {
         stack.push(attribute);
@@ -561,19 +576,4 @@ public void visitUnknown(final Unknown attribute) {
         stack.pop();
     }
 
-    @Override
-    public void visitRecord(Record record) {
-        stack.push(record);
-        record.accept(visitor);
-        accept(record.getComponents());
-        stack.pop();
-    }
-
-    @Override
-    public void visitRecordComponent(RecordComponentInfo recordComponentInfo) {
-        stack.push(recordComponentInfo);
-        recordComponentInfo.accept(visitor);
-        stack.pop();
-    }
-
 }
diff --git a/src/main/java/org/apache/bcel/classfile/JavaClass.java b/src/main/java/org/apache/bcel/classfile/JavaClass.java
@@ -259,6 +259,19 @@ public int compareTo(final JavaClass obj) {
         return getClassName().compareTo(obj.getClassName());
     }
 
+    private void computeIsRecord() {
+        if (computedRecord) {
+            return;
+        }
+        for (final Attribute attribute : this.attributes) {
+            if (attribute instanceof Record) {
+                isRecord = true;
+                break;
+            }
+        }
+        this.computedRecord = true;
+    }
+
     private void computeNestedTypeStatus() {
         if (computedNestedTypeStatus) {
             return;
@@ -743,6 +756,17 @@ public final boolean isNested() {
         return this.isNested;
     }
 
+    /**
+     * Tests whether this class was declared as a record
+     *
+     * @return true if a record attribute is present, false otherwise.
+     * @since 6.9.0
+     */
+    public boolean isRecord() {
+        computeIsRecord();
+        return this.isRecord;
+    }
+
     public final boolean isSuper() {
         return (super.getAccessFlags() & Const.ACC_SUPER) != 0;
     }
@@ -906,28 +930,4 @@ public String toString() {
         }
         return buf.toString();
     }
-
-    /**
-     * Tests whether this class was declared as a record
-     *
-     * @return true if a record attribute is present, false otherwise.
-     * @since 6.9.0
-     */
-    public boolean isRecord() {
-        computeIsRecord();
-        return this.isRecord;
-    }
-
-    private void computeIsRecord() {
-        if (computedRecord) {
-            return;
-        }
-        for (final Attribute attribute : this.attributes) {
-            if (attribute instanceof Record) {
-                isRecord = true;
-                break;
-            }
-        }
-        this.computedRecord = true;
-    }
 }
diff --git a/src/main/java/org/apache/bcel/classfile/Record.java b/src/main/java/org/apache/bcel/classfile/Record.java
@@ -37,6 +37,16 @@ public final class Record extends Attribute {
 
     private static final RecordComponentInfo[] EMPTY_RCI_ARRAY = new RecordComponentInfo[] {};
 
+    private static RecordComponentInfo[] readComponents(final DataInput input, final ConstantPool constantPool)
+            throws IOException {
+        final int classCount = input.readUnsignedShort();
+        final RecordComponentInfo[] components = new RecordComponentInfo[classCount];
+        for (int i = 0; i < classCount; i++) {
+            components[i] = new RecordComponentInfo(input, constantPool);
+        }
+        return components;
+    }
+
     private RecordComponentInfo[] components;
 
     /**
@@ -53,16 +63,6 @@ public final class Record extends Attribute {
         this(nameIndex, length, readComponents(input, constantPool), constantPool);
     }
 
-    private static RecordComponentInfo[] readComponents(final DataInput input, final ConstantPool constantPool)
-            throws IOException {
-        final int classCount = input.readUnsignedShort();
-        final RecordComponentInfo[] components = new RecordComponentInfo[classCount];
-        for (int i = 0; i < classCount; i++) {
-            components[i] = new RecordComponentInfo(input, constantPool);
-        }
-        return components;
-    }
-
     /**
      * Constructs a new instance using components.
      *

diff --git a/src/main/java/org/apache/bcel/classfile/RecordComponentInfo.java b/src/main/java/org/apache/bcel/classfile/RecordComponentInfo.java
@@ -55,6 +55,11 @@ public RecordComponentInfo(final DataInput input, ConstantPool constantPool) thr
         this.constantPool = constantPool;
     }
 
+    @Override
+    public void accept(Visitor v) {
+        v.visitRecordComponent(this);
+    }
+
     /**
      * Dumps contents into a file stream in binary format.
      *
@@ -70,18 +75,22 @@ public void dump(DataOutputStream file) throws IOException {
         }
     }
 
-    @Override
-    public void accept(Visitor v) {
-        v.visitRecordComponent(this);
+    /**
+     * Gets all attributes.
+     *
+     * @return all attributes.
+     */
+    public Attribute[] getAttributes() {
+        return attributes;
     }
 
     /**
-     * Gets the name index.
+     * Gets the constant pool.
      *
-     * @return index in constant pool of this record component name.
+     * @return Constant pool.
      */
-    public int getIndex() {
-        return index;
+    public ConstantPool getConstantPool() {
+        return constantPool;
     }
 
     /**
@@ -94,21 +103,12 @@ public int getDescriptorIndex() {
     }
 
     /**
-     * Gets all attributes.
-     *
-     * @return all attributes.
-     */
-    public Attribute[] getAttributes() {
-        return attributes;
-    }
-
-    /**
-     * Gets the constant pool.
+     * Gets the name index.
      *
-     * @return Constant pool.
+     * @return index in constant pool of this record component name.
      */
-    public ConstantPool getConstantPool() {
-        return constantPool;
+    public int getIndex() {
+        return index;
     }
 
     /**

diff --git a/src/main/java/org/apache/bcel/classfile/Visitor.java b/src/main/java/org/apache/bcel/classfile/Visitor.java
@@ -207,6 +207,17 @@ default void visitNestMembers(final NestMembers obj) {
         // empty
     }
 
+    /**
+     * @since 6.0
+     */
+    void visitParameterAnnotation(ParameterAnnotations obj);
+
+
+    /**
+     * @since 6.0
+     */
+    void visitParameterAnnotationEntry(ParameterAnnotationEntry obj);
+
     /**
      * Visits a {@link Record} object.
      *
@@ -217,16 +228,15 @@ default void visitRecord(final Record obj) {
         // empty
     }
 
-
     /**
-     * @since 6.0
-     */
-    void visitParameterAnnotation(ParameterAnnotations obj);
-
-    /**
-     * @since 6.0
+     * Visits a {@link RecordComponentInfo} object.
+     *
+     * @param record component to visit
+     * @since 6.9.0
      */
-    void visitParameterAnnotationEntry(ParameterAnnotationEntry obj);
+    default void visitRecordComponent(RecordComponentInfo record) {
+     // noop
+    }
 
     void visitSignature(Signature obj);
 
@@ -250,14 +260,4 @@ default void visitStackMapType(final StackMapType obj) {
 
     void visitUnknown(Unknown obj);
 
-    /**
-     * Visits a {@link RecordComponentInfo} object.
-     *
-     * @param record component to visit
-     * @since 6.9.0
-     */
-    default void visitRecordComponent(RecordComponentInfo record) {
-     // noop
-    }
-
 }
diff --git a/src/main/java/org/apache/bcel/verifier/statics/StringRepresentation.java b/src/main/java/org/apache/bcel/verifier/statics/StringRepresentation.java
@@ -399,6 +399,16 @@ public void visitParameterAnnotationEntry(final ParameterAnnotationEntry obj) {
         tostring = toString(obj);
     }
 
+    @Override
+    public void visitRecord(Record obj) {
+        tostring = toString(obj);
+    }
+
+    @Override
+    public void visitRecordComponent(RecordComponentInfo obj) {
+        tostring = toString(obj);
+    }
+
     @Override
     public void visitSignature(final Signature obj) {
         tostring = toString(obj);
@@ -432,14 +442,4 @@ public void visitUnknown(final Unknown obj) {
         tostring = toString(obj);
     }
 
-    @Override
-    public void visitRecord(Record obj) {
-        tostring = toString(obj);
-    }
-
-    @Override
-    public void visitRecordComponent(RecordComponentInfo obj) {
-        tostring = toString(obj);
-    }
-
 }
diff --git a/src/test/java/org/apache/bcel/CounterVisitorTestCase.java b/src/test/java/org/apache/bcel/CounterVisitorTestCase.java
@@ -183,6 +183,11 @@ public void testParameterAnnotationCount() {
         assertEquals(0, getVisitor().parameterAnnotationCount, "parameterAnnotationCount");
     }
 
+    @Test
+    public void testRecordCount() {
+        assertEquals(0, getVisitor().recordCount, "recordCount");
+    }
+
     @Test
     public void testSignatureCount() {
         assertEquals(0, getVisitor().signatureAnnotationCount, "signatureAnnotationCount");
@@ -217,9 +222,4 @@ public void testSyntheticCount() {
     public void testUnknownCount() {
         assertEquals(0, getVisitor().unknownCount, "unknownCount");
     }
-
-    @Test
-    public void testRecordCount() {
-        assertEquals(0, getVisitor().recordCount, "recordCount");
-    }
 }