Commit Graph

127 Commits

Author SHA1 Message Date
Gary Russell
066eb91100 INT-1849/INT-2147 Add Disposition to File Adapter
* Add *disposition-expression* to the inbound file adapter. This allows for operations such as *payload.delete()*, *payload.renameTo()* after the file is processed.
* The result of executing the expression (if any) is sent to the disposition-result-channel.
2012-06-25 11:38:20 -04:00
Artem Bilan
0e31624083 INT-1132 Fix Failing Delyer Test
INT-1132: Eliminate delayer's tests sensitive

* There is no guarantee that a Message will be delayed after restart for exactly the remaining time; it may be delayed longer.
* Remove assert around 'receive time'
* Remove redundant LIFO test-case: now `DelayHandler` just uses simple iteration over `MessageGroup`

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

Build report: https://build.springsource.org/browse/INT-B22X-JOB1-91/test/case/110952529
2012-06-21 17:31:25 -04:00
Artem Bilan
25a2efe59c INT-2607: refactor 'resolveId' with pC.isNested()
* add delegation to `BeanDefinitionReaderUtils.generateBeanName(definition, parserContext.getRegistry(), parserContext.isNested())`
in the `AbstractBeanDefinitionParser#resolveId()` implementations when it is necessary.
* remove redundant `shouldGenerateId()` & `shouldGenerateIdAsFallback()` when they don't make sense.
* additional simple polishing in the affected classes.
* remove TODO & forced 'id' attribute from JpaOutboundGatewayTests-context.xml to check that this solution works as was booked.

JIRA: https://jira.springsource.org/browse/INT-2607
2012-06-21 14:30:32 -04:00
Artem Bilan
d1d4faa151 INT-1132: Rescheduling Support for DelayHandler
- Add support for DelayHandler to reschedule persisted Messages on startup via 'implements ApplicationListener<ContextRefreshedEvent>' as late as possible
- Change DelayHandler dependency to MessageGroupStore
- Add required DelayHandler.messageGroupId property
- Make registered by SI-namespace TaskScheduler as default for DelayHandler
- Remove 'required' from delayer xml-attribute 'default-delay' as redundant
- Additional refactoring & polishing around <delayer>
- Polishing delayer's Tests
- Tests for 'rescheduling'
- Integration test for 'rescheduling' with JdbcMS

INT-1132: add 'initializingLatch' to DelayHandler

INT-1132: additional polishing

INT-1132: add LIFO JMS polling test-case

INT-1132: Changes according to PR comments

INT-1132: Changes according to PR comments 2

Polishing

Remove blocking calls from tests.
2012-06-19 10:00:03 -04:00
Matt Stine
77b8beabaa INT-2575 Eliminate unnecessary String replace on JDBC calls
Introduced a simple map-based query cache. Lazily initialized cache on
calls to getQuery().

This still requires a String replace on the first JDBC call for a
particular query, but seemed like a cleaner solution than implementing
a post-construction method that individually process each constant.

INT-2575 Eliminate unnecessary String replace on JDBC calls

Introduced Query enum to enable use of query name as cache key
rather than query value.
2012-06-18 17:31:18 -04:00
Gary Russell
9bc9867d31 INT-1849/INT-2606 Pseudo Transactional Message Src
Initial commit.

Tested with POP3 and IMAP (James) with Sample app.

Essentially moved all the flagging and deleting code
from receive() to closeContextAfterSuccess().

For non-transactional cases, this new method is
called immediately after receiving the message(s),
essentially working as before.

When run from a <transactional/> poller it is
called using TransactionSynchronization after
the transaction commits.

This behavior can be changed by setting
'symchronized="false"' on the poller, which
removes the synchronization and the update
is called immediately after the receive().

Polishing

PR Comments

Update Reference
2012-06-14 16:55:53 -04:00
Artem Bilan
5bc41bc60b INT-1029: Support for outbound-gateways in chain
XSD refactoring: remove use="required" from 'request-channel' attribute of all 'outbound-gateways'
Tests for all 'outbound-gateways' inside the <chain>
2012-06-07 13:20:56 -04:00
Gunnar Hillert
7a5b49275f INT-2271 - Add Dynamic Stored Proc Names (SpEL + Header)
* Add support for Stored Procedure/Function Names via Message Header
* Add support for Stored Procedure/Function Names via "stored-procedure-expression" parameter
* Add support for cacheable *SimpleJdbcCallOperation* instances
* Add Guava dependency for Cache Support
* Convert white-spaces to tabs (where occurring)
* Convert line-delimiters to Linux format (where occurring)

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

