Revert "Add gRPC support to App Engine Images Service"

PiperOrigin-RevId: 925357707
Change-Id: Ib431a248f563e91c03f5ce5526093d8e1e1b4115

Author: gae-java-bot

api/pom.xml

@@ -147,43 +147,12 @@
       <artifactId>guava-testlib</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-netty-shaded</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-protobuf</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-stub</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-auth</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.auth</groupId>
-      <artifactId>google-auth-library-oauth2-http</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-testing</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.cloud</groupId>
-      <artifactId>google-cloud-storage</artifactId>
-    </dependency>
   </dependencies>
   <build>
-
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -244,13 +213,8 @@
           <failOnWarnings>false</failOnWarnings>
         </configuration>
       </plugin>
-
-
-
-
     </plugins>
   </build>
-
   <profiles>
        <profile>
       <id>docFX</id>
@@ -302,12 +266,12 @@
                   <path>
                       <groupId>com.google.auto.service</groupId>
                       <artifactId>auto-service</artifactId>
-                      <version>${auto-service.version}</version>
+                      <version>1.1.1</version>
                   </path>
                   <path>
                       <groupId>com.google.auto.value</groupId>
                       <artifactId>auto-value</artifactId>
-                      <version>${auto-value.version}</version>
+                      <version>1.11.1</version>
                   </path>
               </annotationProcessorPaths>
              </configuration>

api/src/main/java/com/google/appengine/api/SystemEnvironmentProvider.java

@@ -16,9 +16,7 @@
 
 package com.google.appengine.api.images;
 
-import com.google.appengine.api.images.ImagesServicePb.ImageData;
 import java.util.Map;
-import java.util.function.Function;
 
 /**
  * A {@code Composite} represents a composition of an image onto a canvas.
@@ -36,13 +34,10 @@ public static enum Anchor {TOP_LEFT, TOP_CENTER, TOP_RIGHT, CENTER_LEFT,
 
   /**
    * Adds this compositing operation to a Composite request.
-   *
    * @param request Request for this composite to be added to.
    * @param imageIndexMap Map of images and their indexes in the request.
-   * @param imageDataConverter Function to convert an Image to ImageData.
    */
-  abstract void apply(
-      ImagesServicePb.ImagesCompositeRequest.Builder request,
-      Map<Image, Integer> imageIndexMap,
-      Function<Image, ImageData> imageDataConverter);
+  abstract void apply(ImagesServicePb.ImagesCompositeRequest.Builder request,
+             Map<Image, Integer> imageIndexMap);
+
 }

api/src/main/java/com/google/appengine/api/images/Composite.java

@@ -19,10 +19,8 @@
 import static java.util.Objects.requireNonNull;
 
 import com.google.appengine.api.images.ImagesServicePb.CompositeImageOptions;
-import com.google.appengine.api.images.ImagesServicePb.ImageData;
 import com.google.appengine.api.images.ImagesServicePb.ImagesCompositeRequest;
 import java.util.Map;
-import java.util.function.Function;
 
 /**
  * Implementation of Composite using alpha blending.
@@ -70,14 +68,11 @@ final class CompositeImpl extends Composite {
 
   /** {@inheritDoc} */
   @Override
-  void apply(
-      ImagesCompositeRequest.Builder request,
-      Map<Image, Integer> imageIndexMap,
-      Function<Image, ImageData> imageDataConverter) {
+  void apply(ImagesCompositeRequest.Builder request, Map<Image, Integer> imageIndexMap) {
     // TODO: What is the purpose of this map?
     if (!imageIndexMap.containsKey(image)) {
       imageIndexMap.put(image, request.build().getImageCount());
-      request.addImage(imageDataConverter.apply(image));
+      request.addImage(ImagesServiceImpl.convertImageData(image));
     }
     CompositeImageOptions.Builder options = CompositeImageOptions.newBuilder();
     int sourceId = requireNonNull(imageIndexMap.get(image));

api/src/main/java/com/google/appengine/api/images/CompositeImpl.java

@@ -16,13 +16,8 @@
 
 package com.google.appengine.api.images;
 
-import com.google.appengine.api.EnvironmentProvider;
-import com.google.appengine.api.SystemEnvironmentProvider;
 import com.google.appengine.api.blobstore.BlobKey;
 import com.google.appengine.api.blobstore.BlobstoreServiceFactory;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Supplier;
-import com.google.common.base.Suppliers;
 import java.util.Collection;
 
 /**
@@ -32,26 +27,9 @@
  */
 final class ImagesServiceFactoryImpl implements IImagesServiceFactory {
 
-  @VisibleForTesting
-  static final String USE_CUSTOM_IMAGES_GRPC_SERVICE_ENV = "USE_CUSTOM_IMAGES_GRPC_SERVICE";
-
-  private EnvironmentProvider environmentProvider = new SystemEnvironmentProvider();
-
-  private static final Supplier<GrpcImagesClient> grpcClientSupplier =
-      Suppliers.memoize(() -> new GrpcImagesClient());
-
-  @VisibleForTesting
-  void setEnvironmentProvider(EnvironmentProvider environmentProvider) {
-    this.environmentProvider = environmentProvider;
-  }
-
   @Override
   public ImagesService getImagesService() {
-    GrpcImagesClient client = null;
-    if (Boolean.parseBoolean(environmentProvider.getenv(USE_CUSTOM_IMAGES_GRPC_SERVICE_ENV))) {
-      client = grpcClientSupplier.get();
-    }
-    return new ImagesServiceImpl(environmentProvider, client);
+    return new ImagesServiceImpl();
   }
 
   @Override
@@ -66,12 +44,6 @@ public Image makeImageFromBlob(BlobKey blobKey) {
 
   @Override
   public Image makeImageFromFilename(String filename) {
-    if (Boolean.parseBoolean(environmentProvider.getenv(USE_CUSTOM_IMAGES_GRPC_SERVICE_ENV))) {
-      if (!filename.startsWith("/gs/")) {
-        throw new IllegalArgumentException("Google storage filenames must be prefixed with /gs/");
-      }
-      return new ImageImpl(new BlobKey(filename));
-    }
     BlobKey blobKey = BlobstoreServiceFactory.getBlobstoreService().createGsBlobKey(filename);
     return new ImageImpl(blobKey);
   }