Skip to content

Commit 840c7e4

Browse files
committed
Fix JdbcLockRegistryTests to use H2
* Remove `postProcessDynamicBeans` from docs since it is out of use any more
1 parent a61a8bd commit 840c7e4

File tree

4 files changed

+6
-25
lines changed

4 files changed

+6
-25
lines changed

spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorTests-context.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,10 @@
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:int="http://www.springframework.org/schema/integration"
55
xmlns:p="http://www.springframework.org/schema/p"
6-
xmlns:aop="http://www.springframework.org/schema/aop" xmlns:util="http://www.springframework.org/schema/util"
7-
xmlns:beans="http://www.springframework.org/schema/c"
6+
xmlns:aop="http://www.springframework.org/schema/aop"
87
xsi:schemaLocation="http://www.springframework.org/schema/aop https://www.springframework.org/schema/aop/spring-aop.xsd
98
http://www.springframework.org/schema/integration https://www.springframework.org/schema/integration/spring-integration.xsd
10-
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
11-
http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">
12-
13-
<util:properties id="integrationGlobalProperties">
14-
<prop key="spring.integration.postProcessDynamicBeans">true</prop>
15-
</util:properties>
9+
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
1610

1711
<int:channel id="inputA">
1812
<int:interceptors>

spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/lock/JdbcLockRegistryTests-context.xml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,18 @@
22
<beans xmlns="http://www.springframework.org/schema/beans"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
44
xmlns:jdbc="http://www.springframework.org/schema/jdbc"
5-
xmlns:context="http://www.springframework.org/schema/context"
65
xmlns:tx="http://www.springframework.org/schema/tx"
76
xsi:schemaLocation="http://www.springframework.org/schema/jdbc https://www.springframework.org/schema/jdbc/spring-jdbc.xsd
87
http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
9-
http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd
108
http://www.springframework.org/schema/tx https://www.springframework.org/schema/tx/spring-tx.xsd">
119

12-
<jdbc:embedded-database id="dataSource" type="DERBY"/>
10+
<jdbc:embedded-database id="dataSource" type="H2"/>
1311

14-
<jdbc:initialize-database data-source="dataSource">
15-
<jdbc:script location="${int.schema.script}"/>
12+
<jdbc:initialize-database ignore-failures="DROPS">
13+
<jdbc:script location="org/springframework/integration/jdbc/schema-drop-h2.sql"/>
14+
<jdbc:script location="org/springframework/integration/jdbc/schema-h2.sql" />
1615
</jdbc:initialize-database>
1716

18-
<context:property-placeholder location="int-${ENVIRONMENT:derby}.properties"
19-
system-properties-mode="OVERRIDE"
20-
ignore-unresolvable="true"
21-
order="1"/>
22-
2317
<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
2418
<property name="dataSource" ref="dataSource"/>
2519
</bean>

src/reference/asciidoc/channel.adoc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,9 +1017,6 @@ To inject a global interceptor before the existing interceptors, use a negative
10171017
NOTE: Note that both the `order` and `pattern` attributes are optional.
10181018
The default value for `order` will be 0 and for `pattern`, the default is '*' (to match all channels).
10191019

1020-
Starting with version 4.3.15, you can configure the `spring.integration.postProcessDynamicBeans = true` property to apply any global interceptors to dynamically created `MessageChannel` beans.
1021-
See <<./configuration.adoc#global-properties,Global Properties>> for more information.
1022-
10231020
[[channel-wiretap]]
10241021
===== Wire Tap
10251022

src/reference/asciidoc/configuration.adoc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ spring.integration.taskScheduler.poolSize=10 <4>
168168
spring.integration.messagingTemplate.throwExceptionOnLateReply=false <5>
169169
spring.integration.readOnly.headers= <6>
170170
spring.integration.endpoints.noAutoStartup= <7>
171-
spring.integration.postProcessDynamicBeans=false <8>
172171
----
173172
174173
<1> When true, `input-channel` instances are automatically declared as `DirectChannel` instances when not explicitly found in the application context.
@@ -195,9 +194,6 @@ Since version 4.3.2.
195194
You can manually start these endpoints later by their bean name through a `Control Bus` (see <<./control-bus.adoc#control-bus,Control Bus>>), by their role with the `SmartLifecycleRoleController` (see <<./endpoint.adoc#endpoint-roles,Endpoint Roles>>), or by `Lifecycle` bean injection.
196195
You can explicitly override the effect of this global property by specifying `auto-startup` XML annotation or the `autoStartup` annotation attribute or by calling `AbstractEndpoint.setAutoStartup()` in the bean definition.
197196
Since version 4.3.12.
198-
199-
<8> A boolean flag to indicate that `BeanPostProcessor` instances should post-process beans registered at runtime (for example, message channels created by `IntegrationFlowContext` can be supplied with global channel interceptors).
200-
Since version 4.3.15.
201197
====
202198

203199
These properties can be overridden by adding a `/META-INF/spring.integration.properties` file to the classpath.

0 commit comments

Comments
 (0)