You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ga...@apache.org on 2008/09/29 22:40:45 UTC
svn commit: r700244 - in /cxf/branches/2.1.x-fixes: ./
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java
rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
Author: gawor
Date: Mon Sep 29 13:40:45 2008
New Revision: 700244
URL: http://svn.apache.org/viewvc?rev=700244&view=rev
Log:
Merged revisions 700225 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r700225 | gawor | 2008-09-29 15:47:06 -0400 (Mon, 29 Sep 2008) | 1 line
refactored JAXWSMethodInvoker so that the code could be nicely reused/extended
........
Added:
cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java
- copied unchanged from r700225, cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/AbstractJAXWSMethodInvoker.java
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java?rev=700244&r1=700243&r2=700244&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java (original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JAXWSMethodInvoker.java Mon Sep 29 13:40:45 2008
@@ -20,35 +20,19 @@
package org.apache.cxf.jaxws;
import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.activation.DataHandler;
-import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.handler.MessageContext.Scope;
-import javax.xml.ws.soap.SOAPFaultException;
-import org.apache.cxf.attachment.AttachmentImpl;
-import org.apache.cxf.binding.soap.SoapFault;
-import org.apache.cxf.binding.soap.SoapMessage;
-import org.apache.cxf.endpoint.Endpoint;
-import org.apache.cxf.headers.Header;
import org.apache.cxf.helpers.CastUtils;
-import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
-import org.apache.cxf.message.Attachment;
import org.apache.cxf.message.Exchange;
-import org.apache.cxf.message.Message;
import org.apache.cxf.service.invoker.Factory;
-import org.apache.cxf.service.invoker.FactoryInvoker;
import org.apache.cxf.service.invoker.SingletonFactory;
-public class JAXWSMethodInvoker extends FactoryInvoker {
+public class JAXWSMethodInvoker extends AbstractJAXWSMethodInvoker {
public JAXWSMethodInvoker(final Object bean) {
super(new SingletonFactory(bean));
@@ -57,56 +41,19 @@
public JAXWSMethodInvoker(Factory factory) {
super(factory);
}
-
- protected SOAPFaultException findSoapFaultException(Throwable ex) {
- if (ex instanceof SOAPFaultException) {
- return (SOAPFaultException)ex;
- }
- if (ex.getCause() != null) {
- return findSoapFaultException(ex.getCause());
- }
- return null;
- }
- protected Fault createFault(Throwable ex, Method m, List<Object> params, boolean checked) {
- //map the JAX-WS faults
- SOAPFaultException sfe = findSoapFaultException(ex);
- if (sfe != null) {
- SoapFault fault = new SoapFault(sfe.getFault().getFaultString(),
- ex,
- sfe.getFault().getFaultCodeAsQName());
- fault.setRole(sfe.getFault().getFaultActor());
- fault.setDetail(sfe.getFault().getDetail());
-
- return fault;
- }
- return super.createFault(ex, m, params, checked);
- }
-
+
+ @Override
protected Object invoke(Exchange exchange, final Object serviceObject, Method m, List<Object> params) {
// set up the webservice request context
WrappedMessageContext ctx = new WrappedMessageContext(exchange.getInMessage(), Scope.APPLICATION);
- Map<String, Scope> scopes = CastUtils.cast((Map<?, ?>)ctx.get(WrappedMessageContext.SCOPES));
- Map<String, Object> handlerScopedStuff = new HashMap<String, Object>();
- if (scopes != null) {
- for (Map.Entry<String, Scope> scope : scopes.entrySet()) {
- if (scope.getValue() == Scope.HANDLER) {
- handlerScopedStuff.put(scope.getKey(), ctx.get(scope.getKey()));
- }
- }
- for (String key : handlerScopedStuff.keySet()) {
- ctx.remove(key);
- }
- }
-
+ Map<String, Object> handlerScopedStuff = removeHandlerProperties(ctx);
WebServiceContextImpl.setMessageContext(ctx);
List<Object> res = CastUtils.cast((List)super.invoke(exchange, serviceObject, m, params));
- for (Map.Entry<String, Object> key : handlerScopedStuff.entrySet()) {
- ctx.put(key.getKey(), key.getValue(), Scope.HANDLER);
- }
+ addHandlerProperties(ctx, handlerScopedStuff);
//update the webservice response context
updateWebServiceContext(exchange, ctx);
@@ -115,60 +62,4 @@
return res;
}
-
- private Message createResponseMessage(Exchange exchange) {
- if (exchange == null) {
- return null;
- }
- Message m = exchange.getOutMessage();
- if (m == null && !exchange.isOneWay()) {
- Endpoint ep = exchange.get(Endpoint.class);
- m = ep.getBinding().createMessage();
- exchange.setOutMessage(m);
- }
- return m;
- }
-
- private void updateWebServiceContext(Exchange exchange, MessageContext ctx) {
- // Guard against wrong type associated with header list.
- // Need to copy header only if the message is going out.
- if (ctx.containsKey(Header.HEADER_LIST)
- && ctx.get(Header.HEADER_LIST) instanceof List<?>) {
- List list = (List) ctx.get(Header.HEADER_LIST);
- if (list != null && !list.isEmpty()) {
- SoapMessage sm = (SoapMessage) createResponseMessage(exchange);
- Iterator iter = list.iterator();
- while (iter.hasNext()) {
- sm.getHeaders().add((Header) iter.next());
- }
- }
- }
- if (exchange.getOutMessage() != null) {
- Message out = exchange.getOutMessage();
- if (out.containsKey(Message.PROTOCOL_HEADERS)) {
- Map<String, List<String>> heads = CastUtils
- .cast((Map<?, ?>)exchange.getOutMessage().get(Message.PROTOCOL_HEADERS));
- if (heads.containsKey("Content-Type")) {
- List<String> ct = heads.get("Content-Type");
- exchange.getOutMessage().put(Message.CONTENT_TYPE, ct.get(0));
- heads.remove("Content-Type");
- }
- }
- Map<String, DataHandler> dataHandlers
- = CastUtils.cast((Map<?, ?>)out.get(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS));
- if (dataHandlers != null && !dataHandlers.isEmpty()) {
- Collection<Attachment> attachments = out.getAttachments();
- if (attachments == null) {
- attachments = new ArrayList<Attachment>();
- out.setAttachments(attachments);
- }
- for (Map.Entry<String, DataHandler> entry : dataHandlers.entrySet()) {
- Attachment att = new AttachmentImpl(entry.getKey(), entry.getValue());
- attachments.add(att);
- }
- }
- out.remove(MessageContext.OUTBOUND_MESSAGE_ATTACHMENTS);
- }
- }
-
}