Default java17 runtime to Jetty 12.0 (EE8).

PiperOrigin-RevId: 899703665
Change-Id: I3ba603e833cbdfbff24d79e1231f833c6c28ba14

Author: ludoch

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

@@ -88,7 +88,7 @@ public final class AppEngineWebXmlInitialParse {
    * appengine.use.EE11} are set to true, defaults are applied as follows:
    *
    * <ul>
-   *   <li>{@code runtime="java17"}: Defaults to Jetty 9.4 based environment (EE6 / Servlet 3.1).
+   *   <li>{@code runtime="java17"}: Defaults to Jetty 12.0 based environment (EE8).
    *   <li>{@code runtime="java21"}: Defaults to Jetty 12.0 / EE10, unless {@code
    *       appengine.use.jetty121=true}, in which case it defaults to Jetty 12.1 / EE11.
    *   <li>{@code runtime="java25"}: Defaults to Jetty 12.1 / EE11.
@@ -99,9 +99,7 @@ public final class AppEngineWebXmlInitialParse {
    * <ul>
    *   <li>{@code <runtime>java17</runtime>}:
    *       <ul>
-   *         <li>No flags set: Jetty 9.4 (EE6) unless env variable
-   *             EXPERIMENT_ENABLE_JETTY12_FOR_JAVA is set to true, in which case Jetty 12.0 (EE8)
-   *             is used.
+   *         <li>No flags set: Jetty 12.0 (EE8)
    *         <li>{@code appengine.use.EE8=true}: Jetty 12.0 (EE8)
    *         <li>{@code appengine.use.EE10=true}: Jetty 12.0 (EE10)
    *         <li>{@code appengine.use.EE10=true} and {@code appengine.use.jetty121=true}: Jetty 12.1
@@ -213,10 +211,7 @@ public void handleRuntimeProperties() {
     if (trueCount == 0) {
       // Apply defaults based on javaVersion
       if (Objects.equals(runtimeId, "java17")) {
-        System.setProperty(
-            "appengine.use.EE8",
-            String.valueOf(
-                Objects.equals(envProvider.apply("EXPERIMENT_ENABLE_JETTY12_FOR_JAVA"), "true")));
+        System.setProperty("appengine.use.EE8", "true");
       } else if (Objects.equals(runtimeId, "java21")) {
         if (Boolean.parseBoolean(System.getProperty("appengine.use.jetty121", "false"))) {
           System.setProperty("appengine.use.EE11", "true");
@@ -245,9 +240,7 @@ public void handleRuntimeProperties() {
     // Log the runtime configuration so we can see it in the app logs.
     StringBuilder configLog =
         new StringBuilder("AppEngine runtime configuration: runtimeId=").append(runtimeId);
-    if (Objects.equals(envProvider.apply("EXPERIMENT_ENABLE_JETTY12_FOR_JAVA"), "true")) {
-      configLog.append(", with Jetty 12");
-    }
+    configLog.append(", with Jetty 12");
     if (Objects.equals(envProvider.apply("EXPERIMENT_ENABLE_HTTP_CONNECTOR_FOR_JAVA"), "true")) {
       configLog.append(", with HTTP Connector");
     }

appengine_init/src/test/java/com/google/appengine/init/AppEngineWebXmlInitialParseTest.java

@@ -99,10 +99,9 @@ public void testJava17() throws IOException {
         </appengine-web-app>
         """);
     new AppEngineWebXmlInitialParse(tempFile.toFile().getAbsolutePath()).handleRuntimeProperties();
-    assertFalse(Boolean.getBoolean("appengine.use.EE8")); // Default to jetty 9.4 which is EE6
+    assertTrue(Boolean.getBoolean("appengine.use.EE8")); // Default to jetty 12.0 which is EE8
     assertFalse(Boolean.getBoolean("appengine.use.EE10"));
     assertFalse(Boolean.getBoolean("appengine.use.EE11"));
-    assertFalse(Boolean.getBoolean("appengine.use.EE8"));
     assertFalse(Boolean.getBoolean("appengine.use.jetty121"));
   }
 
@@ -118,7 +117,7 @@ public void testJava17WithJetty121() throws IOException {
         </appengine-web-app>
         """);
     new AppEngineWebXmlInitialParse(tempFile.toFile().getAbsolutePath()).handleRuntimeProperties();
-    assertFalse(Boolean.getBoolean("appengine.use.EE8"));
+    assertTrue(Boolean.getBoolean("appengine.use.EE8")); // Default to jetty 12.0 which is EE8
     assertFalse(Boolean.getBoolean("appengine.use.EE10"));
     assertFalse(Boolean.getBoolean("appengine.use.EE11"));
     assertTrue(Boolean.getBoolean("appengine.use.jetty121"));
@@ -409,7 +408,7 @@ public void testJava21WithEE11() throws IOException {
   }
 
   @Test
-  public void testJava17WithExperimentEnableJetty12() throws IOException {
+  public void testJava17WithJetty12() throws IOException {
     createTempAppEngineWebXml(
         """
         <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
@@ -418,13 +417,7 @@ public void testJava17WithExperimentEnableJetty12() throws IOException {
         """);
     AppEngineWebXmlInitialParse parser =
         new AppEngineWebXmlInitialParse(tempFile.toFile().getAbsolutePath());
-    parser.setEnvProvider(
-        key -> {
-          if (Objects.equals(key, "EXPERIMENT_ENABLE_JETTY12_FOR_JAVA")) {
-            return "true";
-          }
-          return null;
-        });
+
     parser.handleRuntimeProperties();
     assertTrue(Boolean.getBoolean("appengine.use.EE8"));
     assertFalse(Boolean.getBoolean("appengine.use.EE10"));
@@ -444,13 +437,6 @@ public void testJava17WithWhitespace() throws IOException {
         """);
     AppEngineWebXmlInitialParse parser =
         new AppEngineWebXmlInitialParse(tempFile.toFile().getAbsolutePath());
-    parser.setEnvProvider(
-        key -> {
-          if (Objects.equals(key, "EXPERIMENT_ENABLE_JETTY12_FOR_JAVA")) {
-            return "true";
-          }
-          return null;
-        });
     parser.handleRuntimeProperties();
     assertTrue(Boolean.getBoolean("appengine.use.EE8"));
   }
@@ -712,7 +698,7 @@ public void testLogAllFlagsFalse() throws IOException {
       createTempAppEngineWebXml(
           """
           <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
-              <runtime>java17</runtime>
+              <runtime>java11</runtime>
           </appengine-web-app>
           """);
       new AppEngineWebXmlInitialParse(tempFile.toFile().getAbsolutePath()).handleRuntimeProperties();
@@ -756,7 +742,7 @@ public void testLogNotAllFlagsFalseWhenFlagIsSet() throws IOException {
   }
 
   @Test
-  public void testLogExperimentJetty12() throws IOException {
+  public void testLogJetty12() throws IOException {
     Logger logger = Logger.getLogger(AppEngineWebXmlInitialParse.class.getName());
     TestHandler handler = new TestHandler();
     logger.addHandler(handler);
@@ -769,13 +755,7 @@ public void testLogExperimentJetty12() throws IOException {
           """);
       AppEngineWebXmlInitialParse parser =
           new AppEngineWebXmlInitialParse(tempFile.toFile().getAbsolutePath());
-      parser.setEnvProvider(
-          key -> {
-            if (Objects.equals(key, "EXPERIMENT_ENABLE_JETTY12_FOR_JAVA")) {
-              return "true";
-            }
-            return null;
-          });
+
       parser.handleRuntimeProperties();
       boolean found = false;
       for (LogRecord record : handler.records) {