Commit Graph

1154 Commits

Author SHA1 Message Date
Oleg Zhurakousky
aec1467b6b INT-2434 lower-cased ChannelInitializer bean name 2012-04-04 14:27:58 -04:00
Oleg Zhurakousky
458eac43da INT-2434 Fix How input-channels are auto-created
Channel creation logic for channels that are not explicitly defined but identified via an 'input-channel' attribute on the corresponding endpoint is now done by ChannelInitializer - an InitializingBean implementation.

This bean plays a role of pre-instantiator since it is instantiated and initialized as the very first bean of all SI beans using AbstractIntegrationNamespaceHandler

INT-2434-v3 polishing

INT-2434-v3 polishing, changed ChannelCreatingFactoryBean from BeanFactoryPostProcessor to BeanFactoryAware

INT-2434 polishing

fix the test

changed the default name of the CHANNEL_CREATOR_BEAN_NAME to a simple name

added additional test

changed ChannelCreatingFactoryBean from FactoryBean to InitializingBean and renamed it to ChannelInitializer

INT-2434 added test validating how automatic channel creation can be disabled

INT-2434 polished based on the latest PR comments

INT-2434-v3 polishing based on comments and discussions with @markfisher and @garyrussell. Added support for disabling aut-creatioin of channels

INT-2434-v3 polished based on @garyrussell last comments

INT-2434-v3 final polishing
2012-03-30 14:40:22 -04:00
Mark Fisher
a77e5dac5a Combined commit from Gary and Mark for INT-2451
Added bean resolver to ContentEnricher
INT-2451 Polishing - PR Review Comments

Disallow bean resolution in the name expression for content enricher
properties - the name expressions can only resolve to payload
properties. Value expressions can resolve to beans and bean properties.
2012-03-29 18:32:30 -04:00
Oleg Zhurakousky
5952934171 INT-2502-patch Tighten Mask Validation
Polishing and add tests.
2012-03-29 11:19:17 -04:00
Oleg Zhurakousky
4375cd9c8c INT-2502, INT-1117 Improve Group Locking
Add initial support for Global lock registry. Fix race condition described in INT-2502.

INT-2502 addressed PR comments by @garyrussell

INT-2502 polishing
2012-03-28 18:44:24 -04:00
Oleg Zhurakousky
fc31317aa4 INT-2396 Fix 'expression' Attribute Parsing
Ensure that 'expression*' attributes are parsed
by the AggregatorParser when 'ref' is used to
define the actual aggregator

INT-2396 polishing based on PR comments

INT-2396 changed parser error to warning
message as suggested by Mark.
Raised follow up JIRA for 2.2 to fix it back to error
2012-03-27 15:23:17 -04:00
Oleg Zhurakousky
5fd15d11e0 INT-2478a polished the test that broke the build 2012-03-27 14:13:58 -04:00
Oleg Zhurakousky
aeb7df2ad5 INT-2478 SimpleMessageStore and Sequence* Headers
Fix AbstractCorrelatingMessageHandler to ignore
Message Sequence information IF a custom release strategy is provided.

INT-2478 polishing based on PR comments.

Rename Test case.
2012-03-27 11:41:36 -04:00
Gary Russell
b6b4e25efc INT-2449 Fix PubSub Subscriber Accounting
PubSub channel subscriber accounting was incorrect; the counter
was not decremented when unsubscribing.

The handler count, reflecting the current number of subscriptions,
was maintained in the AbstractSubscribableChannel. The count really
belongs in the dispatcher and calls should be delegated to it, particularly
for a custom ASC, which might have a custom AbstractDispatcher.

However, it is possible (although perhaps rare) that someone
could implement a custom channel with a custom dispatcher that
is *not* a subclass of AbstractDispatcher.

Therefore, we now delegate to the dispatcher if we can, and
revert to a counter in the channel if we can't.

Also, the asymmetric accounting in this case is resolved; the
counter is decremented when a subscriber unsubscribes.

Polishing - factor out common code.
2012-03-24 17:32:32 -04:00
Gary Russell
f75dc53ab0 INT-2431 Improve 'Dispatcher Has No Subscribers'
Add channel name to MessageDeliveryException

'Dispatcher has no subscribers'.

In a large integration flow, it can be difficult to track
down which subscribable channel has no subscribers.

This commit adds to the message text in the form

    for channel someChannelName

to the exception message. For example:

    "Dispatcher has no subscribers for channel myChannel."

Also

    for amqp-channel someAmqpChannelName
    for jms-channel someJMSChannelName
    for redis-channel someJMSChannelName

INT-2431 Polishing

