Skip to content

Commit cd5d424

Browse files
cppwfscppwfs
committed
Remove correlation and release strategy entries from context-xml files
Remove CassandraParserUtilsTests. Other tests provide the coverage required. Readd method variable for readability
1 parent 6182ec5 commit cd5d424

File tree

9 files changed

+41
-174
lines changed

9 files changed

+41
-174
lines changed

‎spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/config/CassandraParserUtilsTests.java

Lines changed: 0 additions & 103 deletions
This file was deleted.

‎spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractConsumerEndpointParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,9 @@ protected String getInputChannelAttributeName() {
142142

143143
String handlerBeanName =
144144
BeanDefinitionReaderUtils.generateBeanName(handlerBeanDefinition, parserContext.getRegistry());
145+
String[] handlerAlias = IntegrationNamespaceUtils.generateAlias(element);
145146
parserContext.registerBeanComponent(
146-
new BeanComponentDefinition(handlerBeanDefinition, handlerBeanName,
147-
IntegrationNamespaceUtils.generateAlias(element)));
147+
new BeanComponentDefinition(handlerBeanDefinition, handlerBeanName, handlerAlias));
148148

149149
builder.addPropertyReference("handler", handlerBeanName);
150150

‎spring-integration-core/src/main/java/org/springframework/integration/config/xml/PointToPointChannelParser.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ else if ((queueElement = DomUtils.getChildElementByTagName(element, "rendezvous-
7878
"The 'fixed-subscriber' attribute is not allowed when a <queue/> child element is present.",
7979
element);
8080
}
81-
8281
Assert.state(builder != null, "builder must not be null");
8382
return builder;
8483
}

‎spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/ResequencerIntegrationTests-context.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@
77

88

99
<int:resequencer id="resequencerLight" input-channel="resequencerLightInput" output-channel="outputChannel"
10-
release-partial-sequences="true" correlation-strategy="customCorrelationStrategy"
11-
release-strategy="sequenceSizeReleaseStrategy"/>
10+
release-partial-sequences="true"/>
1211

1312
<int:channel id="outputChannel">
1413
<int:queue/>
1514
</int:channel>
1615

1716
<int:resequencer id="resequencerDeep" input-channel="resequencerDeepInput" output-channel="outputChannel"
18-
release-partial-sequences="true" correlation-strategy="customCorrelationStrategy"
19-
release-strategy="sequenceSizeReleaseStrategy"/>
17+
release-partial-sequences="true"/>
2018

2119
<int:service-activator id="customResequencer" ref="resequencer"
2220
input-channel="inputChannel" output-channel="outputChannel"/>
@@ -42,6 +40,4 @@
4240

4341
<bean id="testMessageStore" class="org.springframework.integration.store.SimpleMessageStore"/>
4442

45-
<bean id="sequenceSizeReleaseStrategy"
46-
class="org.springframework.integration.aggregator.SequenceSizeReleaseStrategy"/>
4743
</beans>

‎spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/PartialSequencesWithGapsTests-context.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,8 @@
99

1010
<channel id="in"/>
1111

12-
<resequencer input-channel="in" output-channel="out" release-partial-sequences="true"
13-
release-strategy="sequenceSizeReleaseStrategy" correlation-strategy="testCorrelationStrategy"/>
12+
<resequencer input-channel="in" output-channel="out" release-partial-sequences="true"/>
1413

1514
<channel id="out"/>
1615

17-
<beans:bean id="sequenceSizeReleaseStrategy"
18-
class="org.springframework.integration.aggregator.SequenceSizeReleaseStrategy"/>
19-
20-
<beans:bean id="testCorrelationStrategy"
21-
class="org.springframework.integration.config.ResequencerParserTests$TestCorrelationStrategy"/>
2216
</beans:beans>

