'
type = typeSignatureToString(signature.substring(n), chopit);
// corrected concurrent private static field acess
- // Utility.consumed_chars += consumed_chars; is replaced by:
- final int temp = unwrap(Utility.CONSUMER_CHARS) + consumedChars;
- wrap(Utility.CONSUMER_CHARS, temp);
+ // consumed_chars += consumed_chars; is replaced by:
+ final int temp = unwrap(CONSUMER_CHARS) + consumedChars;
+ wrap(CONSUMER_CHARS, temp);
return type + brackets.toString();
}
case 'V':
diff --git a/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java b/src/main/java/org/apache/bcel/generic/AnnotationEntryGen.java
index e0e04ec4aa..30eeaead6b 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 int getTypeIndex() {
}
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/ArrayElementValueGen.java b/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java
index 21442263d5..97a15b6896 100644
--- a/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java
+++ b/src/main/java/org/apache/bcel/generic/ArrayElementValueGen.java
@@ -43,7 +43,7 @@ public ArrayElementValueGen(final ArrayElementValue value, final ConstantPoolGen
evalues = new ArrayList<>();
final ElementValue[] in = value.getElementValuesArray();
for (final ElementValue element : in) {
- evalues.add(ElementValueGen.copy(element, cpool, copyPoolEntries));
+ evalues.add(copy(element, cpool, copyPoolEntries));
}
}
@@ -57,7 +57,7 @@ public ArrayElementValueGen(final int type, final ElementValue[] elementValues,
if (type != ARRAY) {
throw new IllegalArgumentException("Only element values of type array can be built with this ctor - type specified: " + type);
}
- this.evalues = Streams.of(elementValues).map(e -> ElementValueGen.copy(e, cpool, true)).collect(Collectors.toList());
+ this.evalues = Streams.of(elementValues).map(e -> copy(e, cpool, true)).collect(Collectors.toList());
}
public void addElement(final ElementValueGen gen) {
diff --git a/src/main/java/org/apache/bcel/generic/ClassElementValueGen.java b/src/main/java/org/apache/bcel/generic/ClassElementValueGen.java
index bf2538b8f6..2a95d40a44 100644
--- a/src/main/java/org/apache/bcel/generic/ClassElementValueGen.java
+++ b/src/main/java/org/apache/bcel/generic/ClassElementValueGen.java
@@ -43,12 +43,12 @@ public ClassElementValueGen(final ClassElementValue value, final ConstantPoolGen
}
protected ClassElementValueGen(final int typeIdx, final ConstantPoolGen cpool) {
- super(ElementValueGen.CLASS, cpool);
+ super(CLASS, cpool);
this.idx = typeIdx;
}
public ClassElementValueGen(final ObjectType t, final ConstantPoolGen cpool) {
- super(ElementValueGen.CLASS, cpool);
+ super(CLASS, cpool);
// this.idx = cpool.addClass(t);
idx = cpool.addUtf8(t.getSignature());
}
@@ -62,9 +62,9 @@ public void dump(final DataOutputStream dos) throws IOException {
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 6722d3c430..96be7a74c9 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 ElementValuePairGen(final ElementValuePair nvp, final ConstantPoolGen cpo
// 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 int getNameIndex() {
}
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 ef1f5f4c90..89fee99b01 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();
@@ -50,7 +48,7 @@ public EnumElementValueGen(final EnumElementValue value, final ConstantPoolGen c
* This ctor is used for deserialization
*/
protected EnumElementValueGen(final int typeIdx, final int valueIdx, final ConstantPoolGen cpool) {
- super(ElementValueGen.ENUM_CONSTANT, cpool);
+ super(ENUM_CONSTANT, cpool);
if (super.getElementValueType() != ENUM_CONSTANT) {
throw new IllegalArgumentException("Only element values of type enum can be built with this ctor - type specified: " + super.getElementValueType());
}
@@ -59,9 +57,9 @@ protected EnumElementValueGen(final int typeIdx, final int valueIdx, final Const
}
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);
+ super(ENUM_CONSTANT, cpool);
+ typeIdx = cpool.addUtf8(t.getSignature()); // was addClass(t);
+ valueIdx = cpool.addUtf8(value); // was addString(value);
}
@Override
@@ -85,9 +83,9 @@ public ElementValue getElementValue() {
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 String getEnumTypeString() {
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 String stringifyValue() {
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/Instruction.java b/src/main/java/org/apache/bcel/generic/Instruction.java
index 2e8fa151cc..1d82913202 100644
--- a/src/main/java/org/apache/bcel/generic/Instruction.java
+++ b/src/main/java/org/apache/bcel/generic/Instruction.java
@@ -456,7 +456,7 @@ public int consumeStack(final ConstantPoolGen cpg) {
public Instruction copy() {
Instruction i = null;
// "Constant" instruction, no need to duplicate
- if (InstructionConst.getInstruction(this.getOpcode()) != null) {
+ if (InstructionConst.getInstruction(getOpcode()) != null) {
i = this;
} else {
try {
diff --git a/src/main/java/org/apache/bcel/generic/InstructionList.java b/src/main/java/org/apache/bcel/generic/InstructionList.java
index 0f4340b70f..0f2eece988 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 void setPositions(final boolean check) { // called by code in other packa
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/generic/InstructionTargeter.java b/src/main/java/org/apache/bcel/generic/InstructionTargeter.java
index f958a25e73..856cd611b9 100644
--- a/src/main/java/org/apache/bcel/generic/InstructionTargeter.java
+++ b/src/main/java/org/apache/bcel/generic/InstructionTargeter.java
@@ -18,7 +18,7 @@
package org.apache.bcel.generic;
/**
- * Denote that a class targets InstructionHandles within an InstructionList. Namely the following implementers:
+ * Denotes that a class targets InstructionHandles within an InstructionList.
*
* @see BranchHandle
* @see LocalVariableGen
@@ -29,9 +29,12 @@ public interface InstructionTargeter {
// static final InstructionTargeter[] EMPTY_ARRAY = new InstructionTargeter[0];
/**
- * Checks whether this targeter targets the specified instruction handle.
+ * Tests whether this targeter targets the specified instruction handle.
+ *
+ * @param instructionHandle the instruction handle to test.
+ * @return whether this targeter targets the specified instruction handle.
*/
- boolean containsTarget(InstructionHandle ih);
+ boolean containsTarget(InstructionHandle instructionHandle);
/**
* Replaces the target of this targeter from this old handle to the new handle.
diff --git a/src/main/java/org/apache/bcel/generic/ObjectType.java b/src/main/java/org/apache/bcel/generic/ObjectType.java
index 95a4df3f4c..b1e93b3da8 100644
--- a/src/main/java/org/apache/bcel/generic/ObjectType.java
+++ b/src/main/java/org/apache/bcel/generic/ObjectType.java
@@ -146,7 +146,7 @@ public boolean referencesInterfaceExact() throws ClassNotFoundException {
* @throws ClassNotFoundException if any of this class's superclasses can't be found
*/
public boolean subclassOf(final ObjectType superclass) throws ClassNotFoundException {
- if (this.referencesInterfaceExact() || superclass.referencesInterfaceExact()) {
+ if (referencesInterfaceExact() || superclass.referencesInterfaceExact()) {
return false;
}
return Repository.instanceOf(this.className, superclass.className);
diff --git a/src/main/java/org/apache/bcel/generic/ReferenceType.java b/src/main/java/org/apache/bcel/generic/ReferenceType.java
index 546bf0ae19..4468dcb2ff 100644
--- a/src/main/java/org/apache/bcel/generic/ReferenceType.java
+++ b/src/main/java/org/apache/bcel/generic/ReferenceType.java
@@ -38,10 +38,10 @@ protected ReferenceType(final byte t, final String s) {
/**
* This commutative operation returns the first common superclass (narrowest ReferenceType referencing a class, not an
- * interface). If one of the types is a superclass of the other, the former is returned. If "this" is Type.NULL, then t
- * is returned. If t is Type.NULL, then "this" is returned. If "this" equals t ['this.equals(t)'] "this" is returned. If
- * "this" or t is an ArrayType, then Type.OBJECT is returned. If "this" or t is a ReferenceType referencing an
- * interface, then Type.OBJECT is returned. If not all of the two classes' superclasses cannot be found, "null" is
+ * interface). If one of the types is a superclass of the other, the former is returned. If "this" is NULL, then t
+ * is returned. If t is NULL, then "this" is returned. If "this" equals t ['this.equals(t)'] "this" is returned. If
+ * "this" or t is an ArrayType, then {@link #OBJECT} is returned. If "this" or t is a ReferenceType referencing an
+ * interface, then {@link #OBJECT} is returned. If not all of the two classes' superclasses cannot be found, "null" is
* returned. See the JVM specification edition 2, "�4.9.2 The Bytecode Verifier".
*
* @deprecated use getFirstCommonSuperclass(ReferenceType t) which has slightly changed semantics.
@@ -49,45 +49,45 @@ protected ReferenceType(final byte t, final String s) {
*/
@Deprecated
public ReferenceType firstCommonSuperclass(final ReferenceType t) throws ClassNotFoundException {
- if (this.equals(Type.NULL)) {
+ if (equals(NULL)) {
return t;
}
- if (t.equals(Type.NULL) || this.equals(t)) {
+ if (t.equals(NULL) || equals(t)) {
return this;
/*
- * TODO: Above sounds a little arbitrary. On the other hand, there is no object referenced by Type.NULL so we can also
- * say all the objects referenced by Type.NULL were derived from {@link Object}. However, the Java Language's
+ * TODO: Above sounds a little arbitrary. On the other hand, there is no object referenced by {@link #NULL} so we can also
+ * say all the objects referenced by {@link #NULL} were derived from {@link Object}. However, the Java Language's
* "instanceof" operator proves us wrong: "null" is not referring to an instance of {@link Object} :)
*/
}
if (this instanceof ArrayType || t instanceof ArrayType) {
- return Type.OBJECT;
- // TODO: Is there a proof of OBJECT being the direct ancestor of every ArrayType?
+ return OBJECT;
+ // TODO: Is there a proof of {@link #OBJECT} being the direct ancestor of every ArrayType?
}
return getFirstCommonSuperclassInternal(t);
}
/**
* This commutative operation returns the first common superclass (narrowest ReferenceType referencing a class, not an
- * interface). If one of the types is a superclass of the other, the former is returned. If "this" is Type.NULL, then t
- * is returned. If t is Type.NULL, then "this" is returned. If "this" equals t ['this.equals(t)'] "this" is returned. If
- * "this" or t is an ArrayType, then Type.OBJECT is returned; unless their dimensions match. Then an ArrayType of the
+ * interface). If one of the types is a superclass of the other, the former is returned. If "this" is NULL, then t
+ * is returned. If t is NULL, then "this" is returned. If "this" equals t ['this.equals(t)'] "this" is returned. If
+ * "this" or t is an ArrayType, then {@link #OBJECT} is returned; unless their dimensions match. Then an ArrayType of the
* same number of dimensions is returned, with its basic type being the first common super class of the basic types of
- * "this" and t. If "this" or t is a ReferenceType referencing an interface, then Type.OBJECT is returned. If not all of
+ * "this" and t. If "this" or t is a ReferenceType referencing an interface, then {@link #OBJECT} is returned. If not all of
* the two classes' superclasses cannot be found, "null" is returned. See the JVM specification edition 2, "�4.9.2 The
* Bytecode Verifier".
*
* @throws ClassNotFoundException on failure to find superclasses of this type, or the type passed as a parameter
*/
public ReferenceType getFirstCommonSuperclass(final ReferenceType t) throws ClassNotFoundException {
- if (this.equals(Type.NULL)) {
+ if (equals(NULL)) {
return t;
}
- if (t.equals(Type.NULL) || this.equals(t)) {
+ if (t.equals(NULL) || equals(t)) {
return this;
/*
- * TODO: Above sounds a little arbitrary. On the other hand, there is no object referenced by Type.NULL so we can also
- * say all the objects referenced by Type.NULL were derived from {@link Object}. However, the Java Language's
+ * TODO: Above sounds a little arbitrary. On the other hand, there is no object referenced by {@link #NULL} so we can also
+ * say all the objects referenced by {@link #NULL} were derived from {@link Object}. However, the Java Language's
* "instanceof" operator proves us wrong: "null" is not referring to an instance of {@link Object} :)
*/
}
@@ -102,8 +102,8 @@ public ReferenceType getFirstCommonSuperclass(final ReferenceType t) throws Clas
}
}
if (this instanceof ArrayType || t instanceof ArrayType) {
- return Type.OBJECT;
- // TODO: Is there a proof of OBJECT being the direct ancestor of every ArrayType?
+ return OBJECT;
+ // TODO: Is there a proof of {@link #OBJECT} being the direct ancestor of every ArrayType?
}
return getFirstCommonSuperclassInternal(t);
}
@@ -111,7 +111,7 @@ public ReferenceType getFirstCommonSuperclass(final ReferenceType t) throws Clas
private ReferenceType getFirstCommonSuperclassInternal(final ReferenceType t) throws ClassNotFoundException {
if (this instanceof ObjectType && ((ObjectType) this).referencesInterfaceExact()
|| t instanceof ObjectType && ((ObjectType) t).referencesInterfaceExact()) {
- return Type.OBJECT;
+ return OBJECT;
// TODO: The above line is correct comparing to the vmspec2. But one could
// make class file verification a bit stronger here by using the notion of
// superinterfaces or even castability or assignment compatibility.
@@ -138,7 +138,7 @@ private ReferenceType getFirstCommonSuperclassInternal(final ReferenceType t) th
}
}
}
- // Huh? Did you ask for Type.OBJECT's superclass??
+ // Huh? Did you ask for OBJECT's superclass??
return null;
}
@@ -154,7 +154,7 @@ public boolean isAssignmentCompatibleWith(final Type t) throws ClassNotFoundExce
return false;
}
final ReferenceType T = (ReferenceType) t;
- if (this.equals(Type.NULL)) {
+ if (equals(NULL)) {
return true; // This is not explicitly stated, but clear. Isn't it?
}
/*
@@ -165,7 +165,7 @@ public boolean isAssignmentCompatibleWith(final Type t) throws ClassNotFoundExce
* If T is a class type, then this must be the same class as T, or this must be a subclass of T;
*/
if (T instanceof ObjectType && ((ObjectType) T).referencesClassExact()
- && (this.equals(T) || Repository.instanceOf(((ObjectType) this).getClassName(), ((ObjectType) T).getClassName()))) {
+ && (equals(T) || Repository.instanceOf(((ObjectType) this).getClassName(), ((ObjectType) T).getClassName()))) {
return true;
}
/*
@@ -183,14 +183,14 @@ public boolean isAssignmentCompatibleWith(final Type t) throws ClassNotFoundExce
/*
* If T is a class type, then T must be Object (�2.4.7).
*/
- if (T instanceof ObjectType && ((ObjectType) T).referencesClassExact() && T.equals(Type.OBJECT)) {
+ if (T instanceof ObjectType && ((ObjectType) T).referencesClassExact() && T.equals(OBJECT)) {
return true;
}
/*
* If T is an interface type, then T must be the same interface as this or a superinterface of this (�2.13.2).
*/
if (T instanceof ObjectType && ((ObjectType) T).referencesInterfaceExact()
- && (this.equals(T) || Repository.implementationOf(((ObjectType) this).getClassName(), ((ObjectType) T).getClassName()))) {
+ && (equals(T) || Repository.implementationOf(((ObjectType) this).getClassName(), ((ObjectType) T).getClassName()))) {
return true;
}
}
@@ -201,7 +201,7 @@ public boolean isAssignmentCompatibleWith(final Type t) throws ClassNotFoundExce
/*
* If T is a class type, then T must be Object (�2.4.7).
*/
- if (T instanceof ObjectType && ((ObjectType) T).referencesClassExact() && T.equals(Type.OBJECT)) {
+ if (T instanceof ObjectType && ((ObjectType) T).referencesClassExact() && T.equals(OBJECT)) {
return true;
}
/*
@@ -242,14 +242,14 @@ public boolean isAssignmentCompatibleWith(final Type t) throws ClassNotFoundExce
/**
* Return true iff this type is castable to another type t as defined in the JVM specification. The case where this is
- * Type.NULL is not defined (see the CHECKCAST definition in the JVM specification). However, because e.g. CHECKCAST
+ * {@link #NULL} is not defined (see the CHECKCAST definition in the JVM specification). However, because e.g. CHECKCAST
* doesn't throw a ClassCastException when casting a null reference to any Object, true is returned in this case.
*
* @throws ClassNotFoundException if any classes or interfaces required to determine assignment compatibility can't be
* found
*/
public boolean isCastableTo(final Type t) throws ClassNotFoundException {
- if (this.equals(Type.NULL)) {
+ if (equals(NULL)) {
return t instanceof ReferenceType; // If this is ever changed in isAssignmentCompatible()
}
return isAssignmentCompatibleWith(t);
diff --git a/src/main/java/org/apache/bcel/generic/TargetLostException.java b/src/main/java/org/apache/bcel/generic/TargetLostException.java
index 94abf59415..1fb3bf80ec 100644
--- a/src/main/java/org/apache/bcel/generic/TargetLostException.java
+++ b/src/main/java/org/apache/bcel/generic/TargetLostException.java
@@ -17,16 +17,16 @@
package org.apache.bcel.generic;
/**
- * Thrown by InstructionList.remove() when one or multiple disposed instructions are still being referenced by an
- * InstructionTargeter object. I.e. the InstructionTargeter has to be notified that (one of) the InstructionHandle it is
- * referencing is being removed from the InstructionList and thus not valid anymore.
+ * Thrown by {@link InstructionList} when one or multiple disposed instructions are still being referenced by an {@link InstructionTargeter} object. I.e. the
+ * {@link InstructionTargeter} has to be notified that (one of) the {@link InstructionHandle} it is referencing is being removed from the
+ * {@link InstructionList} and thus not valid anymore.
*
*
- * Making this an exception instead of a return value forces the user to handle these case explicitly in a try { ... }
- * catch. The following code illustrates how this may be done:
+ * Making this an exception instead of a return value forces the user to handle these case explicitly in a try { ... } catch. The following code illustrates how
+ * this may be done:
*
*
- *
+ *
* ...
* try {
* il.delete(start_ih, end_ih);
@@ -37,7 +37,7 @@
* }
* }
* }
- *
+ *
*
* @see InstructionHandle
* @see InstructionList
@@ -48,12 +48,14 @@ public final class TargetLostException extends Exception {
private static final long serialVersionUID = -6857272667645328384L;
private final InstructionHandle[] targets;
- TargetLostException(final InstructionHandle[] t, final String mesg) {
- super(mesg);
- targets = t;
+ TargetLostException(final InstructionHandle[] targets, final String message) {
+ super(message);
+ this.targets = targets;
}
/**
+ * Gets the list of instructions still being targeted.
+ *
* @return list of instructions still being targeted.
*/
public InstructionHandle[] getTargets() {
diff --git a/src/main/java/org/apache/bcel/generic/Type.java b/src/main/java/org/apache/bcel/generic/Type.java
index 76b833907f..058157a5ba 100644
--- a/src/main/java/org/apache/bcel/generic/Type.java
+++ b/src/main/java/org/apache/bcel/generic/Type.java
@@ -158,7 +158,7 @@ public static Type getReturnType(final String signature) {
static int getReturnTypeSize(final String signature) {
final int index = signature.lastIndexOf(')') + 1;
- return Type.size(getTypeSize(signature.substring(index)));
+ return size(getTypeSize(signature.substring(index)));
}
public static String getSignature(final java.lang.reflect.Method meth) {
@@ -385,14 +385,14 @@ public int hashCode() {
}
/**
- * boolean, short and char variable are considered as int in the stack or local variable area. Returns {@link Type#INT}
- * for {@link Type#BOOLEAN}, {@link Type#SHORT} or {@link Type#CHAR}, otherwise returns the given type.
+ * boolean, short and char variable are considered as int in the stack or local variable area. Returns {@link #INT}
+ * for {@link #BOOLEAN}, {@link #SHORT} or {@link #CHAR}, otherwise returns the given type.
*
* @since 6.0
*/
public Type normalizeForStackOrLocal() {
- if (this == Type.BOOLEAN || this == Type.BYTE || this == Type.SHORT || this == Type.CHAR) {
- return Type.INT;
+ if (this == BOOLEAN || this == BYTE || this == SHORT || this == CHAR) {
+ return INT;
}
return this;
}
@@ -402,6 +402,6 @@ public Type normalizeForStackOrLocal() {
*/
@Override
public String toString() {
- return this.equals(Type.NULL) || type >= Const.T_UNKNOWN ? signature : Utility.signatureToString(signature, false);
+ return equals(NULL) || type >= Const.T_UNKNOWN ? signature : Utility.signatureToString(signature, false);
}
}
diff --git a/src/main/java/org/apache/bcel/util/BCELFactory.java b/src/main/java/org/apache/bcel/util/BCELFactory.java
index b00ab70396..e22c6ce304 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 @@ private void createConstant(final Object value) {
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/main/java/org/apache/bcel/util/ClassPath.java b/src/main/java/org/apache/bcel/util/ClassPath.java
index e48a63222e..0f1c342fc0 100644
--- a/src/main/java/org/apache/bcel/util/ClassPath.java
+++ b/src/main/java/org/apache/bcel/util/ClassPath.java
@@ -42,6 +42,7 @@
import org.apache.bcel.classfile.JavaClass;
import org.apache.bcel.classfile.Utility;
+import org.apache.commons.lang3.SystemProperties;
/**
* Loads class files from the CLASSPATH. Inspired by sun.tools.ClassPath.
@@ -466,14 +467,14 @@ private static void addJdkModules(final String javaHome, final List list
*/
// @since 6.0 no longer final
public static String getClassPath() {
- final String classPathProp = System.getProperty("java.class.path");
+ final String classPathProp = SystemProperties.getJavaClassPath();
final String bootClassPathProp = System.getProperty("sun.boot.class.path");
- final String extDirs = System.getProperty("java.ext.dirs");
+ final String extDirs = SystemProperties.getJavaExtDirs();
// System.out.println("java.version = " + System.getProperty("java.version"));
// System.out.println("java.class.path = " + classPathProp);
// System.out.println("sun.boot.class.path=" + bootClassPathProp);
// System.out.println("java.ext.dirs=" + extDirs);
- final String javaHome = System.getProperty("java.home");
+ final String javaHome = SystemProperties.getJavaHome();
final List list = new ArrayList<>();
// Starting in JRE 9, .class files are in the modules directory. Add them to the path.
diff --git a/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java b/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java
index e8482cc2ab..e7a26db2f5 100644
--- a/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java
+++ b/src/main/java/org/apache/bcel/verifier/VerifierAppFrame.java
@@ -128,11 +128,11 @@ JList getClassNamesJList() {
/** Initizalization of the components. */
private void jbInit() {
// setIconImage(Toolkit.getDefaultToolkit().createImage(Frame1.class.getResource("[Ihr Symbol]")));
- contentPane = (JPanel) this.getContentPane();
+ contentPane = (JPanel) getContentPane();
contentPane.setLayout(cardLayout1);
- this.setJMenuBar(jMenuBar1);
+ setJMenuBar(jMenuBar1);
this.setSize(new Dimension(708, 451));
- this.setTitle("JustIce");
+ setTitle("JustIce");
jPanel1.setMinimumSize(new Dimension(100, 100));
jPanel1.setPreferredSize(new Dimension(100, 100));
jPanel1.setLayout(gridLayout1);
diff --git a/src/main/java/org/apache/bcel/verifier/VerifyDialog.java b/src/main/java/org/apache/bcel/verifier/VerifyDialog.java
index 88ef3b3ffd..a276ec4dbc 100644
--- a/src/main/java/org/apache/bcel/verifier/VerifyDialog.java
+++ b/src/main/java/org/apache/bcel/verifier/VerifyDialog.java
@@ -29,7 +29,6 @@
import javax.swing.JButton;
import javax.swing.JDialog;
import javax.swing.JPanel;
-import javax.swing.WindowConstants;
import org.apache.bcel.Repository;
import org.apache.bcel.classfile.JavaClass;
@@ -51,16 +50,16 @@ final class IvjEventHandler implements ActionListener {
@Override
public void actionPerformed(final ActionEvent e) {
- if (e.getSource() == VerifyDialog.this.getPass1Button()) {
+ if (e.getSource() == getPass1Button()) {
connEtoC1(e);
}
- if (e.getSource() == VerifyDialog.this.getPass2Button()) {
+ if (e.getSource() == getPass2Button()) {
connEtoC2(e);
}
- if (e.getSource() == VerifyDialog.this.getPass3Button()) {
+ if (e.getSource() == getPass3Button()) {
connEtoC3(e);
}
- if (e.getSource() == VerifyDialog.this.getFlushButton()) {
+ if (e.getSource() == getFlushButton()) {
connEtoC4(e);
}
}
@@ -197,7 +196,7 @@ private void connEtoC1(final ActionEvent arg1) {
try {
// user code begin {1}
// user code end
- this.pass1Button_ActionPerformed(arg1);
+ pass1Button_ActionPerformed(arg1);
// user code begin {2}
// user code end
} catch (final Throwable ivjExc) {
@@ -212,7 +211,7 @@ private void connEtoC2(final ActionEvent arg1) {
try {
// user code begin {1}
// user code end
- this.pass2Button_ActionPerformed(arg1);
+ pass2Button_ActionPerformed(arg1);
// user code begin {2}
// user code end
} catch (final Throwable ivjExc) {
@@ -227,7 +226,7 @@ private void connEtoC3(final ActionEvent arg1) {
try {
// user code begin {1}
// user code end
- this.pass4Button_ActionPerformed(arg1);
+ pass4Button_ActionPerformed(arg1);
// user code begin {2}
// user code end
} catch (final Throwable ivjExc) {
@@ -242,7 +241,7 @@ private void connEtoC4(final ActionEvent arg1) {
try {
// user code begin {1}
// user code end
- this.flushButton_ActionPerformed(arg1);
+ flushButton_ActionPerformed(arg1);
// user code begin {2}
// user code end
} catch (final Throwable ivjExc) {
@@ -464,7 +463,7 @@ private void initialize() {
// user code begin {1}
// user code end
setName("VerifyDialog");
- setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+ setDefaultCloseOperation(DISPOSE_ON_CLOSE);
setSize(430, 280);
setVisible(true);
setModal(true);
diff --git a/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java b/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
index 6ea0d18d1a..83f287cb44 100644
--- a/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
+++ b/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
@@ -1444,7 +1444,7 @@ private void finalMethodsAreNotOverridden() {
* Leave that to JustIce.
*/
public LocalVariablesInfo getLocalVariablesInfo(final int methodNr) {
- if (this.verify() != VerificationResult.VR_OK) {
+ if (verify() != VerificationResult.VR_OK) {
return null; // It's cached, don't worry.
}
if (methodNr < 0 || methodNr >= localVariablesInfos.length) {
diff --git a/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java b/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java
index e2be0bf5b0..c67c7875ba 100644
--- a/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java
+++ b/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java
@@ -238,7 +238,7 @@ public ExceptionHandler[] getExceptionHandlers() {
* the surrounding ControlFlowGraph.
*/
private String getExecutionChain() {
- final StringBuilder s = new StringBuilder(this.toString());
+ final StringBuilder s = new StringBuilder(toString());
for (int i = executionPredecessors.size() - 1; i >= 0; i--) {
s.insert(0, executionPredecessors.get(i) + "\n");
}
diff --git a/src/main/java/org/apache/bcel/verifier/structurals/GenericArray.java b/src/main/java/org/apache/bcel/verifier/structurals/GenericArray.java
index 0fa6e412f0..505e1b7ce4 100644
--- a/src/main/java/org/apache/bcel/verifier/structurals/GenericArray.java
+++ b/src/main/java/org/apache/bcel/verifier/structurals/GenericArray.java
@@ -20,7 +20,7 @@
/**
* A placeholder class that can be used to create an ObjectType of which has some of the properties arrays have. They
- * implement {@link Cloneable} and {@link java.io.Serializable} and they extend {@link Object}.
+ * implement {@link Cloneable} and {@link Serializable} and they extend {@link Object}.
*/
public class GenericArray implements Cloneable, Serializable {
diff --git a/src/main/java/org/apache/bcel/verifier/structurals/LocalVariables.java b/src/main/java/org/apache/bcel/verifier/structurals/LocalVariables.java
index 1b27bb6769..05c8e1515a 100644
--- a/src/main/java/org/apache/bcel/verifier/structurals/LocalVariables.java
+++ b/src/main/java/org/apache/bcel/verifier/structurals/LocalVariables.java
@@ -87,7 +87,7 @@ public Type get(final int slotIndex) {
* @return a (correctly typed) clone of this object.
*/
public LocalVariables getClone() {
- return (LocalVariables) this.clone();
+ return (LocalVariables) clone();
}
/**
diff --git a/src/main/java/org/apache/bcel/verifier/structurals/OperandStack.java b/src/main/java/org/apache/bcel/verifier/structurals/OperandStack.java
index c9250c4dbb..036297226e 100644
--- a/src/main/java/org/apache/bcel/verifier/structurals/OperandStack.java
+++ b/src/main/java/org/apache/bcel/verifier/structurals/OperandStack.java
@@ -48,7 +48,7 @@ public OperandStack(final int maxStack) {
*/
public OperandStack(final int maxStack, final ObjectType obj) {
this.maxStack = maxStack;
- this.push(obj);
+ push(obj);
}
/**
@@ -89,7 +89,7 @@ public boolean equals(final Object o) {
* @see #clone()
*/
public OperandStack getClone() {
- return (OperandStack) this.clone();
+ return (OperandStack) clone();
}
/**
diff --git a/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java b/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java
index 7e3413b585..c35b81f29c 100644
--- a/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java
+++ b/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java
@@ -276,14 +276,14 @@ private void circulationPump(final MethodGen m, final ControlFlowGraph cfg, fina
final LocalVariables lvs = f.getLocals();
for (int i = 0; i < lvs.maxLocals(); i++) {
if (lvs.get(i) instanceof UninitializedObjectType) {
- this.addMessage("Warning: ReturnInstruction '" + ic + "' may leave method with an uninitialized object in the local variables array '"
+ addMessage("Warning: ReturnInstruction '" + ic + "' may leave method with an uninitialized object in the local variables array '"
+ lvs + "'.");
}
}
final OperandStack os = f.getStack();
for (int i = 0; i < os.size(); i++) {
if (os.peek(i) instanceof UninitializedObjectType) {
- this.addMessage(
+ addMessage(
"Warning: ReturnInstruction '" + ic + "' may leave method with an uninitialized object on the operand stack '" + os + "'.");
}
}
diff --git a/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java b/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
index 565c95362e..d79a9a0613 100644
--- a/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
+++ b/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
@@ -219,7 +219,7 @@ public int[] getRecursivelyAccessedLocalsIndices() {
for (final int lv : lvs) {
s.add(Integer.valueOf(lv));
}
- getRecursivelyAccessedLocalsIndicesHelper(s, this.subSubs());
+ getRecursivelyAccessedLocalsIndicesHelper(s, subSubs());
final int[] ret = new int[s.size()];
int j = -1;
for (final Integer index : s) {
diff --git a/src/site/xdoc/download_bcel.xml b/src/site/xdoc/download_bcel.xml
index 1aee8987df..e26048f0f6 100644
--- a/src/site/xdoc/download_bcel.xml
+++ b/src/site/xdoc/download_bcel.xml
@@ -113,32 +113,32 @@ limitations under the License.
-
+
diff --git a/src/test/java/org/apache/bcel/AnonymousClassTestCase.java b/src/test/java/org/apache/bcel/AnonymousClassTestCase.java
index 1d65fa965b..b6420642a4 100644
--- a/src/test/java/org/apache/bcel/AnonymousClassTestCase.java
+++ b/src/test/java/org/apache/bcel/AnonymousClassTestCase.java
@@ -17,10 +17,15 @@
package org.apache.bcel;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.apache.bcel.classfile.InnerClass;
+import org.apache.bcel.classfile.InnerClasses;
import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.data.EmptyClass;
import org.junit.jupiter.api.Test;
public class AnonymousClassTestCase extends AbstractTestCase {
@@ -38,6 +43,15 @@ public void testNamedInnerClassIsNotAnonymous() throws ClassNotFoundException {
assertTrue(clazz.isNested(), "regular inner classes are nested");
}
+ @Test
+ public void testRegularClassInnerClasses() throws ClassNotFoundException {
+ final JavaClass clazz = getTestJavaClass(PACKAGE_BASE_NAME + ".data.AnonymousClassTest");
+ final InnerClasses innerClasses = clazz.getAttribute(Const.ATTR_INNER_CLASSES);
+ final InnerClass[] innerClassArray = innerClasses.getInnerClasses();
+ assertEquals(3, innerClassArray.length);
+ assertNull(Repository.lookupClass(EmptyClass.class).getAttribute(Const.ATTR_INNER_CLASSES));
+ }
+
@Test
public void testRegularClassIsNotAnonymous() throws ClassNotFoundException {
final JavaClass clazz = getTestJavaClass(PACKAGE_BASE_NAME + ".data.AnonymousClassTest");
diff --git a/src/test/java/org/apache/bcel/ConstTest.java b/src/test/java/org/apache/bcel/ConstTest.java
new file mode 100644
index 0000000000..94310df8d1
--- /dev/null
+++ b/src/test/java/org/apache/bcel/ConstTest.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.bcel;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * Tests {@link Const}.
+ */
+public class ConstTest {
+
+ @Test
+ public void testJava22() throws Exception {
+ assertEquals(66, Const.MAJOR_22);
+ assertEquals(0, Const.MINOR_22);
+ }
+
+ @Test
+ public void testJava23() throws Exception {
+ assertEquals(67, Const.MAJOR_23);
+ assertEquals(0, Const.MINOR_23);
+ }
+
+ @Test
+ public void testJava24() throws Exception {
+ assertEquals(68, Const.MAJOR_24);
+ assertEquals(0, Const.MINOR_24);
+ }
+}
diff --git a/src/test/java/org/apache/bcel/LocalVariableTypeTableTestCase.java b/src/test/java/org/apache/bcel/LocalVariableTypeTableTestCase.java
index 6d5068efc1..0079a20ed5 100644
--- a/src/test/java/org/apache/bcel/LocalVariableTypeTableTestCase.java
+++ b/src/test/java/org/apache/bcel/LocalVariableTypeTableTestCase.java
@@ -16,11 +16,15 @@
*/
package org.apache.bcel;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import java.lang.reflect.InvocationTargetException;
import java.util.LinkedList;
import java.util.List;
import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.LocalVariableTypeTable;
import org.apache.bcel.classfile.Method;
import org.apache.bcel.generic.ACONST_NULL;
import org.apache.bcel.generic.ALOAD;
@@ -128,6 +132,22 @@ public InstructionList makeWillBeAddedInstructionList(final MethodGen methodGen,
return createPrintln(methodGen.getConstantPool(), instruction);
}
+ @Test
+ public void testGetLocalVariableTypeTable() throws ClassNotFoundException, NoSuchMethodException, SecurityException {
+ final JavaClass testJavaClass = getTestJavaClass("org/apache/commons/lang3/function/TriFunction");
+ final String expectedToString = "LocalVariableTypes(startPc = 0, length = 17, index = 0:org.apache.commons.lang3.function.TriFunction this)";
+ for (final Method method : testJavaClass.getMethods()) {
+ if ("lambda$andThen$0".equals(method.getName())) {
+ final LocalVariableTypeTable localVariableTypeTable = method.getLocalVariableTypeTable();
+ assertEquals(expectedToString, localVariableTypeTable.toString());
+ }
+ if ("apply".equals(method.getName())) {
+ assertNull(method.getLocalVariableTypeTable());
+ }
+ }
+ assertNull(Repository.lookupClass(Object.class).getMethod(Object.class.getMethod("toString")).getLocalVariableTypeTable());
+ }
+
@Test
public void testWithGenericArguement() throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
final String targetClass = PACKAGE_BASE_NAME + ".data.SimpleClassHasMethodIncludeGenericArgument";
diff --git a/src/test/java/org/apache/bcel/PerformanceTest.java b/src/test/java/org/apache/bcel/PerformanceTest.java
index 7191d6d44b..7b7dff4bbd 100644
--- a/src/test/java/org/apache/bcel/PerformanceTest.java
+++ b/src/test/java/org/apache/bcel/PerformanceTest.java
@@ -34,6 +34,7 @@
import org.apache.bcel.generic.ClassGen;
import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.generic.MethodGen;
+import org.apache.commons.lang3.SystemProperties;
import org.junit.jupiter.api.Test;
public final class PerformanceTest {
@@ -130,7 +131,7 @@ private static void test(final File lib) throws IOException {
@Test
public void testPerformance() {
- final File javaLib = new File(System.getProperty("java.home"), "lib");
+ final File javaLib = new File(SystemProperties.getJavaHome(), "lib");
javaLib.listFiles(file -> {
if (file.getName().endsWith(".jar")) {
try {
diff --git a/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleAccessTestCase.java b/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleAccessTestCase.java
new file mode 100644
index 0000000000..2c4eb29045
--- /dev/null
+++ b/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleAccessTestCase.java
@@ -0,0 +1,369 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.bcel.classfile;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Stream;
+
+import org.apache.bcel.Const;
+import org.apache.commons.lang3.stream.Streams;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+/**
+ * Tests {@code module-info.class} files.
+ */
+public final class ConstantPoolModuleAccessTestCase {
+
+ static Stream testJREModules() throws IOException {
+ return Streams.of(ConstantPoolModuleAccessTestCase.class.getClassLoader().getResources("module-info.class"));
+ }
+
+ @ParameterizedTest
+ @MethodSource
+ public void testJREModules(final URL url) throws Exception {
+ try (InputStream inputStream = url.openStream()) {
+ final ClassParser classParser = new ClassParser(inputStream, "module-info.class");
+ final JavaClass javaClass = classParser.parse();
+ final ConstantPool constantPool = javaClass.getConstantPool();
+ final EmptyVisitor visitor = new EmptyVisitor() {
+ @Override
+ public void visitModule(final Module obj) {
+ final String urlPath = url.getPath();
+ if (urlPath.contains("/commons-")) {
+ assertEquals(4096, obj.getModuleFlags(), url.toString());
+ } else {
+ assertEquals(0, obj.getModuleFlags(), url.toString());
+ }
+ final String[] usedClassNames = obj.getUsedClassNames(constantPool, true);
+ if (urlPath.contains("junit-jupiter-engine")) {
+ assertEquals(1, usedClassNames.length);
+ assertEquals("org.junit.jupiter.api.extension.Extension", usedClassNames[0]);
+ } else if (urlPath.contains("junit-platform-launcher")) {
+ final List expected = new ArrayList<>();
+ expected.add("org.junit.platform.engine.TestEngine");
+ expected.add("org.junit.platform.launcher.LauncherDiscoveryListener");
+ expected.add("org.junit.platform.launcher.LauncherInterceptor");
+ expected.add("org.junit.platform.launcher.LauncherSessionListener");
+ expected.add("org.junit.platform.launcher.PostDiscoveryFilter");
+ expected.add("org.junit.platform.launcher.TestExecutionListener");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("junit-platform-engine")) {
+ final List expected = new ArrayList<>();
+ expected.add("org.junit.platform.engine.discovery.DiscoverySelectorIdentifierParser");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/java.rmi/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("java.rmi.server.RMIClassLoaderSpi");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/java.xml/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("javax.xml.datatype.DatatypeFactory");
+ expected.add("javax.xml.parsers.DocumentBuilderFactory");
+ expected.add("javax.xml.parsers.SAXParserFactory");
+ expected.add("javax.xml.stream.XMLEventFactory");
+ expected.add("javax.xml.stream.XMLInputFactory");
+ expected.add("javax.xml.stream.XMLOutputFactory");
+ expected.add("javax.xml.transform.TransformerFactory");
+ expected.add("javax.xml.validation.SchemaFactory");
+ expected.add("javax.xml.xpath.XPathFactory");
+ expected.add("org.xml.sax.XMLReader");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/java.datatransfer/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("sun.datatransfer.DesktopDatatransferService");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/java.desktop/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("java.awt.im.spi.InputMethodDescriptor");
+ expected.add("javax.accessibility.AccessibilityProvider");
+ expected.add("javax.imageio.spi.ImageInputStreamSpi");
+ expected.add("javax.imageio.spi.ImageOutputStreamSpi");
+ expected.add("javax.imageio.spi.ImageReaderSpi");
+ expected.add("javax.imageio.spi.ImageTranscoderSpi");
+ expected.add("javax.imageio.spi.ImageWriterSpi");
+ expected.add("javax.print.PrintServiceLookup");
+ expected.add("javax.print.StreamPrintServiceFactory");
+ expected.add("javax.sound.midi.spi.MidiDeviceProvider");
+ expected.add("javax.sound.midi.spi.MidiFileReader");
+ expected.add("javax.sound.midi.spi.MidiFileWriter");
+ expected.add("javax.sound.midi.spi.SoundbankReader");
+ expected.add("javax.sound.sampled.spi.AudioFileReader");
+ expected.add("javax.sound.sampled.spi.AudioFileWriter");
+ expected.add("javax.sound.sampled.spi.FormatConversionProvider");
+ expected.add("javax.sound.sampled.spi.MixerProvider");
+ expected.add("sun.swing.InteropProvider");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/java.naming/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("javax.naming.ldap.StartTlsResponse");
+ expected.add("javax.naming.spi.InitialContextFactory");
+ if (javaClass.getMajor() > Const.MAJOR_11) {
+ expected.add("javax.naming.ldap.spi.LdapDnsProvider");
+ }
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/java.prefs/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("java.util.prefs.PreferencesFactory");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/java.base/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("java.lang.System$LoggerFinder");
+ expected.add("java.net.ContentHandlerFactory");
+ if (javaClass.getMajor() > Const.MAJOR_17) {
+ expected.add("java.net.spi.InetAddressResolverProvider");
+ }
+ expected.add("java.net.spi.URLStreamHandlerProvider");
+ expected.add("java.nio.channels.spi.AsynchronousChannelProvider");
+ expected.add("java.nio.channels.spi.SelectorProvider");
+ expected.add("java.nio.charset.spi.CharsetProvider");
+ expected.add("java.nio.file.spi.FileSystemProvider");
+ expected.add("java.nio.file.spi.FileTypeDetector");
+ expected.add("java.security.Provider");
+ expected.add("java.text.spi.BreakIteratorProvider");
+ expected.add("java.text.spi.CollatorProvider");
+ expected.add("java.text.spi.DateFormatProvider");
+ expected.add("java.text.spi.DateFormatSymbolsProvider");
+ expected.add("java.text.spi.DecimalFormatSymbolsProvider");
+ expected.add("java.text.spi.NumberFormatProvider");
+ expected.add("java.time.chrono.AbstractChronology");
+ expected.add("java.time.chrono.Chronology");
+ expected.add("java.time.zone.ZoneRulesProvider");
+ if (javaClass.getMajor() > Const.MAJOR_11) {
+ expected.add("java.util.random.RandomGenerator");
+ }
+ expected.add("java.util.spi.CalendarDataProvider");
+ expected.add("java.util.spi.CalendarNameProvider");
+ expected.add("java.util.spi.CurrencyNameProvider");
+ expected.add("java.util.spi.LocaleNameProvider");
+ expected.add("java.util.spi.ResourceBundleControlProvider");
+ expected.add("java.util.spi.ResourceBundleProvider");
+ expected.add("java.util.spi.TimeZoneNameProvider");
+ expected.add("java.util.spi.ToolProvider");
+ expected.add("javax.security.auth.spi.LoginModule");
+ if (javaClass.getMajor() > Const.MAJOR_17) {
+ expected.add("jdk.internal.io.JdkConsoleProvider");
+ }
+ expected.add("jdk.internal.logger.DefaultLoggerFinder");
+ expected.add("sun.text.spi.JavaTimeDateTimePatternProvider");
+ expected.add("sun.util.locale.provider.LocaleDataMetaInfo");
+ expected.add("sun.util.resources.LocaleData$CommonResourceBundleProvider");
+ expected.add("sun.util.resources.LocaleData$SupplementaryResourceBundleProvider");
+ expected.add("sun.util.spi.CalendarProvider");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/jdk.management.agent/module-info.class") && javaClass.getMajor() < Const.MAJOR_21) {
+ final List expected = new ArrayList<>();
+ expected.add("jdk.internal.agent.spi.AgentProvider");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/java.management/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("javax.management.remote.JMXConnectorProvider");
+ expected.add("javax.management.remote.JMXConnectorServerProvider");
+ expected.add("sun.management.spi.PlatformMBeanProvider");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/java.sql/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("java.sql.Driver");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/jdk.httpserver/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("com.sun.net.httpserver.spi.HttpServerProvider");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/java.sql.rowset/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("javax.sql.rowset.RowSetFactory");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/java.compiler/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("javax.tools.DocumentationTool");
+ expected.add("javax.tools.JavaCompiler");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/java.scripting/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("javax.script.ScriptEngineFactory");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/jdk.dynalink/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("jdk.dynalink.linker.GuardingDynamicLinkerExporter");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/jdk.jdi/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("com.sun.jdi.connect.Connector");
+ expected.add("com.sun.jdi.connect.spi.TransportService");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/jdk.compiler/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("javax.annotation.processing.Processor");
+ expected.add("com.sun.source.util.Plugin");
+ if (javaClass.getMajor() > Const.MAJOR_11) {
+ expected.add("com.sun.tools.doclint.DocLint");
+ }
+ expected.add("com.sun.tools.javac.platform.PlatformProvider");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/jdk.jconsole/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("com.sun.tools.jconsole.JConsolePlugin");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/jdk.attach/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("com.sun.tools.attach.spi.AttachProvider");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/jdk.jshell/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("jdk.jshell.spi.ExecutionControlProvider");
+ expected.add("jdk.internal.editor.spi.BuildInEditorProvider");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/jdk.internal.le/module-info.class")) {
+ final List expected = new ArrayList<>();
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/jdk.jlink/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("jdk.tools.jlink.plugin.Plugin");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/jdk.internal.jvmstat/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("sun.jvmstat.monitor.MonitoredHostService");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/jdk.jpackage/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("jdk.jpackage.internal.Bundler");
+ expected.add("jdk.jpackage.internal.Bundlers");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/jdk.naming.ldap/module-info.class")) {
+ final List expected = new ArrayList<>();
+ expected.add("com.sun.jndi.ldap.spi.LdapDnsProvider");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/jdk.jsobject/module-info.class") && javaClass.getMajor() == Const.MAJOR_11) {
+ final List expected = new ArrayList<>();
+ expected.add("jdk.internal.netscape.javascript.spi.JSObjectProvider");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else if (urlPath.contains("/org/assertj/assertj-core/")) {
+ final List expected = new ArrayList<>();
+ expected.add("org.assertj.core.configuration.Configuration");
+ expected.add("org.assertj.core.presentation.Representation");
+ assertEquals(expected, Arrays.asList(usedClassNames));
+ } else {
+ assertEquals(0, usedClassNames.length, "Found " + Arrays.toString(usedClassNames) + " in " + urlPath);
+ }
+ super.visitModule(obj);
+ }
+
+ @Override
+ public void visitModuleExports(final ModuleExports obj) {
+ assertEquals(0, obj.getExportsFlags(), url.toString());
+ final String packageName = obj.getPackageName(constantPool);
+ final String[] toModuleNames = obj.getToModuleNames(constantPool);
+ if (url.getPath().contains("junit-platform-commons")) {
+ final List expected = new ArrayList<>();
+ expected.add("org.junit.jupiter.api");
+ expected.add("org.junit.jupiter.engine");
+ expected.add("org.junit.jupiter.migrationsupport");
+ expected.add("org.junit.jupiter.params");
+ expected.add("org.junit.platform.console");
+ expected.add("org.junit.platform.engine");
+ expected.add("org.junit.platform.launcher");
+ expected.add("org.junit.platform.reporting");
+ expected.add("org.junit.platform.runner");
+ expected.add("org.junit.platform.suite.api");
+ switch (packageName) {
+ case "org.junit.platform.commons.util":
+ expected.add("org.junit.platform.suite.commons");
+ expected.add("org.junit.platform.suite.engine");
+ expected.add("org.junit.platform.testkit");
+ expected.add("org.junit.vintage.engine");
+ assertEquals(expected, Arrays.asList(toModuleNames));
+ break;
+ case "org.junit.platform.commons.logging":
+ expected.add("org.junit.platform.suite.engine");
+ expected.add("org.junit.platform.testkit");
+ expected.add("org.junit.vintage.engine");
+ assertEquals(expected, Arrays.asList(toModuleNames));
+ break;
+ default:
+ assertEquals(0, toModuleNames.length);
+ break;
+ }
+ }
+ super.visitModuleExports(obj);
+ }
+
+ @Override
+ public void visitModuleOpens(final ModuleOpens obj) {
+ assertEquals(0, obj.getOpensFlags(), url.toString());
+ final String packageName = obj.getPackageName(constantPool);
+ final String[] toModuleNames = obj.getToModuleNames(constantPool);
+ final String urlPath = url.getPath();
+ if (urlPath.contains("junit-jupiter-engine")) {
+ assertEquals("org.junit.jupiter.engine.extension", packageName);
+ assertEquals(1, toModuleNames.length);
+ assertEquals("org.junit.platform.commons", toModuleNames[0]);
+ } else if (urlPath.contains("junit-jupiter-api")) {
+ assertEquals("org.junit.jupiter.api.condition", packageName);
+ assertEquals(1, toModuleNames.length);
+ assertEquals("org.junit.platform.commons", toModuleNames[0]);
+ }
+ super.visitModuleOpens(obj);
+ }
+
+ @Override
+ public void visitModuleProvides(final ModuleProvides obj) {
+ final String interfaceName = obj.getInterfaceName(constantPool);
+ final String[] implementationClassNames = obj.getImplementationClassNames(constantPool, true);
+ final String urlPath = url.getPath();
+ if (urlPath.contains("junit-jupiter-engine")) {
+ assertEquals("org.junit.platform.engine.TestEngine", interfaceName);
+ assertEquals(1, implementationClassNames.length);
+ assertEquals("org.junit.jupiter.engine.JupiterTestEngine", implementationClassNames[0]);
+ } else if (urlPath.contains("junit-platform-launcher")) {
+ assertEquals("org.junit.platform.launcher.TestExecutionListener", interfaceName);
+ assertEquals(1, implementationClassNames.length);
+ assertEquals("org.junit.platform.launcher.listeners.UniqueIdTrackingListener", implementationClassNames[0]);
+ }
+ super.visitModuleProvides(obj);
+ }
+
+ @Override
+ public void visitModuleRequires(final ModuleRequires obj) {
+ if (url.getPath().contains("junit-jupiter-engine")) {
+ final String moduleName = obj.getModuleName(constantPool);
+ final Map expected = new HashMap<>();
+ expected.put("java.base", 32768);
+ expected.put("org.apiguardian.api", 64);
+ expected.put("org.junit.jupiter.api", 0);
+ expected.put("org.junit.platform.commons", 0);
+ expected.put("org.junit.platform.engine", 0);
+ expected.put("org.opentest4j", 0);
+ assertTrue(expected.containsKey(moduleName));
+ assertEquals(expected.get(moduleName), obj.getRequiresFlags(), moduleName);
+ }
+ super.visitModuleRequires(obj);
+ }
+ };
+ javaClass.accept(new DescendingVisitor(javaClass, visitor));
+ }
+ }
+}
diff --git a/src/test/java/org/apache/bcel/classfile/RecordTestCase.java b/src/test/java/org/apache/bcel/classfile/RecordTestCase.java
index 8056250a7d..62e139ec04 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 void recordsCanBeVisited() throws ClassNotFoundException, IOException {
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 void recordsCanBeVisited() throws ClassNotFoundException, IOException {
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 void testRecordClassSaysItIs() throws ClassNotFoundException, ClassFormat
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 7d6095d0c2..192c2b5937 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 @@ final class CodeToString {
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/data/EmptyClass.java b/src/test/java/org/apache/bcel/data/EmptyClass.java
new file mode 100644
index 0000000000..b10c1d03d6
--- /dev/null
+++ b/src/test/java/org/apache/bcel/data/EmptyClass.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.bcel.data;
+
+public class EmptyClass {
+}
+
diff --git a/src/test/java/org/apache/bcel/generic/BranchHandleTestCase.java b/src/test/java/org/apache/bcel/generic/BranchHandleTestCase.java
index 2927bdc455..9d0f879f46 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 void testGetBHnull() {
@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 void testsetInstructionBI() {
@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 void testsetInstructionnotBI() {
// 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/FieldAnnotationsTestCase.java b/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java
index 31d66f3bd2..32794cdc81 100644
--- a/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/FieldAnnotationsTestCase.java
@@ -18,12 +18,15 @@
package org.apache.bcel.generic;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
import java.io.IOException;
import org.apache.bcel.AbstractTestCase;
+import org.apache.bcel.Const;
import org.apache.bcel.classfile.AnnotationEntry;
import org.apache.bcel.classfile.ElementValuePair;
import org.apache.bcel.classfile.Field;
@@ -40,6 +43,8 @@ public void checkAnnotatedField(final JavaClass clazz, final String fieldname, f
final AnnotationEntry[] fieldAnnotationEntrys = f.getAnnotationEntries();
if (f.getName().equals(fieldname)) {
checkAnnotationEntry(fieldAnnotationEntrys[0], AnnotationEntryName, AnnotationEntryElementName, AnnotationEntryElementValue);
+ assertNotNull(f.getAttribute(Const.ATTR_RUNTIME_VISIBLE_ANNOTATIONS));
+ assertNull(f.getAttribute(Const.ATTR_RUNTIME_INVISIBLE_ANNOTATIONS));
}
}
}
diff --git a/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java b/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
index 056453c1b0..c2924d3408 100644
--- a/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
@@ -17,6 +17,8 @@
package org.apache.bcel.generic;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
@@ -89,6 +91,8 @@ private void assertParameterAnnotations(final Method method, final int... expect
assertSimpleElementValue(annos[0]);
}
}
+ assertNotNull(method.getAttribute(Const.ATTR_RUNTIME_VISIBLE_PARAMETER_ANNOTATIONS));
+ assertNull(method.getAttribute(Const.ATTR_RUNTIME_INVISIBLE_PARAMETER_ANNOTATIONS));
}
private void assertSimpleElementValue(final AnnotationEntry anno) {
diff --git a/src/test/java/org/apache/bcel/generic/InstructionHandleTestCase.java b/src/test/java/org/apache/bcel/generic/InstructionHandleTestCase.java
index 4d79927370..81ea857141 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 void testGetIHnull() {
@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 void testsetInstructionI() {
@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));
}
diff --git a/src/test/java/org/apache/bcel/util/BCELifierTestCase.java b/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
index 9e66445464..7467104bb5 100644
--- a/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
+++ b/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
@@ -35,6 +35,7 @@
import org.apache.bcel.classfile.JavaClass;
import org.apache.bcel.classfile.Utility;
import org.apache.bcel.generic.BinaryOpCreator;
+import org.apache.commons.lang3.SystemProperties;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
@@ -42,7 +43,7 @@
public class BCELifierTestCase extends AbstractTestCase {
private static final String EOL = System.lineSeparator();
- public static final String CLASSPATH = "." + File.pathSeparator + System.getProperty("java.class.path");
+ public static final String CLASSPATH = "." + File.pathSeparator + SystemProperties.getJavaClassPath();
// Canonicalise the javap output so it compares better
private String canonHashRef(String input) {
diff --git a/src/test/java/org/apache/bcel/verifier/VerifierMainTestCase.java b/src/test/java/org/apache/bcel/verifier/VerifierMainTestCase.java
index f1b4b4ff6d..76495b8d22 100644
--- a/src/test/java/org/apache/bcel/verifier/VerifierMainTestCase.java
+++ b/src/test/java/org/apache/bcel/verifier/VerifierMainTestCase.java
@@ -36,6 +36,7 @@
import org.apache.bcel.generic.InstructionList;
import org.apache.bcel.generic.SWAP;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.SystemProperties;
import org.eclipse.jdt.internal.compiler.batch.Main;
import org.junit.jupiter.api.Test;
@@ -52,7 +53,7 @@ public void testSWAP() throws Exception {
args.add(javaAgent.replace("jacoco.exec", "jacoco_org.apache.bcel.data.SWAP.exec"));
}
args.add("-cp");
- args.add(System.getProperty("java.class.path"));
+ args.add(SystemProperties.getJavaClassPath());
args.add("org.apache.bcel.verifier.Verifier");
args.add("org/apache/bcel/data/SWAP.class");
final ProcessBuilder pb = new ProcessBuilder(args);
diff --git a/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java b/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
index 314fb6b6d6..3496191a63 100644
--- a/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
+++ b/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
@@ -38,6 +38,7 @@
import org.apache.bcel.verifier.input.StaticFieldVerifierChildClass;
import org.apache.bcel.verifier.statics.StringRepresentation;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.SystemProperties;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.DisabledForJreRange;
@@ -89,7 +90,7 @@ private static void testJarFile(final File file, final String... excludes) throw
}
private static void testNestHostWithJavaVersion(final String className) throws ClassNotFoundException {
- final String version = System.getProperty("java.version");
+ final String version = SystemProperties.getJavaVersion();
assertNotNull(version);
try {
testDefaultMethodValidation(className);
diff --git a/src/test/java/org/apache/bcel/verifier/VerifyBadClassesTestCase.java b/src/test/java/org/apache/bcel/verifier/VerifyBadClassesTestCase.java
index 46af8c80fd..4d46730ea7 100644
--- a/src/test/java/org/apache/bcel/verifier/VerifyBadClassesTestCase.java
+++ b/src/test/java/org/apache/bcel/verifier/VerifyBadClassesTestCase.java
@@ -35,6 +35,7 @@
import org.apache.commons.exec.ExecuteWatchdog;
import org.apache.commons.exec.PumpStreamHandler;
import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.SystemProperties;
import org.junit.jupiter.api.Test;
/**
@@ -49,7 +50,7 @@ private List buildVerifyCommand(final String className, final String tes
command.add("-ea");
command.add("-classpath");
- command.add(System.getProperty("java.class.path") + ":" + testDir);
+ command.add(SystemProperties.getJavaClassPath() + ":" + testDir);
command.add("org.apache.bcel.verifier.Verifier");
command.add(className);