.github/workflows/maven.yml

@@ -39,10 +39,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up JDK
-        uses: actions/setup-java@v2.5.0
+        uses: actions/setup-java@v3
         with:
           distribution: ${{ matrix.jdk }}
           java-version: ${{ matrix.java }}

.gitignore

@@ -46,3 +46,7 @@ release.properties
 pom.xml.releaseBackup
 pom.xml.tag
 runtime/test/WEB-INF/
+
+# AppEngine Generated Files
+/applications/proberapp/${appengine.runtime.location}/
+/appengine_testing_tests/WEB-INF/appengine-generated/

TRYLATESTBITSINPROD.md

@@ -43,12 +43,12 @@ top of your web application and change the entrypoint to boot with these jars in
  mvn clean install
 ```
 
-Let's assume the current built version is `2.0.6-SNAPSHOT`.
+Let's assume the current built version is `2.0.7-SNAPSHOT`.
 Add the dependency for the GAE runtime jars in your application pom.xml file:
 
 ```
  <properties>
-        <appengine.runtime.version>2.0.6-SNAPSHOT</appengine.runtime.version>
+        <appengine.runtime.version>2.0.7-SNAPSHOT</appengine.runtime.version>
         <appengine.runtime.location>${appengine.runtime.location}</appengine.runtime.location>
  <properties>
  ...

api/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.6-SNAPSHOT</version>
+    <version>2.0.7-SNAPSHOT</version>
   </parent>
   <properties>
     <maven.deploy.skip>true</maven.deploy.skip>

api/src/main/java/com/google/appengine/api/ThreadManager.java

@@ -17,6 +17,7 @@
 package com.google.appengine.api;
 
 import com.google.apphosting.api.ApiProxy;
+import java.util.Optional;
 import java.util.concurrent.ThreadFactory;
 
 /**
@@ -36,24 +37,21 @@ public final class ThreadManager {
       "com.google.appengine.api.ThreadManager.BACKGROUND_THREAD_FACTORY";
 
   /**
-   * Returns a {@link ThreadFactory} that will create threads scoped
-   * to the current request.  These threads will be interrupted at the
-   * end of the current request and must complete within the request
-   * deadline. If they fail to, the instance containing them may be
-   * terminated.
+   * Returns a {@link ThreadFactory} which will create threads scoped to the current request. These
+   * threads will be interrupted at the end of the current request and must complete within the
+   * request deadline. If they fail to, the instance containing them may be terminated.
    *
-   * <p>The principal reason to use this method is so that the created
-   * threads can make App Engine API calls ({@code com.google.appengine.api.*}).
-   * In general, threads not associated with a request cannot make these API calls.
+   * <p>The principal reason to use this method is so that the created threads can make App Engine
+   * API calls ({@code com.google.appengine.api.*}). In general, threads not associated with a
+   * request cannot make these API calls.
    *
-   * <p>The returned factory is typically used with a call like
-   * {@link java.util.concurrent.Executors#newCachedThreadPool(ThreadFactory)}.
-   * Do not use the {@link java.util.concurrent.ExecutorService ExecutorService} returned
-   * by this call after the request that created it has completed.
+   * <p>The returned factory is typically used with a call like {@link
+   * java.util.concurrent.Executors#newCachedThreadPool(ThreadFactory)}. Do not use the {@link
+   * java.util.concurrent.ExecutorService ExecutorService} returned by this call after the request
+   * that created it has completed.
    *
-   * <p>Note that calling {@link ThreadFactory#newThread} on the
-   * returned instance may throw any of the unchecked exceptions
-   * mentioned by {@link #createBackgroundThread}.
+   * <p>Note that calling {@link ThreadFactory#newThread} on the returned instance may throw any of
+   * the unchecked exceptions mentioned by {@link #createBackgroundThread}.
    *
    * @throws NullPointerException if the calling thread is not associated with a request.
    */
@@ -62,6 +60,34 @@ public static ThreadFactory currentRequestThreadFactory() {
     return (ThreadFactory) environment.getAttributes().get(REQUEST_THREAD_FACTORY_ATTR);
   }
 