‎spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerParserTests-context.xml

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beans:beans xmlns="http://www.springframework.org/schema/integration"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xmlns:beans="http://www.springframework.org/schema/beans"
5-
xsi:schemaLocation="http://www.springframework.org/schema/beans
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:beans="http://www.springframework.org/schema/beans"
5+
xsi:schemaLocation="http://www.springframework.org/schema/beans
66
https://www.springframework.org/schema/beans/spring-beans.xsd
77
http://www.springframework.org/schema/integration
88
https://www.springframework.org/schema/integration/spring-integration.xsd">
@@ -17,8 +17,7 @@
1717
<queue capacity="5"/>
1818
</channel>
1919

20-
<resequencer id="defaultResequencer" input-channel="inputChannel" correlation-strategy="errorChannel"
21-
release-strategy="errorChannel"/>
20+
<resequencer id="defaultResequencer" input-channel="inputChannel"/>
2221

2322
<channel id="inputChannel2"/>
2423

@@ -31,48 +30,42 @@
3130
<channel id="inputChannel6"/>
3231

3332
<resequencer id="completelyDefinedResequencer"
34-
input-channel="inputChannel2"
35-
output-channel="outputChannel"
36-
discard-channel="discardChannel"
37-
send-timeout="86420000"
38-
send-partial-result-on-expiry="true"
39-
empty-group-min-timeout="60000"
40-
release-partial-sequences="true" correlation-strategy="errorChannel"
41-
release-strategy="sequenceSizeReleaseStrategy"/>
33+
input-channel="inputChannel2"
34+
output-channel="outputChannel"
35+
discard-channel="discardChannel"
36+
send-timeout="86420000"
37+
send-partial-result-on-expiry="true"
38+
empty-group-min-timeout="60000"
39+
release-partial-sequences="true"/>
4240

4341
<resequencer id="resequencerWithCorrelationStrategyRefOnly"
44-
input-channel="inputChannel3"
45-
correlation-strategy="testCorrelationStrategy" release-strategy="sequenceSizeReleaseStrategy"/>
42+
input-channel="inputChannel3"
43+
correlation-strategy="testCorrelationStrategy"/>
4644

4745
<resequencer id="resequencerWithCorrelationStrategyRefAndMethod"
48-
input-channel="inputChannel4"
49-
correlation-strategy="testCorrelationStrategyPojo"
50-
correlation-strategy-method="foo" release-strategy="sequenceSizeReleaseStrategy"/>
46+
input-channel="inputChannel4"
47+
correlation-strategy="testCorrelationStrategyPojo"
48+
correlation-strategy-method="foo"/>
5149

5250
<resequencer id="resequencerWithReleaseStrategyRefOnly"
53-
input-channel="inputChannel5"
54-
correlation-strategy="testCorrelationStrategyPojo"
55-
release-strategy="testReleaseStrategy"/>
51+
input-channel="inputChannel5"
52+
release-strategy="testReleaseStrategy"/>
5653

5754
<resequencer id="resequencerWithReleaseStrategyRefAndMethod"
58-
input-channel="inputChannel6"
59-
expire-groups-upon-timeout="true"
60-
correlation-strategy="testCorrelationStrategyPojo"
61-
release-strategy="testReleaseStrategyPojo"
62-
release-strategy-method="bar"/>
55+
input-channel="inputChannel6"
56+
expire-groups-upon-timeout="true"
57+
release-strategy="testReleaseStrategyPojo"
58+
release-strategy-method="bar"/>
6359

6460
<beans:bean id="testCorrelationStrategy"
65-
class="org.springframework.integration.config.ResequencerParserTests$TestCorrelationStrategy"/>
61+
class="org.springframework.integration.config.ResequencerParserTests$TestCorrelationStrategy"/>
6662

6763
<beans:bean id="testCorrelationStrategyPojo"
68-
class="org.springframework.integration.config.ResequencerParserTests$TestCorrelationStrategyPojo"/>
64+
class="org.springframework.integration.config.ResequencerParserTests$TestCorrelationStrategyPojo"/>
6965

7066
<beans:bean id="testReleaseStrategy"
71-
class="org.springframework.integration.config.ResequencerParserTests$TestReleaseStrategy"/>
67+
class="org.springframework.integration.config.ResequencerParserTests$TestReleaseStrategy" />
7268

