From c1d472de25183836b40c7268cedbfd2fefc5e6ed Mon Sep 17 00:00:00 2001
From: Mike Eltsufin <meltsufin@google.com>
Date: Thu, 30 Apr 2020 10:29:54 -0400
Subject: [PATCH] Change package `gcloud` to `gcp`

Resolves #510
---
 docs/src/main/asciidoc/adapters/gcp-intro.adoc              | 6 +++---
 .../function/adapter/{gcloud => gcp}/FunctionInvoker.java   | 2 +-
 .../cloud/function/adapter/{gcloud => gcp}/Context.java     | 2 +-
 .../{gcloud => gcp}/FunctionInvokerBackgroundTests.java     | 2 +-
 .../adapter/{gcloud => gcp}/FunctionInvokerHttpTests.java   | 2 +-
 .../function/adapter/{gcloud => gcp}/PubSubMessage.java     | 2 +-
 .../integration/FunctionInvokerIntegrationTests.java        | 4 ++--
 .../{gcloud => gcp}/integration/LocalServerTestSupport.java | 4 ++--
 .../function-sample-gcp/README.adoc                         | 2 +-
 spring-cloud-function-samples/function-sample-gcp/pom.xml   | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)
 rename spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/{gcloud => gcp}/FunctionInvoker.java (98%)
 rename spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/{gcloud => gcp}/Context.java (96%)
 rename spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/{gcloud => gcp}/FunctionInvokerBackgroundTests.java (99%)
 rename spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/{gcloud => gcp}/FunctionInvokerHttpTests.java (98%)
 rename spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/{gcloud => gcp}/PubSubMessage.java (96%)
 rename spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/{gcloud => gcp}/integration/FunctionInvokerIntegrationTests.java (92%)
 rename spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/{gcloud => gcp}/integration/LocalServerTestSupport.java (97%)

