fix: cleanup checkstyle import rules (#1503)

* fix: format warnings at head
* fix: update checkstyle rule for static import

Author: suraj-qlogic

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>
 

google-api-client-android/src/main/java/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;
 
 /**

google-api-client-appengine/src/main/java/com/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;

google-api-client-appengine/src/main/java/com/google/api/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;

google-api-client-appengine/src/main/java/com/google/api/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;
+  }
 }

google-api-client-java6/src/main/java/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;
 
 /**

google-api-client-protobuf/src/main/java/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;
 
 /**

google-api-client-protobuf/src/main/java/com/google/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;
 
 /**

google-api-client-servlet/src/main/java/com/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;

google-api-client-servlet/src/main/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;