Fix/issue 462 (#469)

* Hardcode several JavaRuntimeParams values.

PiperOrigin-RevId: 860637485
Change-Id: Ibbd87902f4ef73e3620180ad870dc8200a40b417

* Modernize Java syntax to JDK17 level in App Engine code base.

PiperOrigin-RevId: 861206703
Change-Id: If6a63e7bae3d33e833cf752ee8313d88b9dffa86

* Update all non-major dependencies

* Refactor: Use lambda expressions and Character.valueOf.

PiperOrigin-RevId: 862378286
Change-Id: I140e95ffda132265f442bc1d222c587331e367d6

* Update all non-major dependencies

* Refactor AppEngineWebXmlInitialParse to allow mocking environment variables and add a test.
New Test Permutations
We added new test cases to AppEngineWebXmlInitialParseTest.java to ensure full coverage of Runtime, Jetty, and Jakarta EE version combinations:

testJava17WithExperimentEnableJetty12: Verifies that when the environment variable EXPERIMENT_ENABLE_JETTY12_FOR_JAVA is set to true for the java17 runtime (simulated via envProvider), the configuration correctly defaults to appengine.use.EE8=true (Jetty 12.0 in EE8 mode) instead of the standard Jetty 9.4 legacy mode.

testHttpConnectorExperiment: Verifies that when EXPERIMENT_ENABLE_HTTP_CONNECTOR_FOR_JAVA is set to true, the system properties appengine.use.HttpConnector and appengine.ignore.cancelerror are automatically enabled.

testJava17WithJetty121: Verifies that for the java17 runtime, enabling appengine.use.jetty121 alone does not inadvertently enable Jakarta EE 8, 10, or 11.

It confirms that the configuration remains valid with only the Jetty 12.1 flag set.

testJava17WithEE8AndJetty121: Verifies that for java17, explicitly enabling both appengine.use.EE8 and appengine.use.jetty121 correctly sets both properties to true, supporting the legacy EE8 environment on the newer Jetty infrastructure.

testJava21WithEE10Explicit: Confirms that explicitly setting appengine.use.EE10 for java21 (which is the default) works as expected, ensuring EE10 is true and jetty121 remains false (mapping to Jetty 12.0).

testJava21WithEE8AndJetty121: Verifies that for java21, combining appengine.use.EE8 with appengine.use.jetty121 correctly enables both flags.
Environment Variable Emulation
To reliably test logic dependent on environment variables (such as EXPERIMENT_ENABLE_JETTY12_FOR_JAVA or EXPERIMENT_ENABLE_HTTP_CONNECTOR_FOR_JAVA) without modifying the actual system environment or affecting other tests:

The AppEngineWebXmlInitialParse class now accepts a custom envProvider (a UnaryOperator<String>) via the package-private setEnvProvider method.
By default, this provider delegates to System::getenv.

In tests, we inject a lambda function (e.g., key -> "true") to simulate specific environment variables being set.

This allows us to verify that the parser correctly activates experimental features or defaults based on the environment.

testSystemPropertyOverrideRuntime: This test sets the GAE_RUNTIME system property to "java21" (while the XML specifies "java17") and verifies that the runtime logic correctly switches to "java21" behavior (defaulting to EE10). This kills the mutant where runtimeId re-fetching from system properties (line 178) was removed, as the test would fail if runtimeId remained "java17".

testSystemPropertyOverrideRuntimeWithWhitespace: This test sets GAE_RUNTIME to " java21 " (with whitespace) and asserts that the code correctly handles it as "java21" (setting EE10 to true). This kills the mutant where the trim() call (lines 179-181) was removed, as the test would fail if the whitespace prevented the "java21" logic from triggering.

testLogEE8: This test captures the logs generated by AppEngineWebXmlInitialParse and asserts that "appengine.use.EE8=true" is logged when EE8 is enabled. This kills the mutant where the logging logic for EE8 (lines 249-251) was removed.
PiperOrigin-RevId: 862787419
Change-Id: I1bc08a2ee06faa1018f0f225e8ca90f358cc094d

* Update all non-major dependencies

* Refactor StringBuilder usage to use append() calls.

PiperOrigin-RevId: 863263787
Change-Id: I5b7805c536e69fd544fc71edadd0d799e3e5c145

* Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.15.0

* Update Jetty versions and servlet API jar.

Update Jetty 12.0.x to 12.0.32 and Jetty 12.1.x to 12.1.6. Also, update the Jetty servlet API jar from 4.0.6 to 4.0.9 in the Jetty121EE8Sdk configuration.

PiperOrigin-RevId: 864150501
Change-Id: Idc20a1e9abda7b10f9a0e695ad979d3e6cbaa7a2

* temporary fix to AppEngineAnnotationConfiguration for issue #462

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

---------

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
Co-authored-by: Mend Renovate <bot@renovateapp.com>
Co-authored-by: GAE Java Team <gae-java-bot@google.com>
Co-authored-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

Author: 4 people

api/src/main/java/com/google/appengine/api/blobstore/BlobstoreServiceImpl.java

@@ -164,12 +164,10 @@ public void delete(BlobKey... blobKeys) {
     try {
       ApiProxy.makeSyncCall(PACKAGE, "DeleteBlob", request.build().toByteArray());
     } catch (ApiProxy.ApplicationException ex) {
-      switch (BlobstoreServiceError.ErrorCode.forNumber(ex.getApplicationError())) {
-        case INTERNAL_ERROR:
-          throw new BlobstoreFailureException("An internal blobstore error occurred.");
-        default:
-          throw new BlobstoreFailureException("An unexpected error occurred.", ex);
-      }
+      throw switch (BlobstoreServiceError.ErrorCode.forNumber(ex.getApplicationError())) {
+        case INTERNAL_ERROR -> new BlobstoreFailureException("An internal blobstore error occurred.");
+        default -> new BlobstoreFailureException("An unexpected error occurred.", ex);
+      };
     }
   }
 

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

@@ -253,16 +253,11 @@ protected TransactionImpl.InternalTransaction doBeginTransaction(TransactionOpti
       }
     }
     if (options.transactionMode() != null) {
-      switch (options.transactionMode()) {
-        case READ_ONLY:
-          request.setMode(TransactionMode.READ_ONLY);
-          break;
-        case READ_WRITE:
-          request.setMode(TransactionMode.READ_WRITE);
-          break;
-        default:
-          throw new AssertionError("Unrecognized transaction mode: " + options.transactionMode());
-      }
+      request.setMode(switch (options.transactionMode()) {
+        case READ_ONLY -> TransactionMode.READ_ONLY;
+        case READ_WRITE -> TransactionMode.READ_WRITE;
+        default -> throw new AssertionError("Unrecognized transaction mode: " + options.transactionMode());
+      });
     }
 
     Future<DatastoreV3Pb.Transaction> future =
