Cleanup and standardization of App Engine Standard Java code.

PiperOrigin-RevId: 876534240
Change-Id: I5f4733910a43e999823255019afbe8b1da3eee11

Author: ludoch

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

@@ -221,7 +221,7 @@ protected List<File> getJetty121Jars(String subDir) {
             || f.getName().contains("jakarta.interceptor")
             || f.getName().contains("jakarta.servlet-api-6.0.0") // for EE10
             || f.getName().contains("jakarta.transaction")
-            // TODO Still needed for EE11, not sure why
+            // TODO: Still needed for EE11, not sure why
             // || f.getName().contains("jetty-servlet-api-") // no javax.
             || f.getName().contains("ee8") // we want ee11 only. jakarta apis should be in shared
             || f.getName().contains("ee9") // we want ee11 only. jakarta apis should be in shared

google3/third_party/java_src/appengine_standard/api_compatibility_tests/src/test/java/com/google/appengine/apicompat/usage/BlobstoreApiUsage.java

@@ -320,12 +320,7 @@ public Set<Class<?>> useApi() {
         } catch (IOException e) {
           // ok
         }
-        // This is a hack to get around the fact that java 7 classes are not yet available in
-        // blaze but tests are running under a Java 7 runtime.
-        // TODO: Reference AutoCloseable directly once java 7 classes are available at compile
-        // time.
-        Class<?> autoCloseable = Closeable.class.getInterfaces()[0];
-        return classes(Object.class, InputStream.class, autoCloseable, Closeable.class);
+        return classes(Object.class, InputStream.class, AutoCloseable.class, Closeable.class);
       } finally {
         helper.tearDown();
       }

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

@@ -45,7 +45,6 @@
 /**
  * Test for {@link RemoteDatastore}
  *
- * @author maxr@google.com (Max Ross)
  */
 @RunWith(JUnit4.class)
 public class RemoteDatastoreTest {
@@ -356,11 +355,7 @@ private static EntityProto createEntityProto(String appId, int index) {
 
     EntityProto.Builder entity = EntityProto.newBuilder().setKey(key);
 
-    // TODO: There are utilities for this, but they are all under
-    // apphosting/datastore/testing which we may not want to depend on from here.
-    OnestoreEntity.Path group =
-        OnestoreEntity.Path.newBuilder().addElement(key.getPath().getElement(0)).build();
-    entity.setEntityGroup(group);
+    entity.setEntityGroup(OnestoreEntity.Path.newBuilder().addElement(key.getPath().getElement(0)));
 
     addProperty(entity, "someproperty", index);
 

remoteapi/src/test/java/com/google/appengine/tools/remoteapi/testing/RemoteApiSharedTests.java

@@ -58,7 +58,6 @@ public class RemoteApiSharedTests {
   private final String remoteApiPath;
   private final int port;
   private final boolean testKeysCreatedBeforeRemoteApiInstall;
-  private final boolean expectRemoteAppIdsOnKeysAfterInstallingRemoteApi;
 
   /**
    * Builder for a {@link RemoteApiSharedTests} with some sensible defaults.
@@ -82,14 +81,6 @@ public static class Builder {
      */
     private boolean testKeysCreatedBeforeRemoteApiInstall = true;
 
-    /**
-     * Allow these tests to be turned off because they rely on recent changes that haven't been
-     * rolled out everywhere yet.  Targeting 1.8.8.
-     * See http://b/11254141 and http://b/10788115
-     * TODO: Remove this.
-     */
-    private boolean expectRemoteAppIdsOnKeysAfterInstallingRemoteApi = true;
-
     @CanIgnoreReturnValue
     public Builder setLocalAppId(String localAppId) {
       this.localAppId = localAppId;
@@ -135,8 +126,7 @@ public RemoteApiSharedTests build() {
           server,
           remoteApiPath,
           port,
-          testKeysCreatedBeforeRemoteApiInstall,
-          expectRemoteAppIdsOnKeysAfterInstallingRemoteApi);
+          testKeysCreatedBeforeRemoteApiInstall);
     }
   }
 
@@ -148,8 +138,7 @@ private RemoteApiSharedTests(
       String server,
       String remoteApiPath,
       int port,
-      boolean testKeysCreatedBeforeRemoteApiInstall,
-      boolean expectRemoteAppIdsOnKeysAfterInstallingRemoteApi) {
+      boolean testKeysCreatedBeforeRemoteApiInstall) {
     this.localAppId = localAppId;
     this.remoteAppId = remoteAppId;
     this.username = username;
@@ -158,8 +147,6 @@ private RemoteApiSharedTests(
     this.remoteApiPath = remoteApiPath;
     this.port = port;
     this.testKeysCreatedBeforeRemoteApiInstall = testKeysCreatedBeforeRemoteApiInstall;
-    this.expectRemoteAppIdsOnKeysAfterInstallingRemoteApi =
-        expectRemoteAppIdsOnKeysAfterInstallingRemoteApi;
   }
 
   /**
@@ -314,8 +301,6 @@ public void run(
         DatastoreService ds, Supplier<Key> keySupplier, Supplier<Entity> entitySupplier) {
       // Note that we can't use local keys here.  Query will fail if you set an ancestor whose app
       // id does not match the "global" AppIdNamespace.
-      // TODO: Consider making it more lenient, but it's not a big deal.  Users can
-      // just use a Key that was created after installing the Remote API.
       Entity entity = new Entity(getFreshKindName());
       entity.setProperty("prop1", 99L);
       ds.put(entity);
@@ -399,9 +384,7 @@ private RemoteKeySupplier() {
     public Key get() {
       // This assumes that the remote api has already been installed.
       Key key = KeyFactory.createKey(kind, "somename" + nameCounter);
-      if (expectRemoteAppIdsOnKeysAfterInstallingRemoteApi) {
-        assertRemoteAppId(key);
-      }
+      assertRemoteAppId(key);
       nameCounter++;
 
       return key;
@@ -424,9 +407,7 @@ private RemoteEntitySupplier() {
     public Entity get() {
       // This assumes that the remote api has already been installed.
       Entity entity = new Entity(kind);
-      if (expectRemoteAppIdsOnKeysAfterInstallingRemoteApi) {
-        assertRemoteAppId(entity.getKey());
-      }
+      assertRemoteAppId(entity.getKey());
 
       return entity;
     }