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

Some various upgrades, fixes and refactoring

Browse Source 
* Upgrade to SA and SF snapshots
* Address TODOs regarding those upgrades
* Resolve some other TODOs
* Replace `PropertyPlaceholderConfigurer` beans with the `<context:property-placeholder>`
* Upgrade to Spring Social Twitter 1.1.2 and resolve deprecations via mocks (https://github.com/spring-projects/spring-social-twitter/issues/91)
* Upgrade to Curator `3.1.0` and resolve deprecation in the `ZookeeperMetadataStore`
This commit is contained in:
Artem Bilan
2016-04-25 23:32:14 -04:00
parent 3390734a99
commit 47d7a67bda
43 changed files with 420 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java
View File

@@ -490,7 +490,7 @@ public class MessagingMethodInvokerHelper<T> extends AbstractExpressionEvaluator
"] has no eligible methods for handling Messages.");
}
catch (Exception e) {
//TODO backward compatibility
//TODO backward compatibility. Remove in 5.0
throw new IllegalArgumentException(e.getMessage());
}

6
spring-integration-core/src/test/java/org/springframework/integration/config/SelectorChainParserTests-context.xml
View File

@@ -34,11 +34,9 @@
<selector ref="selector6"/>
</selector-chain>
</selector-chain>
<!-- TODO INT-547
<selector id="pojoSelector" ref="pojoSelectorBean" method="accept"/>
-->
<beans:bean id="pojoSelectorBean" class="org.springframework.integration.config.SelectorChainParserTests$StubPojoSelector"/>
<beans:bean id="selector1" class="org.springframework.integration.config.SelectorChainParserTests$StubMessageSelector"/>

3
spring-integration-core/src/test/java/org/springframework/integration/config/SelectorChainParserTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2010 the original author or authors.
* Copyright 2002-2016 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.
@@ -56,6 +56,7 @@ public class SelectorChainParserTests {
assertEquals(selector1, selectors.get(0));
assertEquals(selector2, selectors.get(1));
assertTrue(chain.accept(new GenericMessage<String>("test")));
assertTrue(this.context.containsBean("pojoSelector"));
}
@Test

1
spring-integration-core/src/test/java/org/springframework/integration/gateway/MessagingGatewayTests.java
View File

@@ -213,7 +213,6 @@ public class MessagingGatewayTests {
}
}).when(requestChannel).send(Mockito.any(Message.class), Mockito.anyLong());
// TODO: commenting the next line causes the test to hang
this.messagingGateway.setReplyTimeout(100L);
Message<?> receiveMessage = this.messagingGateway.sendAndReceiveMessage("test");
assertSame(messageMock, receiveMessage);

3
spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java
View File

@@ -286,8 +286,7 @@ public class MethodInvokingMessageProcessorTests {
@Test
public void testProcessMessageBadExpression() throws Exception {
// TODO: should this be MessageHandlingException or NumberFormatException?
expected.expect(new ExceptionCauseMatcher(Exception.class));
expected.expect(MessageHandlingException.class);
AnnotatedTestService service = new AnnotatedTestService();
Method method = service.getClass().getMethod("integerMethod", Integer.class);
MethodInvokingMessageProcessor processor = new MethodInvokingMessageProcessor(service, method);