From 012953f418a33e80f4b378d341a86fd12562b8f4 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Tue, 8 Jan 2008 03:32:10 +0000 Subject: [PATCH] Set 'shouldGenerateIdAsFallback' to true for all adapter parsers. --- .../adapter/file/config/FileSourceAdapterParser.java | 4 ++++ .../adapter/file/config/FileTargetAdapterParser.java | 4 ++++ .../adapter/jms/config/JmsSourceAdapterParser.java | 4 ++++ .../adapter/jms/config/JmsTargetAdapterParser.java | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/adapter/file/config/FileSourceAdapterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/adapter/file/config/FileSourceAdapterParser.java index 01f66a0cec..262f679eed 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/adapter/file/config/FileSourceAdapterParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/adapter/file/config/FileSourceAdapterParser.java @@ -37,6 +37,10 @@ public class FileSourceAdapterParser extends AbstractSingleBeanDefinitionParser return false; } + protected boolean shouldGenerateIdAsFallback() { + return true; + } + protected void doParse(Element element, BeanDefinitionBuilder builder) { String directory = element.getAttribute("directory"); String channel = element.getAttribute("channel"); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/adapter/file/config/FileTargetAdapterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/adapter/file/config/FileTargetAdapterParser.java index 288b2973c2..559ec798d9 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/adapter/file/config/FileTargetAdapterParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/adapter/file/config/FileTargetAdapterParser.java @@ -37,6 +37,10 @@ public class FileTargetAdapterParser extends AbstractSingleBeanDefinitionParser return false; } + protected boolean shouldGenerateIdAsFallback() { + return true; + } + protected void doParse(Element element, BeanDefinitionBuilder builder) { String directory = element.getAttribute("directory"); String channel = element.getAttribute("channel"); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/adapter/jms/config/JmsSourceAdapterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/adapter/jms/config/JmsSourceAdapterParser.java index 27011411db..9cfb286b35 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/adapter/jms/config/JmsSourceAdapterParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/adapter/jms/config/JmsSourceAdapterParser.java @@ -66,6 +66,10 @@ public class JmsSourceAdapterParser extends AbstractSingleBeanDefinitionParser { return false; } + protected boolean shouldGenerateIdAsFallback() { + return true; + } + protected void doParse(Element element, BeanDefinitionBuilder builder) { if (builder.getBeanDefinition().getBeanClass().equals(JmsPollingSourceAdapter.class)) { parsePollingSourceAdapter(element, builder); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/adapter/jms/config/JmsTargetAdapterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/adapter/jms/config/JmsTargetAdapterParser.java index ed20426eff..6bfb810afc 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/adapter/jms/config/JmsTargetAdapterParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/adapter/jms/config/JmsTargetAdapterParser.java @@ -56,6 +56,10 @@ public class JmsTargetAdapterParser extends AbstractSingleBeanDefinitionParser { return false; } + protected boolean shouldGenerateIdAsFallback() { + return true; + } + protected void doParse(Element element, BeanDefinitionBuilder builder) { String jmsTemplate = element.getAttribute(JMS_TEMPLATE_ATTRIBUTE); String connectionFactory = element.getAttribute(CONNECTION_FACTORY_ATTRIBUTE);