Update imports ordering to the new java import order (go/java-imports).

gk5885 · neozwu · commit 925fe8eeaf94 · 2017-06-30T15:36:53.000-07:00
The import order is changing because the current rules are unnecessarily complicated, difficult to configure in IDEs, and difficult for users to remember. More information: http://go/java-imports-lsc Tested: $ blaze build //java/com/google/api/client/benchmarks/model:all //java/com/google/api/client/benchmarks:all //java/com/google/api/client/extensions/android/json:all //java/com/google/api/client/extensions/android:all //java/com/google/api/client/extensions/jetty/auth/oauth2:all //java/com/google/api/client/googleapis/extensions/android/accounts:all //java/com/google/api/client/googleapis/extensions/android/gms/auth:all //java/com/google/api/client/googleapis/xml/atom:all //java/com/google/api/client/http/apache:all //java/com/google/api/client/http/xml/atom:all //java/com/google/api/client/http/xml:all //java/com/google/api/client/test/json:all //java/com/google/api/client/test/util/store:all //java/com/google/api/client/testing/http/apache:all //java/com/google/api/client/xml/atom:all //java/com/google/api/client/xml:all http://sponge/a7602dcb-ac8b-4609-9add-4a9e66f34eaf All failing tests were failing before this change ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=127472734
diff --git a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/accounts/GoogleAccountManager.java b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/accounts/GoogleAccountManager.java
@@ -14,12 +14,11 @@
 
 package com.google.api.client.googleapis.extensions.android.accounts;
 
-import com.google.api.client.util.Beta;
-import com.google.api.client.util.Preconditions;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.content.Context;
+import com.google.api.client.util.Beta;
+import com.google.api.client.util.Preconditions;
 
 /**
  * {@link Beta} <br/>
diff --git a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/GoogleAccountCredential.java b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/GoogleAccountCredential.java
@@ -12,6 +12,9 @@
 
 package com.google.api.client.googleapis.extensions.android.gms.auth;
 
+import android.accounts.Account;
+import android.content.Context;
+import android.content.Intent;
 import com.google.android.gms.auth.GoogleAuthException;
 import com.google.android.gms.auth.GoogleAuthUtil;
 import com.google.android.gms.auth.GooglePlayServicesAvailabilityException;
@@ -30,11 +33,6 @@
 import com.google.api.client.util.Joiner;
 import com.google.api.client.util.Preconditions;
 import com.google.api.client.util.Sleeper;
-
-import android.accounts.Account;
-import android.content.Context;
-import android.content.Intent;
-
 import java.io.IOException;
 import java.util.Collection;
 
diff --git a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/GooglePlayServicesAvailabilityIOException.java b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/GooglePlayServicesAvailabilityIOException.java
@@ -12,12 +12,10 @@
 
 package com.google.api.client.googleapis.extensions.android.gms.auth;
 
+import android.app.Activity;
 import com.google.android.gms.auth.GooglePlayServicesAvailabilityException;
 import com.google.android.gms.common.GooglePlayServicesUtil;
 import com.google.api.client.util.Beta;
-
-import android.app.Activity;
-
 import java.io.IOException;
 
 /**
diff --git a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/UserRecoverableAuthIOException.java b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/UserRecoverableAuthIOException.java
@@ -12,12 +12,10 @@
 
 package com.google.api.client.googleapis.extensions.android.gms.auth;
 
-import com.google.android.gms.auth.UserRecoverableAuthException;
-import com.google.api.client.util.Beta;
-
 import android.app.Activity;
 import android.content.Intent;
-
+import com.google.android.gms.auth.UserRecoverableAuthException;
+import com.google.api.client.util.Beta;
 import java.io.IOException;
 
 /**
diff --git a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchRelativeToOriginalContent.java b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchRelativeToOriginalContent.java
@@ -20,11 +20,9 @@
 import com.google.api.client.util.Preconditions;
 import com.google.api.client.xml.XmlNamespaceDictionary;
 import com.google.api.client.xml.atom.Atom;
-
-import org.xmlpull.v1.XmlSerializer;
-
 import java.io.IOException;
 import java.util.Map;
+import org.xmlpull.v1.XmlSerializer;
 
 /**
  * {@link Beta} <br/>
diff --git a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/MultiKindFeedParser.java b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/MultiKindFeedParser.java
@@ -23,14 +23,12 @@
 import com.google.api.client.xml.XmlNamespaceDictionary;
 import com.google.api.client.xml.atom.AbstractAtomFeedParser;
 import com.google.api.client.xml.atom.Atom;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.util.HashMap;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * {@link Beta} <br/>
