You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/05/01 08:59:16 UTC
svn commit: r1741843 - in
/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom:
attachments/ mime/
Author: veithen
Date: Sun May 1 06:59:16 2016
New Revision: 1741843
URL: http://svn.apache.org/viewvc?rev=1741843&view=rev
Log:
AXIOM-280: Clean up and make PartDataHandler public so that the Part can be accessed (which then allows to retrieve headers).
Added:
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartDataHandler.java
- copied, changed from r1741816, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartDataHandler.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartDataSource.java
- copied, changed from r1741816, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartDataSource.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/Util.java
- copied, changed from r1741821, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/Util.java
Removed:
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartDataHandler.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartDataSource.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/Util.java
Modified:
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyPartDataHandler.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/Header.java
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyPartDataHandler.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyPartDataHandler.java?rev=1741843&r1=1741842&r2=1741843&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyPartDataHandler.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyPartDataHandler.java Sun May 1 06:59:16 2016
@@ -26,6 +26,7 @@ import javax.activation.DataSource;
import org.apache.axiom.attachments.lifecycle.DataHandlerExt;
import org.apache.axiom.blob.Blob;
import org.apache.axiom.mime.Part;
+import org.apache.axiom.mime.PartDataHandler;
final class LegacyPartDataHandler extends PartDataHandler implements DataHandlerExt {
public LegacyPartDataHandler(Part part) {
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/Header.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/Header.java?rev=1741843&r1=1741842&r2=1741843&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/Header.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/Header.java Sun May 1 06:59:16 2016
@@ -32,6 +32,11 @@ public final class Header {
*/
public static final String CONTENT_ID = "Content-ID";
+ /**
+ * The name of the {@code Content-Transfer-Encoding} header.
+ */
+ public static final String CONTENT_TRANSFER_ENCODING = "Content-Transfer-Encoding";
+
private final String name;
private final String value;
Copied: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartDataHandler.java (from r1741816, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartDataHandler.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartDataHandler.java?p2=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartDataHandler.java&p1=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartDataHandler.java&r1=1741816&r2=1741843&rev=1741843&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartDataHandler.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartDataHandler.java Sun May 1 06:59:16 2016
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.attachments;
+package org.apache.axiom.mime;
import java.io.IOException;
import java.io.OutputStream;
@@ -24,16 +24,14 @@ import java.io.OutputStream;
import javax.activation.DataHandler;
import javax.activation.DataSource;
-import org.apache.axiom.mime.Part;
-
/**
* {@link DataHandler} implementation for MIME parts read from a stream.
*/
-class PartDataHandler extends DataHandler {
+public class PartDataHandler extends DataHandler {
private final Part part;
private DataSource dataSource;
- public PartDataHandler(Part part) {
+ protected PartDataHandler(Part part) {
// We can't call PartImpl#getDataSource() here because it would fetch the content of the
// part and therefore disable streaming. We can't pass null here either because Geronimo's
// DataHandler implementation would throw a NullPointerException. Therefore we create the
@@ -44,11 +42,17 @@ class PartDataHandler extends DataHandle
this.part = part;
}
- public Part getPart() {
+ /**
+ * Get the MIME part linked to this data handler.
+ *
+ * @return the MIME part
+ */
+ public final Part getPart() {
return part;
}
- public DataSource getDataSource() {
+ @Override
+ public final DataSource getDataSource() {
if (dataSource == null) {
dataSource = createDataSource(part, Util.getDataSourceContentType(part));
if (dataSource == null) {
@@ -77,7 +81,8 @@ class PartDataHandler extends DataHandle
return null;
}
- public void writeTo(OutputStream os) throws IOException {
+ @Override
+ public final void writeTo(OutputStream os) throws IOException {
// The PartContent may have an implementation of writeTo that is more efficient than the default
// DataHandler#writeTo method (which requests an input stream and then copies it to the output
// stream).
Copied: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartDataSource.java (from r1741816, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartDataSource.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartDataSource.java?p2=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartDataSource.java&p1=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartDataSource.java&r1=1741816&r2=1741843&rev=1741843&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartDataSource.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/PartDataSource.java Sun May 1 06:59:16 2016
@@ -16,14 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.attachments;
+package org.apache.axiom.mime;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import org.apache.axiom.ext.activation.SizeAwareDataSource;
-import org.apache.axiom.mime.Part;
/**
* Default {@link DataSource} implementation for MIME parts. This implementation will be used if
Copied: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/Util.java (from r1741821, webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/Util.java)
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/Util.java?p2=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/Util.java&p1=webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/Util.java&r1=1741821&r2=1741843&rev=1741843&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/Util.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/mime/Util.java Sun May 1 06:59:16 2016
@@ -16,13 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.axiom.attachments;
+package org.apache.axiom.mime;
import javax.activation.DataSource;
-import org.apache.axiom.mime.Header;
-import org.apache.axiom.mime.Part;
-
final class Util {
private Util() {}