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

Polishing related to merginng the previous commit as well as upgrade of Kotlin libs

Browse Source
This commit is contained in:
Oleg Zhurakousky
2021-10-25 13:28:31 +02:00
parent 4c7dfa7a73
commit e58741b6cb
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-function-context/pom.xml
View File

@@ -120,7 +120,7 @@
<plugin> <plugin>
<artifactId>kotlin-maven-plugin</artifactId> <artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<version>1.4.21</version> <version>1.6.0-RC</version>
<configuration> <configuration>
<args> <args>
<arg>-Xjsr305=strict</arg> <arg>-Xjsr305=strict</arg>
@@ -159,7 +159,7 @@
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-allopen</artifactId> <artifactId>kotlin-maven-allopen</artifactId>
<version>1.4.21</version> <version>1.6.0-RC</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>

8
spring-cloud-function-context/src/test/java/org/springframework/cloud/function/context/catalog/BeanFactoryAwareFunctionRegistryTests.java
View File

@@ -880,9 +880,11 @@ public class BeanFactoryAwareFunctionRegistryTests {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
protected Object doApply(Message<byte[]> input, FunctionInvocationWrapper targetFunction) { protected Object doApply(Object input, FunctionInvocationWrapper targetFunction) {
MessageBuilder.fromMessage(input).setHeader("before", "foo").build(); // in this test we know input is a Message
Message<Object> result = (Message<Object>) targetFunction.apply(MessageBuilder.fromMessage(input).setHeader("before", "foo").build()); Message<?> mInput = (Message<?>) input;
MessageBuilder.fromMessage(mInput).setHeader("before", "foo").build();
Message<Object> result = (Message<Object>) targetFunction.apply(MessageBuilder.fromMessage(mInput).setHeader("before", "foo").build());
return MessageBuilder.fromMessage(result).setHeader("after", "bar").build(); return MessageBuilder.fromMessage(result).setHeader("after", "bar").build();
} }
}; };

4
spring-cloud-function-kotlin/pom.xml
View File

@@ -64,7 +64,7 @@
<plugin> <plugin>
<artifactId>kotlin-maven-plugin</artifactId> <artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<version>1.4.21</version> <version>1.6.0-RC</version>
<configuration> <configuration>
<args> <args>
<arg>-Xjsr305=strict</arg> <arg>-Xjsr305=strict</arg>
@@ -93,7 +93,7 @@
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-allopen</artifactId> <artifactId>kotlin-maven-allopen</artifactId>
<version>1.4.21</version> <version>1.6.0-RC</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>

3
spring-cloud-function-samples/function-sample-kotlin-web/pom.xml
View File

@@ -28,10 +28,12 @@
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-reflect</artifactId> <artifactId>kotlin-reflect</artifactId>
<version>1.6.0-RC</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId> <artifactId>kotlin-stdlib-jdk8</artifactId>
<version>1.6.0-RC</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
@@ -77,6 +79,7 @@
<plugin> <plugin>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId> <artifactId>kotlin-maven-plugin</artifactId>
<version>1.6.0-RC</version>
<configuration> <configuration>
<args> <args>
<arg>-Xjsr305=strict</arg> <arg>-Xjsr305=strict</arg>