Sample usage: * - *
+ * {@code
* public class ServletCallbackSample extends AbstractAppEngineAuthorizationCodeCallbackServlet {
*
* @Override
@@ -77,7 +77,7 @@
* "https://server.example.com/authorize").setCredentialStore(new AppEngineCredentialStore())
* .build();
* }
- *
+ * }
*
* @since 1.7
* @author Yaniv Inbar
diff --git a/google-oauth-client-appengine/src/main/java/com/google/api/client/extensions/appengine/auth/oauth2/AbstractAppEngineAuthorizationCodeServlet.java b/google-oauth-client-appengine/src/main/java/com/google/api/client/extensions/appengine/auth/oauth2/AbstractAppEngineAuthorizationCodeServlet.java
index 5153f282..df313aca 100644
--- a/google-oauth-client-appengine/src/main/java/com/google/api/client/extensions/appengine/auth/oauth2/AbstractAppEngineAuthorizationCodeServlet.java
+++ b/google-oauth-client-appengine/src/main/java/com/google/api/client/extensions/appengine/auth/oauth2/AbstractAppEngineAuthorizationCodeServlet.java
@@ -43,7 +43,7 @@
*
* Sample usage: * - *
+ * {@code
* public class ServletSample extends AbstractAppEngineAuthorizationCodeServlet {
*
* @Override
@@ -71,7 +71,7 @@
* .build();
* }
* }
- *
+ * }
*
* @since 1.7
* @author Yaniv Inbar
diff --git a/google-oauth-client-appengine/src/main/java/com/google/api/client/extensions/appengine/auth/oauth2/AppEngineCredentialStore.java b/google-oauth-client-appengine/src/main/java/com/google/api/client/extensions/appengine/auth/oauth2/AppEngineCredentialStore.java
index 05a9d547..a09e9266 100644
--- a/google-oauth-client-appengine/src/main/java/com/google/api/client/extensions/appengine/auth/oauth2/AppEngineCredentialStore.java
+++ b/google-oauth-client-appengine/src/main/java/com/google/api/client/extensions/appengine/auth/oauth2/AppEngineCredentialStore.java
@@ -84,14 +84,14 @@ public boolean load(String userId, Credential credential) {
*
* Sample usage: * - *
+ * {@code
* public static AppEngineDataStore migrate(AppEngineCredentialStore credentialStore)
* throws IOException {
* AppEngineDataStore dataStore = new AppEngineDataStore();
* credentialStore.migrateTo(dataStore);
* return dataStore;
* }
- *
+ * }
*
* @param dataStoreFactory App Engine data store factory
* @since 1.16
diff --git a/google-oauth-client-appengine/src/main/java/com/google/api/client/extensions/appengine/auth/oauth2/jakarta/AbstractAppEngineAuthorizationCodeCallbackServlet.java b/google-oauth-client-appengine/src/main/java/com/google/api/client/extensions/appengine/auth/oauth2/jakarta/AbstractAppEngineAuthorizationCodeCallbackServlet.java
index d49bcd9b..07abe863 100644
--- a/google-oauth-client-appengine/src/main/java/com/google/api/client/extensions/appengine/auth/oauth2/jakarta/AbstractAppEngineAuthorizationCodeCallbackServlet.java
+++ b/google-oauth-client-appengine/src/main/java/com/google/api/client/extensions/appengine/auth/oauth2/jakarta/AbstractAppEngineAuthorizationCodeCallbackServlet.java
@@ -43,7 +43,7 @@
*
* Sample usage: * - *
+ * {@code
* public class ServletCallbackSample extends AbstractAppEngineAuthorizationCodeCallbackServlet {
*
* @Override
@@ -77,7 +77,7 @@
* "https://server.example.com/authorize").setCredentialStore(new AppEngineCredentialStore())
* .build();
* }
- *
+ * }
*
* @since 1.36.0
*/
diff --git a/google-oauth-client-appengine/src/main/java/com/google/api/client/extensions/appengine/auth/oauth2/jakarta/AbstractAppEngineAuthorizationCodeServlet.java b/google-oauth-client-appengine/src/main/java/com/google/api/client/extensions/appengine/auth/oauth2/jakarta/AbstractAppEngineAuthorizationCodeServlet.java
index 2f334f72..667505cc 100644
--- a/google-oauth-client-appengine/src/main/java/com/google/api/client/extensions/appengine/auth/oauth2/jakarta/AbstractAppEngineAuthorizationCodeServlet.java
+++ b/google-oauth-client-appengine/src/main/java/com/google/api/client/extensions/appengine/auth/oauth2/jakarta/AbstractAppEngineAuthorizationCodeServlet.java
@@ -43,7 +43,7 @@
*
* Sample usage: * - *
+ * {@code
* public class ServletSample extends AbstractAppEngineAuthorizationCodeServlet {
*
* @Override
@@ -71,7 +71,7 @@
* .build();
* }
* }
- *
+ * }
*
* @since 1.36.0
*/
diff --git a/google-oauth-client-assembly/pom.xml b/google-oauth-client-assembly/pom.xml
index d7ddd2d9..67c0665a 100644
--- a/google-oauth-client-assembly/pom.xml
+++ b/google-oauth-client-assembly/pom.xml
@@ -4,7 +4,7 @@
Sample usage: * - *
+ * {@code
* public static FileDataStore migrate(FileCredentialStore credentialStore, File dataDirectory)
* throws IOException {
* FileDataStore dataStore = new FileDataStore(dataDirectory);
* credentialStore.migrateTo(dataStore);
* return dataStore;
* }
- *
+ * }
*
* @param dataStoreFactory file data store factory
* @throws IOException
diff --git a/google-oauth-client-jetty/pom.xml b/google-oauth-client-jetty/pom.xml
index 16a5acde..f7a1eda7 100644
--- a/google-oauth-client-jetty/pom.xml
+++ b/google-oauth-client-jetty/pom.xml
@@ -4,7 +4,7 @@
Sample usage: * - *
+ * {@code
* public class ServletCallbackSample extends AbstractAuthorizationCodeCallbackServlet {
*
* @Override
@@ -81,7 +81,7 @@
* // return user ID
* }
* }
- *
+ * }
*
* @since 1.7
* @author Yaniv Inbar
diff --git a/google-oauth-client-servlet/src/main/java/com/google/api/client/extensions/servlet/auth/oauth2/AbstractAuthorizationCodeServlet.java b/google-oauth-client-servlet/src/main/java/com/google/api/client/extensions/servlet/auth/oauth2/AbstractAuthorizationCodeServlet.java
index ff760b9c..1784b639 100644
--- a/google-oauth-client-servlet/src/main/java/com/google/api/client/extensions/servlet/auth/oauth2/AbstractAuthorizationCodeServlet.java
+++ b/google-oauth-client-servlet/src/main/java/com/google/api/client/extensions/servlet/auth/oauth2/AbstractAuthorizationCodeServlet.java
@@ -49,7 +49,7 @@
*
* Sample usage: * - *
+ * {@code
* public class ServletSample extends AbstractAuthorizationCodeServlet {
*
* @Override
@@ -83,7 +83,7 @@
* // return user ID
* }
* }
- *
+ * }
*
* @since 1.7
* @author Yaniv Inbar
diff --git a/google-oauth-client-servlet/src/main/java/com/google/api/client/extensions/servlet/auth/oauth2/jakarta/AbstractAuthorizationCodeCallbackServlet.java b/google-oauth-client-servlet/src/main/java/com/google/api/client/extensions/servlet/auth/oauth2/jakarta/AbstractAuthorizationCodeCallbackServlet.java
index 65f901bd..30ebb5cd 100644
--- a/google-oauth-client-servlet/src/main/java/com/google/api/client/extensions/servlet/auth/oauth2/jakarta/AbstractAuthorizationCodeCallbackServlet.java
+++ b/google-oauth-client-servlet/src/main/java/com/google/api/client/extensions/servlet/auth/oauth2/jakarta/AbstractAuthorizationCodeCallbackServlet.java
@@ -40,7 +40,7 @@
*
* Sample usage: * - *
+ * {@code
* public class ServletCallbackSample extends AbstractAuthorizationCodeCallbackServlet {
*
* @Override
@@ -81,7 +81,7 @@
* // return user ID
* }
* }
- *
+ * }
*
* @since 1.36.0
*/
diff --git a/google-oauth-client-servlet/src/main/java/com/google/api/client/extensions/servlet/auth/oauth2/jakarta/AbstractAuthorizationCodeServlet.java b/google-oauth-client-servlet/src/main/java/com/google/api/client/extensions/servlet/auth/oauth2/jakarta/AbstractAuthorizationCodeServlet.java
index 64e20869..af3b2fbd 100644
--- a/google-oauth-client-servlet/src/main/java/com/google/api/client/extensions/servlet/auth/oauth2/jakarta/AbstractAuthorizationCodeServlet.java
+++ b/google-oauth-client-servlet/src/main/java/com/google/api/client/extensions/servlet/auth/oauth2/jakarta/AbstractAuthorizationCodeServlet.java
@@ -49,7 +49,7 @@
*
* Sample usage: * - *
+ * {@code
* public class ServletSample extends AbstractAuthorizationCodeServlet {
*
* @Override
@@ -83,7 +83,7 @@
* // return user ID
* }
* }
- *
+ * }
*
* @since 1.36.0
*/
diff --git a/google-oauth-client/pom.xml b/google-oauth-client/pom.xml
index 750d9cdc..6d4d4a57 100644
--- a/google-oauth-client/pom.xml
+++ b/google-oauth-client/pom.xml
@@ -4,7 +4,7 @@
Sample usage, taking advantage that this class implements {@link HttpRequestInitializer}: * - *
+ * {@code
* public static HttpRequestFactory createRequestFactory(HttpTransport transport) {
* OAuthParameters parameters = new OAuthParameters();
* // ...
* return transport.createRequestFactory(parameters);
* }
- *
+ * }
*
* If you have a custom request initializer, take a look at the sample usage for {@link * HttpExecuteInterceptor}, which this class also implements. diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeFlow.java b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeFlow.java index 4b4944ff..722a3e15 100644 --- a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeFlow.java +++ b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeFlow.java @@ -174,7 +174,7 @@ protected AuthorizationCodeFlow(Builder builder) { * the {@link #getAuthorizationServerEncodedUrl()}, {@link #getClientId()}, and {@link * #getScopes()}. Sample usage: * - *
+ * {@code
* private AuthorizationCodeFlow flow;
*
* public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
@@ -182,7 +182,7 @@ protected AuthorizationCodeFlow(Builder builder) {
* .setRedirectUri("https://client.example.com/rd").build();
* response.sendRedirect(url);
* }
- *
+ * }
*/
public AuthorizationCodeRequestUrl newAuthorizationUrl() {
AuthorizationCodeRequestUrl url =
diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeRequestUrl.java b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeRequestUrl.java
index 15e8b51c..87d18c8d 100644
--- a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeRequestUrl.java
+++ b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeRequestUrl.java
@@ -31,14 +31,14 @@
*
* Sample usage for a web application: * - *
+ * {@code
* public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
* String url =
* new AuthorizationCodeRequestUrl("https://server.example.com/authorize", "s6BhdRkqt3")
* .setState("xyz").setRedirectUri("https://client.example.com/rd").build();
* response.sendRedirect(url);
* }
- *
+ * }
*
* Implementation is not thread-safe. * diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeResponseUrl.java b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeResponseUrl.java index 6f85e8ba..f66c773a 100644 --- a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeResponseUrl.java +++ b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeResponseUrl.java @@ -27,7 +27,7 @@ * *
Sample usage: * - *
+ * {@code
* public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
* StringBuffer fullUrlBuf = request.getRequestURL();
* if (request.getQueryString() != null) {
@@ -42,7 +42,7 @@
* // request access token using authResponse.getCode()...
* }
* }
- *
+ * }
*
* Implementation is not thread-safe. * diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeTokenRequest.java b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeTokenRequest.java index b2c77cad..f2676c28 100644 --- a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeTokenRequest.java +++ b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationCodeTokenRequest.java @@ -34,7 +34,7 @@ * *
Sample usage: * - *
+ * {@code
* static void requestAccessToken() throws IOException {
* try {
* TokenResponse response =
@@ -58,7 +58,7 @@
* }
* }
* }
- *
+ * }
*
* Some OAuth 2.0 providers don't support {@link BasicAuthentication} but instead support {@link * ClientParametersAuthentication}. In the above sample code, simply replace the class name and it diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationRequestUrl.java b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationRequestUrl.java index 819ca8bb..45fd1f23 100644 --- a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationRequestUrl.java +++ b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/AuthorizationRequestUrl.java @@ -27,14 +27,14 @@ * *
Sample usage for a web application: * - *
+ * {@code
* public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
* String url = new AuthorizationRequestUrl(
* "https://server.example.com/authorize", "s6BhdRkqt3", Arrays.asList("code")).setState("xyz")
* .setRedirectUri("https://client.example.com/rd").build();
* response.sendRedirect(url);
* }
- *
+ * }
*
* Implementation is not thread-safe. * diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/BrowserClientRequestUrl.java b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/BrowserClientRequestUrl.java index 84ac6636..5147bfa9 100644 --- a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/BrowserClientRequestUrl.java +++ b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/BrowserClientRequestUrl.java @@ -27,14 +27,14 @@ * *
Sample usage for a web application: * - *
+ * {@code
* public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
* String url = new BrowserClientRequestUrl(
* "https://server.example.com/authorize", "s6BhdRkqt3").setState("xyz")
* .setRedirectUri("https://client.example.com/cb").build();
* response.sendRedirect(url);
* }
- *
+ * }
*
* Implementation is not thread-safe. * diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/ClientCredentialsTokenRequest.java b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/ClientCredentialsTokenRequest.java index 4af05c27..3cda14f3 100644 --- a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/ClientCredentialsTokenRequest.java +++ b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/ClientCredentialsTokenRequest.java @@ -32,7 +32,7 @@ * *
Sample usage: * - *
+ * {@code
* static void requestAccessToken() throws IOException {
* try {
* TokenResponse response =
@@ -56,7 +56,7 @@
* }
* }
* }
- *
+ * }
*
* Some OAuth 2.0 providers don't support {@link BasicAuthentication} but instead support {@link * ClientParametersAuthentication}. In the above sample code, simply replace the class name and it diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/ClientParametersAuthentication.java b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/ClientParametersAuthentication.java index 13e88fcd..17fca49d 100644 --- a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/ClientParametersAuthentication.java +++ b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/ClientParametersAuthentication.java @@ -33,7 +33,7 @@ * *
Sample usage: * - *
+ * {@code
* static void requestAccessToken() throws IOException {
* try {
* TokenResponse response = new AuthorizationCodeTokenRequest(new NetHttpTransport(),
@@ -56,7 +56,7 @@
* }
* }
* }
- *
+ * }
*
* Implementation is immutable and thread-safe. * diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/Credential.java b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/Credential.java index ce7ec786..fdeb742f 100644 --- a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/Credential.java +++ b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/Credential.java @@ -43,7 +43,7 @@ * *
Sample usage: * - *
+ * {@code
* public static Credential createCredentialWithAccessTokenOnly(
* HttpTransport transport, JsonFactory jsonFactory, TokenResponse tokenResponse) {
* return new Credential(BearerToken.authorizationHeaderAccessMethod()).setFromTokenResponse(
@@ -61,7 +61,7 @@
* .build()
* .setFromTokenResponse(tokenResponse);
* }
- *
+ * }
*
* If you need to persist the access token in a data store, use {@link DataStoreFactory} and * {@link Builder#addRefreshListener(CredentialRefreshListener)} with {@link diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/DataStoreCredentialRefreshListener.java b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/DataStoreCredentialRefreshListener.java index 1ed8f911..e4a9b54a 100644 --- a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/DataStoreCredentialRefreshListener.java +++ b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/DataStoreCredentialRefreshListener.java @@ -28,14 +28,14 @@ *
It needs to be added as a refresh listener using {@link * Credential.Builder#addRefreshListener}. Sample usage: * - *
+ * {@code
* static void addDataStoreCredentialRefreshListener(
* Credential.Builder credentialBuilder, String userId, DataStoreFactory dataStoreFactory)
* throws IOException {
* credentialBuilder.addRefreshListener(
* new DataStoreCredentialRefreshListener(userId, dataStoreFactory));
* }
- *
+ * }
*
* @since 1.6
* @author Yaniv Inbar
diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/PasswordTokenRequest.java b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/PasswordTokenRequest.java
index 313b17e1..45e16d7a 100644
--- a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/PasswordTokenRequest.java
+++ b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/PasswordTokenRequest.java
@@ -35,7 +35,7 @@
*
* Sample usage: * - *
+ * {@code
* static void requestAccessToken() throws IOException {
* try {
* TokenResponse response =
@@ -59,7 +59,7 @@
* }
* }
* }
- *
+ * }
*
* Some OAuth 2.0 providers don't support {@link BasicAuthentication} but instead support {@link * ClientParametersAuthentication}. In the above sample code, simply replace the class name and it diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/RefreshTokenRequest.java b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/RefreshTokenRequest.java index e07fd0ef..6097cd63 100644 --- a/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/RefreshTokenRequest.java +++ b/google-oauth-client/src/main/java/com/google/api/client/auth/oauth2/RefreshTokenRequest.java @@ -34,7 +34,7 @@ * *
Sample usage: * - *
+ * {@code
* static void refreshAccessToken() throws IOException {
* try {
* TokenResponse response =
@@ -57,7 +57,7 @@
* }
* }
* }
- *
+ * }
*
* Some OAuth 2.0 providers don't support {@link BasicAuthentication} but instead support {@link * ClientParametersAuthentication}. In the above sample code, simply replace the class name and it diff --git a/google-oauth-client/src/main/java/com/google/api/client/auth/openidconnect/IdTokenResponse.java b/google-oauth-client/src/main/java/com/google/api/client/auth/openidconnect/IdTokenResponse.java index 94feabb1..59c597df 100644 --- a/google-oauth-client/src/main/java/com/google/api/client/auth/openidconnect/IdTokenResponse.java +++ b/google-oauth-client/src/main/java/com/google/api/client/auth/openidconnect/IdTokenResponse.java @@ -32,12 +32,12 @@ * *
Implementation is not thread-safe. Sample usage: * - *
+ * {@code
* static JsonWebSignature executeIdToken(TokenRequest tokenRequest) throws IOException {
* IdTokenResponse idTokenResponse = IdTokenResponse.execute(tokenRequest);
* return idTokenResponse.parseIdToken();
* }
- *
+ * }
*
* @since 1.7
* @author Yaniv Inbar
diff --git a/owlbot.py b/owlbot.py
deleted file mode 100644
index b799eeb7..00000000
--- a/owlbot.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import synthtool as s
-from synthtool.languages import java
-
-
-for library in s.get_staging_dirs():
- # put any special-case replacements here
- s.move(library)
-
-s.remove_staging_dirs()
-java.common_templates(
- excludes=[
- "README.md",
- "java.header",
- "checkstyle.xml",
- "renovate.json",
- "license-checks.xml",
- ".github/workflows/ci.yaml",
- ".kokoro/requirements.in",
- ".kokoro/requirements.txt"
- ]
-)
diff --git a/pom.xml b/pom.xml
index eec231e3..82f9dc1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@