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

INT-3937: Deprecate Reactor Environment usage

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3937
This commit is contained in:
Artem Bilan
2016-03-28 11:38:06 -04:00
parent 4bfcdb9dfa
commit b5745af148
12 changed files with 41 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-core/src/main/java/org/springframework/integration/annotation/MessagingGateway.java
View File

@@ -135,7 +135,9 @@ public @interface MessagingGateway {
* <p> This attribute is required in case of {@link reactor.rx.Promise} usage.
* @return the suggested reactor Environment bean name.
* @since 4.1
* @deprecated with no-op in favor of global JVM-wide Reactor configuration.
*/
@Deprecated
String reactorEnvironment() default "";
}

6
spring-integration-core/src/main/java/org/springframework/integration/config/MessagingGatewayRegistrar.java
View File

@@ -99,7 +99,6 @@ public class MessagingGatewayRegistrar implements ImportBeanDefinitionRegistrar,
String defaultReplyChannel = (String) gatewayAttributes.get("defaultReplyChannel");
String errorChannel = (String) gatewayAttributes.get("errorChannel");
String asyncExecutor = (String) gatewayAttributes.get("asyncExecutor");
String reactorEnvironment = (String) gatewayAttributes.get("reactorEnvironment");
String mapper = (String) gatewayAttributes.get("mapper");
boolean hasMapper = StringUtils.hasText(mapper);
@@ -125,7 +124,7 @@ public class MessagingGatewayRegistrar implements ImportBeanDefinitionRegistrar,
String headerExpression = (String) header.get("expression");
boolean hasValue = StringUtils.hasText(headerValue);
if (!(hasValue ^ StringUtils.hasText(headerExpression))) {
if (hasValue == StringUtils.hasText(headerExpression)) {
throw new BeanDefinitionStoreException("exactly one of 'value' or 'expression' " +
"is required on a gateway's header.");
}
@@ -157,9 +156,6 @@ public class MessagingGatewayRegistrar implements ImportBeanDefinitionRegistrar,
else if (StringUtils.hasText(asyncExecutor)) {
gatewayProxyBuilder.addPropertyReference("asyncExecutor", asyncExecutor);
}
if (StringUtils.hasText(reactorEnvironment)) {
gatewayProxyBuilder.addPropertyReference("reactorEnvironment", reactorEnvironment);
}
if (StringUtils.hasText(mapper)) {
gatewayProxyBuilder.addPropertyReference("mapper", mapper);
}

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

@@ -73,7 +73,6 @@ public class GatewayParser implements BeanDefinitionParser {
}
gatewayAttributes.put("mapper", element.getAttribute("mapper"));
gatewayAttributes.put("reactorEnvironment", element.getAttribute("reactor-environment"));
gatewayAttributes.put("defaultReplyTimeout",
element.getAttribute(isNested ? "reply-timeout" : "default-reply-timeout"));
gatewayAttributes.put("defaultRequestTimeout",

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

@@ -118,8 +118,6 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint
private volatile Class<?> asyncSubmitListenableType;
private volatile Object reactorEnvironment;
private volatile boolean initialized;
private final Object initializationMonitor = new Object();
@@ -256,12 +254,11 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint
* service interface).
* @param reactorEnvironment the Reactor Environment.
* @since 4.1
* @deprecated with no-op in favor of global JVM-wide Reactor configuration.
*/
@Deprecated
public void setReactorEnvironment(Object reactorEnvironment) {
if (!Environment.class.getName().equals(reactorEnvironment.getClass().getName())) {
throw new IllegalArgumentException("The 'reactorEnvironment' must be instance of 'reactor.Environment'");
}
this.reactorEnvironment = reactorEnvironment;
}
@Override
@@ -364,10 +361,7 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint
}
}
if (reactorPresent && Promise.class.isAssignableFrom(returnType)) {
if (this.reactorEnvironment == null) {
throw new IllegalStateException("'reactorEnvironment' is required in case of 'Promise' return type.");
}
return Promises.<Object>task((Environment) this.reactorEnvironment,
return Promises.<Object>task(Environment.initializeIfEmpty(),
reactor.fn.Functions.supplier(new AsyncInvocationTask(invocation)));
}
return this.doInvoke(invocation, true);

3
spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-4.3.xsd
View File

@@ -789,14 +789,13 @@
<xsd:attribute name="reactor-environment" type="xsd:string">
<xsd:annotation>
<xsd:documentation>
<![CDATA[
DEPRECATED with no-op in favor of global JVM-wide Reactor configuration.
Provide a reference to 'reactor.core.Environment'
to use for any of the interface methods that have a 'reactor.core.composable.Promise' return type.
The Reactor's Environment will only be used for those async methods; the sync methods
will be invoked in the caller's thread.
This attribute is required if any 'service-interface' methods
have a 'reactor.core.composable.Promise' return type.
]]>
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>

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

@@ -49,8 +49,7 @@
<gateway id="promise"
service-interface="org.springframework.integration.gateway.TestService"
default-request-channel="requestChannel"
default-reply-channel="replyChannel"
reactor-environment="reactorEnvironment"/>
default-reply-channel="replyChannel"/>
<gateway id="asyncCompletable"
service-interface="org.springframework.integration.gateway.TestService"
@@ -83,7 +82,7 @@
async-executor="testExecutor">
<default-header name="baz" value="qux"/>
<method name="oneWay" request-channel="otherRequestChannel"
request-timeout="456"
request-timeout="456"
reply-timeout="123"
payload-expression="'fiz'"
reply-channel="foo">
@@ -96,6 +95,4 @@
<beans:bean id="testExecutor" class="org.springframework.integration.config.xml.GatewayParserTests$TestExecutor"/>
<beans:bean id="reactorEnvironment" class="reactor.Environment" destroy-method="shutdown"/>
</beans:beans>

12
spring-integration-core/src/test/java/org/springframework/integration/configuration/EnableIntegrationTests.java
View File

@@ -128,10 +128,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.support.AnnotationConfigContextLoader;
import org.springframework.util.MultiValueMap;
import reactor.Environment;
import reactor.rx.Promise;
import reactor.rx.Streams;
import reactor.spring.context.config.EnableReactor;
/**
* @author Artem Bilan
@@ -139,7 +137,8 @@ import reactor.spring.context.config.EnableReactor;
* @since 4.0
*/
@ContextConfiguration(loader = AnnotationConfigContextLoader.class,
classes = {EnableIntegrationTests.ContextConfiguration.class, EnableIntegrationTests.ContextConfiguration2.class})
classes = {EnableIntegrationTests.ContextConfiguration.class,
EnableIntegrationTests.ContextConfiguration2.class})
@RunWith(SpringJUnit4ClassRunner.class)
@DirtiesContext
public class EnableIntegrationTests {
@@ -606,9 +605,6 @@ public class EnableIntegrationTests {
assertNull(replyChannel.receive(10));
}
@Autowired
private Environment environment;
@Test
public void testPromiseGateway() throws Exception {
@@ -616,7 +612,6 @@ public class EnableIntegrationTests {
final CountDownLatch consumeLatch = new CountDownLatch(1);
Streams.just("1", "2", "3", "4", "5")
.dispatchOn(this.environment)
.map(Integer::parseInt)
.flatMap(this.testGateway::multiply)
.toList()
@@ -911,7 +906,6 @@ public class EnableIntegrationTests {
@EnableMessageHistory("${message.history.tracked.components}")
@EnablePublisher("publishedChannel")
@EnableAsync
@EnableReactor
public static class ContextConfiguration2 {
/*
@@ -1332,7 +1326,7 @@ public class EnableIntegrationTests {
@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
@Retention(RetentionPolicy.RUNTIME)
@MessagingGateway(defaultRequestChannel = "gatewayChannel", reactorEnvironment = "reactorEnv",
@MessagingGateway(defaultRequestChannel = "gatewayChannel",
defaultRequestTimeout = "${default.request.timeout:12300}", defaultReplyTimeout = "#{13400}",
defaultHeaders = @GatewayHeader(name = "foo", value = "FOO"))
public @interface TestMessagingGateway {

38
spring-integration-core/src/test/java/org/springframework/integration/gateway/AsyncGatewayTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 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.
@@ -19,7 +19,6 @@ package org.springframework.integration.gateway;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
@@ -31,11 +30,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicReference;
import org.hamcrest.Matchers;
import org.junit.Test;
import reactor.Environment;
import reactor.fn.Consumer;
import reactor.rx.Promise;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.integration.annotation.Gateway;
@@ -50,6 +45,9 @@ import org.springframework.messaging.support.MessageBuilder;
import org.springframework.util.concurrent.ListenableFuture;
import org.springframework.util.concurrent.ListenableFutureCallback;
import reactor.fn.Consumer;
import reactor.rx.Promise;
/**
* @author Mark Fisher
* @author Oleg Zhurakousky
@@ -59,15 +57,9 @@ import org.springframework.util.concurrent.ListenableFutureCallback;
*/
public class AsyncGatewayTests {
private final Environment reactorEnvironment = new Environment();
// TODO: changed from 0 because of recurrent failure: is this right?
private final long safety = 100;
public void tearDown() {
this.reactorEnvironment.shutdown();
}
@Test
public void futureWithMessageReturned() throws Exception {
QueueChannel requestChannel = new QueueChannel();
@@ -255,7 +247,6 @@ public class AsyncGatewayTests {
proxyFactory.setServiceInterface(TestEchoService.class);
proxyFactory.setBeanFactory(mock(BeanFactory.class));
proxyFactory.setBeanName("testGateway");
proxyFactory.setReactorEnvironment(this.reactorEnvironment);
proxyFactory.afterPropertiesSet();
TestEchoService service = (TestEchoService) proxyFactory.getObject();
Promise<Message<?>> promise = service.returnMessagePromise("foo");
@@ -271,7 +262,6 @@ public class AsyncGatewayTests {
proxyFactory.setDefaultRequestChannel(requestChannel);
proxyFactory.setServiceInterface(TestEchoService.class);
proxyFactory.setBeanFactory(mock(BeanFactory.class));
proxyFactory.setReactorEnvironment(this.reactorEnvironment);
proxyFactory.setBeanName("testGateway");
proxyFactory.afterPropertiesSet();
TestEchoService service = (TestEchoService) proxyFactory.getObject();
@@ -289,7 +279,6 @@ public class AsyncGatewayTests {
proxyFactory.setServiceInterface(TestEchoService.class);
proxyFactory.setBeanFactory(mock(BeanFactory.class));
proxyFactory.setBeanName("testGateway");
proxyFactory.setReactorEnvironment(this.reactorEnvironment);
proxyFactory.afterPropertiesSet();
TestEchoService service = (TestEchoService) proxyFactory.getObject();
Promise<?> promise = service.returnSomethingPromise("foo");
@@ -307,7 +296,6 @@ public class AsyncGatewayTests {
proxyFactory.setServiceInterface(TestEchoService.class);
proxyFactory.setBeanFactory(mock(BeanFactory.class));
proxyFactory.setBeanName("testGateway");
proxyFactory.setReactorEnvironment(this.reactorEnvironment);
proxyFactory.afterPropertiesSet();
TestEchoService service = (TestEchoService) proxyFactory.getObject();
Promise<String> promise = service.returnStringPromise("foo");
@@ -327,24 +315,6 @@ public class AsyncGatewayTests {
assertEquals("foobar", result.get());
}
@Test
public void promiseMethodWithoutEnvironment() throws Exception {
GatewayProxyFactoryBean proxyFactory = new GatewayProxyFactoryBean();
proxyFactory.setServiceInterface(TestEchoService.class);
proxyFactory.setBeanFactory(mock(BeanFactory.class));
proxyFactory.setBeanName("testGateway");
proxyFactory.afterPropertiesSet();
TestEchoService service = (TestEchoService) proxyFactory.getObject();
try {
service.returnStringPromise("foo");
fail("IllegalStateException expected");
}
catch (Exception e) {
assertThat(e, Matchers.instanceOf(IllegalStateException.class));
assertEquals(e.getMessage(), "'reactorEnvironment' is required in case of 'Promise' return type.");
}
}
private static void startResponder(final PollableChannel requestChannel) {
new Thread(new Runnable() {

2
spring-integration-core/src/test/java/org/springframework/integration/routingslip/RoutingSlipTests.java
View File

@@ -61,7 +61,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.support.GenericXmlContextLoader;
import reactor.rx.Streams;
import reactor.spring.context.config.EnableReactor;
/**
* @author Artem Bilan
@@ -174,7 +173,6 @@ public class RoutingSlipTests {
}
@Configuration
@EnableReactor
@EnableIntegration
public static class RoutingSlipConfiguration {