TFJ-559 migrate twitter4j.http.* to twitter4j.auth.*

twitter4j-core/src/main/java/twitter4j/AsyncTwitter.java

@@ -16,7 +16,7 @@
 package twitter4j;
 
 import twitter4j.api.*;
-import twitter4j.http.OAuthSupport;
+import twitter4j.auth.OAuthSupport;
 
 /**
  * @author Yusuke Yamamoto - yusuke at mac.com

twitter4j-core/src/main/java/twitter4j/AsyncTwitterFactory.java

@@ -16,12 +16,12 @@
 
 package twitter4j;
 
+import twitter4j.auth.AccessToken;
+import twitter4j.auth.Authorization;
+import twitter4j.auth.BasicAuthorization;
+import twitter4j.auth.OAuthAuthorization;
 import twitter4j.conf.Configuration;
 import twitter4j.conf.ConfigurationContext;
-import twitter4j.http.AccessToken;
-import twitter4j.http.Authorization;
-import twitter4j.http.BasicAuthorization;
-import twitter4j.http.OAuthAuthorization;
 
 
 /**
@@ -89,7 +89,7 @@ public AsyncTwitter getInstance(String screenName, String password) {
     /**
      * Returns a OAuth Authenticated instance.<br>
      * consumer key and consumer Secret must be provided by twitter4j.properties, or system properties.<br>
-     * Unlike {@link AsyncTwitter#setOAuthAccessToken(twitter4j.http.AccessToken)}, this factory method potentially returns a cached instance.
+     * Unlike {@link AsyncTwitter#setOAuthAccessToken(twitter4j.auth.AccessToken)}, this factory method potentially returns a cached instance.
      *
      * @param accessToken access token
      * @return an instance

twitter4j-core/src/main/java/twitter4j/AsyncTwitterImpl.java

@@ -16,10 +16,10 @@
 
 package twitter4j;
 
+import twitter4j.auth.AccessToken;
+import twitter4j.auth.Authorization;
+import twitter4j.auth.RequestToken;
 import twitter4j.conf.Configuration;
-import twitter4j.http.AccessToken;
-import twitter4j.http.Authorization;
-import twitter4j.http.RequestToken;
 import twitter4j.internal.async.Dispatcher;
 import twitter4j.internal.async.DispatcherFactory;
 

twitter4j-core/src/main/java/twitter4j/Twitter.java

@@ -16,7 +16,7 @@
 package twitter4j;
 
 import twitter4j.api.*;
-import twitter4j.http.OAuthSupport;
+import twitter4j.auth.OAuthSupport;
 
 /**
  * @author Yusuke Yamamoto - yusuke at mac.com

twitter4j-core/src/main/java/twitter4j/TwitterBase.java

@@ -15,8 +15,8 @@
  */
 package twitter4j;
 
+import twitter4j.auth.Authorization;
 import twitter4j.conf.Configuration;
