[ws-axiom] branch master updated: [AXIOM-506] Clean up BlobProvider implementations

[ve...@apache.org]

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 ee34a871f [AXIOM-506] Clean up BlobProvider implementations
ee34a871f is described below

commit ee34a871f855776ee2c4c737ed8c47cb32f0443f
Author: Andreas Veithen <an...@gmail.com>
AuthorDate: Mon Nov 7 01:03:28 2022 +0000

    [AXIOM-506] Clean up BlobProvider implementations
    
    - Use lambdas where possible.
    - Change class names to reflect the refactoring from DataHandlerProvider
    to BlobProvider.
---
 .../axiom/om/impl/stream/xop/XOPDecodingFilterHandler.java       | 6 +++---
 .../axiom/ts/om/factory/TestCreateOMTextFromBlobProvider.java    | 4 ++--
 .../ts/om/sourcedelement/push/WriteBlobProviderScenario.java     | 9 +--------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilterHandler.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilterHandler.java
index c1bb4fa41..563766901 100644
--- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilterHandler.java
+++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/xop/XOPDecodingFilterHandler.java
@@ -29,11 +29,11 @@ import org.apache.axiom.om.OMException;
 import org.apache.axiom.om.impl.intf.TextContent;
 
 final class XOPDecodingFilterHandler extends AbstractXOPDecodingFilterHandler {
-    private static class DataHandlerProviderImpl implements BlobProvider {
+    private static class BlobProviderImpl implements BlobProvider {
         private final OMAttachmentAccessor attachmentAccessor;
         private final String contentID;
 
-        public DataHandlerProviderImpl(OMAttachmentAccessor attachmentAccessor, String contentID) {
+        public BlobProviderImpl(OMAttachmentAccessor attachmentAccessor, String contentID) {
             this.attachmentAccessor = attachmentAccessor;
             this.contentID = contentID;
         }
@@ -59,6 +59,6 @@ final class XOPDecodingFilterHandler extends AbstractXOPDecodingFilterHandler {
     @Override
     protected Object buildCharacterData(String contentID) {
         return new TextContent(
-                contentID, new DataHandlerProviderImpl(attachmentAccessor, contentID), true);
+                contentID, new BlobProviderImpl(attachmentAccessor, contentID), true);
     }
 }
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromBlobProvider.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromBlobProvider.java
index 47940e9ad..8dd099a8b 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromBlobProvider.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromBlobProvider.java
@@ -32,7 +32,7 @@ import org.apache.axiom.util.UIDGenerator;
 import org.apache.axiom.util.activation.DataHandlerUtils;
 
 public class TestCreateOMTextFromBlobProvider extends AxiomTestCase {
-    static class TestDataHandlerProvider implements BlobProvider {
+    static class TestBlobProvider implements BlobProvider {
         private Blob blob;
 
         @Override
@@ -58,7 +58,7 @@ public class TestCreateOMTextFromBlobProvider extends AxiomTestCase {
 
     @Override
     protected void runTest() throws Throwable {
-        TestDataHandlerProvider prov = new TestDataHandlerProvider();
+        TestBlobProvider prov = new TestBlobProvider();
         OMFactory factory = metaFactory.getOMFactory();
         String contentID = nullContentID ? null : UIDGenerator.generateContentId();
         OMText text = factory.createOMText(contentID, prov, true);
diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteBlobProviderScenario.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteBlobProviderScenario.java
index e44fda747..fe49d118d 100644
--- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteBlobProviderScenario.java
+++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteBlobProviderScenario.java
@@ -43,13 +43,6 @@ import org.junit.Assert;
  */
 public class WriteBlobProviderScenario implements PushOMDataSourceScenario {
     private final Blob blob = new RandomBlob(1024);
-    private final BlobProvider blobProvider =
-            new BlobProvider() {
-                @Override
-                public Blob getBlob() throws IOException {
-                    return blob;
-                }
-            };
 
     @Override
     public void addTestParameters(MatrixTestCase testCase) {
@@ -65,7 +58,7 @@ public class WriteBlobProviderScenario implements PushOMDataSourceScenario {
     public void serialize(XMLStreamWriter writer) throws XMLStreamException {
         writer.writeStartElement(null, "root", null);
         try {
-            XMLStreamWriterUtils.writeBlob(writer, blobProvider, null, true);
+            XMLStreamWriterUtils.writeBlob(writer, () -> blob, null, true);
         } catch (IOException ex) {
             throw new XMLStreamException(ex);
         }