From a4a235e14a63b9a4f902805641f1160c6bf5aa93 Mon Sep 17 00:00:00 2001 From: Marcono1234 Date: Sun, 24 May 2020 23:54:32 +0200 Subject: [PATCH] Remove redundant validation method --- .../gson/internal/bind/DefaultDateTypeAdapter.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gson/src/main/java/com/google/gson/internal/bind/DefaultDateTypeAdapter.java b/gson/src/main/java/com/google/gson/internal/bind/DefaultDateTypeAdapter.java index 9ac948f784..f56faee0f9 100644 --- a/gson/src/main/java/com/google/gson/internal/bind/DefaultDateTypeAdapter.java +++ b/gson/src/main/java/com/google/gson/internal/bind/DefaultDateTypeAdapter.java @@ -29,6 +29,7 @@ import com.google.gson.JsonSyntaxException; import com.google.gson.TypeAdapter; import com.google.gson.TypeAdapterFactory; +import com.google.gson.internal.$Gson$Preconditions; import com.google.gson.internal.JavaVersion; import com.google.gson.internal.PreJava9DateFormatProvider; import com.google.gson.internal.bind.util.ISO8601Utils; @@ -92,7 +93,7 @@ public final TypeAdapterFactory createDefaultsAdapterFactory() { private final List dateFormats = new ArrayList(); private DefaultDateTypeAdapter(DateType dateType, String datePattern) { - this.dateType = verifyDateType(dateType); + this.dateType = $Gson$Preconditions.checkNotNull(dateType); dateFormats.add(new SimpleDateFormat(datePattern, Locale.US)); if (!Locale.getDefault().equals(Locale.US)) { dateFormats.add(new SimpleDateFormat(datePattern)); @@ -100,7 +101,7 @@ private DefaultDateTypeAdapter(DateType dateType, String datePattern) { } private DefaultDateTypeAdapter(DateType dateType, int style) { - this.dateType = verifyDateType(dateType); + this.dateType = $Gson$Preconditions.checkNotNull(dateType); dateFormats.add(DateFormat.getDateInstance(style, Locale.US)); if (!Locale.getDefault().equals(Locale.US)) { dateFormats.add(DateFormat.getDateInstance(style)); @@ -111,7 +112,7 @@ private DefaultDateTypeAdapter(DateType dateType, int style) { } private DefaultDateTypeAdapter(DateType dateType, int dateStyle, int timeStyle) { - this.dateType = verifyDateType(dateType); + this.dateType = $Gson$Preconditions.checkNotNull(dateType); dateFormats.add(DateFormat.getDateTimeInstance(dateStyle, timeStyle, Locale.US)); if (!Locale.getDefault().equals(Locale.US)) { dateFormats.add(DateFormat.getDateTimeInstance(dateStyle, timeStyle)); @@ -121,13 +122,6 @@ private DefaultDateTypeAdapter(DateType dateType, int dateStyle, int timeStyl } } - private static DateType verifyDateType(DateType dateType) { - if (dateType == null) { - throw new NullPointerException("dateType == null"); - } - return dateType; - } - // These methods need to be synchronized since JDK DateFormat classes are not thread-safe // See issue 162 @Override