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 9cc7622198fee7b849a0a59eb2dcf01240f17cd6 Author: Andreas Veithen-Knowles <[email protected]> AuthorDate: Sun Mar 15 18:54:48 2026 +0000 Simplify Guice module creation --- .../org/apache/axiom/util/sax/XMLReaderTestSuite.java | 8 +------- .../org/apache/axiom/ts/om/cross/CrossOMTestSuite.java | 18 +++++++----------- .../java/org/apache/axiom/ts/omdom/OMDOMTestSuite.java | 8 +------- .../java/org/apache/axiom/ts/saaj/SAAJTestSuite.java | 10 +--------- 4 files changed, 10 insertions(+), 34 deletions(-) diff --git a/axiom-api/src/test/java/org/apache/axiom/util/sax/XMLReaderTestSuite.java b/axiom-api/src/test/java/org/apache/axiom/util/sax/XMLReaderTestSuite.java index b4e3a8c9f..526e7729d 100644 --- a/axiom-api/src/test/java/org/apache/axiom/util/sax/XMLReaderTestSuite.java +++ b/axiom-api/src/test/java/org/apache/axiom/util/sax/XMLReaderTestSuite.java @@ -24,17 +24,11 @@ import org.apache.axiom.testutils.suite.ParameterFanOutNode; import org.xml.sax.XMLReader; import com.google.common.collect.ImmutableList; -import com.google.inject.AbstractModule; public class XMLReaderTestSuite { public static InjectorNode create(XMLReader xmlReader) { return new InjectorNode( - new AbstractModule() { - @Override - protected void configure() { - bind(XMLReader.class).toInstance(xmlReader); - } - }, + binder -> binder.bind(XMLReader.class).toInstance(xmlReader), new ParameterFanOutNode<>( String.class, ImmutableList.of( diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/CrossOMTestSuite.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/CrossOMTestSuite.java index 3d1b9c094..330f0a0f5 100644 --- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/CrossOMTestSuite.java +++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/CrossOMTestSuite.java @@ -27,22 +27,18 @@ import org.apache.axiom.testutils.suite.ParameterFanOutNode; import org.apache.axiom.ts.xml.XMLSample; import com.google.common.collect.ImmutableList; -import com.google.inject.AbstractModule; import com.google.inject.name.Names; public class CrossOMTestSuite { public static InjectorNode create(OMMetaFactory metaFactory, OMMetaFactory altMetaFactory) { return new InjectorNode( - new AbstractModule() { - @Override - protected void configure() { - bind(OMMetaFactory.class) - .annotatedWith(Names.named("metaFactory")) - .toInstance(metaFactory); - bind(OMMetaFactory.class) - .annotatedWith(Names.named("altMetaFactory")) - .toInstance(altMetaFactory); - } + binder -> { + binder.bind(OMMetaFactory.class) + .annotatedWith(Names.named("metaFactory")) + .toInstance(metaFactory); + binder.bind(OMMetaFactory.class) + .annotatedWith(Names.named("altMetaFactory")) + .toInstance(altMetaFactory); }, new ParentNode( new MatrixTest(TestAddChild.class), diff --git a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/OMDOMTestSuite.java b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/OMDOMTestSuite.java index 3b5c91062..8b22f03fa 100644 --- a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/OMDOMTestSuite.java +++ b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/OMDOMTestSuite.java @@ -27,7 +27,6 @@ import org.apache.axiom.testutils.suite.ParameterFanOutNode; import org.apache.axiom.ts.xml.XMLSample; import com.google.common.collect.ImmutableList; -import com.google.inject.AbstractModule; /** * Builds a test suite for Axiom implementations that also implement DOM. Note that this test suite @@ -37,12 +36,7 @@ import com.google.inject.AbstractModule; public class OMDOMTestSuite { public static InjectorNode create(DOMMetaFactory metaFactory) { return new InjectorNode( - new AbstractModule() { - @Override - protected void configure() { - bind(DOMMetaFactory.class).toInstance(metaFactory); - } - }, + binder -> binder.bind(DOMMetaFactory.class).toInstance(metaFactory), new ParentNode( new MatrixTest( org.apache.axiom.ts.omdom.attr.TestGetNamespaceNormalized.class), 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 b2f7e6567..0b50a412d 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 @@ -33,18 +33,10 @@ import org.apache.axiom.ts.saaj.element.TestSetParentElement; import org.apache.axiom.ts.saaj.header.TestExamineMustUnderstandHeaderElements; import org.apache.axiom.ts.soap.SOAPSpec; -import com.google.inject.AbstractModule; - public class SAAJTestSuite { public static InjectorNode create(SAAJMetaFactory metaFactory) { return new InjectorNode( - new AbstractModule() { - @Override - protected void configure() { - bind(SAAJImplementation.class) - .toInstance(new SAAJImplementation(metaFactory)); - } - }, + binder -> binder.bind(SAAJMetaFactory.class).toInstance(metaFactory), new ParameterFanOutNode<>( SOAPSpec.class, Multiton.getInstances(SOAPSpec.class),
