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

Fix s-i-core and SF @Nullable Changes

Browse Source
This commit is contained in:
Gary Russell
2017-06-07 15:09:08 -04:00
parent 45ae138091
commit 71149f260a
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-core/src/test/java/org/springframework/integration/config/xml/ServiceActivatorParserTests.java
View File

@@ -204,7 +204,7 @@ public class ServiceActivatorParserTests {
MessagingTemplate template = new MessagingTemplate();
template.setDefaultDestination(channel);
return template.convertSendAndReceive(payload, null);
return template.convertSendAndReceive(payload, Object.class);
}

6
spring-integration-core/src/test/java/org/springframework/integration/transaction/TransactionInterceptorBuilderTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2016 the original author or authors.
* Copyright 2016-2017 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.
@@ -58,10 +58,10 @@ public class TransactionInterceptorBuilderTests {
verify(this.interceptor2, null);
}
private void verify(TransactionInterceptor interceptor, PlatformTransactionManager txm) {
private void verify(TransactionInterceptor interceptor, PlatformTransactionManager txm) throws Exception {
assertSame(txm, interceptor.getTransactionManager());
TransactionAttribute atts = interceptor.getTransactionAttributeSource()
.getTransactionAttribute(null, null);
.getTransactionAttribute(TransactionInterceptorBuilderTests.class.getDeclaredMethod("test"), null);
Assert.assertThat(atts.getPropagationBehavior(), equalTo(Propagation.REQUIRES_NEW.value()));
Assert.assertThat(atts.getIsolationLevel(), equalTo(Isolation.SERIALIZABLE.value()));
Assert.assertThat(atts.getTimeout(), equalTo(42));