forked from spring-projects/spring-integration
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
INT-3041 Add Namespace Support For Retry Advice
JIRA: https://jira.spring.io/browse/INT-3041 Add namespace support to simplify configuration of a `RequestHandlerRetryAdvice. INT-3041 Polishing; PR Comments * Allow a retry-advice element within the request-handler-advice-chain * Clean up schema (should not have allowed `synchronization-factory` on the request-handler-advice-chain. INT-3041 Polishing; PR Comment
- Loading branch information
1 parent
c7265d8
commit 1c9bcac
Showing
26 changed files
with
457 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
...tion-core/src/main/java/org/springframework/integration/config/xml/RetryAdviceParser.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * Copyright 2014 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.springframework.integration.config.xml; | ||
|
|
||
| import org.w3c.dom.Element; | ||
|
|
||
| import org.springframework.beans.factory.support.AbstractBeanDefinition; | ||
| import org.springframework.beans.factory.support.BeanDefinitionBuilder; | ||
| import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser; | ||
| import org.springframework.beans.factory.xml.ParserContext; | ||
| import org.springframework.integration.handler.advice.ErrorMessageSendingRecoverer; | ||
| import org.springframework.integration.handler.advice.RequestHandlerRetryAdvice; | ||
| import org.springframework.retry.backoff.ExponentialBackOffPolicy; | ||
| import org.springframework.retry.backoff.FixedBackOffPolicy; | ||
| import org.springframework.retry.policy.SimpleRetryPolicy; | ||
| import org.springframework.retry.support.RetryTemplate; | ||
| import org.springframework.util.StringUtils; | ||
| import org.springframework.util.xml.DomUtils; | ||
|
|
||
| /** | ||
| * @author Gary Russell | ||
| * @since 4.0 | ||
| * | ||
| */ | ||
| public class RetryAdviceParser extends AbstractBeanDefinitionParser { | ||
|
|
||
| @Override | ||
| protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) { | ||
| BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(RequestHandlerRetryAdvice.class); | ||
| BeanDefinitionBuilder retryTemplateBuilder = BeanDefinitionBuilder.genericBeanDefinition(RetryTemplate.class); | ||
| boolean customTemplate = false; | ||
| Element backOffPolicyEle = DomUtils.getChildElementByTagName(element, "fixed-back-off"); | ||
| BeanDefinitionBuilder backOffBuilder = null; | ||
| if (backOffPolicyEle != null) { | ||
| backOffBuilder = BeanDefinitionBuilder.genericBeanDefinition(FixedBackOffPolicy.class); | ||
| IntegrationNamespaceUtils.setValueIfAttributeDefined(backOffBuilder, backOffPolicyEle, "interval", "backOffPeriod"); | ||
| } | ||
| else { | ||
| backOffPolicyEle = DomUtils.getChildElementByTagName(element, "exponential-back-off"); | ||
| if (backOffPolicyEle != null) { | ||
| backOffBuilder = BeanDefinitionBuilder.genericBeanDefinition(ExponentialBackOffPolicy.class); | ||
| IntegrationNamespaceUtils.setValueIfAttributeDefined(backOffBuilder, backOffPolicyEle, "initial", "initialInterval"); | ||
| IntegrationNamespaceUtils.setValueIfAttributeDefined(backOffBuilder, backOffPolicyEle, "multiplier"); | ||
| IntegrationNamespaceUtils.setValueIfAttributeDefined(backOffBuilder, backOffPolicyEle, "maximum", "maxInterval"); | ||
| } | ||
| } | ||
| if (backOffBuilder != null) { | ||
| retryTemplateBuilder.addPropertyValue("backOffPolicy", backOffBuilder.getBeanDefinition()); | ||
| customTemplate = true; | ||
| } | ||
| String maxAttemptsAttr = element.getAttribute("max-attempts"); | ||
| if (StringUtils.hasText(maxAttemptsAttr)) { | ||
| BeanDefinitionBuilder retryPolicyBuilder = BeanDefinitionBuilder.genericBeanDefinition(SimpleRetryPolicy.class); | ||
| IntegrationNamespaceUtils.setValueIfAttributeDefined(retryPolicyBuilder, element, "max-attempts"); | ||
| retryTemplateBuilder.addPropertyValue("retryPolicy", retryPolicyBuilder.getBeanDefinition()); | ||
| customTemplate = true; | ||
| } | ||
| if (customTemplate) { | ||
| builder.addPropertyValue("retryTemplate", retryTemplateBuilder.getBeanDefinition()); | ||
| } | ||
| String recoveryChannelAttr = element.getAttribute("recovery-channel"); | ||
| if (StringUtils.hasText(recoveryChannelAttr)) { | ||
| BeanDefinitionBuilder emsrBuilder = BeanDefinitionBuilder.genericBeanDefinition(ErrorMessageSendingRecoverer.class); | ||
| emsrBuilder.addConstructorArgReference(recoveryChannelAttr); | ||
| IntegrationNamespaceUtils.setValueIfAttributeDefined(emsrBuilder, element, "send-timeout"); | ||
| builder.addPropertyValue("recoveryCallback", emsrBuilder.getBeanDefinition()); | ||
| } | ||
| return builder.getBeanDefinition(); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
...c/test/java/org/springframework/integration/config/xml/RetryAdviceParserTests-context.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <beans xmlns="http://www.springframework.org/schema/beans" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xmlns:int="http://www.springframework.org/schema/integration" | ||
| xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd | ||
| http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd"> | ||
|
|
||
| <int:handler-retry-advice id="a1" /> | ||
|
|
||
| <int:handler-retry-advice id="a2" max-attempts="4" /> | ||
|
|
||
| <int:handler-retry-advice id="a3" max-attempts="5"> | ||
| <int:fixed-back-off /> | ||
| </int:handler-retry-advice> | ||
|
|
||
| <int:handler-retry-advice id="a4" max-attempts="6"> | ||
| <int:fixed-back-off interval="1234" /> | ||
| </int:handler-retry-advice> | ||
|
|
||
| <int:handler-retry-advice id="a5" max-attempts="7"> | ||
| <int:exponential-back-off /> | ||
| </int:handler-retry-advice> | ||
|
|
||
| <int:handler-retry-advice id="a6" max-attempts="8"> | ||
| <int:exponential-back-off initial="1000" multiplier="3.0" maximum="10000" /> | ||
| </int:handler-retry-advice> | ||
|
|
||
| <int:handler-retry-advice id="a7" recovery-channel="foo" send-timeout="4567" /> | ||
|
|
||
| <int:channel id="foo" /> | ||
|
|
||
| <int:service-activator id="sa1" input-channel="foo" expression="'foo'"> | ||
| <int:request-handler-advice-chain> | ||
| <ref bean="a1"/> | ||
| </int:request-handler-advice-chain> | ||
| </int:service-activator> | ||
|
|
||
| <int:service-activator id="sa2" input-channel="foo" expression="'foo'"> | ||
| <int:request-handler-advice-chain> | ||
| <int:retry-advice max-attempts="9" /> | ||
| </int:request-handler-advice-chain> | ||
| </int:service-activator> | ||
|
|
||
| </beans> |
Oops, something went wrong.