Browse Source

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

fluty 4 years ago
parent
commit
6632fc7759
19 changed files with 19 additions and 19 deletions
  1. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Route.java
  2. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/WebSocketListener.java
  3. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/Internal.java
  4. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/cache/CacheStrategy.java
  5. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/cache/DiskLruCache.java
  6. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/connection/RealConnection.java
  7. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/http/RealResponseBody.java
  8. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/http2/Http2Stream.java
  9. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/platform/Android10Platform.java
  10. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/platform/AndroidPlatform.java
  11. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/platform/ConscryptPlatform.java
  12. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/platform/Jdk9Platform.java
  13. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/platform/JdkWithJettyBootPlatform.java
  14. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/ws/RealWebSocket.java
  15. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okio/AsyncTimeout.java
  16. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okio/HashingSink.java
  17. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okio/Okio.java
  18. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okio/RealBufferedSource.java
  19. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okio/SegmentPool.java

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

@@ -17,7 +17,7 @@ package com.fq.threelib.okhttp3;
 
 import java.net.InetSocketAddress;
 import java.net.Proxy;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 /**
  * The concrete route used by a connection to reach an abstract origin server. When creating a

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

@@ -15,7 +15,7 @@
  */
 package com.fq.threelib.okhttp3;
 
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import com.fq.threelib.okio.ByteString;
 
 public abstract class WebSocketListener {

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

@@ -17,7 +17,7 @@ package com.fq.threelib.okhttp3.internal;
 
 import java.io.IOException;
 import java.net.Socket;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import javax.net.ssl.SSLSocket;
 import com.fq.threelib.okhttp3.Address;
 import com.fq.threelib.okhttp3.Call;

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

@@ -16,7 +16,7 @@
 package com.fq.threelib.okhttp3.internal.cache;
 
 import java.util.Date;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import com.fq.threelib.okhttp3.CacheControl;
 import com.fq.threelib.okhttp3.Headers;
 import com.fq.threelib.okhttp3.Request;

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

@@ -32,7 +32,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.Util;
 import com.fq.threelib.okhttp3.internal.io.FileSystem;
 import com.fq.threelib.okhttp3.internal.platform.Platform;

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

@@ -31,7 +31,7 @@ import java.security.cert.X509Certificate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import javax.net.ssl.SSLPeerUnverifiedException;
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.SSLSocket;

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

@@ -15,7 +15,7 @@
  */
 package com.fq.threelib.okhttp3.internal.http;
 
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import com.fq.threelib.okhttp3.MediaType;
 import com.fq.threelib.okhttp3.ResponseBody;
 import com.fq.threelib.okio.BufferedSource;

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

@@ -23,7 +23,7 @@ import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Deque;
 import java.util.List;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import com.fq.threelib.okhttp3.Headers;
 import com.fq.threelib.okhttp3.internal.Util;
 import com.fq.threelib.okio.AsyncTimeout;

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

@@ -18,7 +18,7 @@ package com.fq.threelib.okhttp3.internal.platform;
 import android.annotation.SuppressLint;
 import android.net.ssl.SSLSockets;
 import java.util.List;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSocket;
 import com.fq.threelib.okhttp3.Protocol;

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

@@ -29,7 +29,7 @@ import java.security.cert.Certificate;
 import java.security.cert.TrustAnchor;
 import java.security.cert.X509Certificate;
 import java.util.List;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLPeerUnverifiedException;
 import javax.net.ssl.SSLSocket;

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

@@ -18,7 +18,7 @@ package com.fq.threelib.okhttp3.internal.platform;
 import java.security.NoSuchAlgorithmException;
 import java.security.Provider;
 import java.util.List;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;

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

@@ -18,7 +18,7 @@ package com.fq.threelib.okhttp3.internal.platform;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.List;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;

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

@@ -20,7 +20,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 import java.util.List;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import javax.net.ssl.SSLSocket;
 import com.fq.threelib.okhttp3.Protocol;
 import com.fq.threelib.okhttp3.internal.Util;

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

@@ -27,7 +27,7 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import com.fq.threelib.okhttp3.Call;
 import com.fq.threelib.okhttp3.Callback;
 import com.fq.threelib.okhttp3.EventListener;

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

@@ -18,7 +18,7 @@ package com.fq.threelib.okio;
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 import static com.fq.threelib.okio.Util.checkOffsetAndCount;
 

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

@@ -19,7 +19,7 @@ import java.io.IOException;
 import java.security.InvalidKeyException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-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/Okio.java

@@ -33,7 +33,7 @@ import java.nio.file.OpenOption;
 import java.nio.file.Path;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 import static com.fq.threelib.okio.Util.checkOffsetAndCount;
 

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

@@ -20,7 +20,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 import static com.fq.threelib.okio.Util.checkOffsetAndCount;
 

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

@@ -15,7 +15,7 @@
  */
 package com.fq.threelib.okio;
 
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 /**
  * A collection of unused segments, necessary to avoid GC churn and zero-fill.