Make component type and name immutable once set to avoid
channels further down the stack frame claiming ownership.

INT-2431 Polishing

* PR Comments - use a new Exception type
* Add support for Redis
* Add WARN logs for AMQP/JMS pub-sub channels

INT-2431 Polishing

PR Comments: tighten up isPubSub field in AMQP-backed channel.

INT-2431 Polishing

Ensure channel name is not 'null' or empty string.
2012-03-23 09:50:01 -04:00
Artem Bilan
6c7f7c3eb0 INT-2439 PollerParser adviceChain.add(customBean)
Fix PollerParser#configureAdviceChain for adding 'customBeanDefinition' into 'adviceChain' List.
PollerParserTests: adding <tx:advice> as customElement into poller's <advice-chain>.

Commit is mostly parser tidy-up. The crux of the fix is to add the
missing call to adviceChain.add().
2012-03-13 11:22:54 -04:00
Oleg Zhurakousky
76f6c0877e INT-2412
removed priority enumeration from the 2.0 and 2.1 schema

fixed documentation, added tests
2012-02-13 12:02:02 -05:00
Artem Bilan
920e2f2f50 INT-2405 fix MessageProcessor for <header-value>
1. MethodInvokingHeaderValueMessageProcessor => MessageProcessingHeaderValueMessageProcessor because now he uses MessageProcessor
2. polishing HeaderEnricherParserSupport
3. GroovyHeaderEnricherTests: add check to HeaderValueMessageProcessor for Groovy scripts.
4. build.gradle: add dependency to 'spring-integration-test' for 'spring-integration-groovy'.
2012-02-06 10:17:53 -05:00
Artem Bilan
51da77d14d INT-2399 fix processMessage for service-activator
ServiceActivatorFactoryBean#createMessageProcessingHandler: force 'processMessage' method-name parameter into constructor ServiceActivatingHandler for MessageProcessor
Test for check 'handlerMethods' in ServiceActivatingHandler's MethodInvokingMessageProcessor
Integration test for <service-activator> with invalid Groovy inline script
2012-02-06 09:59:46 -05:00
Gunnar Hillert
a6f400152e INT-2423 Remove 'KEEP_RELEASED_MESSAGES' Constant
Removed 'KEEP_RELEASED_MESSAGES' constant from AbstractCorrelatingMessageHandlerParser
2012-01-31 10:11:26 -05:00
Gunnar Hillert
4b564535d2 INT-2423 remove 'keep-released-messages' attribute
For reference see: https://jira.springsource.org/browse/INT-2423
2012-01-30 23:54:07 -05:00
Gary Russell
3518f3cb4e INT-2409 Fix STS 'Missing Bean' Warnings
Some generated bean names (e.g. LoggingHandler) cause
warnings in STS:

