This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-bcel.git
The following commit(s) were added to refs/heads/master by this push:
new beebb726 Use Checkstyle WhitespaceAfter
new 1d7a98da Merge branch 'master' of
https://gitbox.apache.org/repos/asf/commons-bcel.git
beebb726 is described below
commit beebb72673e0c70bf7236211ff913335cbe928d8
Author: Gary David Gregory (Code signing key) <ggreg...@apache.org>
AuthorDate: Sat May 4 13:48:49 2024 -0400
Use Checkstyle WhitespaceAfter
---
src/conf/checkstyle.xml | 10 ----------
src/main/java/org/apache/bcel/Constants.java | 2 +-
.../java/org/apache/bcel/classfile/Signature.java | 8 ++++----
.../apache/bcel/generic/AnnotationEntryGen.java | 4 ++--
.../apache/bcel/generic/ClassElementValueGen.java | 4 ++--
.../apache/bcel/generic/ElementValuePairGen.java | 4 ++--
.../apache/bcel/generic/EnumElementValueGen.java | 22 ++++++++++------------
.../org/apache/bcel/generic/InstructionList.java | 2 +-
.../java/org/apache/bcel/util/BCELFactory.java | 2 +-
.../org/apache/bcel/classfile/RecordTestCase.java | 15 +++++++--------
.../org/apache/bcel/classfile/UtilityTestCase.java | 2 +-
.../apache/bcel/generic/BranchHandleTestCase.java | 6 +++---
.../bcel/generic/InstructionHandleTestCase.java | 6 +++---
13 files changed, 37 insertions(+), 50 deletions(-)
diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml
index 21cee04d..581c1dee 100644
--- a/src/conf/checkstyle.xml
+++ b/src/conf/checkstyle.xml
@@ -103,17 +103,7 @@ limitations under the License.
<!-- Checks for whitespace -->
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
<module name="EmptyForIteratorPad"/>
- <!-- Too many to fix at present
- <module name="NoWhitespaceAfter"/>
- <module name="NoWhitespaceBefore"/>
- <module name="OperatorWrap">
- <property name="option" value="nl" />
- </module>
- -->
- <!-- Too many to fix at present
- <module name="ParenPad"/>
<module name="WhitespaceAfter"/>
- -->
<module name="WhitespaceAround"/>
<!-- Modifier Checks -->
<!-- See http://checkstyle.sf.net/config_modifiers.html -->
diff --git a/src/main/java/org/apache/bcel/Constants.java
b/src/main/java/org/apache/bcel/Constants.java
index e3e73347..824073b9 100644
--- a/src/main/java/org/apache/bcel/Constants.java
+++ b/src/main/java/org/apache/bcel/Constants.java
@@ -2415,7 +2415,7 @@ public interface Constants {
byte ATTR_RUNTIMEINVISIBLE_PARAMETER_ANNOTATIONS = 15;
byte ATTR_ANNOTATION_DEFAULT = 16;
- short KNOWN_ATTRIBUTES = 12;// should be 17
+ short KNOWN_ATTRIBUTES = 12; // should be 17
// TODO: mutable public array!!
String[] ATTRIBUTE_NAMES = {"SourceFile", "ConstantValue", "Code",
"Exceptions", "LineNumberTable", "LocalVariableTable", "InnerClasses",
"Synthetic",
diff --git a/src/main/java/org/apache/bcel/classfile/Signature.java
b/src/main/java/org/apache/bcel/classfile/Signature.java
index f36c08ad..24ece286 100644
--- a/src/main/java/org/apache/bcel/classfile/Signature.java
+++ b/src/main/java/org/apache/bcel/classfile/Signature.java
@@ -105,7 +105,7 @@ public final class Signature extends Attribute {
if ((ch = in.read()) == -1) {
throw new IllegalArgumentException("Illegal signature: " +
in.getData() + " no ident, reaching EOF");
}
- // System.out.println("return from ident:" + (char)ch);
+ // System.out.println("return from ident:" + (char) ch);
if (!identStart(ch)) {
final StringBuilder buf2 = new StringBuilder();
int count = 1;
@@ -123,7 +123,7 @@ public final class Signature extends Attribute {
buf.append(buf2);
ch = in.read();
in.unread();
- // System.out.println("so far:" + buf2 + ":next:" +(char)ch);
+ // System.out.println("so far:" + buf2 + ":next:" +(char) ch);
} else {
for (int i = 0; i < count; i++) {
in.unread();
@@ -136,10 +136,10 @@ public final class Signature extends Attribute {
do {
buf2.append((char) ch);
ch = in.read();
- // System.out.println("within ident:"+ (char)ch);
+ // System.out.println("within ident:"+ (char) ch);
} while (ch != -1 && (Character.isJavaIdentifierPart((char) ch) || ch
== '/'));
buf.append(Utility.pathToPackage(buf2.toString()));
- // System.out.println("regular return ident:"+ (char)ch + ":" + buf2);
+ // System.out.println("regular return ident:"+ (char) ch + ":" + buf2);
if (ch != -1) {
in.unread();
}
diff --git a/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java
b/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java
index e0e04ec4..30eeaead 100644
--- a/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java
+++ b/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java
@@ -280,12 +280,12 @@ public class AnnotationEntryGen {
}
public final String getTypeName() {
- return getTypeSignature();// BCELBUG: Should I use this instead?
+ return getTypeSignature(); // BCELBUG: Should I use this instead?
// Utility.signatureToString(getTypeSignature());
}
public final String getTypeSignature() {
- // ConstantClass c = (ConstantClass)cpool.getConstant(typeIndex);
+ // ConstantClass c = (ConstantClass) cpool.getConstant(typeIndex);
final ConstantUtf8 utf8 = (ConstantUtf8) cpool.getConstant(typeIndex/*
c.getNameIndex() */);
return utf8.getBytes();
}
diff --git a/src/main/java/org/apache/bcel/generic/ClassElementValueGen.java
b/src/main/java/org/apache/bcel/generic/ClassElementValueGen.java
index bf2538b8..e02366ff 100644
--- a/src/main/java/org/apache/bcel/generic/ClassElementValueGen.java
+++ b/src/main/java/org/apache/bcel/generic/ClassElementValueGen.java
@@ -62,9 +62,9 @@ public class ClassElementValueGen extends ElementValueGen {
public String getClassString() {
final ConstantUtf8 cu8 = (ConstantUtf8)
getConstantPool().getConstant(idx);
return cu8.getBytes();
- // ConstantClass c = (ConstantClass)getConstantPool().getConstant(idx);
+ // ConstantClass c = (ConstantClass)
getConstantPool().getConstant(idx);
// ConstantUtf8 utf8 =
- // (ConstantUtf8)getConstantPool().getConstant(c.getNameIndex());
+ // (ConstantUtf8) getConstantPool().getConstant(c.getNameIndex());
// return utf8.getBytes();
}
diff --git a/src/main/java/org/apache/bcel/generic/ElementValuePairGen.java
b/src/main/java/org/apache/bcel/generic/ElementValuePairGen.java
index 6722d3c4..96be7a74 100644
--- a/src/main/java/org/apache/bcel/generic/ElementValuePairGen.java
+++ b/src/main/java/org/apache/bcel/generic/ElementValuePairGen.java
@@ -39,7 +39,7 @@ public class ElementValuePairGen {
// Could assert nvp.getNameString() points to the same thing as
// constantPoolGen.getConstant(nvp.getNameIndex())
// if
- //
(!nvp.getNameString().equals(((ConstantUtf8)constantPoolGen.getConstant(nvp.getNameIndex())).getBytes()))
+ // (!nvp.getNameString().equals(((ConstantUtf8)
constantPoolGen.getConstant(nvp.getNameIndex())).getBytes()))
// {
// throw new IllegalArgumentException("envp buggered");
// }
@@ -81,7 +81,7 @@ public class ElementValuePairGen {
}
public final String getNameString() {
- // ConstantString cu8 =
(ConstantString)constantPoolGen.getConstant(nameIdx);
+ // ConstantString cu8 = (ConstantString)
constantPoolGen.getConstant(nameIdx);
return ((ConstantUtf8)
constantPoolGen.getConstant(nameIdx)).getBytes();
}
diff --git a/src/main/java/org/apache/bcel/generic/EnumElementValueGen.java
b/src/main/java/org/apache/bcel/generic/EnumElementValueGen.java
index ef1f5f4c..954a739a 100644
--- a/src/main/java/org/apache/bcel/generic/EnumElementValueGen.java
+++ b/src/main/java/org/apache/bcel/generic/EnumElementValueGen.java
@@ -35,10 +35,8 @@ public class EnumElementValueGen extends ElementValueGen {
public EnumElementValueGen(final EnumElementValue value, final
ConstantPoolGen cpool, final boolean copyPoolEntries) {
super(ENUM_CONSTANT, cpool);
if (copyPoolEntries) {
- typeIdx = cpool.addUtf8(value.getEnumTypeString());// was
- //
addClass(value.getEnumTypeString());
- valueIdx = cpool.addUtf8(value.getEnumValueString()); // was
- //
addString(value.getEnumValueString());
+ typeIdx = cpool.addUtf8(value.getEnumTypeString()); // was
addClass(value.getEnumTypeString());
+ valueIdx = cpool.addUtf8(value.getEnumValueString()); // was
addString(value.getEnumValueString());
} else {
typeIdx = value.getTypeIndex();
valueIdx = value.getValueIndex();
@@ -60,8 +58,8 @@ public class EnumElementValueGen extends ElementValueGen {
public EnumElementValueGen(final ObjectType t, final String value, final
ConstantPoolGen cpool) {
super(ElementValueGen.ENUM_CONSTANT, cpool);
- typeIdx = cpool.addUtf8(t.getSignature());// was addClass(t);
- valueIdx = cpool.addUtf8(value);// was addString(value);
+ typeIdx = cpool.addUtf8(t.getSignature()); // was addClass(t);
+ valueIdx = cpool.addUtf8(value); // was addString(value);
}
@Override
@@ -85,9 +83,9 @@ public class EnumElementValueGen extends ElementValueGen {
public String getEnumTypeString() {
// Constant cc = getConstantPool().getConstant(typeIdx);
// ConstantClass cu8 =
- // (ConstantClass)getConstantPool().getConstant(typeIdx);
+ // (ConstantClass) getConstantPool().getConstant(typeIdx);
// return
- //
((ConstantUtf8)getConstantPool().getConstant(cu8.getNameIndex())).getBytes();
+ // ((ConstantUtf8)
getConstantPool().getConstant(cu8.getNameIndex())).getBytes();
return ((ConstantUtf8)
getConstantPool().getConstant(typeIdx)).getBytes();
// return Utility.signatureToString(cu8.getBytes());
}
@@ -95,9 +93,9 @@ public class EnumElementValueGen extends ElementValueGen {
public String getEnumValueString() {
return ((ConstantUtf8)
getConstantPool().getConstant(valueIdx)).getBytes();
// ConstantString cu8 =
- // (ConstantString)getConstantPool().getConstant(valueIdx);
+ // (ConstantString) getConstantPool().getConstant(valueIdx);
// return
- //
((ConstantUtf8)getConstantPool().getConstant(cu8.getStringIndex())).getBytes();
+ // ((ConstantUtf8)
getConstantPool().getConstant(cu8.getStringIndex())).getBytes();
}
public int getTypeIndex() {
@@ -113,8 +111,8 @@ public class EnumElementValueGen extends ElementValueGen {
final ConstantUtf8 cu8 = (ConstantUtf8)
getConstantPool().getConstant(valueIdx);
return cu8.getBytes();
// ConstantString cu8 =
- // (ConstantString)getConstantPool().getConstant(valueIdx);
+ // (ConstantString) getConstantPool().getConstant(valueIdx);
// return
- //
((ConstantUtf8)getConstantPool().getConstant(cu8.getStringIndex())).getBytes();
+ // ((ConstantUtf8)
getConstantPool().getConstant(cu8.getStringIndex())).getBytes();
}
}
diff --git a/src/main/java/org/apache/bcel/generic/InstructionList.java
b/src/main/java/org/apache/bcel/generic/InstructionList.java
index 0f4340b7..0f2eece9 100644
--- a/src/main/java/org/apache/bcel/generic/InstructionList.java
+++ b/src/main/java/org/apache/bcel/generic/InstructionList.java
@@ -1137,7 +1137,7 @@ public class InstructionList implements
Iterable<InstructionHandle> {
index += i.getLength();
}
/*
- * Pass 2: Expand the variable-length (Branch)Instructions depending
on the target offset (short or int) and ensure that
+ * Pass 2: Expand the variable-length (Branch) Instructions depending
on the target offset (short or int) and ensure that
* branch targets are within this list.
*/
for (InstructionHandle ih = start; ih != null; ih = ih.getNext()) {
diff --git a/src/main/java/org/apache/bcel/util/BCELFactory.java
b/src/main/java/org/apache/bcel/util/BCELFactory.java
index b00ab703..e22c6ce3 100644
--- a/src/main/java/org/apache/bcel/util/BCELFactory.java
+++ b/src/main/java/org/apache/bcel/util/BCELFactory.java
@@ -83,7 +83,7 @@ final class BCELFactory extends EmptyVisitor {
if (value instanceof String) {
embed = '"' + Utility.convertString(embed) + '"';
} else if (value instanceof Character) {
- embed = "(char)0x" + Integer.toHexString(((Character)
value).charValue());
+ embed = "(char) 0x" + Integer.toHexString(((Character)
value).charValue());
} else if (value instanceof Float) {
final Float f = (Float) value;
if (Float.isNaN(f)) {
diff --git a/src/test/java/org/apache/bcel/classfile/RecordTestCase.java
b/src/test/java/org/apache/bcel/classfile/RecordTestCase.java
index 8056250a..62e139ec 100644
--- a/src/test/java/org/apache/bcel/classfile/RecordTestCase.java
+++ b/src/test/java/org/apache/bcel/classfile/RecordTestCase.java
@@ -50,8 +50,8 @@ public class RecordTestCase extends AbstractTestCase {
final CountingVisitor countVisitor = new CountingVisitor();
final DescendingVisitor desendingVisitor = new
DescendingVisitor(clazz, countVisitor);
desendingVisitor.visit();
- assertEquals(1,countVisitor.recordCount, "should count one record");
- assertEquals(2,countVisitor.recordComponentCount, "should count two
record components");
+ assertEquals(1, countVisitor.recordCount, "should count one record");
+ assertEquals(2, countVisitor.recordComponentCount, "should count two
record components");
}
@@ -62,13 +62,13 @@ public class RecordTestCase extends AbstractTestCase {
public void testAttributeSerializtion() throws ClassNotFoundException,
IOException {
final JavaClass clazz = new
ClassParser("src/test/resources/record/SimpleRecord.class").parse();
final File tfile = createTestdataFile("SimpleRecord.class");
- final Record recordAttribute =
(Record)findAttribute("Record",clazz)[0];
+ final Record recordAttribute = (Record) findAttribute("Record",
clazz)[0];
clazz.dump(tfile);
// Read in the new version and check it is OK
final SyntheticRepository repos2 = createRepos(".");
final JavaClass clazzFromRepo = repos2.loadClass("SimpleRecord");
assertNotNull(clazzFromRepo); // Use the variable to avoid a warning
- final Record recordAttributeFromRepo =
(Record)findAttribute("Record",clazzFromRepo)[0];
+ final Record recordAttributeFromRepo = (Record)
findAttribute("Record", clazzFromRepo)[0];
assertEquals(recordAttribute.toString(),
recordAttributeFromRepo.toString(), "Both attributes needs to be equal");
tfile.deleteOnExit();
}
@@ -101,20 +101,19 @@ public class RecordTestCase extends AbstractTestCase {
public void testRecordToString() throws ClassNotFoundException,
ClassFormatException, IOException {
final JavaClass clazz = new
ClassParser("src/test/resources/record/SimpleRecord.class").parse();
final Attribute[] attributes = clazz.getAttributes();
- final Record recordAttribute = (Record)
findAttribute("Record",clazz)[0];
+ final Record recordAttribute = (Record) findAttribute("Record",
clazz)[0];
assertEquals(4, attributes.length);
assertEquals("SourceFile: SimpleRecord.java",
attributes[0].toString());
assertEquals("Record(2):\n"
+ " RecordComponentInfo(aNumber,I,0):\n"
+ " RecordComponentInfo(aString,Ljava/lang/String;,1):\n"
+ " RuntimeVisibleAnnotations:\n"
- + " @Ljavax/annotation/Nonnull;"
- ,recordAttribute.toString());
+ + " @Ljavax/annotation/Nonnull;", recordAttribute.toString());
final RecordComponentInfo firstComponent =
recordAttribute.getComponents()[0];
assertEquals(5, firstComponent.getIndex());
assertEquals(6, firstComponent.getDescriptorIndex());
assertEquals(0, firstComponent.getAttributes().length);
-
assertEquals(recordAttribute.getConstantPool(),firstComponent.getConstantPool());
+ assertEquals(recordAttribute.getConstantPool(),
firstComponent.getConstantPool());
assertEquals("RecordComponentInfo(aNumber,I,0):",
firstComponent.toString());
}
diff --git a/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java
b/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java
index 7d6095d0..192c2b59 100644
--- a/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java
+++ b/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java
@@ -80,7 +80,7 @@ public class UtilityTestCase {
assertTrue(code.contains("33:
getfield\t\torg.apache.bcel.classfile.UtilityTestCase$1CodeToString.a [[I"),
code);
assertTrue(code.contains("36:
invokestatic\tjava.util.Arrays.asList ([Ljava/lang/Object;)Ljava/util/List;"),
code);
assertTrue(code.contains("39:
invokeinterface\tjava.util.List.size ()I1\t0"), code);
- assertTrue(code.contains("44:
invokevirtual\tjava.io.PrintStream.print (I)V"), code);
+ assertTrue(code.contains("44:
invokevirtual\tjava.io.PrintStream.print "), code);
assertTrue(code.contains("47: return"), code);
}
}
diff --git a/src/test/java/org/apache/bcel/generic/BranchHandleTestCase.java
b/src/test/java/org/apache/bcel/generic/BranchHandleTestCase.java
index 2927bdc4..9d0f879f 100644
--- a/src/test/java/org/apache/bcel/generic/BranchHandleTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/BranchHandleTestCase.java
@@ -30,7 +30,7 @@ public class BranchHandleTestCase {
@Test
public void testsetInstructionBI() {
- final BranchHandle bh = BranchHandle.getBranchHandle(new
GOTO(null));// have to start with a valid BI
+ final BranchHandle bh = BranchHandle.getBranchHandle(new GOTO(null));
// have to start with a valid BI
assertNotNull(bh);
bh.setInstruction(new GOTO(null));
assertNotNull(bh);
@@ -38,7 +38,7 @@ public class BranchHandleTestCase {
@Test
public void testsetInstructionnotBI() {
- final BranchHandle bh = BranchHandle.getBranchHandle(new
GOTO(null));// have to start with a valid BI
+ final BranchHandle bh = BranchHandle.getBranchHandle(new GOTO(null));
// have to start with a valid BI
assertNotNull(bh);
assertThrows(ClassGenException.class, () -> bh.setInstruction(new
NOP()));
}
@@ -46,7 +46,7 @@ public class BranchHandleTestCase {
// Test that setInstruction only allows BranchInstructions
@Test
public void testsetInstructionNull() {
- final BranchHandle bh = BranchHandle.getBranchHandle(new
GOTO(null));// have to start with a valid BI
+ final BranchHandle bh = BranchHandle.getBranchHandle(new GOTO(null));
// have to start with a valid BI
assertNotNull(bh);
assertThrows(ClassGenException.class, () -> bh.setInstruction(null));
}
diff --git
a/src/test/java/org/apache/bcel/generic/InstructionHandleTestCase.java
b/src/test/java/org/apache/bcel/generic/InstructionHandleTestCase.java
index 4d799273..81ea8571 100644
--- a/src/test/java/org/apache/bcel/generic/InstructionHandleTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/InstructionHandleTestCase.java
@@ -40,7 +40,7 @@ public class InstructionHandleTestCase {
@Test
public void testsetInstructionI() {
- final InstructionHandle ih =
InstructionHandle.getInstructionHandle(new NOP());// have to start with a valid
non BI
+ final InstructionHandle ih =
InstructionHandle.getInstructionHandle(new NOP()); // have to start with a
valid non BI
assertNotNull(ih);
ih.setInstruction(new NOP());
assertNotNull(ih);
@@ -48,14 +48,14 @@ public class InstructionHandleTestCase {
@Test
public void testsetInstructionnotI() {
- final InstructionHandle ih =
InstructionHandle.getInstructionHandle(new NOP());// have to start with a valid
non BI
+ final InstructionHandle ih =
InstructionHandle.getInstructionHandle(new NOP()); // have to start with a
valid non BI
assertNotNull(ih);
assertThrows(ClassGenException.class, () -> ih.setInstruction(new
GOTO(null)));
}
@Test
public void testsetInstructionNull() {
- final InstructionHandle ih =
InstructionHandle.getInstructionHandle(new NOP());// have to start with a valid
non BI
+ final InstructionHandle ih =
InstructionHandle.getInstructionHandle(new NOP()); // have to start with a
valid non BI
assertNotNull(ih);
assertThrows(ClassGenException.class, () -> ih.setInstruction(null));
}
