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 0bf289fb1 Inject MessageFactory/SOAPFactory directly instead of using
helper methods
0bf289fb1 is described below
commit 0bf289fb189c39bf3d4ea761248f2df1349cf559
Author: Copilot <[email protected]>
AuthorDate: Fri May 22 23:35:29 2026 +0100
Inject MessageFactory/SOAPFactory directly instead of using helper methods
Co-authored-by: Andreas Veithen-Knowles <[email protected]>
---
.../org/apache/axiom/ts/saaj/SAAJTestCase.java | 14 +++------
.../org/apache/axiom/ts/saaj/SAAJTestSuite.java | 35 +++++++++++++++++-----
.../saaj/body/TestAddChildElementReification.java | 2 +-
.../saaj/element/TestAddChildElementLocalName.java | 2 +-
.../TestAddChildElementLocalNamePrefixAndURI.java | 2 +-
.../ts/saaj/element/TestGetOwnerDocument.java | 2 +-
.../ts/saaj/element/TestSetParentElement.java | 2 +-
.../TestExamineMustUnderstandHeaderElements.java | 2 +-
8 files changed, 38 insertions(+), 23 deletions(-)
diff --git
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestCase.java
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestCase.java
index 20ada0693..df6cf76ca 100644
---
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestCase.java
+++
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestCase.java
@@ -20,23 +20,17 @@ package org.apache.axiom.ts.saaj;
import com.google.inject.Inject;
import jakarta.xml.soap.MessageFactory;
-import jakarta.xml.soap.SOAPException;
import jakarta.xml.soap.SOAPFactory;
import org.apache.axiom.ts.soap.SOAPSpec;
import org.junit.jupiter.api.function.Executable;
public abstract class SAAJTestCase implements Executable {
- @Inject
- protected SAAJImplementation saajImplementation;
-
@Inject
protected SOAPSpec spec;
- protected final MessageFactory newMessageFactory() throws SOAPException {
- return
spec.getAdapter(FactorySelector.class).newMessageFactory(saajImplementation);
- }
+ @Inject
+ protected MessageFactory messageFactory;
- protected final SOAPFactory newSOAPFactory() throws SOAPException {
- return
spec.getAdapter(FactorySelector.class).newSOAPFactory(saajImplementation);
- }
+ @Inject
+ protected SOAPFactory soapFactory;
}
diff --git
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestSuite.java
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestSuite.java
index cca857f7c..42d2f3c3c 100644
---
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestSuite.java
+++
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/SAAJTestSuite.java
@@ -18,8 +18,13 @@
*/
package org.apache.axiom.ts.saaj;
+import com.google.inject.AbstractModule;
import com.google.inject.Key;
+import com.google.inject.Provides;
+import jakarta.xml.soap.MessageFactory;
import jakarta.xml.soap.SAAJMetaFactory;
+import jakarta.xml.soap.SOAPException;
+import jakarta.xml.soap.SOAPFactory;
import org.apache.axiom.testing.multiton.Multiton;
import org.apache.axiom.testutils.suite.Binding;
import org.apache.axiom.testutils.suite.FanOutNode;
@@ -44,12 +49,28 @@ public class SAAJTestSuite {
Multiton.getInstances(SOAPSpec.class),
Binding.singleton(Key.get(SOAPSpec.class)),
LabelBinding.simpleString("spec", SOAPSpec::getName),
- new ParentNode(
- new
MatrixTest(TestAddChildElementReification.class),
- new
MatrixTest(TestExamineMustUnderstandHeaderElements.class),
- new
MatrixTest(TestAddChildElementLocalName.class),
- new
MatrixTest(TestAddChildElementLocalNamePrefixAndURI.class),
- new MatrixTest(TestSetParentElement.class),
- new MatrixTest(TestGetOwnerDocument.class))));
+ new InjectorNode(
+ new AbstractModule() {
+ @Provides
+ MessageFactory
provideMessageFactory(SAAJImplementation impl, SOAPSpec spec)
+ throws SOAPException {
+ return
spec.getAdapter(FactorySelector.class)
+ .newMessageFactory(impl);
+ }
+
+ @Provides
+ SOAPFactory
provideSOAPFactory(SAAJImplementation impl, SOAPSpec spec)
+ throws SOAPException {
+ return
spec.getAdapter(FactorySelector.class)
+ .newSOAPFactory(impl);
+ }
+ },
+ new ParentNode(
+ new
MatrixTest(TestAddChildElementReification.class),
+ new
MatrixTest(TestExamineMustUnderstandHeaderElements.class),
+ new
MatrixTest(TestAddChildElementLocalName.class),
+ new
MatrixTest(TestAddChildElementLocalNamePrefixAndURI.class),
+ new
MatrixTest(TestSetParentElement.class),
+ new
MatrixTest(TestGetOwnerDocument.class)))));
}
}
diff --git
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/body/TestAddChildElementReification.java
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/body/TestAddChildElementReification.java
index b0e260695..f0e2575e4 100644
---
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/body/TestAddChildElementReification.java
+++
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/body/TestAddChildElementReification.java
@@ -28,7 +28,7 @@ import org.apache.axiom.ts.saaj.SAAJTestCase;
public class TestAddChildElementReification extends SAAJTestCase {
@Override
public void execute() throws Throwable {
- SOAPBody body = newMessageFactory().createMessage().getSOAPBody();
+ SOAPBody body = messageFactory.createMessage().getSOAPBody();
SOAPElement child =
body.addChildElement((SOAPElement)
body.getOwnerDocument().createElementNS("urn:test", "p:test"));
assertThat(child).isInstanceOf(SOAPBodyElement.class);
diff --git
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestAddChildElementLocalName.java
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestAddChildElementLocalName.java
index 8a6a0d83d..8d6837ad7 100644
---
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestAddChildElementLocalName.java
+++
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestAddChildElementLocalName.java
@@ -27,7 +27,7 @@ import org.apache.axiom.ts.saaj.SAAJTestCase;
public class TestAddChildElementLocalName extends SAAJTestCase {
@Override
public void execute() throws Throwable {
- SOAPElement root = newSOAPFactory().createElement("root", "p",
"urn:test");
+ SOAPElement root = soapFactory.createElement("root", "p", "urn:test");
SOAPElement element = root.addChildElement("child");
assertThat(element.getLocalName()).isEqualTo("child");
assertThat(element.getNamespaceURI()).isNull();
diff --git
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestAddChildElementLocalNamePrefixAndURI.java
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestAddChildElementLocalNamePrefixAndURI.java
index 9c600bcf0..4a93acdf8 100644
---
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestAddChildElementLocalNamePrefixAndURI.java
+++
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestAddChildElementLocalNamePrefixAndURI.java
@@ -30,7 +30,7 @@ import org.w3c.dom.NamedNodeMap;
public class TestAddChildElementLocalNamePrefixAndURI extends SAAJTestCase {
@Override
public void execute() throws Throwable {
- SOAPElement root = newSOAPFactory().createElement("root", "ns1",
"urn:ns1");
+ SOAPElement root = soapFactory.createElement("root", "ns1", "urn:ns1");
SOAPElement element = root.addChildElement("child", "ns2", "urn:ns2");
assertThat(element.getLocalName()).isEqualTo("child");
assertThat(element.getNamespaceURI()).isEqualTo("urn:ns2");
diff --git
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestGetOwnerDocument.java
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestGetOwnerDocument.java
index 4f180e70a..77a14f74d 100644
---
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestGetOwnerDocument.java
+++
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestGetOwnerDocument.java
@@ -34,7 +34,7 @@ import org.w3c.dom.Node;
public class TestGetOwnerDocument extends SAAJTestCase {
@Override
public void execute() throws Throwable {
- Document doc = newSOAPFactory().createElement(new
QName("test")).getOwnerDocument();
+ Document doc = soapFactory.createElement(new
QName("test")).getOwnerDocument();
assertThat(doc).isNotInstanceOf(SOAPPart.class);
assertThat(doc.createElementNS(null,
"test")).isInstanceOf(SOAPElement.class);
}
diff --git
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestSetParentElement.java
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestSetParentElement.java
index aa50d185f..fbb2af9c7 100644
---
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestSetParentElement.java
+++
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/element/TestSetParentElement.java
@@ -28,7 +28,7 @@ import org.w3c.dom.NodeList;
public class TestSetParentElement extends SAAJTestCase {
@Override
public void execute() throws Throwable {
- SOAPElement parent = newSOAPFactory().createElement(new
QName("parent"));
+ SOAPElement parent = soapFactory.createElement(new QName("parent"));
SOAPElement child1 = parent.addChildElement(new QName("child1"));
SOAPElement child2 = (SOAPElement)
parent.getOwnerDocument().createElementNS(null, "child2");
child2.setParentElement(parent);
diff --git
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java
index ae1323116..07646a73d 100644
---
a/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java
+++
b/testing/saaj-testsuite/src/main/java/org/apache/axiom/ts/saaj/header/TestExamineMustUnderstandHeaderElements.java
@@ -36,7 +36,7 @@ public class TestExamineMustUnderstandHeaderElements extends
SAAJTestCase {
mimeHeaders.addHeader("Content-Type", spec.getContentType());
InputStream in =
SOAPSampleSet.MUST_UNDERSTAND.getMessage(spec).getInputStream();
try {
- SOAPMessage message =
newMessageFactory().createMessage(mimeHeaders, in);
+ SOAPMessage message = messageFactory.createMessage(mimeHeaders,
in);
SOAPHeader header = message.getSOAPHeader();
Iterator<?> it = header.examineMustUnderstandHeaderElements(null);
assertThat(it.hasNext()).isTrue();