7369
<beans:bean id="testReleaseStrategyPojo"
74-
class="org.springframework.integration.config.ResequencerParserTests$TestReleaseStrategyPojo"/>
75-
76-
<beans:bean id="sequenceSizeReleaseStrategy"
77-
class="org.springframework.integration.aggregator.SequenceSizeReleaseStrategy"/>
70+
class="org.springframework.integration.config.ResequencerParserTests$TestReleaseStrategyPojo" />
7871
</beans:beans>

‎spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerWithMessageStoreParserTests-context.xml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,8 @@
1313
<queue capacity="5"/>
1414
</channel>
1515

16-
<resequencer id="resequencer" input-channel="input" output-channel="output" message-store="messageStore"
17-
correlation-strategy="testCorrelationStrategy" release-strategy="sequenceSizeReleaseStrategy"/>
16+
<resequencer id="resequencer" input-channel="input" output-channel="output" message-store="messageStore"/>
1817

1918
<beans:bean id="messageStore" class="org.springframework.integration.store.SimpleMessageStore"/>
2019

21-
<beans:bean id="sequenceSizeReleaseStrategy"
22-
class="org.springframework.integration.aggregator.SequenceSizeReleaseStrategy"/>
23-
<beans:bean id="testCorrelationStrategy"
24-
class="org.springframework.integration.aggregator.HeaderAttributeCorrelationStrategy">
25-
<beans:constructor-arg value="correlationId"/>
26-
</beans:bean>
2720
</beans:beans>

‎spring-integration-core/src/test/java/org/springframework/integration/config/xml/EndpointRoleParserTests-context.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beans xmlns="http://www.springframework.org/schema/beans"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xmlns:int="http://www.springframework.org/schema/integration"
5-
xmlns:context="http://www.springframework.org/schema/context"
6-
xmlns:util="http://www.springframework.org/schema/util"
7-
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:int="http://www.springframework.org/schema/integration"
5+
xmlns:context="http://www.springframework.org/schema/context"
6+
xmlns:util="http://www.springframework.org/schema/util"
7+
xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
88
http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd
99
http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
1010
http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">

‎spring-integration-core/src/test/java/org/springframework/integration/config/xml/OrderedHandlersTests-context.xml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<beans:beans xmlns="http://www.springframework.org/schema/integration"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xmlns:beans="http://www.springframework.org/schema/beans"
5-
xsi:schemaLocation="http://www.springframework.org/schema/beans
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:beans="http://www.springframework.org/schema/beans"
5+
xsi:schemaLocation="http://www.springframework.org/schema/beans
66
https://www.springframework.org/schema/beans/spring-beans.xsd
77
http://www.springframework.org/schema/integration
88
https://www.springframework.org/schema/integration/spring-integration.xsd">
@@ -21,8 +21,7 @@
2121

2222
<filter id="endpoint8" input-channel="channel" ref="bean" method="filter" order="8"/>
2323

24-
<resequencer id="endpoint10" input-channel="channel" order="10" release-strategy="sequenceSizeReleaseStrategy"
25-
correlation-strategy="testCorrelationStrategy"/>
24+
<resequencer id="endpoint10" input-channel="channel" order="10"/>
2625

2726
<chain id="endpoint6" input-channel="channel" order="6">
2827
<service-activator ref="bean"/>
@@ -42,8 +41,4 @@
4241

4342
<beans:bean id="bean" class="org.springframework.integration.config.xml.OrderedHandlersTests$TestBean"/>
4443

45-
<beans:bean id="sequenceSizeReleaseStrategy"
46-
class="org.springframework.integration.aggregator.SequenceSizeReleaseStrategy"/>
47-
<beans:bean id="testCorrelationStrategy"
48-
class="org.springframework.integration.config.ResequencerParserTests$TestCorrelationStrategy"/>
4944
</beans:beans>

0 commit comments

Comments
 (0)