-import twitter4j.http.Authorization;
 
 /**
  * @author Yusuke Yamamoto - yusuke at mac.com

twitter4j-core/src/main/java/twitter4j/TwitterBaseImpl.java

@@ -16,14 +16,14 @@
 
 package twitter4j;
 
+import twitter4j.auth.AccessToken;
+import twitter4j.auth.Authorization;
+import twitter4j.auth.BasicAuthorization;
+import twitter4j.auth.NullAuthorization;
+import twitter4j.auth.OAuthAuthorization;
+import twitter4j.auth.OAuthSupport;
+import twitter4j.auth.RequestToken;
 import twitter4j.conf.Configuration;
-import twitter4j.http.AccessToken;
-import twitter4j.http.Authorization;
-import twitter4j.http.BasicAuthorization;
-import twitter4j.http.NullAuthorization;
-import twitter4j.http.OAuthAuthorization;
-import twitter4j.http.OAuthSupport;
-import twitter4j.http.RequestToken;
 import twitter4j.internal.http.HttpClientWrapper;
 import twitter4j.internal.http.HttpResponse;
 import twitter4j.internal.http.HttpResponseEvent;

twitter4j-core/src/main/java/twitter4j/TwitterFactory.java

@@ -16,13 +16,13 @@
 
 package twitter4j;
 
+import twitter4j.auth.AccessToken;
+import twitter4j.auth.Authorization;
+import twitter4j.auth.AuthorizationFactory;
+import twitter4j.auth.BasicAuthorization;
+import twitter4j.auth.OAuthAuthorization;
 import twitter4j.conf.Configuration;
 import twitter4j.conf.ConfigurationContext;
-import twitter4j.http.AccessToken;
-import twitter4j.http.Authorization;
-import twitter4j.http.AuthorizationFactory;
-import twitter4j.http.BasicAuthorization;
-import twitter4j.http.OAuthAuthorization;
 
 /**
  * A factory class for Twitter.
@@ -76,7 +76,7 @@ public Twitter getInstance() {
     /**
      * Returns a OAuth Authenticated instance.<br>
      * consumer key and consumer Secret must be provided by twitter4j.properties, or system properties.<br>
-     * Unlike {@link Twitter#setOAuthAccessToken(twitter4j.http.AccessToken)}, this factory method potentially returns a cached instance.
+     * Unlike {@link Twitter#setOAuthAccessToken(twitter4j.auth.AccessToken)}, this factory method potentially returns a cached instance.
      *
      * @param accessToken access token
      * @return an instance

twitter4j-core/src/main/java/twitter4j/TwitterImpl.java

@@ -16,10 +16,10 @@
 
 package twitter4j;
 
+import twitter4j.auth.Authorization;
+import twitter4j.auth.AuthorizationFactory;
 import twitter4j.conf.Configuration;
 import twitter4j.conf.ConfigurationContext;
-import twitter4j.http.Authorization;
-import twitter4j.http.AuthorizationFactory;
 import twitter4j.internal.http.HttpParameter;
 import twitter4j.internal.http.HttpResponse;
 import twitter4j.internal.org.json.JSONException;

twitter4j-core/src/main/java/twitter4j/TwitterOAuthSupportBaseImpl.java

@@ -16,16 +16,16 @@
 
 package twitter4j;
 
+import twitter4j.auth.AccessToken;
+import twitter4j.auth.Authorization;
+import twitter4j.auth.AuthorizationFactory;
+import twitter4j.auth.BasicAuthorization;
+import twitter4j.auth.NullAuthorization;
+import twitter4j.auth.OAuthAuthorization;
+import twitter4j.auth.OAuthSupport;
+import twitter4j.auth.RequestToken;
 import twitter4j.conf.Configuration;
 import twitter4j.conf.ConfigurationContext;
-import twitter4j.http.AccessToken;
-import twitter4j.http.Authorization;
-import twitter4j.http.AuthorizationFactory;
-import twitter4j.http.BasicAuthorization;
-import twitter4j.http.NullAuthorization;
-import twitter4j.http.OAuthAuthorization;
-import twitter4j.http.OAuthSupport;
-import twitter4j.http.RequestToken;
 import twitter4j.internal.http.XAuthAuthorization;
 
 /**

twitter4j-core/src/main/java/twitter4j/TwitterStream.java

@@ -15,7 +15,7 @@
  */
 package twitter4j;
 
