diff --git a/pom.xml b/pom.xml index c7381d549..0e63c2d77 100644 --- a/pom.xml +++ b/pom.xml @@ -101,31 +101,6 @@ ${java.version} - - org.sonatype.plugins - jarjar-maven-plugin - 1.5 - - - package - - jarjar - - - - asm:asm - org.sonatype.sisu.inject:cglib - - - - libcore.** - com.squareup.okhttp.libcore.@1 - - - - - - org.apache.maven.plugins maven-checkstyle-plugin diff --git a/src/main/java/com/squareup/okhttp/OkHttpClient.java b/src/main/java/com/squareup/okhttp/OkHttpClient.java index 97d4505f5..183e93676 100644 --- a/src/main/java/com/squareup/okhttp/OkHttpClient.java +++ b/src/main/java/com/squareup/okhttp/OkHttpClient.java @@ -15,6 +15,8 @@ */ package com.squareup.okhttp; +import com.squareup.okhttp.internal.net.http.HttpURLConnectionImpl; +import com.squareup.okhttp.internal.net.http.HttpsURLConnectionImpl; import java.net.HttpURLConnection; import java.net.Proxy; import java.net.URL; @@ -33,9 +35,9 @@ public final class OkHttpClient { public HttpURLConnection open(URL url) { String protocol = url.getProtocol(); if (protocol.equals("http")) { - return new libcore.net.http.HttpURLConnectionImpl(url, 80, proxy); + return new HttpURLConnectionImpl(url, 80, proxy); } else if (protocol.equals("https")) { - return new libcore.net.http.HttpsURLConnectionImpl(url, 443, proxy); + return new HttpsURLConnectionImpl(url, 443, proxy); } else { throw new IllegalArgumentException(); } diff --git a/src/main/java/libcore/Platform.java b/src/main/java/com/squareup/okhttp/internal/Platform.java similarity index 99% rename from src/main/java/libcore/Platform.java rename to src/main/java/com/squareup/okhttp/internal/Platform.java index 1d1453ff5..db089cf54 100644 --- a/src/main/java/libcore/Platform.java +++ b/src/main/java/com/squareup/okhttp/internal/Platform.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package libcore; +package com.squareup.okhttp.internal; import com.squareup.okhttp.OkHttpClient; import java.io.OutputStream; diff --git a/src/main/java/libcore/io/AsynchronousCloseMonitor.java b/src/main/java/com/squareup/okhttp/internal/io/AsynchronousCloseMonitor.java similarity index 95% rename from src/main/java/libcore/io/AsynchronousCloseMonitor.java rename to src/main/java/com/squareup/okhttp/internal/io/AsynchronousCloseMonitor.java index 62eec24af..23cf2ce71 100644 --- a/src/main/java/libcore/io/AsynchronousCloseMonitor.java +++ b/src/main/java/com/squareup/okhttp/internal/io/AsynchronousCloseMonitor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.io; +package com.squareup.okhttp.internal.io; import java.io.FileDescriptor; diff --git a/src/main/java/libcore/io/Base64.java b/src/main/java/com/squareup/okhttp/internal/io/Base64.java similarity index 98% rename from src/main/java/libcore/io/Base64.java rename to src/main/java/com/squareup/okhttp/internal/io/Base64.java index 96d3b9d97..e395052e6 100644 --- a/src/main/java/libcore/io/Base64.java +++ b/src/main/java/com/squareup/okhttp/internal/io/Base64.java @@ -19,10 +19,10 @@ * @author Alexander Y. Kleymenov */ -package libcore.io; +package com.squareup.okhttp.internal.io; +import com.squareup.okhttp.internal.util.EmptyArray; import java.io.UnsupportedEncodingException; -import libcore.util.EmptyArray; /** * Base64 encoder/decoder. diff --git a/src/main/java/libcore/io/BufferIterator.java b/src/main/java/com/squareup/okhttp/internal/io/BufferIterator.java similarity index 98% rename from src/main/java/libcore/io/BufferIterator.java rename to src/main/java/com/squareup/okhttp/internal/io/BufferIterator.java index 7f3ad472b..f8b461161 100644 --- a/src/main/java/libcore/io/BufferIterator.java +++ b/src/main/java/com/squareup/okhttp/internal/io/BufferIterator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.io; +package com.squareup.okhttp.internal.io; /** * Iterates over big- or little-endian bytes. See {@link MemoryMappedFile#bigEndianIterator} and diff --git a/src/main/java/libcore/io/DiskLruCache.java b/src/main/java/com/squareup/okhttp/internal/io/DiskLruCache.java similarity index 99% rename from src/main/java/libcore/io/DiskLruCache.java rename to src/main/java/com/squareup/okhttp/internal/io/DiskLruCache.java index 5b78838c0..2006257cc 100644 --- a/src/main/java/libcore/io/DiskLruCache.java +++ b/src/main/java/com/squareup/okhttp/internal/io/DiskLruCache.java @@ -14,8 +14,10 @@ * limitations under the License. */ -package libcore.io; +package com.squareup.okhttp.internal.io; +import com.squareup.okhttp.internal.util.Charsets; +import com.squareup.okhttp.internal.util.Libcore; import java.io.BufferedWriter; import java.io.Closeable; import java.io.EOFException; @@ -41,8 +43,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import libcore.util.Charsets; -import libcore.util.Libcore; /** * A cache that uses a bounded amount of space on a filesystem. Each cache diff --git a/src/main/java/libcore/io/IoUtils.java b/src/main/java/com/squareup/okhttp/internal/io/IoUtils.java similarity index 98% rename from src/main/java/libcore/io/IoUtils.java rename to src/main/java/com/squareup/okhttp/internal/io/IoUtils.java index 307737d5b..2b7ccb127 100644 --- a/src/main/java/libcore/io/IoUtils.java +++ b/src/main/java/com/squareup/okhttp/internal/io/IoUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.io; +package com.squareup.okhttp.internal.io; import java.io.Closeable; import java.io.File; diff --git a/src/main/java/libcore/io/OsConstants.java b/src/main/java/com/squareup/okhttp/internal/io/OsConstants.java similarity index 99% rename from src/main/java/libcore/io/OsConstants.java rename to src/main/java/com/squareup/okhttp/internal/io/OsConstants.java index 68a165c8d..bbc6c2655 100644 --- a/src/main/java/libcore/io/OsConstants.java +++ b/src/main/java/com/squareup/okhttp/internal/io/OsConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.io; +package com.squareup.okhttp.internal.io; public final class OsConstants { private OsConstants() { } diff --git a/src/main/java/libcore/io/SizeOf.java b/src/main/java/com/squareup/okhttp/internal/io/SizeOf.java similarity index 95% rename from src/main/java/libcore/io/SizeOf.java rename to src/main/java/com/squareup/okhttp/internal/io/SizeOf.java index 728fbfce7..cb9289c3c 100644 --- a/src/main/java/libcore/io/SizeOf.java +++ b/src/main/java/com/squareup/okhttp/internal/io/SizeOf.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.io; +package com.squareup.okhttp.internal.io; public final class SizeOf { public static final int CHAR = 2; diff --git a/src/main/java/libcore/io/Streams.java b/src/main/java/com/squareup/okhttp/internal/io/Streams.java similarity index 98% rename from src/main/java/libcore/io/Streams.java rename to src/main/java/com/squareup/okhttp/internal/io/Streams.java index 1ad2356ba..4a7a192e5 100644 --- a/src/main/java/libcore/io/Streams.java +++ b/src/main/java/com/squareup/okhttp/internal/io/Streams.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package libcore.io; +package com.squareup.okhttp.internal.io; +import com.squareup.okhttp.internal.util.Libcore; import java.io.ByteArrayOutputStream; import java.io.EOFException; import java.io.IOException; @@ -24,7 +25,6 @@ import java.io.OutputStream; import java.io.Reader; import java.io.StringWriter; import java.util.concurrent.atomic.AtomicReference; -import libcore.util.Libcore; public final class Streams { private static AtomicReference skipBuffer = new AtomicReference(); diff --git a/src/main/java/libcore/io/StrictLineReader.java b/src/main/java/com/squareup/okhttp/internal/io/StrictLineReader.java similarity index 99% rename from src/main/java/libcore/io/StrictLineReader.java rename to src/main/java/com/squareup/okhttp/internal/io/StrictLineReader.java index dabb516b4..9c95b199a 100644 --- a/src/main/java/libcore/io/StrictLineReader.java +++ b/src/main/java/com/squareup/okhttp/internal/io/StrictLineReader.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package libcore.io; +package com.squareup.okhttp.internal.io; +import com.squareup.okhttp.internal.util.Charsets; import java.io.ByteArrayOutputStream; import java.io.Closeable; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; -import libcore.util.Charsets; /** * Buffers input from an {@link InputStream} for reading lines. diff --git a/src/main/java/libcore/net/Dns.java b/src/main/java/com/squareup/okhttp/internal/net/Dns.java similarity index 96% rename from src/main/java/libcore/net/Dns.java rename to src/main/java/com/squareup/okhttp/internal/net/Dns.java index 8b38fdfff..7b2c8e59a 100644 --- a/src/main/java/libcore/net/Dns.java +++ b/src/main/java/com/squareup/okhttp/internal/net/Dns.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package libcore.net; +package com.squareup.okhttp.internal.net; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/src/main/java/libcore/net/MimeUtils.java b/src/main/java/com/squareup/okhttp/internal/net/MimeUtils.java similarity index 99% rename from src/main/java/libcore/net/MimeUtils.java rename to src/main/java/com/squareup/okhttp/internal/net/MimeUtils.java index 76193ff2d..286375566 100644 --- a/src/main/java/libcore/net/MimeUtils.java +++ b/src/main/java/com/squareup/okhttp/internal/net/MimeUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.net; +package com.squareup.okhttp.internal.net; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/libcore/net/http/AbstractHttpInputStream.java b/src/main/java/com/squareup/okhttp/internal/net/http/AbstractHttpInputStream.java similarity index 97% rename from src/main/java/libcore/net/http/AbstractHttpInputStream.java rename to src/main/java/com/squareup/okhttp/internal/net/http/AbstractHttpInputStream.java index 70f76b7ce..dca5505fe 100644 --- a/src/main/java/libcore/net/http/AbstractHttpInputStream.java +++ b/src/main/java/com/squareup/okhttp/internal/net/http/AbstractHttpInputStream.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; +import com.squareup.okhttp.internal.io.Streams; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.CacheRequest; -import libcore.io.Streams; /** * An input stream for the body of an HTTP response. diff --git a/src/main/java/libcore/net/http/AbstractHttpOutputStream.java b/src/main/java/com/squareup/okhttp/internal/net/http/AbstractHttpOutputStream.java similarity index 96% rename from src/main/java/libcore/net/http/AbstractHttpOutputStream.java rename to src/main/java/com/squareup/okhttp/internal/net/http/AbstractHttpOutputStream.java index 145bc5056..336ecc3f1 100644 --- a/src/main/java/libcore/net/http/AbstractHttpOutputStream.java +++ b/src/main/java/com/squareup/okhttp/internal/net/http/AbstractHttpOutputStream.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/libcore/net/http/HeaderParser.java b/src/main/java/com/squareup/okhttp/internal/net/http/HeaderParser.java similarity index 98% rename from src/main/java/libcore/net/http/HeaderParser.java rename to src/main/java/com/squareup/okhttp/internal/net/http/HeaderParser.java index b35db78bf..051dc7ee6 100644 --- a/src/main/java/libcore/net/http/HeaderParser.java +++ b/src/main/java/com/squareup/okhttp/internal/net/http/HeaderParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; final class HeaderParser { diff --git a/src/main/java/libcore/net/http/HttpAuthenticator.java b/src/main/java/com/squareup/okhttp/internal/net/http/HttpAuthenticator.java similarity index 97% rename from src/main/java/libcore/net/http/HttpAuthenticator.java rename to src/main/java/com/squareup/okhttp/internal/net/http/HttpAuthenticator.java index 882d16fd6..eed1a78c9 100644 --- a/src/main/java/libcore/net/http/HttpAuthenticator.java +++ b/src/main/java/com/squareup/okhttp/internal/net/http/HttpAuthenticator.java @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; -import static com.squareup.okhttp.OkHttpConnection.HTTP_PROXY_AUTH; -import static com.squareup.okhttp.OkHttpConnection.HTTP_UNAUTHORIZED; +import com.squareup.okhttp.internal.io.Base64; import java.io.IOException; import java.net.Authenticator; +import static java.net.HttpURLConnection.HTTP_PROXY_AUTH; +import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.PasswordAuthentication; @@ -27,7 +28,6 @@ import java.net.Proxy; import java.net.URL; import java.util.ArrayList; import java.util.List; -import libcore.io.Base64; /** * Handles HTTP authentication headers from origin and proxy servers. diff --git a/src/main/java/libcore/net/http/HttpConnection.java b/src/main/java/com/squareup/okhttp/internal/net/http/HttpConnection.java similarity index 97% rename from src/main/java/libcore/net/http/HttpConnection.java rename to src/main/java/com/squareup/okhttp/internal/net/http/HttpConnection.java index 2fd27935d..0771bbf4c 100644 --- a/src/main/java/libcore/net/http/HttpConnection.java +++ b/src/main/java/com/squareup/okhttp/internal/net/http/HttpConnection.java @@ -15,14 +15,19 @@ * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; -import static com.squareup.okhttp.OkHttpConnection.HTTP_PROXY_AUTH; +import com.squareup.okhttp.internal.Platform; +import com.squareup.okhttp.internal.io.IoUtils; +import com.squareup.okhttp.internal.net.spdy.SpdyConnection; +import com.squareup.okhttp.internal.util.Libcore; +import com.squareup.okhttp.internal.util.Objects; import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import static java.net.HttpURLConnection.HTTP_OK; +import static java.net.HttpURLConnection.HTTP_PROXY_AUTH; import java.net.InetSocketAddress; import java.net.Proxy; import java.net.Socket; @@ -33,11 +38,6 @@ import java.util.Arrays; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; -import libcore.Platform; -import libcore.io.IoUtils; -import libcore.net.spdy.SpdyConnection; -import libcore.util.Libcore; -import libcore.util.Objects; /** * Holds the sockets and streams of an HTTP, HTTPS, or HTTPS+SPDY connection, diff --git a/src/main/java/libcore/net/http/HttpConnectionPool.java b/src/main/java/com/squareup/okhttp/internal/net/http/HttpConnectionPool.java similarity index 98% rename from src/main/java/libcore/net/http/HttpConnectionPool.java rename to src/main/java/com/squareup/okhttp/internal/net/http/HttpConnectionPool.java index 0c2a1889c..9e784b917 100644 --- a/src/main/java/libcore/net/http/HttpConnectionPool.java +++ b/src/main/java/com/squareup/okhttp/internal/net/http/HttpConnectionPool.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; +import com.squareup.okhttp.internal.util.Libcore; import java.net.Socket; import java.net.SocketException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import libcore.util.Libcore; /** * A pool of HTTP and SPDY connections. This class exposes its tuning parameters diff --git a/src/main/java/libcore/net/http/HttpDate.java b/src/main/java/com/squareup/okhttp/internal/net/http/HttpDate.java similarity index 98% rename from src/main/java/libcore/net/http/HttpDate.java rename to src/main/java/com/squareup/okhttp/internal/net/http/HttpDate.java index 41ae5ef62..d8f218b2b 100644 --- a/src/main/java/libcore/net/http/HttpDate.java +++ b/src/main/java/com/squareup/okhttp/internal/net/http/HttpDate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; import java.text.DateFormat; import java.text.ParseException; diff --git a/src/main/java/libcore/net/http/HttpEngine.java b/src/main/java/com/squareup/okhttp/internal/net/http/HttpEngine.java similarity index 98% rename from src/main/java/libcore/net/http/HttpEngine.java rename to src/main/java/com/squareup/okhttp/internal/net/http/HttpEngine.java index e1fa9bead..e3ba46e77 100644 --- a/src/main/java/libcore/net/http/HttpEngine.java +++ b/src/main/java/com/squareup/okhttp/internal/net/http/HttpEngine.java @@ -15,8 +15,14 @@ * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; +import com.squareup.okhttp.internal.io.IoUtils; +import com.squareup.okhttp.internal.net.Dns; +import com.squareup.okhttp.internal.util.EmptyArray; +import com.squareup.okhttp.internal.util.ExtendedResponseCache; +import com.squareup.okhttp.internal.util.Libcore; +import com.squareup.okhttp.internal.util.ResponseSource; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -39,12 +45,6 @@ import java.util.Map; import java.util.zip.GZIPInputStream; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLSocketFactory; -import libcore.io.IoUtils; -import libcore.net.Dns; -import libcore.util.EmptyArray; -import libcore.util.ExtendedResponseCache; -import libcore.util.Libcore; -import libcore.util.ResponseSource; /** * Handles a single HTTP request/response pair. Each HTTP engine follows this diff --git a/src/main/java/libcore/net/http/HttpResponseCache.java b/src/main/java/com/squareup/okhttp/internal/net/http/HttpResponseCache.java similarity index 97% rename from src/main/java/libcore/net/http/HttpResponseCache.java rename to src/main/java/com/squareup/okhttp/internal/net/http/HttpResponseCache.java index 2932e7ed8..a8b57dc8e 100644 --- a/src/main/java/libcore/net/http/HttpResponseCache.java +++ b/src/main/java/com/squareup/okhttp/internal/net/http/HttpResponseCache.java @@ -14,8 +14,16 @@ * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; +import com.squareup.okhttp.internal.io.Base64; +import com.squareup.okhttp.internal.io.DiskLruCache; +import com.squareup.okhttp.internal.io.IoUtils; +import com.squareup.okhttp.internal.io.StrictLineReader; +import com.squareup.okhttp.internal.util.Charsets; +import com.squareup.okhttp.internal.util.ExtendedResponseCache; +import com.squareup.okhttp.internal.util.IntegralToString; +import com.squareup.okhttp.internal.util.ResponseSource; import java.io.BufferedWriter; import java.io.ByteArrayInputStream; import java.io.File; @@ -47,14 +55,6 @@ import java.util.List; import java.util.Map; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLPeerUnverifiedException; -import libcore.io.Base64; -import libcore.io.DiskLruCache; -import libcore.io.IoUtils; -import libcore.io.StrictLineReader; -import libcore.util.Charsets; -import libcore.util.ExtendedResponseCache; -import libcore.util.IntegralToString; -import libcore.util.ResponseSource; /** * Cache responses in a directory on the file system. Most clients should use diff --git a/src/main/java/libcore/net/http/HttpTransport.java b/src/main/java/com/squareup/okhttp/internal/net/http/HttpTransport.java similarity index 99% rename from src/main/java/libcore/net/http/HttpTransport.java rename to src/main/java/com/squareup/okhttp/internal/net/http/HttpTransport.java index ae9a8bce6..f8efdff82 100644 --- a/src/main/java/libcore/net/http/HttpTransport.java +++ b/src/main/java/com/squareup/okhttp/internal/net/http/HttpTransport.java @@ -14,8 +14,10 @@ * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; +import com.squareup.okhttp.internal.io.Streams; +import com.squareup.okhttp.internal.util.Libcore; import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -25,8 +27,6 @@ import java.net.CacheRequest; import java.net.CookieHandler; import java.net.ProtocolException; import java.net.Socket; -import libcore.io.Streams; -import libcore.util.Libcore; final class HttpTransport implements Transport { /** diff --git a/src/main/java/libcore/net/http/HttpURLConnectionImpl.java b/src/main/java/com/squareup/okhttp/internal/net/http/HttpURLConnectionImpl.java similarity index 99% rename from src/main/java/libcore/net/http/HttpURLConnectionImpl.java rename to src/main/java/com/squareup/okhttp/internal/net/http/HttpURLConnectionImpl.java index acfd56a6e..9b944308b 100644 --- a/src/main/java/libcore/net/http/HttpURLConnectionImpl.java +++ b/src/main/java/com/squareup/okhttp/internal/net/http/HttpURLConnectionImpl.java @@ -15,8 +15,10 @@ * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; +import com.squareup.okhttp.internal.io.IoUtils; +import com.squareup.okhttp.internal.util.Libcore; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; @@ -33,8 +35,6 @@ import java.security.cert.CertificateException; import java.util.List; import java.util.Map; import javax.net.ssl.SSLHandshakeException; -import libcore.io.IoUtils; -import libcore.util.Libcore; /** * This implementation uses HttpEngine to send requests and receive responses. diff --git a/src/main/java/libcore/net/http/HttpsHandler.java b/src/main/java/com/squareup/okhttp/internal/net/http/HttpsHandler.java similarity index 97% rename from src/main/java/libcore/net/http/HttpsHandler.java rename to src/main/java/com/squareup/okhttp/internal/net/http/HttpsHandler.java index ed9ba7243..a0f5da60f 100644 --- a/src/main/java/libcore/net/http/HttpsHandler.java +++ b/src/main/java/com/squareup/okhttp/internal/net/http/HttpsHandler.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; import java.io.IOException; import java.net.Proxy; diff --git a/src/main/java/libcore/net/http/HttpsURLConnectionImpl.java b/src/main/java/com/squareup/okhttp/internal/net/http/HttpsURLConnectionImpl.java similarity index 99% rename from src/main/java/libcore/net/http/HttpsURLConnectionImpl.java rename to src/main/java/com/squareup/okhttp/internal/net/http/HttpsURLConnectionImpl.java index 982c5cdb8..41b1de2dd 100644 --- a/src/main/java/libcore/net/http/HttpsURLConnectionImpl.java +++ b/src/main/java/com/squareup/okhttp/internal/net/http/HttpsURLConnectionImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/libcore/net/http/RawHeaders.java b/src/main/java/com/squareup/okhttp/internal/net/http/RawHeaders.java similarity index 99% rename from src/main/java/libcore/net/http/RawHeaders.java rename to src/main/java/com/squareup/okhttp/internal/net/http/RawHeaders.java index 9072cfdd5..70a7adbac 100644 --- a/src/main/java/libcore/net/http/RawHeaders.java +++ b/src/main/java/com/squareup/okhttp/internal/net/http/RawHeaders.java @@ -15,8 +15,10 @@ * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; +import com.squareup.okhttp.internal.io.Streams; +import com.squareup.okhttp.internal.util.Libcore; import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; @@ -31,8 +33,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; -import libcore.io.Streams; -import libcore.util.Libcore; /** * The HTTP status and unparsed header fields of a single HTTP message. Values diff --git a/src/main/java/libcore/net/http/RequestHeaders.java b/src/main/java/com/squareup/okhttp/internal/net/http/RequestHeaders.java similarity index 99% rename from src/main/java/libcore/net/http/RequestHeaders.java rename to src/main/java/com/squareup/okhttp/internal/net/http/RequestHeaders.java index a84437e16..ca872c2e1 100644 --- a/src/main/java/libcore/net/http/RequestHeaders.java +++ b/src/main/java/com/squareup/okhttp/internal/net/http/RequestHeaders.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; import java.net.URI; import java.util.Date; diff --git a/src/main/java/libcore/net/http/ResponseHeaders.java b/src/main/java/com/squareup/okhttp/internal/net/http/ResponseHeaders.java similarity index 99% rename from src/main/java/libcore/net/http/ResponseHeaders.java rename to src/main/java/com/squareup/okhttp/internal/net/http/ResponseHeaders.java index 0d89fe5bc..5f2e1aec4 100644 --- a/src/main/java/libcore/net/http/ResponseHeaders.java +++ b/src/main/java/com/squareup/okhttp/internal/net/http/ResponseHeaders.java @@ -14,8 +14,10 @@ * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; +import com.squareup.okhttp.internal.util.Objects; +import com.squareup.okhttp.internal.util.ResponseSource; import java.io.IOException; import java.net.HttpURLConnection; import java.net.URI; @@ -26,8 +28,6 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; import java.util.concurrent.TimeUnit; -import libcore.util.Objects; -import libcore.util.ResponseSource; /** * Parsed HTTP response headers. diff --git a/src/main/java/libcore/net/http/RetryableOutputStream.java b/src/main/java/com/squareup/okhttp/internal/net/http/RetryableOutputStream.java similarity index 96% rename from src/main/java/libcore/net/http/RetryableOutputStream.java rename to src/main/java/com/squareup/okhttp/internal/net/http/RetryableOutputStream.java index cda2e5e7c..7c8074570 100644 --- a/src/main/java/libcore/net/http/RetryableOutputStream.java +++ b/src/main/java/com/squareup/okhttp/internal/net/http/RetryableOutputStream.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; +import com.squareup.okhttp.internal.util.Libcore; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; import java.net.ProtocolException; -import libcore.util.Libcore; /** * An HTTP request body that's completely buffered in memory. This allows diff --git a/src/main/java/libcore/net/http/RouteSelector.java b/src/main/java/com/squareup/okhttp/internal/net/http/RouteSelector.java similarity index 95% rename from src/main/java/libcore/net/http/RouteSelector.java rename to src/main/java/com/squareup/okhttp/internal/net/http/RouteSelector.java index 1066034ce..3b7bf463b 100644 --- a/src/main/java/libcore/net/http/RouteSelector.java +++ b/src/main/java/com/squareup/okhttp/internal/net/http/RouteSelector.java @@ -13,8 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; +import com.squareup.okhttp.internal.net.Dns; +import static com.squareup.okhttp.internal.net.http.HttpConnection.TLS_MODE_AGGRESSIVE; +import static com.squareup.okhttp.internal.net.http.HttpConnection.TLS_MODE_COMPATIBLE; +import static com.squareup.okhttp.internal.net.http.HttpConnection.TLS_MODE_NULL; +import com.squareup.okhttp.internal.util.Libcore; import java.io.IOException; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -26,11 +31,6 @@ import java.net.UnknownHostException; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; -import libcore.net.Dns; -import static libcore.net.http.HttpConnection.TLS_MODE_AGGRESSIVE; -import static libcore.net.http.HttpConnection.TLS_MODE_COMPATIBLE; -import static libcore.net.http.HttpConnection.TLS_MODE_NULL; -import libcore.util.Libcore; /** * Selects routes to connect to an origin server. Each connection requires a diff --git a/src/main/java/libcore/net/http/SpdyTransport.java b/src/main/java/com/squareup/okhttp/internal/net/http/SpdyTransport.java similarity index 95% rename from src/main/java/libcore/net/http/SpdyTransport.java rename to src/main/java/com/squareup/okhttp/internal/net/http/SpdyTransport.java index 16ad4521f..1cad6be62 100644 --- a/src/main/java/libcore/net/http/SpdyTransport.java +++ b/src/main/java/com/squareup/okhttp/internal/net/http/SpdyTransport.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; +import com.squareup.okhttp.internal.net.spdy.SpdyConnection; +import com.squareup.okhttp.internal.net.spdy.SpdyStream; import java.io.IOException; import java.io.InputStream; import java.io.InterruptedIOException; import java.io.OutputStream; import java.net.CacheRequest; import java.util.List; -import libcore.net.spdy.SpdyConnection; -import libcore.net.spdy.SpdyStream; final class SpdyTransport implements Transport { private final HttpEngine httpEngine; diff --git a/src/main/java/libcore/net/http/Transport.java b/src/main/java/com/squareup/okhttp/internal/net/http/Transport.java similarity index 98% rename from src/main/java/libcore/net/http/Transport.java rename to src/main/java/com/squareup/okhttp/internal/net/http/Transport.java index 3d4c8ddbb..3d73c15f7 100644 --- a/src/main/java/libcore/net/http/Transport.java +++ b/src/main/java/com/squareup/okhttp/internal/net/http/Transport.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/libcore/net/spdy/IncomingStreamHandler.java b/src/main/java/com/squareup/okhttp/internal/net/spdy/IncomingStreamHandler.java similarity index 96% rename from src/main/java/libcore/net/spdy/IncomingStreamHandler.java rename to src/main/java/com/squareup/okhttp/internal/net/spdy/IncomingStreamHandler.java index 69cc8e110..ff8ea0e36 100644 --- a/src/main/java/libcore/net/spdy/IncomingStreamHandler.java +++ b/src/main/java/com/squareup/okhttp/internal/net/spdy/IncomingStreamHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.net.spdy; +package com.squareup.okhttp.internal.net.spdy; import java.io.IOException; diff --git a/src/main/java/libcore/net/spdy/Ping.java b/src/main/java/com/squareup/okhttp/internal/net/spdy/Ping.java similarity index 97% rename from src/main/java/libcore/net/spdy/Ping.java rename to src/main/java/com/squareup/okhttp/internal/net/spdy/Ping.java index 8eb5ebe25..5912831d4 100644 --- a/src/main/java/libcore/net/spdy/Ping.java +++ b/src/main/java/com/squareup/okhttp/internal/net/spdy/Ping.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package libcore.net.spdy; +package com.squareup.okhttp.internal.net.spdy; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/libcore/net/spdy/Settings.java b/src/main/java/com/squareup/okhttp/internal/net/spdy/Settings.java similarity index 99% rename from src/main/java/libcore/net/spdy/Settings.java rename to src/main/java/com/squareup/okhttp/internal/net/spdy/Settings.java index 0e3e40cd5..2f9a5a399 100644 --- a/src/main/java/libcore/net/spdy/Settings.java +++ b/src/main/java/com/squareup/okhttp/internal/net/spdy/Settings.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package libcore.net.spdy; +package com.squareup.okhttp.internal.net.spdy; final class Settings { /** Peer request to clear durable settings. */ diff --git a/src/main/java/libcore/net/spdy/SpdyConnection.java b/src/main/java/com/squareup/okhttp/internal/net/spdy/SpdyConnection.java similarity index 98% rename from src/main/java/libcore/net/spdy/SpdyConnection.java rename to src/main/java/com/squareup/okhttp/internal/net/spdy/SpdyConnection.java index 0aa81fe58..12fa547ba 100644 --- a/src/main/java/libcore/net/spdy/SpdyConnection.java +++ b/src/main/java/com/squareup/okhttp/internal/net/spdy/SpdyConnection.java @@ -14,8 +14,10 @@ * limitations under the License. */ -package libcore.net.spdy; +package com.squareup.okhttp.internal.net.spdy; +import com.squareup.okhttp.internal.io.Streams; +import static com.squareup.okhttp.internal.net.spdy.Threads.newThreadFactory; import java.io.Closeable; import java.io.IOException; import java.io.InputStream; @@ -29,9 +31,6 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import libcore.io.Streams; - -import static libcore.net.spdy.Threads.newThreadFactory; /** * A socket connection to a remote peer. A connection hosts streams which can diff --git a/src/main/java/libcore/net/spdy/SpdyReader.java b/src/main/java/com/squareup/okhttp/internal/net/spdy/SpdyReader.java similarity index 99% rename from src/main/java/libcore/net/spdy/SpdyReader.java rename to src/main/java/com/squareup/okhttp/internal/net/spdy/SpdyReader.java index 5240cd0e2..4ebc7ee2c 100644 --- a/src/main/java/libcore/net/spdy/SpdyReader.java +++ b/src/main/java/com/squareup/okhttp/internal/net/spdy/SpdyReader.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package libcore.net.spdy; +package com.squareup.okhttp.internal.net.spdy; +import com.squareup.okhttp.internal.io.Streams; import java.io.DataInputStream; import java.io.EOFException; import java.io.IOException; @@ -27,7 +28,6 @@ import java.util.logging.Logger; import java.util.zip.DataFormatException; import java.util.zip.Inflater; import java.util.zip.InflaterInputStream; -import libcore.io.Streams; /** * Read version 2 SPDY frames. diff --git a/src/main/java/libcore/net/spdy/SpdyServer.java b/src/main/java/com/squareup/okhttp/internal/net/spdy/SpdyServer.java similarity index 98% rename from src/main/java/libcore/net/spdy/SpdyServer.java rename to src/main/java/com/squareup/okhttp/internal/net/spdy/SpdyServer.java index d2ad4ec63..63273b9bf 100644 --- a/src/main/java/libcore/net/spdy/SpdyServer.java +++ b/src/main/java/com/squareup/okhttp/internal/net/spdy/SpdyServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.net.spdy; +package com.squareup.okhttp.internal.net.spdy; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/libcore/net/spdy/SpdyStream.java b/src/main/java/com/squareup/okhttp/internal/net/spdy/SpdyStream.java similarity index 99% rename from src/main/java/libcore/net/spdy/SpdyStream.java rename to src/main/java/com/squareup/okhttp/internal/net/spdy/SpdyStream.java index 2e336dec2..725509f5b 100644 --- a/src/main/java/libcore/net/spdy/SpdyStream.java +++ b/src/main/java/com/squareup/okhttp/internal/net/spdy/SpdyStream.java @@ -14,17 +14,16 @@ * limitations under the License. */ -package libcore.net.spdy; +package com.squareup.okhttp.internal.net.spdy; +import com.squareup.okhttp.internal.io.Streams; +import com.squareup.okhttp.internal.util.Libcore; import java.io.IOException; import java.io.InputStream; import java.io.InterruptedIOException; import java.io.OutputStream; -import java.util.List; -import libcore.io.Streams; -import libcore.util.Libcore; - import static java.nio.ByteOrder.BIG_ENDIAN; +import java.util.List; /** * A logical bidirectional stream. diff --git a/src/main/java/libcore/net/spdy/SpdyWriter.java b/src/main/java/com/squareup/okhttp/internal/net/spdy/SpdyWriter.java similarity index 98% rename from src/main/java/libcore/net/spdy/SpdyWriter.java rename to src/main/java/com/squareup/okhttp/internal/net/spdy/SpdyWriter.java index cc0f66ec0..281c3e66c 100644 --- a/src/main/java/libcore/net/spdy/SpdyWriter.java +++ b/src/main/java/com/squareup/okhttp/internal/net/spdy/SpdyWriter.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package libcore.net.spdy; +package com.squareup.okhttp.internal.net.spdy; +import com.squareup.okhttp.internal.Platform; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.IOException; import java.io.OutputStream; import java.util.List; import java.util.zip.Deflater; -import libcore.Platform; /** * Write version 2 SPDY frames. diff --git a/src/main/java/libcore/net/spdy/Threads.java b/src/main/java/com/squareup/okhttp/internal/net/spdy/Threads.java similarity index 95% rename from src/main/java/libcore/net/spdy/Threads.java rename to src/main/java/com/squareup/okhttp/internal/net/spdy/Threads.java index 9e257f3b3..c7e577045 100644 --- a/src/main/java/libcore/net/spdy/Threads.java +++ b/src/main/java/com/squareup/okhttp/internal/net/spdy/Threads.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.net.spdy; +package com.squareup.okhttp.internal.net.spdy; import java.util.concurrent.ThreadFactory; diff --git a/src/main/java/libcore/util/BasicLruCache.java b/src/main/java/com/squareup/okhttp/internal/util/BasicLruCache.java similarity index 98% rename from src/main/java/libcore/util/BasicLruCache.java rename to src/main/java/com/squareup/okhttp/internal/util/BasicLruCache.java index b5f6fdf47..75c571225 100644 --- a/src/main/java/libcore/util/BasicLruCache.java +++ b/src/main/java/com/squareup/okhttp/internal/util/BasicLruCache.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.util; +package com.squareup.okhttp.internal.util; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/libcore/util/Charsets.java b/src/main/java/com/squareup/okhttp/internal/util/Charsets.java similarity index 97% rename from src/main/java/libcore/util/Charsets.java rename to src/main/java/com/squareup/okhttp/internal/util/Charsets.java index 95848ee45..4e430ef2a 100644 --- a/src/main/java/libcore/util/Charsets.java +++ b/src/main/java/com/squareup/okhttp/internal/util/Charsets.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.util; +package com.squareup.okhttp.internal.util; import java.nio.charset.Charset; diff --git a/src/main/java/libcore/util/CollectionUtils.java b/src/main/java/com/squareup/okhttp/internal/util/CollectionUtils.java similarity index 98% rename from src/main/java/libcore/util/CollectionUtils.java rename to src/main/java/com/squareup/okhttp/internal/util/CollectionUtils.java index 45edf4f89..e481da383 100644 --- a/src/main/java/libcore/util/CollectionUtils.java +++ b/src/main/java/com/squareup/okhttp/internal/util/CollectionUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.util; +package com.squareup.okhttp.internal.util; import java.lang.ref.Reference; import java.util.Collections; diff --git a/src/main/java/libcore/util/DefaultFileNameMap.java b/src/main/java/com/squareup/okhttp/internal/util/DefaultFileNameMap.java similarity index 87% rename from src/main/java/libcore/util/DefaultFileNameMap.java rename to src/main/java/com/squareup/okhttp/internal/util/DefaultFileNameMap.java index e817a72fb..9b95233c6 100644 --- a/src/main/java/libcore/util/DefaultFileNameMap.java +++ b/src/main/java/com/squareup/okhttp/internal/util/DefaultFileNameMap.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package libcore.util; +package com.squareup.okhttp.internal.util; +import com.squareup.okhttp.internal.net.MimeUtils; import java.net.FileNameMap; import java.util.Locale; -import libcore.net.MimeUtils; /** - * Implements {@link java.net.FileNameMap} in terms of {@link libcore.net.MimeUtils}. + * Implements {@link java.net.FileNameMap} in terms of + * {@link com.squareup.okhttp.internal.net.MimeUtils}. */ class DefaultFileNameMap implements FileNameMap { public String getContentTypeFor(String filename) { diff --git a/src/main/java/libcore/util/EmptyArray.java b/src/main/java/com/squareup/okhttp/internal/util/EmptyArray.java similarity index 96% rename from src/main/java/libcore/util/EmptyArray.java rename to src/main/java/com/squareup/okhttp/internal/util/EmptyArray.java index 0f919c50c..2f12e1a2d 100644 --- a/src/main/java/libcore/util/EmptyArray.java +++ b/src/main/java/com/squareup/okhttp/internal/util/EmptyArray.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.util; +package com.squareup.okhttp.internal.util; public final class EmptyArray { private EmptyArray() { diff --git a/src/main/java/libcore/util/ExtendedResponseCache.java b/src/main/java/com/squareup/okhttp/internal/util/ExtendedResponseCache.java similarity index 97% rename from src/main/java/libcore/util/ExtendedResponseCache.java rename to src/main/java/com/squareup/okhttp/internal/util/ExtendedResponseCache.java index 75e51579a..dbe492dae 100644 --- a/src/main/java/libcore/util/ExtendedResponseCache.java +++ b/src/main/java/com/squareup/okhttp/internal/util/ExtendedResponseCache.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.util; +package com.squareup.okhttp.internal.util; import java.io.IOException; import java.net.CacheResponse; diff --git a/src/main/java/libcore/util/IntegralToString.java b/src/main/java/com/squareup/okhttp/internal/util/IntegralToString.java similarity index 98% rename from src/main/java/libcore/util/IntegralToString.java rename to src/main/java/com/squareup/okhttp/internal/util/IntegralToString.java index 1b66e510c..839f8237d 100644 --- a/src/main/java/libcore/util/IntegralToString.java +++ b/src/main/java/com/squareup/okhttp/internal/util/IntegralToString.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.util; +package com.squareup.okhttp.internal.util; /** * Converts integral types to strings. This class is public but hidden so that it can also be diff --git a/src/main/java/libcore/util/Libcore.java b/src/main/java/com/squareup/okhttp/internal/util/Libcore.java similarity index 98% rename from src/main/java/libcore/util/Libcore.java rename to src/main/java/com/squareup/okhttp/internal/util/Libcore.java index 808933bab..f3a92ba5d 100644 --- a/src/main/java/libcore/util/Libcore.java +++ b/src/main/java/com/squareup/okhttp/internal/util/Libcore.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.util; +package com.squareup.okhttp.internal.util; import java.io.File; import java.io.IOException; diff --git a/src/main/java/libcore/util/MutableBoolean.java b/src/main/java/com/squareup/okhttp/internal/util/MutableBoolean.java similarity index 94% rename from src/main/java/libcore/util/MutableBoolean.java rename to src/main/java/com/squareup/okhttp/internal/util/MutableBoolean.java index 359a8f90e..8cabec434 100644 --- a/src/main/java/libcore/util/MutableBoolean.java +++ b/src/main/java/com/squareup/okhttp/internal/util/MutableBoolean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.util; +package com.squareup.okhttp.internal.util; public final class MutableBoolean { public boolean value; diff --git a/src/main/java/libcore/util/MutableByte.java b/src/main/java/com/squareup/okhttp/internal/util/MutableByte.java similarity index 94% rename from src/main/java/libcore/util/MutableByte.java rename to src/main/java/com/squareup/okhttp/internal/util/MutableByte.java index 13f780b3d..73b576dbf 100644 --- a/src/main/java/libcore/util/MutableByte.java +++ b/src/main/java/com/squareup/okhttp/internal/util/MutableByte.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.util; +package com.squareup.okhttp.internal.util; public final class MutableByte { public byte value; diff --git a/src/main/java/libcore/util/MutableChar.java b/src/main/java/com/squareup/okhttp/internal/util/MutableChar.java similarity index 94% rename from src/main/java/libcore/util/MutableChar.java rename to src/main/java/com/squareup/okhttp/internal/util/MutableChar.java index 1cafc3cd4..0960f5b8a 100644 --- a/src/main/java/libcore/util/MutableChar.java +++ b/src/main/java/com/squareup/okhttp/internal/util/MutableChar.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.util; +package com.squareup.okhttp.internal.util; public final class MutableChar { public char value; diff --git a/src/main/java/libcore/util/MutableDouble.java b/src/main/java/com/squareup/okhttp/internal/util/MutableDouble.java similarity index 94% rename from src/main/java/libcore/util/MutableDouble.java rename to src/main/java/com/squareup/okhttp/internal/util/MutableDouble.java index 4473ae61c..d66ef7b82 100644 --- a/src/main/java/libcore/util/MutableDouble.java +++ b/src/main/java/com/squareup/okhttp/internal/util/MutableDouble.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.util; +package com.squareup.okhttp.internal.util; public final class MutableDouble { public double value; diff --git a/src/main/java/libcore/util/MutableFloat.java b/src/main/java/com/squareup/okhttp/internal/util/MutableFloat.java similarity index 94% rename from src/main/java/libcore/util/MutableFloat.java rename to src/main/java/com/squareup/okhttp/internal/util/MutableFloat.java index f81fba534..5453a59b5 100644 --- a/src/main/java/libcore/util/MutableFloat.java +++ b/src/main/java/com/squareup/okhttp/internal/util/MutableFloat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.util; +package com.squareup.okhttp.internal.util; public final class MutableFloat { public float value; diff --git a/src/main/java/libcore/util/MutableInt.java b/src/main/java/com/squareup/okhttp/internal/util/MutableInt.java similarity index 94% rename from src/main/java/libcore/util/MutableInt.java rename to src/main/java/com/squareup/okhttp/internal/util/MutableInt.java index c8feb3aee..678dba4d4 100644 --- a/src/main/java/libcore/util/MutableInt.java +++ b/src/main/java/com/squareup/okhttp/internal/util/MutableInt.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.util; +package com.squareup.okhttp.internal.util; public final class MutableInt { public int value; diff --git a/src/main/java/libcore/util/MutableLong.java b/src/main/java/com/squareup/okhttp/internal/util/MutableLong.java similarity index 94% rename from src/main/java/libcore/util/MutableLong.java rename to src/main/java/com/squareup/okhttp/internal/util/MutableLong.java index ad9b78e95..b46c38af0 100644 --- a/src/main/java/libcore/util/MutableLong.java +++ b/src/main/java/com/squareup/okhttp/internal/util/MutableLong.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.util; +package com.squareup.okhttp.internal.util; public final class MutableLong { public long value; diff --git a/src/main/java/libcore/util/MutableShort.java b/src/main/java/com/squareup/okhttp/internal/util/MutableShort.java similarity index 94% rename from src/main/java/libcore/util/MutableShort.java rename to src/main/java/com/squareup/okhttp/internal/util/MutableShort.java index 78b4c33db..b2521d58d 100644 --- a/src/main/java/libcore/util/MutableShort.java +++ b/src/main/java/com/squareup/okhttp/internal/util/MutableShort.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.util; +package com.squareup.okhttp.internal.util; public final class MutableShort { public short value; diff --git a/src/main/java/libcore/util/Objects.java b/src/main/java/com/squareup/okhttp/internal/util/Objects.java similarity index 95% rename from src/main/java/libcore/util/Objects.java rename to src/main/java/com/squareup/okhttp/internal/util/Objects.java index 050888d4a..96da7a637 100644 --- a/src/main/java/libcore/util/Objects.java +++ b/src/main/java/com/squareup/okhttp/internal/util/Objects.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.util; +package com.squareup.okhttp.internal.util; public final class Objects { private Objects() { diff --git a/src/main/java/libcore/util/ResponseSource.java b/src/main/java/com/squareup/okhttp/internal/util/ResponseSource.java similarity index 96% rename from src/main/java/libcore/util/ResponseSource.java rename to src/main/java/com/squareup/okhttp/internal/util/ResponseSource.java index 8e7bfae5c..9dd767824 100644 --- a/src/main/java/libcore/util/ResponseSource.java +++ b/src/main/java/com/squareup/okhttp/internal/util/ResponseSource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.util; +package com.squareup.okhttp.internal.util; /** * Where the HTTP client should look for a response. diff --git a/src/main/java/libcore/util/SneakyThrow.java b/src/main/java/com/squareup/okhttp/internal/util/SneakyThrow.java similarity index 98% rename from src/main/java/libcore/util/SneakyThrow.java rename to src/main/java/com/squareup/okhttp/internal/util/SneakyThrow.java index f5c077cec..391c56fb5 100644 --- a/src/main/java/libcore/util/SneakyThrow.java +++ b/src/main/java/com/squareup/okhttp/internal/util/SneakyThrow.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package libcore.util; +package com.squareup.okhttp.internal.util; /** * Exploits a weakness in the runtime to throw an arbitrary throwable without diff --git a/src/test/java/libcore/io/DiskLruCacheTest.java b/src/test/java/com/squareup/okhttp/internal/io/DiskLruCacheTest.java similarity index 99% rename from src/test/java/libcore/io/DiskLruCacheTest.java rename to src/test/java/com/squareup/okhttp/internal/io/DiskLruCacheTest.java index 87b3e8e43..7375be0f6 100644 --- a/src/test/java/libcore/io/DiskLruCacheTest.java +++ b/src/test/java/com/squareup/okhttp/internal/io/DiskLruCacheTest.java @@ -14,8 +14,11 @@ * limitations under the License. */ -package libcore.io; +package com.squareup.okhttp.internal.io; +import static com.squareup.okhttp.internal.io.DiskLruCache.JOURNAL_FILE; +import static com.squareup.okhttp.internal.io.DiskLruCache.MAGIC; +import static com.squareup.okhttp.internal.io.DiskLruCache.VERSION_1; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -29,10 +32,6 @@ import java.util.Arrays; import java.util.List; import junit.framework.TestCase; -import static libcore.io.DiskLruCache.JOURNAL_FILE; -import static libcore.io.DiskLruCache.MAGIC; -import static libcore.io.DiskLruCache.VERSION_1; - public final class DiskLruCacheTest extends TestCase { private final int appVersion = 100; private String javaTmpDir; diff --git a/src/test/java/libcore/io/StrictLineReaderTest.java b/src/test/java/com/squareup/okhttp/internal/io/StrictLineReaderTest.java similarity index 97% rename from src/test/java/libcore/io/StrictLineReaderTest.java rename to src/test/java/com/squareup/okhttp/internal/io/StrictLineReaderTest.java index 2b9e95ed0..b7e2b2015 100644 --- a/src/test/java/libcore/io/StrictLineReaderTest.java +++ b/src/test/java/com/squareup/okhttp/internal/io/StrictLineReaderTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package libcore.io; +package com.squareup.okhttp.internal.io; +import com.squareup.okhttp.internal.util.Charsets; import java.io.ByteArrayInputStream; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; import junit.framework.TestCase; -import libcore.util.Charsets; public class StrictLineReaderTest extends TestCase { diff --git a/src/test/java/libcore/net/http/ExternalSpdyExample.java b/src/test/java/com/squareup/okhttp/internal/net/http/ExternalSpdyExample.java similarity index 97% rename from src/test/java/libcore/net/http/ExternalSpdyExample.java rename to src/test/java/com/squareup/okhttp/internal/net/http/ExternalSpdyExample.java index 70a4c07c5..4624b9d08 100644 --- a/src/test/java/libcore/net/http/ExternalSpdyExample.java +++ b/src/test/java/com/squareup/okhttp/internal/net/http/ExternalSpdyExample.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; import com.squareup.okhttp.OkHttpClient; import java.io.BufferedReader; diff --git a/src/test/java/libcore/net/http/HttpResponseCacheTest.java b/src/test/java/com/squareup/okhttp/internal/net/http/HttpResponseCacheTest.java similarity index 99% rename from src/test/java/libcore/net/http/HttpResponseCacheTest.java rename to src/test/java/com/squareup/okhttp/internal/net/http/HttpResponseCacheTest.java index d9eb91850..828ff9245 100644 --- a/src/test/java/libcore/net/http/HttpResponseCacheTest.java +++ b/src/test/java/com/squareup/okhttp/internal/net/http/HttpResponseCacheTest.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; import com.google.mockwebserver.MockResponse; import com.google.mockwebserver.MockWebServer; import com.google.mockwebserver.RecordedRequest; +import static com.google.mockwebserver.SocketPolicy.DISCONNECT_AT_END; import com.squareup.okhttp.OkHttpClient; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; @@ -58,8 +59,6 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.zip.GZIPOutputStream; import junit.framework.TestCase; -import static com.google.mockwebserver.SocketPolicy.DISCONNECT_AT_END; - /** * Android's HttpResponseCacheTest. */ diff --git a/src/test/java/libcore/net/http/NewURLConnectionTest.java b/src/test/java/com/squareup/okhttp/internal/net/http/NewURLConnectionTest.java similarity index 96% rename from src/test/java/libcore/net/http/NewURLConnectionTest.java rename to src/test/java/com/squareup/okhttp/internal/net/http/NewURLConnectionTest.java index 8c6121e15..183d15d56 100644 --- a/src/test/java/libcore/net/http/NewURLConnectionTest.java +++ b/src/test/java/com/squareup/okhttp/internal/net/http/NewURLConnectionTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; import junit.framework.TestCase; diff --git a/src/test/java/libcore/net/http/RawHeadersTest.java b/src/test/java/com/squareup/okhttp/internal/net/http/RawHeadersTest.java similarity index 98% rename from src/test/java/libcore/net/http/RawHeadersTest.java rename to src/test/java/com/squareup/okhttp/internal/net/http/RawHeadersTest.java index 34f098527..285476773 100644 --- a/src/test/java/libcore/net/http/RawHeadersTest.java +++ b/src/test/java/com/squareup/okhttp/internal/net/http/RawHeadersTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; import java.util.Arrays; import java.util.List; diff --git a/src/test/java/libcore/net/http/RouteSelectorTest.java b/src/test/java/com/squareup/okhttp/internal/net/http/RouteSelectorTest.java similarity index 97% rename from src/test/java/libcore/net/http/RouteSelectorTest.java rename to src/test/java/com/squareup/okhttp/internal/net/http/RouteSelectorTest.java index 90baca178..e0514621e 100644 --- a/src/test/java/libcore/net/http/RouteSelectorTest.java +++ b/src/test/java/com/squareup/okhttp/internal/net/http/RouteSelectorTest.java @@ -13,8 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; +import com.squareup.okhttp.internal.net.Dns; +import static com.squareup.okhttp.internal.net.http.HttpConnection.TLS_MODE_AGGRESSIVE; +import static com.squareup.okhttp.internal.net.http.HttpConnection.TLS_MODE_COMPATIBLE; +import com.squareup.okhttp.internal.net.ssl.SslContextBuilder; import java.io.IOException; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -32,10 +36,6 @@ import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocketFactory; import junit.framework.TestCase; -import libcore.net.Dns; -import static libcore.net.http.HttpConnection.TLS_MODE_AGGRESSIVE; -import static libcore.net.http.HttpConnection.TLS_MODE_COMPATIBLE; -import libcore.net.ssl.SslContextBuilder; public final class RouteSelectorTest extends TestCase { private static final int proxyAPort = 1001; diff --git a/src/test/java/libcore/net/http/URLConnectionTest.java b/src/test/java/com/squareup/okhttp/internal/net/http/URLConnectionTest.java similarity index 99% rename from src/test/java/libcore/net/http/URLConnectionTest.java rename to src/test/java/com/squareup/okhttp/internal/net/http/URLConnectionTest.java index 476e4aff8..ae7a91617 100644 --- a/src/test/java/libcore/net/http/URLConnectionTest.java +++ b/src/test/java/com/squareup/okhttp/internal/net/http/URLConnectionTest.java @@ -14,13 +14,18 @@ * limitations under the License. */ -package libcore.net.http; +package com.squareup.okhttp.internal.net.http; import com.google.mockwebserver.MockResponse; import com.google.mockwebserver.MockWebServer; import com.google.mockwebserver.RecordedRequest; import com.google.mockwebserver.SocketPolicy; +import static com.google.mockwebserver.SocketPolicy.DISCONNECT_AT_END; +import static com.google.mockwebserver.SocketPolicy.DISCONNECT_AT_START; +import static com.google.mockwebserver.SocketPolicy.SHUTDOWN_INPUT_AT_END; +import static com.google.mockwebserver.SocketPolicy.SHUTDOWN_OUTPUT_AT_END; import com.squareup.okhttp.OkHttpClient; +import com.squareup.okhttp.internal.net.ssl.SslContextBuilder; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -69,12 +74,6 @@ import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.X509TrustManager; import junit.framework.TestCase; -import libcore.net.ssl.SslContextBuilder; - -import static com.google.mockwebserver.SocketPolicy.DISCONNECT_AT_END; -import static com.google.mockwebserver.SocketPolicy.DISCONNECT_AT_START; -import static com.google.mockwebserver.SocketPolicy.SHUTDOWN_INPUT_AT_END; -import static com.google.mockwebserver.SocketPolicy.SHUTDOWN_OUTPUT_AT_END; /** * Android's URLConnectionTest. diff --git a/src/test/java/libcore/net/spdy/MockSpdyPeer.java b/src/test/java/com/squareup/okhttp/internal/net/spdy/MockSpdyPeer.java similarity index 98% rename from src/test/java/libcore/net/spdy/MockSpdyPeer.java rename to src/test/java/com/squareup/okhttp/internal/net/spdy/MockSpdyPeer.java index 0eb82088a..f3dc3d07b 100644 --- a/src/test/java/libcore/net/spdy/MockSpdyPeer.java +++ b/src/test/java/com/squareup/okhttp/internal/net/spdy/MockSpdyPeer.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package libcore.net.spdy; +package com.squareup.okhttp.internal.net.spdy; +import com.squareup.okhttp.internal.io.Streams; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -29,7 +30,6 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.Executor; import java.util.concurrent.Executors; import java.util.concurrent.LinkedBlockingQueue; -import libcore.io.Streams; /** * Replays prerecorded outgoing frames and records incoming frames. diff --git a/src/test/java/libcore/net/spdy/SettingsTest.java b/src/test/java/com/squareup/okhttp/internal/net/spdy/SettingsTest.java similarity index 91% rename from src/test/java/libcore/net/spdy/SettingsTest.java rename to src/test/java/com/squareup/okhttp/internal/net/spdy/SettingsTest.java index fe479cfff..f0c83a741 100644 --- a/src/test/java/libcore/net/spdy/SettingsTest.java +++ b/src/test/java/com/squareup/okhttp/internal/net/spdy/SettingsTest.java @@ -13,17 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package libcore.net.spdy; +package com.squareup.okhttp.internal.net.spdy; +import static com.squareup.okhttp.internal.net.spdy.Settings.DOWNLOAD_BANDWIDTH; +import static com.squareup.okhttp.internal.net.spdy.Settings.DOWNLOAD_RETRANS_RATE; +import static com.squareup.okhttp.internal.net.spdy.Settings.MAX_CONCURRENT_STREAMS; +import static com.squareup.okhttp.internal.net.spdy.Settings.PERSISTED; +import static com.squareup.okhttp.internal.net.spdy.Settings.PERSIST_VALUE; +import static com.squareup.okhttp.internal.net.spdy.Settings.UPLOAD_BANDWIDTH; import junit.framework.TestCase; -import static libcore.net.spdy.Settings.DOWNLOAD_BANDWIDTH; -import static libcore.net.spdy.Settings.DOWNLOAD_RETRANS_RATE; -import static libcore.net.spdy.Settings.MAX_CONCURRENT_STREAMS; -import static libcore.net.spdy.Settings.PERSISTED; -import static libcore.net.spdy.Settings.PERSIST_VALUE; -import static libcore.net.spdy.Settings.UPLOAD_BANDWIDTH; - public final class SettingsTest extends TestCase { public void testUnsetField() { Settings settings = new Settings(); diff --git a/src/test/java/libcore/net/spdy/SpdyConnectionTest.java b/src/test/java/com/squareup/okhttp/internal/net/spdy/SpdyConnectionTest.java similarity index 96% rename from src/test/java/libcore/net/spdy/SpdyConnectionTest.java rename to src/test/java/com/squareup/okhttp/internal/net/spdy/SpdyConnectionTest.java index 400959993..9d1b1d1e5 100644 --- a/src/test/java/libcore/net/spdy/SpdyConnectionTest.java +++ b/src/test/java/com/squareup/okhttp/internal/net/spdy/SpdyConnectionTest.java @@ -14,8 +14,18 @@ * limitations under the License. */ -package libcore.net.spdy; +package com.squareup.okhttp.internal.net.spdy; +import static com.squareup.okhttp.internal.net.spdy.Settings.PERSIST_VALUE; +import static com.squareup.okhttp.internal.net.spdy.SpdyConnection.FLAG_FIN; +import static com.squareup.okhttp.internal.net.spdy.SpdyConnection.TYPE_DATA; +import static com.squareup.okhttp.internal.net.spdy.SpdyConnection.TYPE_NOOP; +import static com.squareup.okhttp.internal.net.spdy.SpdyConnection.TYPE_PING; +import static com.squareup.okhttp.internal.net.spdy.SpdyConnection.TYPE_RST_STREAM; +import static com.squareup.okhttp.internal.net.spdy.SpdyConnection.TYPE_SYN_REPLY; +import static com.squareup.okhttp.internal.net.spdy.SpdyConnection.TYPE_SYN_STREAM; +import static com.squareup.okhttp.internal.net.spdy.SpdyStream.RST_INVALID_STREAM; +import static com.squareup.okhttp.internal.util.Charsets.UTF_8; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; @@ -25,17 +35,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import junit.framework.TestCase; -import static libcore.net.spdy.Settings.PERSIST_VALUE; -import static libcore.net.spdy.SpdyConnection.FLAG_FIN; -import static libcore.net.spdy.SpdyConnection.TYPE_DATA; -import static libcore.net.spdy.SpdyConnection.TYPE_NOOP; -import static libcore.net.spdy.SpdyConnection.TYPE_PING; -import static libcore.net.spdy.SpdyConnection.TYPE_RST_STREAM; -import static libcore.net.spdy.SpdyConnection.TYPE_SYN_REPLY; -import static libcore.net.spdy.SpdyConnection.TYPE_SYN_STREAM; -import static libcore.net.spdy.SpdyStream.RST_INVALID_STREAM; -import static libcore.util.Charsets.UTF_8; - public final class SpdyConnectionTest extends TestCase { private static final IncomingStreamHandler REJECT_INCOMING_STREAMS = new IncomingStreamHandler() { diff --git a/src/test/java/libcore/net/ssl/SslContextBuilder.java b/src/test/java/com/squareup/okhttp/internal/net/ssl/SslContextBuilder.java similarity index 99% rename from src/test/java/libcore/net/ssl/SslContextBuilder.java rename to src/test/java/com/squareup/okhttp/internal/net/ssl/SslContextBuilder.java index d88ca9c92..09dba8de9 100644 --- a/src/test/java/libcore/net/ssl/SslContextBuilder.java +++ b/src/test/java/com/squareup/okhttp/internal/net/ssl/SslContextBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package libcore.net.ssl; +package com.squareup.okhttp.internal.net.ssl; import java.io.IOException; import java.io.InputStream;