INT-2271 - Expose Cache Stats via JMX
This includes the implementation of INT-2584 - Instantiate the StoredProcExecutor as a Spring Managed Bean for each Stored Procedure Component

INT-2271 Made DataSource final in StoredProcExecutor

INT-2271 - Code Review Changes

INT-2271 Code Review Fixes
* remove attribute *allowDynamicStoredProcedureNames*
* remove JDBC Headers

INT-2271 Polishing

Use LiteralExpression when a simple stored procedure
name is supplied.
2012-06-01 15:13:05 -04:00
Oleg Zhurakousky
22536d26bf INT-2544 Fix FIFO problem with JdbcMessageStore
Improved polling from Jdbc - INT-2200
To accomplish all that schema change was required so new schemas are commited as well

INT-2544b polished based on Artem's comments

INT-2544b more polishing based on Artem's comments

INT-2544b more polishing based on Artem's comments

INT-2544
defined doPollForMessage(..) method so it could be overriden with custom query to get a single message from the DB

INT-2544
polishing, removed unused import

INT-2544
polishing, added protected getter for JdbcOperations, polished Javadocs

INT-2544 polishing

INT-2544b polishing
added fallback on update when create MessageGroup query fails, fixed the update date

INT-2544b polishing PR comments

INT-2544b polishing white spaces

INT-2544b polsihing white spaces
2012-05-21 11:09:39 -04:00
Artem Bilan
45c429ee2b INT-2275: any outbound-channel-adapter in <chain>
Add re-init logic for nested chains
Add logic about nested element for AbstractChannelAdapterParser
Refactor of DefaultOutboundChannelAdapterParser
Test for non-last nested chain with some outbound-channel-adapter
Improve XSD for chain-type
Manual outbound-channel-adapter ability for chain
Integration tests for all outbound-channel-adapter within <chain>
Remove redundant 'return-value-required' attribute from <stored-proc-outbound-channel-adapter>
Add support 'expectReply' for FileWritingMessageHandler

INT-2275 polishing & refactor FileOutbound*Parser

HttpRequestExecutingMessageHandlerTests polishing

INT-2275: polishing JavaDoc
2012-05-14 12:41:39 -04:00
Gary Russell
95cd202be6 INT-2536 Create 2.2 Schemas
Add 2.2 versions of module schemas.

JMX is already covered by an existing pull request.

INT-2536 Schema Check

Bump version for schema check in
AbstractIntegrationNamespaceHandler.

INT-2536 Remove Schema Versions

Some test config files had 2.1 versioned schemas.
2012-05-04 10:04:01 -04:00
Gary Russell
292aa90599 INT-2404 Fix Auto-Created Channel; Event, TCP, UDP
The AbstractChannelAdapterParser creates an implicit DirectChannel
if the adapter has no 'channel' attribute.

The Event, TCP, and UDP channel adapter parsers did not bind
this channel to the adapter and AC initialization failed with
'outputChannel is required'.

Further, the event schema marked the channel as being 'required',
precluding this feature.

INT-2407 Remove Channel use="required"

Parsers automatically generate the channel when none is provided.

- JMX
- JDBC
- SFTP
- Redis
- Feed
- XMPP
- Mail
- FTP
- HTTP
2012-01-23 10:12:34 -05:00
Gary Russell
f76f63f23a NT-2400 Fix tool:expected-type Classes
* MessageChannel was moved from core to the base package.
* ChannelResolver moved from core to support.
* TcpConnectionInterceptorFactoryChain was incorrect.
2012-01-13 13:21:41 -05:00
Gunnar Hillert
bd3a93d601 INT-2371 - add package-info.java files - XML
See: https://jira.springsource.org/browse/INT-2371

INT-2370 - add package-info.java files - JDBC
Reference: https://jira.springsource.org/browse/INT-2370

Add package-info.java files - Twitter
For reference: https://jira.springsource.org/browse/INT-2383

