fix: cleanup checkstyle import rules (#1503)

* fix: format warnings at head * fix: update checkstyle rule for static import
googleapis · Mar 13, 2020 · ce22c0e · ce22c0e
1 parent 6c8dbb3
commit ce22c0e
Show file tree

Hide file tree

Showing 50 changed files with 6 additions and 57 deletions.
diff --git a/checkstyle.xml b/checkstyle.xml
@@ -53,12 +53,11 @@ page at http://checkstyle.sourceforge.net/config.html -->
     </module>
 
     <module name="ImportOrder">
-      <!-- Checks for out of order import statements. -->
-
       <property name="severity" value="warning"/>
-      <property name="groups" value="com.google,android,junit,net,org,java,javax"/>
       <!-- This ensures that static imports go first. -->
       <property name="option" value="top"/>
+      <property name="separatedStaticGroups" value="true"/>
+      <property name="caseSensitive" value="true"/>
       <property name="tokens" value="STATIC_IMPORT, IMPORT"/>
     </module>
 

diff --git a/...a/com/google/api/client/googleapis/extensions/android/gms/auth/GoogleAuthIOException.java b/...a/com/google/api/client/googleapis/extensions/android/gms/auth/GoogleAuthIOException.java
@@ -15,7 +15,6 @@
 import com.google.android.gms.auth.GoogleAuthException;
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.Preconditions;
-
 import java.io.IOException;
 
 /**

diff --git a/.../google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredential.java b/.../google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredential.java
@@ -27,7 +27,6 @@
 import com.google.appengine.api.appidentity.AppIdentityService;
 import com.google.appengine.api.appidentity.AppIdentityService.GetAccessTokenResult;
 import com.google.appengine.api.appidentity.AppIdentityServiceFactory;
-
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;

diff --git a/...pi/client/googleapis/extensions/appengine/notifications/AppEngineNotificationServlet.java b/...pi/client/googleapis/extensions/appengine/notifications/AppEngineNotificationServlet.java
@@ -18,9 +18,7 @@
 import com.google.api.client.googleapis.extensions.servlet.notifications.WebhookUtils;
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.store.DataStoreFactory;
-
 import java.io.IOException;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;

diff --git a/...pi/client/googleapis/extensions/appengine/testing/auth/oauth2/MockAppIdentityService.java b/...pi/client/googleapis/extensions/appengine/testing/auth/oauth2/MockAppIdentityService.java
@@ -18,7 +18,6 @@
 import com.google.appengine.api.appidentity.AppIdentityService;
 import com.google.appengine.api.appidentity.AppIdentityServiceFailureException;
 import com.google.appengine.api.appidentity.PublicCertificate;
-
 import java.util.Collection;
 import java.util.Date;
 
@@ -91,5 +90,7 @@ public ParsedAppId parseFullAppId(String fullAppId) {
   }
 
   @Override
-  public String getDefaultGcsBucketName() { return null; }
+  public String getDefaultGcsBucketName() {
+    return null;
+  }
 }
diff --git a/...a/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java b/...a/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java
@@ -16,7 +16,6 @@
 
 import com.google.api.client.extensions.java6.auth.oauth2.AbstractPromptReceiver;
 import com.google.api.client.googleapis.auth.oauth2.GoogleOAuthConstants;
-
 import java.io.IOException;
 
 /**

diff --git a/.../com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClientRequest.java b/.../com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClientRequest.java
@@ -22,7 +22,6 @@
 import com.google.api.client.http.protobuf.ProtoHttpContent;
 import com.google.api.client.util.Beta;
 import com.google.protobuf.MessageLite;
-
 import java.io.IOException;
 
 /**

diff --git a/...le/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializer.java b/...le/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializer.java
@@ -17,7 +17,6 @@
 import com.google.api.client.googleapis.services.AbstractGoogleClientRequest;
 import com.google.api.client.googleapis.services.CommonGoogleClientRequestInitializer;
 import com.google.api.client.util.Beta;
-
 import java.io.IOException;
 
 /**

diff --git a/...om/google/api/client/googleapis/extensions/servlet/notifications/NotificationServlet.java b/...om/google/api/client/googleapis/extensions/servlet/notifications/NotificationServlet.java
@@ -19,9 +19,7 @@
 import com.google.api.client.util.store.DataStore;
 import com.google.api.client.util.store.DataStoreFactory;
 import com.google.api.client.util.store.MemoryDataStoreFactory;
-
 import java.io.IOException;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;

diff --git a/.../java/com/google/api/client/googleapis/extensions/servlet/notifications/WebhookUtils.java b/.../java/com/google/api/client/googleapis/extensions/servlet/notifications/WebhookUtils.java
@@ -23,13 +23,11 @@
 import com.google.api.client.util.StringUtils;
 import com.google.api.client.util.store.DataStore;
 import com.google.api.client.util.store.DataStoreFactory;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Enumeration;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;

diff --git a/...le-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/GoogleAtom.java b/...le-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/GoogleAtom.java
@@ -21,7 +21,6 @@
 import com.google.api.client.util.FieldInfo;
 import com.google.api.client.util.GenericData;
 import com.google.api.client.util.Types;
-
 import java.util.Collection;
 import java.util.Map;
 import java.util.TreeSet;

diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/MethodOverride.java b/google-api-client/src/main/java/com/google/api/client/googleapis/MethodOverride.java
@@ -20,7 +20,6 @@
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.UrlEncodedContent;
-
 import java.io.IOException;
 
 /**

diff --git a/...ient/src/main/java/com/google/api/client/googleapis/apache/GoogleApacheHttpTransport.java b/...ient/src/main/java/com/google/api/client/googleapis/apache/GoogleApacheHttpTransport.java
@@ -16,7 +16,6 @@
 
 import com.google.api.client.googleapis.GoogleUtils;
 import com.google.api.client.http.apache.ApacheHttpTransport;
-
 import com.google.api.client.util.SslUtils;
 import java.io.IOException;
 import java.net.ProxySelector;

diff --git a/...src/main/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProvider.java b/...src/main/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProvider.java
@@ -23,7 +23,6 @@
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonObjectParser;
 import com.google.api.client.util.Beta;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;

diff --git a/...c/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlow.java b/...c/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlow.java
@@ -32,7 +32,6 @@
 import com.google.api.client.util.Preconditions;
 import com.google.api.client.util.store.DataStore;
 import com.google.api.client.util.store.DataStoreFactory;
-
 import java.io.IOException;
 import java.util.Collection;
 

diff --git a/.../java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeRequestUrl.java b/.../java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeRequestUrl.java
@@ -18,7 +18,6 @@
 import com.google.api.client.auth.oauth2.AuthorizationCodeResponseUrl;
 import com.google.api.client.util.Key;
 import com.google.api.client.util.Preconditions;
-
 import java.util.Collection;
 
 /**

diff --git a/...ava/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequest.java b/...ava/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequest.java
@@ -24,7 +24,6 @@
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.util.Preconditions;
-
 import java.io.IOException;
 import java.util.Collection;
 

diff --git a/...main/java/com/google/api/client/googleapis/auth/oauth2/GoogleBrowserClientRequestUrl.java b/...main/java/com/google/api/client/googleapis/auth/oauth2/GoogleBrowserClientRequestUrl.java
@@ -17,7 +17,6 @@
 import com.google.api.client.auth.oauth2.BrowserClientRequestUrl;
 import com.google.api.client.util.Key;
 import com.google.api.client.util.Preconditions;
-
 import java.util.Collection;
 
 /**

diff --git a/...lient/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleClientSecrets.java b/...lient/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleClientSecrets.java
@@ -18,7 +18,6 @@
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.util.Key;
 import com.google.api.client.util.Preconditions;
-
 import java.io.IOException;
 import java.io.Reader;
 import java.util.List;

diff --git a/...i-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java b/...i-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java
@@ -41,7 +41,6 @@
 import com.google.api.client.util.Preconditions;
 import com.google.api.client.util.SecurityUtils;
 import com.google.api.client.util.store.DataStoreFactory;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileReader;

diff --git a/...-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdToken.java b/...-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdToken.java
@@ -19,7 +19,6 @@
 import com.google.api.client.json.webtoken.JsonWebSignature;
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.Key;
-
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.util.List;

diff --git a/...ent/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java b/...ent/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java
@@ -21,7 +21,6 @@
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.Clock;
 import com.google.api.client.util.Preconditions;
-
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.security.PublicKey;

diff --git a/...src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleRefreshTokenRequest.java b/...src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleRefreshTokenRequest.java
@@ -23,7 +23,6 @@
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
-
 import java.io.IOException;
 import java.util.Collection;
 

diff --git a/...lient/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleTokenResponse.java b/...lient/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleTokenResponse.java
@@ -19,7 +19,6 @@
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.Key;
 import com.google.api.client.util.Preconditions;
-
 import java.io.IOException;
 
 /**

diff --git a/...le-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/OAuth2Utils.java b/...le-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/OAuth2Utils.java
@@ -20,7 +20,6 @@
 import com.google.api.client.http.HttpResponse;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.util.Beta;
-
 import java.io.IOException;
 import java.net.SocketTimeoutException;
 import java.nio.charset.Charset;

diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchCallback.java b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchCallback.java
@@ -15,7 +15,6 @@
 package com.google.api.client.googleapis.batch;
 
 import com.google.api.client.http.HttpHeaders;
-
 import java.io.IOException;
 
 /**

diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchRequest.java
@@ -27,7 +27,6 @@
 import com.google.api.client.http.MultipartContent;
 import com.google.api.client.util.Preconditions;
 import com.google.api.client.util.Sleeper;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;

diff --git a/...pi-client/src/main/java/com/google/api/client/googleapis/batch/BatchUnparsedResponse.java b/...pi-client/src/main/java/com/google/api/client/googleapis/batch/BatchUnparsedResponse.java
@@ -26,7 +26,6 @@
 import com.google.api.client.http.LowLevelHttpRequest;
 import com.google.api.client.http.LowLevelHttpResponse;
 import com.google.api.client.util.ByteStreams;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.FilterInputStream;

diff --git a/...i-client/src/main/java/com/google/api/client/googleapis/batch/json/JsonBatchCallback.java b/...i-client/src/main/java/com/google/api/client/googleapis/batch/json/JsonBatchCallback.java
@@ -18,7 +18,6 @@
 import com.google.api.client.googleapis.json.GoogleJsonError;
 import com.google.api.client.googleapis.json.GoogleJsonErrorContainer;
 import com.google.api.client.http.HttpHeaders;
-
 import java.io.IOException;
 
 /**

diff --git a/...-api-client/src/main/java/com/google/api/client/googleapis/compute/ComputeCredential.java b/...-api-client/src/main/java/com/google/api/client/googleapis/compute/ComputeCredential.java
@@ -29,7 +29,6 @@
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.Clock;
 import com.google.api.client.util.Preconditions;
-
 import java.io.IOException;
 import java.util.Collection;
 

diff --git a/...client/src/main/java/com/google/api/client/googleapis/javanet/GoogleNetHttpTransport.java b/...client/src/main/java/com/google/api/client/googleapis/javanet/GoogleNetHttpTransport.java
@@ -16,7 +16,6 @@
 
 import com.google.api.client.googleapis.GoogleUtils;
 import com.google.api.client.http.javanet.NetHttpTransport;
-
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;

diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonError.java b/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonError.java
@@ -21,7 +21,6 @@
 import com.google.api.client.json.JsonObjectParser;
 import com.google.api.client.util.Data;
 import com.google.api.client.util.Key;
-
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;

diff --git a/...ient/src/main/java/com/google/api/client/googleapis/json/GoogleJsonResponseException.java b/...ient/src/main/java/com/google/api/client/googleapis/json/GoogleJsonResponseException.java
@@ -24,7 +24,6 @@
 import com.google.api.client.json.JsonToken;
 import com.google.api.client.util.Preconditions;
 import com.google.api.client.util.StringUtils;
-
 import java.io.IOException;
 
 /**

diff --git a/...le-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java b/...le-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java
@@ -36,7 +36,6 @@
 import com.google.api.client.util.ByteStreams;
 import com.google.api.client.util.Preconditions;
 import com.google.api.client.util.Sleeper;
-
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/...-client/src/main/java/com/google/api/client/googleapis/media/MediaUploadErrorHandler.java b/...-client/src/main/java/com/google/api/client/googleapis/media/MediaUploadErrorHandler.java
@@ -20,7 +20,6 @@
 import com.google.api.client.http.HttpUnsuccessfulResponseHandler;
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.Preconditions;
-
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;

diff --git a/...pi-client/src/main/java/com/google/api/client/googleapis/notifications/StoredChannel.java b/...pi-client/src/main/java/com/google/api/client/googleapis/notifications/StoredChannel.java
@@ -19,7 +19,6 @@
 import com.google.api.client.util.Preconditions;
 import com.google.api.client.util.store.DataStore;
 import com.google.api.client.util.store.DataStoreFactory;
-
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.concurrent.locks.Lock;

diff --git a/...c/main/java/com/google/api/client/googleapis/notifications/TypedNotificationCallback.java b/...c/main/java/com/google/api/client/googleapis/notifications/TypedNotificationCallback.java
@@ -18,7 +18,6 @@
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.ObjectParser;
 import com.google.api.client.util.Preconditions;
-
 import java.io.IOException;
 import java.nio.charset.Charset;
 

diff --git a/...nt/src/main/java/com/google/api/client/googleapis/notifications/UnparsedNotification.java b/...nt/src/main/java/com/google/api/client/googleapis/notifications/UnparsedNotification.java
@@ -15,7 +15,6 @@
 package com.google.api.client.googleapis.notifications;
 
 import com.google.api.client.util.Beta;
-
 import java.io.InputStream;
 
 /**

diff --git a/...ain/java/com/google/api/client/googleapis/notifications/UnparsedNotificationCallback.java b/...ain/java/com/google/api/client/googleapis/notifications/UnparsedNotificationCallback.java
@@ -15,7 +15,6 @@
 package com.google.api.client.googleapis.notifications;
 
 import com.google.api.client.util.Beta;
-
 import java.io.IOException;
 import java.io.Serializable;
 

diff --git a/...in/java/com/google/api/client/googleapis/notifications/json/JsonNotificationCallback.java b/...in/java/com/google/api/client/googleapis/notifications/json/JsonNotificationCallback.java
@@ -18,7 +18,6 @@
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonObjectParser;
 import com.google.api.client.util.Beta;
-
 import java.io.IOException;
 
 /**

diff --git a/.../src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java b/.../src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java
@@ -37,7 +37,6 @@
 import com.google.api.client.http.UriTemplate;
 import com.google.api.client.util.GenericData;
 import com.google.api.client.util.Preconditions;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;

diff --git a/...rc/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClient.java b/...rc/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClient.java
@@ -20,7 +20,6 @@
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonObjectParser;
-
 import java.util.Arrays;
 import java.util.Collections;
 

diff --git a/.../java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientRequest.java b/.../java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientRequest.java
@@ -23,7 +23,6 @@
 import com.google.api.client.http.HttpResponse;
 import com.google.api.client.http.UriTemplate;
 import com.google.api.client.http.json.JsonHttpContent;
-
 import java.io.IOException;
 
 /**

diff --git a/.../google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializer.java b/.../google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializer.java
@@ -16,7 +16,6 @@
 
 import com.google.api.client.googleapis.services.AbstractGoogleClientRequest;
 import com.google.api.client.googleapis.services.CommonGoogleClientRequestInitializer;
-
 import java.io.IOException;
 
 /**

diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/TestUtils.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/TestUtils.java
@@ -16,7 +16,6 @@
 
 import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
-
 import java.io.IOException;
 import java.net.URLDecoder;
 import java.util.HashMap;

diff --git a/.../main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockGoogleCredential.java b/.../main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockGoogleCredential.java
@@ -12,7 +12,6 @@
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.Clock;
-
 import java.io.IOException;
 
 /**