chore: fix build, test, and CI workflow warnings

Author: ludoch

.github/workflows/maven.yml

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

api/pom.xml

@@ -147,6 +147,12 @@
       <artifactId>guava-testlib</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-nop</artifactId>
+      <version>${slf4j.version}</version>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>jakarta.servlet</groupId>

api/src/test/java/com/google/appengine/api/images/ImagesServiceImplTest.java

@@ -16,6 +16,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 import java.util.concurrent.ExecutionException;
 
@@ -166,14 +167,16 @@ private void setupGrpcService(ImagesServiceGrpc.ImagesServiceImplBase serviceImp
         grpcCleanup.register(InProcessChannelBuilder.forName(serverName).directExecutor().build());
     blockingStub = ImagesServiceGrpc.newBlockingStub(channel);
     futureStub = ImagesServiceGrpc.newFutureStub(channel);
-    when(mockGrpcImagesClient.getBlockingStub()).thenReturn(blockingStub);
-    when(mockGrpcImagesClient.getFutureStub()).thenReturn(futureStub);
+    lenient().when(mockGrpcImagesClient.getBlockingStub()).thenReturn(blockingStub);
+    lenient().when(mockGrpcImagesClient.getFutureStub()).thenReturn(futureStub);
     imagesService =
         new ImagesServiceImpl(
             mockEnvironmentProvider, mockGrpcImagesClient, null, mockBlobstoreReference);
 
-    when(mockEnvironmentProvider.getenv(
-            ImagesServiceFactoryImpl.USE_CUSTOM_IMAGES_GRPC_SERVICE_ENV))
+    lenient()
+        .when(
+            mockEnvironmentProvider.getenv(
+                ImagesServiceFactoryImpl.USE_CUSTOM_IMAGES_GRPC_SERVICE_ENV))
         .thenReturn("true");
   }
 
