Commit Graph

7438 Commits

Author SHA1 Message Date
Spring Buildmaster
dd4fdee0cb [artifactory-release] Next development version 2014-01-30 17:03:38 -08:00
Spring Buildmaster
05cf2123a0 [artifactory-release] Release version 4.0.0.M3 2014-01-30 17:03:31 -08:00
Artem Bilan
59bde8ad44 INT-3282: Add BrokerRunning Rule
JIRA: https://jira.springsource.org/browse/INT-3282

Remove `@Ignore` from integration tests and some polishing
2014-01-30 18:49:46 -05:00
Gary Russell
af3160bc60 INT-3281 Bump Spring-AMQP to 1.3.0.M2
JIRA: https://jira.springsource.org/browse/INT-3281
2014-01-30 18:45:09 -05:00
Gary Russell
c0637b6e99 INT-3259 Map Inbound JMSPriority to priority
JIRA: https://jira.springsource.org/browse/INT-3259

Add an option to suppress if needed.

INT-3259: Polishing according PR comments
2014-01-30 17:17:10 +02:00
Artem Bilan
ad1035c33a Merge branch 'INT-3280' 2014-01-30 11:36:58 +02:00
Gary Russell
5db740b1ad INT-3278 Ignore ChannelTests
Some CI Servers don't have Rabbit running.

Need to port the BrokerRunning rule from Spring-AMQP
2014-01-29 18:48:27 -05:00
Gary Russell
5aa0bcadf8 INT-3280 Fix SFTP Class Tangle
JIRA: https://jira.springsource.org/browse/INT-3280
2014-01-29 17:46:49 -05:00
Gary Russell
22c0bb4180 INT-3275 Update Spring Data Redis to 1.1.1
JIRA: https://jira.springsource.org/browse/INT-3275
2014-01-29 17:44:19 -05:00
Artem Bilan
7e32b17a10 INT-3005: Add throwExceptionOnLateReply Property
JIRA: https://jira.springsource.org/browse/INT-3005

* `GenericMessagingTemplate` has `throwExceptionOnLateReply` property.
This change provides a global `messagingTemplate.throwExceptionOnLateReply` property
to allow change default `false` to `true` using `spring.integration.properties`

* Refactor `spring.integration.properties` keys to be consistent with other Spring properties - adde prefix `spring.integraton.`

INT-3005: Add test for `lateReply`

INT-3279: Fix classes tangle
2014-01-29 11:52:48 -05:00
Artem Bilan
2b888b7a76 INT-1897: Refactoring for ChannelInterceptors
JIRA: https://jira.springsource.org/browse/INT-1897

INT-1897: Introduce `ChannelInterceptorAware`

Upgrade to SF 4.0.1

JIRA: https://jira.springsource.org/browse/INT-3255
2014-01-29 10:47:26 -05:00
Artem Bilan
062e7bc9d2 INT-3130: Add result-type to <o-to-j-transformer>
JIRA: https://jira.springsource.org/browse/INT-3130

* add `result-type` attribute to the `<object-to-json-transformer>`
based on enumeration values: `STRING`, `NODE`
* Provide implementations for methods to convert value to the node representation
* Refactoring according new generic option in the `JsonObjectMapper`
* Add tests and documentation

Need Migration Guide note according this refactoring

INT-3130: remove some deprecation and JavaDocs

Addressed PR comments

Doc Polishing
2014-01-28 13:05:14 -05:00
Gary Russell
9005938ab5 INT-3278 AMQP PubSub Redeclare After Conn. Loss
JIRA: https://jira.springsource.org/browse/INT-3278

A broker-named auto-delete queue is not suitable for use
with a message listener container. If the connection is lost,
the queue is deleted and the container cannot recover its
consumer.

Use an AnonymousQueue, which has the same semantics as the
current queue, but can be redeclared after a connection loss.

Register the channel as a ConnectionListener and redeclare
the queue and binding as necessary.

