Skip to content
Permalink
Browse files
fix: cleanup checkstyle import rules (#1503)
* fix: format warnings at head
* fix: update checkstyle rule for static import
  • Loading branch information
suraj-qlogic committed Mar 13, 2020
1 parent 6c8dbb3 commit ce22c0ea7d02bd1807eae0076bfe55db1a3b754c
Showing with 6 additions and 57 deletions.
  1. +2 −3 checkstyle.xml
  2. +0 −1 ...main/java/com/google/api/client/googleapis/extensions/android/gms/auth/GoogleAuthIOException.java
  3. +0 −1 ...java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredential.java
  4. +0 −2 ...google/api/client/googleapis/extensions/appengine/notifications/AppEngineNotificationServlet.java
  5. +3 −2 ...google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/MockAppIdentityService.java
  6. +0 −1 ...main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java
  7. +0 −1 ...ain/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClientRequest.java
  8. +0 −1 ...com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializer.java
  9. +0 −2 ...n/java/com/google/api/client/googleapis/extensions/servlet/notifications/NotificationServlet.java
  10. +0 −2 ...src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/WebhookUtils.java
  11. +0 −1 google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/GoogleAtom.java
  12. +0 −1 google-api-client/src/main/java/com/google/api/client/googleapis/MethodOverride.java
  13. +0 −1 ...e-api-client/src/main/java/com/google/api/client/googleapis/apache/GoogleApacheHttpTransport.java
  14. +0 −1 ...-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProvider.java
  15. +0 −1 ...lient/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlow.java
  16. +0 −1 ...src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeRequestUrl.java
  17. +0 −1 ...c/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequest.java
  18. +0 −1 ...ent/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleBrowserClientRequestUrl.java
  19. +0 −1 ...le-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleClientSecrets.java
  20. +0 −1 google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java
  21. +0 −1 google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdToken.java
  22. +0 −1 ...-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java
  23. +0 −1 ...-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleRefreshTokenRequest.java
  24. +0 −1 ...le-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleTokenResponse.java
  25. +0 −1 google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/OAuth2Utils.java
  26. +0 −1 google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchCallback.java
  27. +0 −1 google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchRequest.java
  28. +0 −1 google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchUnparsedResponse.java
  29. +0 −1 google-api-client/src/main/java/com/google/api/client/googleapis/batch/json/JsonBatchCallback.java
  30. +0 −1 google-api-client/src/main/java/com/google/api/client/googleapis/compute/ComputeCredential.java
  31. +0 −1 google-api-client/src/main/java/com/google/api/client/googleapis/javanet/GoogleNetHttpTransport.java
  32. +0 −1 google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonError.java
  33. +0 −1 ...e-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonResponseException.java
  34. +0 −1 google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java
  35. +0 −1 google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaUploadErrorHandler.java
  36. +0 −1 google-api-client/src/main/java/com/google/api/client/googleapis/notifications/StoredChannel.java
  37. +0 −1 ...lient/src/main/java/com/google/api/client/googleapis/notifications/TypedNotificationCallback.java
  38. +0 −1 ...api-client/src/main/java/com/google/api/client/googleapis/notifications/UnparsedNotification.java
  39. +0 −1 ...nt/src/main/java/com/google/api/client/googleapis/notifications/UnparsedNotificationCallback.java
  40. +0 −1 ...t/src/main/java/com/google/api/client/googleapis/notifications/json/JsonNotificationCallback.java
  41. +0 −1 ...i-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java
  42. +0 −1 ...client/src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClient.java
  43. +0 −1 ...src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientRequest.java
  44. +0 −1 ...java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializer.java
  45. +0 −1 google-api-client/src/main/java/com/google/api/client/googleapis/testing/TestUtils.java
  46. +0 −1 ...ient/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockGoogleCredential.java
  47. +1 −2 .../src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockTokenServerTransport.java
  48. +0 −1 ...t/src/main/java/com/google/api/client/googleapis/testing/compute/MockMetadataServerTransport.java
  49. +0 −1 ...java/com/google/api/client/googleapis/testing/json/GoogleJsonResponseExceptionFactoryTesting.java
  50. +0 −1 ...java/com/google/api/client/googleapis/testing/notifications/MockUnparsedNotificationCallback.java
@@ -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>

@@ -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;

/**
@@ -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;
@@ -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;
@@ -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;
}
}
@@ -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;

/**
@@ -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;

/**
@@ -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;

/**
@@ -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;
@@ -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;
@@ -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;
@@ -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;

/**
@@ -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;
@@ -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;
@@ -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;

@@ -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;

/**
@@ -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;

@@ -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;

/**
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;

@@ -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;

/**
@@ -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;
@@ -15,7 +15,6 @@
package com.google.api.client.googleapis.batch;

import com.google.api.client.http.HttpHeaders;

import java.io.IOException;

/**
@@ -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;
@@ -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;
@@ -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;

/**
@@ -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;

@@ -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;
@@ -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;
@@ -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;

/**
@@ -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;
@@ -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;
@@ -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;
@@ -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;

@@ -15,7 +15,6 @@
package com.google.api.client.googleapis.notifications;

import com.google.api.client.util.Beta;

import java.io.InputStream;

/**
@@ -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;

@@ -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;

/**
@@ -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;
@@ -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;