Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compiler warnings and move docbook build to a profile

Browse Source
This commit is contained in:
David Syer
2010-07-27 12:54:18 +00:00
parent c4fe3b2076
commit 829d6efc08
37 changed files with 105 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorBeanPostProcessor.java
View File

@@ -50,10 +50,7 @@ final class GlobalChannelInterceptorBeanPostProcessor implements BeanPostProcess
private final Set<GlobalChannelInterceptorWrapper> positiveOrderInterceptors = new LinkedHashSet<GlobalChannelInterceptorWrapper>();
private final Set<GlobalChannelInterceptorWrapper> negativeOrderInterceptors = new LinkedHashSet<GlobalChannelInterceptorWrapper>();
/**
*
* @param globalInterceptors
*/
GlobalChannelInterceptorBeanPostProcessor(List<GlobalChannelInterceptorWrapper> channelInterceptors){
this.channelInterceptors = channelInterceptors;
}

2
spring-integration-core/src/main/java/org/springframework/integration/config/xml/MessageHistoryParser.java
View File

@@ -16,8 +16,6 @@
package org.springframework.integration.config.xml;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
import org.springframework.beans.factory.parsing.Problem;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser;

1
spring-integration-core/src/main/java/org/springframework/integration/config/xml/PointToPointChannelParser.java
View File

@@ -19,7 +19,6 @@ package org.springframework.integration.config.xml;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.util.StringUtils;
import org.springframework.util.xml.DomUtils;

2
spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java
View File

@@ -22,9 +22,7 @@ import java.util.Iterator;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.integration.context.NamedComponent;
import org.springframework.integration.core.Message;
import org.springframework.util.StringUtils;
/**

3
spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistoryAwareMessageHandler.java
View File

@@ -26,7 +26,7 @@ import org.springframework.integration.message.MessageRejectedException;
/**
* Wrapper class to be used when a particular MessageHandler needs to be tracked in MessageHistory.
* Note, any MessageHandler that is wrapped by this class will be tracked in MessageHistory
* only when MessageHistoryWriter is present.<2E>
* only when MessageHistoryWriter is present.<2E>
*
* @author Oleg Zhurakousky
* @since 2.0
@@ -40,7 +40,6 @@ public class MessageHistoryAwareMessageHandler implements NamedComponent, Messag
*
* @param historyWriter
* @param endpointName
* @param parentHandler
*/
public MessageHistoryAwareMessageHandler(MessageHistoryWriter historyWriter, String endpointName, MessageHandler targetHandler){
this.historyWriter = historyWriter;

7
spring-integration-core/src/main/java/org/springframework/integration/router/RecipientListRouter.java
View File

@@ -19,8 +19,6 @@ package org.springframework.integration.router;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
@@ -38,9 +36,8 @@ import org.springframework.util.Assert;
* A Message Router that sends Messages to a list of recipient channels. The
* recipients can be provided as a static list of {@link MessageChannel}
* instances via the {@link #setChannels(List)} method, or for dynamic
* behavior, a map with {@link MessageSelector} instances as the keys and
* collections of channels as the values can be provided via the
* {@link #setChannelMap(Map)} method.
* behavior, the values can be provided via the
* {@link #setRecipients(List)} method.
* <p/>
* For more advanced, programmatic control
* of dynamic recipient lists, consider using the @Router annotation or

1
spring-integration-core/src/main/java/org/springframework/integration/transformer/CycleDetector.java
View File

@@ -52,7 +52,6 @@ class CycleDetector {
*
* @param target
* @param ignorePakages
* @return
*/
public void detectCycle(Object target, String... ignorePakages){
Map<Object, Set<Object>> objectReferenceMap = new HashMap<Object, Set<Object>>();

1
spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SubscriberOrderTests.java
View File

@@ -23,7 +23,6 @@ import java.util.List;
import org.junit.Test;
import org.springframework.beans.factory.config.ConstructorArgumentValues;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.context.support.GenericApplicationContext;

4
spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserWithExistingConversionServiceTests.java
View File

@@ -72,6 +72,7 @@ public class ConverterParserWithExistingConversionServiceTests {
private String text;
@SuppressWarnings("unused")
public TestBean1(String text) {
this.text = text;
}
@@ -105,14 +106,13 @@ public class ConverterParserWithExistingConversionServiceTests {
}
}
@SuppressWarnings("unused")
private static class TestConverter implements Converter<TestBean1, TestBean2> {
public TestBean2 convert(TestBean1 source) {
return new TestBean2(source.text.toUpperCase());
}
}
@SuppressWarnings("unused")
private static class TestConverter3 implements Converter<TestBean1, TestBean3> {
public TestBean3 convert(TestBean1 source) {

5
spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java
View File

@@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.lang.reflect.Method;
import java.util.Iterator;
import java.util.Random;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
@@ -32,7 +31,6 @@ import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.convert.converter.Converter;
import org.springframework.core.convert.support.ConversionServiceFactory;
import org.springframework.core.convert.support.GenericConversionService;
@@ -43,9 +41,6 @@ import org.springframework.integration.context.IntegrationContextUtils;
import org.springframework.integration.core.Message;
import org.springframework.integration.core.MessageChannel;
import org.springframework.integration.endpoint.EventDrivenConsumer;
import org.springframework.integration.handler.BridgeHandler;
import org.springframework.integration.history.MessageHistoryEvent;
import org.springframework.integration.history.MessageHistoryWriter;
import org.springframework.integration.message.MessageHandler;
import org.springframework.integration.message.StringMessage;
import org.springframework.util.ReflectionUtils;

2
spring-integration-core/src/test/java/org/springframework/integration/gateway/MultipleEndpointGatewayTests.java
View File

@@ -65,7 +65,7 @@ public class MultipleEndpointGatewayTests {
public Object echo(Object value){
return "R:" + value;
}
public Message echoAsMessage(Object value){
public Message<?> echoAsMessage(Object value){
return MessageBuilder.withPayload("R:" + value).build();
}
}

2
spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java
View File

@@ -18,6 +18,7 @@ package org.springframework.integration.history;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse;
import static junit.framework.Assert.assertTrue;
import static org.junit.Assert.assertNotNull;
import java.util.Iterator;
import java.util.Map;
@@ -135,6 +136,7 @@ public class MessageHistoryIntegrationTests {
endOfThePipeChannel.subscribe(handler);
Message<?> result = gateway.echo("hello");
Mockito.verify(handler, Mockito.times(1)).handleMessage(Mockito.any(Message.class));
assertNotNull(result);
//assertEquals("hello", result);
}