From fd073686468d27eabf9dc994e57dc5fbd08f451f Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 27 Jun 2023 18:53:57 +0000 Subject: [PATCH 1/3] chore(deps): update dependency com.google.googlejavaformat:google-java-format to v1.17.0 --- google-api-client-bom/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index c462f4e07..451bb6aea 100644 --- a/google-api-client-bom/pom.xml +++ b/google-api-client-bom/pom.xml @@ -149,7 +149,7 @@ com.google.googlejavaformat google-java-format - 1.13.0 + 1.17.0 diff --git a/pom.xml b/pom.xml index a34e3b297..2918fecf1 100644 --- a/pom.xml +++ b/pom.xml @@ -486,7 +486,7 @@ com.google.googlejavaformat google-java-format - 1.13.0 + 1.17.0 From 7f456792d8fcb131f9012b91aa4cb6879eda4859 Mon Sep 17 00:00:00 2001 From: Alice Li Date: Wed, 12 Jul 2023 15:12:04 -0400 Subject: [PATCH 2/3] update files failing lint check --- .../accounts/GoogleAccountManager.java | 8 +++-- ...lePlayServicesAvailabilityIOException.java | 4 ++- .../auth/UserRecoverableAuthIOException.java | 4 ++- .../protobuf/AbstractGoogleProtoClient.java | 4 ++- ...onGoogleProtoClientRequestInitializer.java | 4 ++- .../protobuf/MockGoogleProtoClient.java | 4 ++- .../oauth2/GoogleAuthorizationCodeFlow.java | 32 ++++++++++++++----- .../auth/oauth2/GoogleCredential.java | 4 ++- .../auth/oauth2/GoogleIdTokenVerifier.java | 4 ++- .../auth/oauth2/GooglePublicKeysManager.java | 4 ++- .../googleapis/compute/ComputeCredential.java | 4 ++- .../googleapis/media/MediaHttpDownloader.java | 4 ++- .../googleapis/media/MediaHttpUploader.java | 4 ++- .../notifications/TypedNotification.java | 4 ++- .../CommonGoogleClientRequestInitializer.java | 4 ++- ...monGoogleJsonClientRequestInitializer.java | 4 ++- 16 files changed, 72 insertions(+), 24 deletions(-) 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 index 3c7cd127e..cd125d2b7 100644 --- 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 @@ -36,12 +36,16 @@ public final class GoogleAccountManager { /** Account manager. */ private final AccountManager manager; - /** @param accountManager account manager */ + /** + * @param accountManager account manager + */ public GoogleAccountManager(AccountManager accountManager) { this.manager = Preconditions.checkNotNull(accountManager); } - /** @param context context from which to retrieve the account manager */ + /** + * @param context context from which to retrieve the account manager + */ public GoogleAccountManager(Context context) { this(AccountManager.get(context)); } 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 index 30647c1d7..5ff630563 100644 --- 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 @@ -45,7 +45,9 @@ public class GooglePlayServicesAvailabilityIOException extends UserRecoverableAu private static final long serialVersionUID = 1L; - /** @since 1.21.0 */ + /** + * @since 1.21.0 + */ public GooglePlayServicesAvailabilityIOException( GooglePlayServicesAvailabilityException wrapped) { super(wrapped); 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 index b1b6825dd..dccde2b75 100644 --- 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 @@ -41,7 +41,9 @@ public class UserRecoverableAuthIOException extends GoogleAuthIOException { private static final long serialVersionUID = 1L; - /** @since 1.21.0 */ + /** + * @since 1.21.0 + */ public UserRecoverableAuthIOException(UserRecoverableAuthException wrapped) { super(wrapped); } diff --git a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClient.java b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClient.java index 0dd2ac2e4..45bd24062 100644 --- a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClient.java +++ b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClient.java @@ -31,7 +31,9 @@ @Beta public abstract class AbstractGoogleProtoClient extends AbstractGoogleClient { - /** @param builder builder */ + /** + * @param builder builder + */ protected AbstractGoogleProtoClient(Builder builder) { super(builder); } diff --git a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializer.java b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializer.java index c8bf4207d..b0d842001 100644 --- a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializer.java +++ b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializer.java @@ -81,7 +81,9 @@ public CommonGoogleProtoClientRequestInitializer() { super(); } - /** @param key API key or {@code null} to leave it unchanged */ + /** + * @param key API key or {@code null} to leave it unchanged + */ public CommonGoogleProtoClientRequestInitializer(String key) { super(key); } diff --git a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClient.java b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClient.java index 1921e2b49..b420f7107 100644 --- a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClient.java +++ b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClient.java @@ -30,7 +30,9 @@ @Beta public class MockGoogleProtoClient extends AbstractGoogleProtoClient { - /** @param builder builder */ + /** + * @param builder builder + */ protected MockGoogleProtoClient(Builder builder) { super(builder); } diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlow.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlow.java index 65cc8cf5a..d2a506122 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlow.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlow.java @@ -254,49 +254,65 @@ public Builder setScopes(Collection scopes) { return (Builder) super.setScopes(scopes); } - /** @since 1.11 */ + /** + * @since 1.11 + */ @Override public Builder setMethod(AccessMethod method) { return (Builder) super.setMethod(method); } - /** @since 1.11 */ + /** + * @since 1.11 + */ @Override public Builder setTransport(HttpTransport transport) { return (Builder) super.setTransport(transport); } - /** @since 1.11 */ + /** + * @since 1.11 + */ @Override public Builder setJsonFactory(JsonFactory jsonFactory) { return (Builder) super.setJsonFactory(jsonFactory); } - /** @since 1.11 */ + /** + * @since 1.11 + */ @Override public Builder setTokenServerUrl(GenericUrl tokenServerUrl) { return (Builder) super.setTokenServerUrl(tokenServerUrl); } - /** @since 1.11 */ + /** + * @since 1.11 + */ @Override public Builder setClientAuthentication(HttpExecuteInterceptor clientAuthentication) { return (Builder) super.setClientAuthentication(clientAuthentication); } - /** @since 1.11 */ + /** + * @since 1.11 + */ @Override public Builder setClientId(String clientId) { return (Builder) super.setClientId(clientId); } - /** @since 1.11 */ + /** + * @since 1.11 + */ @Override public Builder setAuthorizationServerEncodedUrl(String authorizationServerEncodedUrl) { return (Builder) super.setAuthorizationServerEncodedUrl(authorizationServerEncodedUrl); } - /** @since 1.11 */ + /** + * @since 1.11 + */ @Override public Builder setClock(Clock clock) { return (Builder) super.setClock(clock); diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java index 632b495e6..a3ef07ec4 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java @@ -555,7 +555,9 @@ public Builder setJsonFactory(JsonFactory jsonFactory) { return (Builder) super.setJsonFactory(jsonFactory); } - /** @since 1.9 */ + /** + * @since 1.9 + */ @Override public Builder setClock(Clock clock) { return (Builder) super.setClock(clock); diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java index 6425875d1..e80f3c02c 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java @@ -301,7 +301,9 @@ public Builder setIssuer(String issuer) { return (Builder) super.setIssuer(issuer); } - /** @since 1.21.0 */ + /** + * @since 1.21.0 + */ @Override public Builder setIssuers(Collection issuers) { return (Builder) super.setIssuers(issuers); diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManager.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManager.java index ad047cc25..f4dd7c919 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManager.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManager.java @@ -91,7 +91,9 @@ public GooglePublicKeysManager(HttpTransport transport, JsonFactory jsonFactory) this(new Builder(transport, jsonFactory)); } - /** @param builder builder */ + /** + * @param builder builder + */ protected GooglePublicKeysManager(Builder builder) { transport = builder.transport; jsonFactory = builder.jsonFactory; diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/compute/ComputeCredential.java b/google-api-client/src/main/java/com/google/api/client/googleapis/compute/ComputeCredential.java index 34f30a4d0..7cba4064d 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/compute/ComputeCredential.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/compute/ComputeCredential.java @@ -69,7 +69,9 @@ public ComputeCredential(HttpTransport transport, JsonFactory jsonFactory) { this(new Builder(transport, jsonFactory)); } - /** @param builder builder */ + /** + * @param builder builder + */ protected ComputeCredential(Builder builder) { super(builder); } diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloader.java b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloader.java index a1ecdff39..e633d55be 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloader.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloader.java @@ -300,7 +300,9 @@ public MediaHttpDownloader setContentRange(long firstBytePos, long lastBytePos) return this; } - /** @deprecated Use {@link #setContentRange(long, long)} instead. */ + /** + * @deprecated Use {@link #setContentRange(long, long)} instead. + */ @Deprecated public MediaHttpDownloader setContentRange(long firstBytePos, int lastBytePos) { return setContentRange(firstBytePos, (long) lastBytePos); diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java index 078c56d75..dfc64b2ae 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java @@ -455,7 +455,9 @@ private HttpResponse resumableUpload(GenericUrl initiationRequestUrl) throws IOE } } - /** @return {@code true} if the media length is known, otherwise {@code false} */ + /** + * @return {@code true} if the media length is known, otherwise {@code false} + */ private boolean isMediaLengthKnown() throws IOException { return getMediaContentLength() >= 0; } diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotification.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotification.java index 588a55582..d2dc548c8 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotification.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotification.java @@ -50,7 +50,9 @@ public TypedNotification( super(messageNumber, resourceState, resourceId, resourceUri, channelId); } - /** @param sourceNotification source notification metadata to copy */ + /** + * @param sourceNotification source notification metadata to copy + */ public TypedNotification(UnparsedNotification sourceNotification) { super(sourceNotification); } diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/CommonGoogleClientRequestInitializer.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/CommonGoogleClientRequestInitializer.java index f26572c42..467c6838d 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/CommonGoogleClientRequestInitializer.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/CommonGoogleClientRequestInitializer.java @@ -102,7 +102,9 @@ public class CommonGoogleClientRequestInitializer implements GoogleClientRequest /** Project for quota and billing purposes of {@code null} to leave it unchanged. */ private final String userProject; - /** @deprecated Please use the builder interface */ + /** + * @deprecated Please use the builder interface + */ @Deprecated public CommonGoogleClientRequestInitializer() { this(newBuilder()); diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializer.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializer.java index c52924b49..e1de04ecf 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializer.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializer.java @@ -77,7 +77,9 @@ */ public class CommonGoogleJsonClientRequestInitializer extends CommonGoogleClientRequestInitializer { - /** @deprecated Please use the builder interface */ + /** + * @deprecated Please use the builder interface + */ @Deprecated public CommonGoogleJsonClientRequestInitializer() { super(); From 80b81cb225c948d8fb77506afa807a9eef6cc84b Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Wed, 12 Jul 2023 19:14:37 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- .../accounts/GoogleAccountManager.java | 8 ++--- ...lePlayServicesAvailabilityIOException.java | 4 +-- .../auth/UserRecoverableAuthIOException.java | 4 +-- .../protobuf/AbstractGoogleProtoClient.java | 4 +-- ...onGoogleProtoClientRequestInitializer.java | 4 +-- .../protobuf/MockGoogleProtoClient.java | 4 +-- .../oauth2/GoogleAuthorizationCodeFlow.java | 32 +++++-------------- .../auth/oauth2/GoogleCredential.java | 4 +-- .../auth/oauth2/GoogleIdTokenVerifier.java | 4 +-- .../auth/oauth2/GooglePublicKeysManager.java | 4 +-- .../googleapis/compute/ComputeCredential.java | 4 +-- .../googleapis/media/MediaHttpDownloader.java | 4 +-- .../googleapis/media/MediaHttpUploader.java | 4 +-- .../notifications/TypedNotification.java | 4 +-- .../CommonGoogleClientRequestInitializer.java | 4 +-- ...monGoogleJsonClientRequestInitializer.java | 4 +-- 16 files changed, 24 insertions(+), 72 deletions(-) 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 index cd125d2b7..3c7cd127e 100644 --- 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 @@ -36,16 +36,12 @@ public final class GoogleAccountManager { /** Account manager. */ private final AccountManager manager; - /** - * @param accountManager account manager - */ + /** @param accountManager account manager */ public GoogleAccountManager(AccountManager accountManager) { this.manager = Preconditions.checkNotNull(accountManager); } - /** - * @param context context from which to retrieve the account manager - */ + /** @param context context from which to retrieve the account manager */ public GoogleAccountManager(Context context) { this(AccountManager.get(context)); } 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 index 5ff630563..30647c1d7 100644 --- 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 @@ -45,9 +45,7 @@ public class GooglePlayServicesAvailabilityIOException extends UserRecoverableAu private static final long serialVersionUID = 1L; - /** - * @since 1.21.0 - */ + /** @since 1.21.0 */ public GooglePlayServicesAvailabilityIOException( GooglePlayServicesAvailabilityException wrapped) { super(wrapped); 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 index dccde2b75..b1b6825dd 100644 --- 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 @@ -41,9 +41,7 @@ public class UserRecoverableAuthIOException extends GoogleAuthIOException { private static final long serialVersionUID = 1L; - /** - * @since 1.21.0 - */ + /** @since 1.21.0 */ public UserRecoverableAuthIOException(UserRecoverableAuthException wrapped) { super(wrapped); } diff --git a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClient.java b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClient.java index 45bd24062..0dd2ac2e4 100644 --- a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClient.java +++ b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClient.java @@ -31,9 +31,7 @@ @Beta public abstract class AbstractGoogleProtoClient extends AbstractGoogleClient { - /** - * @param builder builder - */ + /** @param builder builder */ protected AbstractGoogleProtoClient(Builder builder) { super(builder); } diff --git a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializer.java b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializer.java index b0d842001..c8bf4207d 100644 --- a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializer.java +++ b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializer.java @@ -81,9 +81,7 @@ public CommonGoogleProtoClientRequestInitializer() { super(); } - /** - * @param key API key or {@code null} to leave it unchanged - */ + /** @param key API key or {@code null} to leave it unchanged */ public CommonGoogleProtoClientRequestInitializer(String key) { super(key); } diff --git a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClient.java b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClient.java index b420f7107..1921e2b49 100644 --- a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClient.java +++ b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClient.java @@ -30,9 +30,7 @@ @Beta public class MockGoogleProtoClient extends AbstractGoogleProtoClient { - /** - * @param builder builder - */ + /** @param builder builder */ protected MockGoogleProtoClient(Builder builder) { super(builder); } diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlow.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlow.java index d2a506122..65cc8cf5a 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlow.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlow.java @@ -254,65 +254,49 @@ public Builder setScopes(Collection scopes) { return (Builder) super.setScopes(scopes); } - /** - * @since 1.11 - */ + /** @since 1.11 */ @Override public Builder setMethod(AccessMethod method) { return (Builder) super.setMethod(method); } - /** - * @since 1.11 - */ + /** @since 1.11 */ @Override public Builder setTransport(HttpTransport transport) { return (Builder) super.setTransport(transport); } - /** - * @since 1.11 - */ + /** @since 1.11 */ @Override public Builder setJsonFactory(JsonFactory jsonFactory) { return (Builder) super.setJsonFactory(jsonFactory); } - /** - * @since 1.11 - */ + /** @since 1.11 */ @Override public Builder setTokenServerUrl(GenericUrl tokenServerUrl) { return (Builder) super.setTokenServerUrl(tokenServerUrl); } - /** - * @since 1.11 - */ + /** @since 1.11 */ @Override public Builder setClientAuthentication(HttpExecuteInterceptor clientAuthentication) { return (Builder) super.setClientAuthentication(clientAuthentication); } - /** - * @since 1.11 - */ + /** @since 1.11 */ @Override public Builder setClientId(String clientId) { return (Builder) super.setClientId(clientId); } - /** - * @since 1.11 - */ + /** @since 1.11 */ @Override public Builder setAuthorizationServerEncodedUrl(String authorizationServerEncodedUrl) { return (Builder) super.setAuthorizationServerEncodedUrl(authorizationServerEncodedUrl); } - /** - * @since 1.11 - */ + /** @since 1.11 */ @Override public Builder setClock(Clock clock) { return (Builder) super.setClock(clock); diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java index a3ef07ec4..632b495e6 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java @@ -555,9 +555,7 @@ public Builder setJsonFactory(JsonFactory jsonFactory) { return (Builder) super.setJsonFactory(jsonFactory); } - /** - * @since 1.9 - */ + /** @since 1.9 */ @Override public Builder setClock(Clock clock) { return (Builder) super.setClock(clock); diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java index e80f3c02c..6425875d1 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java @@ -301,9 +301,7 @@ public Builder setIssuer(String issuer) { return (Builder) super.setIssuer(issuer); } - /** - * @since 1.21.0 - */ + /** @since 1.21.0 */ @Override public Builder setIssuers(Collection issuers) { return (Builder) super.setIssuers(issuers); diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManager.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManager.java index f4dd7c919..ad047cc25 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManager.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManager.java @@ -91,9 +91,7 @@ public GooglePublicKeysManager(HttpTransport transport, JsonFactory jsonFactory) this(new Builder(transport, jsonFactory)); } - /** - * @param builder builder - */ + /** @param builder builder */ protected GooglePublicKeysManager(Builder builder) { transport = builder.transport; jsonFactory = builder.jsonFactory; diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/compute/ComputeCredential.java b/google-api-client/src/main/java/com/google/api/client/googleapis/compute/ComputeCredential.java index 7cba4064d..34f30a4d0 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/compute/ComputeCredential.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/compute/ComputeCredential.java @@ -69,9 +69,7 @@ public ComputeCredential(HttpTransport transport, JsonFactory jsonFactory) { this(new Builder(transport, jsonFactory)); } - /** - * @param builder builder - */ + /** @param builder builder */ protected ComputeCredential(Builder builder) { super(builder); } diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloader.java b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloader.java index e633d55be..a1ecdff39 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloader.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloader.java @@ -300,9 +300,7 @@ public MediaHttpDownloader setContentRange(long firstBytePos, long lastBytePos) return this; } - /** - * @deprecated Use {@link #setContentRange(long, long)} instead. - */ + /** @deprecated Use {@link #setContentRange(long, long)} instead. */ @Deprecated public MediaHttpDownloader setContentRange(long firstBytePos, int lastBytePos) { return setContentRange(firstBytePos, (long) lastBytePos); diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java index dfc64b2ae..078c56d75 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java @@ -455,9 +455,7 @@ private HttpResponse resumableUpload(GenericUrl initiationRequestUrl) throws IOE } } - /** - * @return {@code true} if the media length is known, otherwise {@code false} - */ + /** @return {@code true} if the media length is known, otherwise {@code false} */ private boolean isMediaLengthKnown() throws IOException { return getMediaContentLength() >= 0; } diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotification.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotification.java index d2dc548c8..588a55582 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotification.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotification.java @@ -50,9 +50,7 @@ public TypedNotification( super(messageNumber, resourceState, resourceId, resourceUri, channelId); } - /** - * @param sourceNotification source notification metadata to copy - */ + /** @param sourceNotification source notification metadata to copy */ public TypedNotification(UnparsedNotification sourceNotification) { super(sourceNotification); } diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/CommonGoogleClientRequestInitializer.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/CommonGoogleClientRequestInitializer.java index 467c6838d..f26572c42 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/CommonGoogleClientRequestInitializer.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/CommonGoogleClientRequestInitializer.java @@ -102,9 +102,7 @@ public class CommonGoogleClientRequestInitializer implements GoogleClientRequest /** Project for quota and billing purposes of {@code null} to leave it unchanged. */ private final String userProject; - /** - * @deprecated Please use the builder interface - */ + /** @deprecated Please use the builder interface */ @Deprecated public CommonGoogleClientRequestInitializer() { this(newBuilder()); diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializer.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializer.java index e1de04ecf..c52924b49 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializer.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializer.java @@ -77,9 +77,7 @@ */ public class CommonGoogleJsonClientRequestInitializer extends CommonGoogleClientRequestInitializer { - /** - * @deprecated Please use the builder interface - */ + /** @deprecated Please use the builder interface */ @Deprecated public CommonGoogleJsonClientRequestInitializer() { super();