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
commit 1ad31da2769f37b2ca7519255b218c3237dcada6 Author: Andreas Veithen-Knowles <[email protected]> AuthorDate: Thu Jun 11 06:36:02 2026 +0000 Fix Checker Framework errors in om-mixins --- .../src/main/java/org/apache/axiom/om/impl/intf/TextContent.java | 8 ++++++-- .../axiom/om/impl/stream/ds/PushOMDataSourceXOPHandler.java | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/TextContent.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/TextContent.java index f4303f5ff..f16abb98b 100644 --- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/TextContent.java +++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/intf/TextContent.java @@ -25,6 +25,8 @@ import org.apache.axiom.core.ClonePolicy; import org.apache.axiom.core.CloneableCharacterData; import org.apache.axiom.core.stream.CharacterData; import org.apache.axiom.core.stream.CharacterDataSink; +import org.apache.axiom.core.stream.annotations.StringOrCharacterData; +import org.apache.axiom.core.stream.annotations.UnknownCharacterDataType; import org.apache.axiom.ext.stax.BlobProvider; import org.apache.axiom.mime.PartBlob; import org.apache.axiom.om.OMCloneOptions; @@ -34,6 +36,7 @@ import org.apache.axiom.util.base64.AbstractBase64EncodingOutputStream; import org.apache.axiom.util.base64.Base64EncodingStringBufferOutputStream; import org.apache.axiom.util.base64.Base64Utils; +@SuppressWarnings({"super.invocation", "inconsistent.constructor.type"}) public final class TextContent implements CloneableCharacterData { private final String value; @@ -134,7 +137,8 @@ public final class TextContent implements CloneableCharacterData { } @Override - public String toString() { + @SuppressWarnings("method.invocation") + public String toString(@UnknownCharacterDataType TextContent this) { if (blobObject != null) { try { return Base64Utils.encode(getBlob()); @@ -200,7 +204,7 @@ public final class TextContent implements CloneableCharacterData { } @Override - public Object retain() { + public @StringOrCharacterData Object retain() { return this; } } diff --git a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceXOPHandler.java b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceXOPHandler.java index e6ca67c0b..873ef836a 100644 --- a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceXOPHandler.java +++ b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/stream/ds/PushOMDataSourceXOPHandler.java @@ -23,6 +23,7 @@ import java.util.Map; import org.apache.axiom.blob.Blob; import org.apache.axiom.core.stream.StreamException; import org.apache.axiom.core.stream.XmlHandler; +import org.apache.axiom.core.stream.annotations.StringOrCharacterData; import org.apache.axiom.core.stream.xop.AbstractXOPDecodingFilterHandler; import org.apache.axiom.om.impl.intf.TextContent; import org.apache.axiom.om.impl.stream.xop.XOPHandler; @@ -43,7 +44,7 @@ final class PushOMDataSourceXOPHandler extends AbstractXOPDecodingFilterHandler } @Override - protected Object buildCharacterData(String contentID) throws StreamException { + protected @StringOrCharacterData Object buildCharacterData(String contentID) throws StreamException { Blob blob = blobs.get(contentID); if (blob == null) { throw new StreamException("No Blob found for content ID " + contentID);
