Author: veithen
Date: Sun Jan 17 10:19:50 2016
New Revision: 1725085

URL: http://svn.apache.org/viewvc?rev=1725085&view=rev
Log:
Prefer composition over inheritance.

Added:
    
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/AttachmentContext.java
      - copied, changed from r1725082, 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/AbstractJAXBAttachmentMarshaller.java
    
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java
      - copied, changed from r1725082, 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/AbstractJAXBAttachmentMarshaller.java
    
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java
      - copied, changed from r1725013, 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/AbstractJAXBAttachmentUnmarshaller.java
    
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/MessageContextAttachmentContext.java
      - copied, changed from r1725083, 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java
    
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/MessageAttachmentContext.java
      - copied, changed from r1725083, 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/JAXBAttachmentMarshaller.java
Removed:
    
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/AbstractJAXBAttachmentMarshaller.java
    
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/AbstractJAXBAttachmentUnmarshaller.java
    
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/JAXBAttachmentMarshaller.java
    
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/JAXBAttachmentUnmarshaller.java
Modified:
    
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDSContext.java
    
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBBlockContext.java

Copied: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/AttachmentContext.java
 (from r1725082, 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/AbstractJAXBAttachmentMarshaller.java)
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/AttachmentContext.java?p2=axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/AttachmentContext.java&p1=axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/AbstractJAXBAttachmentMarshaller.java&r1=1725082&r2=1725085&rev=1725085&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/AbstractJAXBAttachmentMarshaller.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/AttachmentContext.java
 Sun Jan 17 10:19:50 2016
@@ -19,228 +19,29 @@
 
 package org.apache.axis2.datasource.jaxb;
 
-import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
-import org.apache.axiom.util.UIDGenerator;
-import org.apache.axis2.Constants;
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.java.security.AccessController;
-import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import javax.activation.DataHandler;
-import javax.mail.MessagingException;
-import javax.mail.internet.InternetHeaders;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimePartDataSource;
-import javax.xml.bind.attachment.AttachmentMarshaller;
-import javax.xml.stream.XMLStreamWriter;
 
