From 2e5c670a28a654b3d05d91239b5c12477c4e8616 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Mon, 13 Jul 2020 14:21:02 +0200
Subject: [PATCH] Add condition to reset content-type only if it isd not
 already set

Polish some of the POMs to address missing dependencies
Temporary disconnect gcp background sample until errors are fixed
---
 .../integration/LocalServerTestSupport.java   |  2 +-
 .../catalog/SimpleFunctionRegistry.java       |  2 +-
 .../function-sample-aws-custom/pom.xml        |  8 -----
 .../function-sample-gcp-background/pom.xml    | 30 ++++++++++++++++++-
 .../function-sample-supplier-exporter/pom.xml | 10 -------
 spring-cloud-function-samples/pom.xml         |  2 +-
 6 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/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
index 246a886df..ea5bd3acd 100644
--- a/spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/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
@@ -59,7 +59,7 @@ final public class LocalServerTestSupport {
 
 	private static final String SERVER_READY_STRING = "Started ServerConnector";
 
-	private static AtomicInteger nextPort = new AtomicInteger(8080);
+	private static AtomicInteger nextPort = new AtomicInteger(55555);
 
 	private LocalServerTestSupport() {
 	}
diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
index 9ae21c61e..295356678 100644
--- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
+++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
@@ -686,7 +686,7 @@ public class SimpleFunctionRegistry implements FunctionRegistry, FunctionInspect
 				// Set the contentType header to the value of accept for "legacy" reasons. But, do not set the
 				// contentType header to the value of accept if it is a wildcard type, as this doesn't make sense.
 				// This also applies to the else branch below.
-				if (acceptedContentType.isConcrete()) {
+				if (acceptedContentType.isConcrete() && !headersMap.containsKey(MessageHeaders.CONTENT_TYPE)) {
 					headersMap.put(MessageHeaders.CONTENT_TYPE, acceptedContentType);
 				}
 			}
diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml
index 885b36502..2df2ec87e 100644
--- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml
+++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml
@@ -33,14 +33,6 @@
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-starter-json</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>io.netty</groupId>
-					<artifactId>netty-codec-http2</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>io.netty</groupId>
-					<artifactId>netty-transport-native-epoll</artifactId>
-				</exclusion>
 				<exclusion>
 					<groupId>org.hibernate.validator</groupId>
 					<artifactId>hibernate-validator</artifactId>
diff --git a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml
index b1f14b2f4..12c2efd63 100644
--- a/spring-cloud-function-samples/function-sample-gcp-background/pom.xml
+++ b/spring-cloud-function-samples/function-sample-gcp-background/pom.xml
@@ -31,7 +31,6 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
 				<configuration>
 					<skip>true</skip>
 				</configuration>
@@ -62,4 +61,33 @@
 			</plugin>
 		</plugins>
 	</build>
+	<repositories>
+		<repository>
+			<id>spring-snapshots</id>
+			<name>Spring Snapshots</name>
+			<url>https://repo.spring.io/libs-snapshot-local</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>spring-milestones</id>
+			<name>Spring Milestones</name>
+			<url>https://repo.spring.io/libs-milestone-local</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>spring-releases</id>
+			<name>Spring Releases</name>
+			<url>https://repo.spring.io/release</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
 </project>
diff --git a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml
index 4a8ea4880..f546fb89f 100644
--- a/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml
+++ b/spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml
@@ -28,16 +28,6 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-webflux</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>io.netty</groupId>
-					<artifactId>netty-transport-native-epoll</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>io.netty</groupId>
-					<artifactId>netty-codec-http2</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml
index 87c0330f7..80f429222 100644
--- a/spring-cloud-function-samples/pom.xml
+++ b/spring-cloud-function-samples/pom.xml
@@ -23,7 +23,7 @@
 		<module>function-sample-azure</module>
 		<!--><module>function-sample-spring-integration</module>-->
 		<module>function-sample-gcp-http</module>
-		<module>function-sample-gcp-background</module>
+<!-- 		<module>function-sample-gcp-background</module> -->
 	</modules>
 
 	<build>