@@ -620,21 +615,11 @@ protected Map<Index, IndexState> wrap(CompositeIndices indices) throws Exception
         for (CompositeIndex ci : indices.getIndexList()) {
           Index index = IndexTranslator.convertFromPb(ci);
           switch (ci.getState()) {
-            case DELETED:
-              answer.put(index, IndexState.DELETING);
-              break;
-            case ERROR:
-              answer.put(index, IndexState.ERROR);
-              break;
-            case READ_WRITE:
-              answer.put(index, IndexState.SERVING);
-              break;
-            case WRITE_ONLY:
-              answer.put(index, IndexState.BUILDING);
-              break;
-            default:
-              logger.log(Level.WARNING, "Unrecognized index state for " + index);
-              break;
+            case DELETED -> answer.put(index, IndexState.DELETING);
+            case ERROR -> answer.put(index, IndexState.ERROR);
+            case READ_WRITE -> answer.put(index, IndexState.SERVING);
+            case WRITE_ONLY -> answer.put(index, IndexState.BUILDING);
+            default -> logger.log(Level.WARNING, "Unrecognized index state for {0}", index);
           }
         }
         return answer;

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

@@ -129,13 +129,7 @@ public BaseQueryResultsSource(
     this.offset = fetchOptions.getOffset() != null ? fetchOptions.getOffset() : 0;
     this.txn = txn;
     this.query = query;
-    this.currentTransactionProvider =
-        new CurrentTransactionProvider() {
-          @Override
-          public Transaction getCurrentTransaction(Transaction defaultValue) {
-            return txn;
-          }
-        };
+    this.currentTransactionProvider = defaultValue -> txn;
     this.initialQueryResultFuture = initialQueryResultFuture;
     this.skippedResults = 0;
   }

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

