spring-integration

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Upgrade to Spring Web Services 2.2.1.RELEASE

This commit updates the version of Spring Web Services to

2.2.1.RELEASE. The fix for SWS-892 means that in the event of an

interceptor failing to handle a request, the request is no longer

sent. The interceptor in UriVariableTests has been updated to return

true, indicating that the request has been handled and should be

sent.

Conflicts:

build.gradle

spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java

Upgrade to Spring Web Services 2.2.1.RELEASE

This commit updates the version of Spring Web Services to

2.2.1.RELEASE. The fix for SWS-892 means that in the event of an

interceptor failing to handle a request, the request is no longer

sent. The interceptor in UriVariableTests has been updated to return

true, indicating that the request has been handled and should be

sent.

Conflicts:

build.gradle

spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java

Conflicts:

build.gradle

Upgrade to Spring Web Services 2.2.1.RELEASE

This commit updates the version of Spring Web Services to

2.2.1.RELEASE. The fix for SWS-892 means that in the event of an

interceptor failing to handle a request, the request is no longer

sent. The interceptor in UriVariableTests has been updated to return

true, indicating that the request has been handled and should be

sent.

INT-3624: Register `#jsonPath` Only for `0.9.1`

JIRA: https://jira.spring.io/browse/INT-3624

Add assert to the `IntegrationRegistrar` for the `#jsonPath` that we register this SpEL function only for support old `json-path` version

Polishing

INT-3689: Upgrade to Spring Data Fowler

JIRA: https://jira.spring.io/browse/INT-3689

Remove usage of deprecated `mongoTemplate.executeInSession`.

Since MongoDB doesn't provide the `member pinning` guarantee with `requestStart/requestDone`,

this feature has been removed in MongoDB 3.0: https://github.com/mongodb/specifications/blob/master/source/server-selection/server-selection.rst#what-happened-to-pinning

INT-3684: Rebuild Tail Command on Restart

JIRA: https://jira.spring.io/browse/INT-3684

Conflicts:

spring-integration-file/src/test/java/org/springframework/integration/file/tail/FileTailingMessageProducerTests.java

Conflicts:

spring-integration-file/src/test/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterParserTests-context.xml

spring-integration-file/src/test/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterParserTests.java

INT-3684: Rebuild Tail Command on Restart

JIRA: https://jira.spring.io/browse/INT-3684

Conflicts:

spring-integration-file/src/test/java/org/springframework/integration/file/tail/FileTailingMessageProducerTests.java

Conflicts:

spring-integration-file/src/test/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterParserTests-context.xml

spring-integration-file/src/test/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterParserTests.java

INT-3684: Rebuild Tail Command on Restart

JIRA: https://jira.spring.io/browse/INT-3684

Conflicts:

spring-integration-file/src/test/java/org/springframework/integration/file/tail/FileTailingMessageProducerTests.java

Conflicts:

spring-integration-file/src/test/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterParserTests-context.xml

spring-integration-file/src/test/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterParserTests.java

INT-3684: Rebuild Tail Command on Restart

JIRA: https://jira.spring.io/browse/INT-3684

Conflicts:

spring-integration-file/src/test/java/org/springframework/integration/file/tail/FileTailingMessageProducerTests.java

INT-3684: Rebuild Tail Command on Restart

JIRA: https://jira.spring.io/browse/INT-3684

INT-3197: Docs to AsciiDoc from DocBook

JIRA: https://jira.spring.io/browse/INT-3197

Polishing

Various glitches.

Fix Table of Contents

Polishing - Various Glitches

More Polishing

  • Fixes for issues found by side-by-side comparison of htmlsingle output.

Fix Table Formats for PDF

More Polishing - PR Comments

More Polishing - Bad Titles

More Polishing

Work-Around for AsciiDoctor Problem

https://github.com/asciidoctor/asciidoctor/issues/1297

Use a blank line between includes rather than a comment

at the end of include files that end with a callout.

Remove Unresolved qName Entries

Fix Overview PDF Image Sizes

Highlight Schema Imports

More Image Fixes

INT-3197: Port DocBook Changes Since Conversion

Remove DocBook Files

    • -0
    • +764
    /src/reference/asciidoc/aggregator.adoc
    • -0
    • +662
    /src/reference/asciidoc/amqp.adoc
    • -0
    • +52
    /src/reference/asciidoc/bridge.adoc
    • -0
    • +161
    /src/reference/asciidoc/chain.adoc
    • -0
    • +178
    /src/reference/asciidoc/changes-1.0-2.0.adoc
    • -0
    • +220
    /src/reference/asciidoc/changes-2.0-2.1.adoc
    • -0
    • +175
    /src/reference/asciidoc/changes-2.1-2.2.adoc
    • -0
    • +421
    /src/reference/asciidoc/changes-2.2-3.0.adoc
    • -0
    • +262
    /src/reference/asciidoc/changes-3.0-4.0.adoc
    • -0
    • +225
    /src/reference/asciidoc/changes-4.0-4.1.adoc
    • -0
    • +4
    /src/reference/asciidoc/changes-4.1-4.2.adoc
    • -0
    • +142
    /src/reference/asciidoc/channel-adapter.adoc
    • -0
    • +788
    /src/reference/asciidoc/channel.adoc
    • -0
    • +214
    /src/reference/asciidoc/claim-check.adoc
  1. … 184 more files in changeset.

