Add support for java8 in standard staging. (#160)

* allow passing runtime = 'java' to bypass the AppCfg restriction to Java 7
GoogleCloudPlatform · Jul 11, 2016 · cc9e793 · cc9e793
1 parent b144e56
commit cc9e793
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/...n/java/com/google/cloud/tools/appengine/api/deploy/DefaultStageStandardConfiguration.java b/...n/java/com/google/cloud/tools/appengine/api/deploy/DefaultStageStandardConfiguration.java
@@ -34,6 +34,7 @@ public class DefaultStageStandardConfiguration implements StageStandardConfigura
   private Boolean deleteJsps;
   private Boolean enableJarClasses;
   private Boolean disableJarJsps;
+  private String runtime;
 
   @Override
   public File getSourceDirectory() {
@@ -133,4 +134,13 @@ public Boolean getDisableJarJsps() {
   public void setDisableJarJsps(Boolean disableJarJsps) {
     this.disableJarJsps = disableJarJsps;
   }
+
+  @Override
+  public String getRuntime() {
+    return runtime;
+  }
+
+  public void setRuntime(String runtime) {
+    this.runtime = runtime;
+  }
 }
diff --git a/...src/main/java/com/google/cloud/tools/appengine/api/deploy/StageStandardConfiguration.java b/...src/main/java/com/google/cloud/tools/appengine/api/deploy/StageStandardConfiguration.java
@@ -42,4 +42,6 @@ public interface StageStandardConfiguration {
   Boolean getEnableJarClasses();
 
   Boolean getDisableJarJsps();
+
+  String getRuntime();
 }
diff --git a/...main/java/com/google/cloud/tools/appengine/cloudsdk/CloudSdkAppEngineStandardStaging.java b/...main/java/com/google/cloud/tools/appengine/cloudsdk/CloudSdkAppEngineStandardStaging.java
@@ -60,7 +60,11 @@ public void stageStandard(StageStandardConfiguration config) throws AppEngineExc
     arguments.addAll(AppCfgArgs.get("delete_jsps", config.getDeleteJsps()));
     arguments.addAll(AppCfgArgs.get("enable_jar_classes", config.getEnableJarClasses()));
     arguments.addAll(AppCfgArgs.get("disable_jar_jsps", config.getDisableJarJsps()));
-
+    if (config.getRuntime() != null) {
+      // currently only java7 is allowed without --allow_any_runtime
+      arguments.addAll(AppCfgArgs.get("allow_any_runtime", true));
+      arguments.addAll(AppCfgArgs.get("runtime", config.getRuntime()));
+    }
     arguments.add("stage");
     arguments.add(config.getSourceDirectory().toPath().toString());
     arguments.add(config.getStagingDirectory().toPath().toString());

diff --git a/.../java/com/google/cloud/tools/appengine/cloudsdk/CloudSdkAppEngineStandardStagingTest.java b/.../java/com/google/cloud/tools/appengine/cloudsdk/CloudSdkAppEngineStandardStagingTest.java
@@ -18,9 +18,7 @@
 
 import com.google.cloud.tools.appengine.api.AppEngineException;
 import com.google.cloud.tools.appengine.api.deploy.DefaultStageStandardConfiguration;
-import com.google.cloud.tools.appengine.cloudsdk.CloudSdkAppEngineStandardStaging;
 import com.google.cloud.tools.appengine.cloudsdk.internal.process.ProcessRunnerException;
-import com.google.cloud.tools.appengine.cloudsdk.CloudSdk;
 import com.google.common.collect.ImmutableList;
 
 import org.junit.Before;
@@ -88,11 +86,13 @@ public void testCheckFlags_allFlags()
     configuration.setDeleteJsps(true);
     configuration.setEnableJarClasses(true);
     configuration.setDisableJarJsps(true);
+    configuration.setRuntime("java");
 
     List<String> expected = ImmutableList
         .of("--enable_quickstart", "--disable_update_check", "--enable_jar_splitting",
             "--jar_splitting_excludes=suffix1,suffix2", "--compile_encoding=UTF8", "--delete_jsps",
-            "--enable_jar_classes", "--disable_jar_jsps", "stage",
+            "--enable_jar_classes", "--disable_jar_jsps", "--allow_any_runtime", "--runtime=java",
+            "stage",
             source.toPath().toString(),
             destination.toPath().toString());