api refactoring

settings.gradle

@@ -1,6 +1,4 @@
 include ':twidere'
-include ':twidere.component.twitter4j'
-//include ':twidere.component.twitter4j.streaming'
 include ':twidere.component.common'
 include ':twidere.library.extension'
 include ':twidere.component.querybuilder'
@@ -8,7 +6,6 @@ include ':twidere.wear'
 include ':twidere.donate.nyanwp'
 include ':twidere.donate.nyanwp.wear'
 include ':twidere.component.nyan'
-//include ':twidere.extension.streaming'
 include ':twidere.extension.twitlonger'
 include ':twidere.extension.push.xiaomi'
 include ':twidere.extension.launcher.compose'

twidere.component.common/build.gradle

@@ -42,6 +42,5 @@ dependencies {
     compile 'com.bluelinelabs:logansquare:1.0.6'
     compile 'org.apache.commons:commons-lang3:3.4'
     compile project(':twidere.component.querybuilder')
-    compile project(':twidere.component.twitter4j')
     compile fileTree(dir: 'libs', include: ['*.jar'])
 }

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/Twitter.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2007 Yusuke Yamamoto
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.mariotaku.twidere.api.twitter;
+
+import org.mariotaku.twidere.api.twitter.api.DirectMessagesResources;
+import org.mariotaku.twidere.api.twitter.api.FavoritesResources;
+import org.mariotaku.twidere.api.twitter.api.FriendsFollowersResources;
+import org.mariotaku.twidere.api.twitter.api.HelpResources;
+import org.mariotaku.twidere.api.twitter.api.ListsResources;
+import org.mariotaku.twidere.api.twitter.api.PlacesGeoResources;
+import org.mariotaku.twidere.api.twitter.api.PrivateActivityResources;
+import org.mariotaku.twidere.api.twitter.api.PrivateDirectMessagesResources;
+import org.mariotaku.twidere.api.twitter.api.PrivateFriendsFollowersResources;
+import org.mariotaku.twidere.api.twitter.api.PrivateTimelinesResources;
+import org.mariotaku.twidere.api.twitter.api.PrivateTweetResources;
+import org.mariotaku.twidere.api.twitter.api.SavedSearchesResources;
+import org.mariotaku.twidere.api.twitter.api.SearchResource;
+import org.mariotaku.twidere.api.twitter.api.SpamReportingResources;
+import org.mariotaku.twidere.api.twitter.api.TimelinesResources;
+import org.mariotaku.twidere.api.twitter.api.TrendsResources;
+import org.mariotaku.twidere.api.twitter.api.TweetResources;
+import org.mariotaku.twidere.api.twitter.api.UsersResources;
+
+/**
+ * @author Yusuke Yamamoto - yusuke at mac.com
+ * @since Twitter4J 2.2.0
+ */
+public interface Twitter extends SearchResource, TimelinesResources,
+        TweetResources, UsersResources, ListsResources, DirectMessagesResources, FriendsFollowersResources,
+        FavoritesResources, SpamReportingResources, SavedSearchesResources, TrendsResources, PlacesGeoResources,
+        HelpResources, PrivateActivityResources, PrivateTweetResources, PrivateTimelinesResources,
+        PrivateFriendsFollowersResources, PrivateDirectMessagesResources {
+}

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/TwitterConstants.java