-import twitter4j.http.OAuthSupport;
+import twitter4j.auth.OAuthSupport;
 
 /**
  * @author Yusuke Yamamoto - yusuke at mac.com

twitter4j-core/src/main/java/twitter4j/TwitterStreamFactory.java

@@ -16,12 +16,12 @@
 
 package twitter4j;
 
+import twitter4j.auth.AccessToken;
+import twitter4j.auth.Authorization;
+import twitter4j.auth.BasicAuthorization;
+import twitter4j.auth.OAuthAuthorization;
 import twitter4j.conf.Configuration;
 import twitter4j.conf.ConfigurationContext;
-import twitter4j.http.AccessToken;
-import twitter4j.http.Authorization;
-import twitter4j.http.BasicAuthorization;
-import twitter4j.http.OAuthAuthorization;
 
 /**
  * A factory class for TwitterFactory.<br>
@@ -86,7 +86,7 @@ public TwitterStream getInstance(String screenName, String password) {
     /**
      * Returns a OAuth Authenticated instance.<br>
      * consumer key and consumer Secret must be provided by twitter4j.properties, or system properties.
-     * Unlike {@link TwitterStream#setOAuthAccessToken(twitter4j.http.AccessToken)}, this factory method potentially returns a cached instance.
+     * Unlike {@link TwitterStream#setOAuthAccessToken(twitter4j.auth.AccessToken)}, this factory method potentially returns a cached instance.
      *
      * @param accessToken access token
      * @return an instance

twitter4j-core/src/main/java/twitter4j/TwitterStreamImpl.java

@@ -16,9 +16,9 @@
 
 package twitter4j;
 
+import twitter4j.auth.Authorization;
 import twitter4j.conf.Configuration;
 import twitter4j.conf.ConfigurationContext;
-import twitter4j.http.Authorization;
 import twitter4j.internal.async.Dispatcher;
 import twitter4j.internal.async.DispatcherFactory;
 import twitter4j.internal.http.HttpClientWrapper;

twitter4j-core/src/main/java/twitter4j/http/AccessToken.java → twitter4j-core/src/main/java/twitter4j/auth/AccessToken.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j.http;
+package twitter4j.auth;
 
 import twitter4j.TwitterException;
 import twitter4j.internal.http.HttpResponse;

twitter4j-core/src/main/java/twitter4j/http/Authorization.java → twitter4j-core/src/main/java/twitter4j/auth/Authorization.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j.http;
+package twitter4j.auth;
 
 import twitter4j.internal.http.HttpRequest;
 

twitter4j-core/src/main/java/twitter4j/http/AuthorizationConfiguration.java → twitter4j-core/src/main/java/twitter4j/auth/AuthorizationConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j.http;
+package twitter4j.auth;
 
 /**
  * A static factory class for Authorization.

twitter4j-core/src/main/java/twitter4j/http/AuthorizationFactory.java → twitter4j-core/src/main/java/twitter4j/auth/AuthorizationFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j.http;
+package twitter4j.auth;
 
 import twitter4j.conf.Configuration;
 

twitter4j-core/src/main/java/twitter4j/http/BasicAuthorization.java → twitter4j-core/src/main/java/twitter4j/auth/BasicAuthorization.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j.http;
+package twitter4j.auth;
 
 import twitter4j.internal.http.BASE64Encoder;
 import twitter4j.internal.http.HttpRequest;

twitter4j-core/src/main/java/twitter4j/http/NullAuthorization.java → twitter4j-core/src/main/java/twitter4j/auth/NullAuthorization.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j.http;
+package twitter4j.auth;
 
 import twitter4j.internal.http.HttpRequest;
 

twitter4j-core/src/main/java/twitter4j/http/OAuthAuthorization.java → twitter4j-core/src/main/java/twitter4j/auth/OAuthAuthorization.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j.http;
+package twitter4j.auth;
 
 import twitter4j.TwitterException;
 import twitter4j.conf.Configuration;

twitter4j-core/src/main/java/twitter4j/http/OAuthSupport.java → twitter4j-core/src/main/java/twitter4j/auth/OAuthSupport.java

@@ -1,4 +1,4 @@
-package twitter4j.http;
+package twitter4j.auth;
 
 import twitter4j.TwitterException;
 

twitter4j-core/src/main/java/twitter4j/http/OAuthToken.java → twitter4j-core/src/main/java/twitter4j/auth/OAuthToken.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j.http;
+package twitter4j.auth;
 
 import twitter4j.TwitterException;
 import twitter4j.internal.http.HttpResponse;

twitter4j-core/src/main/java/twitter4j/http/RequestToken.java → twitter4j-core/src/main/java/twitter4j/auth/RequestToken.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j.http;
+package twitter4j.auth;
 
 import twitter4j.TwitterException;
 import twitter4j.conf.Configuration;

twitter4j-core/src/main/java/twitter4j/conf/Configuration.java

@@ -16,7 +16,7 @@
 
 package twitter4j.conf;
 
-import twitter4j.http.AuthorizationConfiguration;
+import twitter4j.auth.AuthorizationConfiguration;
 import twitter4j.internal.async.DispatcherConfiguration;
 import twitter4j.internal.http.HttpClientConfiguration;
 import twitter4j.internal.http.HttpClientWrapperConfiguration;

twitter4j-core/src/main/java/twitter4j/internal/http/HttpClientWrapper.java

@@ -17,8 +17,8 @@
 package twitter4j.internal.http;
 
 import twitter4j.TwitterException;
+import twitter4j.auth.Authorization;
 import twitter4j.conf.ConfigurationContext;
-import twitter4j.http.Authorization;
 
 import java.util.HashMap;
 import java.util.Map;

twitter4j-core/src/main/java/twitter4j/internal/http/HttpRequest.java

@@ -16,7 +16,7 @@
 
 package twitter4j.internal.http;
 
-import twitter4j.http.Authorization;
+import twitter4j.auth.Authorization;
 
 import java.util.Arrays;
 import java.util.Map;

twitter4j-core/src/main/java/twitter4j/internal/http/XAuthAuthorization.java

@@ -16,8 +16,8 @@
 
 package twitter4j.internal.http;
 
-import twitter4j.http.Authorization;
-import twitter4j.http.BasicAuthorization;
+import twitter4j.auth.Authorization;
+import twitter4j.auth.BasicAuthorization;
 
 /**
  * @author Yusuke Yamamoto - yusuke at mac.com

twitter4j-core/src/test/java/twitter4j/AsyncTwitterTest.java

@@ -16,7 +16,7 @@
 
 package twitter4j;
 
-import twitter4j.http.AccessToken;
+import twitter4j.auth.AccessToken;
 
 import java.util.Date;
 import java.util.List;

twitter4j-core/src/test/java/twitter4j/AuthorizationTest.java

@@ -16,10 +16,10 @@
 
 package twitter4j;
 
-import twitter4j.http.Authorization;
-import twitter4j.http.BasicAuthorization;
-import twitter4j.http.NullAuthorization;
-import twitter4j.http.OAuthAuthorization;
+import twitter4j.auth.Authorization;
+import twitter4j.auth.BasicAuthorization;
+import twitter4j.auth.NullAuthorization;
+import twitter4j.auth.OAuthAuthorization;
 
 
 /**

twitter4j-core/src/test/java/twitter4j/DAOTest.java

@@ -16,10 +16,10 @@
 
 package twitter4j;
 
+import twitter4j.auth.AccessToken;
+import twitter4j.auth.OAuthAuthorization;
 import twitter4j.conf.Configuration;
 import twitter4j.conf.ConfigurationBuilder;
-import twitter4j.http.AccessToken;
-import twitter4j.http.OAuthAuthorization;
 import twitter4j.internal.http.HttpClientImpl;
 import twitter4j.internal.http.HttpClientWrapper;
 import twitter4j.internal.org.json.JSONArray;

twitter4j-core/src/test/java/twitter4j/StreamAPITest.java

@@ -16,7 +16,7 @@
 
 package twitter4j;
 
-import twitter4j.http.AccessToken;
+import twitter4j.auth.AccessToken;
 import twitter4j.internal.async.DispatcherFactory;
 import twitter4j.json.DataObjectFactory;
 

twitter4j-core/src/test/java/twitter4j/conf/ConfigurationTest.java

@@ -19,7 +19,7 @@
 import junit.framework.Assert;
 import junit.framework.TestCase;
 import twitter4j.Version;
-import twitter4j.http.RequestToken;
+import twitter4j.auth.RequestToken;
 import twitter4j.internal.util.T4JInternalStringUtil;
 
 import java.io.BufferedWriter;

twitter4j-core/src/test/java/twitter4j/http/OAuthTest.java

@@ -23,6 +23,9 @@
 import twitter4j.TwitterStream;
 import twitter4j.TwitterStreamFactory;
 import twitter4j.TwitterTestBase;
+import twitter4j.auth.AccessToken;
+import twitter4j.auth.OAuthAuthorization;
+import twitter4j.auth.RequestToken;
 import twitter4j.conf.Configuration;
 import twitter4j.conf.ConfigurationBuilder;
 import twitter4j.conf.ConfigurationContext;