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-compress.git
The following commit(s) were added to refs/heads/master by this push:
new 8e6faf4b Use Objects.requireNonNull()
8e6faf4b is described below
commit 8e6faf4bf75ac16c011606bb592af5544c71ab49
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri May 6 08:09:03 2022 -0400
Use Objects.requireNonNull()
---
.../commons/compress/harmony/unpack200/bytecode/CPClass.java | 6 ++----
.../commons/compress/harmony/unpack200/bytecode/CPConstant.java | 7 +++----
.../commons/compress/harmony/unpack200/bytecode/CPMember.java | 8 +++-----
.../compress/harmony/unpack200/bytecode/CPNameAndType.java | 8 +++-----
.../apache/commons/compress/harmony/unpack200/bytecode/CPRef.java | 8 +++-----
.../commons/compress/harmony/unpack200/bytecode/CPUTF8.java | 6 ++----
.../compress/harmony/unpack200/bytecode/forms/ReferenceForm.java | 6 +++---
7 files changed, 19 insertions(+), 30 deletions(-)
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPClass.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPClass.java
index d737cd93..f8fdae0c 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPClass.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPClass.java
@@ -18,6 +18,7 @@ package
org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
+import java.util.Objects;
/**
* Constant pool entry for a class
@@ -39,10 +40,7 @@ public class CPClass extends ConstantPoolEntry {
*/
public CPClass(final CPUTF8 name, final int globalIndex) {
super(ConstantPoolEntry.CP_Class, globalIndex);
- if (name == null) {
- throw new NullPointerException("Null arguments are not allowed");
- }
- this.name = name.underlyingString();
+ this.name = Objects.requireNonNull(name, "name").underlyingString();
this.utf8 = name;
}
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPConstant.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPConstant.java
index b4d86627..e94df933 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPConstant.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPConstant.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.compress.harmony.unpack200.bytecode;
+import java.util.Objects;
+
/**
* Abstract superclass for constant pool constant entries such as numbers or
Strings
*/
@@ -33,10 +35,7 @@ public abstract class CPConstant extends ConstantPoolEntry {
*/
public CPConstant(final byte tag, final Object value, final int
globalIndex) {
super(tag, globalIndex);
- this.value = value;
- if (value == null) {
- throw new NullPointerException("Null arguments are not allowed");
- }
+ this.value = Objects.requireNonNull(value, "value");
}
@Override
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPMember.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPMember.java
index 9c4a4bf4..f05610d6 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPMember.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPMember.java
@@ -20,6 +20,7 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
/**
* Superclass for member constant pool entries, such as fields or methods.
@@ -43,13 +44,10 @@ public class CPMember extends ClassFileEntry {
* @throws NullPointerException if name or descriptor is null
*/
public CPMember(final CPUTF8 name, final CPUTF8 descriptor, final long
flags, final List attributes) {
- this.name = name;
- this.descriptor = descriptor;
+ this.name = Objects.requireNonNull(name, "name");
+ this.descriptor = Objects.requireNonNull(descriptor, "descriptor");
this.flags = (short) flags;
this.attributes = attributes == null ? Collections.EMPTY_LIST :
attributes;
- if (name == null || descriptor == null) {
- throw new NullPointerException("Null arguments are not allowed");
- }
}
@Override
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPNameAndType.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPNameAndType.java
index ba3b94fb..9c8ea2e5 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPNameAndType.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPNameAndType.java
@@ -18,6 +18,7 @@ package
org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
+import java.util.Objects;
import org.apache.commons.compress.harmony.unpack200.SegmentUtils;
@@ -44,11 +45,8 @@ public class CPNameAndType extends ConstantPoolEntry {
*/
public CPNameAndType(final CPUTF8 name, final CPUTF8 descriptor, final int
globalIndex) {
super(ConstantPoolEntry.CP_NameAndType, globalIndex);
- this.name = name;
- this.descriptor = descriptor;
- if (name == null || descriptor == null) {
- throw new NullPointerException("Null arguments are not allowed");
- }
+ this.name = Objects.requireNonNull(name, "name");
+ this.descriptor = Objects.requireNonNull(descriptor, "descriptor");
}
@Override
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPRef.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPRef.java
index 076b9b45..e80c52e6 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPRef.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPRef.java
@@ -18,6 +18,7 @@ package
org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
+import java.util.Objects;
/**
* Abstract superclass for reference constant pool entries, such as a method
or field reference.
@@ -41,11 +42,8 @@ public abstract class CPRef extends ConstantPoolEntry {
*/
public CPRef(final byte type, final CPClass className, final CPNameAndType
descriptor, final int globalIndex) {
super(type, globalIndex);
- this.className = className;
- this.nameAndType = descriptor;
- if (descriptor == null || className == null) {
- throw new NullPointerException("Null arguments are not allowed");
- }
+ this.className = Objects.requireNonNull(className, "className");
+ this.nameAndType = Objects.requireNonNull(descriptor, "descriptor");
}
@Override
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPUTF8.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPUTF8.java
index be223ae5..b4c76591 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPUTF8.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPUTF8.java
@@ -18,6 +18,7 @@ package
org.apache.commons.compress.harmony.unpack200.bytecode;
import java.io.DataOutputStream;
import java.io.IOException;
+import java.util.Objects;
/**
* UTF8 constant pool entry, used for storing long Strings.
@@ -35,10 +36,7 @@ public class CPUTF8 extends ConstantPoolEntry {
*/
public CPUTF8(final String utf8, final int globalIndex) {
super(ConstantPoolEntry.CP_UTF8, globalIndex);
- this.utf8 = utf8;
- if (utf8 == null) {
- throw new NullPointerException("Null arguments are not allowed");
- }
+ this.utf8 = Objects.requireNonNull(utf8, "utf8");
}
public CPUTF8(final String string) {
diff --git
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ReferenceForm.java
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ReferenceForm.java
index 68177095..039e86f9 100644
---
a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ReferenceForm.java
+++
b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/forms/ReferenceForm.java
@@ -16,6 +16,8 @@
*/
package org.apache.commons.compress.harmony.unpack200.bytecode.forms;
+import java.util.Objects;
+
import org.apache.commons.compress.harmony.pack200.Pack200Exception;
import org.apache.commons.compress.harmony.unpack200.SegmentConstantPool;
import org.apache.commons.compress.harmony.unpack200.bytecode.ByteCode;
@@ -40,9 +42,7 @@ public abstract class ReferenceForm extends ByteCodeForm {
final SegmentConstantPool globalPool =
operandManager.globalConstantPool();
ClassFileEntry[] nested = null;
nested = new ClassFileEntry[]
{globalPool.getConstantPoolEntry(getPoolID(), offset)};
- if (nested[0] == null) {
- throw new NullPointerException("Null nested entries are not
allowed");
- }
+ Objects.requireNonNull(nested[0], "Null nested entries are not
allowed");
byteCode.setNested(nested);
byteCode.setNestedPositions(new int[][] {{0, 2}});
}