@@ -356,8 +359,10 @@ public void loadImageData_withLegacyBlobKey_failure() throws Exception {
 
   public void setUpGrpc(boolean useGrpc) throws Exception {
     ImagesServiceImpl.setStorageForTesting(mockStorage);
-    when(mockEnvironmentProvider.getenv(
-            ImagesServiceFactoryImpl.USE_CUSTOM_IMAGES_GRPC_SERVICE_ENV))
+    lenient()
+        .when(
+            mockEnvironmentProvider.getenv(
+                ImagesServiceFactoryImpl.USE_CUSTOM_IMAGES_GRPC_SERVICE_ENV))
         .thenReturn(Boolean.toString(useGrpc));
 
     if (useGrpc) {
@@ -373,8 +378,8 @@ public void setUpGrpc(boolean useGrpc) throws Exception {
               InProcessChannelBuilder.forName(serverName).directExecutor().build());
       blockingStub = ImagesServiceGrpc.newBlockingStub(channel);
       futureStub = ImagesServiceGrpc.newFutureStub(channel);
-      when(mockGrpcImagesClient.getBlockingStub()).thenReturn(blockingStub);
-      when(mockGrpcImagesClient.getFutureStub()).thenReturn(futureStub);
+      lenient().when(mockGrpcImagesClient.getBlockingStub()).thenReturn(blockingStub);
+      lenient().when(mockGrpcImagesClient.getFutureStub()).thenReturn(futureStub);
 
       imagesService =
           new ImagesServiceImpl(

api_dev/pom.xml

@@ -209,6 +209,12 @@
       <artifactId>mockito-junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-nop</artifactId>
+      <version>${slf4j.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>

api_dev/src/test/java/com/google/appengine/api/blobstore/BlobstoreServiceImplTest.java

@@ -163,16 +163,15 @@ public void testDelete_multiSuccess() throws Exception {
     DeleteBlobRequest requestProto =
         DeleteBlobRequest.newBuilder().addBlobKey("_foo1").addBlobKey("_foo2").build();
 
-    when(delegate.makeSyncCall(any(), any(), any(), any())).thenReturn(new byte[0]);
-
-    new BlobstoreServiceImpl().delete(new BlobKey("_foo1"), new BlobKey("_foo2"));
     when(delegate.makeSyncCall(
             same(ApiProxy.getCurrentEnvironment()),
             eq(BlobstoreServiceImpl.PACKAGE),
             eq("DeleteBlob"),
             eq(requestProto.toByteArray())))
         .thenReturn(new byte[0]);
 
+    new BlobstoreServiceImpl().delete(new BlobKey("_foo1"), new BlobKey("_foo2"));
+
     verify(delegate)
         .makeSyncCall(
             same(ApiProxy.getCurrentEnvironment()),

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

@@ -21,6 +21,7 @@
 import static com.google.common.util.concurrent.Futures.immediateFuture;
 import static org.junit.Assert.assertThrows;
 import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.notNull;
 import static org.mockito.Mockito.when;
@@ -89,7 +90,7 @@ public void setUp() throws Exception {
         new AsyncDatastoreServiceFactory() {
           @Override
           public AsyncDatastoreService getInstance(DatastoreServiceConfig config) {
-            when(delegate.getDatastoreServiceConfig()).thenReturn(config);
+            lenient().when(delegate.getDatastoreServiceConfig()).thenReturn(config);
             return delegate;
           }
 

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

@@ -1412,7 +1412,6 @@ public void testPostLoad_Get_Batch_RollbackTxn() throws Exception {
         datastore.get(ImmutableList.of(yar.getKey(), yarChild.getKey()));
     verifyNoMoreInteractions(mock);
     // postLoad callback doesn't run until we call get() on the future.
-    assertThat(result.get()).containsExactly(yar.getKey(), yar, yarChild.getKey(), yarChild);
     doAnswer(checkContext(new PostLoadContext(txnProvider, txn, ImmutableList.of(yar, yarChild))))
         .when(mock)
         .postLoad(any());

appengine_jsr107/src/test/java/com/google/appengine/api/memcache/jsr107cache/GCacheTest.java

@@ -207,7 +207,7 @@ public void testPutAll_addIfNotPresent_throws() {
     properties.put(GCacheFactory.THROW_ON_PUT_FAILURE, Boolean.TRUE);
     properties.put(GCacheFactory.SET_POLICY, ADD_ONLY_IF_NOT_PRESENT);
     Cache cache = new GCache(properties);
-    when(service.putAll(map, null, REPLACE_ONLY_IF_PRESENT)).thenReturn(failureSet);
+    when(service.putAll(map, null, ADD_ONLY_IF_NOT_PRESENT)).thenReturn(failureSet);
     assertThrows(GCacheException.class, () -> cache.putAll(map));
   }
 

appengine_testing_tests/pom.xml

@@ -68,6 +68,12 @@
             <artifactId>javax.servlet-api</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-nop</artifactId>
+            <version>${slf4j.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <profiles>
         <profile>
@@ -82,8 +88,10 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
                             <argLine>
-                                -Duser.timezone=CST
+                                -Xshare:off
+                                -Duser.timezone=America/Chicago
                                 --add-opens java.base/java.lang=ALL-UNNAMED
+                                -javaagent:${org.mockito:mockito-core:jar}
                             </argLine>
                           <systemPropertyVariables>
                             <net.bytebuddy.experimental>true</net.bytebuddy.experimental>
@@ -105,7 +113,7 @@
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
                             <argLine>
-                                -Duser.timezone=CST
+                                -Duser.timezone=America/Chicago
                             </argLine>
                         </configuration>
                     </plugin>

lib/tools_api/src/main/java/com/google/appengine/tools/admin/Application.java

@@ -1236,8 +1236,7 @@ private void compileJspJavaFiles(
     // Depending on the runtime, select the correct bytecode target for the jsp classes compilation.
     // If the runtime is unknown and forced (like java9), keep the default settings.
     // If the current JDK is older than the runtime, we fallback to the current JDK version.
-    optionList.addAll(Arrays.asList("-source", javaVersion));
-    optionList.addAll(Arrays.asList("-target", javaVersion));
+    optionList.addAll(Arrays.asList("--release", javaVersion, "-Xlint:-options"));
 
     Iterable<? extends JavaFileObject> compilationUnits =
         fileManager.getJavaFileObjectsFromFiles(files);