INT-2386 - add package-info.java files - XMPP
For reference: https://jira.springsource.org/browse/INT-2386

INT-2384 - add package-info.java files - WS
Reference: https://jira.springsource.org/browse/INT-2384

INT-2382 - add package-info.java files - Test
For reference: https://jira.springsource.org/browse/INT-2382
2012-01-05 16:17:18 -05:00
Oleg Zhurakousky
c825689d60 INT-2338
added MessageHistory tests to all implementations of MessageStore
2011-12-22 21:23:49 -05:00
Mark Fisher
77abc55a1e INT-2322 2011-12-20 13:18:57 -05:00
Oleg Zhurakousky
86c574e493 INT-2311
modified implementation of MessageGroupQueue to use interruptible locks

Basically modeled it after LinkedBlockingQueue

changed to use ReadWriteLock

refactored MessageGroupQueue and added tests

changed MessageGroupQueue to use Condition

added messageGroupSize(groupId) method to MessageGroupStore and all the implementations

polishing based on Gary's comments

removed setStoreLock method in favor of additional constructors

polishing tests, decreased timeouts

made peek() thread safe

added logging
2011-12-19 19:32:23 -05:00
Mark Fisher
5805528faa removing warnings 2011-12-19 16:38:48 -05:00
Gunnar Hillert
3b7bd6e6dd Document use-payload-as-parameter-source attribute
For reference see: https://jira.springsource.org/browse/INT-2314

* Updated 2.1 JDBC XML Schema
* Updated Docbook Reference Manual
2011-12-19 15:48:53 -05:00
Oleg Zhurakousky
634e190f5c INT-2267
removed test compile warnings

INT-2267
removed test compile warnings(2)
2011-11-29 13:50:08 -05:00
Oleg Zhurakousky
d2920c3145 INT-2280
polishing Jdbc tests hoping to avoid intermittent failures
2011-11-29 09:51:03 -05:00
Mark Fisher
6c1454ae3d INT-2238 removing warnings in JavaDoc 2011-11-22 21:48:34 -05:00
Gunnar Hillert
462af6bea0 INT-2246 - Changes based on code review. 2011-11-22 15:40:22 -05:00
Gunnar Hillert
6f33252c7c INT-2246 - Add attribute "max-rows-per-poll" to Jdbc Outbound Gateway
For reference see: https://jira.springsource.org/browse/INT-2246
2011-11-22 15:40:22 -05:00
Oleg Zhurakousky
bd9d591dbf INT-2253
added support for updating MessageGroup with lastModified timestamp on every touch
2011-11-22 04:16:17 -05:00
Oleg Zhurakousky
50d8caa1c3 INT-2231
Fixed JdbcMessageStore to reuse CREATED_DATE while updating UPDATED_DATE

  Added support for configuring MessageGroup timeout based on the idle time of the MessageGroup

  Changed updatedTimestamp to lastModified

  Added an assertion to AbsractMessageGroup.expireMessageGroups to check if lastModified is 0

  Changed attribute name in MessageWrapper in Mongo Message Store
2011-11-21 15:56:04 -05:00
Mark Fisher
87006f36ed polishing 2011-11-21 13:48:27 -05:00
Gunnar Hillert
cd9d9bc656 INT-2245 Jdbc Outbound Gateways - Change "request-timeout" to "reply-timeout"
For reference see: https://jira.springsource.org/browse/INT-2245
2011-11-21 13:46:39 -05:00
Gunnar Hillert
d1c740930c INT-2175 - Add Doc for Stored Proc Components
For reference see: https://jira.springsource.org/browse/INT-2175
2011-11-21 13:43:13 -05:00
Gunnar Hillert
730c0e5174 INT-2241 - Stored Proc: Add attribute: skipUndeclaredResults
For reference see: https://jira.springsource.org/browse/INT-2241
2011-11-17 12:33:33 -05:00
Oleg Zhurakousky
c88206b33e INT-2152 polishing JdbcMessageStore 2011-10-25 12:46:40 -05:00
Oleg Zhurakousky
ddeab16394 INT-2182 interim
INT-2182 interim

INT-2182 work in progress