@@ -62,8 +62,7 @@ public int hashCode() {
   /** Two {@code Blob} objects are considered equal if their contained bytes match exactly. */
   @Override
   public boolean equals(@Nullable Object object) {
-    if (object instanceof Blob) {
-      Blob key = (Blob) object;
+    if (object instanceof Blob key) {
       return Arrays.equals(bytes, key.bytes);
     }
     return false;

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

@@ -22,8 +22,6 @@
 import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
 import com.google.api.client.googleapis.compute.ComputeCredential;
 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.gson.GsonFactory;
 import com.google.api.client.util.ExponentialBackOff;
 import com.google.auto.value.AutoValue;
@@ -59,6 +57,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.logging.Level;
+import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 import org.jspecify.annotations.Nullable;
 
@@ -126,67 +125,31 @@ static synchronized CloudDatastoreV1ClientImpl create(DatastoreServiceConfig con
 
   @Override
   public Future<BeginTransactionResponse> beginTransaction(final BeginTransactionRequest req) {
-    return makeCall(
-        new Callable<BeginTransactionResponse>() {
-          @Override
-          public BeginTransactionResponse call() throws DatastoreException {
-            return datastore.beginTransaction(req);
-          }
-        });
+    return makeCall(() -> datastore.beginTransaction(req));
   }
 
   @Override
   public Future<RollbackResponse> rollback(final RollbackRequest req) {
-    return makeCall(
-        new Callable<RollbackResponse>() {
-          @Override
-          public RollbackResponse call() throws DatastoreException {
-            return datastore.rollback(req);
-          }
-        });
+    return makeCall(() -> datastore.rollback(req));
   }
 
   @Override
   public Future<RunQueryResponse> runQuery(final RunQueryRequest req) {
-    return makeCall(
-        new Callable<RunQueryResponse>() {
-          @Override
-          public RunQueryResponse call() throws DatastoreException {
-            return datastore.runQuery(req);
-          }
-        });
+    return makeCall(() -> datastore.runQuery(req));
   }
 
   @Override
   public Future<LookupResponse> lookup(final LookupRequest req) {
-    return makeCall(
-        new Callable<LookupResponse>() {
-          @Override
-          public LookupResponse call() throws DatastoreException {
-            return datastore.lookup(req);
-          }
-        });
+    return makeCall(() -> datastore.lookup(req));
   }
 
   @Override
   public Future<AllocateIdsResponse> allocateIds(final AllocateIdsRequest req) {
-    return makeCall(
-        new Callable<AllocateIdsResponse>() {
-          @Override
-          public AllocateIdsResponse call() throws DatastoreException {
-            return datastore.allocateIds(req);
-          }
-        });
+    return makeCall(() -> datastore.allocateIds(req));
   }
 
   private Future<CommitResponse> commit(final CommitRequest req) {
-    return makeCall(
-        new Callable<CommitResponse>() {
-          @Override
-          public CommitResponse call() throws DatastoreException {
-            return datastore.commit(req);
-          }
-        });
+    return makeCall(() -> datastore.commit(req));
   }
 
   @Override
@@ -222,10 +185,11 @@ public T call() throws Exception {
           return callable.call();
         } catch (Exception e) {
           if (isRetryable(e) && remainingTries > 0) {
-            logger.log(
-                Level.FINE,
-                String.format("Caught retryable exception; %d tries remaining", remainingTries),
-                e);
+            LogRecord lr =
+                new LogRecord(Level.FINE, "Caught retryable exception; {0} tries remaining");
+            lr.setParameters(new Object[] {remainingTries});
+            lr.setThrown(e);
+            logger.log(lr);
             Thread.sleep(backoff.nextBackOffMillis());
           } else {
             throw e;
@@ -249,21 +213,17 @@ private <T extends Message> Future<T> makeCall(final Callable<T> oneAttempt) {
             ? new Exception()
             : null;
     return executor.submit(
-        new Callable<T>() {
-          @Override
-          public T call() throws Exception {
-            try {
-              return new RetryingCallable<>(oneAttempt, maxRetries).call();
-            } catch (DatastoreException e) {
-              String message =
-                  stackTraceCapturer != null
-                      ? String.format(
-                          "%s%nstack trace when async call was initiated: <%n%s>",
-                          e.getMessage(), Throwables.getStackTraceAsString(stackTraceCapturer))
-                      : String.format(
-                          "%s%n(stack trace capture for async call is disabled)", e.getMessage());
-              throw DatastoreApiHelper.createV1Exception(e.getCode(), message, e);
-            }
+        () -> {
+          try {
+            return new RetryingCallable<>(oneAttempt, maxRetries).call();
+          } catch (DatastoreException e) {
+            String message =
+                stackTraceCapturer != null
+                    ? e.getMessage()
+                        + "\nstack trace when async call was initiated: <\n"
+                        + Throwables.getStackTraceAsString(stackTraceCapturer)
+                    : e.getMessage() + "\n(stack trace capture for async call is disabled)";
+            throw DatastoreApiHelper.createV1Exception(e.getCode(), message, e);
           }
         });
   }
@@ -275,13 +235,10 @@ private static DatastoreOptions createDatastoreOptions(
     setProjectEndpoint(projectId, options);
     options.credential(getCredential());
     options.initializer(
-        new HttpRequestInitializer() {
-          @Override
-          public void initialize(HttpRequest request) throws IOException {
-            request.setConnectTimeout(httpConnectTimeoutMillis);
-            if (config.getDeadline() != null) {
-              request.setReadTimeout((int) (config.getDeadline() * 1000));
-            }
+        request -> {
+          request.setConnectTimeout(httpConnectTimeoutMillis);
+          if (config.getDeadline() != null) {
+            request.setReadTimeout((int) (config.getDeadline() * 1000));
           }
         });
     return options.build();
@@ -298,8 +255,7 @@ private static Credential getCredential() throws GeneralSecurityException, IOExc
       if (privateKeyFile != null) {
         logger.log(
             Level.INFO,
-            "Service account and private key file were provided. "
-                + "Using service account credential.");
+            "Service account and private key file were provided. Using service account credential.");
         return getServiceAccountCredentialBuilder(serviceAccount)
             .setServiceAccountPrivateKeyFromP12File(new File(privateKeyFile))
             .build();
@@ -308,8 +264,7 @@ private static Credential getCredential() throws GeneralSecurityException, IOExc
       if (privateKey != null) {
         logger.log(
             Level.INFO,
-            "Service account and private key were provided. "
-                + "Using service account credential.");
+            "Service account and private key were provided. Using service account credential.");
         return getServiceAccountCredentialBuilder(serviceAccount)
             .setServiceAccountPrivateKey(privateKey)
             .build();

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

@@ -145,12 +145,7 @@ protected String generateXmlForIndex(Index index, IndexSource source) {
 
   /** We compare {@link Property Properties} by comparing their names. */
   private static final Comparator<Property> PROPERTY_NAME_COMPARATOR =
-      new Comparator<Property>() {
-        @Override
-        public int compare(Property o1, Property o2) {
-          return o1.getName().compareTo(o2.getName());
-        }
-      };
+      (o1, o2) -> o1.getName().compareTo(o2.getName());
 
   private List<Property> getRecommendedIndexProps(IndexComponentsOnlyQuery query) {
     // Construct the list of index properties

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

@@ -1113,7 +1113,6 @@ public RawValue getValue(Value propertyValue) {
     }
 
     @Override
- @  SuppressWarnings("PatternMatchingInstanceof") 
     public @Nullable Comparable<?> asComparable(Object value) {
       Object value2 = ((RawValue) value).getValue();
       // All possible values except byte[] are already comparable.
@@ -2027,10 +2026,7 @@ public int compareTo(ComparableByteArray other) {
 
     @Override
     public boolean equals(@Nullable Object obj) {
-      if (obj == null) {
-        return false;
-      }
-      return Arrays.equals(bytes, ((ComparableByteArray) obj).bytes);
+      return obj instanceof ComparableByteArray other && Arrays.equals(bytes, other.bytes);
     }
 
     @Override

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

@@ -63,59 +63,41 @@ public static RuntimeException translateError(ApiProxy.ApplicationException exce
     if (errorCode == null) {
       return new DatastoreFailureException(exception.getErrorDetail());
     }
-    switch (errorCode) {
-      case BAD_REQUEST:
-        return new IllegalArgumentException(exception.getErrorDetail());
-
-      case CONCURRENT_TRANSACTION:
-        return new ConcurrentModificationException(exception.getErrorDetail());
-
-      case NEED_INDEX:
-        return new DatastoreNeedIndexException(exception.getErrorDetail());
-
-      case TIMEOUT:
-      case BIGTABLE_ERROR:
-        return new DatastoreTimeoutException(exception.getErrorDetail());
-
-      case COMMITTED_BUT_STILL_APPLYING:
-        return new CommittedButStillApplyingException(exception.getErrorDetail());
-
-      case RESOURCE_EXHAUSTED:
-        return new ApiProxy.OverQuotaException(exception.getErrorDetail(), (Throwable) null);
-
-      case INTERNAL_ERROR:
-      default:
-        return new DatastoreFailureException(exception.getErrorDetail());
-    }
+    return switch (errorCode) {
+      case BAD_REQUEST -> new IllegalArgumentException(exception.getErrorDetail());
+      case CONCURRENT_TRANSACTION -> new ConcurrentModificationException(exception.getErrorDetail());
+      case NEED_INDEX -> new DatastoreNeedIndexException(exception.getErrorDetail());
+      case TIMEOUT, BIGTABLE_ERROR -> new DatastoreTimeoutException(exception.getErrorDetail());
+      case COMMITTED_BUT_STILL_APPLYING -> new CommittedButStillApplyingException(
+          exception.getErrorDetail());
+      case RESOURCE_EXHAUSTED -> new ApiProxy.OverQuotaException(
+          exception.getErrorDetail(), (Throwable) null);
+      default -> new DatastoreFailureException(exception.getErrorDetail());
+    };
   }
 
   static RuntimeException createV1Exception(Code code, String message, Throwable cause) {
     if (code == null) {
       return new DatastoreFailureException(message, cause);
     }
-    switch (code) {
-      case ABORTED:
-        return new ConcurrentModificationException(message, cause);
-      case FAILED_PRECONDITION:
+    return switch (code) {
+      case ABORTED -> new ConcurrentModificationException(message, cause);
+      case FAILED_PRECONDITION -> {
         if (message.contains("The Cloud Datastore API is not enabled for the project")) {
-          return new DatastoreFailureException(message, cause);
+          yield new DatastoreFailureException(message, cause);
         }
         // Could also indicate ErrorCode.SAFE_TIME_TOO_OLD.
-        return new DatastoreNeedIndexException(message, cause);
-      case DEADLINE_EXCEEDED:
-        return new DatastoreTimeoutException(message, cause);
-      case INVALID_ARGUMENT:
-      case PERMISSION_DENIED:
-        return new IllegalArgumentException(message, cause);
-      case UNAVAILABLE:
-        return new ApiProxy.RPCFailedException(message, cause);
-      case RESOURCE_EXHAUSTED:
-        return new ApiProxy.OverQuotaException(message, cause);
-      case INTERNAL:
-        // Could also indicate ErrorCode.COMMITTED_BUT_STILL_APPLYING.
-      default:
-        return new DatastoreFailureException(message, cause);
-    }
+        yield new DatastoreNeedIndexException(message, cause);
+      }
+      case DEADLINE_EXCEEDED -> new DatastoreTimeoutException(message, cause);
+      case INVALID_ARGUMENT, PERMISSION_DENIED -> new IllegalArgumentException(message, cause);
+      case UNAVAILABLE -> new ApiProxy.RPCFailedException(message, cause);
+      case RESOURCE_EXHAUSTED -> new ApiProxy.OverQuotaException(message, cause);
+      case INTERNAL ->
+          // Could also indicate ErrorCode.COMMITTED_BUT_STILL_APPLYING.
+          new DatastoreFailureException(message, cause);
+      default -> new DatastoreFailureException(message, cause);
+    };
   }
 
   static <T extends Message, S extends Message.Builder> Future<T> makeAsyncCall(
@@ -162,8 +144,8 @@ protected T wrap(byte[] responseBytes) throws InvalidProtocolBufferException {
 
       @Override
       protected Throwable convertException(Throwable cause) {
-        if (cause instanceof ApiProxy.ApplicationException) {
-          return translateError((ApiProxy.ApplicationException) cause);
+        if (cause instanceof ApiProxy.ApplicationException applicationException) {
+          return translateError(applicationException);
         }
         return cause;
       }