INT-1129 moved Message and MessageHeaders from 'core' to the root (org.springframework.integration)

This commit is contained in:
Mark Fisher
2010-07-28 15:05:50 +00:00
parent 7434976734
commit 4de9a23357
510 changed files with 608 additions and 585 deletions

View File

@@ -14,7 +14,8 @@
* limitations under the License.
*/
package org.springframework.integration.core;
package org.springframework.integration;
/**
* The central interface that any Message type must implement.

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.integration.core;
package org.springframework.integration;
import java.io.IOException;
import java.io.ObjectInputStream;

View File

@@ -20,10 +20,10 @@ import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.MessageHeaders;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageHeaders;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.integration.store.MessageGroup;
import org.springframework.util.Assert;

View File

@@ -18,7 +18,7 @@ import java.util.concurrent.ConcurrentMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.handler.AbstractMessageHandler;
import org.springframework.integration.message.MessageSource;
import org.springframework.integration.store.MessageGroup;

View File

@@ -19,11 +19,11 @@ import java.util.concurrent.ConcurrentMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.Message;
import org.springframework.integration.MessageHeaders;
import org.springframework.integration.channel.NullChannel;
import org.springframework.integration.core.ChannelResolver;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageHeaders;
import org.springframework.integration.core.MessageProducer;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.integration.handler.AbstractMessageHandler;

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.aggregator;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
/**
* Strategy for determining how messages shall be correlated. Implementations

View File

@@ -18,7 +18,7 @@ package org.springframework.integration.aggregator;
import java.lang.reflect.Method;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.handler.MethodInvokingMessageProcessor;
import org.springframework.util.Assert;

View File

@@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.store.MessageGroup;
import org.springframework.util.Assert;

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.aggregator;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
/**
* Default implementation of {@link CorrelationStrategy}. Uses a header

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.aggregator;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessagingException;
import org.springframework.integration.util.DefaultMethodInvoker;
import org.springframework.util.Assert;

View File

@@ -18,7 +18,7 @@ package org.springframework.integration.aggregator;
import java.util.Comparator;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
/**
* A {@link Comparator} implementation based on the 'sequence number'

View File

@@ -26,9 +26,9 @@ import java.util.concurrent.atomic.AtomicReference;
import org.springframework.aop.support.AopUtils;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.integration.Message;
import org.springframework.integration.annotation.Aggregator;
import org.springframework.integration.annotation.Header;
import org.springframework.integration.core.Message;
import org.springframework.integration.store.MessageGroup;
import org.springframework.util.Assert;
import org.springframework.util.ReflectionUtils;

View File

@@ -13,7 +13,7 @@
package org.springframework.integration.aggregator;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.integration.store.MessageGroup;

View File

@@ -19,7 +19,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.integration.store.MessageGroup;

View File

@@ -1,48 +1,48 @@
/*
* Copyright 2002-2010 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.aggregator;
import java.util.Comparator;
import org.springframework.integration.core.Message;
/**
* @author Dave Syer
*
* @since 2.0
*
*/
public class SequenceNumberComparator implements Comparator<Message<?>> {
/**
* If both messages have a sequence number then compare that, otherwise if one has a sequence number and the other
* doesn't then the numbered message comes first, or finally of neither has a sequence number then they are equal in
* rank.
*/
public int compare(Message<?> o1, Message<?> o2) {
Integer sequenceNumber1 = o1.getHeaders().getSequenceNumber();
Integer sequenceNumber2 = o2.getHeaders().getSequenceNumber();
if (sequenceNumber1 == sequenceNumber2) {
return 0;
}
if (sequenceNumber1 == null) {
return -sequenceNumber2;
}
if (sequenceNumber2 == null) {
return sequenceNumber1;
}
return sequenceNumber1.compareTo(sequenceNumber2);
}
/*
* Copyright 2002-2010 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.aggregator;
import java.util.Comparator;
import org.springframework.integration.Message;
/**
* @author Dave Syer
*
* @since 2.0
*
*/
public class SequenceNumberComparator implements Comparator<Message<?>> {
/**
* If both messages have a sequence number then compare that, otherwise if one has a sequence number and the other
* doesn't then the numbered message comes first, or finally of neither has a sequence number then they are equal in
* rank.
*/
public int compare(Message<?> o1, Message<?> o2) {
Integer sequenceNumber1 = o1.getHeaders().getSequenceNumber();
Integer sequenceNumber2 = o2.getHeaders().getSequenceNumber();
if (sequenceNumber1 == sequenceNumber2) {
return 0;
}
if (sequenceNumber1 == null) {
return -sequenceNumber2;
}
if (sequenceNumber2 == null) {
return sequenceNumber1;
}
return sequenceNumber1.compareTo(sequenceNumber2);
}
}

View File

@@ -21,7 +21,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.store.MessageGroup;
/**

View File

@@ -13,7 +13,7 @@
package org.springframework.integration.aggregator;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.store.MessageGroup;
/**

View File

@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
* Indicates that a method is capable of playing the role of a Message Filter.
* <p>
* A method annotated with @Filter may accept a parameter of type
* {@link org.springframework.integration.core.Message} or of the expected
* {@link org.springframework.integration.Message} or of the expected
* Message payload's type. Any type conversion supported by default or any
* Converters registered with the "integrationConversionService" bean will be
* applied to the Message payload if necessary. Header values can also be passed

View File

@@ -30,7 +30,7 @@ import java.lang.annotation.Target;
* where the annotation attributes can override the default channel settings.
*
* <p>A method annotated with @Gateway may accept a single non-annotated
* parameter of type {@link org.springframework.integration.core.Message}
* parameter of type {@link org.springframework.integration.Message}
* or of the intended Message payload type. Method parameters may be mapped
* to individual Message header values by using the {@link Header @Header}
* parameter annotation. Alternatively, to pass the entire Message headers

View File

@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
* based on a message, message header(s), or both.
* <p>
* A method annotated with @Router may accept a parameter of type
* {@link org.springframework.integration.core.Message} or of the expected
* {@link org.springframework.integration.Message} or of the expected
* Message payload's type. Any type conversion supported by
* {@link org.springframework.beans.SimpleTypeConverter} will be applied to
* the Message payload if necessary. Header values can also be passed as

View File

@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
* Indicates that a method is capable of handling a message or message payload.
* <p>
* A method annotated with @ServiceActivator may accept a parameter of type
* {@link org.springframework.integration.core.Message} or of the expected
* {@link org.springframework.integration.Message} or of the expected
* Message payload's type. Any type conversion supported by
* {@link org.springframework.beans.SimpleTypeConverter} will be applied to
* the Message payload if necessary. Header values can also be passed as

View File

@@ -27,7 +27,7 @@ import java.lang.annotation.Target;
* payload to produce multiple messages or payloads.
* <p>
* A method annotated with @Splitter may accept a parameter of type
* {@link org.springframework.integration.core.Message} or of the expected
* {@link org.springframework.integration.Message} or of the expected
* Message payload's type. Any type conversion supported by
* {@link org.springframework.beans.SimpleTypeConverter} will be applied to
* the Message payload if necessary. Header values can also be passed as

View File

@@ -32,8 +32,8 @@ import org.springframework.expression.ParseException;
import org.springframework.expression.spel.SpelParserConfiguration;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.StandardEvaluationContext;
import org.springframework.integration.Message;
import org.springframework.integration.core.ChannelResolver;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessagingTemplate;

View File

@@ -25,8 +25,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.core.OrderComparator;
import org.springframework.core.convert.ConversionService;
import org.springframework.integration.Message;
import org.springframework.integration.context.IntegrationObjectSupport;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageDeliveryException;

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.channel;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.PollableChannel;
/**

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.channel;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.core.SubscribableChannel;

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.channel;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageChannel;
/**

View File

@@ -19,7 +19,7 @@ package org.springframework.integration.channel;
import java.util.ArrayList;
import java.util.List;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageSelector;
import org.springframework.util.Assert;

View File

@@ -20,11 +20,11 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.integration.Message;
import org.springframework.integration.context.BeanFactoryChannelResolver;
import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.core.ChannelResolver;
import org.springframework.integration.core.ErrorMessage;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessagingException;
import org.springframework.util.Assert;

View File

@@ -19,7 +19,7 @@ package org.springframework.integration.channel;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.PollableChannel;
/**

View File

@@ -19,8 +19,8 @@ package org.springframework.integration.channel;
import java.util.Comparator;
import java.util.concurrent.PriorityBlockingQueue;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageHeaders;
import org.springframework.integration.Message;
import org.springframework.integration.MessageHeaders;
import org.springframework.integration.util.UpperBound;
/**

View File

@@ -22,7 +22,7 @@ import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageSelector;
import org.springframework.util.Assert;

View File

@@ -18,7 +18,7 @@ package org.springframework.integration.channel;
import java.util.concurrent.SynchronousQueue;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
/**
* A zero-capacity version of {@link QueueChannel} that delegates to a

View File

@@ -16,8 +16,8 @@
package org.springframework.integration.channel.interceptor;
import org.springframework.integration.Message;
import org.springframework.integration.channel.ChannelInterceptor;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
/**

View File

@@ -16,8 +16,8 @@
package org.springframework.integration.channel.interceptor;
import org.springframework.core.Ordered;
import org.springframework.integration.Message;
import org.springframework.integration.channel.ChannelInterceptor;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
/**

View File

@@ -19,7 +19,7 @@ package org.springframework.integration.channel.interceptor;
import java.util.Arrays;
import java.util.List;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageDeliveryException;
import org.springframework.integration.core.MessageSelector;

View File

@@ -20,8 +20,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.Lifecycle;
import org.springframework.integration.Message;
import org.springframework.integration.channel.ChannelInterceptor;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageSelector;
import org.springframework.util.Assert;

View File

@@ -17,7 +17,7 @@
package org.springframework.integration.config;
import org.springframework.core.Ordered;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.history.MessageHistoryWriter;
import org.springframework.integration.history.NamedComponent;

View File

@@ -20,7 +20,7 @@ import org.w3c.dom.Element;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.integration.core.MessageHeaders;
import org.springframework.integration.MessageHeaders;
import org.springframework.util.StringUtils;
/**

View File

@@ -26,8 +26,8 @@ import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.ListableBeanFactory;
import org.springframework.core.convert.ConversionService;
import org.springframework.integration.Message;
import org.springframework.integration.core.ChannelResolver;
import org.springframework.integration.core.Message;
import org.springframework.integration.history.MessageHistoryWriter;
import org.springframework.integration.history.NamedComponent;
import org.springframework.scheduling.TaskScheduler;

View File

@@ -20,6 +20,8 @@ import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import org.springframework.integration.Message;
import org.springframework.integration.MessageHeaders;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;

View File

@@ -22,6 +22,8 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
import org.springframework.integration.Message;
import org.springframework.integration.MessageHeaders;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;

View File

@@ -16,6 +16,8 @@
package org.springframework.integration.core;
import org.springframework.integration.Message;
/**
* Base channel interface defining common behavior for message sending and receiving.
*

View File

@@ -16,6 +16,8 @@
package org.springframework.integration.core;
import org.springframework.integration.Message;
/**
* Exception that indicates an error during message delivery.

View File

@@ -16,6 +16,8 @@
package org.springframework.integration.core;
import org.springframework.integration.Message;
/**
* Base interface for any component that handles Messages.

View File

@@ -16,6 +16,8 @@
package org.springframework.integration.core;
import org.springframework.integration.Message;
/**
* Exception that indicates an error during message handling.

View File

@@ -16,6 +16,8 @@
package org.springframework.integration.core;
import org.springframework.integration.Message;
/**
* Exception that indicates a message has been rejected by a selector.

View File

@@ -16,6 +16,8 @@
package org.springframework.integration.core;
import org.springframework.integration.Message;
/**
* Strategy interface for message selection.

View File

@@ -16,6 +16,8 @@
package org.springframework.integration.core;
import org.springframework.integration.Message;
/**
* The base exception for any failures within the messaging system.
*

View File

@@ -24,6 +24,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.integration.Message;
import org.springframework.integration.MessageHeaders;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallback;

View File

@@ -16,6 +16,8 @@
package org.springframework.integration.core;
import org.springframework.integration.Message;
/**
* Interface for Message Channels from which Messages may be actively received through polling.

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.dispatcher;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageDeliveryException;
import java.util.Collections;

View File

@@ -20,10 +20,10 @@ import java.util.List;
import java.util.UUID;
import java.util.concurrent.Executor;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.MessageHeaders;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.core.MessageHeaders;
import org.springframework.integration.core.MessagingException;
/**

View File

@@ -18,7 +18,7 @@ package org.springframework.integration.dispatcher;
import java.util.Iterator;
import java.util.List;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageHandler;
/**

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.dispatcher;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageHandler;
/**

View File

@@ -21,7 +21,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageHandler;
/**

View File

@@ -23,7 +23,7 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageDeliveryException;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.core.MessagingException;

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.endpoint;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageProducer;
import org.springframework.integration.core.MessagingTemplate;

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.endpoint;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.core.PollableChannel;
import org.springframework.util.Assert;

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.endpoint;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.integration.message.MessageSource;

View File

@@ -20,7 +20,7 @@ import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.core.convert.ConversionService;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageSelector;
import org.springframework.integration.handler.AbstractMessageProcessor;
import org.springframework.integration.handler.MessageProcessor;

View File

@@ -17,10 +17,10 @@
package org.springframework.integration.filter;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.MessageHeaders;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageDeliveryException;
import org.springframework.integration.core.MessageHeaders;
import org.springframework.integration.core.MessageRejectedException;
import org.springframework.integration.core.MessageSelector;
import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;

View File

@@ -16,8 +16,8 @@
package org.springframework.integration.gateway;
import org.springframework.integration.Message;
import org.springframework.integration.core.ErrorMessage;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageDeliveryException;

View File

@@ -18,7 +18,7 @@ package org.springframework.integration.gateway;
import java.io.Serializable;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageHandlingException;

View File

@@ -32,9 +32,9 @@ import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.core.convert.ConversionService;
import org.springframework.integration.Message;
import org.springframework.integration.annotation.Gateway;
import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.endpoint.AbstractEndpoint;
import org.springframework.integration.handler.ArgumentArrayMessageMapper;

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.gateway;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
/**
* Support class for inbound Messaging Gateways.

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.gateway;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
/**
* Interface for a request/reply Message exchange. This will be used as a default

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.gateway;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
import org.springframework.util.Assert;

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.gateway;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.message.InboundMessageMapper;
import org.springframework.integration.message.OutboundMessageMapper;

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.gateway;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessagingException;
import org.springframework.integration.message.InboundMessageMapper;
import org.springframework.integration.message.OutboundMessageMapper;

View File

@@ -19,10 +19,10 @@ package org.springframework.integration.handler;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.core.Ordered;
import org.springframework.integration.Message;
import org.springframework.integration.context.IntegrationObjectSupport;
import org.springframework.integration.core.ChannelResolutionException;
import org.springframework.integration.core.ChannelResolver;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.core.MessageHandlingException;

View File

@@ -21,7 +21,7 @@ import org.springframework.expression.EvaluationException;
import org.springframework.expression.Expression;
import org.springframework.expression.spel.support.StandardEvaluationContext;
import org.springframework.expression.spel.support.StandardTypeConverter;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageHandlingException;
/**

View File

@@ -16,13 +16,13 @@
package org.springframework.integration.handler;
import org.springframework.integration.Message;
import org.springframework.integration.MessageHeaders;
import org.springframework.integration.core.ChannelResolver;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageDeliveryException;
import org.springframework.integration.core.MessageHandlingException;
import org.springframework.integration.core.MessageHeaders;
import org.springframework.integration.core.MessageProducer;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.util.Assert;

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.handler;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageHandlingException;
import org.springframework.scripting.ScriptSource;
import org.springframework.util.Assert;

View File

@@ -34,10 +34,10 @@ import org.springframework.expression.EvaluationContext;
import org.springframework.expression.Expression;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.StandardEvaluationContext;
import org.springframework.integration.Message;
import org.springframework.integration.annotation.Header;
import org.springframework.integration.annotation.Headers;
import org.springframework.integration.annotation.Payload;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.core.MessagingException;
import org.springframework.integration.message.InboundMessageMapper;

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.handler;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.util.Assert;
/**

View File

@@ -24,17 +24,17 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.Ordered;
import org.springframework.integration.Message;
import org.springframework.integration.MessageHeaders;
import org.springframework.integration.context.BeanFactoryChannelResolver;
import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.context.IntegrationObjectSupport;
import org.springframework.integration.core.ChannelResolutionException;
import org.springframework.integration.core.ChannelResolver;
import org.springframework.integration.core.ErrorMessage;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.core.MessageHandlingException;
import org.springframework.integration.core.MessageHeaders;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.integration.store.MessageStore;
import org.springframework.integration.store.SimpleMessageStore;

View File

@@ -27,7 +27,7 @@ import org.springframework.expression.ExpressionParser;
import org.springframework.expression.ParseException;
import org.springframework.expression.spel.SpelParserConfiguration;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
/**
* A {@link MessageProcessor} implementation that evaluates a SpEL expression

View File

@@ -18,7 +18,7 @@ package org.springframework.integration.handler;
import java.lang.reflect.Method;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
/**
* Strategy interface for resolving a Method that should be responsible for

View File

@@ -24,7 +24,7 @@ import org.springframework.expression.EvaluationContext;
import org.springframework.expression.Expression;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.StandardEvaluationContext;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.util.StringUtils;
/**

View File

@@ -20,8 +20,8 @@ import java.util.HashSet;
import java.util.List;
import org.springframework.core.Ordered;
import org.springframework.integration.Message;
import org.springframework.integration.context.IntegrationObjectSupport;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.core.MessageHandlingException;

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.handler;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
/**
* This defines the lowest-level strategy of processing a Message and returning

View File

@@ -19,7 +19,7 @@ package org.springframework.integration.handler;
import java.lang.reflect.Method;
import org.springframework.core.Ordered;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.core.MessagingException;
import org.springframework.util.Assert;

View File

@@ -40,10 +40,10 @@ import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.expression.Expression;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.StandardEvaluationContext;
import org.springframework.integration.Message;
import org.springframework.integration.annotation.Header;
import org.springframework.integration.annotation.Headers;
import org.springframework.integration.annotation.Payload;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageHandlingException;
import org.springframework.integration.core.MessagingException;
import org.springframework.integration.util.ClassUtils;

View File

@@ -26,7 +26,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.util.ClassUtils;
import org.springframework.util.Assert;

View File

@@ -18,8 +18,8 @@ package org.springframework.integration.handler;
import java.lang.reflect.Method;
import org.springframework.integration.Message;
import org.springframework.integration.annotation.ServiceActivator;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageHandlingException;
/**

View File

@@ -18,7 +18,7 @@ package org.springframework.integration.handler;
import java.lang.reflect.Method;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.util.Assert;
/**

View File

@@ -29,9 +29,9 @@ import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.type.TypeFactory;
import org.codehaus.jackson.type.JavaType;
import org.codehaus.jackson.type.TypeReference;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.MessageHeaders;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.core.MessageHeaders;
import org.springframework.integration.message.InboundMessageMapper;
import org.springframework.util.Assert;

View File

@@ -3,7 +3,7 @@ package org.springframework.integration.json;
import java.io.StringWriter;
import org.codehaus.jackson.map.ObjectMapper;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.message.OutboundMessageMapper;
/**

View File

@@ -18,7 +18,7 @@ package org.springframework.integration.message;
import java.util.Map;
import org.springframework.integration.core.MessageHeaders;
import org.springframework.integration.MessageHeaders;
/**
* Generic strategy interface for mapping {@link MessageHeaders} to and from other

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.message;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
/**
* Strategy interface for mapping from an Object to a{@link Message}.

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.message;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessagingException;
/**

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.message;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
/**
* Base interface for any source of {@link Message Messages} that can be polled.

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.message;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.core.MessageHandlingException;
/**

View File

@@ -20,8 +20,8 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.integration.Message;
import org.springframework.integration.core.GenericMessage;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessagingException;
import org.springframework.integration.util.DefaultMethodInvoker;
import org.springframework.integration.util.MethodInvoker;

View File

@@ -16,7 +16,7 @@
package org.springframework.integration.message;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
/**
* Strategy interface for mapping from a {@link Message} to an Object.

View File

@@ -23,9 +23,9 @@ import java.util.List;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.support.ConversionServiceFactory;
import org.springframework.integration.Message;
import org.springframework.integration.core.ChannelResolutionException;
import org.springframework.integration.core.ChannelResolver;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessagingException;
import org.springframework.util.Assert;

View File

@@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.handler.AbstractMessageProcessor;
import org.springframework.integration.handler.MessageProcessor;
import org.springframework.util.Assert;

View File

@@ -19,11 +19,11 @@ package org.springframework.integration.router;
import java.util.Collection;
import java.util.UUID;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
import org.springframework.integration.MessageHeaders;
import org.springframework.integration.core.MessageBuilder;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.core.MessageDeliveryException;
import org.springframework.integration.core.MessageHeaders;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.integration.handler.AbstractMessageHandler;

View File

@@ -19,7 +19,7 @@ package org.springframework.integration.router;
import java.util.ArrayList;
import java.util.List;
import org.springframework.integration.core.Message;
import org.springframework.integration.Message;
/**
* Extends {@link AbstractChannelNameResolvingMessageRouter} to support router

Some files were not shown because too many files have changed in this diff Show More