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

gk5885 · garrettjonesgoogle · commit ece15415e7e6 · 2017-06-30T15:00:24.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-http-client-android/src/main/java/com/google/api/client/extensions/android/AndroidUtils.java b/google-http-client-android/src/main/java/com/google/api/client/extensions/android/AndroidUtils.java
@@ -14,11 +14,10 @@
 
 package com.google.api.client.extensions.android;
 
+import android.os.Build;
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.Preconditions;
 
-import android.os.Build;
-
 /**
  * {@link Beta} <br/>
  * Utilities for Android.
diff --git a/google-http-client-android/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonFactory.java b/google-http-client-android/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonFactory.java
@@ -14,17 +14,15 @@
 
 package com.google.api.client.extensions.android.json;
 
+import android.annotation.TargetApi;
+import android.util.JsonReader;
+import android.util.JsonWriter;
 import com.google.api.client.extensions.android.AndroidUtils;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonGenerator;
 import com.google.api.client.json.JsonParser;
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.Charsets;
-
-import android.annotation.TargetApi;
-import android.util.JsonReader;
-import android.util.JsonWriter;
-
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
diff --git a/google-http-client-android/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonGenerator.java b/google-http-client-android/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonGenerator.java
@@ -14,13 +14,11 @@
 
 package com.google.api.client.extensions.android.json;
 
+import android.annotation.TargetApi;
+import android.util.JsonWriter;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonGenerator;
 import com.google.api.client.util.Beta;
-
-import android.annotation.TargetApi;
-import android.util.JsonWriter;
-
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/google-http-client-android/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonParser.java b/google-http-client-android/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonParser.java
@@ -14,15 +14,13 @@
 
 package com.google.api.client.extensions.android.json;
 
+import android.annotation.TargetApi;
+import android.util.JsonReader;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonParser;
 import com.google.api.client.json.JsonToken;
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.Preconditions;
-
-import android.annotation.TargetApi;
-import android.util.JsonReader;
-
 import java.io.EOFException;
 import java.io.IOException;
 import java.math.BigDecimal;
diff --git a/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonFactoryTest.java b/google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonFactoryTest.java
@@ -35,9 +35,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.reflect.TypeToken;
-
-import junit.framework.TestCase;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
@@ -56,6 +53,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+import junit.framework.TestCase;
 
 /**
  * Abstract test case for testing a {@link JsonFactory}.
diff --git a/google-http-client-test/src/main/java/com/google/api/client/test/util/store/AbstractDataStoreFactoryTest.java b/google-http-client-test/src/main/java/com/google/api/client/test/util/store/AbstractDataStoreFactoryTest.java
@@ -18,12 +18,10 @@
 import com.google.api.client.util.store.DataStore;
 import com.google.api.client.util.store.DataStoreFactory;
 import com.google.common.collect.Sets;
-
-import junit.framework.TestCase;
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Set;
+import junit.framework.TestCase;
 
 /**
  * Tests {@link DataStoreFactory}.
diff --git a/google-http-client-xml/src/main/java/com/google/api/client/http/xml/AbstractXmlHttpContent.java b/google-http-client-xml/src/main/java/com/google/api/client/http/xml/AbstractXmlHttpContent.java
@@ -20,11 +20,9 @@
 import com.google.api.client.util.Preconditions;
 import com.google.api.client.xml.Xml;
 import com.google.api.client.xml.XmlNamespaceDictionary;
-
-import org.xmlpull.v1.XmlSerializer;
-
 import java.io.IOException;
 import java.io.OutputStream;
+import org.xmlpull.v1.XmlSerializer;
 
 /**
  * {@link Beta} <br/>
diff --git a/google-http-client-xml/src/main/java/com/google/api/client/http/xml/XmlHttpContent.java b/google-http-client-xml/src/main/java/com/google/api/client/http/xml/XmlHttpContent.java
@@ -18,10 +18,8 @@
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.Preconditions;
 import com.google.api.client.xml.XmlNamespaceDictionary;
-
-import org.xmlpull.v1.XmlSerializer;
-
 import java.io.IOException;
+import org.xmlpull.v1.XmlSerializer;
 
 /**
  * {@link Beta} <br/>
diff --git a/google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/AtomContent.java b/google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/AtomContent.java
@@ -20,10 +20,8 @@
 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 org.xmlpull.v1.XmlSerializer;
 
 /**
  * {@link Beta} <br/>
diff --git a/google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/AtomFeedParser.java b/google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/AtomFeedParser.java
@@ -22,12 +22,10 @@
 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 org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * {@link Beta} <br/>
diff --git a/google-http-client-xml/src/main/java/com/google/api/client/xml/Xml.java b/google-http-client-xml/src/main/java/com/google/api/client/xml/Xml.java
@@ -23,12 +23,6 @@
 import com.google.api.client.util.FieldInfo;
 import com.google.api.client.util.Preconditions;
 import com.google.api.client.util.Types;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-import org.xmlpull.v1.XmlPullParserFactory;
-import org.xmlpull.v1.XmlSerializer;
-
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
@@ -37,6 +31,10 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlPullParserFactory;
+import org.xmlpull.v1.XmlSerializer;
 
 /**
  * {@link Beta} <br/>
diff --git a/google-http-client-xml/src/main/java/com/google/api/client/xml/XmlNamespaceDictionary.java b/google-http-client-xml/src/main/java/com/google/api/client/xml/XmlNamespaceDictionary.java
@@ -20,9 +20,6 @@
 import com.google.api.client.util.FieldInfo;
 import com.google.api.client.util.Preconditions;
 import com.google.api.client.util.Types;
-
-import org.xmlpull.v1.XmlSerializer;
-
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.ArrayList;
@@ -32,6 +29,7 @@
 import java.util.Map;
 import java.util.SortedSet;
 import java.util.TreeSet;
+import org.xmlpull.v1.XmlSerializer;
 
 /**
  * {@link Beta} <br/>
diff --git a/google-http-client-xml/src/main/java/com/google/api/client/xml/XmlObjectParser.java b/google-http-client-xml/src/main/java/com/google/api/client/xml/XmlObjectParser.java
@@ -18,15 +18,13 @@
 import com.google.api.client.util.ObjectParser;
 import com.google.api.client.util.Preconditions;
 import com.google.api.client.util.Types;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
 import java.lang.reflect.Type;
 import java.nio.charset.Charset;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * {@link Beta} <br/>
diff --git a/google-http-client-xml/src/main/java/com/google/api/client/xml/atom/AbstractAtomFeedParser.java b/google-http-client-xml/src/main/java/com/google/api/client/xml/atom/AbstractAtomFeedParser.java
@@ -19,12 +19,10 @@
 import com.google.api.client.util.Types;
 import com.google.api.client.xml.Xml;
 import com.google.api.client.xml.XmlNamespaceDictionary;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
 import java.io.IOException;
 import java.io.InputStream;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
 
 /**
  * {@link Beta} <br/>
diff --git a/google-http-client/src/main/java/com/google/api/client/http/apache/ApacheHttpRequest.java b/google-http-client/src/main/java/com/google/api/client/http/apache/ApacheHttpRequest.java
@@ -17,16 +17,14 @@
 import com.google.api.client.http.LowLevelHttpRequest;
 import com.google.api.client.http.LowLevelHttpResponse;
 import com.google.api.client.util.Preconditions;
-
+import java.io.IOException;
 import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.conn.params.ConnManagerParams;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
 
-import java.io.IOException;
-
 /**
  * @author Yaniv Inbar
  */