Note: You cannot currently unregister a listener (AMQP-367)
so if the context is destroyed, the channel will remain a
listener. However, the isRunning() flag can be used to
avoid declaring the channels when in that state.

INT-3278 Polishing

* PR Comments
* Remove the listener when the bean is destroy()ed.
2014-01-28 19:54:47 +02:00
Artem Bilan
7e7fbe7247 INT-3274: build.gradle: BUILD-SNAPSHOT condition
JIRA: https://jira.springsource.org/browse/INT-3274

* Change the `libs-snapshot` repository to `libs-milestone`
* Add condition on `project.version` to check `BUILD-SNAPSHOT` release category
and enable `libs-snapshot` repository
* Remove redundant directories from `mqtt` module
* and one more project property for Spring AMQP version

To test it om master:
1. `gradle.properties -> version=4.0.0.M3`
2. `gradlew clean test --refresh-dependencies -PspringAmqpVersion=1.2.1.RELEASE`
2014-01-27 10:51:23 -05:00
Gary Russell
cb25d5ab05 INT-3239 Fix JDK8 Javadoc 2014-01-25 09:51:58 -05:00
Gary Russell
5cb9f05a40 INT-3271 Revert MessageHandlingException Ctor Use
When `MHE` was moved to spring-messaging, 2 constructors were
dropped. INT-3246 worked around it but it had undesirable
side-effects. Constructors have been added back in
spring-messaging so this commit reverts to using those
constructors.

JIRA: https://jira.springsource.org/browse/INT-3271
2014-01-24 10:58:31 +02:00
Gary Russell
1eefab9339 INT-3239 MQTT Final Polishing For Master Merge
* Final Polishing to move from extensions to master
* Commit history is retained from the extensions
* Docbook Chapter

JIRA: https://jira.springsource.org/browse/INT-3239
2014-01-23 18:59:15 -05:00
Glenn Renfro
85a388af89 Updated MQTTMessageConverter to use new classpath 2014-01-23 16:52:39 -05:00
Gary Russell
89cf737ad4 MQTT - Update to Spring Integration 4.0.0.M1 2014-01-23 16:52:39 -05:00
Gary Russell
f316ba86dd MQTT - Use INT/SPR 4.0.0 2014-01-23 16:52:39 -05:00
Gary Russell
7089f864d5 INTEXT-89 Fix Inbound Stop When No Server
The reconnection task was not canceled in doStop().
2014-01-23 16:52:39 -05:00
Gunnar Hillert
fa5a1e3ddd INTEXT-64 - Polishing
* Update dependency versions
* Add more comments/links
* Remove DocBook usage
2014-01-23 16:52:39 -05:00
Gunnar Hillert
4c8083edae Initial MQTT commit 2014-01-23 16:52:39 -05:00
Gary Russell
56ad69b3f6 INT-3276 Failing CI Tests
* Add test diagnostics
* Increase timers

JIRA: https://jira.springsource.org/browse/INT-3276
2014-01-23 13:18:23 -05:00
Gary Russell
7c7fc3fe2c INT-3276 Use a ThreadPool For Aggregator Stress
Stress tests previously created 36,000 threads.

JIRA: https://jira.springsource.org/browse/INT-3276
2014-01-23 12:52:29 -05:00
Gary Russell
deb6a35739 INT-3273 Fix Tests For Spring AMQP 1.3.x
Some mocking changes are needed to support changes in Spring-AMQP.

Note: Needs Spring AMQP with the fix for AMQP-364 Applied.

JIRA: https://jira.springsource.org/browse/INT-3273
2014-01-23 11:10:45 -05:00
Artem Bilan
16c7ac6134 INT-2688 Add header-type to xpath-header-enricher
JIRA: https://jira.springsource.org/browse/INT-2688
JIRA: https://jira.springsource.org/browse/INT-3237

