Spring/spring-integration-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to SI-5.0 & SIK-3.0, Reactor 3.0

Browse Source 
* Fix compatibility after Java DSL migration to the SI Core
* Also upgrade all the JMS sample to the JMS 2.0
* Fix default `connectionFactory` bean reference to the current `jmsConnectionFactory`
* Remove unsupported JPA-1.0 Spec via `OpenJpaAutoConfiguration`, since the minimum now is JPA-2.0
* Remove non-lambda sample since minimum now is Java 8
* Rename `PromiseTest` to `MonoTest` and fix it to Reactor 3.0
* Fix `stomp-server.xml` to use proper Reactor 3.0 `eactor.util.function.Tuples` for SpEL
* Regenerate POMs
This commit is contained in:
Artem Bilan
2016-11-17 11:34:23 -05:00
parent a6bf188099
commit 5f524dc534
84 changed files with 359 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/stomp-chat/pom.xml
View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.4.2.RELEASE</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>stomp-chat</artifactId>
<version>4.3.0.BUILD-SNAPSHOT</version>
<version>5.0.0.BUILD-SNAPSHOT</version>
<name>Web Sockets Stomp Chat Sample</name>
<description>Web Sockets Stomp Chat Sample</description>
<url>http://projects.spring.io/spring-integration</url>
@@ -98,7 +98,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<version>4.3.2.RELEASE</version>
<version>5.0.0.BUILD-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>

4
applications/stomp-chat/src/main/resources/org/springframework/integration/samples/chat/stomp/server/stomp-server.xml
View File

@@ -68,7 +68,7 @@
<int:service-activator input-channel="subscribe" output-channel="nullChannel"
expression="@chatRoomSessions[headers.simpDestination]
.add(T(reactor.tuple.Tuple).of(headers.simpSessionId, headers.simpSubscriptionId))"/>
.add(T(reactor.util.function.Tuples).of(headers.simpSessionId, headers.simpSubscriptionId))"/>
<int:chain input-channel="subscribe" output-channel="sendMessage">
<int:header-enricher>
@@ -92,7 +92,7 @@
<int:outbound-channel-adapter id="unsubscribe">
<int-groovy:script>
chatRoomSessions.each { k, v ->
v.remove(reactor.tuple.Tuple.of(headers.simpSessionId, headers.simpSubscriptionId))
v.remove(reactor.util.function.Tuples.of(headers.simpSessionId, headers.simpSubscriptionId))
}
null
</int-groovy:script>