Skip to content

Commit 24bc1f2

Browse files
spencergibbspencergibb
committed
Updates to version 5.0.0-SNAPSHOT
Changes for Framework 7
1 parent ae46123 commit 24bc1f2

File tree

64 files changed

+106
-98
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+106
-98
lines changed

‎docs/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>org.springframework.cloud</groupId>
1010
<artifactId>spring-cloud-function-parent</artifactId>
11-
<version>4.3.1-SNAPSHOT</version>
11+
<version>5.0.0-SNAPSHOT</version>
1212
</parent>
1313
<packaging>jar</packaging>
1414
<name>Spring Cloud Function Docs</name>

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
<artifactId>spring-cloud-function-parent</artifactId>
88
<name>Spring Cloud Function Parent</name>
9-
<version>4.3.1-SNAPSHOT</version>
9+
<version>5.0.0-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<parent>
1313
<groupId>org.springframework.cloud</groupId>
1414
<artifactId>spring-cloud-build</artifactId>
15-
<version>4.3.1-SNAPSHOT</version>
15+
<version>5.0.0-SNAPSHOT</version>
1616
<relativePath/>
1717
</parent>
1818

‎spring-cloud-function-adapters/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>org.springframework.cloud</groupId>
1212
<artifactId>spring-cloud-function-parent</artifactId>
13-
<version>4.3.1-SNAPSHOT</version>
13+
<version>5.0.0-SNAPSHOT</version>
1414
</parent>
1515

1616
<name>spring-cloud-function-adapter-parent</name>

‎spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.cloud</groupId>
1515
<artifactId>spring-cloud-function-adapter-parent</artifactId>
16-
<version>4.3.1-SNAPSHOT</version>
16+
<version>5.0.0-SNAPSHOT</version>
1717
</parent>
1818

1919
<properties>