Doc Polishing.
2014-01-21 12:07:48 -05:00
Artem Bilan
b817e98a44 INT-3249: property-placeholder for log-c-a Level
JIRA: https://jira.springsource.org/browse/INT-3249
2014-01-21 10:09:18 -05:00
Artem Bilan
e6d6bf04e2 INT-3244 Fix RedisMEssageStoreTest Race Condition
JIRA: https://jira.springsource.org/browse/INT-3244
2014-01-21 09:48:51 -05:00
Gary Russell
7b7319b39a INT-3266 Java 6 Compiler Compatibility
- ((CachingSessionFactory<?>.CachedSession) session).dirty();
+ ((CachingSessionFactory.CachedSession) session).dirty();

Failed to compile with Java6 (compiles ok with Java7 with
sourceCompatibility=1.6).
2014-01-21 09:28:32 -05:00
Gary Russell
1d002bfc47 INT-3266 (S)FTP Close Dirty Cached Sessions
If an exception occurs on a session it should be physically closed
and not reused because its state is indeterminate and the next
operation might fail.

Note: The booleans within CachedSession do not need to be volatile
because it is a short-lived object only used by the current thread.

Also fixes the assertion message in RFT.get().

JIRA: https://jira.springsource.org/browse/INT-3266

INT-3266 Polishing - PR Comments

Remove need for SuppressWarnings.
Fix 2 test cases where the exception has an additional cause.
2014-01-21 11:19:26 +02:00
Gary Russell
a90291c452 INT-3268 Add Simple RemoteFileOperations.get()
Requires a simple `remotePath` arg instead of
a Message<?>.

JIRA: https://jira.springsource.org/browse/INT-3268

Remove extra-class from `this` reference
2014-01-20 18:20:51 +02:00
Gary Russell
e6a2534fd2 INT-3265 Stored Proc Debug Logging
Set up stored procedure name in `SimpleJdbcCall` before setting
up row mappers; previously the debug logg showed `[null]` for
the procedure name.

JIRA: https://jira.springsource.org/browse/INT-3265
2014-01-16 15:46:15 -05:00
Gary Russell
c45b708341 INT-3262 JDK8 Javadoc Commit
Increase receive timeout for `Jsr223TransformerTests#testInt3162ScriptExecutorThreadSafety`.

JIRA: https://jira.springsource.org/browse/INT-3262
JIRA: https://jira.springsource.org/browse/INT-3263
2014-01-15 19:16:37 +02:00
Artem Bilan
66efb34342 INT-3257 Make AggXmlMValidationEx more convenient
JIRA: https://jira.springsource.org/browse/INT-3257
2014-01-07 09:37:35 -05:00
Gary Russell
cca630e882 Improve JMS Test
Loop sleeping 100ms for up to 10s instead of a hard sleep of 1s.

Stop the gateway in a finally block.
2014-01-06 09:03:05 -05:00
Gary Russell
b5bb4a6fc5 INT-3254: AMQP inbound-gateway: add reply-timeout
JIRA: https://jira.springsource.org/browse/INT-3254

Attribute was missing from the namespace causing issues
with long-running consumers with async handoff.

Also fix typo in http, ampq and core schemas.
2014-01-05 18:02:37 +02:00
Artem Bilan
acf2ad2229 INT-3246: MessageHandlingException Refactoring
JIRA: https://jira.springsource.org/browse/INT-3246

INT-3246: Add description to usage of MHException

Deprecate `MessageRejectedException` constructor

INT-3246: Remove `MessageHandlingException` class
2014-01-03 16:19:01 -05:00
Artem Bilan
0be6ade8f8 INT-3253: Eliminate EasyMock Dependency
JIRA: https://jira.springsource.org/browse/INT-3253

INT-3253 Polishing

Use the mockito test runner to initialize the mocks.
2014-01-03 12:54:41 -05:00
Artem Bilan
f9e0bef434 INT-3240: i-c-a-parser: Fix gen. MessageSource Id
JIRA: https://jira.springsource.org/browse/INT-3240

