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

INT-1240, removed 'default' from 'operation-name' and 'object-name', since 'operation-name' and 'object-name' is now required on adapters/gateway, there is no reason calling them 'default'

Browse Source
This commit is contained in:
Oleg Zhurakousky
2010-07-19 12:23:54 +00:00
parent 7cbf845a83
commit c2f526586a
7 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/OperationInvokingMessageHandlerTests.java
View File

@@ -69,9 +69,9 @@ public class OperationInvokingMessageHandlerTests {
QueueChannel outputChannel = new QueueChannel();
OperationInvokingMessageHandler handler = new OperationInvokingMessageHandler();
handler.setServer(this.server);
handler.setDefaultObjectName(this.objectName);
handler.setObjectName(this.objectName);
handler.setOutputChannel(outputChannel);
handler.setDefaultOperationName("x");
handler.setOperationName("x");
handler.afterPropertiesSet();
Map<String, Object> params = new HashMap<String, Object>();
params.put("p1", "foo");
@@ -88,9 +88,9 @@ public class OperationInvokingMessageHandlerTests {
QueueChannel outputChannel = new QueueChannel();
OperationInvokingMessageHandler handler = new OperationInvokingMessageHandler();
handler.setServer(this.server);
handler.setDefaultObjectName(this.objectName);
handler.setObjectName(this.objectName);
handler.setOutputChannel(outputChannel);
handler.setDefaultOperationName("y");
handler.setOperationName("y");
handler.afterPropertiesSet();
Message<?> message = MessageBuilder.withPayload("foo").build();
handler.handleMessage(message);
@@ -101,9 +101,9 @@ public class OperationInvokingMessageHandlerTests {
QueueChannel outputChannel = new QueueChannel();
OperationInvokingMessageHandler handler = new OperationInvokingMessageHandler();
handler.setServer(this.server);
handler.setDefaultObjectName(this.objectName);
handler.setObjectName(this.objectName);
handler.setOutputChannel(outputChannel);
handler.setDefaultOperationName("x");
handler.setOperationName("x");
handler.afterPropertiesSet();
Map<String, Object> params = new HashMap<String, Object>();
params.put("p1", "foo");
@@ -119,9 +119,9 @@ public class OperationInvokingMessageHandlerTests {
QueueChannel outputChannel = new QueueChannel();
OperationInvokingMessageHandler handler = new OperationInvokingMessageHandler();
handler.setServer(this.server);
handler.setDefaultObjectName(this.objectName);
handler.setObjectName(this.objectName);
handler.setOutputChannel(outputChannel);
handler.setDefaultOperationName("x");
handler.setOperationName("x");
handler.afterPropertiesSet();
List<Object> params = Arrays.asList(new Object[] { "foo", new Integer(123) });
Message<?> message = MessageBuilder.withPayload(params).build();

4
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParserTests-context.xml
View File

@@ -17,8 +17,8 @@
<context:mbean-server/>
<jmx:operation-invoking-channel-adapter id="input"
default-object-name="org.springframework.integration.jmx.config:type=TestBean,name=testBeanAdapter"
default-operation-name="test"/>
object-name="org.springframework.integration.jmx.config:type=TestBean,name=testBeanAdapter"
operation-name="test"/>
<bean id="testBeanAdapter" class="org.springframework.integration.jmx.config.TestBean"/>

8
spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests-context.xml
View File

@@ -30,12 +30,12 @@
<jmx:operation-invoking-outbound-gateway request-channel="withReplyChannel"
reply-channel="withReplyChannelOutput"
default-object-name="org.springframework.integration.jmx.config:type=TestBean,name=testBeanGateway"
default-operation-name="testWithReturn"/>
object-name="org.springframework.integration.jmx.config:type=TestBean,name=testBeanGateway"
operation-name="testWithReturn"/>
<jmx:operation-invoking-outbound-gateway request-channel="withNoReplyChannel"
default-object-name="org.springframework.integration.jmx.config:type=TestBean,name=testBeanGateway"
default-operation-name="testWithReturn"/>
object-name="org.springframework.integration.jmx.config:type=TestBean,name=testBeanGateway"
operation-name="testWithReturn"/>
<bean id="testBeanGateway" class="org.springframework.integration.jmx.config.TestBean"/>
</beans>