You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/01/08 04:15:07 UTC
svn commit: r1228770 - in /cxf/trunk:
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/http/
rt/frontend/jaxws/src/main/java...
Author: dkulp
Date: Sun Jan 8 03:15:06 2012
New Revision: 1228770
URL: http://svn.apache.org/viewvc?rev=1228770&view=rev
Log:
JAX-WS Spec jars use plan List<Handler> which raises rawType warnings. All we can do is suppress them in this case.
Modified:
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/AbstractBindingImpl.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/http/HTTPBindingImpl.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerResolverImpl.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageContextImpl.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java
cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java
cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointImpl.java Sun Jan 8 03:15:06 2012
@@ -111,6 +111,7 @@ public class EndpointImpl extends javax.
= new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
private List<Interceptor<? extends Message>> inFault
= new ModCountCopyOnWriteArrayList<Interceptor<? extends Message>>();
+ @SuppressWarnings("rawtypes")
private List<Handler> handlers = new ModCountCopyOnWriteArrayList<Handler>();
/**
@@ -718,10 +719,11 @@ public class EndpointImpl extends javax.
public void setOutFaultInterceptors(List<Interceptor<? extends Message>> interceptors) {
outFault = interceptors;
}
- public void setHandlers(List<Handler> h) {
+ public void setHandlers(@SuppressWarnings("rawtypes") List<Handler> h) {
handlers.clear();
handlers.addAll(h);
}
+ @SuppressWarnings("rawtypes")
public List<Handler> getHandlers() {
return handlers;
}
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsProxyFactoryBean.java Sun Jan 8 03:15:06 2012
@@ -60,6 +60,7 @@ import org.apache.cxf.service.model.Serv
*/
@NoJSR250Annotations
public class JaxWsProxyFactoryBean extends ClientProxyFactoryBean {
+ @SuppressWarnings("rawtypes")
List<Handler> handlers = new ArrayList<Handler>();
boolean loadHandlers = true;
@@ -84,7 +85,7 @@ public class JaxWsProxyFactoryBean exten
*
* @param h a <code>List</code> of <code>Handler</code> objects
*/
- public void setHandlers(List<Handler> h) {
+ public void setHandlers(@SuppressWarnings("rawtypes") List<Handler> h) {
handlers.clear();
handlers.addAll(h);
}
@@ -93,6 +94,7 @@ public class JaxWsProxyFactoryBean exten
*
* @return a <code>List</code> of <code>Handler</code> objects
*/
+ @SuppressWarnings("rawtypes")
public List<Handler> getHandlers() {
return handlers;
}
@@ -187,6 +189,7 @@ public class JaxWsProxyFactoryBean exten
private void buildHandlerChain(JaxWsClientProxy cp) {
AnnotationHandlerChainBuilder builder = new AnnotationHandlerChainBuilder();
JaxWsServiceFactoryBean sf = (JaxWsServiceFactoryBean)getServiceFactory();
+ @SuppressWarnings("rawtypes")
List<Handler> chain = new ArrayList<Handler>(handlers);
if (loadHandlers) {
chain.addAll(builder.buildHandlerChainFromClass(sf.getServiceClass(),
@@ -201,7 +204,7 @@ public class JaxWsProxyFactoryBean exten
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());
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsServerFactoryBean.java Sun Jan 8 03:15:06 2012
@@ -62,6 +62,7 @@ import org.apache.cxf.service.model.Bind
*/
public class JaxWsServerFactoryBean extends ServerFactoryBean {
protected boolean doInit;
+ @SuppressWarnings("rawtypes")
protected List<Handler> handlers = new ArrayList<Handler>();
private boolean blockPostConstruct;
@@ -82,13 +83,14 @@ public class JaxWsServerFactoryBean exte
public JaxWsServiceFactoryBean getJaxWsServiceFactory() {
return (JaxWsServiceFactoryBean)getServiceFactory();
}
- public void setHandlers(List<Handler> h) {
+ public void setHandlers(@SuppressWarnings("rawtypes") List<Handler> h) {
handlers.clear();
handlers.addAll(h);
}
- public void addHandlers(List<Handler> h) {
+ public void addHandlers(@SuppressWarnings("rawtypes") List<Handler> h) {
handlers.addAll(h);
}
+ @SuppressWarnings("rawtypes")
public List<Handler> getHandlers() {
return handlers;
}
@@ -237,11 +239,12 @@ public class JaxWsServerFactoryBean exte
private void buildHandlerChain() {
AnnotationHandlerChainBuilder builder = new AnnotationHandlerChainBuilder();
JaxWsServiceFactoryBean sf = (JaxWsServiceFactoryBean)getServiceFactory();
+ @SuppressWarnings("rawtypes")
List<Handler> chain = new ArrayList<Handler>(handlers);
chain.addAll(builder.buildHandlerChainFromClass(getServiceBeanClass(), sf.getEndpointInfo()
.getName(), sf.getServiceQName(), this.getBindingId()));
- for (Handler h : chain) {
+ for (Handler<?> h : chain) {
injectResources(h);
}
((JaxWsEndpointImpl)getServer().getEndpoint()).getJaxwsBinding().setHandlerChain(chain);
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/ServiceImpl.java Sun Jan 8 03:15:06 2012
@@ -483,6 +483,7 @@ public class ServiceImpl extends Service
client.setExecutor(executor);
JaxWsEndpointImpl jaxwsEndpoint = (JaxWsEndpointImpl) client.getEndpoint();
configureObject(jaxwsEndpoint);
+ @SuppressWarnings("rawtypes")
List<Handler> hc = jaxwsEndpoint.getJaxwsBinding().getHandlerChain();
hc.addAll(handlerResolver.getHandlerChain(portInfos.get(portName)));
@@ -644,6 +645,7 @@ public class ServiceImpl extends Service
&& clientFac.getBus() != null) {
clientBus = clientFac.getBus();
}
+ @SuppressWarnings("rawtypes")
List<Handler> hc = clientFac.getHandlers();
//CXF-3956
hc.addAll(handlerResolver.getHandlerChain(portInfos.get(portName)));
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/AbstractBindingImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/AbstractBindingImpl.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/AbstractBindingImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/AbstractBindingImpl.java Sun Jan 8 03:15:06 2012
@@ -28,6 +28,7 @@ import javax.xml.ws.handler.Handler;
import org.apache.cxf.jaxws.support.JaxWsEndpointImpl;
public abstract class AbstractBindingImpl implements Binding {
+ @SuppressWarnings("rawtypes")
private List<Handler> handlerChain = new ArrayList<Handler>();
private final JaxWsEndpointImpl endpoint;
@@ -36,12 +37,13 @@ public abstract class AbstractBindingImp
}
+ @SuppressWarnings("rawtypes")
public List<Handler> getHandlerChain() {
//per spec, this should be a copy
return new ArrayList<Handler>(handlerChain);
}
- public void setHandlerChain(List<Handler> hc) {
+ public void setHandlerChain(@SuppressWarnings("rawtypes") List<Handler> hc) {
handlerChain = hc;
if (handlerChain == null || handlerChain.isEmpty()) {
endpoint.removeHandlerInterceptors();
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/http/HTTPBindingImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/http/HTTPBindingImpl.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/http/HTTPBindingImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/binding/http/HTTPBindingImpl.java Sun Jan 8 03:15:06 2012
@@ -41,6 +41,7 @@ public class HTTPBindingImpl extends Abs
return "http://cxf.apache.org/bindings/xformat";
}
+ @SuppressWarnings("rawtypes")
@Override
public void setHandlerChain(List<Handler> hc) {
super.setHandlerChain(hc);
@@ -48,7 +49,7 @@ public class HTTPBindingImpl extends Abs
}
private void validate() {
- for (Handler handler : this.getHandlerChain()) {
+ for (Handler<?> handler : this.getHandlerChain()) {
if (!(handler instanceof LogicalHandler)) {
throw new WebServiceException("Adding an incompatible handler in HTTPBinding: "
+ handler.getClass());
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilder.java Sun Jan 8 03:15:06 2012
@@ -49,6 +49,7 @@ import org.apache.cxf.common.util.String
import org.apache.cxf.helpers.XMLUtils;
import org.apache.cxf.jaxws.javaee.PortComponentHandlerType;
+@SuppressWarnings("rawtypes")
public class AnnotationHandlerChainBuilder extends HandlerChainBuilder {
private static final Logger LOG = LogUtils.getL7dLogger(AnnotationHandlerChainBuilder.class);
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainBuilder.java Sun Jan 8 03:15:06 2012
@@ -42,6 +42,7 @@ import org.apache.cxf.jaxws.javaee.PortC
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.resource.ResourceResolver;
+@SuppressWarnings("rawtypes")
public class HandlerChainBuilder {
static final Logger LOG = LogUtils.getL7dLogger(HandlerChainBuilder.class);
private static final ResourceBundle BUNDLE = LOG.getResourceBundle();
@@ -92,12 +93,12 @@ public class HandlerChainBuilder {
*/
public List<Handler> sortHandlers(List<Handler> handlers) {
- List<LogicalHandler> logicalHandlers = new ArrayList<LogicalHandler>();
- List<Handler> protocolHandlers = new ArrayList<Handler>();
+ List<LogicalHandler<?>> logicalHandlers = new ArrayList<LogicalHandler<?>>();
+ List<Handler<?>> protocolHandlers = new ArrayList<Handler<?>>();
- for (Handler handler : handlers) {
+ for (Handler<?> handler : handlers) {
if (handler instanceof LogicalHandler) {
- logicalHandlers.add((LogicalHandler)handler);
+ logicalHandlers.add((LogicalHandler<?>)handler);
} else {
protocolHandlers.add(handler);
}
@@ -123,7 +124,7 @@ public class HandlerChainBuilder {
.getValue()), true, classLoader)
.asSubclass(Handler.class);
- Handler handler = handlerClass.newInstance();
+ Handler<?> handler = handlerClass.newInstance();
LOG.fine("adding handler to chain: " + handler);
configureHandler(handler, ht);
handlerChain.add(handler);
@@ -155,7 +156,7 @@ public class HandlerChainBuilder {
return handlerFile;
}
- private void configureHandler(Handler handler, PortComponentHandlerType h) {
+ private void configureHandler(Handler<?> handler, PortComponentHandlerType h) {
if (!handlerInitEnabled) {
return;
}
@@ -179,7 +180,7 @@ public class HandlerChainBuilder {
}
}
- private void initializeViaInjection(Handler handler, final Map<String, String> params) {
+ private void initializeViaInjection(Handler<?> handler, final Map<String, String> params) {
if (bus != null) {
ResourceManager resMgr = bus.getExtension(ResourceManager.class);
List<ResourceResolver> resolvers = resMgr.getResourceResolvers();
@@ -190,7 +191,7 @@ public class HandlerChainBuilder {
}
}
- private void initializeViaInitMethod(Handler handler, Map<String, String> params, Method init) {
+ private void initializeViaInitMethod(Handler<?> handler, Map<String, String> params, Method init) {
try {
init.invoke(handler, params);
} catch (InvocationTargetException ex) {
@@ -201,7 +202,7 @@ public class HandlerChainBuilder {
}
}
- private Method getInitMethod(Handler handler) {
+ private Method getInitMethod(Handler<?> handler) {
Method m = null;
try {
m = handler.getClass().getMethod("init", Map.class);
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerChainInvoker.java Sun Jan 8 03:15:06 2012
@@ -58,11 +58,11 @@ public class HandlerChainInvoker {
private static final Logger LOG = LogUtils.getL7dLogger(HandlerChainInvoker.class);
- private final List<Handler> protocolHandlers = new ArrayList<Handler>();
- private List<LogicalHandler> logicalHandlers = new ArrayList<LogicalHandler>();
+ private final List<Handler<?>> protocolHandlers = new ArrayList<Handler<?>>();
+ private List<LogicalHandler<?>> logicalHandlers = new ArrayList<LogicalHandler<?>>();
- private final List<Handler> invokedHandlers = new ArrayList<Handler>();
- private final List<Handler> closeHandlers = new ArrayList<Handler>();
+ private final List<Handler<?>> invokedHandlers = new ArrayList<Handler<?>>();
+ private final List<Handler<?>> closeHandlers = new ArrayList<Handler<?>>();
private boolean outbound;
private boolean isRequestor;
@@ -71,22 +71,22 @@ public class HandlerChainInvoker {
private boolean closed;
private boolean messageDirectionReversed;
private Exception fault;
- private MessageContext logicalMessageContext;
+ private LogicalMessageContext logicalMessageContext;
private MessageContext protocolMessageContext;
- public HandlerChainInvoker(List<Handler> hc) {
+ public HandlerChainInvoker(@SuppressWarnings("rawtypes") List<Handler> hc) {
this(hc, true);
}
- public HandlerChainInvoker(List<Handler> hc, boolean isOutbound) {
+ public HandlerChainInvoker(@SuppressWarnings("rawtypes") List<Handler> hc, boolean isOutbound) {
if (LOG.isLoggable(Level.FINE)) {
LOG.log(Level.FINE, "invoker for chain size: " + (hc != null ? hc.size() : 0));
}
if (hc != null) {
- for (Handler h : hc) {
+ for (Handler<?> h : hc) {
if (h instanceof LogicalHandler) {
- logicalHandlers.add((LogicalHandler)h);
+ logicalHandlers.add((LogicalHandler<?>)h);
} else {
protocolHandlers.add(h);
}
@@ -95,19 +95,19 @@ public class HandlerChainInvoker {
outbound = isOutbound;
}
- public List<LogicalHandler> getLogicalHandlers() {
+ public List<LogicalHandler<?>> getLogicalHandlers() {
return logicalHandlers;
}
- public List<Handler> getProtocolHandlers() {
+ public List<Handler<?>> getProtocolHandlers() {
return protocolHandlers;
}
- public MessageContext getLogicalMessageContext() {
+ public LogicalMessageContext getLogicalMessageContext() {
return logicalMessageContext;
}
- public void setLogicalMessageContext(MessageContext mc) {
+ public void setLogicalMessageContext(LogicalMessageContext mc) {
logicalMessageContext = mc;
}
@@ -225,11 +225,11 @@ public class HandlerChainInvoker {
logicalHandlers = invoker.getLogicalHandlers();
}
- List getInvokedHandlers() {
+ List<Handler<?>> getInvokedHandlers() {
return Collections.unmodifiableList(invokedHandlers);
}
- private boolean invokeHandlerChain(List<? extends Handler> handlerChain, MessageContext ctx) {
+ private boolean invokeHandlerChain(List<? extends Handler<?>> handlerChain, MessageContext ctx) {
if (handlerChain.isEmpty()) {
LOG.log(Level.FINEST, "no handlers registered");
return true;
@@ -264,7 +264,8 @@ public class HandlerChainInvoker {
* ProtocolException (per spec), if the exception is thrown from other
* places other than handlers, we always invoke handleFault.
*/
- private boolean invokeHandlerChainHandleFault(List<? extends Handler> handlerChain, MessageContext ctx) {
+ private boolean invokeHandlerChainHandleFault(List<? extends Handler<?>> handlerChain,
+ MessageContext ctx) {
if (handlerChain.isEmpty()) {
LOG.log(Level.FINEST, "no handlers registered");
return true;
@@ -301,15 +302,16 @@ public class HandlerChainInvoker {
}
@SuppressWarnings("unchecked")
- private boolean invokeHandleFault(List<? extends Handler> handlerChain, MessageContext ctx) {
+ private boolean invokeHandleFault(List<? extends Handler<?>> handlerChain, MessageContext ctx) {
boolean continueProcessing = true;
try {
- for (Handler h : handlerChain) {
+ for (Handler<?> h : handlerChain) {
if (invokeThisHandler(h)) {
closeHandlers.add(h);
markHandlerInvoked(h);
- continueProcessing = h.handleFault(ctx);
+ Handler<MessageContext> lh = (Handler<MessageContext>)h;
+ continueProcessing = lh.handleFault(ctx);
}
if (!continueProcessing) {
break;
@@ -325,14 +327,15 @@ public class HandlerChainInvoker {
}
@SuppressWarnings("unchecked")
- private boolean invokeHandleMessage(List<? extends Handler> handlerChain, MessageContext ctx) {
+ private boolean invokeHandleMessage(List<? extends Handler<?>> handlerChain, MessageContext ctx) {
boolean continueProcessing = true;
try {
- for (Handler h : handlerChain) {
+ for (Handler<?> h : handlerChain) {
if (invokeThisHandler(h)) {
closeHandlers.add(h);
markHandlerInvoked(h);
- continueProcessing = h.handleMessage(ctx);
+ Handler<MessageContext> lh = (Handler<MessageContext>)h;
+ continueProcessing = lh.handleMessage(ctx);
}
if (!continueProcessing) {
if (responseExpected) {
@@ -489,11 +492,13 @@ public class HandlerChainInvoker {
try {
int index = invokedHandlers.size() - 2;
while (index >= 0 && continueProcessing) {
- Handler h = invokedHandlers.get(index);
+ Handler<? extends MessageContext> h = invokedHandlers.get(index);
if (h instanceof LogicalHandler) {
- continueProcessing = h.handleFault(logicalMessageContext);
+ LogicalHandler<LogicalMessageContext> lh = (LogicalHandler<LogicalMessageContext>)h;
+ continueProcessing = lh.handleFault(logicalMessageContext);
} else {
- continueProcessing = h.handleFault(protocolMessageContext);
+ Handler<MessageContext> ph = (Handler<MessageContext>)h;
+ continueProcessing = ph.handleFault(protocolMessageContext);
}
if (!continueProcessing) {
@@ -522,7 +527,7 @@ public class HandlerChainInvoker {
private void invokeReversedClose() {
int index = invokedHandlers.size() - 1;
while (index >= 0) {
- Handler handler = invokedHandlers.get(index);
+ Handler<?> handler = invokedHandlers.get(index);
if (handler instanceof LogicalHandler) {
handler.close(logicalMessageContext);
} else {
@@ -534,7 +539,7 @@ public class HandlerChainInvoker {
closed = true;
}
- private boolean invokeThisHandler(Handler h) {
+ private boolean invokeThisHandler(Handler<?> h) {
boolean ret = true;
// when handler processing has been aborted, only invoke on
// previously invoked handlers
@@ -549,11 +554,11 @@ public class HandlerChainInvoker {
return ret;
}
- private boolean isTheLastInvokedHandler(Handler h) {
+ private boolean isTheLastInvokedHandler(Handler<?> h) {
return invokedHandlers.contains(h) && invokedHandlers.indexOf(h) == (invokedHandlers.size() - 1);
}
- private void markHandlerInvoked(Handler h) {
+ private void markHandlerInvoked(Handler<?> h) {
if (!invokedHandlers.contains(h)) {
invokedHandlers.add(h);
}
@@ -574,7 +579,7 @@ public class HandlerChainInvoker {
}
}
- private <T extends Handler> List<T> reverseHandlerChain(List<T> handlerChain) {
+ private <T extends Handler<?>> List<T> reverseHandlerChain(List<T> handlerChain) {
List<T> reversedHandlerChain = new ArrayList<T>();
reversedHandlerChain.addAll(handlerChain);
Collections.reverse(reversedHandlerChain);
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerResolverImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerResolverImpl.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerResolverImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/HandlerResolverImpl.java Sun Jan 8 03:15:06 2012
@@ -35,8 +35,10 @@ import org.apache.cxf.resource.DefaultRe
import org.apache.cxf.resource.ResourceManager;
import org.apache.cxf.resource.ResourceResolver;
+@SuppressWarnings("rawtypes")
public class HandlerResolverImpl implements HandlerResolver {
- private final Map<PortInfo, List<Handler>> handlerMap = new HashMap<PortInfo, List<Handler>>();
+ private final Map<PortInfo, List<Handler>> handlerMap
+ = new HashMap<PortInfo, List<Handler>>();
//private QName service;
private Class<?> annotationClass;
@@ -72,7 +74,7 @@ public class HandlerResolverImpl impleme
chain.addAll(getHandlersFromAnnotation(annotationClass, portInfo));
}
- for (Handler h : chain) {
+ for (Handler<?> h : chain) {
configHandler(h);
}
@@ -102,7 +104,7 @@ public class HandlerResolverImpl impleme
* the case where no injections were requested, the runtime MUST invoke the
* method carrying a javax.annotation .PostConstruct annotation, if present.
*/
- private void configHandler(Handler handler) {
+ private void configHandler(Handler<?> handler) {
if (handler != null) {
ResourceManager resourceManager = bus.getExtension(ResourceManager.class);
List<ResourceResolver> resolvers = resourceManager.getResourceResolvers();
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageContextImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageContextImpl.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageContextImpl.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/logical/LogicalMessageContextImpl.java Sun Jan 8 03:15:06 2012
@@ -41,19 +41,17 @@ public class LogicalMessageContextImpl e
public Object get(Object key) {
Object o = super.get(key);
- if (MessageContext.HTTP_RESPONSE_HEADERS.equals(key)
- || MessageContext.HTTP_REQUEST_HEADERS.equals(key)) {
- Map mp = (Map)o;
- if (mp != null) {
- if (mp.isEmpty()) {
- return null;
- }
- if (!isResponse() && MessageContext.HTTP_RESPONSE_HEADERS.equals(key)) {
- return null;
- }
- if (isRequestor() && MessageContext.HTTP_REQUEST_HEADERS.equals(key)) {
- return null;
- }
+ if ((MessageContext.HTTP_RESPONSE_HEADERS.equals(key)
+ || MessageContext.HTTP_REQUEST_HEADERS.equals(key))
+ && o != null) {
+ if (((Map<?, ?>)o).isEmpty()) {
+ return null;
+ }
+ if (!isResponse() && MessageContext.HTTP_RESPONSE_HEADERS.equals(key)) {
+ return null;
+ }
+ if (isRequestor() && MessageContext.HTTP_REQUEST_HEADERS.equals(key)) {
+ return null;
}
}
return o;
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultInInterceptor.java Sun Jan 8 03:15:06 2012
@@ -59,9 +59,9 @@ public class SOAPHandlerFaultInIntercept
public Set<QName> getUnderstoodHeaders() {
Set<QName> understood = new HashSet<QName>();
- for (Handler h : getBinding().getHandlerChain()) {
+ for (Handler<?> h : getBinding().getHandlerChain()) {
if (h instanceof SOAPHandler) {
- Set<QName> headers = CastUtils.cast(((SOAPHandler) h).getHeaders());
+ Set<QName> headers = CastUtils.cast(((SOAPHandler<?>) h).getHeaders());
if (headers != null) {
understood.addAll(headers);
}
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerFaultOutInterceptor.java Sun Jan 8 03:15:06 2012
@@ -73,9 +73,9 @@ public class SOAPHandlerFaultOutIntercep
public Set<QName> getUnderstoodHeaders() {
Set<QName> understood = new HashSet<QName>();
- for (Handler h : getBinding().getHandlerChain()) {
+ for (Handler<?> h : getBinding().getHandlerChain()) {
if (h instanceof SOAPHandler) {
- Set<QName> headers = CastUtils.cast(((SOAPHandler) h).getHeaders());
+ Set<QName> headers = CastUtils.cast(((SOAPHandler<?>) h).getHeaders());
if (headers != null) {
understood.addAll(headers);
}
Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptor.java Sun Jan 8 03:15:06 2012
@@ -93,9 +93,9 @@ public class SOAPHandlerInterceptor exte
public Set<QName> getUnderstoodHeaders() {
Set<QName> understood = new HashSet<QName>();
- for (Handler h : getBinding().getHandlerChain()) {
+ for (Handler<?> h : getBinding().getHandlerChain()) {
if (h instanceof SOAPHandler) {
- Set<QName> headers = CastUtils.cast(((SOAPHandler) h).getHeaders());
+ Set<QName> headers = CastUtils.cast(((SOAPHandler<?>) h).getHeaders());
if (headers != null) {
understood.addAll(headers);
}
Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java Sun Jan 8 03:15:06 2012
@@ -276,6 +276,7 @@ public class ServiceImplTest extends Abs
return info;
}
+ @SuppressWarnings("rawtypes")
public List<Handler> getHandlerChain(PortInfo portInfo) {
List<Handler> handlerList = new ArrayList<Handler>();
this.info = portInfo;
Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AbstractProtocolHandlerInterceptorTest.java Sun Jan 8 03:15:06 2012
@@ -56,6 +56,7 @@ public class AbstractProtocolHandlerInte
exchange = control.createMock(Exchange.class);
binding = control.createMock(Binding.class);
+ @SuppressWarnings("rawtypes")
List<Handler> list = new ArrayList<Handler>();
list.add(null);
expect(binding.getHandlerChain()).andReturn(list).anyTimes();
Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/AnnotationHandlerChainBuilderTest.java Sun Jan 8 03:15:06 2012
@@ -43,6 +43,7 @@ public class AnnotationHandlerChainBuild
public void testFindHandlerChainAnnotation() {
HandlerTestImpl handlerTestImpl = new HandlerTestImpl();
AnnotationHandlerChainBuilder chainBuilder = new AnnotationHandlerChainBuilder();
+ @SuppressWarnings("rawtypes")
List<Handler> handlers = chainBuilder
.buildHandlerChainFromClass(handlerTestImpl.getClass(),
null,
@@ -68,6 +69,7 @@ public class AnnotationHandlerChainBuild
QName portQName = new QName("namespacedoesntsupportyet", "SoapPort1");
QName serviceQName = new QName("namespacedoesntsupportyet", "SoapService1");
String bindingID = "http://schemas.xmlsoap.org/wsdl/soap/http";
+ @SuppressWarnings("rawtypes")
List<Handler> handlers = chainBuilder
.buildHandlerChainFromClass(handlerTestImpl.getClass(), portQName, serviceQName, bindingID);
assertNotNull(handlers);
@@ -81,6 +83,7 @@ public class AnnotationHandlerChainBuild
QName portQName = new QName("namespacedoesntsupportyet", "SoapPortUnknown");
QName serviceQName = new QName("namespacedoesntsupportyet", "SoapServiceUnknown");
String bindingID = "BindingUnknow";
+ @SuppressWarnings("rawtypes")
List<Handler> handlers = chainBuilder
.buildHandlerChainFromClass(handlerTestImpl.getClass(), portQName, serviceQName, bindingID);
assertNotNull(handlers);
@@ -94,6 +97,7 @@ public class AnnotationHandlerChainBuild
QName portQName = new QName("http://apache.org/handler_test", "SoapPortWildcard");
QName serviceQName = new QName("http://apache.org/handler_test", "SoapServiceWildcard");
String bindingID = "BindingUnknow";
+ @SuppressWarnings("rawtypes")
List<Handler> handlers = chainBuilder
.buildHandlerChainFromClass(handlerTestImpl.getClass(), portQName, serviceQName, bindingID);
assertNotNull(handlers);
Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainBuilderTest.java Sun Jan 8 03:15:06 2012
@@ -37,6 +37,7 @@ import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
+@SuppressWarnings("rawtypes")
public class HandlerChainBuilderTest extends Assert {
Handler[] allHandlers = {EasyMock.createMock(LogicalHandler.class), EasyMock.createMock(Handler.class),
Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/HandlerChainInvokerTest.java Sun Jan 8 03:15:06 2012
@@ -70,6 +70,7 @@ public class HandlerChainInvokerTest ext
public void setUp() {
AbstractHandlerBase.clear();
+ @SuppressWarnings("rawtypes")
List<Handler> handlers = new ArrayList<Handler>();
for (int i = 0; i < logicalHandlers.length; i++) {
logicalHandlers[i] = new TestLogicalHandler();
@@ -93,6 +94,7 @@ public class HandlerChainInvokerTest ext
}
+ @SuppressWarnings("rawtypes")
@Test
public void testInvokeEmptyHandlerChain() {
invoker = new HandlerChainInvoker(new ArrayList<Handler>());
@@ -104,12 +106,12 @@ public class HandlerChainInvokerTest ext
public void testHandlerPartitioning() {
assertEquals(HANDLER_COUNT, invoker.getLogicalHandlers().size());
- for (Handler h : invoker.getLogicalHandlers()) {
+ for (Handler<?> h : invoker.getLogicalHandlers()) {
assertTrue(h instanceof LogicalHandler);
}
assertEquals(HANDLER_COUNT, invoker.getProtocolHandlers().size());
- for (Handler h : invoker.getProtocolHandlers()) {
+ for (Handler<?> h : invoker.getProtocolHandlers()) {
assertTrue(!(h instanceof LogicalHandler));
}
Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/LogicalHandlerInterceptorTest.java Sun Jan 8 03:15:06 2012
@@ -73,19 +73,20 @@ public class LogicalHandlerInterceptorTe
@Test
public void testInterceptSuccess() {
- List<LogicalHandler> list = new ArrayList<LogicalHandler>();
- list.add(new LogicalHandler() {
+ List<LogicalHandler<?>> list = new ArrayList<LogicalHandler<?>>();
+ list.add(new LogicalHandler<LogicalMessageContext>() {
public void close(MessageContext arg0) {
}
- public boolean handleFault(MessageContext arg0) {
+ public boolean handleFault(LogicalMessageContext arg0) {
return true;
}
- public boolean handleMessage(MessageContext arg0) {
+ public boolean handleMessage(LogicalMessageContext arg0) {
return true;
}
});
+ @SuppressWarnings("rawtypes")
List<Handler> hList = CastUtils.cast(list);
expect(binding.getHandlerChain()).andReturn(hList).anyTimes();
expect(invoker.getLogicalHandlers()).andReturn(list);
@@ -109,6 +110,7 @@ public class LogicalHandlerInterceptorTe
//becomes a response message.
//NOTE: commented out as this has been covered by other tests.
public void xtestReturnFalseClientSide() throws Exception {
+ @SuppressWarnings("rawtypes")
List<Handler> list = new ArrayList<Handler>();
list.add(new LogicalHandler<LogicalMessageContext>() {
public void close(MessageContext arg0) {
@@ -130,6 +132,7 @@ public class LogicalHandlerInterceptorTe
IMocksControl control1 = createNiceControl();
Binding binding1 = control1.createMock(Binding.class);
+ @SuppressWarnings("rawtypes")
List<Handler> hList = CastUtils.cast(list);
expect(binding1.getHandlerChain()).andReturn(hList).anyTimes();
Exchange exchange1 = control1.createMock(Exchange.class);
Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/handler/soap/SOAPHandlerInterceptorTest.java Sun Jan 8 03:15:06 2012
@@ -95,6 +95,7 @@ public class SOAPHandlerInterceptorTest
// outputStream
@Test
public void testChangeSOAPBodyOutBound() throws Exception {
+ @SuppressWarnings("rawtypes")
List<Handler> list = new ArrayList<Handler>();
list.add(new SOAPHandler<SOAPMessageContext>() {
public boolean handleMessage(SOAPMessageContext smc) {
@@ -189,6 +190,7 @@ public class SOAPHandlerInterceptorTest
@Test
public void testChangeSOAPHeaderInBound() throws Exception {
+ @SuppressWarnings("rawtypes")
List<Handler> list = new ArrayList<Handler>();
list.add(new SOAPHandler<SOAPMessageContext>() {
public boolean handleMessage(SOAPMessageContext smc) {
@@ -286,6 +288,7 @@ public class SOAPHandlerInterceptorTest
@Test
public void testChangeSOAPHeaderOutBound() throws Exception {
+ @SuppressWarnings("rawtypes")
List<Handler> list = new ArrayList<Handler>();
list.add(new SOAPHandler<SOAPMessageContext>() {
public boolean handleMessage(SOAPMessageContext smc) {
@@ -387,6 +390,7 @@ public class SOAPHandlerInterceptorTest
@Test
public void testGetSOAPMessageInBound() throws Exception {
+ @SuppressWarnings("rawtypes")
List<Handler> list = new ArrayList<Handler>();
list.add(new SOAPHandler<SOAPMessageContext>() {
public boolean handleMessage(SOAPMessageContext smc) {
@@ -445,6 +449,7 @@ public class SOAPHandlerInterceptorTest
@Test
public void testGetUnderstoodHeadersReturnsNull() {
+ @SuppressWarnings("rawtypes")
List<Handler> list = new ArrayList<Handler>();
list.add(new SOAPHandler<SOAPMessageContext>() {
public boolean handleMessage(SOAPMessageContext smc) {
Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/DispatchHandlerInvocationTest.java Sun Jan 8 03:15:06 2012
@@ -390,10 +390,11 @@ public class DispatchHandlerInvocationTe
assertEquals("Hello tli", value.getResponseType());
}
- public void addHandlersProgrammatically(BindingProvider bp, Handler...handlers) {
+ public void addHandlersProgrammatically(BindingProvider bp, Handler<?>...handlers) {
+ @SuppressWarnings("rawtypes")
List<Handler> handlerChain = bp.getBinding().getHandlerChain();
assertNotNull(handlerChain);
- for (Handler h : handlers) {
+ for (Handler<?> h : handlers) {
handlerChain.add(h);
}
bp.getBinding().setHandlerChain(handlerChain);
Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java Sun Jan 8 03:15:06 2012
@@ -134,6 +134,7 @@ public class HandlerInvocationTest exten
BindingProvider bp1 = (BindingProvider)handlerTest1;
Binding binding1 = bp1.getBinding();
+ @SuppressWarnings("rawtypes")
List<Handler> port1HandlerChain = binding1.getHandlerChain();
assertEquals(1, port1HandlerChain.size());
}
@@ -1205,10 +1206,11 @@ public class HandlerInvocationTest exten
}
- void addHandlersToChain(BindingProvider bp, Handler... handlers) {
+ void addHandlersToChain(BindingProvider bp, Handler<?>... handlers) {
+ @SuppressWarnings("rawtypes")
List<Handler> handlerChain = bp.getBinding().getHandlerChain();
assertNotNull(handlerChain);
- for (Handler h : handlers) {
+ for (Handler<?> h : handlers) {
handlerChain.add(h);
}
bp.getBinding().setHandlerChain(handlerChain);
@@ -1230,15 +1232,17 @@ public class HandlerInvocationTest exten
}
public class MyHandlerResolver implements HandlerResolver {
+ @SuppressWarnings("rawtypes")
List<Handler> chain = new ArrayList<Handler>();
String bindingID;
- public MyHandlerResolver(Handler... handlers) {
- for (Handler h : handlers) {
+ public MyHandlerResolver(Handler<?>... handlers) {
+ for (Handler<?> h : handlers) {
chain.add(h);
}
}
+ @SuppressWarnings("rawtypes")
public List<Handler> getHandlerChain(PortInfo portInfo) {
bindingID = portInfo.getBindingID();
return chain;
Modified: cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java?rev=1228770&r1=1228769&r2=1228770&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java (original)
+++ cxf/trunk/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationUsingAddNumbersTest.java Sun Jan 8 03:15:06 2012
@@ -145,6 +145,7 @@ public class HandlerInvocationUsingAddNu
AddNumbers port = (AddNumbers)service.getPort(portName, AddNumbers.class);
setAddress(port, addNumbersAddress);
+ @SuppressWarnings("rawtypes")
List<Handler> handlerChain = ((BindingProvider)port).getBinding().getHandlerChain();
SmallNumberHandler h = (SmallNumberHandler)handlerChain.get(0);
@@ -166,16 +167,18 @@ public class HandlerInvocationUsingAddNu
AddNumbers port = (AddNumbers)service.getPort(portName, AddNumbers.class);
setAddress(port, addNumbersAddress);
+ @SuppressWarnings("rawtypes")
List<Handler> handlerChain = ((BindingProvider)port).getBinding().getHandlerChain();
SmallNumberHandler h = (SmallNumberHandler)handlerChain.get(0);
assertEquals("injectedValue", h.getInjectedString());
}
- private void addHandlersProgrammatically(BindingProvider bp, Handler...handlers) {
+ private void addHandlersProgrammatically(BindingProvider bp, Handler<?>...handlers) {
+ @SuppressWarnings("rawtypes")
List<Handler> handlerChain = bp.getBinding().getHandlerChain();
assertNotNull(handlerChain);
- for (Handler h : handlers) {
+ for (Handler<?> h : handlers) {
handlerChain.add(h);
}
bp.getBinding().setHandlerChain(handlerChain);