Add initial support for the java25 runtime ID, still defaulting to Jetty12.0 and EE10.

PiperOrigin-RevId: 800083080
Change-Id: I3c83189ae1f366ffc637f66ae62b8f9c74f7713c

Author: ludoch

appengine_init/src/main/java/com/google/appengine/init/AppEngineWebXmlInitialParse.java

@@ -96,10 +96,16 @@ public void handleRuntimeProperties() {
     // and only if the setting has not been defined in appengine-web.xml.
     if (!settingDoneInAppEngineWebXml && (runtimeId != null)) {
       switch (runtimeId) {
-        case "java21": // Force default to EE10.
+        case "java21":
           System.clearProperty("appengine.use.EE8");
           System.setProperty("appengine.use.EE10", "true");
           break;
+        case"java25": 
+          System.clearProperty("appengine.use.EE8");
+          System.setProperty(
+              "appengine.use.EE10",
+              "true"); // Force default to EE10. Replace when jetty12.1 is EE11.
+          break;
         case "java17":
           // See if the Mendel experiment to enable Jetty12 for java17 is set
           // automatically via env var:

lib/tools_api/src/main/java/com/google/appengine/tools/admin/Application.java

@@ -132,13 +132,15 @@ public class Application implements GenericApplication {
   private static final String JAVA_11_RUNTIME_ID = "java11";
   private static final String JAVA_17_RUNTIME_ID = "java17";
   private static final String JAVA_21_RUNTIME_ID = "java21";
+  private static final String JAVA_25_RUNTIME_ID = "java25";
 
   private static final ImmutableSet<String> ALLOWED_RUNTIME_IDS =
       ImmutableSet.of(
           JAVA_8_RUNTIME_ID,
           JAVA_11_RUNTIME_ID,
           JAVA_17_RUNTIME_ID,
           JAVA_21_RUNTIME_ID,
+          JAVA_25_RUNTIME_ID,
           GOOGLE_RUNTIME_ID,
           GOOGLE_LEGACY_RUNTIME_ID);
 
@@ -892,6 +894,7 @@ private boolean isJava8OrAbove() {
         || appEngineWebXml.getRuntime().equals(JAVA_11_RUNTIME_ID)
         || appEngineWebXml.getRuntime().equals(JAVA_17_RUNTIME_ID)
         || appEngineWebXml.getRuntime().equals(JAVA_21_RUNTIME_ID)
+        || appEngineWebXml.getRuntime().equals(JAVA_25_RUNTIME_ID)
         || appEngineWebXml.getRuntime().startsWith(GOOGLE_LEGACY_RUNTIME_ID));
   }
 
@@ -1251,7 +1254,8 @@ private void compileJspJavaFiles(
     } else if (runtime.startsWith(GOOGLE_LEGACY_RUNTIME_ID)
         || runtime.equals(JAVA_11_RUNTIME_ID)
         || runtime.equals(JAVA_17_RUNTIME_ID)
-        || runtime.equals(JAVA_21_RUNTIME_ID)) {
+        || runtime.equals(JAVA_21_RUNTIME_ID)
+        || runtime.equals(JAVA_25_RUNTIME_ID)) {
       // TODO(b/115569833): for now, it's still possible to use a JDK8 to compile and deploy Java11
       // apps.
       optionList.addAll(Arrays.asList("-source", "8"));

lib/tools_api/src/test/java/com/google/appengine/tools/admin/AppYamlTranslatorTest.java

@@ -273,31 +273,6 @@ public void testNoVersion() {
     assertEquals(yaml, translator.getYaml());
   }
 
-  public void testRuntime() {
-    appEngineWebXml.setRuntime("foo-bar");
-    AppYamlTranslator translator = createTranslator();
-    String yaml =
-        "application: 'app1'\n"
-            + "runtime: foo-bar\n"
-            + "version: 'ver1'\n"
-            + "auto_id_policy: default\n"
-            + "api_version: '1.0'\n"
-            + "handlers:\n"
-            + "- url: /\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: /.*/\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: /_ah/.*\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n";
-    assertEquals(yaml, translator.getYaml());
-  }
-
   public void testAutomaticServer_Minimal() {
     appEngineWebXml.setService("stan");
     appEngineWebXml.setInstanceClass("F8");
@@ -450,65 +425,6 @@ public void testAutomaticScalingCloneSchedulerSettings() {
     assertEquals(yaml, translator.getYaml());
   }
 
-  public void testAutomaticScalingCustomMetrics() {
-    appEngineWebXml.setEnv("flex");
-    AutomaticScaling automaticScaling = appEngineWebXml.getAutomaticScaling();
-    automaticScaling.setMinInstances(1);
-    automaticScaling.setMaxInstances(2);
-
-    List<CustomMetricUtilization> customMetrics = new ArrayList<>();
-    CustomMetricUtilization customMetric = new CustomMetricUtilization();
-    customMetric.setMetricName("foo/metric/name");
-    customMetric.setTargetType("GAUGE");
-    customMetric.setTargetUtilization(10.0);
-    customMetric.setFilter("metric.foo != bar");
-    customMetrics.add(customMetric);
-    customMetric = new CustomMetricUtilization();
-    customMetric.setMetricName("bar/metric/name");
-    customMetric.setTargetType("DELTA_PER_SECOND");
-    customMetric.setSingleInstanceAssignment(20.0);
-    customMetrics.add(customMetric);
-    automaticScaling.setCustomMetrics(customMetrics);
-
-    String yaml =
-        "application: 'app1'\n"
-            + "runtime: java\n"
-            + "env: flex\n"
-            + "version: 'ver1'\n"
-            + "automatic_scaling:\n"
-            + "  min_instances: 1\n"
-            + "  max_instances: 2\n"
-            + "  custom_metrics:\n"
-            + "    - metric_name: 'foo/metric/name'\n"
-            + "      target_type: 'GAUGE'\n"
-            + "      target_utilization: 10.0\n"
-            + "      filter: 'metric.foo != bar'\n"
-            + "    - metric_name: 'bar/metric/name'\n"
-            + "      target_type: 'DELTA_PER_SECOND'\n"
-            + "      single_instance_assignment: 20.0\n"
-            + "auto_id_policy: default\n"
-            + "api_version: '1.0'\n"
-            + "handlers:\n"
-            + "- url: /\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: /.*/\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: /_ah/.*\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: .*\\.jsp\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n";
-    AppYamlTranslator translator = createTranslator();
-    assertEquals(yaml, translator.getYaml());
-  }
-
   public void testManualServer() {
     appEngineWebXml.setService("stan");
     appEngineWebXml.setInstanceClass("B8");
@@ -1474,38 +1390,6 @@ public void testPrecompilationEnabledVmEnvironment() {
     assertEquals(yaml, translator.getYaml());
   }
 
-  public void testPrecompilationEnabledFlexEnvironment() {
-    appEngineWebXml.setPrecompilationEnabled(true);
-    appEngineWebXml.setEnv("flex");
-
-    AppYamlTranslator translator = createTranslator();
-    String yaml =
-        "application: 'app1'\n"
-            + "runtime: java\n"
-            + "env: flex\n"
-            + "version: 'ver1'\n"
-            + "auto_id_policy: default\n"
-            + "api_version: '1.0'\n"
-            + "handlers:\n"
-            + "- url: /\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: /.*/\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: /_ah/.*\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: .*\\.jsp\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n";
-    assertEquals(yaml, translator.getYaml());
-  }
-
   public void testThreadsafe() {
     appEngineWebXml.setThreadsafe(true);
 
@@ -1772,110 +1656,6 @@ public void testCodeLock() {
     assertEquals(yaml, translator.getYaml());
   }
 
-  public void testEnv() {
-    appEngineWebXml.setEnv("flexible");
-
-    AppYamlTranslator translator = createTranslator();
-    String yaml =
-        "application: 'app1'\n"
-            + "runtime: java\n"
-            + "env: flexible\n"
-            + "version: 'ver1'\n"
-            + "auto_id_policy: default\n"
-            + "api_version: '1.0'\n"
-            + "handlers:\n"
-            + "- url: /\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: /.*/\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: /_ah/.*\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: .*\\.jsp\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n";
-    assertEquals(yaml, translator.getYaml());
-  }
-
-  public void testEnvFlex() {
-    appEngineWebXml.setEnv("flex");
-
-    AppYamlTranslator translator = createTranslator();
-    String yaml =
-        "application: 'app1'\n"
-            + "runtime: java\n"
-            + "env: flex\n"
-            + "version: 'ver1'\n"
-            + "auto_id_policy: default\n"
-            + "api_version: '1.0'\n"
-            + "handlers:\n"
-            + "- url: /\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: /.*/\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: /_ah/.*\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: .*\\.jsp\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n";
-    assertEquals(yaml, translator.getYaml());
-  }
-
-  public void testEnv2() {
-    appEngineWebXml.setEnv("2");
-
-    AppYamlTranslator translator = createTranslator();
-    String yaml =
-        "application: 'app1'\n"
-            + "runtime: java\n"
-            + "env: 2\n"
-            + "version: 'ver1'\n"
-            + "auto_id_policy: default\n"
-            + "api_version: '1.0'\n"
-            + "handlers:\n"
-            + "- url: /\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: /.*/\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: /_ah/.*\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: .*\\.jsp\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n";
-    assertEquals(yaml, translator.getYaml());
-  }
-
-  public void testValidEnv() {
-    appEngineWebXml.setEnv("2");
-    assertTrue(appEngineWebXml.isFlexible());
-    appEngineWebXml.setEnv("flex");
-    assertTrue(appEngineWebXml.isFlexible());
-    appEngineWebXml.setEnv("flexible");
-    assertTrue(appEngineWebXml.isFlexible());
-    appEngineWebXml.setEnv("standard");
-    assertFalse(appEngineWebXml.isFlexible());
-  }
-
   public void testEnvStd() {
     appEngineWebXml.setEnv("standard");
 
@@ -1902,63 +1682,6 @@ public void testEnvStd() {
     assertEquals(yaml, translator.getYaml());
   }
 
-  public void testVmEnabled() {
-    appEngineWebXml.setUseVm(true);
-
-    AppYamlTranslator translator = createTranslator();
-    String yaml =
-        "application: 'app1'\n"
-            + "runtime: java8\n"
-            + "vm: True\n"
-            + "version: 'ver1'\n"
-            + "auto_id_policy: default\n"
-            + "api_version: '1.0'\n"
-            + "handlers:\n"
-            + "- url: /\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: /.*/\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: /_ah/.*\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: .*\\.jsp\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n";
-    assertEquals(yaml, translator.getYaml());
-  }
-
-  public void testVmDisabled() {
-    appEngineWebXml.setUseVm(false);
-
-    AppYamlTranslator translator = createTranslator();
-    String yaml =
-        "application: 'app1'\n"
-            + "runtime: java8\n"
-            + "version: 'ver1'\n"
-            + "auto_id_policy: default\n"
-            + "api_version: '1.0'\n"
-            + "handlers:\n"
-            + "- url: /\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: /.*/\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n"
-            + "- url: /_ah/.*\n"
-            + "  script: unused\n"
-            + "  login: optional\n"
-            + "  secure: optional\n";
-    assertEquals(yaml, translator.getYaml());
-  }
-
   public void testBetaSettings() {
     appEngineWebXml.setUseVm(true);
     appEngineWebXml.addBetaSetting("machine_type", "n1-standard-1");

runtime/impl/src/main/java/com/google/apphosting/runtime/RequestRunner.java

@@ -239,9 +239,9 @@ private void dispatchRequest(RequestManager.RequestToken requestToken) throws Ex
 
   private void dispatchBackgroundRequest() throws InterruptedException, TimeoutException {
     String requestId = getBackgroundRequestId(upRequest);
-    // For java21 runtime, RPC path, do the new background thread handling for now, and keep it for
-    // other runtimes.
-    if (!Objects.equals(GAE_RUNTIME, "java21")) {
+    // For java21/25 runtime, RPC path, do the new background thread handling for now, and keep it
+    // for other runtimes.
+    if (!(Objects.equals(GAE_RUNTIME, "java21") || Objects.equals(GAE_RUNTIME, "java25"))) {
       // Wait here for synchronization with the ThreadFactory.
       CountDownLatch latch = ThreadGroupPool.resetCurrentThread();
       Thread thread = new ThreadProxy();

runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/JettyServletEngineAdapter.java

@@ -102,7 +102,7 @@ public void start(String serverInfo, ServletEngineAdapter.Config runtimeOptions)
         new QueuedThreadPool(MAX_THREAD_POOL_THREADS, MIN_THREAD_POOL_THREADS);
     // Try to enable virtual threads if requested and on java21:
     if (Boolean.getBoolean("appengine.use.virtualthreads")
-        && "java21".equals(GAE_RUNTIME)) {
+        && ("java21".equals(GAE_RUNTIME) || "java25".equals(GAE_RUNTIME))) {
       threadPool.setVirtualThreadsExecutor(VirtualThreads.getDefaultVirtualThreadsExecutor());
       logger.atInfo().log("Configuring Appengine web server virtual threads.");
     }

utils/src/main/java/com/google/apphosting/utils/config/AppEngineWebXml.java

@@ -339,11 +339,7 @@ public boolean isWebXmlRequired() {
    * Test if the runtime is at least Java11.
    */
   public boolean isJava11OrAbove() {
-    return getRuntime().equals("google")
-        || getRuntime().equals("googlelegacy")
-        || getRuntime().equals("java11")
-        || getRuntime().equals("java17")
-        || getRuntime().equals("java21");
+    return !getRuntime().equals("java8");
   }
 
   public void setRuntime(String runtime) {