Merge branch 'master' into shinfan-dev

Author: shinfan

.travis.yml

@@ -3,8 +3,6 @@ matrix:
   include:
     - os: linux
       jdk: oraclejdk8
-    - os: linux
-      jdk: oraclejdk7
     - os: linux
       jdk: openjdk7
     - os: osx

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

@@ -69,6 +69,9 @@ class DefaultCredentialsProvider {
   static final String CLOUD_SHELL_ENV_VAR = "DEVSHELL_CLIENT_PORT";
 
   static final String SKIP_APP_ENGINE_ENV_VAR = "GOOGLE_APPLICATION_CREDENTIALS_SKIP_APP_ENGINE";
+  static final String SPECIFICATION_VERSION = System.getProperty("java.specification.version");
+  static final String GAE_RUNTIME_VERSION = System.getProperty("com.google.appengine.runtime.version");
+  static final String RUNTIME_JETTY_LOGGER = System.getProperty("org.eclipse.jetty.util.log.class");
 
   static final String NO_GCE_CHECK_ENV_VAR = "NO_GCE_CHECK";
   static final String GCE_METADATA_HOST_ENV_VAR = "GCE_METADATA_HOST";
@@ -175,8 +178,8 @@ private final GoogleCredentials getDefaultCredentialsUnsynchronized(
       }
     }
 
-    // Then try App Engine
-    if (credentials == null && !skipAppEngineCredentialsCheck()) {
+    // Then try GAE 7 standard environment
+    if (credentials == null && isOnGAEStandard7() && !skipAppEngineCredentialsCheck()) {
       credentials = tryGetAppEngineCredential();
     }
 
@@ -186,7 +189,7 @@ private final GoogleCredentials getDefaultCredentialsUnsynchronized(
       credentials = tryGetCloudShellCredentials();
     }
 
-    // Then try Compute Engine
+    // Then try Compute Engine and GAE 8 standard environment
     if (credentials == null) {
       credentials = tryGetComputeCredentials(transportFactory);
     }
@@ -283,6 +286,11 @@ private boolean skipAppEngineCredentialsCheck() {
     return skip;
   }
 
+  protected boolean isOnGAEStandard7() {
+    return GAE_RUNTIME_VERSION != null
+        && (SPECIFICATION_VERSION.equals("1.7") || RUNTIME_JETTY_LOGGER == null);
+  }
+
   /*
    * Start of methods to allow overriding in the test code to isolate from the environment.
    */

oauth2_http/javatests/com/google/auth/oauth2/DefaultCredentialsProviderTest.java

@@ -187,6 +187,7 @@ public void getDefaultCredentials_appEngineClassWithoutRuntime_NotFoundError() {
     TestDefaultCredentialsProvider testProvider = new TestDefaultCredentialsProvider();
     testProvider.addType(DefaultCredentialsProvider.APP_ENGINE_SIGNAL_CLASS,
         MockOffAppEngineSystemProperty.class);
+    testProvider.setProperty("isOnGAEStandard7", "true");
 
     try {
       testProvider.getDefaultCredentials(transportFactory);
@@ -203,6 +204,7 @@ public void getDefaultCredentials_appEngineRuntimeWithoutClass_throwsHelpfulLoad
     TestDefaultCredentialsProvider testProvider = new TestDefaultCredentialsProvider();
     testProvider.addType(DefaultCredentialsProvider.APP_ENGINE_SIGNAL_CLASS,
         MockAppEngineSystemProperty.class);
+    testProvider.setProperty("isOnGAEStandard7", "true");
 
     try {
       testProvider.getDefaultCredentials(transportFactory);
@@ -223,6 +225,7 @@ public void getDefaultCredentials_appEngineSkipWorks_retrievesCloudShellCredenti
         MockOffAppEngineSystemProperty.class);
     testProvider.setEnv(DefaultCredentialsProvider.CLOUD_SHELL_ENV_VAR,"9090");
     testProvider.setEnv(DefaultCredentialsProvider.SKIP_APP_ENGINE_ENV_VAR, "true");
+    testProvider.setProperty("isOnGAEStanadard7", "true");
     GoogleCredentials credentials = testProvider.getDefaultCredentials(transportFactory);
     assertNotNull(credentials);
     assertTrue(credentials instanceof CloudShellCredentials);
@@ -578,6 +581,11 @@ Class<?> forName(String className) throws ClassNotFoundException {
       throw new ClassNotFoundException("TestDefaultCredentialProvider: Class not found.");
     }
 
+    @Override
+    protected boolean isOnGAEStandard7() {
+      return getProperty("isOnGAEStandard7", "false").equals("true");
+    }
+
     int getForNameCallCount() {
       return forNameCallCount;
     }