(Warning "Referenced bean
'org.springframework.integration.handler.LoggingHandler#0' not found")

Fix is to register these beans as components so an event is fired.
2012-01-30 10:15:10 -05:00
Artem Bilan
7efff7ef7a INT-2180: fix Delayer's scheduler docs
spring-integration-2.1.xsd: Delayer's scheduler 'documentation' & tool's expected-type.
Reference Manual: Delayer's introduction: fix scheduler's <interfacename>.
2012-01-23 10:42:47 -05:00
Gary Russell
b899595e01 INT-2413 <int-jmx:mbean-export/> And <control-bus>
When an AbstractMappingMessageRouter is included in an
ApplicationContext that also has an <int-jmx:mbean-exporter/>,
the @ManagedOperations (set and remove mapping) are no longer
visible to the <control-bus/>.

Adds these methods to a new interface MappingMessageRouterManagement,
thus making them available on the proxy that the MBean exporter
creates.
2012-01-23 10:34:58 -05:00
Gary Russell
46c9c807a2 INT-2411 default-output-channel Ignored on RLR
https://jira.springsource.org/browse/INT-2411

Namespace problem only; the default-output-channel was
not bound to the RecipientListRouter.

Workaround is to declare the router using <bean/> syntax.
2012-01-23 10:30:48 -05:00
Gary Russell
4872876e4f INT-2400 More expected-type Fixes
CollectionFilter in core; package changes in security.
2012-01-13 13:40:40 -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
Gary Russell
b59ee8e352 INT-2369 package-info IP
INT-2360 package-info Core

INT-2361 package-info AMQP

INT-2362 package-info Event

INT-2363 package-info Feed

INT-2364 package-info File

INT-2365 INT-2380 package-info (S)FTP

INT-2366 package-info GemFire

INT-2367 package-info Groovy

INT-2368 package-info Http

INT-2378 package-info Scripting

INT-2372 package-info JMS
2012-01-05 14:42:24 -05:00
Gary Russell
5750ca5ff5 INT-2347 Update Channel Mappings Atomically
Ensure consistent state if channel map is replaced
dynamically.
2012-01-03 11:44:13 -05:00
Mark Fisher
f3155f86fa corrected reversed test method names 2012-01-03 11:30:45 -05:00
Gary Russell
85ea4f6411 INT-2342 Add Test Cases 2012-01-03 11:19:52 -05:00
Mark Fisher
ffe132986b INT-2342 2012-01-03 11:17:47 -05:00
Oleg Zhurakousky
06bc10e960 INT-2331 fixed aggregator documentation
INT-2331 polishing
2011-12-22 09:09:57 -05:00
Mark Fisher
5fae7d2a1f fixed RouterFactoryBean 2011-12-20 17:41:21 -05:00
Oleg Zhurakousky
dd66c98f61 INT-2319
changed logic behind default group id for QueueChannel to be messageStoreId:channelId

added support for resolving value if it is a placeholder
2011-12-20 14:10:40 -05:00
Oleg Zhurakousky
50e1fddaf5 INT-2321
Handlers within a chain are no longer registered as beans in the context.
2011-12-20 13:58:07 -05:00
Mark Fisher
77abc55a1e INT-2322 2011-12-20 13:18:57 -05:00
Oleg Zhurakousky
a44d150009 INT-2323
made changes based on Sonar suggestions

added optional rome dependency to HTTP module
2011-12-20 12:12:20 -05:00
Artem Bilan
d7851fef5a INT-2316: xsd improve for reply- & error-channels
Now <header-enricher> <reply-channel> & <error-channel> are 'referenceOrValueHeaderType'.
Added tests for 'value' & 'expression' attributes on <reply-channel> element.
2011-12-20 11:13:19 -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
84b94ec5da removed @ManagedResource from AMMR 2011-12-19 16:59:32 -05:00
Mark Fisher
84d590aeae removed suppress deprecation 2011-12-19 16:57:05 -05:00
Mark Fisher
af1d0859d1 un-deprecated setChannelResolver() method
the XSD attribute IS deprecated, but this method is needed internally
2011-12-19 16:29:12 -05:00
Artem Bilan
83700f73f4 INT-2315 headerValueRouter chain mapping minOcc=0
now <header-value-router> doesn't require mapping when it is defined inside <chain>.
Tests for <header-value-router> inside <chain>.
2011-12-19 15:41:01 -05:00
Mark Fisher
6e6e972e35 INT-2291 no longer counting down in failing handler or unexpected handler 2011-12-19 12:08:49 -05:00
Oleg Zhurakousky
8869da7a95 INT-2291
polished MixedDispatcherConfigurationScenarioTests.failoverNoLoadBalancingWithExecutorConcurrent() test even more, introduced 'taskSubmissionMonitor' as CountDownLatch to ensure that shutdown command is not called untill all tasks are submitted. Also made sure that ExecutorChannel is using the same tasks executor so shutdown command actually shuts down the same executor.
2011-12-19 09:22:47 -05:00
Oleg Zhurakousky
22cbe9e0dd INT-2291 polished broken test 2011-12-19 08:58:59 -05:00
Mark Fisher
e5ec1d48b2 INT-2291 temporarily ignoring test 2011-12-16 10:14:05 -05:00
Oleg Zhurakousky
390bf504dd INT-2306 fixed populateUserDefinedHeaders() to account for standard heades 2011-12-15 17:28:54 -05:00
Mark Fisher
2928830868 moved ChannelResolver setter call to configureRouter() method 2011-12-15 17:14:55 -05:00
Oleg Zhurakousky
e2f73ba6be INT-2299 polishing 2011-12-15 17:09:52 -05:00
Oleg Zhurakousky
0a8b348c98 INT-2299
put back 'channel-resolver' attribute with deprecation warnings

INT-2299 polishing

INT-2299 added XPATH test
2011-12-15 17:09:52 -05:00
Oleg Zhurakousky
8587ace344 INT-2295 fixed parser logic to eliminate STS warning
INT-2295 removed dead code
Object source = parserContext.extractSource(element); always returned NULL
2011-12-15 16:10:22 -05:00
Oleg Zhurakousky
18bb156ead INT-2291 polished test 2011-12-15 15:40:05 -05:00
Artem Bilan
8a1614cb00 INT-2288: done ResourceInboundChannelAdapterParserTests independents of OS & @After for remove files in tests 2011-12-14 11:37:39 -05:00