INT-2182 Refctored MessageGroupQueue and related classes
- created MGS.pollMessageFromGroup(groupId)
- removed MARKED messages concept
- renamed UNMARKED to just Messages
- removed keepReleasedMessages attribute
- refactored JdbcMessageStore to NOT store Messages that belong to a MessageGroup in the MessageGroup table, only relationship
- provided implementation of pollMessageFromGroup method in JdbcMessageStore
- polished tests

INT-2182 refactored MongoDB support to reflect changes to MGQ

INT-2182 added Gemfire support for polling

INT-2182 added Redis support

INT-2182 polishing
removed syncronized blocks from SMG, added availablePermits() method to UpperBound, polished JdbcMessageStore

INT-2182 polishing

INT-2182 polishing

INT-2182 polishing

INT-2182 polishing

INT-2182 polishing

INT-2182 polishing based on PR comments
2011-10-25 12:50:17 -04:00
Mark Fisher
772599cf99 improved jdbc message store test 2011-10-25 11:42:06 -05:00
Oleg Zhurakousky
d76f2dc570 fixed JdbcMessageStoreTests.testAddAndUpdateWithChange() 2011-10-24 12:41:26 -04:00
Mark Fisher
efdce112f8 versionless schemas for jdbc module 2011-10-12 09:51:11 -04:00
Gunnar Hillert
c302f96f6d Fixed some spelling errors 2011-10-12 08:59:48 -04:00
Gunnar Hillert
4508212d40 Code Review Fixes
* AbstractReplyProducingMessageHandler - throw MessageHandlingException instead of MessagingException
* In Parser classes reduce validation logic, where the the Xml Schema already enforces it
* Better null handling in class ProcedureParameter + more unit tests
2011-10-12 08:59:48 -04:00
Gunnar Hillert
a25cb2fcda Refactored the functionality around sqlParameterSourceFactory and usePayloadAsParameterSource 2011-10-12 08:59:48 -04:00
Gunnar Hillert
b018ea84c8 Initial draft of the stored proc. adapters
The following 3 components are provided:

* stored-proc-outbound-channel-adapter
* stored-proc-outbound-gateway
* stored-proc-inbound-channel-adapter
2011-10-12 08:59:48 -04:00
Oleg Zhurakousky
946b9e2b82 INT-2152
parent issue for INT-2134, INT-2135, INT-2142, INT-2155, INT-2158
2011-10-07 12:48:20 -04:00
Oleg Zhurakousky
789c9d6da1 INT-1884 polished test that intermittently break CI
Increased the 'await' time in JdbcMessageStoreChannelIntegrationTests.testTransactionalSendAndReceive(), polished InnerDefinitionHandlerAwareEndpointParserTests.testAggregatorDefinitionSuccess to avoid NPE and increased its receive timeout as well
2011-09-23 11:04:53 -04:00
Mark Fisher
7c5603fe83 INT-2092 update schema imports to use 2.1 version 2011-08-31 05:26:02 -04:00
Oleg Zhurakousky
521a602dad INT-2040 changed signature of MessageStore.getMessageCount() to return long. Changed affected implementations 2011-08-11 13:07:41 -04:00
Oleg Zhurakousky
6ecf0ec1e6 INT-2039 removed references to deprecated Spring classes. Modified code where needed 2011-08-09 00:19:42 -04:00
Oleg Zhurakousky
935cd01d07 INT-1512 changed the type of ID attribute to be xsd:string in all related 2.1 schema files 2011-08-08 23:34:12 -04:00
Mark Fisher
3e71b5a83b INT-2004 added 2.1 versions of all XML schemas and adjusted spring.schemas files accordingly 2011-08-05 11:07:20 -04:00
Oleg Zhurakousky
cd1c4b1c45 INT-1884 bumped the timeout in JdbcMessageStoreChannelIntegrationTests which intermittently fails localy and in CI 2011-07-26 20:35:22 -04:00
Mark Fisher
8cfd7d5a75 removing warnings 2011-07-15 11:50:22 -04:00
Mark Fisher
4866d242be INT-1972 adjusted unit tests for JDBC based on MessageHeader changes 2011-07-12 17:05:31 -04:00
Gary Russell
3cbee4f7e9 INT-1957 Eliminate Spurious NPE from Test Case 2011-07-01 19:36:17 -04:00