Move AppInfoFactory to a common package as it is not Jetty specific and can be shared across all Jetty versions.

PiperOrigin-RevId: 865965002
Change-Id: I04d68e5e83ee9219c20b4fac974070a400bbb662

Author: ludoch

…sting/runtime/jetty9/AppInfoFactory.java …e/apphosting/runtime/AppInfoFactory.javaruntime/runtime_impl_jetty9/src/main/java/com/google/apphosting/runtime/jetty9/AppInfoFactory.java renamed to runtime/impl/src/main/java/com/google/apphosting/runtime/AppInfoFactory.java runtime/runtime_impl_jetty9/src/main/java/com/google/apphosting/runtime/jetty9/AppInfoFactory.java renamed to runtime/impl/src/main/java/com/google/apphosting/runtime/AppInfoFactory.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.apphosting.runtime.jetty9;
+package com.google.apphosting.runtime;
+
 
 import com.google.apphosting.base.protos.AppinfoPb;
-import com.google.apphosting.utils.config.AppYaml;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.NoSuchFileException;
@@ -84,17 +84,9 @@ public AppinfoPb.AppInfo getAppInfoFromFile(String applicationRoot, String fixed
     return getAppInfo();
   }
 
-  public AppinfoPb.AppInfo getAppInfoFromAppYaml(AppYaml unused) throws IOException {
-    return getAppInfo();
-  }
 
-  public AppinfoPb.AppInfo getAppInfo() {
-    final AppinfoPb.AppInfo.Builder appInfoBuilder =
-        AppinfoPb.AppInfo.newBuilder()
-            .setAppId(gaeApplication)
-            .setVersionId(gaeVersion)
-            .setRuntimeId("java8");
 
-    return appInfoBuilder.build();
+  public AppinfoPb.AppInfo getAppInfo() {
+    return AppinfoPb.AppInfo.newBuilder().setAppId(gaeApplication).setVersionId(gaeVersion).build();
   }
 }

…g/runtime/jetty9/AppInfoFactoryTest.java …phosting/runtime/AppInfoFactoryTest.javaruntime/runtime_impl_jetty9/src/test/java/com/google/apphosting/runtime/jetty9/AppInfoFactoryTest.java renamed to runtime/impl/src/test/java/com/google/apphosting/runtime/AppInfoFactoryTest.java runtime/runtime_impl_jetty9/src/test/java/com/google/apphosting/runtime/jetty9/AppInfoFactoryTest.java renamed to runtime/impl/src/test/java/com/google/apphosting/runtime/AppInfoFactoryTest.java

@@ -14,24 +14,18 @@
  * limitations under the License.
  */
 
-package com.google.apphosting.runtime.jetty9;
+package com.google.apphosting.runtime;
 
 import static com.google.common.base.StandardSystemProperty.USER_DIR;
 import static com.google.common.truth.Truth.assertThat;
-import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.Assert.assertThrows;
 
 import com.google.appengine.tools.development.resource.ResourceExtractor;
 import com.google.apphosting.base.protos.AppinfoPb;
