Переглянути джерело

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

fluty 5 роки тому
батько
коміт
bc1d6e2800
18 змінених файлів з 18 додано та 17 видалено
  1. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Address.java
  2. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Authenticator.java
  3. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Cache.java
  4. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/CertificatePinner.java
  5. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Connection.java
  6. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/ConnectionPool.java
  7. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/ConnectionSpec.java
  8. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Cookie.java
  9. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Dispatcher.java
  10. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/EventListener.java
  11. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/FormBody.java
  12. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/Interceptor.java
  13. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/MultipartBody.java
  14. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/OkHttpClient.java
  15. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/RealCall.java
  16. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/WebSocket.java
  17. 1 0
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/annotations/EverythingIsNonNull.java
  18. 1 1
      fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/platform/Platform.java

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

@@ -18,7 +18,7 @@ package com.fq.threelib.okhttp3;
 import java.net.Proxy;
 import java.net.ProxySelector;
 import java.util.List;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 import javax.net.SocketFactory;
 import javax.net.ssl.HostnameVerifier;

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

@@ -16,7 +16,7 @@
 package com.fq.threelib.okhttp3;
 
 import java.io.IOException;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 /**
  * Performs either <strong>preemptive</strong> authentication before connecting to a proxy server,

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

@@ -28,7 +28,7 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.NoSuchElementException;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.Util;
 import com.fq.threelib.okhttp3.internal.cache.CacheRequest;
 import com.fq.threelib.okhttp3.internal.cache.CacheStrategy;

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

@@ -23,7 +23,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 javax.net.ssl.SSLPeerUnverifiedException;
 import com.fq.threelib.okhttp3.internal.tls.CertificateChainCleaner;
 import com.fq.threelib.okio.ByteString;

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

@@ -17,7 +17,7 @@
 package com.fq.threelib.okhttp3;
 
 import java.net.Socket;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 /**
  * The sockets and streams of an HTTP, HTTPS, or HTTPS+HTTP/2 connection. May be used for multiple

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

@@ -27,7 +27,7 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.Util;
 import com.fq.threelib.okhttp3.internal.connection.RealConnection;
 import com.fq.threelib.okhttp3.internal.connection.RouteDatabase;

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

@@ -17,7 +17,7 @@ package com.fq.threelib.okhttp3;
 
 import java.util.Arrays;
 import java.util.List;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import javax.net.ssl.SSLSocket;
 import com.fq.threelib.okhttp3.internal.Util;
 

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

@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Locale;
 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.http.HttpDate;
 import com.fq.threelib.okhttp3.internal.publicsuffix.PublicSuffixDatabase;

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

@@ -25,7 +25,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import com.fq.threelib.okhttp3.RealCall.AsyncCall;
 import com.fq.threelib.okhttp3.internal.Util;
 

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

@@ -20,7 +20,7 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.util.List;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 /**
  * Listener for metrics events. Extend this class to monitor the quantity, size, and duration of

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

@@ -19,7 +19,7 @@ import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
-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.BufferedSink;

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

@@ -17,7 +17,7 @@ package com.fq.threelib.okhttp3;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 
 /**
  * Observes, modifies, and potentially short-circuits requests going out and the corresponding

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

@@ -19,7 +19,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-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.BufferedSink;

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

@@ -551,7 +551,7 @@ public class OkHttpClient implements Cloneable, Call.Factory, WebSocket.Factory
      * body, server processing, and reading the response body. If the call requires redirects or
      * retries all must complete within one timeout period.
      */
-    @IgnoreJRERequirement
+    @android.support.annotation.Nullable
     public Builder callTimeout(Duration duration) {
       callTimeout = checkDuration("timeout", duration.toMillis(), TimeUnit.MILLISECONDS);
       return this;

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

@@ -21,7 +21,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.RejectedExecutionException;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import com.fq.threelib.okhttp3.internal.NamedRunnable;
 import com.fq.threelib.okhttp3.internal.cache.CacheInterceptor;
 import com.fq.threelib.okhttp3.internal.connection.ConnectInterceptor;

+ 1 - 1
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/WebSocket.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;
 
 /**

+ 1 - 0
fq_plugin_base/src/main/java/com/fq/threelib/okhttp3/internal/annotations/EverythingIsNonNull.java

@@ -20,6 +20,7 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+
 import javax.annotation.Nonnull;
 import javax.annotation.meta.TypeQualifierDefault;
 

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

@@ -26,7 +26,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.annotation.Nullable;
+import android.support.annotation.Nullable;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;