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

Start version 6.2.0

Browse Source 
* Add Christian Tzolov to author name in the doc
* Move `whats-new.adoc` content to new `changes-6.0-6.1.adoc`
* Upgrade to Gradle `8.1.1`
* Upgrade to Spring Framework `6.1`
* Fix `StompSessionManagerTests` for deprecated `ConcurrentTaskScheduler` ctor
* Fix XML configs for Kafka to use types for ctor args instead of their names.
Apparently SF doesn't do a discovery by names anymore.
This commit is contained in:
abilan
2023-05-16 20:40:11 -04:00
parent 6433445ee7
commit edbaf6d590
12 changed files with 112 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/AllXmlTests-context.xml
View File

@@ -9,7 +9,7 @@
http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
<context:property-placeholder />
<context:property-placeholder/>
<bean id="cf" class="org.springframework.kafka.core.DefaultKafkaConsumerFactory">
<constructor-arg>
@@ -34,7 +34,7 @@
</bean>
<bean id="cp" class="org.springframework.kafka.listener.ConsumerProperties">
<constructor-arg name="topics" value="one"/>
<constructor-arg type="java.lang.String[]" value="one"/>
<property name="groupId" value="groupForTopic1"/>
</bean>
@@ -58,8 +58,7 @@
<int:chain input-channel="fromTwo" output-channel="lastChannel">
<int:transformer expression="payload + headers['kafka_receivedTopic']"/>
<int-kafka:outbound-gateway
kafka-template="replyingTemplate"/>
<int-kafka:outbound-gateway kafka-template="replyingTemplate"/>
<int:transformer expression="payload + headers['kafka_receivedTopic']"/>
</int:chain>
@@ -72,8 +71,7 @@
kafka-template="replyingTemplate"
request-channel="fromThree"/>
<int:transformer input-channel="fromThree"
expression="payload + headers['kafka_receivedTopic']"/>
<int:transformer input-channel="fromThree" expression="payload + headers['kafka_receivedTopic']"/>
<bean id="template" class="org.springframework.kafka.core.KafkaTemplate">
<constructor-arg ref="pf"/>
@@ -83,7 +81,7 @@
<constructor-arg ref="cf"/>
<constructor-arg>
<bean class="org.springframework.kafka.listener.ContainerProperties">
<constructor-arg name="topics" value="two"/>
<constructor-arg type="java.lang.String[]" value="two"/>
<property name="groupId" value="container1"/>
</bean>
</constructor-arg>
@@ -93,7 +91,7 @@
<constructor-arg ref="cf"/>
<constructor-arg>
<bean class="org.springframework.kafka.listener.ContainerProperties">
<constructor-arg name="topics" value="three"/>
<constructor-arg type="java.lang.String[]" value="three"/>
<property name="groupId" value="container3"/>
</bean>
</constructor-arg>
@@ -109,7 +107,7 @@
<constructor-arg ref="cf"/>
<constructor-arg>
<bean class="org.springframework.kafka.listener.ContainerProperties">
<constructor-arg name="topics" value="four"/>
<constructor-arg type="java.lang.String[]" value="four"/>
<property name="groupId" value="container4"/>
</bean>
</constructor-arg>

4
spring-integration-kafka/src/test/java/org/springframework/integration/kafka/config/xml/KafkaInboundChannelAdapterParserTests-context.xml
View File

@@ -39,14 +39,14 @@
</bean>
<bean id="consumerProperties1" class="org.springframework.kafka.listener.ConsumerProperties">
<constructor-arg name="topics" value="topic1"/>
<constructor-arg value="topic1" type="java.lang.String[]"/>
<property name="groupId" value="group"/>
<property name="clientId" value="client"/>
<property name="consumerRebalanceListener" ref="rebal"/>
</bean>
<bean id="consumerProperties2" class="org.springframework.kafka.listener.ConsumerProperties">
<constructor-arg name="topics" value="topic1, topic2"/>
<constructor-arg value="topic1, topic2" type="java.lang.String[]"/>
<property name="groupId" value="group"/>
</bean>