-import com.google.apphosting.utils.config.AppYaml;
 import com.google.common.collect.ImmutableMap;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -53,16 +47,15 @@ public final class AppInfoFactoryTest {
 
   @Before
   public void setUp() throws IOException {
-    Path projPath = Paths.get(temporaryFolder.newFolder(PROJECT_RESOURCE_NAME).getPath());
+    Path projPath = Path.of(temporaryFolder.newFolder(PROJECT_RESOURCE_NAME).getPath());
     appRoot = projPath.getParent().toString();
-    fixedAppDir = Paths.get(projPath.toString(), "100.mydeployment").toString();
+    fixedAppDir = Path.of(projPath.toString(), "100.mydeployment").toString();
     ResourceExtractor.toFile(PROJECT_RESOURCE_NAME, projPath.toString());
   }
 
   @Test
   public void getGaeService_nonDefault() throws Exception {
-    AppInfoFactory factory =
-        new AppInfoFactory(ImmutableMap.of("GAE_SERVICE", "mytestservice"));
+    AppInfoFactory factory = new AppInfoFactory(ImmutableMap.of("GAE_SERVICE", "mytestservice"));
     assertThat(factory.getGaeService()).isEqualTo("mytestservice");
   }
 
@@ -140,7 +133,6 @@ public void getAppInfo_fixedApplicationPath() throws Exception {
 
     assertThat(appInfo.getAppId()).isEqualTo("s~myapp");
     assertThat(appInfo.getVersionId()).isEqualTo("mytestservice:100.mydeployment");
-    assertThat(appInfo.getRuntimeId()).isEqualTo("java8");
   }
 
   @Test
@@ -157,7 +149,6 @@ public void getAppInfo_appRoot() throws Exception {
 
     assertThat(appInfo.getAppId()).isEqualTo("s~myapp");
     assertThat(appInfo.getVersionId()).isEqualTo("mytestservice:100.mydeployment");
-    assertThat(appInfo.getRuntimeId()).isEqualTo("java8");
   }
 
   @Test
@@ -179,7 +170,7 @@ public void getAppInfo_noAppYaml() throws Exception {
 
     assertThat(appInfo.getAppId()).isEqualTo("s~myapp");
     assertThat(appInfo.getVersionId()).isEqualTo("mytestservice:100.mydeployment");
-    assertThat(appInfo.getRuntimeId()).isEqualTo("java8");
+    assertThat(appInfo.getApiVersion()).isEmpty();
   }
 
   @Test
@@ -208,14 +199,10 @@ public void getAppInfo_givenAppYaml() throws Exception {
                 "GAE_APPLICATION", "s~myapp",
                 "GOOGLE_CLOUD_PROJECT", "mytestproject"));
 
-    File appYamlFile = new File(fixedAppDir + "/WEB-INF/appengine-generated/app.yaml");
-    AppYaml appYaml = AppYaml.parse(new InputStreamReader(new FileInputStream(appYamlFile), UTF_8));
-
-    AppinfoPb.AppInfo appInfo = factory.getAppInfoFromAppYaml(appYaml);
+    AppinfoPb.AppInfo appInfo = factory.getAppInfo();
 
     assertThat(appInfo.getAppId()).isEqualTo("s~myapp");
     assertThat(appInfo.getVersionId()).isEqualTo("mytestservice:100.mydeployment");
-    assertThat(appInfo.getRuntimeId()).isEqualTo("java8");
   }
 
   @Test
@@ -233,6 +220,5 @@ public void getAppInfo_givenVersion() throws Exception {
 
     assertThat(appInfo.getAppId()).isEqualTo("s~myapp");
     assertThat(appInfo.getVersionId()).isEqualTo("mytestservice:100.mydeployment");
-    assertThat(appInfo.getRuntimeId()).isEqualTo("java8");
   }
 }

…ent/WEB-INF/appengine-generated/app.yaml …ent/WEB-INF/appengine-generated/app.yamlruntime/impl/src/test/resources/com/google/apphosting/runtime/jetty9/mytestproject/100.mydeployment/WEB-INF/appengine-generated/app.yaml renamed to runtime/impl/src/test/resources/com/google/apphosting/runtime/mytestproject/100.mydeployment/WEB-INF/appengine-generated/app.yaml runtime/impl/src/test/resources/com/google/apphosting/runtime/jetty9/mytestproject/100.mydeployment/WEB-INF/appengine-generated/app.yaml renamed to runtime/impl/src/test/resources/com/google/apphosting/runtime/mytestproject/100.mydeployment/WEB-INF/appengine-generated/app.yaml

@@ -23,13 +23,13 @@
 import com.google.apphosting.base.protos.AppinfoPb;
 import com.google.apphosting.runtime.ApiDeadlineOracle;
 import com.google.apphosting.runtime.ApiProxyImpl;
+import com.google.apphosting.runtime.AppInfoFactory;
 import com.google.apphosting.runtime.AppVersion;
 import com.google.apphosting.runtime.ApplicationEnvironment;
 import com.google.apphosting.runtime.SessionsConfig;
 import com.google.apphosting.runtime.anyrpc.APIHostClientInterface;
 import com.google.apphosting.runtime.http.HttpApiHostClientFactory;
 import com.google.apphosting.runtime.jetty9.AppEngineWebAppContext;
