Author: ningjiang
Date: Tue Nov 20 07:16:46 2012
New Revision: 1411567
URL: http://svn.apache.org/viewvc?rev=1411567&view=rev
Log:
CAMEL-5778 rename the constant OPERATION_NANE to METHOD_NAME
Modified:
camel/trunk/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcConstants.java
camel/trunk/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcProducer.java
camel/trunk/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/converter/XmlRpcConverter.java
camel/trunk/components/camel-xmlrpc/src/test/java/org/apache/camel/component/xmlrpc/XmlRpcComponentTest.java
camel/trunk/components/camel-xmlrpc/src/test/java/org/apache/camel/component/xmlrpc/converter/XmlRpcConverterTest.java
Modified:
camel/trunk/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcConstants.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcConstants.java?rev=1411567&r1=1411566&r2=1411567&view=diff
==============================================================================
---
camel/trunk/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcConstants.java
(original)
+++
camel/trunk/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcConstants.java
Tue Nov 20 07:16:46 2012
@@ -17,7 +17,7 @@
package org.apache.camel.component.xmlrpc;
public final class XmlRpcConstants {
- public static final String OPERATION_NAME = "CamelXmlRpcOperationName";
+ public static final String METHOD_NAME = "CamelXmlRpcMethodName";
public static final String ERROR_CODE = "CamelXmlRpcErrorCode";
public static final String ERROR_MESSAGE = "CamelXmlRpcErrorMessage";
Modified:
camel/trunk/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcProducer.java?rev=1411567&r1=1411566&r2=1411567&view=diff
==============================================================================
---
camel/trunk/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcProducer.java
(original)
+++
camel/trunk/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/XmlRpcProducer.java
Tue Nov 20 07:16:46 2012
@@ -43,7 +43,7 @@ public class XmlRpcProducer extends Defa
public void process(Exchange exchange) throws Exception {
LOG.trace("Process exchange: {} in the sync way.", exchange);
Message in = exchange.getIn();
- String operationName = in.getHeader(XmlRpcConstants.OPERATION_NAME,
String.class);
+ String operationName = in.getHeader(XmlRpcConstants.METHOD_NAME,
String.class);
//TODO need to use the binding to handle the requests
Object result = client.execute(operationName, in.getBody(List.class));
//TODO what if the request is one way operation
@@ -53,7 +53,7 @@ public class XmlRpcProducer extends Defa
public boolean process(Exchange exchange, AsyncCallback callback) {
LOG.trace("Process exchange: {} in the async way.", exchange);
Message in = exchange.getIn();
- String operationName = in.getHeader(XmlRpcConstants.OPERATION_NAME,
String.class);
+ String operationName = in.getHeader(XmlRpcConstants.METHOD_NAME,
String.class);
XmlRpcAsyncCallback xmlRpcAsyncCallback = new
XmlRpcAsyncCallback(exchange, callback);
//TODO need to use the binding to handle the requests
try {
Modified:
camel/trunk/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/converter/XmlRpcConverter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/converter/XmlRpcConverter.java?rev=1411567&r1=1411566&r2=1411567&view=diff
==============================================================================
---
camel/trunk/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/converter/XmlRpcConverter.java
(original)
+++
camel/trunk/components/camel-xmlrpc/src/main/java/org/apache/camel/component/xmlrpc/converter/XmlRpcConverter.java
Tue Nov 20 07:16:46 2012
@@ -34,7 +34,7 @@ public final class XmlRpcConverter {
@Converter
public static XmlRpcRequest toXmlRpcRequest(final Object[] parameters,
Exchange exchange) {
// get the message operation name
- String operationName =
exchange.getIn().getHeader(XmlRpcConstants.OPERATION_NAME, String.class);
+ String operationName =
exchange.getIn().getHeader(XmlRpcConstants.METHOD_NAME, String.class);
// create the request object here
XmlRpcRequest request = new XmlRpcRequestImpl(operationName,
parameters);
@@ -45,7 +45,7 @@ public final class XmlRpcConverter {
@Converter
public static XmlRpcRequest toXmlRpcRequest(final List<?> parameters,
Exchange exchange) {
// get the message operation name
- String operationName =
exchange.getIn().getHeader(XmlRpcConstants.OPERATION_NAME, String.class);
+ String operationName =
exchange.getIn().getHeader(XmlRpcConstants.METHOD_NAME, String.class);
// create the request object here
XmlRpcRequest request = new XmlRpcRequestImpl(operationName,
parameters);
Modified:
camel/trunk/components/camel-xmlrpc/src/test/java/org/apache/camel/component/xmlrpc/XmlRpcComponentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlrpc/src/test/java/org/apache/camel/component/xmlrpc/XmlRpcComponentTest.java?rev=1411567&r1=1411566&r2=1411567&view=diff
==============================================================================
---
camel/trunk/components/camel-xmlrpc/src/test/java/org/apache/camel/component/xmlrpc/XmlRpcComponentTest.java
(original)
+++
camel/trunk/components/camel-xmlrpc/src/test/java/org/apache/camel/component/xmlrpc/XmlRpcComponentTest.java
Tue Nov 20 07:16:46 2012
@@ -52,14 +52,14 @@ public class XmlRpcComponentTest extends
mock.reset();
mock.expectedBodiesReceived("GreetMe!");
- template.requestBodyAndHeader(uri, new Object[]{"me"},
XmlRpcConstants.OPERATION_NAME, "hello");
+ template.requestBodyAndHeader(uri, new Object[]{"me"},
XmlRpcConstants.METHOD_NAME, "hello");
assertMockEndpointsSatisfied();
}
private void invokeServiceFaultResponse(String uri) throws Exception {
try {
- template.requestBodyAndHeader(uri, new Object[]{"me"},
XmlRpcConstants.OPERATION_NAME, "hello");
+ template.requestBodyAndHeader(uri, new Object[]{"me"},
XmlRpcConstants.METHOD_NAME, "hello");
fail("Expects the exception here");
} catch (Exception ex) {
assertTrue("Get a wrong exception.", ex instanceof
CamelExecutionException);
Modified:
camel/trunk/components/camel-xmlrpc/src/test/java/org/apache/camel/component/xmlrpc/converter/XmlRpcConverterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlrpc/src/test/java/org/apache/camel/component/xmlrpc/converter/XmlRpcConverterTest.java?rev=1411567&r1=1411566&r2=1411567&view=diff
==============================================================================
---
camel/trunk/components/camel-xmlrpc/src/test/java/org/apache/camel/component/xmlrpc/converter/XmlRpcConverterTest.java
(original)
+++
camel/trunk/components/camel-xmlrpc/src/test/java/org/apache/camel/component/xmlrpc/converter/XmlRpcConverterTest.java
Tue Nov 20 07:16:46 2012
@@ -32,7 +32,7 @@ public class XmlRpcConverterTest extends
public void testToXmlRpcRequest() throws Exception {
CamelContext context = new DefaultCamelContext();
Exchange exchange = new DefaultExchange(context);
- exchange.getIn().setHeader(XmlRpcConstants.OPERATION_NAME, "greet");
+ exchange.getIn().setHeader(XmlRpcConstants.METHOD_NAME, "greet");
exchange.getIn().setBody(new Object[] {"me", "you"});
XmlRpcRequest request = exchange.getIn().getBody(XmlRpcRequest.class);
