Skip to content

Commit bb91fd3

Browse files
committed
Some documentations clean up
1 parent 53dd050 commit bb91fd3

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlow.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ static IntegrationFlowBuilder from(MessageChannelSpec<?, ?> messageChannelSpec)
156156

157157
/**
158158
* Populate the {@link MessageChannel} name to the new {@link IntegrationFlowBuilder} chain.
159-
* Typically for the {@link org.springframework.integration.channel.FixedSubscriberChannel} together
159+
* Typically, for the {@link org.springframework.integration.channel.FixedSubscriberChannel} together
160160
* with {@code fixedSubscriber = true}.
161161
* The {@link IntegrationFlow} {@code inputChannel}.
162162
* @param messageChannelName the name for {@link DirectChannel} or
@@ -215,6 +215,7 @@ static IntegrationFlowBuilder from(MessageSourceSpec<?, ? extends MessageSource<
215215
*/
216216
static IntegrationFlowBuilder from(MessageSourceSpec<?, ? extends MessageSource<?>> messageSourceSpec,
217217
Consumer<SourcePollingChannelAdapterSpec> endpointConfigurer) {
218+
218219
Assert.notNull(messageSourceSpec, "'messageSourceSpec' must not be null");
219220
return from(messageSourceSpec.get(), endpointConfigurer, registerComponents(messageSourceSpec));
220221
}
@@ -248,7 +249,7 @@ static <T> IntegrationFlowBuilder fromSupplier(Supplier<T> messageSource,
248249
Consumer<SourcePollingChannelAdapterSpec> endpointConfigurer) {
249250

250251
Assert.notNull(messageSource, "'messageSource' must not be null");
251-
return from(new AbstractMessageSource<Object>() {
252+
return from(new AbstractMessageSource<>() {
252253

253254
@Override
254255
protected Object doReceive() {
@@ -497,10 +498,9 @@ private static IntegrationFlowBuilder registerComponents(Object spec) {
497498

498499
@SuppressWarnings("unchecked")
499500
private static <T> T extractProxyTarget(T target) {
500-
if (!(target instanceof Advised)) {
501+
if (!(target instanceof Advised advised)) {
501502
return target;
502503
}
503-
Advised advised = (Advised) target;
504504
try {
505505
return (T) extractProxyTarget(advised.getTargetSource().getTarget());
506506
}

spring-integration-core/src/main/java/org/springframework/integration/dsl/IntegrationFlows.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
*
4242
* @see org.springframework.integration.dsl.context.IntegrationFlowBeanPostProcessor
4343
*
44-
* @deprecated Since version 6.0, this factory is not recommended to use as it shall be removed in the following versions. Use fluent API methods straight from {@link IntegrationFlow} interface.
44+
* @deprecated since version 6.0 in favor of fluent API methods straight from {@link IntegrationFlow} interface.
4545
*/
4646
@Deprecated(since = "6.0", forRemoval = true)
4747
public final class IntegrationFlows {

src/reference/asciidoc/whats-new.adoc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ See <<./aggregator.adoc#aggregator,Aggregator>> for more information.
5050
The `IntegrationFlows` factory is now marked as deprecated in favor of the fluent API available in the `IntegrationFlow` interface itself.
5151
The factory class will be removed in the future releases.
5252

53+
See <<./dsl.adoc#java-dsl,Java DSL>> for more information.
54+
5355
[[x6.0-http]]
5456
=== HTTP Changes
5557

@@ -74,6 +76,10 @@ See <<./kafka.adoc#kafka,Spring for Apache Kafka Support>> for more information.
7476

7577
The `DefaultLockRepository` can now be supplied with a `PlatformTransactionManager` instead of relying on the primary bean from the application context.
7678

79+
See <<./jdbc.adoc#jdbc-lock-registry,JDBC Lock Registry>> for more information.
80+
7781
=== TCP/IP Changes
7882

79-
The `lookupHost` property of the `AbstractConnectionFactory` and `DatagramPacketMessageMapper` is now set to `false` by default to avoid delays in the environments where DNS is not configured.
83+
The `lookupHost` property of the `AbstractConnectionFactory` and `DatagramPacketMessageMapper` is now set to `false` by default to avoid delays in the environments where DNS is not configured.
84+
85+
See <<./ip.adoc#ip,TCP and UDP Support>> for more information.

0 commit comments

Comments
 (0)