From ff5b9a897ae77d4255a023527753afd99b71e2d3 Mon Sep 17 00:00:00 2001 From: redkale Date: Sun, 25 Jun 2023 10:50:56 +0800 Subject: [PATCH] =?UTF-8?q?Convert=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/redkale/convert/bson/BsonConvert.java | 6 +++--- src/main/java/org/redkale/convert/json/JsonConvert.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/redkale/convert/bson/BsonConvert.java b/src/main/java/org/redkale/convert/bson/BsonConvert.java index fa4387364..f10d254a7 100644 --- a/src/main/java/org/redkale/convert/bson/BsonConvert.java +++ b/src/main/java/org/redkale/convert/bson/BsonConvert.java @@ -8,6 +8,7 @@ package org.redkale.convert.bson; import java.io.*; import java.lang.reflect.Type; import java.nio.ByteBuffer; +import java.util.Objects; import java.util.function.*; import org.redkale.convert.*; import org.redkale.util.*; @@ -235,6 +236,7 @@ public class BsonConvert extends BinaryConvert { @Override public void convertToBytes(final ByteArray array, final Type type, final Object value) { + Objects.requireNonNull(array); final BsonWriter writer = configWrite(new BsonWriter(array).tiny(tiny)); if (value == null) { writer.writeNull(); @@ -258,9 +260,7 @@ public class BsonConvert extends BinaryConvert { @Override public ByteBuffer[] convertTo(final Supplier supplier, final Type type, final Object value) { - if (supplier == null) { - return null; - } + Objects.requireNonNull(supplier); BsonByteBufferWriter writer = pollWriter(supplier); if (value == null) { writer.writeNull(); diff --git a/src/main/java/org/redkale/convert/json/JsonConvert.java b/src/main/java/org/redkale/convert/json/JsonConvert.java index cd9831afb..360ff76d7 100644 --- a/src/main/java/org/redkale/convert/json/JsonConvert.java +++ b/src/main/java/org/redkale/convert/json/JsonConvert.java @@ -9,6 +9,7 @@ import java.io.*; import java.lang.reflect.Type; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; +import java.util.Objects; import java.util.function.*; import org.redkale.convert.*; import org.redkale.service.RetResult; @@ -390,6 +391,7 @@ public class JsonConvert extends TextConvert { @Override public void convertToBytes(final ByteArray array, final Type type, final Object value) { + Objects.requireNonNull(array); JsonBytesWriter writer = configWrite(new JsonBytesWriter(tiny, array)); if (value == null) { writer.writeNull(); @@ -428,9 +430,7 @@ public class JsonConvert extends TextConvert { @Override public ByteBuffer[] convertTo(final Supplier supplier, final Type type, final Object value) { - if (supplier == null) { - return null; - } + Objects.requireNonNull(supplier); JsonByteBufferWriter out = configWrite(new JsonByteBufferWriter(tiny, supplier)); if (value == null) { out.writeNull();