From 7b99019b6eb9df9a13a9c6871a81e4eb565d4fc6 Mon Sep 17 00:00:00 2001 From: czp Date: Sat, 17 Feb 2018 13:16:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=86=97=E4=BD=99=E7=9A=84?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=20null=20=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/hiczp/bilibili/api/BilibiliAPI.java | 7 ------- .../com/hiczp/bilibili/api/BilibiliClientProperties.java | 5 ++--- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/hiczp/bilibili/api/BilibiliAPI.java b/src/main/java/com/hiczp/bilibili/api/BilibiliAPI.java index aba6cb0..dd8e8a7 100644 --- a/src/main/java/com/hiczp/bilibili/api/BilibiliAPI.java +++ b/src/main/java/com/hiczp/bilibili/api/BilibiliAPI.java @@ -25,7 +25,6 @@ import java.time.Instant; import java.util.Collections; import java.util.Date; import java.util.List; -import java.util.Objects; public class BilibiliAPI implements BilibiliServiceProvider, LiveClientProvider { private static final Logger LOGGER = LoggerFactory.getLogger(BilibiliAPI.class); @@ -71,9 +70,6 @@ public class BilibiliAPI implements BilibiliServiceProvider, LiveClientProvider } public PassportService getPassportService(@Nonnull List interceptors, @Nonnull HttpLoggingInterceptor.Level logLevel) { - Objects.requireNonNull(interceptors); - Objects.requireNonNull(logLevel); - OkHttpClient.Builder okHttpClientBuilder = new OkHttpClient.Builder(); interceptors.forEach(okHttpClientBuilder::addInterceptor); @@ -109,9 +105,6 @@ public class BilibiliAPI implements BilibiliServiceProvider, LiveClientProvider } public LiveService getLiveService(@Nonnull List interceptors, @Nonnull HttpLoggingInterceptor.Level logLevel) { - Objects.requireNonNull(interceptors); - Objects.requireNonNull(logLevel); - OkHttpClient.Builder okHttpClientBuilder = new OkHttpClient.Builder(); interceptors.forEach(okHttpClientBuilder::addInterceptor); diff --git a/src/main/java/com/hiczp/bilibili/api/BilibiliClientProperties.java b/src/main/java/com/hiczp/bilibili/api/BilibiliClientProperties.java index bee2974..981dbab 100644 --- a/src/main/java/com/hiczp/bilibili/api/BilibiliClientProperties.java +++ b/src/main/java/com/hiczp/bilibili/api/BilibiliClientProperties.java @@ -1,6 +1,6 @@ package com.hiczp.bilibili.api; -import java.util.Objects; +import javax.annotation.Nonnull; public class BilibiliClientProperties { private String appKey = "1d8b6e7d45233436"; @@ -63,8 +63,7 @@ public class BilibiliClientProperties { return version; } - public BilibiliClientProperties setVersion(String version) { - Objects.requireNonNull(version); + public BilibiliClientProperties setVersion(@Nonnull String version) { this.version = version; generateBuildProperty(); return this;