Merge from main (#471)

* 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

* Re-enable and migrate RemoteDatastoreTest to Proto2 API and move remaining internal tests to open source.

PiperOrigin-RevId: 865415153
Change-Id: I26706754398304cfe4567583ffb84e0d9f2d73f1

* 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

---------

Co-authored-by: Mend Renovate <bot@renovateapp.com>
Co-authored-by: GAE Java Team <gae-java-bot@google.com>

Author: 3 people

remoteapi/pom.xml

@@ -56,6 +56,37 @@
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-1.0-sdk</artifactId>
     </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.truth.extensions</groupId>
+      <artifactId>truth-proto-extension</artifactId>
+      <version>1.4.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

remoteapi/src/main/java/com/google/appengine/tools/remoteapi/RemoteDatastore.java

@@ -23,7 +23,6 @@
 import com.google.protobuf.Message;
 import com.google.storage.onestore.v3_bytes.proto2api.OnestoreEntity;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -195,12 +194,11 @@ static boolean rewriteQueryAppIds(DatastoreV3Pb.Query.Builder query, String remo
       reserialize = true;
       query.getAncestorBuilder().setApp(remoteAppId);
     }
-    for (DatastoreV3Pb.Query.Filter filter : query.getFilterList()) {
-      for (OnestoreEntity.Property prop : filter.getPropertyList()) {
-        OnestoreEntity.PropertyValue propValue = prop.getValue();
-        if (propValue.hasReferenceValue()) {
+    for (DatastoreV3Pb.Query.Filter.Builder filter : query.getFilterBuilderList()) {
+      for (OnestoreEntity.Property.Builder prop : filter.getPropertyBuilderList()) {
+        if (prop.getValue().hasReferenceValue()) {
           OnestoreEntity.PropertyValue.ReferenceValue.Builder ref =
-              propValue.getReferenceValue().toBuilder();
+              prop.getValueBuilder().getReferenceValueBuilder();
           if (!ref.getApp().equals(remoteAppId)) {
             reserialize = true;
             ref.setApp(remoteAppId);
@@ -268,7 +266,7 @@ private byte[] handleGet(byte[] originalRequestBytes) {
     mergeFromBytes(rewrittenReq, originalRequestBytes);
 
     // Update the Request so that all References have the remoteAppId.
-    boolean reserialize = rewriteRequestReferences(rewrittenReq.getKeyList(), remoteAppId);
+    boolean reserialize = rewriteRequestReferences(rewrittenReq.getKeyBuilderList(), remoteAppId);
     if (rewrittenReq.hasTransaction()) {
       return handleGetWithTransaction(rewrittenReq.build());
     } else {
@@ -326,7 +324,7 @@ private byte[] handleDelete(byte[] requestBytes) {
     DatastoreV3Pb.DeleteRequest.Builder request = DatastoreV3Pb.DeleteRequest.newBuilder();
     mergeFromBytes(request, requestBytes);
 
-    boolean reserialize = rewriteRequestReferences(request.getKeyList(), remoteAppId);
+    boolean reserialize = rewriteRequestReferences(request.getKeyBuilderList(), remoteAppId);
     if (reserialize) {
       // The request was mutated, so we need to reserialize it.
       requestBytes = request.build().toByteArray();
@@ -348,12 +346,12 @@ private byte[] handleDelete(byte[] requestBytes) {
    */
   /* @VisibleForTesting */
   static boolean rewriteRequestReferences(
-      Collection<OnestoreEntity.Reference> references, String remoteAppId) {
+      List<OnestoreEntity.Reference.Builder> references, String remoteAppId) {
 
     boolean reserialize = false;
-    for (OnestoreEntity.Reference refToCheck : references) {
+    for (OnestoreEntity.Reference.Builder refToCheck : references) {
       if (!refToCheck.getApp().equals(remoteAppId)) {
-        refToCheck = refToCheck.toBuilder().setApp(remoteAppId).build();
+        refToCheck.setApp(remoteAppId);
         reserialize = true;
       }
     }

remoteapi/src/main/java/com/google/appengine/tools/remoteapi/RemoteRpc.java

@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2021 Google LLC
  *

remoteapi/src/test/java/com/google/appengine/tools/remoteapi/OAuthClientTest.java

@@ -0,0 +1,122 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.appengine.tools.remoteapi;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+
+import com.google.api.client.http.LowLevelHttpRequest;
+import com.google.api.client.http.LowLevelHttpResponse;
+import com.google.api.client.testing.http.MockHttpTransport;
+import com.google.api.client.testing.http.MockLowLevelHttpRequest;
+import com.google.api.client.testing.http.MockLowLevelHttpResponse;
+import com.google.appengine.tools.remoteapi.AppEngineClient.Response;
+import com.google.appengine.tools.remoteapi.testing.StubCredential;
+import java.io.IOException;
+import java.util.Arrays;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/**
+ * Test for {@link OAuthClient}.
+ */
+@RunWith(JUnit4.class)
+public class OAuthClientTest {
+
+  private static final String APP_ID = "appid";
+
+  private static class SimpleHttpTransport extends MockHttpTransport {
+    private final byte[] responseBytes;
+
+    private String lastMethod = null;
+    private String lastUrl = null;
+
+    SimpleHttpTransport(byte[] responseBytes) {
+      this.responseBytes = responseBytes;
+    }
+
+    @Override
+    public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+      lastMethod = method;
+      lastUrl = url;
+      return new MockLowLevelHttpRequest() {
+        @Override
+        public LowLevelHttpResponse execute() throws IOException {
+          MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
+          response.setContent(Arrays.copyOf(responseBytes, responseBytes.length));
+          return response;
+        }
+      };
+    }
+
+    String getLastMethod() {
+      return lastMethod;
+    }
+
+    String getLastUrl() {
+      return lastUrl;
+    }
+  }
+
+  @Test
+  public void testConstructor() {
+    RemoteApiOptions noOAuthCredential = new RemoteApiOptions()
+        .credentials("email", "password")
+        .httpTransport(new SimpleHttpTransport(new byte[] {}));
+    assertThrows(IllegalArgumentException.class, () -> new OAuthClient(noOAuthCredential, APP_ID));
+
+    RemoteApiOptions noHttpTransport = new RemoteApiOptions()
+        .oauthCredential(new StubCredential());
+    assertThrows(IllegalStateException.class, () -> new OAuthClient(noHttpTransport, APP_ID));
+  }
+
+  @Test
+  public void testGet() throws Exception {
+    byte[] expectedResponseBytes = new byte[] {42};
+    
+    SimpleHttpTransport transport = new SimpleHttpTransport(expectedResponseBytes);
+    RemoteApiOptions options = new RemoteApiOptions()
+        .server("example.com", 8080)
+        .oauthCredential(new StubCredential())
+        .httpTransport(transport);
+
+    Response response = new OAuthClient(options, APP_ID)
+        .get("/foo");
+    assertTrue(Arrays.equals(expectedResponseBytes, response.getBodyAsBytes()));
+    assertEquals("GET", transport.getLastMethod());
+    assertEquals("http://example.com:8080/foo", transport.getLastUrl());
+  }
+
+  @Test
+  public void testPost() throws Exception {
+    byte[] expectedResponseBytes = new byte[] {42};
+
+    SimpleHttpTransport transport = new SimpleHttpTransport(expectedResponseBytes);
+    RemoteApiOptions options = new RemoteApiOptions()
+        .server("example.com", 443)
+        .oauthCredential(new StubCredential())
+        .httpTransport(transport);
+
+    Response response = new OAuthClient(options, APP_ID)
+        .post("/foo", "application/json", new byte[]{1});
+    assertTrue(Arrays.equals(expectedResponseBytes, response.getBodyAsBytes()));
+    assertEquals("POST", transport.getLastMethod());
+    assertEquals("https://example.com:443/foo", transport.getLastUrl());
+  }
+}