-import com.google.apphosting.runtime.jetty9.AppInfoFactory;
 import com.google.apphosting.runtime.jetty9.AppVersionHandlerFactory;
 import com.google.apphosting.runtime.jetty9.JettyServerConnectorWithReusePort;
 import com.google.apphosting.runtime.jetty9.WebAppContextFactory;

runtime/lite/src/main/java/com/google/appengine/runtime/lite/AppEngineRuntime.java

@@ -17,9 +17,9 @@
 package com.google.appengine.runtime.lite;
 
 import com.google.apphosting.runtime.AppVersion;
+import com.google.apphosting.runtime.AppInfoFactory;
 import com.google.apphosting.runtime.MutableUpResponse;
 import com.google.apphosting.runtime.anyrpc.AnyRpcServerContext;
-import com.google.apphosting.runtime.jetty9.AppInfoFactory;
 import com.google.apphosting.runtime.jetty9.AppVersionHandlerFactory;
 import com.google.apphosting.runtime.jetty9.UPRequestTranslator;
 import com.google.common.flogger.GoogleLogger;

runtime/lite/src/main/java/com/google/appengine/runtime/lite/RequestHandler.java

@@ -35,9 +35,9 @@
 import com.google.apphosting.runtime.ApiProxyImpl;
 import com.google.apphosting.runtime.AppVersion;
 import com.google.apphosting.runtime.ApplicationEnvironment;
+import com.google.apphosting.runtime.AppInfoFactory;
 import com.google.apphosting.runtime.SessionsConfig;
 import com.google.apphosting.runtime.http.FakeHttpApiHost;
-import com.google.apphosting.runtime.jetty9.AppInfoFactory;
 import com.google.apphosting.testing.PortPicker;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableMap;

runtime/lite/src/test/java/com/google/appengine/runtime/lite/AppEngineRuntimeTest.java

@@ -28,6 +28,7 @@
 import com.google.apphosting.base.protos.RuntimePb.UPRequest;
 import com.google.apphosting.base.protos.RuntimePb.UPResponse;
 import com.google.apphosting.runtime.AppEngineConstants;
+import com.google.apphosting.runtime.AppInfoFactory;
 import com.google.apphosting.runtime.AppVersion;
 import com.google.apphosting.runtime.LocalRpcContext;
 import com.google.apphosting.runtime.MutableUpResponse;

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

@@ -25,26 +25,23 @@
 import com.google.apphosting.base.protos.RuntimePb;
 import com.google.apphosting.runtime.ApiProxyImpl;
 import com.google.apphosting.runtime.AppEngineConstants;
+import com.google.apphosting.runtime.AppInfoFactory;
 import com.google.apphosting.runtime.AppVersion;
 import com.google.apphosting.runtime.BackgroundRequestCoordinator;
 import com.google.apphosting.runtime.LocalRpcContext;
 import com.google.apphosting.runtime.RequestManager;
-import com.google.apphosting.runtime.RequestRunner;
 import com.google.apphosting.runtime.RequestRunner.EagerRunner;
 import com.google.apphosting.runtime.ResponseAPIData;
 import com.google.apphosting.runtime.ServletEngineAdapter;
 import com.google.apphosting.runtime.anyrpc.AnyRpcServerContext;
-import com.google.apphosting.runtime.jetty.AppInfoFactory;
 import com.google.common.flogger.GoogleLogger;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.time.Duration;
 import java.util.concurrent.TimeoutException;
 import org.eclipse.jetty.server.Handler;
-import org.eclipse.jetty.server.HttpStream;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Response;
-import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.util.Blocker;
 import org.eclipse.jetty.util.Callback;
 

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

@@ -55,9 +55,9 @@
 import com.google.apphosting.base.protos.HttpPb;
 import com.google.apphosting.base.protos.RuntimePb;
 import com.google.apphosting.base.protos.TracePb;
+import com.google.apphosting.runtime.AppInfoFactory;
 import com.google.apphosting.runtime.RequestAPIData;
 import com.google.apphosting.runtime.TraceContextHelper;
-import com.google.apphosting.runtime.jetty.AppInfoFactory;
 import com.google.common.base.Strings;
 import com.google.common.flogger.GoogleLogger;
 import java.net.InetSocketAddress;