INT-3680: Fix JMS Durable Subscription Name

JIRA: https://jira.spring.io/browse/INT-3680

Change parser to use the `setSubscriptionName` setter instead

of `setDurableSubscriptionName` which as the side effect of

unconditionally setting the subscription as durable.

INT-3680: Fix JMS Durable Subscription Name

JIRA: https://jira.spring.io/browse/INT-3680

Change parser to use the `setSubscriptionName` setter instead

of `setDurableSubscriptionName` which as the side effect of

unconditionally setting the subscription as durable.

Merge remote-tracking branch 'upstream-gh-pages/gh-pages' into gh-pages

Display Pivotal Education related courseware

This change adds a new "Related Courseware" section in the side

container; this section lists links to courses and talks that are

relevant to the current project page.

Relevant content is fetched by the browser, with an AJAX request sent to

the Pivotal Education LMS API. This API uses the Referrer HTTP header as

input parameter to its content selection algorithm.

Note that CORS HTTP headers are also used to allow/disallow AJAX cross

domain requests.

INT-3672: Fix IdempotentReceiver for MH `@Bean`s

JIRA: https://jira.spring.io/browse/INT-3672

Previously the `IdempotentReceiverInterceptor` has been applied only for the `MessageHandler`s which were registered with `.handler` suffix.

Rework `IdempotentReceiverAutoProxyCreatorInitializer` and `IdempotentReceiverAutoProxyCreator` to get deal with *direct* `MessageHandler`s

which can be resulted from `@Bean` methods.

Use the `MessageHandler` real bean name instead of `endpoint pattern` in that case

*Cherry-pick to 4.1.x*

INT-3672: Fix IdempotentReceiver for MH `@Bean`s

JIRA: https://jira.spring.io/browse/INT-3672

Previously the `IdempotentReceiverInterceptor` has been applied only for the `MessageHandler`s which were registered with `.handler` suffix.

Rework `IdempotentReceiverAutoProxyCreatorInitializer` and `IdempotentReceiverAutoProxyCreator` to get deal with *direct* `MessageHandler`s

which can be resulted from `@Bean` methods.

Use the `MessageHandler` real bean name instead of `endpoint pattern` in that case

*Cherry-pick to 4.1.x*

INT-3633: Add MessageSourceAdvice

JIRA: https://jira.spring.io/browse/INT-3633

INT-3633: Add SimpleActiveIdleMessageSourceAdvice

Also resolve package tangle.

Polishing and Docs

Polishing according PR comments:

  • Fix JavaDocs vulnerabilities
  • Fix typos in docs
  • Remove unnecessary `AopUtils.canApply` check

INT-3670: JMS Doc Polishing

Add Control Bus to Stored Proc JavaConfig Test

INT-3656: Restore PreSend Log; Avoid Access Method

JIRA: https://jira.spring.io/browse/INT-3656

The optimization (when no interceptors) inadvertently removed

the `preSend` DEBUG log.

Reinstate the DEBUG log.

Also change `ChannelInterceptorList` to a `static` class.

This avoids the access method invocation each time the channel's

`logger` is used. The only `AMC` field used was the `logger`; pass

it into the `CIL` via a constructor.

Old bytecode:

104: aload_0

105: getfield #14 // Field this$0:Lorg/springframework/integration/channel/AbstractMessageChannel;

108: invokestatic #60 // Method org/springframework/integration/channel/AbstractMessageChannel.access$1:(Lorg/springframework/integration/channel/AbstractMessageChannel;)Lorg/apache/commons/logging/Log;

111: invokeinterface #66, 1 // InterfaceMethod org/apache/commons/logging/Log.isDebugEnabled)Z

116: ifeq 157

New bytecode:

98: aload_0

99: getfield #22 // Field logger:Lorg/apache/commons/logging/Log;

102: invokeinterface #60, 1 // InterfaceMethod org/apache/commons/logging/Log.isDebugEnabled)Z

INT-3656: Restore PreSend Log; Avoid Access Method

JIRA: https://jira.spring.io/browse/INT-3656

The optimization (when no interceptors) inadvertently removed

the `preSend` DEBUG log.

Reinstate the DEBUG log.

Also change `ChannelInterceptorList` to a `static` class.

This avoids the access method invocation each time the channel's

`logger` is used. The only `AMC` field used was the `logger`; pass

it into the `CIL` via a constructor.

Old bytecode:

104: aload_0

105: getfield #14 // Field this$0:Lorg/springframework/integration/channel/AbstractMessageChannel;

108: invokestatic #60 // Method org/springframework/integration/channel/AbstractMessageChannel.access$1:(Lorg/springframework/integration/channel/AbstractMessageChannel;)Lorg/apache/commons/logging/Log;

