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 2023/06/11 16:23:51 UTC
[ws-axiom] branch master updated: AXIOM-506: Simplify BlobDataSource
This is an automated email from the ASF dual-hosted git repository.
veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push:
new 5bec8e8fb AXIOM-506: Simplify BlobDataSource
5bec8e8fb is described below
commit 5bec8e8fbbb970d0d3425b698f5af465817424df
Author: Andreas Veithen <an...@gmail.com>
AuthorDate: Sun Jun 11 17:23:34 2023 +0100
AXIOM-506: Simplify BlobDataSource
---
.../axiom/util/activation/BlobDataHandler.java | 2 +-
.../axiom/util/activation/BlobDataSource.java | 6 ++---
.../DataHandlerContentTypeProviderTest.java | 29 +++++++++++++++++++++-
3 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/axiom-jakarta-activation/src/main/java/org/apache/axiom/util/activation/BlobDataHandler.java b/axiom-jakarta-activation/src/main/java/org/apache/axiom/util/activation/BlobDataHandler.java
index 057293b3d..2b858a5a8 100644
--- a/axiom-jakarta-activation/src/main/java/org/apache/axiom/util/activation/BlobDataHandler.java
+++ b/axiom-jakarta-activation/src/main/java/org/apache/axiom/util/activation/BlobDataHandler.java
@@ -29,7 +29,7 @@ final class BlobDataHandler extends DataHandler {
private final Blob blob;
BlobDataHandler(Blob blob) {
- super(new BlobDataSource(blob, "application/octet-stream"));
+ super(new BlobDataSource(blob));
this.blob = blob;
}
diff --git a/axiom-jakarta-activation/src/main/java/org/apache/axiom/util/activation/BlobDataSource.java b/axiom-jakarta-activation/src/main/java/org/apache/axiom/util/activation/BlobDataSource.java
index edbea6388..f0abfd712 100644
--- a/axiom-jakarta-activation/src/main/java/org/apache/axiom/util/activation/BlobDataSource.java
+++ b/axiom-jakarta-activation/src/main/java/org/apache/axiom/util/activation/BlobDataSource.java
@@ -29,11 +29,9 @@ import org.apache.axiom.ext.activation.SizeAwareDataSource;
/** Data source backed by a {@link Blob}. */
class BlobDataSource implements SizeAwareDataSource {
private final Blob blob;
- private final String contentType;
- BlobDataSource(Blob blob, String contentType) {
+ BlobDataSource(Blob blob) {
this.blob = blob;
- this.contentType = contentType;
}
Blob getBlob() {
@@ -47,7 +45,7 @@ class BlobDataSource implements SizeAwareDataSource {
@Override
public String getContentType() {
- return contentType;
+ return "application/octet-stream";
}
@Override
diff --git a/axiom-jakarta-activation/src/test/java/org/apache/axiom/util/activation/DataHandlerContentTypeProviderTest.java b/axiom-jakarta-activation/src/test/java/org/apache/axiom/util/activation/DataHandlerContentTypeProviderTest.java
index d7b850aeb..9ab0950cc 100644
--- a/axiom-jakarta-activation/src/test/java/org/apache/axiom/util/activation/DataHandlerContentTypeProviderTest.java
+++ b/axiom-jakarta-activation/src/test/java/org/apache/axiom/util/activation/DataHandlerContentTypeProviderTest.java
@@ -20,7 +20,12 @@ package org.apache.axiom.util.activation;
import static org.assertj.core.api.Assertions.assertThat;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
import org.apache.axiom.blob.Blobs;
import org.apache.axiom.mime.ContentType;
@@ -38,7 +43,29 @@ public class DataHandlerContentTypeProviderTest {
@Test
public void testDataHandlerWithoutContentType() {
- DataHandler dh = new DataHandler(new BlobDataSource(Blobs.createBlob(new byte[10]), null));
+ DataHandler dh =
+ new DataHandler(
+ new DataSource() {
+ @Override
+ public InputStream getInputStream() throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public OutputStream getOutputStream() throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getContentType() {
+ return null;
+ }
+
+ @Override
+ public String getName() {
+ throw new UnsupportedOperationException();
+ }
+ });
assertThat(
DataHandlerContentTypeProvider.INSTANCE.getContentType(
DataHandlerUtils.toBlob(dh)))