Browse Source

接口联调javax.annotation.Nullable 替换成引用Android自带的

fluty 4 years ago
parent
commit
45bc6492f3

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/CacheControl.java

@@ -1,7 +1,7 @@
 package com.fq.threelib.okhttp3;
 
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.http.HttpHeaders;
 
 /**

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Challenge.java

@@ -19,7 +19,7 @@ import java.nio.charset.Charset;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 import static java.util.Collections.singletonMap;
 import static java.util.Collections.unmodifiableMap;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Handshake.java

@@ -21,7 +21,7 @@ import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
 import java.util.Collections;
 import java.util.List;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import javax.net.ssl.SSLPeerUnverifiedException;
 import javax.net.ssl.SSLSession;
 import com.fq.threelib.okhttp3.internal.Util;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Headers.java

@@ -27,7 +27,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.Util;
 import com.fq.threelib.okhttp3.internal.http.HttpDate;
 

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/HttpUrl.java

@@ -26,7 +26,7 @@ import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.Util;
 import com.fq.threelib.okhttp3.internal.publicsuffix.PublicSuffixDatabase;
 import com.fq.threelib.okio.Buffer;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/MediaType.java

@@ -19,7 +19,7 @@ import java.nio.charset.Charset;
 import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 /**
  * An <a href="http://tools.ietf.org/html/rfc2045">RFC 2045</a> Media Type, appropriate to describe

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/OkHttpClient.java

@@ -27,7 +27,7 @@ import java.util.List;
 import java.util.Random;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import javax.net.SocketFactory;
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Request.java

@@ -20,7 +20,7 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.Util;
 import com.fq.threelib.okhttp3.internal.http.HttpMethod;
 

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/RequestBody.java

@@ -18,7 +18,7 @@ package com.fq.threelib.okhttp3;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.Util;
 import com.fq.threelib.okio.BufferedSink;
 import com.fq.threelib.okio.ByteString;

+ 4 - 2
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Response.java

@@ -15,11 +15,12 @@
  */
 package com.fq.threelib.okhttp3;
 
+import android.support.annotation.Nullable;
+
 import java.io.Closeable;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
-import javax.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.http.HttpHeaders;
 import com.fq.threelib.okio.Buffer;
 import com.fq.threelib.okio.BufferedSource;
@@ -45,7 +46,8 @@ public final class Response implements Closeable {
   final Protocol protocol;
   final int code;
   final String message;
-  final @Nullable Handshake handshake;
+  final @Nullable
+  Handshake handshake;
   final Headers headers;
   final @Nullable ResponseBody body;
   final @Nullable Response networkResponse;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/ResponseBody.java

@@ -21,7 +21,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.Charset;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.Util;
 import com.fq.threelib.okio.Buffer;
 import com.fq.threelib.okio.BufferedSource;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/Util.java

@@ -40,7 +40,7 @@ import java.util.TimeZone;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okio/Buffer.java

@@ -29,7 +29,7 @@ import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okio/BufferedSource.java

@@ -19,7 +19,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.charset.Charset;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 /**
  * A source that keeps a buffer internally so that callers can do small reads without a performance

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okio/ByteString.java

@@ -29,7 +29,7 @@ import java.security.InvalidKeyException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okio/Segment.java

@@ -15,7 +15,7 @@
  */
 package com.fq.threelib.okio;
 
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 /**
  * A segment of a buffer.