Author: wtam
Date: Thu Feb 19 19:51:49 2009
New Revision: 745978
URL: http://svn.apache.org/viewvc?rev=745978&view=rev
Log:
fixed some warnings, [CAMEL-1351] camel-cxf should preserve user-* phase
interceptors
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerMessageTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadRouterTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageCustomizedExceptionTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRouterTestSupport.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSimpleRouterTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderConvertStringTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/MyProcessor.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java?rev=745978&r1=745977&r2=745978&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
Thu Feb 19 19:51:49 2009
@@ -31,6 +31,7 @@
protected abstract Logger getLogger();
+ @SuppressWarnings("unchecked")
protected void removeInterceptorWhichIsInThePhases(List<Interceptor>
interceptors, String[] phaseNames) {
for (Interceptor i : interceptors) {
if (i instanceof PhaseInterceptor) {
@@ -46,6 +47,7 @@
}
}
+ @SuppressWarnings("unchecked")
protected void removeInterceptorWhichIsOutThePhases(List<Interceptor>
interceptors, String[] phaseNames) {
for (Interceptor i : interceptors) {
boolean outside = false;
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java?rev=745978&r1=745977&r2=745978&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/MessageDataFormatFeature.java
Thu Feb 19 19:51:49 2009
@@ -44,11 +44,11 @@
private static final Logger LOG =
LogUtils.getL7dLogger(MessageDataFormatFeature.class);
// filter the unused in phase interceptor
- private static final String[] REMAINING_IN_PHASES = {Phase.RECEIVE ,
Phase.INVOKE,
- Phase.POST_INVOKE};
+ private static final String[] REMAINING_IN_PHASES = {Phase.RECEIVE ,
Phase.USER_STREAM,
+ Phase.INVOKE, Phase.POST_INVOKE};
// filter the unused in phase interceptor
- private static final String[] REMAINING_OUT_PHASES = {Phase.PREPARE_SEND,
Phase.WRITE,
- Phase.SEND, Phase.PREPARE_SEND_ENDING};
+ private static final String[] REMAINING_OUT_PHASES = {Phase.PREPARE_SEND,
Phase.USER_STREAM,
+ Phase.WRITE, Phase.SEND, Phase.PREPARE_SEND_ENDING};
@Override
public void initialize(Client client, Bus bus) {
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerMessageTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerMessageTest.java?rev=745978&r1=745977&r2=745978&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerMessageTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerMessageTest.java
Thu Feb 19 19:51:49 2009
@@ -16,18 +16,13 @@
*/
package org.apache.camel.component.cxf;
-import java.util.List;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
public class CxfConsumerMessageTest extends CxfConsumerTest {
- private static final transient Log LOG =
LogFactory.getLog(CxfConsumerMessageTest.class);
private static final String ECHO_METHOD = "ns1:echo
xmlns:ns1=\"http://cxf.component.camel.apache.org/\"";;
private static final String ECHO_RESPONSE = "<soap:Envelope
xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\";>"
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java?rev=745978&r1=745977&r2=745978&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfConsumerTest.java
Thu Feb 19 19:51:49 2009
@@ -17,7 +17,6 @@
package org.apache.camel.component.cxf;
-import java.util.ArrayList;
import java.util.List;
import org.apache.camel.ContextTestSupport;
@@ -25,8 +24,6 @@
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.cxf.BusFactory;
import org.apache.cxf.frontend.ClientFactoryBean;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
@@ -36,7 +33,6 @@
protected static final String SIMPLE_ENDPOINT_ADDRESS =
"http://localhost:28080/test";;
protected static final String SIMPLE_ENDPOINT_URI = "cxf://" +
SIMPLE_ENDPOINT_ADDRESS
+ "?serviceClass=org.apache.camel.component.cxf.HelloService";
- private static final transient Log LOG =
LogFactory.getLog(CxfProducerRouterTest.class);
private static final String ECHO_OPERATION = "echo";
private static final String ECHO_BOOLEAN_OPERATION = "echoBoolean";
@@ -51,7 +47,7 @@
public void process(final Exchange exchange) {
Message in = exchange.getIn();
// Get the parameter list
- List parameter = in.getBody(List.class);
+ List<?> parameter = in.getBody(List.class);
// Get the operation name
String operation =
(String)in.getHeader(CxfConstants.OPERATION_NAME);
Object result = operation + " " +
(String)parameter.get(0);
@@ -63,7 +59,7 @@
public void process(final Exchange exchange) {
Message in = exchange.getIn();
// Get the parameter list
- List parameter = in.getBody(List.class);
+ List<?> parameter = in.getBody(List.class);
// Put the result back
exchange.getOut().setBody((Boolean)parameter.get(0));
}
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java?rev=745978&r1=745977&r2=745978&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
Thu Feb 19 19:51:49 2009
@@ -16,14 +16,9 @@
*/
package org.apache.camel.component.cxf;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java?rev=745978&r1=745977&r2=745978&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterMessageRouterTest.java
Thu Feb 19 19:51:49 2009
@@ -17,9 +17,7 @@
package org.apache.camel.component.cxf;
-import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.spring.SpringCamelContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadRouterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadRouterTest.java?rev=745978&r1=745977&r2=745978&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadRouterTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfGreeterPayLoadRouterTest.java
Thu Feb 19 19:51:49 2009
@@ -16,9 +16,7 @@
*/
package org.apache.camel.component.cxf;
-import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.spring.SpringCamelContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageCustomizedExceptionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageCustomizedExceptionTest.java?rev=745978&r1=745977&r2=745978&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageCustomizedExceptionTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageCustomizedExceptionTest.java
Thu Feb 19 19:51:49 2009
@@ -17,8 +17,6 @@
package org.apache.camel.component.cxf;
-import org.apache.cxf.BusFactory;
-
/**
* Test for throwing the CustomizedException from Camel CXF consumer with
MESSAGE DataFormat
*/
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRouterTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRouterTestSupport.java?rev=745978&r1=745977&r2=745978&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRouterTestSupport.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRouterTestSupport.java
Thu Feb 19 19:51:49 2009
@@ -16,18 +16,10 @@
*/
package org.apache.camel.component.cxf;
-import org.apache.camel.CamelContext;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.DefaultCamelContext;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.endpoint.Server;
-import org.apache.cxf.endpoint.ServerImpl;
-import org.apache.cxf.frontend.ClientFactoryBean;
-import org.apache.cxf.frontend.ClientProxyFactoryBean;
-import org.apache.cxf.frontend.ServerFactoryBean;
-
public abstract class CxfRouterTestSupport extends ContextTestSupport {
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSimpleRouterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSimpleRouterTest.java?rev=745978&r1=745977&r2=745978&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSimpleRouterTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSimpleRouterTest.java
Thu Feb 19 19:51:49 2009
@@ -20,7 +20,6 @@
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.cxf.endpoint.ServerImpl;
import org.apache.cxf.frontend.ClientFactoryBean;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
import org.apache.cxf.frontend.ServerFactoryBean;
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderConvertStringTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderConvertStringTest.java?rev=745978&r1=745977&r2=745978&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderConvertStringTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapMessageProviderConvertStringTest.java
Thu Feb 19 19:51:49 2009
@@ -16,17 +16,8 @@
*/
package org.apache.camel.component.cxf;
-import java.lang.reflect.UndeclaredThrowableException;
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.spring.processor.SpringTestHelper;
-import org.apache.hello_world_soap_http.Greeter;
-import org.apache.hello_world_soap_http.SOAPService;
-
public class CxfSoapMessageProviderConvertStringTest extends
CxfSoapMessageProviderTest {
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/MyProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/MyProcessor.java?rev=745978&r1=745977&r2=745978&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/MyProcessor.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/MyProcessor.java
Thu Feb 19 19:51:49 2009
@@ -33,7 +33,7 @@
Thread.sleep(4000);
Message in = exchange.getIn();
// Get the parameter list
- List parameter = in.getBody(List.class);
+ List<?> parameter = in.getBody(List.class);
// Get the operation name
String operation = (String)in.getHeader(CxfConstants.OPERATION_NAME);
Object result = operation + " " + (String)parameter.get(0);
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java?rev=745978&r1=745977&r2=745978&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/non_wrapper/PersonProcessor.java
Thu Feb 19 19:51:49 2009
@@ -22,7 +22,6 @@
import org.apache.camel.non_wrapper.types.GetPersonResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.cxf.message.MessageContentsList;
import org.apache.cxf.service.model.BindingOperationInfo;
// START SNIPPET: personProcessor
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java?rev=745978&r1=745977&r2=745978&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/wsdl_first/PersonProcessor.java
Thu Feb 19 19:51:49 2009
@@ -20,7 +20,6 @@
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.wsdl_first.types.GetPersonResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.cxf.message.MessageContentsList;
