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

INT-3803: Suppress deprecation for Reactor-2.0.5

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3803

Revert changes made by the last commit for the `INT-3802`
 and mark Deprecated `Suppliers` usage with the `@SuppressWarnings("deprecation")`
This commit is contained in:
Artem Bilan
2015-08-14 15:04:21 -04:00
committed by Gary Russell
parent 59f82ce924
commit 9d65512fdb
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java
View File

@@ -64,7 +64,6 @@ import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils;
import reactor.Environment;
import reactor.fn.Supplier;
import reactor.rx.Promise;
import reactor.rx.Promises;
@@ -346,6 +345,7 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint
}
@Override
@SuppressWarnings("deprecation")
public Object invoke(final MethodInvocation invocation) throws Throwable {
final Class<?> returnType = invocation.getMethod().getReturnType();
if (this.asyncExecutor != null && !Object.class.equals(returnType)) {
@@ -368,14 +368,7 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint
throw new IllegalStateException("'reactorEnvironment' is required in case of 'Promise' return type.");
}
return Promises.<Object>task((Environment) this.reactorEnvironment,
new Supplier<Object>() {
@Override
public Object get() {
return new AsyncInvocationTask(invocation).call();
}
});
reactor.fn.Functions.supplier(new AsyncInvocationTask(invocation)));
}
return this.doInvoke(invocation, true);
}
@@ -644,7 +637,7 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint
}
@Override
public Object call() {
public Object call() throws Exception {
try {
return doInvoke(this.invocation, false);
}