Update Datastore client dependencies and host override logic. Needed as the old deprecated method has now been removed.

PiperOrigin-RevId: 918562515
Change-Id: I596dfa2a59f6cf24d861a71e3b2c2f52ed604ef7

Author: ludoch

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

@@ -255,7 +255,8 @@ 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();
@@ -291,22 +292,22 @@ private static Credential getCredential() throws GeneralSecurityException, IOExc
   }
 
   private static void setProjectEndpoint(String projectId, DatastoreOptions.Builder options) {
-    if (DatastoreServiceGlobalConfig.getConfig().hostOverride() != null) {
-      options.projectEndpoint(
-          String.format(
-              "%s/%s/projects/%s",
-              DatastoreServiceGlobalConfig.getConfig().hostOverride(),
-              DatastoreFactory.VERSION.toLowerCase(),
-              projectId));
+    options.projectId(projectId);
+    String hostOverride = DatastoreServiceGlobalConfig.getConfig().hostOverride();
+    if (hostOverride != null) {
+      if (hostOverride.startsWith("http://")) {
+        options.localHost(hostOverride.substring("http://".length()));
+      } else if (hostOverride.startsWith("https://")) {
+        options.host(hostOverride.substring("https://".length()));
+      } else {
+        options.host(hostOverride);
+      }
       return;
     }
     if (DatastoreServiceGlobalConfig.getConfig().emulatorHost() != null) {
-      options.projectId(projectId);
       options.localHost(DatastoreServiceGlobalConfig.getConfig().emulatorHost());
       return;
     }
-    options.projectId(projectId);
-    return;
   }
 
   private static GoogleCredential.Builder getServiceAccountCredentialBuilder(String account)

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

@@ -21,51 +21,57 @@
 import static com.google.appengine.api.datastore.FetchOptions.Builder.withDefaults;
 import static com.google.appengine.api.datastore.FetchOptions.Builder.withLimit;
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 import com.google.appengine.tools.development.testing.LocalDatastoreServiceTestConfig;
 import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
+import java.util.logging.Handler;
 import java.util.logging.Level;
-import java.util.logging.Logger;
+import java.util.logging.LogRecord;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
 
 @RunWith(JUnit4.class)
 public class QueryResultsSourceImplTest {
-  @Rule public MockitoRule mockitoRule = MockitoJUnit.rule();
-
   private final LocalServiceTestHelper helper =
       new LocalServiceTestHelper(new LocalDatastoreServiceTestConfig());
 
-  @Mock Logger mockLogger;
+  private final AssertingHandler assertingHandler = new AssertingHandler();
 
   @Before
   public void setUp() throws Exception {
     helper.setUp();
     lastChunkSizeWarning.set(0);
+    BaseQueryResultsSource.logger.addHandler(assertingHandler);
   }
 
   @After
   public void tearDown() {
+    BaseQueryResultsSource.logger.removeHandler(assertingHandler);
     lastChunkSizeWarning.set(0);
     helper.tearDown();
   }
 
+  private static class AssertingHandler extends Handler {
+    private final List<LogRecord> records = new ArrayList<>();
+
+    @Override
+    public void publish(LogRecord record) {
+      records.add(record);
+    }
+
+    @Override
+    public void flush() {}
+
+    @Override
+    public void close() {}
+  }
+
   private void addData(int count) {
     DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
     List<Entity> toPut = new ArrayList<>();
@@ -88,40 +94,35 @@ private static Iterable<Entity> asList(PreparedQuery query, FetchOptions opts) {
   }
 
   private void doQueries(ResultIterableProvider provider) {
-    Logger original = BaseQueryResultsSource.logger;
-    BaseQueryResultsSource.logger = mockLogger;
-    try {
-      DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
-      Query query = new Query("foo");
-      // This won't trigger the warning because we're not pulling back enough.
-      for (@SuppressWarnings("unused")
-      Entity e : provider.asIterable(datastore.prepare(query), withLimit(1000))) {}
-      // This won't trigger the warning because we're setting an explicit chunk size.
-      for (@SuppressWarnings("unused")
-      Entity e : provider.asIterable(datastore.prepare(query), withChunkSize(21))) {}
-      // This will trigger the warning.
-      for (@SuppressWarnings("unused")
-      Entity e : provider.asIterable(datastore.prepare(query), withDefaults())) {}
-      // Do it again - we shouldn't log a second time because we only log every
-      // 5 minutes.
-      for (@SuppressWarnings("unused")
-      Entity e : provider.asIterable(datastore.prepare(query), withDefaults())) {}
-    } finally {
-      BaseQueryResultsSource.logger = original;
-    }
+    DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
+    Query query = new Query("foo");
+    // This won't trigger the warning because we're not pulling back enough.
+    for (@SuppressWarnings("unused")
+    Entity e : provider.asIterable(datastore.prepare(query), withLimit(1000))) {}
+    // This won't trigger the warning because we're setting an explicit chunk size.
+    for (@SuppressWarnings("unused")
+    Entity e : provider.asIterable(datastore.prepare(query), withChunkSize(21))) {}
+    // This will trigger the warning.
+    for (@SuppressWarnings("unused")
+    Entity e : provider.asIterable(datastore.prepare(query), withDefaults())) {}
+    // Do it again - we shouldn't log a second time because we only log every
+    // 5 minutes.
+    for (@SuppressWarnings("unused")
+    Entity e : provider.asIterable(datastore.prepare(query), withDefaults())) {}
   }
 
   @Test
   public void testLogChunkSizeWarning() {
     Consumer<ResultIterableProvider> test =
         provider -> {
           doQueries(provider);
-          verify(mockLogger).warning(anyString());
           assertThat(lastChunkSizeWarning.get()).isGreaterThan(0);
+          assertThat(assertingHandler.records).isNotEmpty();
+          assertThat(assertingHandler.records.get(0).getLevel()).isEqualTo(Level.WARNING);
         };
     addData(1001);
     test.accept(QueryResultsSourceImplTest::asIterable);
-    reset(mockLogger);
+    assertingHandler.records.clear();
     lastChunkSizeWarning.set(0);
     test.accept(QueryResultsSourceImplTest::asList);
   }
@@ -135,12 +136,12 @@ public void testLogChunkSizeWarning_After5Minutes() {
           lastChunkSizeWarning.set(lastChunkSizeWarning.get() - (1000 * 60 * 10));
           // Run again, we'll get one more log warning
           doQueries(provider);
-          verify(mockLogger, times(2)).warning(anyString());
+          assertThat(assertingHandler.records).hasSize(2);
           assertThat(lastChunkSizeWarning.get()).isGreaterThan(0);
         };
     addData(1001);
     test.accept(QueryResultsSourceImplTest::asIterable);
-    reset(mockLogger);
+    assertingHandler.records.clear();
     lastChunkSizeWarning.set(0);
     test.accept(QueryResultsSourceImplTest::asList);
   }
@@ -156,11 +157,11 @@ public void testLogChunkSizeWarning_LoggingDisabled() {
             System.clearProperty("appengine.datastore.disableChunkSizeWarning");
           }
           assertThat(lastChunkSizeWarning.get()).isEqualTo(0);
-          verifyNoMoreInteractions(mockLogger);
+          assertThat(assertingHandler.records).isEmpty();
         };
     addData(1001);
     test.accept(QueryResultsSourceImplTest::asIterable);
-    reset(mockLogger);
+    assertingHandler.records.clear();
     lastChunkSizeWarning.set(0);
     test.accept(QueryResultsSourceImplTest::asList);
   }

pom.xml

@@ -69,7 +69,7 @@
     <jetty.version>9.4.58.v20250814</jetty.version>
     <jetty12.version>12.0.35</jetty12.version>
     <jetty121.version>12.1.9</jetty121.version>
-    <slf4j.version>2.0.17</slf4j.version>
+    <slf4j.version>2.0.18</slf4j.version>
     <protoc.version>4.34.1</protoc.version>
     <auto-service.version>1.1.1</auto-service.version>
     <auto-value.version>1.11.1</auto-value.version>
@@ -437,7 +437,7 @@
       <dependency>
         <groupId>com.google.cloud.datastore</groupId>
         <artifactId>datastore-v1-proto-client</artifactId>
-        <version>2.33.1</version>
+        <version>2.41.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.geometry</groupId>
@@ -500,12 +500,12 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-datastore-v1</artifactId>
-        <version>0.128.0</version>
+        <version>0.133.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-common-protos</artifactId>
-        <version>2.67.0</version>
+        <version>2.71.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.code.findbugs</groupId>