‎spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/CustomRuntimeEventLoop.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ private Context generateClientContext(HttpHeaders headers) {
179179
@Override
180180
public int getRemainingTimeInMillis() {
181181
long now = System.currentTimeMillis();
182-
if (!headers.containsKey("Lambda-Runtime-Deadline-Ms")) {
182+
if (!headers.containsHeader("Lambda-Runtime-Deadline-Ms")) {
183183
return 0;
184184
}
185185
int delta = (int) (Long.parseLong(headers.getFirst("Lambda-Runtime-Deadline-Ms")) - now);

‎spring-cloud-function-adapters/spring-cloud-function-adapter-azure-web/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.springframework.cloud</groupId>
1111
<artifactId>spring-cloud-function-adapter-parent</artifactId>
12-
<version>4.3.1-SNAPSHOT</version>
12+
<version>5.0.0-SNAPSHOT</version>
1313
</parent>
1414
<properties>
1515
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

‎spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.springframework.cloud</groupId>
1414
<artifactId>spring-cloud-function-adapter-parent</artifactId>
15-
<version>4.3.1-SNAPSHOT</version>
15+
<version>5.0.0-SNAPSHOT</version>
1616
</parent>
1717

1818
<properties>

‎spring-cloud-function-adapters/spring-cloud-function-adapter-gcp/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<artifactId>spring-cloud-function-adapter-parent</artifactId>
1313
<groupId>org.springframework.cloud</groupId>
14-
<version>4.3.1-SNAPSHOT</version>
14+
<version>5.0.0-SNAPSHOT</version>
1515
</parent>
1616

1717
<properties>

‎spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/org.springframework.cloud.function.aws-lambda.packaging.gradle.plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>org.springframework.cloud.function.aws-lambda.packaging</groupId>
1212
<artifactId>spring-cloud-function-aws-gradle-parent</artifactId>
13-
<version>4.3.1-SNAPSHOT</version>
13+
<version>5.0.0-SNAPSHOT</version>
1414
</parent>
1515
<properties>
1616
<main.basedir>${basedir}/../..</main.basedir>

‎spring-cloud-function-adapters/spring-cloud-function-aws-gradle-parent/spring-cloud-function-aws-packaging-gradle-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.cloud.function.aws-lambda.packaging</groupId>
1515
<artifactId>spring-cloud-function-aws-gradle-parent</artifactId>
16-
<version>4.3.1-SNAPSHOT</version>
16+
<version>5.0.0-SNAPSHOT</version>
1717
</parent>
1818

1919
<properties>

‎spring-cloud-function-adapters/spring-cloud-function-grpc-cloudevent-ext/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.cloud</groupId>
77
<artifactId>spring-cloud-function-adapter-parent</artifactId>
8-
<version>4.3.1-SNAPSHOT</version>
8+
<version>5.0.0-SNAPSHOT</version>
99
</parent>
1010
<artifactId>spring-cloud-function-grpc-cloudevent-ext</artifactId>
1111
<name>spring-cloud-function-grpc-cloudevent-ext</name>

‎spring-cloud-function-adapters/spring-cloud-function-grpc/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>org.springframework.cloud</groupId>
1212
<artifactId>spring-cloud-function-adapter-parent</artifactId>
13-
<version>4.3.1-SNAPSHOT</version>
13+
<version>5.0.0-SNAPSHOT</version>
1414
</parent>
1515
<properties>
1616
<grpc.version>1.55.1</grpc.version>

‎spring-cloud-function-adapters/spring-cloud-function-serverless-web/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>org.springframework.cloud</groupId>
1212
<artifactId>spring-cloud-function-adapter-parent</artifactId>
13-
<version>4.3.1-SNAPSHOT</version>
13+
<version>5.0.0-SNAPSHOT</version>
1414
</parent>
1515
<properties>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

‎spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessHttpServletRequest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ public void setContentType(@Nullable String contentType) {
279279
@Override
280280
@Nullable
281281
public String getContentType() {
282-
return this.headers.containsKey(HttpHeaders.CONTENT_TYPE) ? this.headers.get(HttpHeaders.CONTENT_TYPE).get(0) : null;
282+
return this.headers.containsHeader(HttpHeaders.CONTENT_TYPE) ? this.headers.get(HttpHeaders.CONTENT_TYPE).get(0) : null;
283283
}
284284

285285
@Override
@@ -713,17 +713,17 @@ public Cookie[] getCookies() {
713713
@Override
714714
@Nullable
715715
public String getHeader(String name) {
716-
return this.headers.containsKey(name) ? this.headers.get(name).get(0) : null;
716+
return this.headers.containsHeader(name) ? this.headers.get(name).get(0) : null;
717717
}
718718

719719
@Override
720720
public Enumeration<String> getHeaders(String name) {
721-
return Collections.enumeration(this.headers.containsKey(name) ? this.headers.get(name) : new LinkedList<>());
721+
return Collections.enumeration(this.headers.containsHeader(name) ? this.headers.get(name) : new LinkedList<>());
722722
}
723723

724724
@Override
725725
public Enumeration<String> getHeaderNames() {
726-
return Collections.enumeration(this.headers.keySet());
726+
return Collections.enumeration(this.headers.headerNames());
727727
}
728728

729729
public void setHeader(String name, @Nullable String value) {
@@ -735,7 +735,7 @@ public void addHeader(String name, @Nullable String value) {
735735
}
736736

737737
public void addHeaders(MultiValueMap<String, String> headers) {
738-
this.headers.addAll(headers);
738+
this.headers.addAll(new HttpHeaders(headers));
739739
}
740740

741741
public void setHeaders(MultiValueMap<String, String> headers) {

‎spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessHttpServletResponse.java

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public Cookie getCookie(String name) {
217217

218218
@Override
219219
public boolean containsHeader(String name) {
220-
return this.headers.containsKey(name);
220+
return this.headers.containsHeader(name);
221221
}
222222

223223
/**
@@ -231,7 +231,7 @@ public boolean containsHeader(String name) {
231231
*/
232232
@Override
233233
public Collection<String> getHeaderNames() {
234-
return this.headers.keySet();
234+
return this.headers.headerNames();
235235
}
236236

237237
/**
@@ -249,7 +249,7 @@ public Collection<String> getHeaderNames() {
249249
@Override
250250
@Nullable
251251
public String getHeader(String name) {
252-
return this.headers.containsKey(name) ? this.headers.get(name).get(0) : null;
252+
return this.headers.containsHeader(name) ? this.headers.get(name).get(0) : null;
253253
}
254254

255255
/**
@@ -265,7 +265,7 @@ public String getHeader(String name) {
265265
*/
266266
@Override
267267
public List<String> getHeaders(String name) {
268-
if (!this.headers.containsKey(name)) {
268+
if (!this.headers.containsHeader(name)) {
269269
return Collections.emptyList();
270270
}
271271
return this.headers.get(name);
@@ -281,7 +281,7 @@ public List<String> getHeaders(String name) {
281281
*/
282282
@Nullable
283283
public Object getHeaderValue(String name) {
284-
return this.headers.containsKey(name) ? this.headers.get(name).get(0) : null;
284+
return this.headers.containsHeader(name) ? this.headers.get(name).get(0) : null;
285285
}
286286

287287
/**
@@ -329,6 +329,15 @@ public void sendRedirect(String url) throws IOException {
329329
setStatus(HttpServletResponse.SC_MOVED_TEMPORARILY);
330330
}
331331

332+
@Override
333+
public void sendRedirect(String location, int statusCode, boolean clearBuffer) throws IOException {
334+
Assert.state(!isCommitted(), "Cannot send redirect - response is already committed");
335+
Assert.notNull(location, "Redirect URL must not be null");
336+
setHeader(HttpHeaders.LOCATION, location);
337+
setStatus(statusCode);
338+
//TODO: deal with clearBuffer
339+
}
340+
332341
@Nullable
333342
public String getRedirectedUrl() {
334343
return getHeader(HttpHeaders.LOCATION);

‎spring-cloud-function-context/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.springframework.cloud</groupId>
1414
<artifactId>spring-cloud-function-parent</artifactId>
15-
<version>4.3.1-SNAPSHOT</version>
15+
<version>5.0.0-SNAPSHOT</version>
1616
</parent>
1717

1818
<properties>

‎spring-cloud-function-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.springframework.cloud</groupId>
1414
<artifactId>spring-cloud-function-parent</artifactId>
15-
<version>4.3.1-SNAPSHOT</version>
15+
<version>5.0.0-SNAPSHOT</version>
1616
</parent>
1717

1818
<dependencies>

‎spring-cloud-function-dependencies/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<parent>
77
<artifactId>spring-cloud-dependencies-parent</artifactId>
88
<groupId>org.springframework.cloud</groupId>
9-
<version>4.3.1-SNAPSHOT</version>
9+
<version>5.0.0-SNAPSHOT</version>
1010
<relativePath/>
1111
</parent>
1212
<artifactId>spring-cloud-function-dependencies</artifactId>
13-
<version>4.3.1-SNAPSHOT</version>
13+
<version>5.0.0-SNAPSHOT</version>
1414
<packaging>pom</packaging>
1515
<name>Spring Cloud Function Dependencies</name>
1616
<description>Spring Cloud Function Dependencies</description>

‎spring-cloud-function-deployer/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>org.springframework.cloud</groupId>
1212
<artifactId>spring-cloud-function-parent</artifactId>
13-
<version>4.3.1-SNAPSHOT</version>
13+
<version>5.0.0-SNAPSHOT</version>
1414
</parent>
1515

1616
<properties>

‎spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<properties>
2020
<java.version>17</java.version>
21-
<spring-cloud-function.version>4.3.1-SNAPSHOT</spring-cloud-function.version>
21+
<spring-cloud-function.version>5.0.0-SNAPSHOT</spring-cloud-function.version>
2222
<wrapper.version>1.0.31.RELEASE</wrapper.version>
2323
</properties>
2424

‎spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<properties>
2020
<java.version>17</java.version>
21-
<spring-cloud-function.version>4.3.1-SNAPSHOT</spring-cloud-function.version>
21+
<spring-cloud-function.version>5.0.0-SNAPSHOT</spring-cloud-function.version>
2222
<wrapper.version>1.0.31.RELEASE</wrapper.version>
2323
</properties>
2424

‎spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<properties>
2020
<java.version>17</java.version>
21-
<spring-cloud-function.version>4.3.1-SNAPSHOT</spring-cloud-function.version>
21+
<spring-cloud-function.version>5.0.0-SNAPSHOT</spring-cloud-function.version>
2222
<wrapper.version>1.0.31.RELEASE</wrapper.version>
2323
</properties>
2424

‎spring-cloud-function-deployer/src/it/bootapp/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<properties>
2020
<java.version>17</java.version>
21-
<spring-cloud-function.version>4.3.1-SNAPSHOT</spring-cloud-function.version>
21+
<spring-cloud-function.version>5.0.0-SNAPSHOT</spring-cloud-function.version>
2222
<wrapper.version>1.0.31.RELEASE</wrapper.version>
2323
</properties>
2424

‎spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<properties>
2020
<java.version>17</java.version>
21-
<spring-cloud-function.version>4.3.1-SNAPSHOT</spring-cloud-function.version>
21+
<spring-cloud-function.version>5.0.0-SNAPSHOT</spring-cloud-function.version>
2222
<wrapper.version>1.0.31.RELEASE</wrapper.version>
2323
</properties>
2424

‎spring-cloud-function-deployer/src/it/bootjar/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<properties>
2020
<java.version>17</java.version>
21-
<spring-cloud-function.version>4.3.1-SNAPSHOT</spring-cloud-function.version>
21+
<spring-cloud-function.version>5.0.0-SNAPSHOT</spring-cloud-function.version>
2222
<wrapper.version>1.0.31.RELEASE</wrapper.version>
2323
</properties>
2424

‎spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<properties>
2020
<java.version>17</java.version>
21-
<spring-cloud-function.version>4.3.1-SNAPSHOT</spring-cloud-function.version>
21+
<spring-cloud-function.version>5.0.0-SNAPSHOT</spring-cloud-function.version>
2222
<wrapper.version>1.0.31.RELEASE</wrapper.version>
2323
</properties>
2424

‎spring-cloud-function-integration/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<artifactId>spring-cloud-function-parent</artifactId>
1414
<groupId>org.springframework.cloud</groupId>
15-
<version>4.3.1-SNAPSHOT</version>
15+
<version>5.0.0-SNAPSHOT</version>
1616
</parent>
1717

1818

‎spring-cloud-function-kotlin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.springframework.cloud</groupId>
1414
<artifactId>spring-cloud-function-parent</artifactId>
15-
<version>4.3.1-SNAPSHOT</version>
15+
<version>5.0.0-SNAPSHOT</version>
1616
</parent>
1717

1818
<dependencies>

‎spring-cloud-function-kotlin/src/test/kotlin/org/springframework/cloud/function/kotlin/KotlinLambdasConfiguration.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ open class KotlinLambdasConfiguration {
3434
open fun uppercase(): Function<String, String> = KotlinComponentFunction()
3535
@Bean
3636
open fun kotlinFunction(): (String) -> String {
37-
return { it.toUpperCase() }
37+
return { it.uppercase() }
3838
}
3939

4040
@Bean

‎spring-cloud-function-kotlin/src/test/kotlin/org/springframework/cloud/function/kotlin/KotlinSuspendFlowLambdasConfiguration.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ open class KotlinSuspendFlowLambdasConfiguration {
3636

3737
@Bean
3838
open fun kotlinFunction(): suspend (Flow<String>) -> Flow<String> = { flow ->
39-
flow.map { value -> value.toUpperCase() }
39+
flow.map { value -> value.uppercase() }
4040
}
4141

4242
@Bean

‎spring-cloud-function-kotlin/src/test/kotlin/org/springframework/cloud/function/kotlin/web/HeadersToMessageSuspendTests.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ open class HeadersToMessageSuspendTests {
5656
)
5757

5858
Assertions.assertThat(postForEntity.body).isEqualTo("[{\"name\":\"Bob\",\"age\":25}]")
59-
Assertions.assertThat(postForEntity.headers.containsKey("x-content-type")).isTrue
59+
Assertions.assertThat(postForEntity.headers.headerNames()).contains("x-content-type")
6060
Assertions.assertThat(postForEntity.headers["x-content-type"]!![0])
6161
.isEqualTo("application/xml")
6262
Assertions.assertThat(postForEntity.headers["foo"]!![0]).isEqualTo("bar")
@@ -67,7 +67,7 @@ open class HeadersToMessageSuspendTests {
6767
"HELLO", String::class.java
6868
)
6969
Assertions.assertThat(postForEntity.body).isEqualTo("[\"HELLO\"]")
70-
Assertions.assertThat(postForEntity.headers.containsKey("x-content-type")).isTrue
70+
Assertions.assertThat(postForEntity.headers.headerNames()).contains("x-content-type")
7171
Assertions.assertThat(postForEntity.headers["x-content-type"]!![0])
7272
.isEqualTo("application/xml")
7373
Assertions.assertThat(postForEntity.headers["foo"]!![0]).isEqualTo("bar")

0 commit comments

Comments
 (0)