GCF file split (munge): imagemagick (GoogleCloudPlatform#2664)

Ace Nassri · web-flow · commit 833ec9dabfc9 · 2020-04-15T10:16:30.000-07:00
diff --git a/functions/imagemagick/pom.xml b/functions/imagemagick/pom.xml
@@ -22,7 +22,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.example.cloud.functions</groupId>
-  <artifactId>functions-snippets-imagemagick</artifactId>
+  <artifactId>functions-imagemagick</artifactId>
 
   <parent>
     <groupId>com.google.cloud.samples</groupId>
@@ -31,7 +31,6 @@
   </parent>
 
   <properties>
-    <powermock.version>2.0.7</powermock.version>
     <maven.compiler.target>11</maven.compiler.target>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -58,14 +57,6 @@
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-vision</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.cloud</groupId>
-      <artifactId>google-cloud-translate</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.cloud</groupId>
-      <artifactId>google-cloud-pubsub</artifactId>
-    </dependency>
 
     <!-- Required for Function primitives -->
     <dependency>
@@ -91,24 +82,6 @@
       <version>29.0-jre</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-core</artifactId>
-      <version>${powermock.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-      <version>${powermock.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito2</artifactId>
-      <version>${powermock.version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <!-- Disable tests during GCF builds (from parent POM) -->
@@ -144,6 +117,9 @@
         <groupId>com.google.cloud.functions</groupId>
         <artifactId>function-maven-plugin</artifactId>
         <version>0.9.1</version>
+        <configuration>
+          <functionTarget>functions.ImageMagick</functionTarget>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/functions/imagemagick/src/main/java/com/example/functions/imagemagick/eventpojos/PubSubMessage.java b/functions/imagemagick/src/main/java/com/example/functions/imagemagick/eventpojos/PubSubMessage.java
diff --git a/functions/imagemagick/src/main/java/functions/ImageMagick.java b/functions/imagemagick/src/main/java/functions/ImageMagick.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.example.functions.imagemagick;
+package functions;
 
 // [START functions_imagemagick_setup]
-import com.example.functions.imagemagick.eventpojos.GcsEvent;
+
 import com.google.cloud.functions.BackgroundFunction;
 import com.google.cloud.functions.Context;
 import com.google.cloud.storage.Blob;
@@ -34,6 +34,7 @@
 import com.google.cloud.vision.v1.ImageAnnotatorClient;
 import com.google.cloud.vision.v1.ImageSource;
 import com.google.cloud.vision.v1.SafeSearchAnnotation;
+import functions.eventpojos.GcsEvent;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/functions/imagemagick/src/main/java/functions/eventpojos/GcsEvent.java b/functions/imagemagick/src/main/java/functions/eventpojos/GcsEvent.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.functions.imagemagick.eventpojos;
+package functions.eventpojos;
 
 import java.util.Date;
 
diff --git a/functions/imagemagick/src/test/java/functions/ImageMagickTest.java b/functions/imagemagick/src/test/java/functions/ImageMagickTest.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.example.functions.imagemagick;
+package functions;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.example.functions.imagemagick.eventpojos.GcsEvent;
-import com.example.functions.imagemagick.eventpojos.MockContext;
 import com.google.common.testing.TestLogHandler;
+import functions.eventpojos.GcsEvent;
+import functions.eventpojos.MockContext;
 import java.util.List;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
diff --git a/functions/imagemagick/src/test/java/functions/eventpojos/MockContext.java b/functions/imagemagick/src/test/java/functions/eventpojos/MockContext.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.example.functions.imagemagick.eventpojos;
+package functions.eventpojos;
 
 import com.google.cloud.functions.Context;
 