111: invokeinterface #66, 1 // InterfaceMethod org/apache/commons/logging/Log.isDebugEnabled)Z

116: ifeq 157

New bytecode:

98: aload_0

99: getfield #22 // Field logger:Lorg/apache/commons/logging/Log;

102: invokeinterface #60, 1 // InterfaceMethod org/apache/commons/logging/Log.isDebugEnabled)Z

Conflicts:

spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java

spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractPollableChannel.java

spring-integration-core/src/test/java/org/springframework/integration/channel/QueueChannelTests.java

INT-3670: JMS Conversion Error Handling

JIRA: https://jira.spring.io/browse/INT-3670

Exceptions during inbound message conversion are now routed to the error-channel (if present).

When there is no error-channel, the exception is thrown back to the container as before.

Add a note to the `jms.xml` about the `error-channel` usage changes

    • -0
    • +10
    /src/reference/docbook/whats-new.xml

INT-3664: Rework BPP in the `IntMBExporter`

JIRA: https://jira.spring.io/browse/INT-3664

Since all metrics are already direct for the integration components, we don't do any proxying from `IntegrationMBeanExporter`,

and even any other adjustments during BPP phases. Hence this stuff is already redundant for `IntegrationMBeanExporter`.

In addition this change fix the `early access to the BeanFactory from BPP` issue.

INT-3664: Address PR comments

Doc Polish

INT-3664: Polishing according the SF changes to the `PostProcessorRegistrationDelegate$BeanPostProcessorChecker`

INT-3669: Fix `DelayHandler` for the `Date` delay

JIRA: https://jira.spring.io/browse/INT-3669

Previously the `DelayHandler` incorrectly calculated a `delay` for values which are of the `Date` time.

It always used `new Date()` even for rescheduling for persisted messages.

  • Fix `DelayHandler` to calculate `delays` against the `requestDate` of the delayed Message
  • In addition fix the expression evaluation root object, when for rescheduling it was the message with `DelayedMessageWrapper` payload instead of original message.

*Cherry-pick to 3.0.x, 4.0.x, 4.1.x*

INT-3669: Fix `DelayHandler` for the `Date` delay

JIRA: https://jira.spring.io/browse/INT-3669

Previously the `DelayHandler` incorrectly calculated a `delay` for values which are of the `Date` time.

It always used `new Date()` even for rescheduling for persisted messages.

  • Fix `DelayHandler` to calculate `delays` against the `requestDate` of the delayed Message
  • In addition fix the expression evaluation root object, when for rescheduling it was the message with `DelayedMessageWrapper` payload instead of original message.

*Cherry-pick to 3.0.x, 4.0.x, 4.1.x*

INT-3669: Fix `DelayHandler` for the `Date` delay

JIRA: https://jira.spring.io/browse/INT-3669

Previously the `DelayHandler` incorrectly calculated a `delay` for values which are of the `Date` time.

It always used `new Date()` even for rescheduling for persisted messages.

  • Fix `DelayHandler` to calculate `delays` against the `requestDate` of the delayed Message
  • In addition fix the expression evaluation root object, when for rescheduling it was the message with `DelayedMessageWrapper` payload instead of original message.

*Cherry-pick to 3.0.x, 4.0.x, 4.1.x*

INT-3669: Fix `DelayHandler` for the `Date` delay

JIRA: https://jira.spring.io/browse/INT-3669

Previously the `DelayHandler` incorrectly calculated a `delay` for values which are of the `Date` time.

It always used `new Date()` even for rescheduling for persisted messages.

  • Fix `DelayHandler` to calculate `delays` against the `requestDate` of the delayed Message
  • In addition fix the expression evaluation root object, when for rescheduling it was the message with `DelayedMessageWrapper` payload instead of original message.

*Cherry-pick to 3.0.x, 4.0.x, 4.1.x*

INT-3669: Fix `DelayHandler` for the `Date` delay

JIRA: https://jira.spring.io/browse/INT-3669

Previously the `DelayHandler` incorrectly calculated a `delay` for values which are of the `Date` time.

It always used `new Date()` even for rescheduling for persisted messages.

  • Fix `DelayHandler` to calculate `delays` against the `requestDate` of the delayed Message
  • In addition fix the expression evaluation root object, when for rescheduling it was the message with `DelayedMessageWrapper` payload instead of original message.

*Cherry-pick to 3.0.x, 4.0.x, 4.1.x*

INT-3669: Fix `DelayHandler` for the `Date` delay

JIRA: https://jira.spring.io/browse/INT-3669

Previously the `DelayHandler` incorrectly calculated a `delay` for values which are of the `Date` time.

It always used `new Date()` even for rescheduling for persisted messages.

  • Fix `DelayHandler` to calculate `delays` against the `requestDate` of the delayed Message
  • In addition fix the expression evaluation root object, when for rescheduling it was the message with `DelayedMessageWrapper` payload instead of original message.

*Cherry-pick to 3.0.x, 4.0.x, 4.1.x*

Conflicts:

spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java

Resolved