Merge branch '4.1.x'

snicoll · snicoll · commit 9f5e64e50a2b · 2025-05-06T09:06:45.000+02:00
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProvider.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/Wsdl11DestinationProvider.java
@@ -58,9 +58,9 @@ public class Wsdl11DestinationProvider extends AbstractCachingDestinationProvide
 	 */
 	public static final String DEFAULT_WSDL_LOCATION_EXPRESSION = "/wsdl:definitions/wsdl:service/wsdl:port/soap:address/@location";
 
-	private static TransformerFactory transformerFactory = TransformerFactoryUtils.newInstance();
+	private static final TransformerFactory transformerFactory = TransformerFactoryUtils.newInstance();
 
-	private Map<String, String> expressionNamespaces = new HashMap<>();
+	private final Map<String, String> expressionNamespaces = new HashMap<>();
 
 	private XPathExpression locationXPathExpression;
 
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/WsConfigurerComposite.java b/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/WsConfigurerComposite.java
@@ -34,7 +34,7 @@
 @Deprecated(since = "4.0.12", forRemoval = true)
 public class WsConfigurerComposite implements WsConfigurer {
 
-	private List<WsConfigurer> delegates = new ArrayList<>();
+	private final List<WsConfigurer> delegates = new ArrayList<>();
 
 	public void addWsConfigurers(List<WsConfigurer> configurers) {
 		if (configurers != null) {
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessageFactory.java b/spring-ws-core/src/main/java/org/springframework/ws/pox/dom/DomPoxMessageFactory.java
@@ -45,7 +45,7 @@ public class DomPoxMessageFactory extends TransformerObjectSupport implements We
 	/** The default content type for the POX messages. */
 	public static final String DEFAULT_CONTENT_TYPE = "application/xml";
 
-	private DocumentBuilderFactory documentBuilderFactory;
+	private final DocumentBuilderFactory documentBuilderFactory;
 
 	private String contentType = DEFAULT_CONTENT_TYPE;
 
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointInvocationChain.java b/spring-ws-core/src/main/java/org/springframework/ws/server/EndpointInvocationChain.java
@@ -26,7 +26,7 @@
  */
 public class EndpointInvocationChain {
 
-	private Object endpoint;
+	private final Object endpoint;
 
 	private EndpointInterceptor[] interceptors;
 
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java
@@ -47,7 +47,7 @@
  */
 public class SourcePayloadMethodProcessor extends AbstractPayloadSourceMethodProcessor {
 
-	private XMLInputFactory inputFactory = createXmlInputFactory();
+	private final XMLInputFactory inputFactory = createXmlInputFactory();
 
 	// MethodArgumentResolver
 
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/XomPayloadMethodProcessor.java
@@ -49,7 +49,7 @@
  */
 public class XomPayloadMethodProcessor extends AbstractPayloadSourceMethodProcessor {
 
-	private DocumentBuilderFactory documentBuilderFactory = createDocumentBuilderFactory();
+	private final DocumentBuilderFactory documentBuilderFactory = createDocumentBuilderFactory();
 
 	@Override
 	protected boolean supportsRequestPayloadParameter(MethodParameter parameter) {
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapVersion.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/SoapVersion.java
@@ -42,25 +42,25 @@ public interface SoapVersion {
 
 		private static final String CONTENT_TYPE = "text/xml";
 
-		private QName ENVELOPE_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Envelope");
+		private final QName ENVELOPE_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Envelope");
 
-		private QName HEADER_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Header");
+		private final QName HEADER_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Header");
 
-		private QName BODY_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Body");
+		private final QName BODY_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Body");
 
-		private QName FAULT_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Fault");
+		private final QName FAULT_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Fault");
 
-		private QName MUST_UNDERSTAND_ATTRIBUTE_NAME = new QName(ENVELOPE_NAMESPACE_URI, "mustUnderstand");
+		private final QName MUST_UNDERSTAND_ATTRIBUTE_NAME = new QName(ENVELOPE_NAMESPACE_URI, "mustUnderstand");
 
-		private QName ACTOR_NAME = new QName(ENVELOPE_NAMESPACE_URI, "actor");
+		private final QName ACTOR_NAME = new QName(ENVELOPE_NAMESPACE_URI, "actor");
 
-		private QName CLIENT_FAULT_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Client");
+		private final QName CLIENT_FAULT_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Client");
 
-		private QName SERVER_FAULT_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Server");
+		private final QName SERVER_FAULT_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Server");
 
-		private QName MUST_UNDERSTAND_FAULT_NAME = new QName(ENVELOPE_NAMESPACE_URI, "MustUnderstand");
+		private final QName MUST_UNDERSTAND_FAULT_NAME = new QName(ENVELOPE_NAMESPACE_URI, "MustUnderstand");
 
-		private QName VERSION_MISMATCH_FAULT_NAME = new QName(ENVELOPE_NAMESPACE_URI, "VersionMismatch");
+		private final QName VERSION_MISMATCH_FAULT_NAME = new QName(ENVELOPE_NAMESPACE_URI, "VersionMismatch");
 
 		public QName getBodyName() {
 			return this.BODY_NAME;
@@ -143,25 +143,25 @@ public String toString() {
 
 		private static final String CONTENT_TYPE = "application/soap+xml";
 
-		private QName ENVELOPE_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Envelope");
+		private final QName ENVELOPE_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Envelope");
 
-		private QName HEADER_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Header");
+		private final QName HEADER_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Header");
 
-		private QName BODY_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Body");
+		private final QName BODY_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Body");
 
-		private QName FAULT_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Fault");
+		private final QName FAULT_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Fault");
 
-		private QName MUST_UNDERSTAND_ATTRIBUTE_NAME = new QName(ENVELOPE_NAMESPACE_URI, "mustUnderstand");
+		private final QName MUST_UNDERSTAND_ATTRIBUTE_NAME = new QName(ENVELOPE_NAMESPACE_URI, "mustUnderstand");
 
-		private QName ROLE_NAME = new QName(ENVELOPE_NAMESPACE_URI, "role");
+		private final QName ROLE_NAME = new QName(ENVELOPE_NAMESPACE_URI, "role");
 
-		private QName SENDER_FAULT_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Sender");
+		private final QName SENDER_FAULT_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Sender");
 
-		private QName RECEIVER_FAULT_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Receiver");
+		private final QName RECEIVER_FAULT_NAME = new QName(ENVELOPE_NAMESPACE_URI, "Receiver");
 
-		private QName MUST_UNDERSTAND_FAULT_NAME = new QName(ENVELOPE_NAMESPACE_URI, "MustUnderstand");
+		private final QName MUST_UNDERSTAND_FAULT_NAME = new QName(ENVELOPE_NAMESPACE_URI, "MustUnderstand");
 
-		private QName VERSION_MISMATCH_FAULT_NAME = new QName(ENVELOPE_NAMESPACE_URI, "VersionMismatch");
+		private final QName VERSION_MISMATCH_FAULT_NAME = new QName(ENVELOPE_NAMESPACE_URI, "VersionMismatch");
 
 		public QName getBodyName() {
 			return this.BODY_NAME;
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java
@@ -51,9 +51,9 @@ class AddressingEndpointInterceptor implements SoapEndpointInterceptor {
 
 	private final WebServiceMessageSender[] messageSenders;
 
-	private URI replyAction;
+	private final URI replyAction;
 
-	private URI faultAction;
+	private final URI faultAction;
 
 	AddressingEndpointInterceptor(AddressingVersion version, MessageIdStrategy messageIdStrategy,
 			WebServiceMessageSender[] messageSenders, URI replyAction, URI faultAction) {
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/AbstractAddressingVersion.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/version/AbstractAddressingVersion.java
@@ -64,7 +64,7 @@
  */
 public abstract class AbstractAddressingVersion extends TransformerObjectSupport implements AddressingVersion {
 
-	private static DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance();
+	private static final DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance();
 
 	private final XPathExpression toExpression;
 
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajContentHandler.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajContentHandler.java
@@ -46,7 +46,7 @@ public class SaajContentHandler implements ContentHandler {
 
 	private final SOAPEnvelope envelope;
 
-	private Map<String, String> namespaces = new LinkedHashMap<>();
+	private final Map<String, String> namespaces = new LinkedHashMap<>();
 
 	/**
 	 * Constructs a new instance of the {@code SaajContentHandler} that creates children
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java
@@ -62,7 +62,7 @@ public abstract class SaajUtils {
 	 */
 	public static final int SAAJ_13 = 2;
 
-	private static int saajVersion = SAAJ_13;
+	private static final int saajVersion = SAAJ_13;
 
 	/**
 	 * Gets the SAAJ version. Returns {@link #SAAJ_13} as of Spring-WS 2.2.
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultMappingExceptionResolver.java
@@ -32,7 +32,7 @@
  */
 public class SoapFaultMappingExceptionResolver extends AbstractSoapFaultDefinitionExceptionResolver {
 
-	private Map<String, String> exceptionMappings = new LinkedHashMap<>();
+	private final Map<String, String> exceptionMappings = new LinkedHashMap<>();
 
 	/**
 	 * Set the mappings between exception class names and SOAP Faults. The exception class
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/WsdlDefinitionHandlerAdapter.java
@@ -89,7 +89,7 @@ public class WsdlDefinitionHandlerAdapter extends LocationTransformerObjectSuppo
 
 	private static final String CONTENT_TYPE = "text/xml";
 
-	private Map<String, String> expressionNamespaces = new HashMap<>();
+	private final Map<String, String> expressionNamespaces = new HashMap<>();
 
 	private String locationExpression = DEFAULT_LOCATION_EXPRESSION;
 
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/XsdSchemaHandlerAdapter.java
@@ -61,7 +61,7 @@ public class XsdSchemaHandlerAdapter extends LocationTransformerObjectSupport
 
 	private static final String CONTENT_TYPE = "text/xml";
 
-	private Map<String, String> expressionNamespaces = new HashMap<>();
+	private final Map<String, String> expressionNamespaces = new HashMap<>();
 
 	private String schemaLocationExpression = DEFAULT_SCHEMA_LOCATION_EXPRESSION;
 
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jHandler.java
@@ -43,7 +43,7 @@
 class Wss4jHandler extends WSHandler {
 
 	/** Keys are constants from {@link ConfigurationConstants}; values are strings. */
-	private Properties options = new Properties();
+	private final Properties options = new Properties();
 
 	private String securementPassword;
 
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBean.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/support/CryptoFactoryBean.java
@@ -44,7 +44,7 @@
  */
 public class CryptoFactoryBean implements FactoryBean<Crypto>, InitializingBean {
 
-	private Properties configuration = new Properties();
+	private final Properties configuration = new Properties();
 
 	private Crypto crypto;
 
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthenticationToken.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/x509/X509AuthenticationToken.java
@@ -41,7 +41,7 @@ public class X509AuthenticationToken extends AbstractAuthenticationToken {
 
 	private Object principal;
 
-	private X509Certificate credentials;
+	private final X509Certificate credentials;
 
 	// ~ Constructors
 	// ===================================================================================================
diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailReceiverConnection.java
@@ -231,9 +231,9 @@ protected void onSendAfterWrite(WebServiceMessage message) throws IOException {
 
 	private static final class ByteArrayDataSource implements DataSource {
 
-		private byte[] data;
+		private final String contentType;
 
-		private String contentType;
+		private final byte[] data;
 
 		ByteArrayDataSource(String contentType, byte[] data) {
 			this.data = data;
diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailSenderConnection.java
@@ -309,9 +309,9 @@ public void onClose() throws IOException {
 
 	private static final class ByteArrayDataSource implements DataSource {
 
-		private byte[] data;
+		private final String contentType;
 
-		private String contentType;
+		private final byte[] data;
 
 		ByteArrayDataSource(String contentType, byte[] data) {
 			this.data = data;
diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageReceiver.java
@@ -55,7 +55,7 @@ public class XmppMessageReceiver extends AbstractStandaloneMessageReceiver {
 
 	private WebServicePacketListener packetListener;
 
-	private String messageEncoding = DEFAULT_MESSAGE_ENCODING;
+	private final String messageEncoding = DEFAULT_MESSAGE_ENCODING;
 
 	public XmppMessageReceiver() {
 	}
diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/PayloadMessageCreator.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/creator/PayloadMessageCreator.java
@@ -37,7 +37,7 @@ public class PayloadMessageCreator extends AbstractMessageCreator {
 
 	private final Source payload;
 
-	private TransformerHelper transformerHelper = new TransformerHelper();
+	private final TransformerHelper transformerHelper = new TransformerHelper();
 
 	/**
 	 * Creates a new instance of the {@code PayloadMessageCreator} with the given payload
diff --git a/spring-xml/src/main/java/org/springframework/xml/transform/TransformerObjectSupport.java b/spring-xml/src/main/java/org/springframework/xml/transform/TransformerObjectSupport.java
@@ -43,7 +43,7 @@ public abstract class TransformerObjectSupport {
 	 */
 	protected final Log logger = LogFactory.getLog(getClass());
 
-	private TransformerHelper transformerHelper = new TransformerHelper();
+	private final TransformerHelper transformerHelper = new TransformerHelper();
 
 	/**
 	 * Specify the {@code TransformerFactory} class to use.
diff --git a/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java b/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp13ValidatorFactory.java
@@ -50,7 +50,7 @@ static XmlValidator createValidator(Resource[] resources, String schemaLanguage)
 
 	private static final class Jaxp13Validator implements XmlValidator {
 
-		private Schema schema;
+		private final Schema schema;
 
 		Jaxp13Validator(Schema schema) {
 			this.schema = schema;
@@ -84,7 +84,7 @@ public SAXParseException[] validate(Source source, ValidationErrorHandler errorH
 	 */
 	private static final class DefaultValidationErrorHandler implements ValidationErrorHandler {
 
-		private List<SAXParseException> errors = new ArrayList<>();
+		private final List<SAXParseException> errors = new ArrayList<>();
 
 		@Override
 		public SAXParseException[] getErrors() {
diff --git a/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp15ValidatorFactory.java b/spring-xml/src/main/java/org/springframework/xml/validation/Jaxp15ValidatorFactory.java
@@ -58,7 +58,7 @@ static XmlValidator createValidator(Resource[] resources, String schemaLanguage)
 
 	private static final class Jaxp15Validator implements XmlValidator {
 
-		private Schema schema;
+		private final Schema schema;
 
 		Jaxp15Validator(Schema schema) {
 			this.schema = schema;
@@ -113,7 +113,7 @@ public SAXParseException[] validate(Source source, ValidationErrorHandler errorH
 	 */
 	private static final class DefaultValidationErrorHandler implements ValidationErrorHandler {
 
-		private List<SAXParseException> errors = new ArrayList<>();
+		private final List<SAXParseException> errors = new ArrayList<>();
 
 		@Override
 		public SAXParseException[] getErrors() {
diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java b/spring-xml/src/main/java/org/springframework/xml/xpath/JaxenXPathExpressionFactory.java
@@ -77,7 +77,7 @@ public static XPathExpression createXPathExpression(String expression, Map<Strin
 	/** Jaxen implementation of the {@code XPathExpression} interface. */
 	private static final class JaxenXpathExpression implements XPathExpression {
 
-		private XPath xpath;
+		private final XPath xpath;
 
 		private final String expression;
 
diff --git a/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java b/spring-xml/src/main/java/org/springframework/xml/xpath/Jaxp13XPathExpressionFactory.java
@@ -42,7 +42,7 @@
  */
 abstract class Jaxp13XPathExpressionFactory {
 
-	private static XPathFactory xpathFactory = XPathFactory.newInstance();
+	private static final XPathFactory xpathFactory = XPathFactory.newInstance();
 
 	/**
 	 * Creates a JAXP 1.3 {@code XPathExpression} from the given string expression.
diff --git a/spring-xml/src/main/java/org/springframework/xml/xsd/SimpleXsdSchema.java b/spring-xml/src/main/java/org/springframework/xml/xsd/SimpleXsdSchema.java
@@ -50,7 +50,7 @@
  */
 public class SimpleXsdSchema implements XsdSchema, InitializingBean {
 
-	private static DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance();
+	private static final DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactoryUtils.newInstance();
 
 	private static final String SCHEMA_NAMESPACE = "http://www.w3.org/2001/XMLSchema";
 