@@ -1,4 +1,4 @@
-package twitter4j;
+package org.mariotaku.twidere.api.twitter;
 
 public interface TwitterConstants {
 

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/TwitterException.java

@@ -17,19 +17,22 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;
 
 import org.mariotaku.simplerestapi.http.RestRequest;
 import org.mariotaku.simplerestapi.http.RestResponse;
+import org.mariotaku.twidere.api.twitter.model.ErrorInfo;
+import org.mariotaku.twidere.api.twitter.model.RateLimitStatus;
+import org.mariotaku.twidere.api.twitter.model.TwitterResponse;
 import org.mariotaku.twidere.api.twitter.model.impl.RateLimitStatusJSONImpl;
 
 import java.util.Locale;
 
-import twitter4j.http.HttpResponseCode;
+import org.mariotaku.twidere.api.twitter.http.HttpResponseCode;
-import twitter4j.internal.util.InternalParseUtil;
+import org.mariotaku.twidere.api.twitter.util.InternalParseUtil;
 
 /**
  * An exception class that will be thrown when TwitterAPI calls are failed.<br>

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/TwitterOAuth.java

@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter;
 
 
 import org.mariotaku.simplerestapi.http.BodyType;

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/DirectMessagesResources.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j.api;
+package org.mariotaku.twidere.api.twitter.api;
 
 import org.mariotaku.simplerestapi.http.BodyType;
 import org.mariotaku.simplerestapi.method.GET;
@@ -23,10 +23,10 @@ import org.mariotaku.simplerestapi.param.Body;
 import org.mariotaku.simplerestapi.param.Form;
 import org.mariotaku.simplerestapi.param.Query;
 
-import twitter4j.DirectMessage;
+import org.mariotaku.twidere.api.twitter.model.DirectMessage;
-import twitter4j.Paging;
+import org.mariotaku.twidere.api.twitter.model.Paging;
-import twitter4j.ResponseList;
+import org.mariotaku.twidere.api.twitter.model.ResponseList;
-import twitter4j.TwitterException;
+import org.mariotaku.twidere.api.twitter.TwitterException;
 
 /**
  * @author Joern Huxhorn - jhuxhorn at googlemail.com

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/FavoritesResources.java

@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package twitter4j.api;
+package org.mariotaku.twidere.api.twitter.api;
 
 import org.mariotaku.simplerestapi.http.BodyType;
 import org.mariotaku.simplerestapi.method.GET;
@@ -26,10 +26,10 @@ import org.mariotaku.simplerestapi.param.Body;
 import org.mariotaku.simplerestapi.param.Form;
 import org.mariotaku.simplerestapi.param.Query;
 
-import twitter4j.Paging;
+import org.mariotaku.twidere.api.twitter.model.Paging;
-import twitter4j.ResponseList;
+import org.mariotaku.twidere.api.twitter.model.ResponseList;
-import twitter4j.Status;
+import org.mariotaku.twidere.api.twitter.model.Status;
-import twitter4j.TwitterException;
+import org.mariotaku.twidere.api.twitter.TwitterException;
 
 /**
  * @author Joern Huxhorn - jhuxhorn at googlemail.com

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/FriendsFollowersResources.java

@@ -17,19 +17,19 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package twitter4j.api;
+package org.mariotaku.twidere.api.twitter.api;
 
 import org.mariotaku.simplerestapi.method.GET;
 import org.mariotaku.simplerestapi.param.Query;
 
-import twitter4j.Friendship;
+import org.mariotaku.twidere.api.twitter.model.Friendship;
-import twitter4j.IDs;
+import org.mariotaku.twidere.api.twitter.model.IDs;
-import twitter4j.PageableResponseList;
+import org.mariotaku.twidere.api.twitter.model.PageableResponseList;
-import twitter4j.Paging;
+import org.mariotaku.twidere.api.twitter.model.Paging;
-import twitter4j.Relationship;
+import org.mariotaku.twidere.api.twitter.model.Relationship;
-import twitter4j.ResponseList;
+import org.mariotaku.twidere.api.twitter.model.ResponseList;
-import twitter4j.TwitterException;
+import org.mariotaku.twidere.api.twitter.TwitterException;
-import twitter4j.User;
+import org.mariotaku.twidere.api.twitter.model.User;
 
 /**
  * @author Joern Huxhorn - jhuxhorn at googlemail.com

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/HelpResources.java

@@ -17,14 +17,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package twitter4j.api;
+package org.mariotaku.twidere.api.twitter.api;
+
+import org.mariotaku.twidere.api.twitter.TwitterException;
 
 import java.util.Map;
 
-import twitter4j.RateLimitStatus;
+import org.mariotaku.twidere.api.twitter.model.RateLimitStatus;
-import twitter4j.ResponseList;
+import org.mariotaku.twidere.api.twitter.model.ResponseList;
-import twitter4j.TwitterAPIConfiguration;
+import org.mariotaku.twidere.api.twitter.model.TwitterAPIConfiguration;
-import twitter4j.TwitterException;
 
 /**
  * @author Joern Huxhorn - jhuxhorn at googlemail.com
@@ -37,7 +38,7 @@ public interface HelpResources {
 	 * they are loaded, but no more than once a day.
 	 * 
 	 * @return configuration
-	 * @throws twitter4j.TwitterException when Twitter service or network is
+	 * @throws TwitterException when Twitter service or network is
 	 *             unavailable
 	 * @see <a
 	 *      href="https://dev.twitter.com/docs/api/1.1/get/help/configuration">GET
@@ -52,7 +53,7 @@ public interface HelpResources {
 	 * include lang with any of your requests.
 	 * 
 	 * @return list of languages supported by Twitter
-	 * @throws twitter4j.TwitterException when Twitter service or network is
+	 * @throws TwitterException when Twitter service or network is
 	 *             unavailable
 	 * @see <a
 	 *      href="https://dev.twitter.com/docs/api/1.1/get/help/languages">GET
@@ -66,7 +67,7 @@ public interface HelpResources {
 	 * This method calls http://api.twitter.com/1.1/legal/privacy.json
 	 * 
 	 * @return privacy policy
-	 * @throws twitter4j.TwitterException when Twitter service or network is
+	 * @throws TwitterException when Twitter service or network is
 	 *             unavailable
 	 * @see <a href="https://dev.twitter.com/docs/api/1.1/get/legal/privacy">GET
 	 *      legal/privacy | Twitter Developers</a>
@@ -148,7 +149,7 @@ public interface HelpResources {
 	 * This method calls http://api.twitter.com/1.1/legal/tos.json
 	 * 
 	 * @return Terms of Service
-	 * @throws twitter4j.TwitterException when Twitter service or network is
+	 * @throws TwitterException when Twitter service or network is
 	 *             unavailable
 	 * @see <a href="https://dev.twitter.com/docs/api/1.1/get/legal/tos">GET
 	 *      legal/tos | Twitter Developers</a>

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/ListsResources.java

@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package twitter4j.api;
+package org.mariotaku.twidere.api.twitter.api;
 
 import org.mariotaku.simplerestapi.http.BodyType;
 import org.mariotaku.simplerestapi.method.GET;
@@ -26,14 +26,14 @@ import org.mariotaku.simplerestapi.param.Body;
 import org.mariotaku.simplerestapi.param.Form;
 import org.mariotaku.simplerestapi.param.Query;
 
-import twitter4j.PageableResponseList;
+import org.mariotaku.twidere.api.twitter.model.PageableResponseList;
-import twitter4j.Paging;
+import org.mariotaku.twidere.api.twitter.model.Paging;
-import twitter4j.ResponseList;
+import org.mariotaku.twidere.api.twitter.model.ResponseList;
-import twitter4j.Status;
+import org.mariotaku.twidere.api.twitter.model.Status;
-import twitter4j.TwitterException;
+import org.mariotaku.twidere.api.twitter.TwitterException;
-import twitter4j.User;
+import org.mariotaku.twidere.api.twitter.model.User;
-import twitter4j.UserList;
+import org.mariotaku.twidere.api.twitter.model.UserList;
-import twitter4j.UserListUpdate;
+import org.mariotaku.twidere.api.twitter.model.UserListUpdate;
 
 /**
  * @author Joern Huxhorn - jhuxhorn at googlemail.com

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/PlacesGeoResources.java

@@ -17,14 +17,14 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package twitter4j.api;
+package org.mariotaku.twidere.api.twitter.api;
 
-import twitter4j.GeoLocation;
+import org.mariotaku.twidere.api.twitter.model.GeoLocation;
-import twitter4j.GeoQuery;
+import org.mariotaku.twidere.api.twitter.model.GeoQuery;
-import twitter4j.Place;
+import org.mariotaku.twidere.api.twitter.model.Place;
-import twitter4j.ResponseList;
+import org.mariotaku.twidere.api.twitter.model.ResponseList;
-import twitter4j.SimilarPlaces;
+import org.mariotaku.twidere.api.twitter.model.SimilarPlaces;
-import twitter4j.TwitterException;
+import org.mariotaku.twidere.api.twitter.TwitterException;
 
 /**
  * @author Yusuke Yamamoto - yusuke at mac.com
@@ -58,7 +58,7 @@ public interface PlacesGeoResources {
 
 	/**
 	 * Find out more details of a place that was returned from the
-	 * {@link PlacesGeoResources#reverseGeoCode(twitter4j.GeoQuery)}
+	 * {@link PlacesGeoResources#reverseGeoCode(GeoQuery)}
 	 * method. <br>
 	 * This method calls http://api.twitter.com/1.1/geo/id/:id.json
 	 * 

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/PrivateActivityResources.java

@@ -1,9 +1,9 @@
-package twitter4j.api;
+package org.mariotaku.twidere.api.twitter.api;
 
-import twitter4j.Activity;
+import org.mariotaku.twidere.api.twitter.model.Activity;
-import twitter4j.Paging;
+import org.mariotaku.twidere.api.twitter.model.Paging;
-import twitter4j.ResponseList;
+import org.mariotaku.twidere.api.twitter.model.ResponseList;
-import twitter4j.TwitterException;
+import org.mariotaku.twidere.api.twitter.TwitterException;
 
 public interface PrivateActivityResources extends PrivateResources {
 	public ResponseList<Activity> getActivitiesAboutMe() throws TwitterException;

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/PrivateDirectMessagesResources.java

@@ -17,9 +17,9 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package twitter4j.api;
+package org.mariotaku.twidere.api.twitter.api;
 
-import twitter4j.TwitterException;
+import org.mariotaku.twidere.api.twitter.TwitterException;
 
 /**
  * Created by mariotaku on 15/1/6.

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/PrivateFriendsFollowersResources.java

@@ -1,7 +1,7 @@
-package twitter4j.api;
+package org.mariotaku.twidere.api.twitter.api;
 
-import twitter4j.TwitterException;
+import org.mariotaku.twidere.api.twitter.TwitterException;
-import twitter4j.User;
+import org.mariotaku.twidere.api.twitter.model.User;
 
 public interface PrivateFriendsFollowersResources extends PrivateResources {
 

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/PrivateResources.java

@@ -0,0 +1,5 @@
+package org.mariotaku.twidere.api.twitter.api;
+
+public interface PrivateResources {
+
+}

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/PrivateTimelinesResources.java

@@ -1,12 +1,12 @@
-package twitter4j.api;
+package org.mariotaku.twidere.api.twitter.api;
 
 import org.mariotaku.simplerestapi.method.GET;
 import org.mariotaku.simplerestapi.param.Query;
 
-import twitter4j.Paging;
+import org.mariotaku.twidere.api.twitter.model.Paging;
-import twitter4j.ResponseList;
+import org.mariotaku.twidere.api.twitter.model.ResponseList;
-import twitter4j.Status;
+import org.mariotaku.twidere.api.twitter.model.Status;
-import twitter4j.TwitterException;
+import org.mariotaku.twidere.api.twitter.TwitterException;
 
 public interface PrivateTimelinesResources extends PrivateResources {
 

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/PrivateTweetResources.java

@@ -1,14 +1,14 @@
-package twitter4j.api;
+package org.mariotaku.twidere.api.twitter.api;
 
 import org.mariotaku.simplerestapi.method.GET;
 import org.mariotaku.simplerestapi.param.Query;
 
-import twitter4j.Paging;
+import org.mariotaku.twidere.api.twitter.model.Paging;
-import twitter4j.ResponseList;
+import org.mariotaku.twidere.api.twitter.model.ResponseList;
-import twitter4j.Status;
+import org.mariotaku.twidere.api.twitter.model.Status;
-import twitter4j.StatusActivitySummary;
+import org.mariotaku.twidere.api.twitter.model.StatusActivitySummary;
-import twitter4j.TranslationResult;
+import org.mariotaku.twidere.api.twitter.model.TranslationResult;
-import twitter4j.TwitterException;
+import org.mariotaku.twidere.api.twitter.TwitterException;
 
 public interface PrivateTweetResources extends PrivateResources {
 

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/SavedSearchesResources.java

@@ -17,13 +17,13 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package twitter4j.api;
+package org.mariotaku.twidere.api.twitter.api;
 
 import org.mariotaku.simplerestapi.method.GET;
 
-import twitter4j.ResponseList;
+import org.mariotaku.twidere.api.twitter.model.ResponseList;
-import twitter4j.SavedSearch;
+import org.mariotaku.twidere.api.twitter.model.SavedSearch;
-import twitter4j.TwitterException;
+import org.mariotaku.twidere.api.twitter.TwitterException;
 
 public interface SavedSearchesResources {
     SavedSearch createSavedSearch(String query) throws TwitterException;

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/SearchResource.java

@@ -17,14 +17,14 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package twitter4j.api;
+package org.mariotaku.twidere.api.twitter.api;
 
 import org.mariotaku.simplerestapi.method.GET;
 import org.mariotaku.simplerestapi.param.Query;
 
-import twitter4j.QueryResult;
+import org.mariotaku.twidere.api.twitter.model.QueryResult;
-import twitter4j.SearchQuery;
+import org.mariotaku.twidere.api.twitter.model.SearchQuery;
-import twitter4j.TwitterException;
+import org.mariotaku.twidere.api.twitter.TwitterException;
 
 public interface SearchResource {
     @GET("/search/tweets.json")

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/SpamReportingResources.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package twitter4j.api;
+package org.mariotaku.twidere.api.twitter.api;
 
-import twitter4j.TwitterException;
+import org.mariotaku.twidere.api.twitter.TwitterException;
-import twitter4j.User;
+import org.mariotaku.twidere.api.twitter.model.User;
 
 /**
  * @author Joern Huxhorn - jhuxhorn at googlemail.com

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/TimelinesResources.java

@@ -17,15 +17,15 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package twitter4j.api;
+package org.mariotaku.twidere.api.twitter.api;
 
 import org.mariotaku.simplerestapi.method.GET;
 import org.mariotaku.simplerestapi.param.Query;
 
-import twitter4j.Paging;
+import org.mariotaku.twidere.api.twitter.model.Paging;
-import twitter4j.ResponseList;
+import org.mariotaku.twidere.api.twitter.model.ResponseList;
-import twitter4j.Status;
+import org.mariotaku.twidere.api.twitter.model.Status;
-import twitter4j.TwitterException;
+import org.mariotaku.twidere.api.twitter.TwitterException;
 
 /**
  * @author Joern Huxhorn - jhuxhorn at googlemail.com

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/TrendsResources.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package twitter4j.api;
+package org.mariotaku.twidere.api.twitter.api;
 
-import twitter4j.GeoLocation;
+import org.mariotaku.twidere.api.twitter.TwitterException;
-import twitter4j.Location;
+import org.mariotaku.twidere.api.twitter.model.GeoLocation;
-import twitter4j.ResponseList;
+import org.mariotaku.twidere.api.twitter.model.Location;
-import twitter4j.Trends;
+import org.mariotaku.twidere.api.twitter.model.ResponseList;
-import twitter4j.TwitterException;
+import org.mariotaku.twidere.api.twitter.model.Trends;
 
 /**
  * @author Joern Huxhorn - jhuxhorn at googlemail.com
@@ -36,7 +36,7 @@ public interface TrendsResources {
 	 * This method calls http://api.twitter.com/1.1/trends/available.json
 	 * 
 	 * @return the locations
-	 * @throws twitter4j.TwitterException when Twitter service or network is
+	 * @throws TwitterException when Twitter service or network is
 	 *             unavailable
 	 * @see <a
 	 *      href="https://dev.twitter.com/docs/api/1.1/get/trends/available">GET
@@ -58,7 +58,7 @@ public interface TrendsResources {
 	 *            to the lat and long passed in. The sort is nearest to
 	 *            furthest.
 	 * @return the locations
-	 * @throws twitter4j.TwitterException when Twitter service or network is
+	 * @throws TwitterException when Twitter service or network is
 	 *             unavailable
 	 * @see <a
 	 *      href="https://dev.twitter.com/docs/api/1.1/get/trends/available">GET
@@ -81,7 +81,7 @@ public interface TrendsResources {
 	 *            to the lat and long passed in. The sort is nearest to
 	 *            furthest.
 	 * @return the locations
-	 * @throws twitter4j.TwitterException when Twitter service or network is
+	 * @throws TwitterException when Twitter service or network is
 	 *             unavailable
 	 * @see <a
 	 *      href="https://dev.twitter.com/docs/api/1.1/get/trends/closest">GET
@@ -103,7 +103,7 @@ public interface TrendsResources {
 	 * 
 	 * @param woeid The WOEID of the location to be querying for
 	 * @return trends
-	 * @throws twitter4j.TwitterException when Twitter service or network is
+	 * @throws TwitterException when Twitter service or network is
 	 *             unavailable
 	 * @see <a href="https://dev.twitter.com/docs/api/1.1/get/trends/:woeid">GET
 	 *      trends/:woeid | Twitter Developers</a>
@@ -129,7 +129,7 @@ public interface TrendsResources {
 	 *            trending information for. Global information is available by
 	 *            using 1 as the WOEID.
 	 * @return trends
-	 * @throws twitter4j.TwitterException when Twitter service or network is
+	 * @throws TwitterException when Twitter service or network is
 	 *             unavailable
 	 * @see <a href="https://dev.twitter.com/docs/api/1.1/get/trends/place">GET
 	 *      trends/place | Twitter Developers</a>

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/TweetResources.java

@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package twitter4j.api;
+package org.mariotaku.twidere.api.twitter.api;
 
 import org.mariotaku.simplerestapi.http.BodyType;
 import org.mariotaku.simplerestapi.method.GET;
@@ -27,12 +27,12 @@ import org.mariotaku.simplerestapi.param.Form;
 import org.mariotaku.simplerestapi.param.Path;
 import org.mariotaku.simplerestapi.param.Query;
 
-import twitter4j.IDs;
+import org.mariotaku.twidere.api.twitter.model.IDs;
-import twitter4j.Paging;
+import org.mariotaku.twidere.api.twitter.model.Paging;
-import twitter4j.ResponseList;
+import org.mariotaku.twidere.api.twitter.model.ResponseList;
-import twitter4j.Status;
+import org.mariotaku.twidere.api.twitter.model.Status;
-import twitter4j.StatusUpdate;
+import org.mariotaku.twidere.api.twitter.model.StatusUpdate;
-import twitter4j.TwitterException;
+import org.mariotaku.twidere.api.twitter.TwitterException;
 
 /**
  * @author Joern Huxhorn - jhuxhorn at googlemail.com

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/TwitterUpload.java

@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package twitter4j.api;
+package org.mariotaku.twidere.api.twitter.api;
 
 import org.mariotaku.simplerestapi.http.BodyType;
 import org.mariotaku.simplerestapi.http.mime.FileTypedData;
@@ -27,8 +27,8 @@ import org.mariotaku.simplerestapi.param.Part;
 
 import java.io.File;
 
-import twitter4j.MediaUploadResponse;
+import org.mariotaku.twidere.api.twitter.model.MediaUploadResponse;
-import twitter4j.TwitterException;
+import org.mariotaku.twidere.api.twitter.TwitterException;
 
 public interface TwitterUpload {
 

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/api/UsersResources.java

@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package twitter4j.api;
+package org.mariotaku.twidere.api.twitter.api;
 
 import org.mariotaku.simplerestapi.http.BodyType;
 import org.mariotaku.simplerestapi.method.GET;
@@ -29,16 +29,16 @@ import org.mariotaku.simplerestapi.param.Query;
 import java.io.File;
 import java.io.InputStream;
 
-import twitter4j.AccountSettings;
+import org.mariotaku.twidere.api.twitter.model.AccountSettings;
-import twitter4j.Category;
+import org.mariotaku.twidere.api.twitter.model.Category;
-import twitter4j.IDs;
+import org.mariotaku.twidere.api.twitter.model.IDs;
-import twitter4j.PageableResponseList;
+import org.mariotaku.twidere.api.twitter.model.PageableResponseList;
-import twitter4j.Paging;
+import org.mariotaku.twidere.api.twitter.model.Paging;
-import twitter4j.ProfileUpdate;
+import org.mariotaku.twidere.api.twitter.model.ProfileUpdate;
-import twitter4j.ResponseList;
+import org.mariotaku.twidere.api.twitter.model.ResponseList;
-import twitter4j.SettingsUpdate;
+import org.mariotaku.twidere.api.twitter.model.SettingsUpdate;
-import twitter4j.TwitterException;
+import org.mariotaku.twidere.api.twitter.TwitterException;
-import twitter4j.User;
+import org.mariotaku.twidere.api.twitter.model.User;
 
 public interface UsersResources {
 

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/auth/AuthorizationConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j.auth;
+package org.mariotaku.twidere.api.twitter.auth;
 
 /**
  * A static factory class for Authorization.

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/http/HttpResponseCode.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j.http;
+package org.mariotaku.twidere.api.twitter.http;
 
 /**
  * @author Yusuke Yamamoto - yusuke at mac.com

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/AccountSettings.java

@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
-
-import java.io.Serializable;
 
 /**
  * @author Yusuke Yamamoto - yusuke at mac.com

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/AccountTotals.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 import java.io.Serializable;
 

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Activity.java

@@ -1,4 +1,4 @@
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 import java.util.Date;
 

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/CardEntity.java

@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 import java.util.Map;
 

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Category.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 import java.io.Serializable;
 

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/CursorSupport.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 /**
  * @author Yusuke Yamamoto - yusuke at mac.com

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/DirectMessage.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 import java.util.Date;
 

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/EntitySupport.java

@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
-
-import java.io.Serializable;
 
 /**
  * @author Yusuke Yamamoto - yusuke at mac.com

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/ErrorInfo.java

@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 import com.bluelinelabs.logansquare.annotation.JsonField;
 import com.bluelinelabs.logansquare.annotation.JsonObject;

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/ExtendedEntitySupport.java

@@ -17,7 +17,10 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package twitter4j.lib;
+package org.mariotaku.twidere.api.twitter.model;
+
+public interface ExtendedEntitySupport extends EntitySupport {
+
+    MediaEntity[] getExtendedMediaEntities();
 
-public class MyClass {
 }

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Friendship.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 /**
  * @author Yusuke Yamamoto - yusuke at mac.com

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/GeoLocation.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 import com.bluelinelabs.logansquare.LoganSquare;
 import com.bluelinelabs.logansquare.typeconverters.TypeConverter;

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/GeoQuery.java

@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 import org.mariotaku.simplerestapi.http.ValueMap;
 

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/HashtagEntity.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 import java.io.Serializable;
 

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/IDs.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 /**
  * A data interface representing array of numeric IDs.

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Location.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 /**
  * @author Yusuke Yamamoto - yusuke at mac.com

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/MediaEntity.java

@@ -1,8 +1,7 @@
 
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
-import java.io.Serializable;
 import java.util.Map;
 
 

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/MediaUploadResponse.java

@@ -1,4 +1,4 @@
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 public interface MediaUploadResponse extends TwitterResponse {
 

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/PageableResponseList.java

@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 /**
  * ResponseList with cursor support.

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Paging.java

@@ -1,4 +1,4 @@
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 import org.mariotaku.simplerestapi.http.ValueMap;
 

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Place.java

@@ -1,4 +1,4 @@
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 /**
  * @author Yusuke Yamamoto - yusuke at mac.com

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/ProfileUpdate.java

@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 import org.mariotaku.simplerestapi.http.SimpleValueMap;
 

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/QueryResult.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 /**
  * A data interface representing search API response

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/RateLimitStatus.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 /**
  * A data interface representing Twitter REST API's rate limit status

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/Relationship.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 public interface Relationship extends TwitterResponse {
     boolean canSourceDMTarget();

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/ReportAs.java

@@ -1,4 +1,4 @@
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 public enum ReportAs {
 	ABUSE("abuse"), COMPROMISED("compromised"), SPAM("spam");

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/ResponseList.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 import java.util.List;
 

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/SavedSearch.java

@@ -14,11 +14,8 @@
  * limitations under the License.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
-import com.bluelinelabs.logansquare.annotation.JsonObject;
-
-import java.io.Serializable;
 import java.util.Date;
 
 /**

twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/SearchQuery.java

@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package twitter4j;
+package org.mariotaku.twidere.api.twitter.model;
 
 import org.mariotaku.simplerestapi.http.ValueMap;