Remove deprecated methods (#190)

* add App Engine API to pom.xml with test scope

* remove deprecated methods

* remove one more deprecated comment

* 1.9.71 appngine api

Author: elharo

appengine/java/com/google/auth/appengine/AppEngineCredentials.java

@@ -62,30 +62,7 @@ public class AppEngineCredentials extends GoogleCredentials implements ServiceAc
 
   private transient AppIdentityService appIdentityService;
 
-  /**
-   * Create a new AppEngineCredential.
-   *
-   * @param scopes Collection of scopes to request.
-   *
-   * @deprecated Use {@link #newBuilder()} instead. This constructor will either be deleted or made
-   *             private in a later version.
-   */
-  @Deprecated
-  public AppEngineCredentials(Collection<String> scopes) {
-    this(scopes, null);
-  }
-
-  /**
-   * Create a new AppEngineCredential.
-   *
-   * @param scopes Collection of scopes to request.
-   * @param appIdentityService Custom service used for signing.
-   *
-   * @deprecated Use {@link #newBuilder()} instead. This constructor will either be deleted or made
-   *             private in a later version.
-   */
-  @Deprecated
-  public AppEngineCredentials(Collection<String> scopes, AppIdentityService appIdentityService) {
+  private AppEngineCredentials(Collection<String> scopes, AppIdentityService appIdentityService) {
     this.scopes = scopes == null ? ImmutableSet.<String>of() : ImmutableList.copyOf(scopes);
     this.appIdentityService = appIdentityService != null ? appIdentityService 
         : AppIdentityServiceFactory.getAppIdentityService();

oauth2_http/java/com/google/auth/oauth2/ClientId.java

@@ -136,11 +136,8 @@ public static ClientId fromStream(InputStream stream) throws IOException {
    *
    * @param clientId Text identifier of the Client ID.
    * @param clientSecret Secret to associated with the Client ID.
-   * @deprecated Use {@link #of(String, String)} instead. This constructor will either be deleted
-   *             or made private in a later version.
    */
-  @Deprecated
-  public ClientId(String clientId, String clientSecret) {
+  private ClientId(String clientId, String clientSecret) {
     this.clientId = Preconditions.checkNotNull(clientId);
     this.clientSecret = clientSecret;
   }

oauth2_http/java/com/google/auth/oauth2/CloudShellCredentials.java

@@ -55,7 +55,7 @@ public class CloudShellCredentials extends GoogleCredentials {
 
   /**
    * The Cloud Shell back authorization channel uses serialized
-   * Javascript Protobufers, preceeded by the message length and a
+   * Javascript Protobuffers, preceded by the message length and a
    * new line character. However, the request message has no content,
    * so a token request consists of an empty JsPb, and its 2 character
    * length prefix.
@@ -65,27 +65,11 @@ public class CloudShellCredentials extends GoogleCredentials {
 
   private final int authPort;
 
-  /**
-   * @param authPort Authentication port.
-   * @return The CloudShellCredentials.
-   * @deprecated Use {@link #create(int)} instead. This method will be deleted in a later version.
-   */
-  @Deprecated
-  public static CloudShellCredentials of(int authPort) {
-    return create(authPort);
-  }
-
   public static CloudShellCredentials create(int authPort) {
     return CloudShellCredentials.newBuilder().setAuthPort(authPort).build();
   }
 
-  /**
-   * @param authPort Authentication port.
-   * @deprecated Use {@link #create(int)} instead. This constructor will either be deleted or
-   *             made private in a later version.
-   */
-  @Deprecated
-  public CloudShellCredentials(int authPort) {
+  private CloudShellCredentials(int authPort) {
     this.authPort = authPort;
   }
 

oauth2_http/java/com/google/auth/oauth2/ComputeEngineCredentials.java

@@ -97,40 +97,13 @@ public class ComputeEngineCredentials extends GoogleCredentials implements Servi
   private transient HttpTransportFactory transportFactory;
   private transient String serviceAccountEmail;
 
-  /**
-   * Returns a credentials instance from the given transport factory
-   *
-   * @param transportFactory The Http transport factory
-   * @return the credential instance
-   * @deprecated Use {@link #newBuilder()} instead. This constructor will either be deleted or made
-   *             private in a later version.
-   */
-  @Deprecated
-  public static ComputeEngineCredentials of(HttpTransportFactory transportFactory) {
-    return ComputeEngineCredentials.newBuilder().setHttpTransportFactory(transportFactory).build();
-  }
-
-  /**
-   * Create a new ComputeEngineCredentials instance with default behavior.
-   *
-   * @deprecated Use {@link #create()} instead. This constructor will either be deleted or
-   *             made private in a later version.
-   */
-  @Deprecated
-  public ComputeEngineCredentials() {
-    this(null);
-  }
-
   /**
    * Constructor with overridden transport.
    *
    * @param transportFactory HTTP transport factory, creates the transport used to get access
    *        tokens.
-   * @deprecated Use {@link #newBuilder()} instead. This constructor will either be deleted or made
-   *             private in a later version.
    */
-  @Deprecated
-  public ComputeEngineCredentials(HttpTransportFactory transportFactory) {
+  private ComputeEngineCredentials(HttpTransportFactory transportFactory) {
     this.transportFactory = firstNonNull(transportFactory,
         getFromServiceLoader(HttpTransportFactory.class, OAuth2Utils.HTTP_TRANSPORT_FACTORY));
     this.transportFactoryClassName = this.transportFactory.getClass().getName();

oauth2_http/java/com/google/auth/oauth2/GoogleCredentials.java

@@ -54,19 +54,6 @@ public class GoogleCredentials extends OAuth2Credentials {
   private static final DefaultCredentialsProvider defaultCredentialsProvider =
       new DefaultCredentialsProvider();
 
-  /**
-   * Returns the credentials instance from the given access token.
-   *
-   * @param accessToken the access token
-   * @return the credentials instance
-   * @deprecated Use {@link #create(AccessToken)} instead. This method will be deleted in a later
-   *             version.
-   */
-  @Deprecated
-  public static GoogleCredentials of(AccessToken accessToken) {
-    return create(accessToken);
-  }
-
   /**
    * Returns the credentials instance from the given access token.
    *
@@ -189,11 +176,8 @@ protected GoogleCredentials() {
   /**
    * Constructor with explicit access token.
    *
-   * @param accessToken Initial or temporary access token.
-   * @deprecated Use {@link #create(AccessToken)} instead. This constructor will either be deleted
-   *             or made protected/private in a later version.
-   **/
-  @Deprecated
+   * @param accessToken initial or temporary access token
+   */
   public GoogleCredentials(AccessToken accessToken) {
     super(accessToken);
   }

oauth2_http/java/com/google/auth/oauth2/OAuth2Credentials.java

@@ -71,19 +71,6 @@ public class OAuth2Credentials extends Credentials {
   @VisibleForTesting
   transient Clock clock = Clock.SYSTEM;
 
-  /**
-   * Returns the credentials instance from the given access token.
-   *
-   * @param accessToken the access token
-   * @return the credentials instance
-   * @deprecated Use {@link #create(AccessToken)} instead. This method will be deleted in a later
-   *             version.
-   */
-  @Deprecated
-  public static OAuth2Credentials of(AccessToken accessToken) {
-    return create(accessToken);
-  }
-
   /**
    * Returns the credentials instance from the given access token.
    *
@@ -104,12 +91,9 @@ protected OAuth2Credentials() {
   /**
    * Constructor with explicit access token.
    *
-   * @param accessToken Initial or temporary access token.
-   * @deprecated Use {@link #create(AccessToken)} instead. This constructor will either be deleted
-   *             or made private in a later version.
+   * @param accessToken initial or temporary access token
    **/
-  @Deprecated
-  public OAuth2Credentials(AccessToken accessToken) {
+  protected OAuth2Credentials(AccessToken accessToken) {
     if (accessToken != null) {
       useAccessToken(accessToken);
     }

oauth2_http/java/com/google/auth/oauth2/ServiceAccountCredentials.java

@@ -102,47 +102,6 @@ public class ServiceAccountCredentials extends GoogleCredentials implements Serv
 
   private transient HttpTransportFactory transportFactory;
 
-  /**
-   * Constructor with minimum identifying information.
-   *
-   * @param clientId Client ID of the service account from the console. May be null.
-   * @param clientEmail Client email address of the service account from the console.
-   * @param privateKey RSA private key object for the service account.
-   * @param privateKeyId Private key identifier for the service account. May be null.
-   * @param scopes Scope strings for the APIs to be called. May be null or an empty collection,
-   *        which results in a credential that must have createScoped called before use.
-   * @deprecated Use {@link #newBuilder()} instead. This constructor will either be deleted or made
-   *             private in a later version.
-   */
-  @Deprecated
-  public ServiceAccountCredentials(
-      String clientId, String clientEmail, PrivateKey privateKey, String privateKeyId,
-      Collection<String> scopes) {
-    this(clientId, clientEmail, privateKey, privateKeyId, scopes, null, null, null, null);
-  }
-
-  /**
-   * Constructor with minimum identifying information and custom HTTP transport.
-   *
-   * @param clientId Client ID of the service account from the console. May be null.
-   * @param clientEmail Client email address of the service account from the console.
-   * @param privateKey RSA private key object for the service account.
-   * @param privateKeyId Private key identifier for the service account. May be null.
-   * @param scopes Scope strings for the APIs to be called. May be null or an empty collection,
-   *        which results in a credential that must have createScoped called before use.
-   * @param transportFactory HTTP transport factory, creates the transport used to get access
-   *        tokens.
-   * @param tokenServerUri URI of the end point that provides tokens.
-   * @deprecated Use {@link #newBuilder()} instead. This constructor will either be deleted or made
-   *             private in a later version.
-   */
-  @Deprecated
-  public ServiceAccountCredentials(
-      String clientId, String clientEmail, PrivateKey privateKey, String privateKeyId,
-      Collection<String> scopes, HttpTransportFactory transportFactory, URI tokenServerUri) {
-    this(clientId, clientEmail, privateKey, privateKeyId, scopes, transportFactory, tokenServerUri, null, null);
-  }
-
   /**
    * Constructor with minimum identifying information and custom HTTP transport.
    *

oauth2_http/java/com/google/auth/oauth2/ServiceAccountJwtAccessCredentials.java

@@ -96,22 +96,6 @@ public class ServiceAccountJwtAccessCredentials extends Credentials
   @VisibleForTesting
   transient Clock clock = Clock.SYSTEM;
 
-  /**
-   * Constructor with minimum identifying information.
-   *
-   * @param clientId Client ID of the service account from the console. May be null.
-   * @param clientEmail Client email address of the service account from the console.
-   * @param privateKey RSA private key object for the service account.
-   * @param privateKeyId Private key identifier for the service account. May be null.
-   * @deprecated Use {@link #newBuilder()} instead. This constructor will either be deleted or made
-   *             private in a later version.
-   */
-  @Deprecated
-  public ServiceAccountJwtAccessCredentials(
-      String clientId, String clientEmail, PrivateKey privateKey, String privateKeyId) {
-    this(clientId, clientEmail, privateKey, privateKeyId, null);
-  }
-
   /**
    * Constructor with full information.
    *
@@ -120,11 +104,8 @@ public ServiceAccountJwtAccessCredentials(
    * @param privateKey RSA private key object for the service account.
    * @param privateKeyId Private key identifier for the service account. May be null.
    * @param defaultAudience Audience to use if not provided by transport. May be null.
-   * @deprecated Use {@link #newBuilder()} instead. This constructor will either be deleted or made
-   *             private in a later version.
    */
-  @Deprecated
-  public ServiceAccountJwtAccessCredentials(String clientId, String clientEmail,
+  private ServiceAccountJwtAccessCredentials(String clientId, String clientEmail,
       PrivateKey privateKey, String privateKeyId, URI defaultAudience) {
     this.clientId = clientId;
     this.clientEmail = Preconditions.checkNotNull(clientEmail);
@@ -135,7 +116,7 @@ public ServiceAccountJwtAccessCredentials(String clientId, String clientEmail,
   }
 
   /**
-   * Returns service account crentials defined by JSON using the format supported by the Google
+   * Returns service account credentials defined by JSON using the format supported by the Google
    * Developers Console.
    *
    * @param json a map from the JSON representing the credentials.

oauth2_http/java/com/google/auth/oauth2/UserAuthorizer.java

@@ -69,52 +69,20 @@ public class UserAuthorizer {
   private final URI tokenServerUri;
   private final URI userAuthUri;
 
-  /**
-   * Constructor with minimal parameters.
-   *
-   * @param clientId Client ID to identify the OAuth2 consent prompt.
-   * @param scopes OAUth2 scopes defining the user consent.
-   * @param tokenStore Implementation of component for long term storage of tokens.
-   * @deprecated Use {@link #newBuilder()} instead. This constructor will either be deleted or made
-   *             private in a later version.
-   */
-  @Deprecated
-  public UserAuthorizer(ClientId clientId, Collection<String> scopes, TokenStore tokenStore) {
-    this(clientId, scopes, tokenStore, null, null, null, null);
-  }
-
-  /**
-   * Constructor with common parameters.
-   *
-   * @param clientId Client ID to identify the OAuth2 consent prompt.
-   * @param scopes OAUth2 scopes defining the user consent.
-   * @param tokenStore Implementation of component for long term storage of tokens.
-   * @param callbackUri URI for implementation of the OAuth2 web callback.
-   * @deprecated Use {@link #newBuilder()} instead. This constructor will either be deleted or made
-   *             private in a later version.
-   */
-  @Deprecated
-  public UserAuthorizer(ClientId clientId, Collection<String> scopes, TokenStore tokenStore, URI callbackUri) {
-    this(clientId, scopes, tokenStore, callbackUri, null, null, null);
-  }
-
   /**
    * Constructor with all parameters.
    *
-   * @param clientId Client ID to identify the OAuth2 consent prompt.
-   * @param scopes OAUth2 scopes defining the user consent.
-   * @param tokenStore Implementation of a component for long term storage of tokens.
-   * @param callbackUri URI for implementation of the OAuth2 web callback.
+   * @param clientId Client ID to identify the OAuth2 consent prompt
+   * @param scopes OAuth2 scopes defining the user consent
+   * @param tokenStore Implementation of a component for long term storage of tokens
+   * @param callbackUri URI for implementation of the OAuth2 web callback
    * @param transportFactory HTTP transport factory, creates the transport used to get access
    *        tokens.
-   * @param tokenServerUri URI of the end point that provides tokens.
-   * @param userAuthUri URI of the Web UI for user consent.
-   * @deprecated Use {@link #newBuilder()} instead. This constructor will either be deleted or made
-   *             private in a later version.
+   * @param tokenServerUri URI of the end point that provides tokens
+   * @param userAuthUri URI of the Web UI for user consent
    */
-  @Deprecated
-  public UserAuthorizer(ClientId clientId, Collection<String> scopes, TokenStore tokenStore,
-                        URI callbackUri, HttpTransportFactory transportFactory, URI tokenServerUri, URI userAuthUri) {
+  private UserAuthorizer(ClientId clientId, Collection<String> scopes, TokenStore tokenStore,
+      URI callbackUri, HttpTransportFactory transportFactory, URI tokenServerUri, URI userAuthUri) {
     this.clientId = Preconditions.checkNotNull(clientId);
     this.scopes = ImmutableList.copyOf(Preconditions.checkNotNull(scopes));
     this.callbackUri = (callbackUri == null) ? DEFAULT_CALLBACK_URI : callbackUri;