Merge pull request protocolbuffers#7855 from belugabehr/ObjectsRequir…

…eNonNull Standardize NPE checks on JDK Objects utility
avm99963 · Aug 29, 2021 · a3e5587 · a3e5587
2 parents f79f956 + 5d168fa
commit a3e5587
Show file tree

Hide file tree

Showing 33 changed files with 110 additions and 173 deletions.
diff --git a/java/core/src/main/java/com/google/protobuf/AbstractMessageLite.java b/java/core/src/main/java/com/google/protobuf/AbstractMessageLite.java
@@ -30,15 +30,14 @@
 
 package com.google.protobuf;
 
-import static com.google.protobuf.Internal.checkNotNull;
-
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * A partial implementation of the {@link MessageLite} interface which implements as many methods of
@@ -402,7 +401,7 @@ protected static <T> void addAll(final Iterable<T> values, final Collection<? su
      *     null.
      */
     protected static <T> void addAll(final Iterable<T> values, final List<? super T> list) {
-      checkNotNull(values);
+      Objects.requireNonNull(values);
       if (values instanceof LazyStringList) {
         // For StringOrByteStringLists, check the underlying elements to avoid
         // forcing conversions of ByteStrings to Strings.

diff --git a/java/core/src/main/java/com/google/protobuf/AllocatedBuffer.java b/java/core/src/main/java/com/google/protobuf/AllocatedBuffer.java
@@ -30,9 +30,8 @@
 
 package com.google.protobuf;
 
-import static com.google.protobuf.Internal.checkNotNull;
-
 import java.nio.ByteBuffer;
+import java.util.Objects;
 
 /**
  * A buffer that was allocated by a {@link BufferAllocator}. For every buffer, it is guaranteed that
@@ -151,7 +150,7 @@ public static AllocatedBuffer wrap(final byte[] bytes, final int offset, final i
    * returned buffer will have {@link #hasNioBuffer} == {@code true}.
    */
   public static AllocatedBuffer wrap(final ByteBuffer buffer) {
-    checkNotNull(buffer, "buffer");
+    Objects.requireNonNull(buffer, "buffer");
 
     return new AllocatedBuffer() {
 

diff --git a/java/core/src/main/java/com/google/protobuf/ArrayDecoders.java b/java/core/src/main/java/com/google/protobuf/ArrayDecoders.java
@@ -34,6 +34,7 @@
 
 import com.google.protobuf.Internal.ProtobufList;
 import java.io.IOException;
+import java.util.Objects;
 
 /**
  * Helper functions to decode protobuf wire format from a byte array.
@@ -64,10 +65,7 @@ static final class Registers {
     }
 
     Registers(ExtensionRegistryLite extensionRegistry) {
-      if (extensionRegistry == null) {
-        throw new NullPointerException();
-      }
-      this.extensionRegistry = extensionRegistry;
+      this.extensionRegistry = Objects.requireNonNull(extensionRegistry);
     }
   }
 

diff --git a/java/core/src/main/java/com/google/protobuf/BinaryWriter.java b/java/core/src/main/java/com/google/protobuf/BinaryWriter.java
@@ -30,7 +30,6 @@
 
 package com.google.protobuf;
 
-import static com.google.protobuf.Internal.checkNotNull;
 import static com.google.protobuf.WireFormat.FIXED32_SIZE;
 import static com.google.protobuf.WireFormat.FIXED64_SIZE;
 import static com.google.protobuf.WireFormat.MAX_VARINT32_SIZE;
@@ -51,6 +50,7 @@
 import java.util.ArrayDeque;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Queue;
 
 /**
@@ -146,7 +146,7 @@ private BinaryWriter(BufferAllocator alloc, int chunkSize) {
     if (chunkSize <= 0) {
       throw new IllegalArgumentException("chunkSize must be > 0");
     }
-    this.alloc = checkNotNull(alloc, "alloc");
+    this.alloc = Objects.requireNonNull(alloc, "alloc");
     this.chunkSize = chunkSize;
   }
 

diff --git a/java/core/src/main/java/com/google/protobuf/BooleanArrayList.java b/java/core/src/main/java/com/google/protobuf/BooleanArrayList.java
@@ -30,11 +30,10 @@
 
 package com.google.protobuf;
 
-import static com.google.protobuf.Internal.checkNotNull;
-
 import com.google.protobuf.Internal.BooleanList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Objects;
 import java.util.RandomAccess;
 
 /**
@@ -238,7 +237,7 @@ private void addBoolean(int index, boolean element) {
   public boolean addAll(Collection<? extends Boolean> collection) {
     ensureIsMutable();
 
-    checkNotNull(collection);
+    Objects.requireNonNull(collection);
 
     // We specialize when adding another BooleanArrayList to avoid boxing elements.
     if (!(collection instanceof BooleanArrayList)) {

diff --git a/java/core/src/main/java/com/google/protobuf/ByteString.java b/java/core/src/main/java/com/google/protobuf/ByteString.java
@@ -55,6 +55,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.NoSuchElementException;
+import java.util.Objects;
 
 /**
  * Immutable sequence of bytes. Provides conversions to and from {@code byte[]}, {@link
@@ -1313,10 +1314,7 @@ private static class LiteralByteString extends ByteString.LeafByteString {
      * @param bytes array to wrap
      */
     LiteralByteString(byte[] bytes) {
-      if (bytes == null) {
-        throw new NullPointerException();
-      }
-      this.bytes = bytes;
+      this.bytes = Objects.requireNonNull(bytes);
     }
 
     @Override

diff --git a/java/core/src/main/java/com/google/protobuf/CodedInputStream.java b/java/core/src/main/java/com/google/protobuf/CodedInputStream.java
@@ -33,7 +33,6 @@
 import static com.google.protobuf.Internal.EMPTY_BYTE_ARRAY;
 import static com.google.protobuf.Internal.EMPTY_BYTE_BUFFER;
 import static com.google.protobuf.Internal.UTF_8;
-import static com.google.protobuf.Internal.checkNotNull;
 import static com.google.protobuf.WireFormat.FIXED32_SIZE;
 import static com.google.protobuf.WireFormat.FIXED64_SIZE;
 import static com.google.protobuf.WireFormat.MAX_VARINT_SIZE;
@@ -47,6 +46,7 @@
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Reads and decodes protocol message fields.
@@ -2056,8 +2056,7 @@ private static final class StreamDecoder extends CodedInputStream {
     private int currentLimit = Integer.MAX_VALUE;
 
     private StreamDecoder(final InputStream input, int bufferSize) {
-      checkNotNull(input, "input");
-      this.input = input;
+      this.input = Objects.requireNonNull(input, "input");
       this.buffer = new byte[bufferSize];
       this.bufferSize = 0;
       pos = 0;

diff --git a/java/core/src/main/java/com/google/protobuf/CodedInputStreamReader.java b/java/core/src/main/java/com/google/protobuf/CodedInputStreamReader.java
@@ -42,6 +42,7 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /** An adapter between the {@link Reader} interface and {@link CodedInputStream}. */
 @ExperimentalApi
@@ -63,7 +64,7 @@ public static CodedInputStreamReader forCodedInput(CodedInputStream input) {
   }
 
   private CodedInputStreamReader(CodedInputStream input) {
-    this.input = Internal.checkNotNull(input, "input");
+    this.input = Objects.requireNonNull(input, "input");
     this.input.wrapper = this;
   }
 

diff --git a/java/core/src/main/java/com/google/protobuf/CodedOutputStream.java b/java/core/src/main/java/com/google/protobuf/CodedOutputStream.java
@@ -42,6 +42,7 @@
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -1154,9 +1155,7 @@ private static class ArrayEncoder extends CodedOutputStream {
     private int position;
 
     ArrayEncoder(byte[] buffer, int offset, int length) {
-      if (buffer == null) {
-        throw new NullPointerException("buffer");
-      }
+      Objects.requireNonNull(buffer, "buffer");
       if ((offset | length | (buffer.length - (offset + length))) < 0) {
         throw new IllegalArgumentException(
             String.format(
@@ -2120,14 +2119,11 @@ public void writeFixed64NoTag(long value) throws IOException {
 
     @Override
     public void write(byte[] value, int offset, int length) throws IOException {
-      if (value == null
-          || offset < 0
+      Objects.requireNonNull(value, "value");
+      if (offset < 0
           || length < 0
           || (value.length - length) < offset
           || (limit - length) < position) {
-        if (value == null) {
-          throw new NullPointerException("value");
-        }
         throw new OutOfSpaceException(
             String.format("Pos: %d, limit: %d, len: %d", position, limit, length));
       }
@@ -2396,10 +2392,7 @@ private static final class ByteOutputEncoder extends AbstractBufferedEncoder {
 
     ByteOutputEncoder(ByteOutput out, int bufferSize) {
       super(bufferSize);
-      if (out == null) {
-        throw new NullPointerException("out");
-      }
-      this.out = out;
+      this.out = Objects.requireNonNull(out, "out");
     }
 
     @Override
@@ -2710,10 +2703,7 @@ private static final class OutputStreamEncoder extends AbstractBufferedEncoder {
 
     OutputStreamEncoder(OutputStream out, int bufferSize) {
       super(bufferSize);
-      if (out == null) {
-        throw new NullPointerException("out");
-      }
-      this.out = out;
+      this.out = Objects.requireNonNull(out, "out");
     }
 
     @Override

diff --git a/java/core/src/main/java/com/google/protobuf/CodedOutputStreamWriter.java b/java/core/src/main/java/com/google/protobuf/CodedOutputStreamWriter.java
@@ -30,13 +30,13 @@
 
 package com.google.protobuf;
 
-import static com.google.protobuf.Internal.checkNotNull;
 import static com.google.protobuf.WireFormat.WIRETYPE_LENGTH_DELIMITED;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /** An adapter between the {@link Writer} interface and {@link CodedOutputStream}. */
 @ExperimentalApi
@@ -51,7 +51,7 @@ public static CodedOutputStreamWriter forCodedOutput(CodedOutputStream output) {
   }
 
   private CodedOutputStreamWriter(CodedOutputStream output) {
-    this.output = checkNotNull(output, "output");
+    this.output = Objects.requireNonNull(output, "output");
     this.output.wrapper = this;
   }
 

diff --git a/java/core/src/main/java/com/google/protobuf/Descriptors.java b/java/core/src/main/java/com/google/protobuf/Descriptors.java
@@ -30,8 +30,6 @@
 
 package com.google.protobuf;
 
-import static com.google.protobuf.Internal.checkNotNull;
-
 import com.google.protobuf.DescriptorProtos.DescriptorProto;
 import com.google.protobuf.DescriptorProtos.EnumDescriptorProto;
 import com.google.protobuf.DescriptorProtos.EnumOptions;
@@ -57,6 +55,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.WeakHashMap;
 import java.util.logging.Logger;
@@ -744,7 +743,7 @@ public boolean isReservedNumber(final int number) {
 
     /** Determines if the given field name is reserved. */
     public boolean isReservedName(final String name) {
-      checkNotNull(name);
+      Objects.requireNonNull(name);
       for (final String reservedName : proto.getReservedNameList()) {
         if (reservedName.equals(name)) {
           return true;

diff --git a/java/core/src/main/java/com/google/protobuf/DoubleArrayList.java b/java/core/src/main/java/com/google/protobuf/DoubleArrayList.java
@@ -30,11 +30,10 @@
 
 package com.google.protobuf;
 
-import static com.google.protobuf.Internal.checkNotNull;
-
 import com.google.protobuf.Internal.DoubleList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Objects;
 import java.util.RandomAccess;
 
 /**
@@ -238,7 +237,7 @@ private void addDouble(int index, double element) {
   public boolean addAll(Collection<? extends Double> collection) {
     ensureIsMutable();
 
-    checkNotNull(collection);
+    Objects.requireNonNull(collection);
 
     // We specialize when adding another DoubleArrayList to avoid boxing elements.
     if (!(collection instanceof DoubleArrayList)) {

diff --git a/java/core/src/main/java/com/google/protobuf/DynamicMessage.java b/java/core/src/main/java/com/google/protobuf/DynamicMessage.java
@@ -30,8 +30,6 @@
 
 package com.google.protobuf;
 
-import static com.google.protobuf.Internal.checkNotNull;
-
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.Descriptors.EnumValueDescriptor;
 import com.google.protobuf.Descriptors.FieldDescriptor;
@@ -41,6 +39,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * An implementation of {@link Message} that can represent arbitrary types, given a {@link
@@ -624,7 +623,7 @@ private void verifyOneofContainingType(OneofDescriptor oneof) {
 
     /** Verifies that the value is EnumValueDescriptor and matches Enum Type. */
     private void ensureSingularEnumValueDescriptor(FieldDescriptor field, Object value) {
-      checkNotNull(value);
+      Objects.requireNonNull(value);
       if (!(value instanceof EnumValueDescriptor)) {
         throw new IllegalArgumentException(
             "DynamicMessage should use EnumValueDescriptor to set Enum Value.");