diff --git a/docs/src/main/asciidoc/adapters/gcp-intro.adoc b/docs/src/main/asciidoc/adapters/gcp-intro.adoc
index 74ce1e09b..e44de79d7 100644
--- a/docs/src/main/asciidoc/adapters/gcp-intro.adoc
+++ b/docs/src/main/asciidoc/adapters/gcp-intro.adoc
@@ -29,14 +29,14 @@ public class CloudFunctionMain {
 
 Start by adding the Maven plugin provided as part of the Google Functions Framework for Java.
 
-[source, xml]
+[source,xml]
 ----
 <plugin>
     <groupId>com.google.cloud.functions</groupId>
     <artifactId>function-maven-plugin</artifactId>
     <version>0.9.1</version>
     <configuration>
-        <functionTarget>org.springframework.cloud.function.adapter.gcloud.FunctionInvoker</functionTarget>
+        <functionTarget>org.springframework.cloud.function.adapter.gcp.FunctionInvoker</functionTarget>
         <port>8080</port>
     </configuration>
 </plugin>
@@ -134,7 +134,7 @@ From the project base directory run the following command to deploy.
 
 ----
 gcloud alpha functions deploy function-sample-gcp \
---entry-point org.springframework.cloud.function.adapter.gcloud.FunctionInvoker \
+--entry-point org.springframework.cloud.function.adapter.gcp.FunctionInvoker \
 --runtime java11 \
 --trigger-http \
 --source target/deploy \
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcloud/FunctionInvoker.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcp/FunctionInvoker.java
similarity index 98%
rename from spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcloud/FunctionInvoker.java
rename to spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcp/FunctionInvoker.java
index 591c1f5d7..52b65843a 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcloud/FunctionInvoker.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/main/java/org/springframework/cloud/function/adapter/gcp/FunctionInvoker.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.function.adapter.gcloud;
+package org.springframework.cloud.function.adapter.gcp;
 
 import java.io.BufferedReader;
 import java.nio.charset.StandardCharsets;
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcloud/Context.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/Context.java
similarity index 96%
rename from spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcloud/Context.java
rename to spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/Context.java
index 142ef82b7..46e77e425 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcloud/Context.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/Context.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.function.adapter.gcloud;
+package org.springframework.cloud.function.adapter.gcp;
 
 /**
  * An immutable implementation of the Google Cloud Function
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcloud/FunctionInvokerBackgroundTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerBackgroundTests.java
similarity index 99%
rename from spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcloud/FunctionInvokerBackgroundTests.java
rename to spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerBackgroundTests.java
index 119db2637..f5e090d31 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcloud/FunctionInvokerBackgroundTests.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerBackgroundTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.function.adapter.gcloud;
+package org.springframework.cloud.function.adapter.gcp;
 
 import java.util.function.Consumer;
 import java.util.function.Function;
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcloud/FunctionInvokerHttpTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerHttpTests.java
similarity index 98%
rename from spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcloud/FunctionInvokerHttpTests.java
rename to spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerHttpTests.java
index 3ffdbe867..c2d5f832a 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcloud/FunctionInvokerHttpTests.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/FunctionInvokerHttpTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.function.adapter.gcloud;
+package org.springframework.cloud.function.adapter.gcp;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcloud/PubSubMessage.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/PubSubMessage.java
similarity index 96%
rename from spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcloud/PubSubMessage.java
rename to spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/PubSubMessage.java
index 120979875..aa1322348 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcloud/PubSubMessage.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/PubSubMessage.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.function.adapter.gcloud;
+package org.springframework.cloud.function.adapter.gcp;
 
 import java.util.Map;
 
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcloud/integration/FunctionInvokerIntegrationTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/FunctionInvokerIntegrationTests.java
similarity index 92%
rename from spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcloud/integration/FunctionInvokerIntegrationTests.java
rename to spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/FunctionInvokerIntegrationTests.java
index 5fe9105f2..d9b69394b 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcloud/integration/FunctionInvokerIntegrationTests.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/FunctionInvokerIntegrationTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.function.adapter.gcloud.integration;
+package org.springframework.cloud.function.adapter.gcp.integration;
 
 import java.io.IOException;
 import java.util.function.Function;
@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-import static org.springframework.cloud.function.adapter.gcloud.integration.LocalServerTestSupport.verify;
+import static org.springframework.cloud.function.adapter.gcp.integration.LocalServerTestSupport.verify;
 
 /**
  * Integration tests for GCF Http Functions.
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcloud/integration/LocalServerTestSupport.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/LocalServerTestSupport.java
similarity index 97%
rename from spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcloud/integration/LocalServerTestSupport.java
rename to spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/LocalServerTestSupport.java
index 04df86185..ef17f5a49 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcloud/integration/LocalServerTestSupport.java
+++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/LocalServerTestSupport.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.function.adapter.gcloud.integration;
+package org.springframework.cloud.function.adapter.gcp.integration;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -38,7 +38,7 @@ import com.google.cloud.functions.invoker.runner.Invoker;
 import com.google.gson.Gson;
 
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.cloud.function.adapter.gcloud.FunctionInvoker;
+import org.springframework.cloud.function.adapter.gcp.FunctionInvoker;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
diff --git a/spring-cloud-function-samples/function-sample-gcp/README.adoc b/spring-cloud-function-samples/function-sample-gcp/README.adoc
index cd7ce23bf..f12b939a4 100644
--- a/spring-cloud-function-samples/function-sample-gcp/README.adoc
+++ b/spring-cloud-function-samples/function-sample-gcp/README.adoc
@@ -35,7 +35,7 @@ Run the following command from the project root to deploy.
 
 ----
 gcloud alpha functions deploy function-sample-gcp \
---entry-point org.springframework.cloud.function.adapter.gcloud.FunctionInvoker \
+--entry-point org.springframework.cloud.function.adapter.gcp.FunctionInvoker \
 --runtime java11 \
 --trigger-http \
 --source target/deploy \
diff --git a/spring-cloud-function-samples/function-sample-gcp/pom.xml b/spring-cloud-function-samples/function-sample-gcp/pom.xml
index 9d15f3873..4c2c5c61f 100644
--- a/spring-cloud-function-samples/function-sample-gcp/pom.xml
+++ b/spring-cloud-function-samples/function-sample-gcp/pom.xml
@@ -27,7 +27,7 @@
 				<artifactId>function-maven-plugin</artifactId>
 				<version>0.9.1</version>
 				<configuration>
-					<functionTarget>org.springframework.cloud.function.adapter.gcloud.FunctionInvoker</functionTarget>
+					<functionTarget>org.springframework.cloud.function.adapter.gcp.FunctionInvoker</functionTarget>
 					<port>8080</port>
 				</configuration>
 			</plugin>