diff --git a/google-http-client/src/main/java/com/google/api/client/http/apache/ApacheHttpResponse.java b/google-http-client/src/main/java/com/google/api/client/http/apache/ApacheHttpResponse.java
@@ -15,16 +15,14 @@
 package com.google.api.client.http.apache;
 
 import com.google.api.client.http.LowLevelHttpResponse;
-
+import java.io.IOException;
+import java.io.InputStream;
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.StatusLine;
 import org.apache.http.client.methods.HttpRequestBase;
 
-import java.io.IOException;
-import java.io.InputStream;
-
 final class ApacheHttpResponse extends LowLevelHttpResponse {
 
   private final HttpRequestBase request;
diff --git a/google-http-client/src/main/java/com/google/api/client/http/apache/ApacheHttpTransport.java b/google-http-client/src/main/java/com/google/api/client/http/apache/ApacheHttpTransport.java
@@ -21,7 +21,13 @@
 import com.google.api.client.util.Preconditions;
 import com.google.api.client.util.SecurityUtils;
 import com.google.api.client.util.SslUtils;
-
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.ProxySelector;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.security.cert.CertificateFactory;
+import javax.net.ssl.SSLContext;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpVersion;
 import org.apache.http.client.HttpClient;
@@ -52,15 +58,6 @@
 import org.apache.http.params.HttpParams;
 import org.apache.http.params.HttpProtocolParams;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.ProxySelector;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.cert.CertificateFactory;
-
-import javax.net.ssl.SSLContext;
-
 /**
  * Thread-safe HTTP transport based on the Apache HTTP Client library.
  *
diff --git a/google-http-client/src/main/java/com/google/api/client/http/apache/ContentEntity.java b/google-http-client/src/main/java/com/google/api/client/http/apache/ContentEntity.java
@@ -16,12 +16,10 @@
 
 import com.google.api.client.util.Preconditions;
 import com.google.api.client.util.StreamingContent;
-
-import org.apache.http.entity.AbstractHttpEntity;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import org.apache.http.entity.AbstractHttpEntity;
 
 /**
  * @author Yaniv Inbar
diff --git a/google-http-client/src/main/java/com/google/api/client/http/apache/HttpExtensionMethod.java b/google-http-client/src/main/java/com/google/api/client/http/apache/HttpExtensionMethod.java
@@ -13,10 +13,8 @@
 package com.google.api.client.http.apache;
 
 import com.google.api.client.util.Preconditions;
-
-import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
-
 import java.net.URI;
+import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
 
 /**
  * HTTP extension method.
diff --git a/google-http-client/src/main/java/com/google/api/client/http/apache/SSLSocketFactoryExtension.java b/google-http-client/src/main/java/com/google/api/client/http/apache/SSLSocketFactoryExtension.java
@@ -14,8 +14,6 @@
 
 package com.google.api.client.http.apache;
 
-import org.apache.http.conn.ssl.SSLSocketFactory;
-
 import java.io.IOException;
 import java.net.Socket;
 import java.net.UnknownHostException;
@@ -24,9 +22,9 @@
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.UnrecoverableKeyException;
-
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocket;
+import org.apache.http.conn.ssl.SSLSocketFactory;
 
 /**
  * Implementation of SSL socket factory that extends Apache's implementation to provide
diff --git a/google-http-client/src/main/java/com/google/api/client/testing/http/apache/MockHttpClient.java b/google-http-client/src/main/java/com/google/api/client/testing/http/apache/MockHttpClient.java
@@ -16,7 +16,7 @@
 
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.Preconditions;
-
+import java.io.IOException;
 import org.apache.http.ConnectionReuseStrategy;
 import org.apache.http.HttpException;
 import org.apache.http.HttpHost;
@@ -39,8 +39,6 @@
 import org.apache.http.protocol.HttpProcessor;
 import org.apache.http.protocol.HttpRequestExecutor;
 
-import java.io.IOException;
-
 /**
  * {@link Beta} <br/>
  * Mock for {@link HttpClient} that does not actually make any network calls.
