(ws-axiom) branch master updated: Fix om-mixins Checker Framework compilation failures

[veithen]

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 cb469de53 Fix om-mixins Checker Framework compilation failures
cb469de53 is described below

commit cb469de5397a9acd3f351c4c39d25c8b7987281b
Author: Copilot <198982749+copi...@users.noreply.github.com>
AuthorDate: Thu Jun 4 09:47:12 2026 +0200

    Fix om-mixins Checker Framework compilation failures
    
    Co-authored-by: Andreas Veithen-Knowles <andreas.veit...@gmail.com>
---
 mixins/dom-mixins/pom.xml                                           | 6 ++++++
 mixins/om-mixins/pom.xml                                            | 6 ++++++
 .../java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java | 3 ++-
 .../apache/axiom/om/impl/stream/xop/XOPDecodingFilterHandler.java   | 3 ++-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/mixins/dom-mixins/pom.xml b/mixins/dom-mixins/pom.xml
index 705ea20d0..ae472efa6 100644
--- a/mixins/dom-mixins/pom.xml
+++ b/mixins/dom-mixins/pom.xml
@@ -47,6 +47,12 @@
             <artifactId>xml-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>checker-annotations</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>axiom-weaver-annotations</artifactId>
diff --git a/mixins/om-mixins/pom.xml b/mixins/om-mixins/pom.xml
index 2af56b18e..d2cb26420 100644
--- a/mixins/om-mixins/pom.xml
+++ b/mixins/om-mixins/pom.xml
@@ -48,6 +48,12 @@
             <artifactId>xml-utils</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>checker-annotations</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>axiom-weaver-annotations</artifactId>
diff --git 
a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
 
b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
index 489c1a909..103135ba0 100644
--- 
a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
+++ 
b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
@@ -24,6 +24,7 @@ import java.util.Iterator;
 import javax.xml.namespace.QName;
 import org.apache.axiom.blob.Blob;
 import org.apache.axiom.core.CoreModelException;
+import org.apache.axiom.core.stream.annotations.StringOrCharacterData;
 import org.apache.axiom.ext.stax.BlobProvider;
 import org.apache.axiom.om.OMAttribute;
 import org.apache.axiom.om.OMComment;
@@ -99,7 +100,7 @@ public class OMFactoryImpl implements OMFactory {
         return node;
     }
 
-    private AxiomText createAxiomText(OMContainer parent, Object content, int 
type) {
+    private AxiomText createAxiomText(OMContainer parent, 
@StringOrCharacterData Object content, int type) {
         AxiomText node;
         switch (type) {
             case OMNode.TEXT_NODE -> {
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 32a9771bc..59f706aab 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
@@ -21,6 +21,7 @@ package org.apache.axiom.om.impl.stream.xop;
 import java.io.IOException;
 import org.apache.axiom.blob.Blob;
 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.ext.stax.BlobProvider;
 import org.apache.axiom.om.OMAttachmentAccessor;
@@ -56,7 +57,7 @@ final class XOPDecodingFilterHandler extends 
AbstractXOPDecodingFilterHandler {
     }
 
     @Override
-    protected Object buildCharacterData(String contentID) {
+    protected @StringOrCharacterData Object buildCharacterData(String 
contentID) {
         return new TextContent(contentID, new 
BlobProviderImpl(attachmentAccessor, contentID), true);
     }
 }