Commit Graph

9623 Commits

Author SHA1 Message Date
Gary Russell
83e84b0272 INT-2906 Upgrade Groovy to 2.1.0 2013-02-13 16:50:01 -05:00
Mark Fisher
937b38c366 Merge pull request #733 from garyrussell/INT-2900
* INT-2900: Remove Extraneous Debug Log
2013-02-13 14:24:36 -05:00
Gary Russell
5edebb303e INT-2900 Remove Extraneous Debug Log
When referencing a <gateway/> from a <service-activator/>, a debug
log is written with a full stack trace.

This is because all methods on the proxy are considered candidates,
but one method (addAdvice) has multiple parameters and can't be
used to process a message.

Add code to detect a proxy that has no target object; if the Proxy
only has one interface, then use that as the targetClass.
2013-02-13 14:23:20 -05:00
Gunnar Hillert
d765add255 Merge pull request #728 from garyrussell/INT-2911
* garyrussell-INT-2911:
  INT-2911 IO Exceptions Not Logged as ERROR
2013-02-13 12:38:30 -05:00
Gary Russell
84e9c0ec36 INT-2911 IO Exceptions Not Logged as ERROR
TcpNetConnection IO errors were only logged under DEBUG.

* Code was added to suppress the error log when the exception was due to a normal close. This inadvertently suppressed all ERROR logs.
* Capture a local copy of this.noReadErrorOnClose before closing the socket after an exception.
* Add test case to ensure ERROR log is emitted.
2013-02-13 12:34:18 -05:00
Gunnar Hillert
82173d3be6 Merge pull request #739 from garyrussell/INT-2922
* garyrussell-INT-2922:
  INT-2922 Fix TypeConverter Concurrency Issue
2013-02-12 16:55:44 -05:00
Gary Russell
fc8985aee7 INT-2922 Fix TypeConverter Concurrency Issue
During initialization, it is possible for type conversion to fail because a second thread accesses a partially built list of PropertyEditors. This is because getDefaultEditor(Class) is not thread-safe.

* Add a test with mocks and spies to verify concurrent access to the method occurs before the fix, and not after the fix.
* Synchronize the call to getDefaultEditor(), when called from canConvert() and convertValue().
* Only synchronize the call until we have invoked the method at least once.
2013-02-12 16:53:16 -05:00
Gunnar Hillert
7c7dbe65c4 Merge pull request #732 from garyrussell/INT-2823
* garyrussell-INT-2823:
  INT-2823 Add QueueChannelOperations
2013-02-12 15:31:27 -05:00
Gary Russell
e822bfd908 INT-2823 Add QueueChannelOperations
Operations on QueueChannel (clear, getQueueSize etc) are not available
when the IntegrationMBeanExporter is configured because they
are not declared on the PollableChannel interface.

Add an additional interface QueueChannelOperations.

The proxy proxies all interfaces so users can cast the
proxy to QueueChannelOperations to use its methods.
2013-02-12 15:05:01 -05:00
Gary Russell
716b5f7f8e Merge pull request #729 from ghillert/INT-2912 2013-02-12 14:56:25 -05:00
Gunnar Hillert
da817cb754 INT-2912 JdbcMessageStore Add 'region' to Queries
Missing region column in some queries.

For reference see: https://jira.springsource.org/browse/INT-2912

INT-2912 - Code Review
* Eliminate Spring Application Context for Test
* Improve SQL Query

INT-2912 Polishing

Modified testVerifyMessageGroupCount to test size of each
group in each region.
2013-02-12 14:54:46 -05:00
Gary Russell
6eb009fd62 Merge pull request #727 from artembilan/INT-2899 2013-02-12 14:29:29 -05:00
Artem Bilan
8c07856fa1 INT-2899: Remove Redundant Logic from Aggregator
Previously, `AggregatingMessageHandler#setExpireGroupsUponCompletion` had additional logic
for removing complete MessageGroups. It could produce some overhead on application start-up with big persistent `MessageStore`.
This logic played a role to remove empty groups from a `MessageStore`.
Since `AbstractCorrelatingMessageHandler#forceComplete` has an ability to to remove empty groups too,
this logic became redundant.
So, to clean `MessageStore` from empty complete groups, it's sufficient to use a `MessageGroupStoreReaper`.

* Remove logic iterating over the `MessageStore` from `AggregatingMessageHandler#setExpireGroupsUponCompletion`
* Polishing `AggregatorSupportedUseCasesTests.java` to use `store.expireMessageGroups(0)`
* Introduce `empty-group-min-timeout` xml-attribute, populating `AbstractCorrelatingMessageHandler#minimumTimeoutForEmptyGroups`
* Add parser tests for `empty-group-min-timeout` attribute

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

INT-2899: Documentation about changes of ACMH

* rename new XSD-attribute to `empty-group-min-timeout`
* add to Reference Manual description about `empty-group-min-timeout`
* add 'What's new' for `empty-group-min-timeout`
* add 2.2-3.0 Migration Guide note

