Remove Java 8 specific classpath setup from ClassPathUtils.

PiperOrigin-RevId: 807265751
Change-Id: I67c62f3b120ff318b2ae0ad851e5ae7efa2278fb

Author: ludoch

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

@@ -422,36 +422,13 @@ private ClassLoader createClassLoader(
       if (classPathUtils == null) {
         logger.atInfo().log("Ignoring API version setting %s", apiVersion);
       } else {
-        File apiJar = classPathUtils.getFrozenApiJar();
-        if (apiJar != null) {
-          logger.atInfo().log("Adding API jar %s for version %s", apiJar, apiVersion);
-          try {
-            classPathBuilder.addAppengineJar(new URL("file", "", apiJar.getAbsolutePath()));
-          } catch (MalformedURLException ex) {
-            logger.atWarning().withCause(ex).log("Could not parse URL for %s, ignoring.", apiJar);
-          }
-
-          File appengineApiLegacyJar = classPathUtils.getAppengineApiLegacyJar();
-          if (appengineApiLegacyJar != null) {
-            logger.atInfo().log("Adding appengine-api-legacy jar %s", appengineApiLegacyJar);
-            try {
-              // Add appengine-api-legacy jar with appengine-api-jar priority.
-              classPathBuilder.addAppengineJar(
-                  new URL("file", "", appengineApiLegacyJar.getAbsolutePath()));
-            } catch (MalformedURLException ex) {
-              logger.atWarning().withCause(ex).log(
-                  "Could not parse URL for %s, ignoring.", appengineApiLegacyJar);
-            }
-          }
-        } else {
-          // TODO: We should probably return an
-          // UPResponse::UNKNOWN_API_VERSION here, but I'd like to be
-          // lenient until API versions are well established.
-          logger.atWarning().log(
-              "The Java runtime is not adding an API jar for this application, as the "
-                  + "Java api_version defined in app.yaml or appinfo is unknown: %s",
-              apiVersion);
-        }
+        // TODO: We should probably return an
+        // UPResponse::UNKNOWN_API_VERSION here, but I'd like to be
+        // lenient until API versions are well established.
+        logger.atWarning().log(
+            "The Java runtime is not adding an API jar for this application, as the "
+                + "Java api_version defined in app.yaml or appinfo is unknown: %s",
+            apiVersion);
       }
     }
     if (!appInfo.getFileList().isEmpty()) {

runtime/impl/src/test/java/com/google/apphosting/runtime/ClassPathUtilsTest.java

@@ -18,7 +18,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import java.io.File;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -40,15 +39,8 @@ public void setUp() throws Exception {
     System.setProperty("classpath.runtimebase", runtimeLocation);
   }
 
-  private void createJava8Environment() throws Exception {
-    // Only Java8 runtime has the native launcher. This file is used to determine which env
-    // must be used.
-    temporaryFolder.newFile("java_runtime_launcher");
-  }
-
   @Test
   public void verifyJava11PropertiesAreConfigured() throws Exception {
-    // we do not call createJava8Environment() so expect java11+
     ClassPathUtils cpu = new ClassPathUtils();
     assertThat(cpu.getConnectorJUrls()).hasLength(0);
     if (Boolean.getBoolean("appengine.use.EE8")|| Boolean.getBoolean("appengine.use.EE10")) {
@@ -63,33 +55,5 @@ public void verifyJava11PropertiesAreConfigured() throws Exception {
                 .isEqualTo(runtimeLocation + "/runtime-shared-jetty9.jar");
     }
     assertThat(System.getProperty("classpath.connector-j")).isNull();
-
-    assertThat(cpu.getFrozenApiJar().getCanonicalPath())
-        .isEqualTo(new File(runtimeLocation + "/appengine-api-1.0-sdk.jar").getCanonicalPath());
-  }
-
-  @Test
-  public void verifyMavenJarsPropertiesAreConfigured() throws Exception {
-    createJava8Environment();
-
-    ClassPathUtils cpu = new ClassPathUtils(new File("/my_app_root"));
-    assertThat(cpu.getConnectorJUrls()).hasLength(1);
-    assertThat(System.getProperty("classpath.runtime-impl"))
-        .isEqualTo(
-            runtimeLocation
-                + "/jars/runtime-impl-jetty9.jar");
-
-    assertThat(System.getProperty("classpath.runtime-shared"))
-        .isEqualTo(runtimeLocation + "/jars/runtime-shared-jetty9.jar");
-    assertThat(System.getProperty("classpath.connector-j"))
-        .isEqualTo(runtimeLocation + "/jdbc-mysql-connector.jar");
-
-    assertThat(cpu.getFrozenApiJar().getAbsolutePath())
-        .isEqualTo("/my_app_root" + runtimeLocation + "/appengine-api.jar");
-    assertThat(System.getProperty("classpath.appengine-api-legacy"))
-        .isEqualTo(runtimeLocation + "/jars/appengine-api-legacy.jar");
-
-    assertThat(cpu.getAppengineApiLegacyJar().getAbsolutePath())
-        .isEqualTo("/my_app_root" + runtimeLocation + "/jars/appengine-api-legacy.jar");
   }
 }

runtime/util/src/main/java/com/google/apphosting/runtime/ApplicationClassLoader.java

@@ -60,17 +60,14 @@ class ApplicationClassLoader extends URLClassLoader {
   static final String COMPAT_PROPERTY = "appengine.api.legacy.repackaging";
 
   private final URL[] originalUrls;
-  private final URL[] legacyUrls;
   private final URLClassLoader resourceLoader;
-  boolean addedLegacyUrls;
 
   ApplicationClassLoader(
-      URL[] urls, URL[] legacyUrls, ClassLoader parent, boolean alwaysScanClassDirs) {
+      URL[] urls, ClassLoader parent, boolean alwaysScanClassDirs) {
     super(
         alwaysScanClassDirs ? urls : excludeClasslessDirectories(urls),
         parent);
     this.originalUrls = urls;
-    this.legacyUrls = legacyUrls;
     if (Arrays.equals(urls, super.getURLs())) {
       resourceLoader = null;
     } else {
@@ -149,13 +146,6 @@ protected Class<?> findClass(String name) throws ClassNotFoundException {
     try {
       return super.findClass(name);
     } catch (ClassNotFoundException e) {
-      if (!addedLegacyUrls && Boolean.getBoolean(COMPAT_PROPERTY)) {
-        for (URL url : legacyUrls) {
-          addURL(url);
-        }
-        addedLegacyUrls = true;
-        return super.findClass(name);
-      }
       throw e;
     }
   }

runtime/util/src/main/java/com/google/apphosting/runtime/ClassPathUtils.java

@@ -22,7 +22,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.StringTokenizer;
 import java.util.logging.Level;
@@ -40,70 +39,16 @@ public class ClassPathUtils {
   private static final String RUNTIME_IMPL_PROPERTY = "classpath.runtime-impl";
   private static final String RUNTIME_SHARED_PROPERTY = "classpath.runtime-shared";
   private static final String PREBUNDLED_PROPERTY = "classpath.prebundled";
-  private static final String API_PROPERTY = "classpath.api-map";
   private static final String CONNECTOR_J_PROPERTY = "classpath.connector-j";
-  private static final String APPENGINE_API_LEGACY_PROPERTY = "classpath.appengine-api-legacy";
-  private static final String LEGACY_PROPERTY = "classpath.legacy";
   // Cannot use Guava library in this classloader.
   private static final String PATH_SEPARATOR = System.getProperty("path.separator");
 
   private final File root;
-  private File frozenApiJarFile;
 
   public ClassPathUtils() {
     this(null);
   }
-
-  public ClassPathUtils(File root) {
-
-    String runtimeBase = System.getProperty(RUNTIME_BASE_PROPERTY);
-    if (runtimeBase == null) {
-      throw new RuntimeException("System property not defined: " + RUNTIME_BASE_PROPERTY);
-    }
-    this.root = root;
-
-    if (!new File(runtimeBase, "java_runtime_launcher").exists()) {
-      initForJava11OrAbove(runtimeBase);
-      return;
-    }
-
-    String profilerJar = null;
-    if (System.getenv("GAE_PROFILER_MODE") != null) {
-      profilerJar = "profiler.jar"; // Close source, not in Maven.;
-      logger.log(Level.INFO, "AppEngine profiler enabled.");
-    }
-    List<String> runtimeClasspathEntries =
-        Arrays.asList("jars/runtime-impl-jetty9.jar", profilerJar);
-
-    String runtimeClasspath =
-        runtimeClasspathEntries.stream()
-            .filter(t -> t != null)
-            .map(s -> runtimeBase + "/" + s)
-            .collect(joining(PATH_SEPARATOR));
-
-    if (System.getProperty(RUNTIME_IMPL_PROPERTY) != null) {
-      // Prepend existing value, only used in our tests.
-      runtimeClasspath =
-          System.getProperty(RUNTIME_IMPL_PROPERTY) + PATH_SEPARATOR + runtimeClasspath;
-    }
-    // Keep old properties for absolute compatibility if ever some public apps depend on them:
-    System.setProperty(RUNTIME_IMPL_PROPERTY, runtimeClasspath);
-    logger.log(Level.INFO, "Using runtime classpath: " + runtimeClasspath);
-
-    // The frozen API jar we must use for ancient customers still relying on the obsolete feature
-    // that when deploying with api_version: 1.0 in generated app.yaml
-    // we need to add our own legacy jar.
-    frozenApiJarFile = new File(new File(root, runtimeBase), "/appengine-api.jar");
-    System.setProperty(RUNTIME_SHARED_PROPERTY, runtimeBase + "/jars/runtime-shared-jetty9.jar");
-    System.setProperty(API_PROPERTY, "1.0=" + runtimeBase + "/jars/appengine-api-1.0-sdk.jar");
-    System.setProperty(
-        APPENGINE_API_LEGACY_PROPERTY, runtimeBase + "/jars/appengine-api-legacy.jar");
-    System.setProperty(CONNECTOR_J_PROPERTY, runtimeBase + "/jdbc-mysql-connector.jar");
-    System.setProperty(PREBUNDLED_PROPERTY, runtimeBase + "/conscrypt.jar");
-    System.setProperty(LEGACY_PROPERTY, runtimeBase + "/legacy.jar");
-  }
-
-  /**
+ /**
    * Initializes runtime classpath properties for Java 11 and newer runtimes based on system
    * properties that indicate which Jakarta EE version and Jetty version to use.
    *
@@ -128,9 +73,15 @@ public ClassPathUtils(File root) {
    *   <li>If EE6 is active (default), Jetty 9.4 is used with {@code runtime-shared-jetty9.jar}.
    * </ul>
    *
-   * @param runtimeBase The base directory for runtime jars.
    */
-  private void initForJava11OrAbove(String runtimeBase) {
+  
+  public ClassPathUtils(File root) {
+
+    String runtimeBase = System.getProperty(RUNTIME_BASE_PROPERTY);
+    if (runtimeBase == null) {
+      throw new RuntimeException("System property not defined: " + RUNTIME_BASE_PROPERTY);
+    }
+    this.root = root;
     /*
         New content is very simple now (from maven jars):
         ls blaze-bin/java/com/google/apphosting/runtime_java11/deployment_java11
@@ -223,7 +174,6 @@ New content is very simple now (from maven jars):
     System.setProperty(RUNTIME_IMPL_PROPERTY, runtimeClasspath);
     logger.log(Level.INFO, "Using runtime classpath: " + runtimeClasspath);
 
-    frozenApiJarFile = new File(runtimeBase, "/appengine-api-1.0-sdk.jar");
   }
 
   public URL[] getRuntimeImplUrls() {
@@ -252,34 +202,6 @@ public URL[] getConnectorJUrls() {
     }
   }
 
-  /**
-   * Returns the URLs for legacy jars. This may be empty or it may be one or more jars that contain
-   * classes like {@code com.google.appengine.repackaged.org.joda.Instant}, the old form of
-   * repackaging. We've switched to classes like {@code
-   * com.google.appengine.repackaged.org.joda.$Instant}, with a {@code $}, but this jar can
-   * optionally be added to an app's classpath if it is referencing the old names. Other legacy
-   * classes, unrelated to repackaging, may also appear in these jars.
-   */
-  public URL[] getLegacyJarUrls() {
-    String path = System.getProperty(LEGACY_PROPERTY);
-    if (path == null) {
-      return new URL[0];
-    } else {
-      return parseClasspath(path);
-    }
-  }
-
-  /** Returns a {@link File} for the frozen old API jar, */
-  public File getFrozenApiJar() {
-    return frozenApiJarFile;
-  }
-
-  @Nullable
-  public File getAppengineApiLegacyJar() {
-    String filename = System.getProperty(APPENGINE_API_LEGACY_PROPERTY);
-    return filename == null ? null : new File(root, filename);
-  }
-
   /**
    * Parse the specified string into individual files (using the machine's path separator) and
    * return an array containing a {@link URL} object representing each file.

runtime/util/src/main/java/com/google/apphosting/runtime/NullSandboxPlugin.java

@@ -138,11 +138,10 @@ protected ClassLoader doCreateApplicationClassLoader(
         URL[] urls = getClassPathUtils().getConnectorJUrls();
         userUrls = append(urls, userUrls);
     }
-    URL[] legacyUrls = getClassPathUtils().getLegacyJarUrls();
     boolean alwaysScanClassDirs = "true".equalsIgnoreCase(
         environment.getSystemProperties().get(ALWAYS_SCAN_CLASS_DIRS_PROPERTY));
     return new ApplicationClassLoader(
-        userUrls, legacyUrls, sharedClassLoader, alwaysScanClassDirs);
+        userUrls, sharedClassLoader, alwaysScanClassDirs);
   }
 
   /**