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 369194c3b Remove unnecessary binding annotations
369194c3b is described below
commit 369194c3bd1f59fd3924f36d72a1e80eb36efe4e
Author: Andreas Veithen-Knowles <[email protected]>
AuthorDate: Sun Mar 15 21:30:49 2026 +0000
Remove unnecessary binding annotations
---
.../apache/axiom/om/impl/jaxp/StreamSourceToOMResultTest.java | 5 +----
.../axiom/om/impl/jaxp/StreamSourceToOMResultTestCase.java | 4 +---
.../core/stream/serializer/SerializerConformanceTest.java | 7 +------
.../core/stream/serializer/SerializerConformanceTestCase.java | 5 +----
.../stream/stax/pull/output/StAXPivotTransformerTest.java | 11 ++---------
.../stream/stax/pull/output/StAXPivotTransformerTestCase.java | 9 ++-------
.../java/org/apache/axiom/ts/om/cross/CrossOMTestSuite.java | 5 +----
.../apache/axiom/ts/om/cross/TestImportInformationItem.java | 5 +----
.../main/java/org/apache/axiom/ts/omdom/OMDOMTestSuite.java | 5 +----
.../org/apache/axiom/ts/omdom/document/TestImportNode.java | 5 +----
.../src/main/java/org/apache/axiom/ts/saaj/SAAJTestCase.java | 5 +----
.../src/main/java/org/apache/axiom/ts/saaj/SAAJTestSuite.java | 7 +------
.../java/org/apache/axiom/ts/springws/SpringWSTestCase.java | 5 +----
.../java/org/apache/axiom/ts/springws/SpringWSTestSuite.java | 6 +-----
14 files changed, 16 insertions(+), 68 deletions(-)
diff --git
a/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTest.java
b/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTest.java
index 66c0dc874..a075a3d6a 100644
---
a/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTest.java
+++
b/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTest.java
@@ -47,10 +47,7 @@ public class StreamSourceToOMResultTest {
s -> s,
new ParameterFanOutNode<>(
Multiton.getInstances(XMLSample.class),
- (binder, value) ->
- binder.bind(XMLSample.class)
-
.annotatedWith(Names.named("file"))
- .toInstance(value),
+ (binder, value) ->
binder.bind(XMLSample.class).toInstance(value),
"file",
XMLSample::getName,
new
MatrixTest(StreamSourceToOMResultTestCase.class)))
diff --git
a/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTestCase.java
b/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTestCase.java
index 46e9f6779..c616a4fa1 100644
---
a/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTestCase.java
+++
b/axiom-compat/src/test/java/org/apache/axiom/om/impl/jaxp/StreamSourceToOMResultTestCase.java
@@ -42,9 +42,7 @@ public class StreamSourceToOMResultTestCase extends TestCase {
@Named("axiomImplementation")
private String axiomImplementation;
- @Inject
- @Named("file")
- private XMLSample file;
+ @Inject private XMLSample file;
@Override
@SuppressWarnings({"deprecation"})
diff --git
a/components/core-streams/src/test/java/org/apache/axiom/core/stream/serializer/SerializerConformanceTest.java
b/components/core-streams/src/test/java/org/apache/axiom/core/stream/serializer/SerializerConformanceTest.java
index 59f4f1d79..2039977d6 100644
---
a/components/core-streams/src/test/java/org/apache/axiom/core/stream/serializer/SerializerConformanceTest.java
+++
b/components/core-streams/src/test/java/org/apache/axiom/core/stream/serializer/SerializerConformanceTest.java
@@ -20,8 +20,6 @@ package org.apache.axiom.core.stream.serializer;
import java.util.stream.Stream;
-import com.google.inject.name.Names;
-
import org.apache.axiom.testing.multiton.Multiton;
import org.apache.axiom.testutils.suite.MatrixTest;
import org.apache.axiom.testutils.suite.ParameterFanOutNode;
@@ -34,10 +32,7 @@ public class SerializerConformanceTest {
public Stream<DynamicNode> tests() {
return new ParameterFanOutNode<>(
Multiton.getInstances(XMLSample.class),
- (binder, value) ->
- binder.bind(XMLSample.class)
- .annotatedWith(Names.named("sample"))
- .toInstance(value),
+ (binder, value) ->
binder.bind(XMLSample.class).toInstance(value),
"sample",
XMLSample::getName,
new MatrixTest(SerializerConformanceTestCase.class))
diff --git
a/components/core-streams/src/test/java/org/apache/axiom/core/stream/serializer/SerializerConformanceTestCase.java
b/components/core-streams/src/test/java/org/apache/axiom/core/stream/serializer/SerializerConformanceTestCase.java
index 250754bd8..88bc7935f 100644
---
a/components/core-streams/src/test/java/org/apache/axiom/core/stream/serializer/SerializerConformanceTestCase.java
+++
b/components/core-streams/src/test/java/org/apache/axiom/core/stream/serializer/SerializerConformanceTestCase.java
@@ -27,7 +27,6 @@ import java.io.StringWriter;
import javax.xml.parsers.DocumentBuilderFactory;
import com.google.inject.Inject;
-import com.google.inject.name.Named;
import org.apache.axiom.core.stream.XmlReader;
import org.apache.axiom.core.stream.dom.input.DOMInput;
import org.apache.axiom.ts.xml.XMLSample;
@@ -37,9 +36,7 @@ import org.xml.sax.InputSource;
import junit.framework.TestCase;
public class SerializerConformanceTestCase extends TestCase {
- @Inject
- @Named("sample")
- private XMLSample sample;
+ @Inject private XMLSample sample;
@Override
protected void runTest() throws Throwable {
diff --git
a/components/core-streams/src/test/java/org/apache/axiom/core/stream/stax/pull/output/StAXPivotTransformerTest.java
b/components/core-streams/src/test/java/org/apache/axiom/core/stream/stax/pull/output/StAXPivotTransformerTest.java
index e6a4c1911..afcb7824a 100644
---
a/components/core-streams/src/test/java/org/apache/axiom/core/stream/stax/pull/output/StAXPivotTransformerTest.java
+++
b/components/core-streams/src/test/java/org/apache/axiom/core/stream/stax/pull/output/StAXPivotTransformerTest.java
@@ -29,7 +29,6 @@ import org.junit.jupiter.api.DynamicNode;
import org.junit.jupiter.api.TestFactory;
import com.google.common.collect.ImmutableList;
-import com.google.inject.name.Names;
public class StAXPivotTransformerTest {
@TestFactory
@@ -38,20 +37,14 @@ public class StAXPivotTransformerTest {
Multiton.getInstances(XSLTImplementation.class).stream()
.filter(XSLTImplementation::supportsStAXSource)
.collect(ImmutableList.toImmutableList()),
- (binder, value) ->
- binder.bind(XSLTImplementation.class)
- .annotatedWith(Names.named("xslt"))
- .toInstance(value),
+ (binder, value) ->
binder.bind(XSLTImplementation.class).toInstance(value),
"xslt",
XSLTImplementation::getName,
new ParameterFanOutNode<>(
Multiton.getInstances(XMLSample.class).stream()
.filter(s -> !s.hasDTD())
.collect(ImmutableList.toImmutableList()),
- (binder, value) ->
- binder.bind(XMLSample.class)
-
.annotatedWith(Names.named("sample"))
- .toInstance(value),
+ (binder, value) ->
binder.bind(XMLSample.class).toInstance(value),
"sample",
XMLSample::getName,
new
MatrixTest(StAXPivotTransformerTestCase.class)))
diff --git
a/components/core-streams/src/test/java/org/apache/axiom/core/stream/stax/pull/output/StAXPivotTransformerTestCase.java
b/components/core-streams/src/test/java/org/apache/axiom/core/stream/stax/pull/output/StAXPivotTransformerTestCase.java
index 1e72f5c6c..2fa5ae21d 100644
---
a/components/core-streams/src/test/java/org/apache/axiom/core/stream/stax/pull/output/StAXPivotTransformerTestCase.java
+++
b/components/core-streams/src/test/java/org/apache/axiom/core/stream/stax/pull/output/StAXPivotTransformerTestCase.java
@@ -33,18 +33,13 @@ import org.apache.axiom.ts.xml.XMLSample;
import org.w3c.dom.Document;
import com.google.inject.Inject;
-import com.google.inject.name.Named;
import junit.framework.TestCase;
public class StAXPivotTransformerTestCase extends TestCase {
- @Inject
- @Named("xslt")
- private XSLTImplementation xsltImplementation;
+ @Inject private XSLTImplementation xsltImplementation;
- @Inject
- @Named("sample")
- private XMLSample sample;
+ @Inject private XMLSample sample;
@Override
protected void runTest() throws Throwable {
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 396e03e8f..98194698b 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
@@ -44,10 +44,7 @@ public class CrossOMTestSuite {
new MatrixTest(TestAddChild.class),
new ParameterFanOutNode<>(
Multiton.getInstances(XMLSample.class),
- (binder, value) ->
- binder.bind(XMLSample.class)
-
.annotatedWith(Names.named("file"))
- .toInstance(value),
+ (binder, value) ->
binder.bind(XMLSample.class).toInstance(value),
"file",
XMLSample::getName,
new
MatrixTest(TestImportInformationItem.class)),
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/TestImportInformationItem.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/TestImportInformationItem.java
index 765423920..3b3d37922 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/TestImportInformationItem.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/cross/TestImportInformationItem.java
@@ -22,16 +22,13 @@ import static com.google.common.truth.Truth.assertAbout;
import static org.apache.axiom.truth.xml.XMLTruth.xml;
import com.google.inject.Inject;
-import com.google.inject.name.Named;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.ts.om.XMLSampleAdapter;
import org.apache.axiom.ts.xml.XMLSample;
public class TestImportInformationItem extends CrossOMTestCase {
- @Inject
- @Named("file")
- private XMLSample file;
+ @Inject private XMLSample file;
@Override
protected void runTest() throws Throwable {
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 04bcd7f66..603d71313 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
@@ -66,10 +66,7 @@ public class OMDOMTestSuite {
new
MatrixTest(org.apache.axiom.ts.omdom.document.TestGetOMFactory2.class),
new ParameterFanOutNode<>(
Multiton.getInstances(XMLSample.class),
- (binder, value) ->
- binder.bind(XMLSample.class)
-
.annotatedWith(Names.named("file"))
- .toInstance(value),
+ (binder, value) ->
binder.bind(XMLSample.class).toInstance(value),
"file",
XMLSample::getName,
new MatrixTest(
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestImportNode.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestImportNode.java
index ed5965148..7a8a611ec 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestImportNode.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/document/TestImportNode.java
@@ -32,12 +32,9 @@ import org.w3c.dom.Node;
import org.xml.sax.InputSource;
import com.google.inject.Inject;
-import com.google.inject.name.Named;
public class TestImportNode extends OMDOMTestCase {
- @Inject
- @Named("file")
- private XMLSample file;
+ @Inject private XMLSample file;
@Override
protected void runTest() throws Throwable {
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 e62375893..d3cd2ec95 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
@@ -25,16 +25,13 @@ import jakarta.xml.soap.SOAPFactory;
import org.apache.axiom.ts.soap.SOAPSpec;
import com.google.inject.Inject;
-import com.google.inject.name.Named;
import junit.framework.TestCase;
public abstract class SAAJTestCase extends TestCase {
@Inject protected SAAJImplementation saajImplementation;
- @Inject
- @Named("spec")
- protected SOAPSpec spec;
+ @Inject protected SOAPSpec spec;
protected final MessageFactory newMessageFactory() throws SOAPException {
return
spec.getAdapter(FactorySelector.class).newMessageFactory(saajImplementation);
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 add516f50..834d1c2b0 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
@@ -20,8 +20,6 @@ package org.apache.axiom.ts.saaj;
import jakarta.xml.soap.SAAJMetaFactory;
-import com.google.inject.name.Names;
-
import org.apache.axiom.testing.multiton.Multiton;
import org.apache.axiom.testutils.suite.MatrixTest;
import org.apache.axiom.testutils.suite.InjectorNode;
@@ -43,10 +41,7 @@ public class SAAJTestSuite {
.toInstance(new
SAAJImplementation(metaFactory)),
new ParameterFanOutNode<>(
Multiton.getInstances(SOAPSpec.class),
- (binder, value) ->
- binder.bind(SOAPSpec.class)
- .annotatedWith(Names.named("spec"))
- .toInstance(value),
+ (binder, value) ->
binder.bind(SOAPSpec.class).toInstance(value),
"spec",
SOAPSpec::getName,
new ParentNode(
diff --git
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestCase.java
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestCase.java
index 129677e1d..f2c88f4f9 100644
---
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestCase.java
+++
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestCase.java
@@ -26,14 +26,11 @@ import org.springframework.core.io.Resource;
import org.springframework.mock.env.MockPropertySource;
import com.google.inject.Inject;
-import com.google.inject.name.Named;
import junit.framework.TestCase;
public abstract class SpringWSTestCase extends TestCase {
- @Inject
- @Named("soapVersion")
- protected SOAPSpec spec;
+ @Inject protected SOAPSpec spec;
protected void configureContext(
GenericApplicationContext context,
diff --git
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuite.java
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuite.java
index 9833231b0..64163dd80 100644
---
a/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuite.java
+++
b/testing/spring-ws-testsuite/src/main/java/org/apache/axiom/ts/springws/SpringWSTestSuite.java
@@ -41,7 +41,6 @@ import
org.apache.axiom.ts.springws.soap.messagefactory.TestCreateWebServiceMess
import
org.apache.axiom.ts.springws.soap.messagefactory.TestCreateWebServiceMessageFromInputStreamVersionMismatch;
import com.google.common.collect.ImmutableList;
-import com.google.inject.name.Names;
public class SpringWSTestSuite {
public static MatrixTestNode create(
@@ -56,10 +55,7 @@ public class SpringWSTestSuite {
return new ParameterFanOutNode<>(
Multiton.getInstances(SOAPSpec.class),
- (binder, value) ->
- binder.bind(SOAPSpec.class)
- .annotatedWith(Names.named("soapVersion"))
- .toInstance(value),
+ (binder, value) ->
binder.bind(SOAPSpec.class).toInstance(value),
"soapVersion",
spec ->
spec.getAdapter(SOAPSpecAdapter.class).getSoapVersion(),
new ParentNode(
