Merge pull request square#149 from square/jw/package-move

Move packages.
wolf9s · Feb 19, 2013 · 49c9c02 · 49c9c02
2 parents 9388669 + 81a1b3b
commit 49c9c02
Show file tree

Hide file tree

Showing 24 changed files with 33 additions and 33 deletions.
diff --git a/retrofit/src/main/java/retrofit/http/Converter.java b/retrofit/src/main/java/retrofit/http/Converter.java
@@ -2,8 +2,8 @@
 package retrofit.http;
 
 import java.lang.reflect.Type;
-import retrofit.io.TypedInput;
-import retrofit.io.TypedOutput;
+import retrofit.http.mime.TypedInput;
+import retrofit.http.mime.TypedOutput;
 
 /**
  * Arbiter for converting objects to and from their representation in HTTP.

diff --git a/retrofit/src/main/java/retrofit/http/GsonConverter.java b/retrofit/src/main/java/retrofit/http/GsonConverter.java
@@ -8,8 +8,8 @@
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Type;
-import retrofit.io.TypedInput;
-import retrofit.io.TypedOutput;
+import retrofit.http.mime.TypedInput;
+import retrofit.http.mime.TypedOutput;
 
 import static retrofit.http.RestAdapter.UTF_8;
 

diff --git a/retrofit/src/main/java/retrofit/http/Platform.java b/retrofit/src/main/java/retrofit/http/Platform.java
@@ -7,8 +7,8 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
 import javax.inject.Provider;
-import retrofit.android.AndroidApacheClient;
-import retrofit.android.MainThreadExecutor;
+import retrofit.http.android.AndroidApacheClient;
+import retrofit.http.android.MainThreadExecutor;
 import retrofit.http.client.ApacheClient;
 import retrofit.http.client.Client;
 

diff --git a/retrofit/src/main/java/retrofit/http/RequestBuilder.java b/retrofit/src/main/java/retrofit/http/RequestBuilder.java
@@ -10,8 +10,8 @@
 import java.util.Map;
 import java.util.Set;
 import retrofit.http.client.Request;
-import retrofit.io.TypedOutput;
-import retrofit.io.TypedString;
+import retrofit.http.mime.TypedOutput;
+import retrofit.http.mime.TypedString;
 
 import static retrofit.http.RestAdapter.UTF_8;
 import static retrofit.http.RestMethodInfo.NO_SINGLE_ENTITY;

diff --git a/retrofit/src/main/java/retrofit/http/RestAdapter.java b/retrofit/src/main/java/retrofit/http/RestAdapter.java
@@ -20,9 +20,9 @@
 import retrofit.http.client.Client;
 import retrofit.http.client.Request;
 import retrofit.http.client.Response;
-import retrofit.io.TypedByteArray;
-import retrofit.io.TypedInput;
-import retrofit.io.TypedOutput;
+import retrofit.http.mime.TypedByteArray;
+import retrofit.http.mime.TypedInput;
+import retrofit.http.mime.TypedOutput;
 
 import static retrofit.http.Utils.SynchronousExecutor;
 

diff --git a/retrofit/src/main/java/retrofit/http/RestMethodInfo.java b/retrofit/src/main/java/retrofit/http/RestMethodInfo.java
@@ -11,7 +11,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.inject.Named;
-import retrofit.io.TypedOutput;
+import retrofit.http.mime.TypedOutput;
 
 /** Cached details about an interface method. */
 final class RestMethodInfo {

diff --git a/retrofit/src/main/java/retrofit/http/RetrofitError.java b/retrofit/src/main/java/retrofit/http/RetrofitError.java
@@ -4,7 +4,7 @@
 import java.io.IOException;
 import java.lang.reflect.Type;
 import retrofit.http.client.Response;
-import retrofit.io.TypedInput;
+import retrofit.http.mime.TypedInput;
 
 public class RetrofitError extends RuntimeException {
   static RetrofitError networkError(String url, IOException exception) {

diff --git a/...retrofit/android/AndroidApacheClient.java → ...fit/http/android/AndroidApacheClient.java b/...retrofit/android/AndroidApacheClient.java → ...fit/http/android/AndroidApacheClient.java
@@ -1,5 +1,5 @@
 // Copyright 2013 Square, Inc.
-package retrofit.android;
+package retrofit.http.android;
 
 import android.net.http.AndroidHttpClient;
 import retrofit.http.client.ApacheClient;

diff --git a/.../retrofit/android/MainThreadExecutor.java → ...ofit/http/android/MainThreadExecutor.java b/.../retrofit/android/MainThreadExecutor.java → ...ofit/http/android/MainThreadExecutor.java
@@ -1,5 +1,5 @@
 // Copyright 2012 Square, Inc.
-package retrofit.android;
+package retrofit.http.android;
 
 import android.os.Handler;
 import android.os.Looper;

diff --git a/retrofit/src/main/java/retrofit/http/client/ApacheClient.java b/retrofit/src/main/java/retrofit/http/client/ApacheClient.java
@@ -24,8 +24,8 @@
 import org.apache.http.message.BasicHeader;
 import org.apache.http.util.EntityUtils;
 import retrofit.http.Header;
-import retrofit.io.TypedByteArray;
-import retrofit.io.TypedOutput;
+import retrofit.http.mime.TypedByteArray;
+import retrofit.http.mime.TypedOutput;
 
 import static org.apache.http.entity.mime.HttpMultipartMode.BROWSER_COMPATIBLE;
 

diff --git a/retrofit/src/main/java/retrofit/http/client/Request.java b/retrofit/src/main/java/retrofit/http/client/Request.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import java.util.Map;
 import retrofit.http.Header;
-import retrofit.io.TypedOutput;
+import retrofit.http.mime.TypedOutput;
 
 /** Encapsulates all of the information necessary to make an HTTP request. */
 public final class Request {

diff --git a/retrofit/src/main/java/retrofit/http/client/Response.java b/retrofit/src/main/java/retrofit/http/client/Response.java
@@ -5,7 +5,7 @@
 import java.util.Collections;
 import java.util.List;
 import retrofit.http.Header;
-import retrofit.io.TypedInput;
+import retrofit.http.mime.TypedInput;
 
 /** An HTTP response. */
 public final class Response {

diff --git a/retrofit/src/main/java/retrofit/http/client/TypedInputStream.java b/retrofit/src/main/java/retrofit/http/client/TypedInputStream.java
@@ -3,7 +3,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import retrofit.io.TypedInput;
+import retrofit.http.mime.TypedInput;
 
 public class TypedInputStream implements TypedInput {
 

diff --git a/...main/java/retrofit/io/TypedByteArray.java → ...va/retrofit/http/mime/TypedByteArray.java b/...main/java/retrofit/io/TypedByteArray.java → ...va/retrofit/http/mime/TypedByteArray.java
@@ -1,5 +1,5 @@
 // Copyright 2010 Square, Inc.
-package retrofit.io;
+package retrofit.http.mime;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

diff --git a/.../src/main/java/retrofit/io/TypedFile.java → ...in/java/retrofit/http/mime/TypedFile.java b/.../src/main/java/retrofit/io/TypedFile.java → ...in/java/retrofit/http/mime/TypedFile.java
@@ -1,5 +1,5 @@
 // Copyright 2010 Square, Inc.
-package retrofit.io;
+package retrofit.http.mime;
 
 import java.io.File;
 import java.io.FileInputStream;

diff --git a/...src/main/java/retrofit/io/TypedInput.java → ...n/java/retrofit/http/mime/TypedInput.java b/...src/main/java/retrofit/io/TypedInput.java → ...n/java/retrofit/http/mime/TypedInput.java
@@ -1,5 +1,5 @@
 // Copyright 2013 Square, Inc.
-package retrofit.io;
+package retrofit.http.mime;
 
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/...rc/main/java/retrofit/io/TypedOutput.java → .../java/retrofit/http/mime/TypedOutput.java b/...rc/main/java/retrofit/io/TypedOutput.java → .../java/retrofit/http/mime/TypedOutput.java
@@ -1,5 +1,5 @@
 // Copyright 2013 Square, Inc.
-package retrofit.io;
+package retrofit.http.mime;
 
 import java.io.IOException;
 import java.io.OutputStream;

diff --git a/...rc/main/java/retrofit/io/TypedString.java → .../java/retrofit/http/mime/TypedString.java b/...rc/main/java/retrofit/io/TypedString.java → .../java/retrofit/http/mime/TypedString.java
@@ -1,5 +1,5 @@
 // Copyright 2013 Square, Inc.
-package retrofit.io;
+package retrofit.http.mime;
 
 import java.io.UnsupportedEncodingException;
 

diff --git a/retrofit/src/test/java/retrofit/http/RequestBuilderTest.java b/retrofit/src/test/java/retrofit/http/RequestBuilderTest.java
@@ -12,8 +12,8 @@
 import java.util.Set;
 import org.junit.Test;
 import retrofit.http.client.Request;
-import retrofit.io.TypedString;
-import retrofit.io.TypedOutput;
+import retrofit.http.mime.TypedString;
+import retrofit.http.mime.TypedOutput;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;

diff --git a/retrofit/src/test/java/retrofit/http/RestAdapterTest.java b/retrofit/src/test/java/retrofit/http/RestAdapterTest.java
@@ -10,7 +10,7 @@
 import retrofit.http.client.Client;
 import retrofit.http.client.Request;
 import retrofit.http.client.Response;
-import retrofit.io.TypedString;
+import retrofit.http.mime.TypedString;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 import static org.fest.assertions.api.Assertions.fail;

diff --git a/retrofit/src/test/java/retrofit/http/RestMethodInfoTest.java b/retrofit/src/test/java/retrofit/http/RestMethodInfoTest.java
@@ -11,7 +11,7 @@
 import javax.inject.Named;
 import org.junit.Ignore;
 import org.junit.Test;
-import retrofit.io.TypedOutput;
+import retrofit.http.mime.TypedOutput;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

diff --git a/retrofit/src/test/java/retrofit/http/client/ApacheClientTest.java b/retrofit/src/test/java/retrofit/http/client/ApacheClientTest.java
@@ -17,8 +17,8 @@
 import org.apache.http.message.BasicStatusLine;
 import org.junit.Test;
 import retrofit.http.Header;
-import retrofit.io.TypedOutput;
-import retrofit.io.TypedString;
+import retrofit.http.mime.TypedOutput;
+import retrofit.http.mime.TypedString;
 
 import static org.fest.assertions.api.Assertions.assertThat;
 

diff --git a/.../java/retrofit/io/TypedByteArrayTest.java → ...etrofit/http/mime/TypedByteArrayTest.java b/.../java/retrofit/io/TypedByteArrayTest.java → ...etrofit/http/mime/TypedByteArrayTest.java
@@ -1,5 +1,5 @@
 // Copyright 2010 Square, Inc.
-package retrofit.io;
+package retrofit.http.mime;
 
 import org.junit.Test;
 

diff --git a/.../test/java/retrofit/io/TypedFileTest.java → ...ava/retrofit/http/mime/TypedFileTest.java b/.../test/java/retrofit/io/TypedFileTest.java → ...ava/retrofit/http/mime/TypedFileTest.java
@@ -1,5 +1,5 @@
 // Copyright 2010 Square, Inc.
-package retrofit.io;
+package retrofit.http.mime;
 
 import java.io.File;
 import java.io.FileOutputStream;