elharo
diff --git a/‎google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredential.java‎
Lines changed: 41 additions & 20 deletions b/‎google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredential.java‎
Lines changed: 41 additions & 20 deletions
diff --git a/‎google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdToken.java‎
Lines changed: 5 additions & 0 deletions b/‎google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdToken.java‎
Lines changed: 5 additions & 0 deletions
@@ -21,7 +21,6 @@
 import com.google.appengine.api.appidentity.AppIdentityService;
 import com.google.appengine.api.appidentity.AppIdentityServiceFactory;
 import com.google.appengine.api.appidentity.AppIdentityServiceFailureException;
-import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 
 import java.io.IOException;
@@ -63,24 +62,42 @@ public class AppIdentityCredential implements HttpRequestInitializer, HttpExecut
    * @param scopes OAuth scopes
    */
   public AppIdentityCredential(Iterable<String> scopes) {
-    this(AppIdentityServiceFactory.getAppIdentityService(), ImmutableList.copyOf(scopes));
+    this(new Builder(scopes));
   }
 
   /**
    * @param scopes OAuth scopes
    */
   public AppIdentityCredential(String... scopes) {
-    this(AppIdentityServiceFactory.getAppIdentityService(), ImmutableList.copyOf(scopes));
+    this(new Builder(scopes));
+  }
+
+  /**
+   * @param builder builder
+   *
+   * @since 1.14
+   */
+  protected AppIdentityCredential(Builder builder) {
+    // Lazily retrieved rather than setting as the default value in order to not add runtime
+    // dependencies on AppIdentityServiceFactory unless it is actually being used.
+    appIdentityService = builder.appIdentityService == null
+        ? AppIdentityServiceFactory.getAppIdentityService() : builder.appIdentityService;
+    scopes = ImmutableList.copyOf(builder.scopes);
   }
 
   /**
    * @param appIdentityService App Identity Service that provides the access token
    * @param scopes OAuth scopes
    *
    * @since 1.12
+   * @deprecated (scheduled to be removed in 1.15) Use {@link #AppIdentityCredential(Builder)}
    */
+  @Deprecated
   protected AppIdentityCredential(AppIdentityService appIdentityService, List<String> scopes) {
-    this.appIdentityService = Preconditions.checkNotNull(appIdentityService);
+    // Lazily retrieved rather than setting as the default value in order to not add runtime
+    // dependencies on AppIdentityServiceFactory unless it is actually being used.
+    this.appIdentityService = appIdentityService == null
+        ? AppIdentityServiceFactory.getAppIdentityService() : appIdentityService;
     this.scopes = ImmutableList.copyOf(scopes);
   }
 
@@ -133,11 +150,14 @@ public final List<String> getScopes() {
    */
   public static class Builder {
 
-    /** App Identity Service that provides the access token. */
-    private AppIdentityService appIdentityService;
+    /**
+     * App Identity Service that provides the access token or {@code null} to use
+     * {@link AppIdentityServiceFactory#getAppIdentityService()}.
+     */
+    AppIdentityService appIdentityService;
 
     /** OAuth scopes. */
-    private final ImmutableList<String> scopes;
+    final ImmutableList<String> scopes;
 
     /**
      * Returns an instance of a new builder.
@@ -158,33 +178,34 @@ public Builder(String... scopes) {
     }
 
     /**
-     * Sets the App Identity Service that provides the access token.
-     * <p>
-     * If not explicitly set, the {@link AppIdentityServiceFactory#getAppIdentityService()} method
-     * will be used to provide the App Identity Service.
-     * </p>
+     * Returns the App Identity Service that provides the access token or {@code null} to use
+     * {@link AppIdentityServiceFactory#getAppIdentityService()}.
+     *
+     * @since 1.14
+     */
+    public final AppIdentityService getAppIdentityService() {
+      return appIdentityService;
+    }
+
+    /**
+     * Sets the App Identity Service that provides the access token or {@code null} to use
+     * {@link AppIdentityServiceFactory#getAppIdentityService()}.
      *
      * <p>
      * Overriding is only supported for the purpose of calling the super implementation and changing
      * the return type, but nothing else.
      * </p>
      */
     public Builder setAppIdentityService(AppIdentityService appIdentityService) {
-      this.appIdentityService = Preconditions.checkNotNull(appIdentityService);
+      this.appIdentityService = appIdentityService;
       return this;
     }
 
     /**
      * Returns a new {@link AppIdentityCredential}.
      */
     public AppIdentityCredential build() {
-      AppIdentityService appIdentityService = this.appIdentityService;
-      if (appIdentityService == null) {
-        // Lazily retrieved rather than setting as the default value in order to not add runtime
-        // dependencies on AppIdentityServiceFactory unless it is actually being used.
-        appIdentityService = AppIdentityServiceFactory.getAppIdentityService();
-      }
-      return new AppIdentityCredential(appIdentityService, scopes);
+      return new AppIdentityCredential(this);
     }
   }
 }
@@ -22,6 +22,7 @@
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
+import java.util.Collection;
 
 /**
  * Google ID tokens.
@@ -70,7 +71,11 @@ public GoogleIdToken(
 
   /**
    * Verifies that this ID token is valid using {@link GoogleIdTokenVerifier#verify(GoogleIdToken)}.
+   *
+   * @deprecated (scheduled to be removed in 1.15) Use
+   *             {@link GoogleIdTokenVerifier#verify(GoogleIdToken, Collection, Collection)}
    */
+  @Deprecated
   public boolean verify(GoogleIdTokenVerifier verifier)
       throws GeneralSecurityException, IOException {
     return verifier.verify(this);