Spring Integration 3.0 introduced registration of `MessageSource`s as beans
with an `id` based on the adapter `id` or, as a fallback, generated from
the `MessageSource` class name and the suffix `.source`.
But since that bean wasn't registered as a bean with the generated name (because the suffix was added),
subsequent elements get the same source bean name. This meant that
several anonymous `inbound-channel-adapter` with the same type (`file:`, `ftp:`, `twitter:` etc.)
caused an issue, when the same `MessageSource` bean was used by several `SourcePollingChannelAdapter` beans.

Fix the issue for fallback name generation by using the `SourcePollingChannelAdapterFactoryBean` class name.
Since that is registered, the source will always get a unique name, regardless of whether an id is provided.
2014-01-02 13:31:46 -05:00
Artem Bilan
fa4775e775 INT-3241: Upgrade Gradle and some dependencies
JIRA: https://jira.springsource.org/browse/INT-3241
2014-01-02 12:43:12 -05:00
Gary Russell
df492e18fa INT-3248 Suppress HeaderChannelRegistry Warning
Remove warning from BFCR if there is no HeaderChannelRegistry in
the bean factory. Change the log to DEBUG and remove the stack
trace.

Instead, update the Exception message when a channel name can't be
resolved to a channel to indicate that there is no registry.

JIRA: https://jira.springsource.org/browse/INT-3248
2013-12-21 10:46:14 -05:00
Spring Buildmaster
382eae5353 [artifactory-release] Next development version 2013-12-17 15:02:55 -08:00
Spring Buildmaster
27e9e01fb6 [artifactory-release] Release version 4.0.0.M2 2013-12-17 15:02:46 -08:00
Gary Russell
ca0bddffbd INT-3245 Remove SI ChannelInterceptor
Replace with the same class from spring-messaging.

JIRA: https://jira.springsource.org/browse/INT-3245
2013-12-17 16:52:12 -05:00
Gary Russell
c2ee2161a1 INT-3242 Final Polish for 4.0.0.M2
- Rename EiMessageHeaderAccessor to IntegrationMessageHeaderAccessor
- Remove GenericMessage
- Minor TODOs
- Start a new What's new" chapter in the reference

JIRA: https://jira.springsource.org/browse/INT-3242
2013-12-17 14:38:36 -05:00
Artem Bilan
64cc1faafe INT-3052 RestTemplate with TypeReference for HTTP
JIRA: https://jira.springsource.org/browse/INT-3052

Add support of `ParameterizedTypeReference` as a result of
`expectedResponseTypeExpression` evaluation for
`RestTemplate.exchange` with `ParameterizedTypeReference` parameter

Now `expectedResponseTypeExpression` can be evaluated to `Class<?>`,
`String` and `ParameterizedTypeReference<?>`
2013-12-17 19:03:31 +02:00
Artem Bilan
73a104c955 INT-3184: Test HTTP Matrix Variables
JIRA: https://jira.springsource.org/browse/INT-3184

* Change `IntegrationRequestMappingHandlerMapping` to postpone
Handlers detection as late as possible using `ApplicationListener<ContextRefreshedEvent>`.
This is needed, because `RequestMappingInfoHandlerMapping#afterPropertiesSet()`
iterates over beans from `BeanFactory` to detect MVC Handlers. But at the same time
Integration Endpoints require `requestChannel` as dependency and those may be postponed
for `auto-creation` by `ChannelInitializer` - late-binding issue.
2013-12-17 11:32:46 -05:00
Gary Russell
075e331dcf Revert "INT-3184: Test HTTP Matrix Variables"
This reverts commit b607b6d3c9.
2013-12-17 11:32:28 -05:00
Artem Bilan
b607b6d3c9 INT-3184: Test HTTP Matrix Variables
JIRA: https://jira.springsource.org/browse/INT-3184

* Change `IntegrationRequestMappingHandlerMapping` to postpone
Handlers detection as late as possible using `ApplicationListener<ContextRefreshedEvent>`
2013-12-17 11:24:41 -05:00