-import java.security.PrivilegedAction;
-
-public abstract class AbstractJAXBAttachmentMarshaller extends 
AttachmentMarshaller {
-
-    private static final Log log = 
LogFactory.getLog(AbstractJAXBAttachmentMarshaller.class);
-
-    protected final MessageContext msgContext;
-    private final XMLStreamWriter writer;
-    private static final String APPLICATION_OCTET = "application/octet-stream";
-    
-    /**
-     * Construct the JAXBAttachmentMarshaller that has access to the 
MessageContext
-     * @param msgContext
-     * @param writer
-     */
-    public AbstractJAXBAttachmentMarshaller(MessageContext msgContext, 
XMLStreamWriter writer) {
-        this.msgContext = msgContext;
-        this.writer = writer;
-    }
-
-    /**
-     * Override isXOPPackaget to calculate the isXOPPackage setting
-     */
-    public boolean isXOPPackage() {
-        boolean value = false;
-        
-        // For outbound messages, only trigger MTOM if
-        // the message is mtom enabled.
-        value = isMTOMEnabled();
-        
-        // If the writer is not an MTOM XMLStreamWriter then we don't have
-        // any place to store the attachment
-        if (!(writer instanceof MTOMXMLStreamWriter)) {
-            if (log.isDebugEnabled()) {
-                log.debug("The writer is not enabled for MTOM.  " +
-                                "MTOM values will not be optimized");
-            }
-            value = false;
-        }
-    
-        if (log.isDebugEnabled()){ 
-            log.debug("isXOPPackage returns " + value);
-        }
-        return value;        
-    }
-
-    
-    /* (non-Javadoc)
-     * @see 
javax.xml.bind.attachment.AttachmentMarshaller#addMtomAttachment(byte[], int, 
int, java.lang.String, java.lang.String, java.lang.String)
-     */
-    public final String addMtomAttachment(byte[] data, int offset, int length,
-                                    String mimeType, String namespace, String 
localPart) {
-
-        if (offset != 0 || length != data.length) {
-            int len = length - offset;
-            byte[] newData = new byte[len];
-            System.arraycopy(data, offset, newData, 0, len);
-            data = newData;
-        }
-        
-        if (mimeType == null || mimeType.length() == 0) {
-            mimeType = APPLICATION_OCTET;
-        }
-        
-        if (log.isDebugEnabled()){ 
-            log.debug("Adding MTOM/XOP byte array attachment for element: " + 
-                      "{" + namespace + "}" + localPart);
-        }
-        
-        String cid = null;
-        
-        try {
-            // Create MIME Body Part
-            final InternetHeaders ih = new InternetHeaders();
-            final byte[] dataArray = data; 
-            ih.setHeader(HTTPConstants.HEADER_CONTENT_TYPE, mimeType);
-            final MimeBodyPart mbp = (MimeBodyPart) 
AccessController.doPrivileged(new PrivilegedAction() {
-                public Object run() {
-                    try {
-                        return new MimeBodyPart(ih, dataArray);
-                    } catch (MessagingException e) {
-                        throw new OMException(e);
-                    }
-                }});
-
-            //Create a data source for the MIME Body Part
-            MimePartDataSource mpds = (MimePartDataSource) 
AccessController.doPrivileged(new PrivilegedAction() {
-                public Object run() {
-                    return new MimePartDataSource(mbp);
-                }});
-            long dataLength =data.length;
-            Integer value = null;
-            if (msgContext != null) {
-                value = (Integer) 
msgContext.getProperty(Constants.Configuration.MTOM_THRESHOLD);
-            } else if (log.isDebugEnabled()) {
-                log.debug("The msgContext is null so the MTOM threshold value 
can not be determined; it will default to 0.");
-            }
-
-            int optimizedThreshold = (value != null) ? value.intValue() : 0;
-
-            if(optimizedThreshold==0 || dataLength > optimizedThreshold){
-                DataHandler dataHandler = new DataHandler(mpds);
-                cid = addDataHandler(dataHandler, false);
-            }
-
-            // Add the content id to the mime body part
-            mbp.setHeader(HTTPConstants.HEADER_CONTENT_ID, cid);
-        } catch (MessagingException e) {
-            throw new OMException(e);
-        }
-
-        return cid == null ? null : "cid:" + cid;
-    }
-    
-    
-    /* (non-Javadoc)
-     * @see 
javax.xml.bind.attachment.AttachmentMarshaller#addMtomAttachment(javax.activation.DataHandler,
 java.lang.String, java.lang.String)
-     */
-    public final String addMtomAttachment(DataHandler data, String namespace, 
String localPart) {
-        if (log.isDebugEnabled()){ 
-            log.debug("Adding MTOM/XOP datahandler attachment for element: " + 
-                      "{" + namespace + "}" + localPart);
-        }
-        String cid = addDataHandler(data, false);
-        return cid == null ? null : "cid:" + cid;
-    }
-    
-    
-    /* (non-Javadoc)
-     * @see 
javax.xml.bind.attachment.AttachmentMarshaller#addSwaRefAttachment(javax.activation.DataHandler)
-     */
-    public final String addSwaRefAttachment(DataHandler data) {
-        if (log.isDebugEnabled()){ 
-            log.debug("Adding SWAREF attachment");
-        }
-        
-        String cid = addDataHandler(data, true);
-        setDoingSWA();
-        return "cid:" + cid;
-    }
+public interface AttachmentContext {
+    MessageContext getMessageContext();
     
     /**
-     * Add the DataHandler to the writer and context
-     * @param dh
-     * @return
-     */
-    private String addDataHandler(DataHandler dh, boolean isSWA) {
-        String cid = null;
-        
-        // If this is an MTOMXMLStreamWriter then inform the writer 
-        // that it must write out this attachment (I guess we should do this
-        // even if the attachment is SWAREF ?)
-        if (isSWA) {
-            if (log.isDebugEnabled()){ 
-                log.debug("adding DataHandler for SWA");
-            }
-            // If old SWA attachments, get the ID and add the attachment to 
message
-            cid = UIDGenerator.generateContentId();
-            addDataHandler(dh, cid);   
-        } else {
-            if (log.isDebugEnabled()){ 
-                log.debug("adding DataHandler for MTOM");
-            }
-            if (writer instanceof MTOMXMLStreamWriter) {
-                cid = ((MTOMXMLStreamWriter)writer).prepareDataHandler(dh);
-                if (cid != null) {
-                    if (log.isDebugEnabled()){ 
-                        log.debug("The MTOM attachment is written as an 
attachment part.");
-                    }
-                    // Remember the attachment on the message.
-                    addDataHandler(dh, cid);
-                } else {
-                    if (log.isDebugEnabled()){ 
-                        log.debug("The MTOM attachment is inlined.");
-                    }
-                }
-            } else {
-                if (log.isDebugEnabled()){ 
-                    log.debug("writer is not MTOM capable.  The attachment 
will be inlined.");
-                }
-            }
-        }
-        
-        if (log.isDebugEnabled()){ 
-            log.debug("   content id=" + cid);
-            log.debug("   dataHandler  =" + dh);
-        }
-        return cid;
-    }
-
-    /**
      * @return if MTOM enabled calculated from the context information
      */
-    protected abstract boolean isMTOMEnabled();
+    boolean isMTOMEnabled();
     
     /**
      * Indicate on the context that SWA attachments are encountered
      */
-    protected abstract void setDoingSWA();
+    void setDoingSWA();
     
     /**
      * Inform the context that an Attachment (DataHandler, CID) is written.
      * @param dh
      * @param cid
      */
-    protected abstract void addDataHandler(DataHandler dh, String cid);
+    void addDataHandler(DataHandler dh, String cid);
+
+    DataHandler getDataHandlerForSwA(String blobcid);
 }

Copied: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java
 (from r1725082, 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/AbstractJAXBAttachmentMarshaller.java)
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java?p2=axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java&p1=axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/AbstractJAXBAttachmentMarshaller.java&r1=1725082&r2=1725085&rev=1725085&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/AbstractJAXBAttachmentMarshaller.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java
 Sun Jan 17 10:19:50 2016
@@ -39,11 +39,11 @@ import javax.xml.stream.XMLStreamWriter;
 
 import java.security.PrivilegedAction;
 
-public abstract class AbstractJAXBAttachmentMarshaller extends 
AttachmentMarshaller {
+public final class JAXBAttachmentMarshaller extends AttachmentMarshaller {
 
-    private static final Log log = 
LogFactory.getLog(AbstractJAXBAttachmentMarshaller.class);
+    private static final Log log = 
LogFactory.getLog(JAXBAttachmentMarshaller.class);
 
-    protected final MessageContext msgContext;
+    private final AttachmentContext context;
     private final XMLStreamWriter writer;
     private static final String APPLICATION_OCTET = "application/octet-stream";
     
@@ -52,8 +52,8 @@ public abstract class AbstractJAXBAttach
      * @param msgContext
      * @param writer
      */
-    public AbstractJAXBAttachmentMarshaller(MessageContext msgContext, 
XMLStreamWriter writer) {
-        this.msgContext = msgContext;
+    public JAXBAttachmentMarshaller(AttachmentContext context, XMLStreamWriter 
writer) {
+        this.context = context;
         this.writer = writer;
     }
 
@@ -65,7 +65,7 @@ public abstract class AbstractJAXBAttach
         
         // For outbound messages, only trigger MTOM if
         // the message is mtom enabled.
-        value = isMTOMEnabled();
+        value = context.isMTOMEnabled();
         
         // If the writer is not an MTOM XMLStreamWriter then we don't have
         // any place to store the attachment
@@ -129,6 +129,7 @@ public abstract class AbstractJAXBAttach
                 }});
             long dataLength =data.length;
             Integer value = null;
+            MessageContext msgContext = context.getMessageContext();
             if (msgContext != null) {
                 value = (Integer) 
msgContext.getProperty(Constants.Configuration.MTOM_THRESHOLD);
             } else if (log.isDebugEnabled()) {
@@ -174,7 +175,7 @@ public abstract class AbstractJAXBAttach
         }
         
         String cid = addDataHandler(data, true);
-        setDoingSWA();
+        context.setDoingSWA();
         return "cid:" + cid;
     }
     
@@ -195,7 +196,7 @@ public abstract class AbstractJAXBAttach
             }
             // If old SWA attachments, get the ID and add the attachment to 
message
             cid = UIDGenerator.generateContentId();
-            addDataHandler(dh, cid);   
+            context.addDataHandler(dh, cid);   
         } else {
             if (log.isDebugEnabled()){ 
                 log.debug("adding DataHandler for MTOM");
@@ -207,7 +208,7 @@ public abstract class AbstractJAXBAttach
                         log.debug("The MTOM attachment is written as an 
attachment part.");
                     }
                     // Remember the attachment on the message.
-                    addDataHandler(dh, cid);
+                    context.addDataHandler(dh, cid);
                 } else {
                     if (log.isDebugEnabled()){ 
                         log.debug("The MTOM attachment is inlined.");
@@ -226,21 +227,4 @@ public abstract class AbstractJAXBAttach
         }
         return cid;
     }
-
-    /**
-     * @return if MTOM enabled calculated from the context information
-     */
-    protected abstract boolean isMTOMEnabled();
-    
-    /**
-     * Indicate on the context that SWA attachments are encountered
-     */
-    protected abstract void setDoingSWA();
-    
-    /**
-     * Inform the context that an Attachment (DataHandler, CID) is written.
-     * @param dh
-     * @param cid
-     */
-    protected abstract void addDataHandler(DataHandler dh, String cid);
 }

Copied: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java
 (from r1725013, 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/AbstractJAXBAttachmentUnmarshaller.java)
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java?p2=axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java&p1=axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/AbstractJAXBAttachmentUnmarshaller.java&r1=1725013&r2=1725085&rev=1725085&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/AbstractJAXBAttachmentUnmarshaller.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java
 Sun Jan 17 10:19:50 2016
@@ -33,20 +33,20 @@ import java.io.IOException;
 import java.io.InputStream;
 
 /**
- * Abstract base class for {@link JAXBAttachmentUnmarshaller} and
- * {@link 
org.apache.axis2.jaxws.message.attachments.JAXBAttachmentUnmarshaller}. This is 
a partial
- * implementation of the {@link AttachmentUnmarshaller} class. It handles the 
attachments provided
+ * Implementation of the {@link AttachmentUnmarshaller} class that handles the 
attachments provided
  * by Axiom through the {@link MimePartProvider} interface. It should be noted 
that while Axiom only
  * handles attachments referenced using XOP, {@link AttachmentUnmarshaller} is 
also used to retrieve
  * attachments from SwA messages. Hence the {@link 
#getDataHandlerForSwA(String)} method.
  */
-public abstract class AbstractJAXBAttachmentUnmarshaller extends 
AttachmentUnmarshaller {
+public final class JAXBAttachmentUnmarshaller extends AttachmentUnmarshaller {
 
-    private static final Log log = 
LogFactory.getLog(AbstractJAXBAttachmentUnmarshaller.class);
+    private static final Log log = 
LogFactory.getLog(JAXBAttachmentUnmarshaller.class);
 
+    private final AttachmentContext context;
     private final MimePartProvider mimePartProvider;
 
-    public AbstractJAXBAttachmentUnmarshaller(MimePartProvider 
mimePartProvider) {
+    public JAXBAttachmentUnmarshaller(AttachmentContext context, 
MimePartProvider mimePartProvider) {
+        this.context = context;
         this.mimePartProvider = mimePartProvider;
     }
 
@@ -166,13 +166,11 @@ public abstract class AbstractJAXBAttach
             throw new OMException("Failed to load attachment with content ID " 
+ blobcid, ex);
         }
         if (dh == null) {
-            dh = getDataHandlerForSwA(blobcid);
+            dh = context.getDataHandlerForSwA(blobcid);
         }
         if (dh != null) {
             JAXBAttachmentUnmarshallerMonitor.addBlobCID(blobcid);
         }
         return dh;
     }
-    
-    protected abstract DataHandler getDataHandlerForSwA(String blobcid);
 }

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDSContext.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDSContext.java?rev=1725085&r1=1725084&r2=1725085&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDSContext.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDSContext.java
 Sun Jan 17 10:19:50 2016
@@ -287,21 +287,8 @@ public class JAXBDSContext {
         return null;
     }
     
-    /**
-     * Create an AttachmentMarshaller to marshal MTOM/SWA Attachments
-     * @param writer
-     * @return
-     */
-    protected AttachmentMarshaller createAttachmentMarshaller(XMLStreamWriter 
writer) {
-        return new JAXBAttachmentMarshaller(getMessageContext(), writer);
-    }
-    
-    /**
-     * Create an Attachment unmarshaller for unmarshalling MTOM/SWA Attachments
-     * @return AttachmentUnmarshaller
-     */
-    protected AttachmentUnmarshaller 
createAttachmentUnmarshaller(MimePartProvider mimePartProvider) {
-        return new JAXBAttachmentUnmarshaller(mimePartProvider, 
getMessageContext());
+    protected AttachmentContext createAttachmentContext() {
+        return new MessageContextAttachmentContext(getMessageContext());
     }
 
     /**
@@ -332,7 +319,7 @@ public class JAXBDSContext {
 
         
         // Create an attachment unmarshaller
-        AttachmentUnmarshaller aum = 
createAttachmentUnmarshaller(xopEncodedStream.getMimePartProvider());
+        AttachmentUnmarshaller aum = new 
JAXBAttachmentUnmarshaller(createAttachmentContext(), 
xopEncodedStream.getMimePartProvider());
 
         if (aum != null) {
             if (DEBUG_ENABLED) {
@@ -418,7 +405,7 @@ public class JAXBDSContext {
                 }
             }
 
-            AttachmentMarshaller am = createAttachmentMarshaller(writer);
+            AttachmentMarshaller am = new 
JAXBAttachmentMarshaller(createAttachmentContext(), writer);
             if (am != null) {
                 if (DEBUG_ENABLED) {
                     log.debug("Adding JAXBAttachmentMarshaller to Marshaller");

Copied: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/MessageContextAttachmentContext.java
 (from r1725083, 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java)
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/MessageContextAttachmentContext.java?p2=axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/MessageContextAttachmentContext.java&p1=axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java&r1=1725083&r2=1725085&rev=1725085&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentMarshaller.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/MessageContextAttachmentContext.java
 Sun Jan 17 10:19:50 2016
@@ -31,20 +31,21 @@ import javax.xml.stream.XMLStreamWriter;
  * An implementation of the JAXB AttachmentMarshaller that is used to handle 
binary data from JAXB
  * and create populate the appropriate constructs on the MessageContext
  */
-public final class JAXBAttachmentMarshaller extends 
AbstractJAXBAttachmentMarshaller {
+public final class MessageContextAttachmentContext implements 
AttachmentContext {
 
-    private static final Log log = 
LogFactory.getLog(JAXBAttachmentMarshaller.class);
+    private static final Log log = 
LogFactory.getLog(MessageContextAttachmentContext.class);
 
-    /**
-     * Construct the JAXBAttachmentMarshaller that has access to the 
MessageContext
-     * @param msgContext
-     * @param writer
-     */
-    public JAXBAttachmentMarshaller(MessageContext msgContext, XMLStreamWriter 
writer) {
-        super(msgContext, writer);
+    private final MessageContext msgContext;
+    
+    public MessageContextAttachmentContext(MessageContext msgContext) {
+        this.msgContext = msgContext;
+    }
+
+    public MessageContext getMessageContext() {
+        return msgContext;
     }
 
-    protected boolean isMTOMEnabled() {
+    public boolean isMTOMEnabled() {
         if (msgContext == null) {
             return false;
         } else {
@@ -53,14 +54,14 @@ public final class JAXBAttachmentMarshal
         }  
     }
     
-    protected void setDoingSWA() {
+    public void setDoingSWA() {
         if (msgContext != null) {
             msgContext.setDoingSwA(true);
             msgContext.setProperty(Configuration.ENABLE_SWA, "true");
         }
     }
     
-    protected void addDataHandler(DataHandler dh, String cid) {
+    public void addDataHandler(DataHandler dh, String cid) {
         if (msgContext != null) {
             msgContext.addAttachment(cid, dh);
         } else {
@@ -71,4 +72,8 @@ public final class JAXBAttachmentMarshal
             }
         }
     }
+
+    public DataHandler getDataHandlerForSwA(String blobcid) {
+        return msgContext.getAttachment(blobcid);
+    }
 }

Copied: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/MessageAttachmentContext.java
 (from r1725083, 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/JAXBAttachmentMarshaller.java)
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/MessageAttachmentContext.java?p2=axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/MessageAttachmentContext.java&p1=axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/JAXBAttachmentMarshaller.java&r1=1725083&r2=1725085&rev=1725085&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/JAXBAttachmentMarshaller.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/MessageAttachmentContext.java
 Sun Jan 17 10:19:50 2016
@@ -20,34 +20,24 @@
 package org.apache.axis2.jaxws.message.attachments;
 
 import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.datasource.jaxb.AbstractJAXBAttachmentMarshaller;
+import org.apache.axis2.datasource.jaxb.AttachmentContext;
 import org.apache.axis2.jaxws.message.Message;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import javax.activation.DataHandler;
-import javax.xml.stream.XMLStreamWriter;
 
-/**
- * An implementation of the JAXB AttachmentMarshaller that is used to handle 
binary data from JAXB
- * and create populate the appropriate constructs within the JAX-WS Message 
Model.
- */
-public final class JAXBAttachmentMarshaller extends 
AbstractJAXBAttachmentMarshaller {
+public final class MessageAttachmentContext implements AttachmentContext {
     
-    private static final Log log = 
LogFactory.getLog(JAXBAttachmentMarshaller.class);
-    private Message message;
+    private static final Log log = 
LogFactory.getLog(MessageAttachmentContext.class);
+    private final Message message;
     
-    public JAXBAttachmentMarshaller(Message message, XMLStreamWriter writer) {
-        super(getAxis2MessageContext(message), writer);
+    public MessageAttachmentContext(Message message) {
         this.message = message;
     }
     
-    /**
-     * Get the Axis2 Message Context out of the Message by going through the 
JAXWS Message Context.
-     * @param message The Message from which to get the Axis Message Context
-     * @return the Axis Message context or null if one is not found.
-     */
-    private static MessageContext getAxis2MessageContext(Message message) {
+    public MessageContext getMessageContext() {
+        // Get the Axis2 Message Context out of the Message by going through 
the JAXWS Message Context.
         MessageContext axisMessageContext = null;
         if (message != null) {
             if (message.getMessageContext() != null) {
@@ -57,7 +47,7 @@ public final class JAXBAttachmentMarshal
         return axisMessageContext;
     }
 
-    protected boolean isMTOMEnabled() {
+    public boolean isMTOMEnabled() {
         if (message == null) {
             return false;
         } else {
@@ -65,13 +55,13 @@ public final class JAXBAttachmentMarshal
         }  
     }
     
-    protected void setDoingSWA() {
+    public void setDoingSWA() {
         if (message != null) {
             message.setDoingSWA(true);
         }
     }
     
-    protected void addDataHandler(DataHandler dh, String cid) {
+    public void addDataHandler(DataHandler dh, String cid) {
         if (message != null) {
             message.addDataHandler(dh, cid);
         } else {
@@ -82,4 +72,8 @@ public final class JAXBAttachmentMarshal
             }
         }
     }
+
+    public DataHandler getDataHandlerForSwA(String blobcid) {
+        return message.getDataHandler(blobcid);
+    }
 }

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBBlockContext.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBBlockContext.java?rev=1725085&r1=1725084&r2=1725085&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBBlockContext.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBBlockContext.java
 Sun Jan 17 10:19:50 2016
@@ -19,18 +19,14 @@
 
 package org.apache.axis2.jaxws.message.databinding;
 
-import org.apache.axiom.util.stax.xop.MimePartProvider;
 import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.datasource.jaxb.AttachmentContext;
 import org.apache.axis2.datasource.jaxb.JAXBDSContext;
 import org.apache.axis2.jaxws.message.Message;
-import org.apache.axis2.jaxws.message.attachments.JAXBAttachmentMarshaller;
-import org.apache.axis2.jaxws.message.attachments.JAXBAttachmentUnmarshaller;
+import org.apache.axis2.jaxws.message.attachments.MessageAttachmentContext;
 import org.apache.axis2.jaxws.spi.Constants;
 
 import javax.xml.bind.JAXBContext;
-import javax.xml.bind.attachment.AttachmentMarshaller;
-import javax.xml.bind.attachment.AttachmentUnmarshaller;
-import javax.xml.stream.XMLStreamWriter;
 import java.util.TreeSet;
 
 /*
@@ -89,13 +85,8 @@ public class JAXBBlockContext extends JA
     }
 
     @Override
-    protected AttachmentMarshaller createAttachmentMarshaller(XMLStreamWriter 
writer) {
-        return new JAXBAttachmentMarshaller(getMessage(), writer);
-    }
-    
-    @Override
-    protected AttachmentUnmarshaller 
createAttachmentUnmarshaller(MimePartProvider mimePartProvider) {
-        return new JAXBAttachmentUnmarshaller(mimePartProvider, getMessage());
+    protected AttachmentContext createAttachmentContext() {
+        return new MessageAttachmentContext(getMessage());
     }
 
     public ClassLoader getClassLoader() {


Reply via email to