+  /**
+   * Returns an Optional {@link ThreadFactory} which will create threads scoped to the current
+   * request. These threads will be interrupted at the end of the current request and must complete
+   * within the request deadline. If they fail to, the instance containing them may be terminated.
+   *
+   * <p>If this method is not called from an App Engine request thread, returns an empty Optional
+   * instance.
+   *
+   * <p>The principal reason to use this method is so that the created threads can make App Engine
+   * API calls ({@code com.google.appengine.api.*}). In general, threads not associated with a
+   * request cannot make these API calls.
+   *
+   * <p>The returned factory is typically used with a call like {@link
+   * java.util.concurrent.Executors#newCachedThreadPool(ThreadFactory)}. Do not use the {@link
+   * java.util.concurrent.ExecutorService ExecutorService} returned by this call after the request
+   * that created it has completed.
+   *
+   * <p>Note that calling {@link ThreadFactory#newThread} on the returned instance may throw any of
+   * the unchecked exceptions mentioned by {@link #createBackgroundThread}.
+   */
+  public static Optional<ThreadFactory> currentRequestThreadFactoryOptional() {
+    return Optional.ofNullable(ApiProxy.getCurrentEnvironment())
+        .flatMap(
+            environment ->
+                Optional.ofNullable(
+                    (ThreadFactory) environment.getAttributes().get(REQUEST_THREAD_FACTORY_ATTR)));
+  }
+
   /**
    * Create a new {@link Thread} that executes {@code runnable} for
    * the duration of the current request.  Calling this method is

api/src/main/java/com/google/appengine/api/datastore/CloudDatastoreV1ClientImpl.java

@@ -24,7 +24,7 @@
 import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpRequestInitializer;
-import com.google.api.client.json.jackson.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.util.ExponentialBackOff;
 import com.google.auto.value.AutoValue;
 import com.google.common.base.Preconditions;
@@ -321,7 +321,7 @@ private static Credential getCredential() throws GeneralSecurityException, IOExc
       // TODO: Remove this special case and defer to Application Default Credentials
       // See b/35156374.
       return new ComputeCredential(
-          GoogleNetHttpTransport.newTrustedTransport(), new JacksonFactory());
+          GoogleNetHttpTransport.newTrustedTransport(), GsonFactory.getDefaultInstance());
     }
     return GoogleCredential.getApplicationDefault().createScoped(DatastoreOptions.SCOPES);
   }
@@ -349,7 +349,7 @@ private static GoogleCredential.Builder getServiceAccountCredentialBuilder(Strin
       throws GeneralSecurityException, IOException {
     return new GoogleCredential.Builder()
         .setTransport(GoogleNetHttpTransport.newTrustedTransport())
-        .setJsonFactory(new JacksonFactory())
+        .setJsonFactory(GsonFactory.getDefaultInstance())
         .setServiceAccountId(account)
         .setServiceAccountScopes(DatastoreOptions.SCOPES);
   }

api_dev/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.6-SNAPSHOT</version>
+    <version>2.0.7-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>

api_dev/src/main/java/com/google/appengine/api/datastore/dev/LocalDatastoreService.java

@@ -1201,7 +1201,7 @@ private void addActionsImpl(Status status, TaskQueueBulkAddRequest request) {
   static Transaction toProto1(
       com.google.apphosting.datastore.proto2api.DatastoreV3Pb.Transaction txn) {
     Transaction txnProto = new Transaction();
-    txnProto.mergeFrom(txn.toByteArray());
+    boolean unused = txnProto.mergeFrom(txn.toByteArray());
     return txnProto;
   }
 

api_dev/src/main/java/com/google/appengine/tools/info/AppengineSdk.java

@@ -34,21 +34,6 @@
  */
 public abstract class AppengineSdk {
 
-  /**
-   * For the quickstart annotation processing, we need different weddefault.xml files used by Jetty
-   * to specify system default servlets and filters. For now, we need 3 of them: - the vm:true
-   * Managed VM Java image (based on Jetty92), - the vm:true/flex Managed VM Java image developped
-   * on github (based on Jetty93), - the App Engine standard Java8(g) runtime (based on Jetty93)
-   */
-  public enum WebDefaultXmlType {
-    JETTY93_STANDARD {
-      @Override
-      public String toString() {
-        return "9.3.standard";
-      }
-    }
-  }
-
   /**
    * Default deployment admin server name.
    */
@@ -146,16 +131,11 @@ public List<URL> getUserJspLibs() {
   /** Returns the list of web api jar URLs for the SDK. */
   public abstract List<URL> getWebApiToolsLibs();
 
-  /**
-   * Returns the classpath of the quickstart process.
-   */
-  public abstract String getQuickStartClasspath(WebDefaultXmlType jettyVersion);
+  /** Returns the classpath of the quickstart process. */
+  public abstract String getQuickStartClasspath();
 
-  /**
-   * Returns the webdefault.xml for the corresponding Jetty version.
-   * Valid versions for now are 9.2 and 9.3 (Standard or Flex).
-   */
-  public abstract String getWebDefaultXml(WebDefaultXmlType jettyVersion);
+  /** Returns the webdefault.xml for the corresponding Jetty version. */
+  public abstract String getWebDefaultXml();
 
   /**
    * Returns the path to SDK resource files like xml or schemas files.

api_dev/src/main/java/com/google/appengine/tools/info/ClassicSdk.java

@@ -75,7 +75,7 @@ public List<URL> getDatanucleusLibs(String version) {
   }
 
   @Override
-  public String getQuickStartClasspath(WebDefaultXmlType jettyVersion) {
+  public String getQuickStartClasspath() {
     List<String> list = new ArrayList<>();
     File quickstart = new File(getSdkRoot(), "lib/tools/quickstart/quickstartgenerator.jar");
     File jettyDir = new File(getSdkRoot(), SdkInfo.JETTY9_HOME_LIB_PATH);
@@ -101,13 +101,8 @@ public String getQuickStartClasspath(WebDefaultXmlType jettyVersion) {
   }
 
   @Override
-  public String getWebDefaultXml(WebDefaultXmlType jettyVersion) {
-    switch (jettyVersion) {
-      case JETTY93_STANDARD:
+  public String getWebDefaultXml() {
         return getSdkRoot() + "/docs/webdefault.xml";
-      default:
-        throw new IllegalArgumentException("Invalid Jetty version: " + jettyVersion);
-    }
   }
 
   public String getSdkRoot() {

api_dev/src/main/java/com/google/appengine/tools/info/MavenSdk.java

@@ -70,7 +70,7 @@ public List<File> getUserLibFiles() {
   }
 
   @Override
-  public String getQuickStartClasspath(WebDefaultXmlType jettyVersion) {
+  public String getQuickStartClasspath() {
     List<String> classes =
         Lists.transform(
             profileToFiles.get("QuickStart"),
@@ -114,8 +114,8 @@ public List<URL> getDatanucleusLibs(String version) {
   }
 
   @Override
-  public String getWebDefaultXml(WebDefaultXmlType jettyVersion) {
-    return new File(resourceFile, jettyVersion + "/webdefault.xml").toString();
+  public String getWebDefaultXml() {
+    return new File(resourceFile, "aaaaaaa" + "/webdefault.xml").toString();
   }
 
   @Override

api_dev/src/main/java/com/google/appengine/tools/info/SdkInfo.java

@@ -29,10 +29,7 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-/**
- * Retrieves installation information for the App Engine SDK.
- *
- */
+/** Retrieves installation information for the App Engine SDK. */
 public class SdkInfo {
 
   public static final String SDK_ROOT_PROPERTY = "appengine.sdk.root";
@@ -333,7 +330,15 @@ static List<File> getJetty9SharedLibFiles() {
     File jettyHomeLib = new File(sdkRoot, JETTY9_HOME_LIB_PATH);
 
     sharedLibs.add(new File(jettyHomeLib, "servlet-api-3.1.jar"));
-    sharedLibs.add(new File(jettyHomeLib, "jetty-schemas-3.1.jar"));
+    File schemas = new File(jettyHomeLib, "servlet-schemas-3.1.jar");
+    if (schemas.exists()) {
+      sharedLibs.add(schemas);
+    } else {
+      schemas = new File(jettyHomeLib, "jetty-schemas-3.1.jar");
+      if (schemas.exists()) {
+        sharedLibs.add(schemas);
+      }
+    }
 
     // We want to match this file: "jetty-util-9.3.8.v20160314.jar"
     // but without hardcoding the Jetty version which is changing from time to time.

api_dev/src/test/java/com/google/appengine/api/datastore/LazyListImplTest.java

@@ -96,11 +96,11 @@ public Future<byte[]> makeAsyncCall(
       if (packageName.equals("datastore_v3")) {
         if (methodName.equals("RunQuery")) {
           DatastoreV3Pb.Query query = new DatastoreV3Pb.Query();
-          query.parseFrom(request);
+          boolean unused = query.parseFrom(request);
           runQueryCalls.add(query);
         } else if (methodName.equals("Next")) {
           DatastoreV3Pb.NextRequest next = new DatastoreV3Pb.NextRequest();
-          next.parseFrom(request);
+          boolean unused = next.parseFrom(request);
           nextCalls.add(next);
         }
       }

api_dev/src/test/java/com/google/appengine/api/quota/QuotaServiceImplTest.java

@@ -51,12 +51,16 @@ public void setUp() throws Exception {
     // Setup the environment, stats, and quota service
     environment = new MockEnvironment("some-app", "v1");
     ApiProxy.setEnvironmentForCurrentThread(environment);
-    // TODO(b/226203690): the unused capture shouldn't be necessary
+
+    // We capture the result to avoid tripping a compile-time check, but we don't
+    // need to do anything with this result, as ApiStats's constructor is
+    // side-effecting (it binds this to the environment).
     ApiStats unused = new ApiStats(environment) {
       @Override
       public long getApiTimeInMegaCycles() {
         return 13;
       }
+
       @Override
       public long getCpuTimeInMegaCycles() {
         return 14;

api_legacy/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.6-SNAPSHOT</version>
+    <version>2.0.7-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>

appengine-api-1.0-sdk/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.6-SNAPSHOT</version>
+    <version>2.0.7-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: appengine-api-1.0-sdk</name>

appengine-api-stubs/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.6-SNAPSHOT</version>
+    <version>2.0.7-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>