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 4cd16379 Reuse ArrayUtils.nullToEmpty()
4cd16379 is described below
commit 4cd1637972d15084122abd134a70dbc728a3ec9d
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Mar 31 15:41:53 2024 -0400
Reuse ArrayUtils.nullToEmpty()
---
src/examples/ListClass.java | 5 +++--
src/main/java/org/apache/bcel/classfile/AnnotationEntry.java | 4 +++-
src/main/java/org/apache/bcel/classfile/Code.java | 6 +++---
src/main/java/org/apache/bcel/classfile/ExceptionTable.java | 4 ++--
src/main/java/org/apache/bcel/classfile/JavaClass.java | 4 +---
src/main/java/org/apache/bcel/classfile/ModulePackages.java | 4 ++--
src/main/java/org/apache/bcel/classfile/NestMembers.java | 4 ++--
7 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/examples/ListClass.java b/src/examples/ListClass.java
index b973fbd7..442f7ce8 100644
--- a/src/examples/ListClass.java
+++ b/src/examples/ListClass.java
@@ -31,6 +31,7 @@ import org.apache.bcel.classfile.ConstantPool;
import org.apache.bcel.classfile.ConstantUtf8;
import org.apache.bcel.classfile.JavaClass;
import org.apache.bcel.classfile.Method;
+import org.apache.commons.lang3.stream.Streams;
/**
* Read class file(s) and display its contents. The command line usage is:
@@ -193,13 +194,13 @@ public class ListClass {
* Dump the disassembled code of all methods in the class.
*/
public static void printCode(final Method[] methods, final boolean
verbose) {
- for (final Method method : methods) {
+ Streams.of(methods).forEach(method -> {
System.out.println(method);
final Code code = method.getCode();
if (code != null) {
System.out.println(code.toString(verbose));
}
- }
+ });
}
boolean code;
diff --git a/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java
b/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java
index b3c2bb22..d0b4b045 100644
--- a/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java
+++ b/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java
@@ -23,6 +23,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Stream;
+import org.apache.commons.lang3.stream.Streams;
+
/**
* Represents one annotation in the annotation table
*
@@ -34,7 +36,7 @@ public class AnnotationEntry implements Node {
public static AnnotationEntry[] createAnnotationEntries(final Attribute[]
attrs) {
// Find attributes that contain annotation data
- return
Stream.of(attrs).filter(Annotations.class::isInstance).flatMap(e ->
Stream.of(((Annotations) e).getAnnotationEntries()))
+ return
Streams.of(attrs).filter(Annotations.class::isInstance).flatMap(e ->
Stream.of(((Annotations) e).getAnnotationEntries()))
.toArray(AnnotationEntry[]::new);
}
diff --git a/src/main/java/org/apache/bcel/classfile/Code.java
b/src/main/java/org/apache/bcel/classfile/Code.java
index 72964af1..13f9dfc4 100644
--- a/src/main/java/org/apache/bcel/classfile/Code.java
+++ b/src/main/java/org/apache/bcel/classfile/Code.java
@@ -127,8 +127,8 @@ public final class Code extends Attribute {
super(Const.ATTR_CODE, nameIndex, length, constantPool);
this.maxStack = Args.requireU2(maxStack, "maxStack");
this.maxLocals = Args.requireU2(maxLocals, "maxLocals");
- this.code = code != null ? code : ArrayUtils.EMPTY_BYTE_ARRAY;
- this.exceptionTable = exceptionTable != null ? exceptionTable :
CodeException.EMPTY_CODE_EXCEPTION_ARRAY;
+ this.code = ArrayUtils.nullToEmpty(code);
+ this.exceptionTable = ArrayUtils.nullToEmpty(exceptionTable,
CodeException[].class);
Args.requireU2(this.exceptionTable.length, "exceptionTable.length");
this.attributes = attributes != null ? attributes : EMPTY_ARRAY;
super.setLength(calculateLength()); // Adjust length
@@ -299,7 +299,7 @@ public final class Code extends Attribute {
* @param code byte code
*/
public void setCode(final byte[] code) {
- this.code = code != null ? code : ArrayUtils.EMPTY_BYTE_ARRAY;
+ this.code = ArrayUtils.nullToEmpty(code);
super.setLength(calculateLength()); // Adjust length
}
diff --git a/src/main/java/org/apache/bcel/classfile/ExceptionTable.java
b/src/main/java/org/apache/bcel/classfile/ExceptionTable.java
index 6e1aaa23..3877b2f8 100644
--- a/src/main/java/org/apache/bcel/classfile/ExceptionTable.java
+++ b/src/main/java/org/apache/bcel/classfile/ExceptionTable.java
@@ -82,7 +82,7 @@ public final class ExceptionTable extends Attribute {
*/
public ExceptionTable(final int nameIndex, final int length, final int[]
exceptionIndexTable, final ConstantPool constantPool) {
super(Const.ATTR_EXCEPTIONS, nameIndex, length, constantPool);
- this.exceptionIndexTable = exceptionIndexTable != null ?
exceptionIndexTable : ArrayUtils.EMPTY_INT_ARRAY;
+ this.exceptionIndexTable = ArrayUtils.nullToEmpty(exceptionIndexTable);
Args.requireU2(this.exceptionIndexTable.length,
"exceptionIndexTable.length");
}
@@ -153,7 +153,7 @@ public final class ExceptionTable extends Attribute {
* length.
*/
public void setExceptionIndexTable(final int[] exceptionIndexTable) {
- this.exceptionIndexTable = exceptionIndexTable != null ?
exceptionIndexTable : ArrayUtils.EMPTY_INT_ARRAY;
+ this.exceptionIndexTable = ArrayUtils.nullToEmpty(exceptionIndexTable);
}
/**
diff --git a/src/main/java/org/apache/bcel/classfile/JavaClass.java
b/src/main/java/org/apache/bcel/classfile/JavaClass.java
index 5bcd5c7e..b90cfad0 100644
--- a/src/main/java/org/apache/bcel/classfile/JavaClass.java
+++ b/src/main/java/org/apache/bcel/classfile/JavaClass.java
@@ -182,9 +182,7 @@ public class JavaClass extends AccessFlags implements
Cloneable, Node, Comparabl
public JavaClass(final int classNameIndex, final int superclassNameIndex,
final String fileName, final int major, final int minor, final int accessFlags,
final ConstantPool constantPool, int[] interfaces, Field[] fields,
Method[] methods, Attribute[] attributes, final byte source) {
super(accessFlags);
- if (interfaces == null) {
- interfaces = ArrayUtils.EMPTY_INT_ARRAY;
- }
+ interfaces = ArrayUtils.nullToEmpty(interfaces);
if (attributes == null) {
attributes = Attribute.EMPTY_ARRAY;
}
diff --git a/src/main/java/org/apache/bcel/classfile/ModulePackages.java
b/src/main/java/org/apache/bcel/classfile/ModulePackages.java
index fef3a632..ade6cb32 100644
--- a/src/main/java/org/apache/bcel/classfile/ModulePackages.java
+++ b/src/main/java/org/apache/bcel/classfile/ModulePackages.java
@@ -62,7 +62,7 @@ public final class ModulePackages extends Attribute {
*/
public ModulePackages(final int nameIndex, final int length, final int[]
packageIndexTable, final ConstantPool constantPool) {
super(Const.ATTR_MODULE_PACKAGES, nameIndex, length, constantPool);
- this.packageIndexTable = packageIndexTable != null ? packageIndexTable
: ArrayUtils.EMPTY_INT_ARRAY;
+ this.packageIndexTable = ArrayUtils.nullToEmpty(packageIndexTable);
Args.requireU2(this.packageIndexTable.length,
"packageIndexTable.length");
}
@@ -142,7 +142,7 @@ public final class ModulePackages extends Attribute {
* @param packageIndexTable the list of package indexes Also redefines
number_of_packages according to table length.
*/
public void setPackageIndexTable(final int[] packageIndexTable) {
- this.packageIndexTable = packageIndexTable != null ? packageIndexTable
: ArrayUtils.EMPTY_INT_ARRAY;
+ this.packageIndexTable = ArrayUtils.nullToEmpty(packageIndexTable);
}
/**
diff --git a/src/main/java/org/apache/bcel/classfile/NestMembers.java
b/src/main/java/org/apache/bcel/classfile/NestMembers.java
index e9b15593..3449148c 100644
--- a/src/main/java/org/apache/bcel/classfile/NestMembers.java
+++ b/src/main/java/org/apache/bcel/classfile/NestMembers.java
@@ -63,7 +63,7 @@ public final class NestMembers extends Attribute {
*/
public NestMembers(final int nameIndex, final int length, final int[]
classes, final ConstantPool constantPool) {
super(Const.ATTR_NEST_MEMBERS, nameIndex, length, constantPool);
- this.classes = classes != null ? classes : ArrayUtils.EMPTY_INT_ARRAY;
+ this.classes = ArrayUtils.nullToEmpty(classes);
Args.requireU2(this.classes.length, "classes.length");
}
@@ -143,7 +143,7 @@ public final class NestMembers extends Attribute {
* @param classes the list of class indexes Also redefines
number_of_classes according to table length.
*/
public void setClasses(final int[] classes) {
- this.classes = classes != null ? classes : ArrayUtils.EMPTY_INT_ARRAY;
+ this.classes = ArrayUtils.nullToEmpty(classes);
}
/**