INT-2899 Doc Polishing
2013-02-12 14:27:31 -05:00
Gary Russell
22859bf63e Merge pull request #742 from ghillert/INT-2728 2013-02-12 11:56:51 -05:00
Gunnar Hillert
731b338c84 INT-2728 Stored Proc Fix Missing Schema Attribute
INT-2728 - Stored Proc - Add 'return-value-required' attribute

* For Stored Procedure Inbound Channel Adapter: Add 'return-value-required' attribute
* Add tests

For reference: https://jira.springsource.org/browse/INT-2728

INT-2878 Polishing

Add a default false assertion to the parser tests.
2013-02-12 11:51:52 -05:00
Gary Russell
bc51c86a21 Merge pull request #744 from ghillert/INT-2919 2013-02-12 11:05:53 -05:00
Gunnar Hillert
e2cc2326f1 INT-2919 - Upgrade Spring Data Gemfire to 1.2.2.RELEASE
For reference: https://jira.springsource.org/browse/INT-2919
2013-02-12 11:00:08 -05:00
Gary Russell
c60b7afa38 Merge pull request #722 from artembilan/INT-2888 2013-02-12 10:52:41 -05:00
Artem Bilan
77fae8844a INT-2888 Fix MapToObjectTransformerParser CL Issue
In the parent-child environment configuration that relies on class names may produce
a `ClassNotFoundException`.

* remove usage of `ClassLoader` in the `MapToObjectTransformerParser` and allow to use the `ConversionService` from application context
* remove deprecation from `MapToObjectTransformer`
* refactor `MapToObjectTransformer` to use `IntegrationObjectSupport#getConversionService()`
* remove fallback to the `beanFactory#getConversionService()` in the `ExpressionUtils`

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

INT-2928: Do Not Fallback to BF's ConversionService

* Polishing according PR's comments
* Important note about `conversionService` & `integrationConversionService` beans
* Link a JIRA about elimination of `BeanFactory`'s `ConversionService` usage
* Add a note to the 2.2-3.0 Migration Guide

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

INT-2888 Doc Polishing
2013-02-12 10:51:36 -05:00
Gunnar Hillert
e994c4dab3 Merge pull request #735 from sobychacko/INT-2526
* sobychacko-INT-2526:
  INT-2526 - Remove additional deprecations in Core
  INT-2526: Remove deprecations in Core after upgrade to Spring 3.1.1
2013-02-11 23:45:20 -05:00
Gunnar Hillert
629566c738 INT-2526 - Remove additional deprecations in Core 2013-02-11 23:42:05 -05:00
Soby Chacko
05cd8e68c0 INT-2526: Remove deprecations in Core after upgrade to Spring 3.1.1
* remove deprecated usage of ConversionServiceFactory.createDefaultConversionService()
* remove deprecated usage of AopUtils.isCglibProxyClass

JIRA: https://jira.springsource.org/browse/INT-2526
2013-02-11 23:41:15 -05:00
Gary Russell
fd4fa6aa75 Merge pull request #741 from ghillert/INT-2769 2013-02-11 11:26:05 -05:00
Gunnar Hillert
208d022ca6 INT-2769 Document Filename Generation Options
INT-2769 - Document filename-generator + filename-generator-expression

For reference see: https://jira.springsource.org/browse/INT-2769

INT-2769 Polishing
2013-02-11 11:17:17 -05:00
Gunnar Hillert
0602f88c9f Merge pull request #719 from garyrussell/INT-2829
* garyrussell-INT-2829:
  INT-2830 Resolve Class Tangle
2013-02-08 17:59:54 -05:00
Gary Russell
91722b7a5f INT-2830 Resolve Class Tangle
* MessageGroupStore <-> MessageGroupCallback
  - Change callback to be an inner interface of the MGS.
* INT-2829 Fix Class Tangle in IP Module
  - 3 way tangle between TcpSender, TcpConnection, TcpMessageMapper
  - Clean up interfaces (remove setters); add top-level support classes for TcpConnection, TcpConnectionInterceptor.
* INT-2829 Remove TCP Package Tangle
  - tcp.connection <-> tcp.connection.support
  - Remove ...connection.support package - move classes to ...connection.
2013-02-08 17:58:17 -05:00
Gary Russell
f88a97332a Merge pull request #736 from nickspacek/INT-2920 2013-02-08 16:33:30 -05:00
Nick Spacek
6e6d1c60c9 INT-2920 Fix two hits to MessageStore
Reduce ClaimCheckOutTransformer's hits to the MessageStore.

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

Add @author and update copyright

Fixed missing semi-colon
2013-02-08 16:32:36 -05:00
Gunnar Hillert
9c7116a936 Merge pull request #740 from garyrussell/INT-2923
* garyrussell-INT-2923:
  INT-2923 3.0 Reference Changes
