You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2012/01/20 22:51:17 UTC
svn commit: r1234163 - in /camel/branches/camel-2.9.x: ./
components/camel-cxf/
components/camel-cxf/src/main/java/org/apache/camel/component/cxf/
components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/
components/camel-cxf/src/mai...
Author: hadrian
Date: Fri Jan 20 21:51:15 2012
New Revision: 1234163
URL: http://svn.apache.org/viewvc?rev=1234163&view=rev
Log:
Merged revisions 1229572 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1229572 | dkulp | 2012-01-10 09:56:53 -0500 (Tue, 10 Jan 2012) | 2 lines
Fix warnings in camel-cxf, update to work with both 2.5.x and
2.6.0-SNAPSHOT
........
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/components/camel-cxf/pom.xml
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/WSDLServiceConfiguration.java
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/AbstractBeanDefinitionParser.java
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringBusFactoryBean.java
camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSServerFactoryBean.java
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfJavaOnlyPayloadModeTest.java
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerOperationTest.java
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/ConverterTest.java
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/MyCxfCustomerConverter.java
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CXFHolderRouteTest.java
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfMessageHelperTest.java
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsa/WSAddressingTest.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/components/camel-cxf/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/pom.xml?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/pom.xml (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/pom.xml Fri Jan 20 21:51:15 2012
@@ -269,6 +269,10 @@
<phase>generate-sources</phase>
<configuration>
<sourceRoot>${basedir}/target/generated</sourceRoot>
+ <defaultOptions>
+ <markGenerated>true</markGenerated>
+ <faultSerialVersionUID>1</faultSerialVersionUID>
+ </defaultOptions>
<wsdlOptions>
<wsdlOption>
<wsdl>${basedir}/src/test/resources/mtom.wsdl</wsdl>
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java Fri Jan 20 21:51:15 2012
@@ -138,6 +138,7 @@ public class CxfEndpoint extends Default
private List<AbstractFeature> features
= new ModCountCopyOnWriteArrayList<AbstractFeature>();
+ @SuppressWarnings("rawtypes")
private List<Handler> handlers;
private List<String> schemaLocations;
private String transportId;
@@ -345,6 +346,7 @@ public class CxfEndpoint extends Default
if (factoryBean instanceof JaxWsClientFactoryBean && handlers != null) {
AnnotationHandlerChainBuilder builder = new AnnotationHandlerChainBuilder();
JaxWsServiceFactoryBean sf = (JaxWsServiceFactoryBean)factoryBean.getServiceFactory();
+ @SuppressWarnings("rawtypes")
List<Handler> chain = new ArrayList<Handler>(handlers);
chain.addAll(builder.buildHandlerChainFromClass(sf.getServiceClass(),
@@ -358,7 +360,7 @@ public class CxfEndpoint extends Default
resourceManager = new DefaultResourceManager(resolvers);
resourceManager.addResourceResolver(new WebServiceContextResourceResolver());
ResourceInjector injector = new ResourceInjector(resourceManager);
- for (Handler h : chain) {
+ for (Handler<?> h : chain) {
if (Proxy.isProxyClass(h.getClass()) && getServiceClass() != null) {
injector.inject(h, getServiceClass());
injector.construct(h, getServiceClass());
@@ -944,10 +946,11 @@ public class CxfEndpoint extends Default
return features;
}
- public void setHandlers(List<Handler> h) {
+ public void setHandlers(@SuppressWarnings("rawtypes") List<Handler> h) {
handlers = h;
}
+ @SuppressWarnings("rawtypes")
public List<Handler> getHandlers() {
return handlers;
}
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfProducer.java Fri Jan 20 21:51:15 2012
@@ -264,7 +264,7 @@ public class CxfProducer extends Default
} else {
// maybe we can iterate the body and that way create a list for the parameters
// then end users do not need to trouble with List
- Iterator it = exchange.getIn().getBody(Iterator.class);
+ Iterator<?> it = exchange.getIn().getBody(Iterator.class);
if (it != null && it.hasNext()) {
list = exchange.getContext().getTypeConverter().convertTo(List.class, it);
if (list != null) {
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java Fri Jan 20 21:51:15 2012
@@ -414,7 +414,7 @@ public class DefaultCxfBinding implement
String contextKey) {
// extract from header
- Map context = (Map)camelHeaders.get(contextKey);
+ Map<String, ?> context = (Map<String, ?>)camelHeaders.get(contextKey);
if (context != null) {
cxfContext.putAll(context);
if (LOG.isTraceEnabled()) {
@@ -426,7 +426,7 @@ public class DefaultCxfBinding implement
}
// extract from exchange property
- context = (Map)camelExchange.getProperty(contextKey);
+ context = (Map<String, ?>)camelExchange.getProperty(contextKey);
if (context != null) {
cxfContext.putAll(context);
if (LOG.isTraceEnabled()) {
@@ -450,10 +450,9 @@ public class DefaultCxfBinding implement
* @param camelMessage
* @param exchange provides context for filtering
*/
- @SuppressWarnings("unchecked")
protected void propagateHeadersFromCxfToCamel(Message cxfMessage,
org.apache.camel.Message camelMessage, Exchange exchange) {
- Map<String, List<String>> cxfHeaders = (Map)cxfMessage.get(Message.PROTOCOL_HEADERS);
+ Map<String, List<String>> cxfHeaders = CastUtils.cast((Map<?, ?>)cxfMessage.get(Message.PROTOCOL_HEADERS));
Map<String, Object> camelHeaders = camelMessage.getHeaders();
camelHeaders.put(CxfConstants.CAMEL_CXF_MESSAGE, cxfMessage);
@@ -537,12 +536,12 @@ public class DefaultCxfBinding implement
// use a treemap to keep ordering and ignore key case
Map<String, List<String>> transportHeaders = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
if (camelExchange != null) {
- Map<String, List<String>> h = (Map)camelExchange.getProperty(Message.PROTOCOL_HEADERS);
+ Map<String, List<String>> h = CastUtils.cast((Map<?, ?>)camelExchange.getProperty(Message.PROTOCOL_HEADERS));
if (h != null) {
transportHeaders.putAll(h);
}
}
- Map<String, List<String>> headers = (Map)camelHeaders.get(Message.PROTOCOL_HEADERS);
+ Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)camelHeaders.get(Message.PROTOCOL_HEADERS));
if (headers != null) {
transportHeaders.putAll(headers);
}
@@ -679,7 +678,7 @@ public class DefaultCxfBinding implement
Object part = inObjects.get(partInfo);
if (part instanceof Holder) {
- part = ((Holder)part).value;
+ part = ((Holder<?>)part).value;
}
if (part instanceof Source) {
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/WSDLServiceConfiguration.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/WSDLServiceConfiguration.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/WSDLServiceConfiguration.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/WSDLServiceConfiguration.java Fri Jan 20 21:51:15 2012
@@ -23,6 +23,7 @@ import javax.wsdl.Service;
import javax.xml.namespace.QName;
import org.apache.camel.RuntimeCamelException;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.service.factory.AbstractServiceConfiguration;
import org.apache.cxf.wsdl.WSDLManager;
@@ -53,7 +54,7 @@ public class WSDLServiceConfiguration ex
protected QName getServiceQName() {
if (serviceQName == null) {
- Map services = getDefinition().getServices();
+ Map<QName, ?> services = CastUtils.cast(getDefinition().getServices());
if (services.size() == 0) {
throw new IllegalArgumentException("There is no service in the WSDL" + serviceFactoryBean.getWsdlURL());
}
@@ -72,7 +73,7 @@ public class WSDLServiceConfiguration ex
throw new IllegalArgumentException("There is no service " + serviceFactoryBean.getServiceQName()
+ " in WSDL " + serviceFactoryBean.getWsdlURL());
}
- Map ports = service.getPorts();
+ Map<String, ?> ports = CastUtils.cast(service.getPorts());
if (ports.size() == 0) {
throw new IllegalArgumentException("There is no port/endpoint in the service "
+ serviceFactoryBean.getServiceQName() + "of WSDL"
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/AbstractBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/AbstractBeanDefinitionParser.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/AbstractBeanDefinitionParser.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/AbstractBeanDefinitionParser.java Fri Jan 20 21:51:15 2012
@@ -42,7 +42,7 @@ public class AbstractBeanDefinitionParse
return id;
}
- public MutableBeanMetadata createBeanMetadata(Element element, ParserContext context, Class runtimeClass) {
+ public MutableBeanMetadata createBeanMetadata(Element element, ParserContext context, Class<?> runtimeClass) {
MutableBeanMetadata answer = context.createMetadata(MutableBeanMetadata.class);
answer.setRuntimeClass(runtimeClass);
answer.addProperty("blueprintContainer", createRef(context, "blueprintContainer"));
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java Fri Jan 20 21:51:15 2012
@@ -41,7 +41,7 @@ public class CxfNamespaceHandler impleme
return getClass().getClassLoader().getResource("schema/blueprint/camel-cxf.xsd");
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "rawtypes"})
public Set<Class> getManagedClasses() {
return new HashSet<Class>(Arrays.asList(CxfNamespaceHandler.class));
}
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/converter/CxfConverter.java Fri Jan 20 21:51:15 2012
@@ -60,8 +60,8 @@ public final class CxfConverter {
}
@Converter
- public static List<Class> toClassesList(final String[] classNames) throws ClassNotFoundException {
- List<Class> answer = new ArrayList<Class>();
+ public static List<Class<?>> toClassesList(final String[] classNames) throws ClassNotFoundException {
+ List<Class<?>> answer = new ArrayList<Class<?>>();
for (String className : classNames) {
answer.add(ClassLoaderUtils.loadClass(className.trim(), CxfConverter.class));
}
@@ -69,7 +69,7 @@ public final class CxfConverter {
}
@Converter
- public static List<Class> toClassList(String classeString) throws ClassNotFoundException {
+ public static List<Class<?>> toClassList(String classeString) throws ClassNotFoundException {
String[] classNames = classeString.split(",|;");
return toClassesList(classNames);
}
@@ -82,7 +82,7 @@ public final class CxfConverter {
@Converter
public static Object[] toArray(Object object) {
if (object instanceof Collection) {
- return ((Collection)object).toArray();
+ return ((Collection<?>)object).toArray();
} else {
Object answer[];
if (object == null) {
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanComponent.java Fri Jan 20 21:51:15 2012
@@ -34,10 +34,9 @@ public class CxfBeanComponent extends He
private Map<String, CxfBeanEndpoint> endpoints = new HashMap<String, CxfBeanEndpoint>();
- @SuppressWarnings("unchecked")
@Override
protected Endpoint createEndpoint(String uri, String remaining,
- Map parameters) throws Exception {
+ Map<String, Object> parameters) throws Exception {
// Extract the comma separated list of providers in advance of the auto-extraction
// that a DefaultEndpoint will perform (as the default one does not understand lists).
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/cxfbean/CxfBeanEndpoint.java Fri Jan 20 21:51:15 2012
@@ -75,7 +75,7 @@ public class CxfBeanEndpoint extends Pro
List<Object> serviceBeans;
if (obj instanceof List) {
- serviceBeans = (List)obj;
+ serviceBeans = (List<Object>)obj;
} else {
serviceBeans = new ArrayList<Object>(1);
serviceBeans.add(obj);
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/AbstractDataFormatFeature.java Fri Jan 20 21:51:15 2012
@@ -45,9 +45,9 @@ public abstract class AbstractDataFormat
}
protected void removeInterceptorWhichIsInThePhases(List<Interceptor<? extends Message>> interceptors, String[] phaseNames, Set<String> needToBeKept) {
- for (Interceptor i : interceptors) {
+ for (Interceptor<? extends Message> i : interceptors) {
if (i instanceof PhaseInterceptor) {
- PhaseInterceptor p = (PhaseInterceptor) i;
+ PhaseInterceptor<? extends Message> p = (PhaseInterceptor<? extends Message>) i;
for (String phaseName : phaseNames) {
if (p.getPhase().equals(phaseName)) {
// To support the old API
@@ -73,10 +73,10 @@ public abstract class AbstractDataFormat
}
protected void removeInterceptorWhichIsOutThePhases(List<Interceptor<? extends Message>> interceptors, String[] phaseNames, Set<String> needToBeKept) {
- for (Interceptor i : interceptors) {
+ for (Interceptor<? extends Message> i : interceptors) {
boolean outside = false;
if (i instanceof PhaseInterceptor) {
- PhaseInterceptor p = (PhaseInterceptor) i;
+ PhaseInterceptor<? extends Message> p = (PhaseInterceptor<? extends Message>) i;
for (String phaseName : phaseNames) {
if (p.getPhase().equals(phaseName)) {
outside = true;
@@ -97,8 +97,9 @@ public abstract class AbstractDataFormat
}
}
- protected void removeInterceptors(List<Interceptor<? extends Message>> interceptors, Collection<Class> toBeRemovedInterceptors) {
- for (Interceptor interceptor : interceptors) {
+ protected void removeInterceptors(List<Interceptor<? extends Message>> interceptors,
+ Collection<Class<?>> toBeRemovedInterceptors) {
+ for (Interceptor<? extends Message> interceptor : interceptors) {
if (toBeRemovedInterceptors.contains(interceptor.getClass())) {
getLogger().info("removing the interceptor " + interceptor);
interceptors.remove(interceptor);
@@ -107,8 +108,8 @@ public abstract class AbstractDataFormat
}
protected void removeInterceptor(List<Interceptor<? extends Message>> interceptors,
- Class<? extends Interceptor> cls) {
- for (Interceptor interceptor : interceptors) {
+ Class<? extends Interceptor<? extends Message>> cls) {
+ for (Interceptor<? extends Message> interceptor : interceptors) {
if (interceptor.getClass().equals(cls)) {
interceptors.remove(interceptor);
}
@@ -116,13 +117,13 @@ public abstract class AbstractDataFormat
}
public void addInIntercepters(List<Interceptor<? extends Message>> interceptors) {
- for (Interceptor interceptor : interceptors) {
+ for (Interceptor<? extends Message> interceptor : interceptors) {
inInterceptorNames.add(interceptor.getClass().getName());
}
}
public void addOutInterceptors(List<Interceptor<? extends Message>> interceptors) {
- for (Interceptor interceptor : interceptors) {
+ for (Interceptor<? extends Message> interceptor : interceptors) {
outInterceptorNames.add(interceptor.getClass().getName());
}
}
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/PayLoadDataFormatFeature.java Fri Jan 20 21:51:15 2012
@@ -44,10 +44,10 @@ import org.slf4j.LoggerFactory;
*/
public class PayLoadDataFormatFeature extends AbstractDataFormatFeature {
private static final Logger LOG = LoggerFactory.getLogger(PayLoadDataFormatFeature.class);
- private static final Collection<Class> REMOVING_FAULT_IN_INTERCEPTORS;
+ private static final Collection<Class<?>> REMOVING_FAULT_IN_INTERCEPTORS;
private static final boolean DEFAULT_ALLOW_STREAMING;
static {
- REMOVING_FAULT_IN_INTERCEPTORS = new ArrayList<Class>();
+ REMOVING_FAULT_IN_INTERCEPTORS = new ArrayList<Class<?>>();
REMOVING_FAULT_IN_INTERCEPTORS.add(ClientFaultConverter.class);
String s = System.getProperty("org.apache.camel.component.cxf.streaming");
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java Fri Jan 20 21:51:15 2012
@@ -132,13 +132,15 @@ public class CxfRsEndpoint extends Defau
}
}
+ @SuppressWarnings({"rawtypes", "unchecked"})
protected void setupJAXRSServerFactoryBean(JAXRSServerFactoryBean sfb) {
// address
if (getAddress() != null) {
sfb.setAddress(getAddress());
}
if (getResourceClasses() != null) {
- sfb.setResourceClasses(CastUtils.cast(getResourceClasses(), Class.class));
+ List res = CastUtils.cast(getResourceClasses());
+ sfb.setResourceClasses(res);
}
sfb.setStart(false);
}
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java Fri Jan 20 21:51:15 2012
@@ -99,7 +99,7 @@ public class CxfRsProducer extends Defau
cfb.setBus(((CxfRsEndpoint)getEndpoint()).getBus());
WebClient client = cfb.createWebClient();
String httpMethod = inMessage.getHeader(Exchange.HTTP_METHOD, String.class);
- Class responseClass = inMessage.getHeader(CxfConstants.CAMEL_CXF_RS_RESPONSE_CLASS, Class.class);
+ Class<?> responseClass = inMessage.getHeader(CxfConstants.CAMEL_CXF_RS_RESPONSE_CLASS, Class.class);
Type genericType = inMessage.getHeader(CxfConstants.CAMEL_CXF_RS_RESPONSE_GENERIC_TYPE, Type.class);
String path = inMessage.getHeader(Exchange.HTTP_PATH, String.class);
@@ -158,7 +158,7 @@ public class CxfRsProducer extends Defau
if (genericType instanceof ParameterizedType) {
// Get the collection member type first
Type[] actualTypeArguments = ((ParameterizedType) genericType).getActualTypeArguments();
- response = client.invokeAndGetCollection(httpMethod, body, (Class) actualTypeArguments[0]);
+ response = client.invokeAndGetCollection(httpMethod, body, (Class<?>) actualTypeArguments[0]);
} else {
throw new CamelExchangeException("Header " + CxfConstants.CAMEL_CXF_RS_RESPONSE_GENERIC_TYPE + " not found in message", exchange);
@@ -251,7 +251,7 @@ public class CxfRsProducer extends Defau
return answer;
}
- private Method findRightMethod(List<Class<?>> resourceClasses, String methodName, Class[] parameterTypes) throws NoSuchMethodException {
+ private Method findRightMethod(List<Class<?>> resourceClasses, String methodName, Class<?>[] parameterTypes) throws NoSuchMethodException {
Method answer = null;
for (Class<?> clazz : resourceClasses) {
try {
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanDefinitionParser.java Fri Jan 20 21:51:15 2012
@@ -24,6 +24,7 @@ import org.w3c.dom.Element;
import org.apache.camel.component.cxf.CxfSpringEndpoint;
import org.apache.cxf.common.util.StringUtils;
+import org.apache.cxf.helpers.CastUtils;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
@@ -69,12 +70,11 @@ public class CxfEndpointBeanDefinitionPa
}
}
- @SuppressWarnings("unchecked")
@Override
protected void mapElement(ParserContext ctx, BeanDefinitionBuilder bean, Element el, String name) {
if ("properties".equals(name)) {
- Map map = ctx.getDelegate().parseMapElement(el, bean.getBeanDefinition());
- Map props = getPropertyMap(bean, false);
+ Map<String, Object> map = CastUtils.cast(ctx.getDelegate().parseMapElement(el, bean.getBeanDefinition()));
+ Map<String, Object> props = getPropertyMap(bean, false);
if (props != null) {
map.putAll(props);
}
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsClientFactoryBeanDefinitionParser.java Fri Jan 20 21:51:15 2012
@@ -40,17 +40,17 @@ public class CxfRsClientFactoryBeanDefin
@Override
protected void mapElement(ParserContext ctx, BeanDefinitionBuilder bean, Element el, String name) {
if ("properties".equals(name) || "headers".equals(name)) {
- Map map = ctx.getDelegate().parseMapElement(el, bean.getBeanDefinition());
+ Map<?, ?> map = ctx.getDelegate().parseMapElement(el, bean.getBeanDefinition());
bean.addPropertyValue(name, map);
} else if ("binding".equals(name)) {
setFirstChildAsProperty(el, ctx, bean, "bindingConfig");
} else if ("inInterceptors".equals(name) || "inFaultInterceptors".equals(name)
|| "outInterceptors".equals(name) || "outFaultInterceptors".equals(name)) {
- List list = ctx.getDelegate().parseListElement(el, bean.getBeanDefinition());
+ List<?> list = ctx.getDelegate().parseListElement(el, bean.getBeanDefinition());
bean.addPropertyValue(name, list);
} else if ("features".equals(name) || "providers".equals(name)
|| "schemaLocations".equals(name) || "modelBeans".equals(name)) {
- List list = ctx.getDelegate().parseListElement(el, bean.getBeanDefinition());
+ List<?> list = ctx.getDelegate().parseListElement(el, bean.getBeanDefinition());
bean.addPropertyValue(name, list);
} else if ("model".equals(name)) {
List<UserResource> resources = ResourceUtils.getResourcesFromElement(el);
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/CxfRsServerFactoryBeanDefinitionParser.java Fri Jan 20 21:51:15 2012
@@ -42,7 +42,7 @@ public class CxfRsServerFactoryBeanDefin
if ("properties".equals(name)
|| "extensionMappings".equals(name)
|| "languageMappings".equals(name)) {
- Map map = ctx.getDelegate().parseMapElement(el, bean.getBeanDefinition());
+ Map<?, ?> map = ctx.getDelegate().parseMapElement(el, bean.getBeanDefinition());
bean.addPropertyValue(name, map);
} else if ("executor".equals(name)) {
setFirstChildAsProperty(el, ctx, bean, "serviceFactory.executor");
@@ -52,12 +52,12 @@ public class CxfRsServerFactoryBeanDefin
setFirstChildAsProperty(el, ctx, bean, "bindingConfig");
} else if ("inInterceptors".equals(name) || "inFaultInterceptors".equals(name)
|| "outInterceptors".equals(name) || "outFaultInterceptors".equals(name)) {
- List list = ctx.getDelegate().parseListElement(el, bean.getBeanDefinition());
+ List<?> list = ctx.getDelegate().parseListElement(el, bean.getBeanDefinition());
bean.addPropertyValue(name, list);
} else if ("features".equals(name) || "schemaLocations".equals(name)
|| "providers".equals(name) || "serviceBeans".equals(name)
|| "modelBeans".equals(name)) {
- List list = ctx.getDelegate().parseListElement(el, bean.getBeanDefinition());
+ List<?> list = ctx.getDelegate().parseListElement(el, bean.getBeanDefinition());
bean.addPropertyValue(name, list);
} else if ("model".equals(name)) {
List<UserResource> resources = ResourceUtils.getResourcesFromElement(el);
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringBusFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringBusFactoryBean.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringBusFactoryBean.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringBusFactoryBean.java Fri Jan 20 21:51:15 2012
@@ -31,12 +31,12 @@ import org.springframework.beans.factory
* You can still specify the spring extension file in the cfgFiles list and it will override
* the extensions which is load by CXF bus.
*/
-public class SpringBusFactoryBean implements SmartFactoryBean {
+public class SpringBusFactoryBean implements SmartFactoryBean<Bus> {
private String[] cfgFiles;
private boolean includeDefaultBus;
private SpringBusFactory bf;
- public Object getObject() throws Exception {
+ public Bus getObject() throws Exception {
bf = new SpringBusFactory();
if (cfgFiles != null) {
return bf.createBus(cfgFiles, includeDefaultBus);
@@ -45,7 +45,7 @@ public class SpringBusFactoryBean implem
}
}
- public Class getObjectType() {
+ public Class<?> getObjectType() {
return Bus.class;
}
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSServerFactoryBean.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSServerFactoryBean.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSServerFactoryBean.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/spring/SpringJAXRSServerFactoryBean.java Fri Jan 20 21:51:15 2012
@@ -67,11 +67,6 @@ public class SpringJAXRSServerFactoryBea
beanId = id;
}
- // to walk round the issue of setting the serviceClass in CXF
- public void setServiceClass(Class clazz) {
- setResourceClasses(clazz);
- }
-
// add this mothod for testing
List<String> getSchemaLocations() {
return schemaLocations;
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/AbstractCxfWsdlFirstTest.java Fri Jan 20 21:51:15 2012
@@ -109,7 +109,7 @@ public abstract class AbstractCxfWsdlFir
Exchange exchange = sendJaxWsMessageWithHolders("hello");
assertEquals("The request should be handled sucessfully ", exchange.isFailed(), false);
org.apache.camel.Message out = exchange.getOut();
- List result = out.getBody(List.class);
+ List<Object> result = out.getBody(List.class);
assertEquals("The result list should not be empty", result.size(), 4);
Holder<String> name = (Holder<String>) result.get(3);
assertEquals("we should get the right answer from router", "Bonjour", name.value);
@@ -122,9 +122,8 @@ public abstract class AbstractCxfWsdlFir
protected Exchange sendJaxWsMessageWithHolders(final String personIdString) {
Exchange exchange = template.send("direct:producer", new Processor() {
- @SuppressWarnings("unchecked")
public void process(final Exchange exchange) {
- final List params = new ArrayList();
+ final List<Object> params = new ArrayList<Object>();
Holder<String> personId = new Holder<String>();
personId.value = personIdString;
params.add(personId);
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfJavaOnlyPayloadModeTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfJavaOnlyPayloadModeTest.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfJavaOnlyPayloadModeTest.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfJavaOnlyPayloadModeTest.java Fri Jan 20 21:51:15 2012
@@ -52,7 +52,7 @@ public class CxfJavaOnlyPayloadModeTest
assertNotNull(output);
// using CxfPayload in payload mode
- CxfPayload payload = (CxfPayload) output;
+ CxfPayload<?> payload = (CxfPayload<?>) output;
// convert the payload body to string
String reply = context.getTypeConverter().convertTo(String.class, payload.getBody().get(0));
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerContextTest.java Fri Jan 20 21:51:15 2012
@@ -27,6 +27,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.message.Message;
import org.junit.Test;
@@ -39,7 +40,6 @@ public class CxfProducerContextTest exte
private static final String TEST_KEY = "sendSimpleMessage-test";
private static final String TEST_VALUE = "exchange property value should get passed through request context";
- @SuppressWarnings("unchecked")
@Test
public void testExchangePropertyPropagation() throws Exception {
Exchange exchange = sendSimpleMessage();
@@ -47,7 +47,7 @@ public class CxfProducerContextTest exte
// No direct access to native CXF Message but we can verify the
// request context from the Camel exchange
assertNotNull(exchange);
- Map<String, Object> requestContext = (Map)exchange.getProperty(Client.REQUEST_CONTEXT);
+ Map<String, Object> requestContext = CastUtils.cast((Map<?, ?>)exchange.getProperty(Client.REQUEST_CONTEXT));
assertNotNull(requestContext);
String actualValue = (String)requestContext.get(TEST_KEY);
assertEquals("exchange property should get propagated to the request context", TEST_VALUE, actualValue);
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerOperationTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerOperationTest.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerOperationTest.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerOperationTest.java Fri Jan 20 21:51:15 2012
@@ -82,7 +82,7 @@ public class CxfProducerOperationTest ex
para1.add("para1");
final List<String> para2 = new ArrayList<String>();
para2.add("para2");
- List<List> parameters = new ArrayList<List>();
+ List<List<String>> parameters = new ArrayList<List<String>>();
parameters.add(para1);
parameters.add(para2);
// The object array version is working too
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerRouterTest.java Fri Jan 20 21:51:15 2012
@@ -104,7 +104,7 @@ public class CxfProducerRouterTest exten
// The result will be extract from the MessageContentsList with the String class type
MessageContentsList result = (MessageContentsList)out.getBody();
LOG.info("Received output text: " + result.get(0));
- Map<String, Object> responseContext = CastUtils.cast((Map)out.getHeader(Client.RESPONSE_CONTEXT));
+ Map<String, Object> responseContext = CastUtils.cast((Map<?, ?>)out.getHeader(Client.RESPONSE_CONTEXT));
assertNotNull(responseContext);
assertEquals("We should get the response context here", "UTF-8", responseContext.get(org.apache.cxf.message.Message.ENCODING));
assertEquals("Reply body on Camel is wrong", "echo " + TEST_MESSAGE, result.get(0));
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java Fri Jan 20 21:51:15 2012
@@ -107,7 +107,7 @@ public class CxfProducerTest extends Ass
org.apache.camel.Message out = exchange.getOut();
String result = out.getBody(String.class);
LOG.info("Received output text: " + result);
- Map<String, Object> responseContext = CastUtils.cast((Map)out.getHeader(Client.RESPONSE_CONTEXT));
+ Map<String, Object> responseContext = CastUtils.cast((Map<?, ?>)out.getHeader(Client.RESPONSE_CONTEXT));
assertNotNull(responseContext);
assertEquals("We should get the response context here", "UTF-8", responseContext.get(org.apache.cxf.message.Message.ENCODING));
assertEquals("reply body on Camel", "echo " + TEST_MESSAGE, result);
@@ -130,7 +130,7 @@ public class CxfProducerTest extends Ass
org.apache.camel.Message out = exchange.getOut();
String result = out.getBody(String.class);
LOG.info("Received output text: " + result);
- Map<String, Object> responseContext = CastUtils.cast((Map)out.getHeader(Client.RESPONSE_CONTEXT));
+ Map<String, Object> responseContext = CastUtils.cast((Map<?, ?>)out.getHeader(Client.RESPONSE_CONTEXT));
assertNotNull(responseContext);
assertEquals("Get the wrong wsdl opertion name", "{http://apache.org/hello_world_soap_http}greetMe", responseContext.get("javax.xml.ws.wsdl.operation").toString());
assertEquals("reply body on Camel", "Hello " + TEST_MESSAGE, result);
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java Fri Jan 20 21:51:15 2012
@@ -23,6 +23,7 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.util.MessageHelper;
+import org.apache.cxf.helpers.CastUtils;
import org.junit.Test;
public class CxfRawMessageRouterTest extends CxfSimpleRouterTest {
@@ -49,8 +50,8 @@ public class CxfRawMessageRouterTest ext
HelloService client = getCXFClient();
client.echo("hello world");
assertMockEndpointsSatisfied();
- Map context = (Map)result.assertExchangeReceived(0).getIn().getHeaders().get("ResponseContext");
- Map protocalHeaders = (Map) context.get("org.apache.cxf.message.Message.PROTOCOL_HEADERS");
+ Map<?, ?> context = CastUtils.cast((Map<?, ?>)result.assertExchangeReceived(0).getIn().getHeaders().get("ResponseContext"));
+ Map<?, ?> protocalHeaders = CastUtils.cast((Map<?, ?>) context.get("org.apache.cxf.message.Message.PROTOCOL_HEADERS"));
assertTrue("Should get a right content type", protocalHeaders.get("content-type").toString().startsWith("[text/xml;"));
assertTrue("Should get a right context type with a charset", protocalHeaders.get("content-type").toString().indexOf("charset=") > 0);
assertEquals("Should get the response code ", context.get("org.apache.cxf.message.Message.RESPONSE_CODE"), 200);
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java Fri Jan 20 21:51:15 2012
@@ -78,7 +78,7 @@ public class DefaultCxfBindingTest exten
cxfBinding.populateCxfRequestFromExchange(cxfExchange, exchange, requestContext);
// check the protocol headers
- Map<String, List<String>> headers = CastUtils.cast((Map)requestContext.get(Message.PROTOCOL_HEADERS));
+ Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)requestContext.get(Message.PROTOCOL_HEADERS));
assertNotNull(headers);
assertTrue(headers.size() == 2);
@@ -155,7 +155,7 @@ public class DefaultCxfBindingTest exten
cxfMessage = cxfExchange.getOutMessage();
assertNotNull(cxfMessage);
- Map<String, List<String>> headers = CastUtils.cast((Map)cxfMessage.get(Message.PROTOCOL_HEADERS));
+ Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)cxfMessage.get(Message.PROTOCOL_HEADERS));
assertNotNull(headers);
assertTrue(headers.size() == 2);
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/ConverterTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/ConverterTest.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/ConverterTest.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/ConverterTest.java Fri Jan 20 21:51:15 2012
@@ -38,7 +38,7 @@ public class ConverterTest extends Asser
String classString = "java.lang.String, "
+ "org.apache.camel.component.cxf.converter.ConverterTest ;"
+ "java.lang.StringBuilder";
- List<Class> classList = CxfConverter.toClassList(classString);
+ List<Class<?>> classList = CxfConverter.toClassList(classString);
assertEquals("Get the wrong number of classes", classList.size(), 3);
assertEquals("Get the wrong the class", classList.get(0), String.class);
assertEquals("Get the wrong the class", classList.get(1), ConverterTest.class);
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/CxfPayloadConverterTest.java Fri Jan 20 21:51:15 2012
@@ -91,7 +91,7 @@ public class CxfPayloadConverterTest ext
public void testToCxfPayload() {
// use default type converter
exchange.getIn().setBody(inputStream);
- CxfPayload payload = exchange.getIn().getBody(CxfPayload.class);
+ CxfPayload<?> payload = exchange.getIn().getBody(CxfPayload.class);
assertTrue(payload instanceof CxfPayload);
assertEquals("Get a wrong size of body", 1, payload.getBody().size());
}
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/MyCxfCustomerConverter.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/MyCxfCustomerConverter.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/MyCxfCustomerConverter.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/converter/MyCxfCustomerConverter.java Fri Jan 20 21:51:15 2012
@@ -32,7 +32,7 @@ public final class MyCxfCustomerConverte
}
@Converter
- public static String cxfPayloadToString(final CxfPayload payload) {
+ public static String cxfPayloadToString(final CxfPayload<?> payload) {
XmlConverter converter = new XmlConverter();
StringBuilder buf = new StringBuilder();
for (Object element : payload.getBody()) {
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CXFHolderRouteTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CXFHolderRouteTest.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CXFHolderRouteTest.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CXFHolderRouteTest.java Fri Jan 20 21:51:15 2012
@@ -34,7 +34,7 @@ public class CXFHolderRouteTest extends
@SuppressWarnings("unchecked")
public void process(Exchange exchange) throws Exception {
Message in = exchange.getIn();
- List parameters = in.getBody(List.class);
+ List<Object> parameters = in.getBody(List.class);
int amount = (Integer) parameters.remove(1);
Holder<String> customer = (Holder<String>)parameters.get(1);
if (customer.value.length() == 0) {
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/holder/CxfHolderConsumerTest.java Fri Jan 20 21:51:15 2012
@@ -44,7 +44,7 @@ public class CxfHolderConsumerTest exten
@SuppressWarnings("unchecked")
public void process(Exchange exchange) throws Exception {
Message in = exchange.getIn();
- List parameters = in.getBody(List.class);
+ List<Object> parameters = in.getBody(List.class);
int amount = (Integer) parameters.remove(1);
Holder<String> customer = (Holder<String>)parameters.get(1);
if (customer.value.length() == 0) {
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerTest.java Fri Jan 20 21:51:15 2012
@@ -114,7 +114,7 @@ public class CxfRsProducerTest extends C
});
// get the response message
- List<Customer> response = CastUtils.cast((List) exchange.getOut().getBody());
+ List<Customer> response = CastUtils.cast((List<?>) exchange.getOut().getBody());
assertNotNull("The response should not be null ", response);
assertEquals("Get a wrong customer id ", String.valueOf(response.get(0).getId()), "113");
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomDisabledProducerPayloadModeTest.java Fri Jan 20 21:51:15 2012
@@ -43,6 +43,7 @@ import org.apache.camel.component.cxf.Cx
import org.apache.camel.cxf.mtom_feature.Hello;
import org.apache.cxf.attachment.AttachmentDataSource;
import org.apache.cxf.binding.soap.SoapHeader;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.helpers.IOUtils;
import org.junit.Assert;
@@ -121,12 +122,12 @@ public class CxfMtomDisabledProducerPayl
@Resource
WebServiceContext ctx;
- @SuppressWarnings("unchecked")
@Override
public void detail(Holder<byte[]> photo, Holder<Image> image) {
// verify request attachments
- Map<String, DataHandler> map = (Map) ctx.getMessageContext().get(MessageContext.INBOUND_MESSAGE_ATTACHMENTS);
+ Map<String, DataHandler> map
+ = CastUtils.cast((Map<?, ?>)ctx.getMessageContext().get(MessageContext.INBOUND_MESSAGE_ATTACHMENTS));
Assert.assertEquals(2, map.size());
DataHandler dh = map.get(MtomTestHelper.REQ_PHOTO_CID);
@@ -154,7 +155,7 @@ public class CxfMtomDisabledProducerPayl
Assert.assertEquals(39, bufferedImage.getHeight());
// add output attachments
- map = (Map) ctx.getMessageContext().get(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS);
+ map = CastUtils.cast((Map<?, ?>)ctx.getMessageContext().get(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS));
try {
DataSource ds = new AttachmentDataSource("image/jpeg", getClass().getResourceAsStream("/Splash.jpg"));
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java Fri Jan 20 21:51:15 2012
@@ -22,7 +22,6 @@ import java.lang.reflect.InvocationHandl
import java.lang.reflect.Proxy;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -510,7 +509,7 @@ public class CxfMessageHeadersRelayTest
org.apache.camel.Message out = exchange.getOut();
MessageContentsList result = (MessageContentsList)out.getBody();
- Map<String, Object> responseContext = CastUtils.cast((Map)out.getHeader(Client.RESPONSE_CONTEXT));
+ Map<String, Object> responseContext = CastUtils.cast((Map<?, ?>)out.getHeader(Client.RESPONSE_CONTEXT));
assertNotNull(responseContext);
assertTrue("Expected the out of band header to propagate but it didn't",
result.get(0) != null && ((Me)result.get(0)).getFirstName().equals("pass"));
@@ -535,7 +534,7 @@ public class CxfMessageHeadersRelayTest
MessageContentsList result = (MessageContentsList)out.getBody();
assertTrue("Expected the out of band header to propagate but it didn't",
result.get(0) != null && ((Me)result.get(0)).getFirstName().equals("pass"));
- Map<String, Object> responseContext = CastUtils.cast((Map)out.getHeader(Client.RESPONSE_CONTEXT));
+ Map<String, Object> responseContext = CastUtils.cast((Map<?, ?>)out.getHeader(Client.RESPONSE_CONTEXT));
assertNotNull(responseContext);
validateReturnedOutOfBandHeader(responseContext);
}
@@ -564,7 +563,7 @@ public class CxfMessageHeadersRelayTest
MessageContentsList result = (MessageContentsList)out.getBody();
assertTrue("Expected the out of band header to propagate but it didn't",
result.get(0) != null && ((Me)result.get(0)).getFirstName().equals("pass"));
- Map<String, Object> responseContext = CastUtils.cast((Map)out.getHeader(Client.RESPONSE_CONTEXT));
+ Map<String, Object> responseContext = CastUtils.cast((Map<?, ?>)out.getHeader(Client.RESPONSE_CONTEXT));
assertNotNull(responseContext);
validateReturnedOutOfBandHeader(responseContext);
}
@@ -591,7 +590,7 @@ public class CxfMessageHeadersRelayTest
protected static void validateReturnedOutOfBandHeader(Map<String, Object> responseContext, boolean expect) {
OutofBandHeader hdrToTest = null;
- List oobHdr = (List)responseContext.get(Header.HEADER_LIST);
+ List<Header> oobHdr = CastUtils.cast((List<?>)responseContext.get(Header.HEADER_LIST));
if (!expect) {
if (oobHdr == null || (oobHdr != null && oobHdr.size() == 0)) {
return;
@@ -605,22 +604,15 @@ public class CxfMessageHeadersRelayTest
assertTrue("HeaderHolder list expected to conain 1 object received " + oobHdr.size(),
oobHdr.size() == 1);
- if (oobHdr != null & oobHdr instanceof List) {
- Iterator iter = oobHdr.iterator();
- while (iter.hasNext()) {
- Object hdr = iter.next();
- if (hdr instanceof Header) {
- Header hdr1 = (Header)hdr;
- if (hdr1.getObject() instanceof Node) {
- try {
- JAXBElement job = (JAXBElement)JAXBContext
- .newInstance(org.apache.cxf.outofband.header.ObjectFactory.class)
- .createUnmarshaller().unmarshal((Node)hdr1.getObject());
- hdrToTest = (OutofBandHeader)job.getValue();
- } catch (JAXBException ex) {
- ex.printStackTrace();
- }
- }
+ for (Header hdr1 : oobHdr) {
+ if (hdr1.getObject() instanceof Node) {
+ try {
+ JAXBElement<?> job = (JAXBElement<?>)JAXBContext
+ .newInstance(org.apache.cxf.outofband.header.ObjectFactory.class)
+ .createUnmarshaller().unmarshal((Node)hdr1.getObject());
+ hdrToTest = (OutofBandHeader)job.getValue();
+ } catch (JAXBException ex) {
+ ex.printStackTrace();
}
}
}
@@ -655,7 +647,7 @@ public class CxfMessageHeadersRelayTest
protected static void validateReturnedOutOfBandHeaderWithInsertion(Map<String, Object> responseContext, boolean expect) {
List<OutofBandHeader> hdrToTest = new ArrayList<OutofBandHeader>();
- List oobHdr = (List)responseContext.get(Header.HEADER_LIST);
+ List<Header> oobHdr = CastUtils.cast((List<?>)responseContext.get(Header.HEADER_LIST));
if (!expect) {
if (oobHdr == null || (oobHdr != null && oobHdr.size() == 0)) {
return;
@@ -669,22 +661,15 @@ public class CxfMessageHeadersRelayTest
assertTrue("HeaderHolder list expected to conain 2 object received " + oobHdr.size(),
oobHdr.size() == 2);
- if (oobHdr != null & oobHdr instanceof List) {
- Iterator iter = oobHdr.iterator();
- while (iter.hasNext()) {
- Object hdr = iter.next();
- if (hdr instanceof Header) {
- Header hdr1 = (Header)hdr;
- if (hdr1.getObject() instanceof Node) {
- try {
- JAXBElement job = (JAXBElement)JAXBContext
- .newInstance(org.apache.cxf.outofband.header.ObjectFactory.class)
- .createUnmarshaller().unmarshal((Node)hdr1.getObject());
- hdrToTest.add((OutofBandHeader)job.getValue());
- } catch (JAXBException ex) {
- ex.printStackTrace();
- }
- }
+ for (Header hdr1 : oobHdr) {
+ if (hdr1.getObject() instanceof Node) {
+ try {
+ JAXBElement<?> job = (JAXBElement<?>)JAXBContext
+ .newInstance(org.apache.cxf.outofband.header.ObjectFactory.class)
+ .createUnmarshaller().unmarshal((Node)hdr1.getObject());
+ hdrToTest.add((OutofBandHeader)job.getValue());
+ } catch (JAXBException ex) {
+ ex.printStackTrace();
}
}
}
@@ -709,9 +694,8 @@ public class CxfMessageHeadersRelayTest
public static class InsertRequestOutHeaderProcessor implements Processor {
- @SuppressWarnings("unchecked")
public void process(Exchange exchange) throws Exception {
- List<SoapHeader> soapHeaders = (List)exchange.getIn().getHeader(Header.HEADER_LIST);
+ List<SoapHeader> soapHeaders = CastUtils.cast((List<?>)exchange.getIn().getHeader(Header.HEADER_LIST));
// Insert a new header
String xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?><outofbandHeader "
@@ -734,9 +718,8 @@ public class CxfMessageHeadersRelayTest
public static class InsertResponseOutHeaderProcessor implements Processor {
- @SuppressWarnings("unchecked")
public void process(Exchange exchange) throws Exception {
- List<SoapHeader> soapHeaders = (List)exchange.getIn().getHeader(Header.HEADER_LIST);
+ List<SoapHeader> soapHeaders = CastUtils.cast((List<?>)exchange.getIn().getHeader(Header.HEADER_LIST));
// Insert a new header
String xml = "<?xml version=\"1.0\" encoding=\"utf-8\"?><outofbandHeader "
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java Fri Jan 20 21:51:15 2012
@@ -26,6 +26,7 @@ import javax.xml.ws.handler.MessageConte
import org.w3c.dom.Node;
import org.apache.cxf.headers.Header;
+import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.outofband.header.OutofBandHeader;
@@ -38,7 +39,7 @@ public class HeaderTesterWithInsertionIm
if (ctx != null
&& !ctx.containsKey(Header.HEADER_LIST)
|| (ctx.containsKey(Header.HEADER_LIST)
- && ((List)ctx.get(Header.HEADER_LIST)).size() == 0)) {
+ && ((List<?>)ctx.get(Header.HEADER_LIST)).size() == 0)) {
return true;
}
return false;
@@ -46,7 +47,7 @@ public class HeaderTesterWithInsertionIm
boolean success = false;
if (ctx != null && ctx.containsKey(Header.HEADER_LIST)) {
- List oobHdr = (List) ctx.get(Header.HEADER_LIST);
+ List<Header> oobHdr = CastUtils.cast((List<?>) ctx.get(Header.HEADER_LIST));
if (oobHdr.size() != 2) {
throw new RuntimeException("test failed expected 2 soap headers but found " + oobHdr.size());
}
@@ -65,8 +66,8 @@ public class HeaderTesterWithInsertionIm
if (hdr instanceof Header && ((Header) hdr).getObject() instanceof Node) {
Header hdr1 = (Header) hdr;
try {
- JAXBElement job =
- (JAXBElement)JAXBContext.newInstance(org.apache.cxf.outofband.header.ObjectFactory.class)
+ JAXBElement<?> job =
+ (JAXBElement<?>)JAXBContext.newInstance(org.apache.cxf.outofband.header.ObjectFactory.class)
.createUnmarshaller()
.unmarshal((Node) hdr1.getObject());
OutofBandHeader ob = (OutofBandHeader) job.getValue();
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfMessageHelperTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfMessageHelperTest.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfMessageHelperTest.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/util/CxfMessageHelperTest.java Fri Jan 20 21:51:15 2012
@@ -85,7 +85,7 @@ public class CxfMessageHelperTest extend
exchange.getIn().setHeader("soapAction", "urn:hello:world");
message = CxfMessageHelper.getCxfInMessage(headerFilterStrategy, exchange, false);
// test message
- Map<String, List<String>> headers = CastUtils.cast((Map)message.get(Message.PROTOCOL_HEADERS));
+ Map<String, List<String>> headers = CastUtils.cast((Map<?, ?>)message.get(Message.PROTOCOL_HEADERS));
// verify there is no duplicate
assertNotNull("The headers must be present", headers);
Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsa/WSAddressingTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsa/WSAddressingTest.java?rev=1234163&r1=1234162&r2=1234163&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsa/WSAddressingTest.java (original)
+++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/wsa/WSAddressingTest.java Fri Jan 20 21:51:15 2012
@@ -129,7 +129,7 @@ public class WSAddressingTest extends Ab
public static class RemoveRequestOutHeaderProcessor implements Processor {
public void process(Exchange exchange) throws Exception {
- List headerList = (List) exchange.getIn().getHeader(Header.HEADER_LIST);
+ List<?> headerList = (List<?>) exchange.getIn().getHeader(Header.HEADER_LIST);
assertNotNull("We should get the header list.", headerList);
assertEquals("Get a wrong size of header list.", 4, headerList.size());
// we don't need send the soap headers to the client