SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add condition to reset content-type only if it isd not already set

Browse Source 
Polish some of the POMs to address missing dependencies
Temporary disconnect gcp background sample until errors are fixed
This commit is contained in:
Oleg Zhurakousky
2020-07-13 14:21:02 +02:00
parent 07421a6062
commit 2e5c670a28
6 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/src/test/java/org/springframework/cloud/function/adapter/gcp/integration/LocalServerTestSupport.java
View File

@@ -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() {
}

2
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/catalog/SimpleFunctionRegistry.java
View File

@@ -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);
}
}

8
spring-cloud-function-samples/function-sample-aws-custom/pom.xml
View File

@@ -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>

30
spring-cloud-function-samples/function-sample-gcp-background/pom.xml
View File

@@ -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>

10
spring-cloud-function-samples/function-sample-supplier-exporter/pom.xml
View File

@@ -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>

2
spring-cloud-function-samples/pom.xml
View File

@@ -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>