2013-02-08 15:07:24 -05:00
Gary Russell
8fd5995f78 INT-2923 3.0 Reference Changes
Move 2.2. "What's New" to Change History Appendix.
2013-02-07 16:39:33 -05:00
Gary Russell
35919ea2ee Merge pull request #738 from ghillert/INT-2697 2013-02-07 11:48:06 -05:00
Gunnar Hillert
e66c16bb44 INT-2697 - Remove Bundlor from build.gradle
For reference: https://jira.springsource.org/browse/INT-2697
2013-02-07 10:45:46 -05:00
Gary Russell
88782b8a34 INT-2921 Add 2013 to Reference Manual Copyright 2013-02-06 18:30:52 -05:00
Gunnar Hillert
0a24267041 Merge pull request #731 from garyrussell/INT-2915
* garyrussell-INT-2915:
  INT-2915 JMS Remove Deprecated Attributes
2013-02-06 16:44:02 -05:00
Gary Russell
501982c47d INT-2915 JMS Remove Deprecated Attributes
delivery-mode was deprecated (in favor of delivery-persistent)
in 2.0. Remove attribute from schema and parser.

Unfortunately, the setter on the gateway was never deprecated
so there is a possibility someone is using it programmatically,
with no knowledge that it is going away.

Deprecated the setter.

Also, added schema documentation for several attributes where
no documentation was provided.
2013-02-06 16:33:42 -05:00
Gary Russell
6d53e4b61c Merge pull request #726 from artembilan/INT-2908 2013-02-05 14:13:59 -05:00
Artem Bilan
f9f2d65477 INT-2908 Fix JMS Tests Concurrency Issue
Fix concurrency issues with timeouts field.

JIRA: https://jira.springsource.org/browse/INT-2908
2013-02-05 14:12:25 -05:00
Gary Russell
e9b47ff024 Merge pull request #712 from artembilan/INT-2893 2013-02-05 12:51:58 -05:00
Artem Bilan
dc59207df2 INT-2893: fix chain -> router -> bean or script
* add XSD element for nested router type
* add tests on the matter
* polishing for RouterParserTests

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

INT-2893: Polishing

INT-2893: after rebasing to 3.0

XSD changes reverted from 2.2 and moved to 3.0

INT-2893 Polishing

Factor out common elements; fixing missing documentation for
`expression` within a `router` within a `chain`.
2013-02-05 12:30:19 -05:00
Gunnar Hillert
90c54c5f74 Merge pull request #718 from garyrussell-INT-2682
* garyrussell-INT-2682-2:
  INT-2682 JMS GW - Support Expression for replyDest
2013-02-05 09:51:44 -05:00
Gary Russell
86d6d970d1 INT-2682 JMS GW - Support Expression for replyDest
Currently supports destination and destination name.

* Add support for replyDestinationExpression.
* Add Docs for JMS Outbound Gateway Attributes.
* Change method name for consistency.
2013-02-05 09:48:35 -05:00
Gunnar Hillert
ed4fe234c7 Merge pull request #717 from garyrussell/INT-2825
* garyrussell-INT-2825:
  INT-2825 Remove Temporary 2.2. Interface
2013-02-04 17:42:08 -05:00
Gary Russell
a127a46083 INT-2825 Remove Temporary 2.2. Interface
AbstractTransactionSynchronizingPollingEndpoint was introduced late in the 2.2 release process to avoid a breaking change to AbstractPollingEndpoint. For 3.0, its methods are now pulled-up into APE.

Further change:

* remove Deprecated Setter (PollerMetadata)
* fix failing test
2013-02-04 17:40:56 -05:00
Gary Russell
f3e59cda26 Merge pull request #725 from artembilan/INT-2907 2013-02-01 19:00:53 -05:00
Gary Russell
ef29d6b2a2 INT-2913 Fix Looping Mail Tests
Causes excessive CPU utilization and OOM Errors with
Gradle 1.4 (and 1.2 on some platforms).

Stop adapters when tests complete.
2013-02-01 18:58:27 -05:00
Artem Bilan
c4ca84e20b INT-2907: Upgrade to Gradle 1.4
JIRA: https://jira.springsource.org/browse/INT-2907
2013-02-01 16:01:04 -05:00
Gary Russell
3d9c87efe4 Merge pull request #721 from artembilan/INT-2884 2013-02-01 15:56:47 -05:00
Artem Bilan
877c62c5e7 INT-2884: Refactor Stream Tests to Use Mocks
Avoid hijacking stdout, stderr because the tests failed
when logging was enabled.
2013-02-01 15:50:52 -05:00
Mark Fisher
a9369a1ecf Merge pull request #716 from garyrussell/INT-2873
* INT-2873: Create 3.0 Schemas
2013-01-25 17:56:28 -05:00
Gary Russell
451beb424a INT-2873 Create 3.0 Schemas
Copy schemas, cleanup whitespace, update spring.schemas files,
update version in AbstractIntegrationNamespaceHandler.

For each schema compared the 2.2 version with the 3.0 version
(diff -w), ensuring the only difference is the import of
3.0 schemas (where appropriate) instead of 2.2.
2013-01-25 16:12:00 -05:00