From e8ef5ab878b40c03e75210a4f7b28e5705a375ad Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Sun, 11 Aug 2013 17:44:24 -0400 Subject: [PATCH] INT-3095 Remove DOS Newlines --- ...stractSimpleMessageHandlerFactoryBean.java | 300 +++++++++--------- 1 file changed, 150 insertions(+), 150 deletions(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractSimpleMessageHandlerFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractSimpleMessageHandlerFactoryBean.java index a5e8370938..451ded1a94 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractSimpleMessageHandlerFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractSimpleMessageHandlerFactoryBean.java @@ -1,150 +1,150 @@ -/* - * Copyright 2002-2013 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; - -import java.util.List; - -import org.aopalliance.aop.Advice; - -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.BeanFactory; -import org.springframework.beans.factory.BeanFactoryAware; -import org.springframework.beans.factory.BeanInitializationException; -import org.springframework.beans.factory.FactoryBean; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.context.IntegrationObjectSupport; -import org.springframework.integration.context.Orderable; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.MessageProducer; -import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; -import org.springframework.util.Assert; -import org.springframework.util.CollectionUtils; - -/** - * @author Dave Syer - * @author Oleg Zhurakousky - * @author Gary Russell - * @author Artem Bilan - */ -public abstract class AbstractSimpleMessageHandlerFactoryBean - implements FactoryBean, BeanFactoryAware { - - private volatile H handler; - - private volatile MessageChannel outputChannel; - - private volatile Integer order; - - private BeanFactory beanFactory; - - private volatile boolean initialized; - - private final Object initializationMonitor = new Object(); - - private volatile List adviceChain; - - private volatile String componentName; - - public AbstractSimpleMessageHandlerFactoryBean() { - super(); - } - - public void setOutputChannel(MessageChannel outputChannel) { - this.outputChannel = outputChannel; - } - - public void setOrder(Integer order) { - this.order = order; - } - - public void setBeanFactory(BeanFactory beanFactory) throws BeansException { - this.beanFactory = beanFactory; - } - - protected BeanFactory getBeanFactory() { - return this.beanFactory; - } - - public void setAdviceChain(List adviceChain) { - this.adviceChain = adviceChain; - } - - /** - * Sets the name of the handler component. - * - * @param componentName - */ - public void setComponentName(String componentName) { - this.componentName = componentName; - } - - public H getObject() throws Exception { - if (this.handler == null) { - this.handler = this.createHandlerInternal(); - Assert.notNull(this.handler, "failed to create MessageHandler"); - } - return this.handler; - } - - protected final H createHandlerInternal() { - synchronized (this.initializationMonitor) { - if (this.initialized) { - // There was a problem when this method was called already - return null; - } - handler = createHandler(); - if (handler instanceof BeanFactoryAware) { - ((BeanFactoryAware) handler).setBeanFactory(getBeanFactory()); - } - if (this.handler instanceof MessageProducer && this.outputChannel != null) { - ((MessageProducer) this.handler).setOutputChannel(this.outputChannel); - } - if (this.handler instanceof IntegrationObjectSupport && this.componentName != null) { - ((IntegrationObjectSupport) this.handler).setComponentName(this.componentName); - } - if (!CollectionUtils.isEmpty(this.adviceChain) && - this.handler instanceof AbstractReplyProducingMessageHandler) { - ((AbstractReplyProducingMessageHandler) this.handler).setAdviceChain(this.adviceChain); - } - if (this.handler instanceof Orderable && this.order != null) { - ((Orderable) this.handler).setOrder(this.order); - } - this.initialized = true; - } - if (handler instanceof InitializingBean) { - try { - ((InitializingBean) handler).afterPropertiesSet(); - } - catch (Exception e) { - throw new BeanInitializationException("failed to initialize MessageHandler", e); - } - } - return handler; - } - - protected abstract H createHandler(); - - public Class getObjectType() { - if (this.handler != null) { - return this.handler.getClass(); - } - return MessageHandler.class; - } - - public boolean isSingleton() { - return true; - } - -} +/* + * Copyright 2002-2013 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; + +import java.util.List; + +import org.aopalliance.aop.Advice; + +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.BeanFactory; +import org.springframework.beans.factory.BeanFactoryAware; +import org.springframework.beans.factory.BeanInitializationException; +import org.springframework.beans.factory.FactoryBean; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.integration.MessageChannel; +import org.springframework.integration.context.IntegrationObjectSupport; +import org.springframework.integration.context.Orderable; +import org.springframework.integration.core.MessageHandler; +import org.springframework.integration.core.MessageProducer; +import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; +import org.springframework.util.Assert; +import org.springframework.util.CollectionUtils; + +/** + * @author Dave Syer + * @author Oleg Zhurakousky + * @author Gary Russell + * @author Artem Bilan + */ +public abstract class AbstractSimpleMessageHandlerFactoryBean + implements FactoryBean, BeanFactoryAware { + + private volatile H handler; + + private volatile MessageChannel outputChannel; + + private volatile Integer order; + + private BeanFactory beanFactory; + + private volatile boolean initialized; + + private final Object initializationMonitor = new Object(); + + private volatile List adviceChain; + + private volatile String componentName; + + public AbstractSimpleMessageHandlerFactoryBean() { + super(); + } + + public void setOutputChannel(MessageChannel outputChannel) { + this.outputChannel = outputChannel; + } + + public void setOrder(Integer order) { + this.order = order; + } + + public void setBeanFactory(BeanFactory beanFactory) throws BeansException { + this.beanFactory = beanFactory; + } + + protected BeanFactory getBeanFactory() { + return this.beanFactory; + } + + public void setAdviceChain(List adviceChain) { + this.adviceChain = adviceChain; + } + + /** + * Sets the name of the handler component. + * + * @param componentName + */ + public void setComponentName(String componentName) { + this.componentName = componentName; + } + + public H getObject() throws Exception { + if (this.handler == null) { + this.handler = this.createHandlerInternal(); + Assert.notNull(this.handler, "failed to create MessageHandler"); + } + return this.handler; + } + + protected final H createHandlerInternal() { + synchronized (this.initializationMonitor) { + if (this.initialized) { + // There was a problem when this method was called already + return null; + } + handler = createHandler(); + if (handler instanceof BeanFactoryAware) { + ((BeanFactoryAware) handler).setBeanFactory(getBeanFactory()); + } + if (this.handler instanceof MessageProducer && this.outputChannel != null) { + ((MessageProducer) this.handler).setOutputChannel(this.outputChannel); + } + if (this.handler instanceof IntegrationObjectSupport && this.componentName != null) { + ((IntegrationObjectSupport) this.handler).setComponentName(this.componentName); + } + if (!CollectionUtils.isEmpty(this.adviceChain) && + this.handler instanceof AbstractReplyProducingMessageHandler) { + ((AbstractReplyProducingMessageHandler) this.handler).setAdviceChain(this.adviceChain); + } + if (this.handler instanceof Orderable && this.order != null) { + ((Orderable) this.handler).setOrder(this.order); + } + this.initialized = true; + } + if (handler instanceof InitializingBean) { + try { + ((InitializingBean) handler).afterPropertiesSet(); + } + catch (Exception e) { + throw new BeanInitializationException("failed to initialize MessageHandler", e); + } + } + return handler; + } + + protected abstract H createHandler(); + + public Class getObjectType() { + if (this.handler != null) { + return this.handler.getClass(); + } + return MessageHandler.class; + } + + public boolean isSingleton() { + return true; + } + +}