diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/package-info.java index 97a779c1..512eae58 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/destination/package-info.java @@ -15,6 +15,6 @@ */ /** - * Provides the DestinationProvider interface. + * Provides the {@code DestinationProvider} interface. */ package org.springframework.ws.client.support.destination; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java index bdb79a0e..4d629bc7 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/AbstractValidatingInterceptor.java @@ -78,7 +78,9 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup this.schemaLanguage = schemaLanguage; } - /** Returns the schema resources to use for validation. */ + /** + * Returns the schema resources to use for validation. + */ public Resource[] getSchemas() { return schemas; } @@ -86,8 +88,8 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup /** * Sets the schema resource to use for validation. Setting this property, * {@link #setXsdSchemaCollection(XsdSchemaCollection) xsdSchemaCollection}, - * {@link #setSchema(Resource) schema}, or {@link #setSchemas(Resource[]) schemas} is - * required. + * {@link #setSchemas(Resource[]) schemas}, or {@link #setXsdSchema(XsdSchema) + * xsdSchema} is required. */ public void setSchema(Resource schema) { setSchemas(schema); @@ -96,8 +98,8 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup /** * Sets the schema resources to use for validation. Setting this property, * {@link #setXsdSchemaCollection(XsdSchemaCollection) xsdSchemaCollection}, - * {@link #setSchema(Resource) schema}, or {@link #setSchemas(Resource[]) schemas} is - * required. + * {@link #setSchema(Resource) schema}, or {@link #setXsdSchema(XsdSchema) xsdSchema} + * is required. */ public void setSchemas(Resource... schemas) { Assert.notEmpty(schemas, "schemas must not be empty or null"); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/package-info.java index 6b0ded5c..4e41ed0d 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/support/interceptor/package-info.java @@ -15,6 +15,6 @@ */ /** - * Provides the ClientInterceptor interface, and validating interceptors. + * Provides the {@code ClientInterceptor} interface, and validating interceptors. */ package org.springframework.ws.client.support.interceptor; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/context/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/context/package-info.java index 15992793..12e0f138 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/context/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/context/package-info.java @@ -15,6 +15,6 @@ */ /** - * Contains the MessageContext interface and implementations thereof. + * Contains the {@code MessageContext} interface and implementations thereof. */ package org.springframework.ws.context; 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 index 7a611b41..d3333f85 100644 --- 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 @@ -58,7 +58,7 @@ public class DomPoxMessageFactory extends TransformerObjectSupport implements We /** * Provide your own {@link DocumentBuilderFactory}. - * @param documentBuilderFactory + * @param documentBuilderFactory the document builder factory to use */ public DomPoxMessageFactory(DocumentBuilderFactory documentBuilderFactory) { this.documentBuilderFactory = documentBuilderFactory; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java index 003889aa..65aa8b43 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractEndpointExceptionResolver.java @@ -68,9 +68,6 @@ public abstract class AbstractEndpointExceptionResolver implements EndpointExcep * Default is no warn logging. Specify this setting to activate warn logging into a * specific category. Alternatively, override the {@link #logException} method for * custom logging. - * @see org.apache.commons.logging.LogFactory#getLog(String) - * @see org.apache.log4j.Logger#getLogger(String) - * @see java.util.logging.Logger#getLogger(String) */ public void setWarnLogCategory(String loggerName) { this.warnLogger = LogFactory.getLog(loggerName); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java index 5b52cd29..b6794306 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractJDomPayloadEndpoint.java @@ -33,7 +33,7 @@ import org.springframework.xml.transform.TransformerObjectSupport; * Abstract base class for endpoints that handle the message payload as JDOM elements. *

* Offers the message payload as a JDOM {@link Element}, and allows subclasses to create a - * response by returning an {@code Element}. one payload element. Multiple payload elements are not in accordance * with WS-I. * diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractLoggingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractLoggingInterceptor.java index 983cd0c3..fe06bb05 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractLoggingInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractLoggingInterceptor.java @@ -71,9 +71,6 @@ public abstract class AbstractLoggingInterceptor extends TransformerObjectSuppor *

* This can be specified to not log into the category of a class but rather into a * specific named category. - * @see org.apache.commons.logging.LogFactory#getLog(String) - * @see org.apache.log4j.Logger#getLogger(String) - * @see java.util.logging.Logger#getLogger(String) */ public void setLoggerName(String loggerName) { this.logger = LogFactory.getLog(loggerName); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolver.java index 0a565e90..722d5bb8 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolver.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/XPathParamMethodArgumentResolver.java @@ -32,7 +32,6 @@ import org.w3c.dom.NodeList; import org.springframework.core.MethodParameter; import org.springframework.core.convert.ConversionService; -import org.springframework.core.convert.support.ConversionServiceFactory; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.ws.context.MessageContext; import org.springframework.ws.server.endpoint.annotation.XPathParam; @@ -64,9 +63,7 @@ public class XPathParamMethodArgumentResolver implements MethodArgumentResolver /** * Sets the conversion service to use. *

- * Defaults to the - * {@linkplain ConversionServiceFactory#createDefaultConversionService() default - * conversion service}. + * Defaults to the {@linkplain DefaultConversionService default conversion service}. */ public void setConversionService(ConversionService conversionService) { this.conversionService = conversionService; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/package-info.java index 3328a381..63fd94dd 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/dom/package-info.java @@ -15,7 +15,7 @@ */ /** - * Provides DOM-based implementations of the MethodArgumentResolver and - * MethodReturnValueHandler interfaces. + * Provides DOM-based implementations of the {@code MethodArgumentResolver} and + * {@code MethodReturnValueHandler} interfaces. */ package org.springframework.ws.server.endpoint.adapter.method.dom; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/package-info.java index 1183cf50..ec70b2c0 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/jaxb/package-info.java @@ -15,7 +15,7 @@ */ /** - * Provides JAXB2-based implementations of the MethodArgumentResolver and - * MethodReturnValueHandler interfaces. + * Provides JAXB2-based implementations of the {@code MethodArgumentResolver} and + * {@code MethodReturnValueHandler} interfaces. */ package org.springframework.ws.server.endpoint.adapter.method.jaxb; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/package-info.java index ff23c5d2..c5bfb586 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/package-info.java @@ -15,8 +15,7 @@ */ /** - * Provides the MethodArgumentResolver and - * MethodReturnValueHandler abstractions, and various implementations - * thereof. + * Provides the {@code MethodArgumentResolver} and {@code MethodReturnValueHandler} + * abstractions, and various implementations thereof. */ package org.springframework.ws.server.endpoint.adapter.method; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/package-info.java index 8ab435c1..a0959439 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/package-info.java @@ -15,6 +15,6 @@ */ /** - * Provides miscellaneous EndpointAdapter implementations. + * Provides miscellaneous {@code EndpointAdapter} implementations. */ package org.springframework.ws.server.endpoint.adapter; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/AbstractValidatingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/AbstractValidatingInterceptor.java index bbdd4965..6f121fa2 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/AbstractValidatingInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/AbstractValidatingInterceptor.java @@ -84,7 +84,9 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup this.schemaLanguage = schemaLanguage; } - /** Returns the schema resources to use for validation. */ + /** + * Returns the schema resources to use for validation. + */ public Resource[] getSchemas() { return schemas; } @@ -92,8 +94,8 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup /** * Sets the schema resource to use for validation. Setting this property, * {@link #setXsdSchemaCollection(XsdSchemaCollection) xsdSchemaCollection}, - * {@link #setSchema(Resource) schema}, or {@link #setSchemas(Resource[]) schemas} is - * required. + * {@link #setSchemas(Resource[]) schemas}, or {@link #setXsdSchema(XsdSchema) + * xsdSchema} is required. */ public void setSchema(Resource schema) { setSchemas(schema); @@ -102,8 +104,8 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup /** * Sets the schema resources to use for validation. Setting this property, * {@link #setXsdSchemaCollection(XsdSchemaCollection) xsdSchemaCollection}, - * {@link #setSchema(Resource) schema}, or {@link #setSchemas(Resource[]) schemas} is - * required. + * {@link #setSchema(Resource) schema}, or {@link #setXsdSchema(XsdSchema) xsdSchema} + * is required. */ public void setSchemas(Resource... schemas) { Assert.notEmpty(schemas, "schemas must not be empty or null"); @@ -120,7 +122,6 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup * {@link #setSchema(Resource) schema}, or {@link #setSchemas(Resource[]) schemas} is * required. * @param schema the xsd schema to use - * @throws IOException in case of I/O errors */ public void setXsdSchema(XsdSchema schema) { this.validator = schema.createValidator(); @@ -131,7 +132,6 @@ public abstract class AbstractValidatingInterceptor extends TransformerObjectSup * {@link #setXsdSchema(XsdSchema) xsdSchema}, {@link #setSchema(Resource) schema}, or * {@link #setSchemas(Resource[]) schemas} is required. * @param schemaCollection the xsd schema collection to use - * @throws IOException in case of I/O errors */ public void setXsdSchemaCollection(XsdSchemaCollection schemaCollection) { this.validator = schemaCollection.createValidator(); diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptor.java index d91d3245..1bf2d7f4 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/PayloadLoggingInterceptor.java @@ -26,7 +26,8 @@ import org.springframework.ws.server.endpoint.AbstractLoggingInterceptor; * that logs the payload of request and response messages. *

* By default, both request and response messages are logged, but this behaviour can be - * changed using the {@link #logRequest} and {@link #logResponse} properties. + * changed using the {@link #setLogRequest(boolean) logRequest} and + * {@link #setLogResponse(boolean) logResponse} properties. * * @author Arjen Poutsma * @see #setLogRequest(boolean) diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/package-info.java index c18394fc..524c9869 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/interceptor/package-info.java @@ -15,6 +15,6 @@ */ /** - * Provides miscellaneous endpoints EndpointInterceptor implementations. + * Provides miscellaneous endpoints {@code EndpointInterceptor} implementations. */ package org.springframework.ws.server.endpoint.interceptor; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java index ecf3de32..ec28cf78 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/AbstractMethodEndpointMapping.java @@ -194,7 +194,7 @@ public abstract class AbstractMethodEndpointMapping extends AbstractEndpointM /** * Returns the endpoint keys for the given method. Should return an empty array if the * method is not to be registered. The default delegates to - * {@link #getLookupKeysForMethod(Method)}. + * {@link #getLookupKeyForMethod(Method)}. * @param method the method * @return a list of registration keys * @since 2.2 diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java index cac54a76..f1247574 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMapping.java @@ -62,7 +62,7 @@ public class PayloadRootAnnotationMethodEndpointMapping extends AbstractAnnotati /** * Override the default {@link TransformerFactory}. - * @param transformerFactory + * @param transformerFactory the transformer factory to use */ public static void setTransformerFactory(TransformerFactory transformerFactory) { PayloadRootAnnotationMethodEndpointMapping.transformerFactory = transformerFactory; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java index ab381036..aab60bca 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/PayloadRootQNameEndpointMapping.java @@ -57,7 +57,7 @@ public class PayloadRootQNameEndpointMapping extends AbstractQNameEndpointMappin /** * Override the default {@link TransformerFactory}. - * @param transformerFactory + * @param transformerFactory the transformer factory to use */ public static void setTransformerFactory(TransformerFactory transformerFactory) { PayloadRootQNameEndpointMapping.transformerFactory = transformerFactory; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/package-info.java index 010c3429..f4d91caa 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/package-info.java @@ -15,6 +15,6 @@ */ /** - * Provides JAXB2-based EndpointMapping implementations. + * Provides JAXB2-based {@code EndpointMapping} implementations. */ package org.springframework.ws.server.endpoint.mapping.jaxb; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/package-info.java index a8b7aa74..363c9b60 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/package-info.java @@ -15,6 +15,6 @@ */ /** - * Provides miscellaneous endpoints EndpointMapping implementations. + * Provides miscellaneous endpoints {@code EndpointMapping} implementations. */ package org.springframework.ws.server.endpoint.mapping; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/package-info.java index 59553068..dd6b6190 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/package-info.java @@ -15,6 +15,6 @@ */ /** - * Provides standard endpoint, and EndpointAdapter implementations. + * Provides standard endpoint, and {@code EndpointAdapter} implementations. */ package org.springframework.ws.server.endpoint; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/support/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/support/package-info.java index d66b5847..e5592a66 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/support/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/support/package-info.java @@ -15,7 +15,7 @@ */ /** - * Provides helper classes for EndpointAdapter, - * EndpointInteceptor, and EndpointMapping implementations. + * Provides helper classes for {@code EndpointAdapter}, {@code EndpointInterceptor}, and + * {@code EndpointMapping} implementations. */ package org.springframework.ws.server.endpoint.support; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/package-info.java index e1302e8b..6c6b6ea0 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/core/package-info.java @@ -15,7 +15,7 @@ */ /** - * Core package for WS-Addressing support. Contains the EndpointReference and - * MessageAddressingProperties classes. + * Core package for WS-Addressing support. Contains the {@code EndpointReference} and + * {@code MessageAddressingProperties} classes. */ package org.springframework.ws.soap.addressing.core; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/package-info.java index 927b153f..4c558840 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/package-info.java @@ -15,7 +15,6 @@ */ /** - * Contains servers-side WS-Addressing support, in the form of - * EndpointMappings. + * Contains servers-side WS-Addressing support, in the form of {@code EndpointMappings}. */ package org.springframework.ws.soap.addressing.server; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolver.java index c1d6f34f..8051f4da 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolver.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/adapter/method/SoapHeaderElementMethodArgumentResolver.java @@ -43,11 +43,11 @@ import org.springframework.xml.namespace.QNameUtils; * The following snippet shows an example of supported declarations. * * 

- * 
+ * {@code
  * public void soapHeaderElement(@SoapHeader("{http://springframework.org/ws}header") SoapHeaderElement element)
  *
- * public void soapHeaderElementList(@SoapHeader("{http://springframework.org/ws}header") List<SoapHeaderElement> elements)
- *
+ * public void soapHeaderElementList(@SoapHeader("{http://springframework.org/ws}header") List elements) + * } * * @author Tareq Abedrabbo * @author Arjen Poutsma diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/package-info.java index 149c54db..ac0f2fe1 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/interceptor/package-info.java @@ -15,7 +15,7 @@ */ /** - * Provides miscellaneous endpoints EndpointInterceptor implementations for - * SOAP purposes. + * Provides miscellaneous endpoints {@code EndpointInterceptor} implementations for SOAP + * purposes. */ package org.springframework.ws.soap.server.endpoint.interceptor; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/package-info.java index 024ec3a8..7b4c3073 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/package-info.java @@ -15,7 +15,7 @@ */ /** - * Provides miscellaneous endpoints EndpointMapping implementations for SOAP + * Provides miscellaneous endpoints {@code EndpointMapping} implementations for SOAP * purposes. */ package org.springframework.ws.soap.server.endpoint.mapping; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/package-info.java index 5545a677..c67a437a 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/package-info.java @@ -15,7 +15,7 @@ */ /** - * Provides EndpointAdapter, EndpointMapping, and - * EndpointExceptionResolver implementations for SOAP. + * Provides {@code EndpointAdapter}, {@code EndpointMapping}, and + * {@code EndpointExceptionResolver} implementations for SOAP. */ package org.springframework.ws.soap.server.endpoint; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/AbstractHttpSenderConnection.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/AbstractHttpSenderConnection.java index 6fa386cc..431ab8ed 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/AbstractHttpSenderConnection.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/AbstractHttpSenderConnection.java @@ -41,7 +41,7 @@ public abstract class AbstractHttpSenderConnection extends AbstractSenderConnect implements FaultAwareWebServiceConnection { /** - * Cached result of {@link #hasResponse}. + * Cached result of {@code hasResponse}. */ private Boolean hasResponse; diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5ClientFactory.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5ClientFactory.java index 3c790c7b..04101c38 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5ClientFactory.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/HttpComponents5ClientFactory.java @@ -40,7 +40,7 @@ import org.springframework.ws.client.support.interceptor.ClientInterceptor; * {@link FactoryBean} to set up a {@link CloseableHttpClient} using HttpComponents * HttpClient 5. * - * @see http://hc.apache.org/httpcomponents-client + * @see HttpComponents * @author Lars Uffmann * @since 4.0.5 */ diff --git a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/package-info.java b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/package-info.java index ec4d0498..e54a45e3 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/transport/http/package-info.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/transport/http/package-info.java @@ -16,8 +16,8 @@ /** * Package providing support for handling messages via HTTP. Includes the - * MessageDispatcherServlet and WebServiceHttpHandler for - * server-side access, and the HttpUrlConnectionMessageSender and - * CommonsHttpMessageSender for client-side access. + * {@code MessageDispatcherServlet} and {@code WebServiceHttpHandler} for server-side + * access, and the {@code HttpUrlConnectionMessageSender} and + * {@code CommonsHttpMessageSender} for client-side access. */ package org.springframework.ws.transport.http; diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpSenderConnectionTest.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpSenderConnectionTest.java index 7e2ff0ea..6f259428 100644 --- a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpSenderConnectionTest.java +++ b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpSenderConnectionTest.java @@ -44,7 +44,6 @@ public class AbstractHttpSenderConnectionTest { * before passing it to the message factory. This is a regression test for SWS-707. * @param chunking Specifies whether the test should simulate a response with chunking * enabled. - * @throws Exception */ private void testSupportsStreaming(boolean chunking) throws Exception { diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/AbstractWsSecurityInterceptor.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/AbstractWsSecurityInterceptor.java index bb6c0bf3..b553910b 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/AbstractWsSecurityInterceptor.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/AbstractWsSecurityInterceptor.java @@ -216,7 +216,6 @@ public abstract class AbstractWsSecurityInterceptor implements SoapEndpointInter * if the {@link #setSecureRequest(boolean) secureRequest} property is {@code true}. * @param messageContext the message context, containing the request to be secured * @return {@code true} if the response was secured; {@code false} otherwise. - * @throws Exception in case of errors * @see #secureMessage(org.springframework.ws.soap.SoapMessage,org.springframework.ws.context.MessageContext) */ @Override @@ -246,7 +245,6 @@ public abstract class AbstractWsSecurityInterceptor implements SoapEndpointInter * {@code true}. * @param messageContext the message context, containing the response to be validated * @return {@code true} if the request was valid; {@code false} otherwise. - * @throws Exception in case of errors * @see #validateMessage(org.springframework.ws.soap.SoapMessage,org.springframework.ws.context.MessageContext) */ @Override diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/callback/package-info.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/callback/package-info.java index 96e12862..c5e8d259 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/callback/package-info.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/callback/package-info.java @@ -15,6 +15,6 @@ */ /** - * Contains generic CallbackHandler implementations. + * Contains generic {@code CallbackHandler} implementations. */ package org.springframework.ws.soap.security.callback; diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/package-info.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/package-info.java index 927feeb3..2d06a371 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/package-info.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/package-info.java @@ -16,6 +16,6 @@ /** * Provides WS-Security implementation classes. Contains the - * AbstractWsSecurityInterceptor and exceptions. + * {@code AbstractWsSecurityInterceptor} and exceptions. */ package org.springframework.ws.soap.security; diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java index 2229e4c8..9c643368 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/Wss4jSecurityInterceptor.java @@ -63,7 +63,6 @@ import org.springframework.ws.soap.security.wss4j2.callback.UsernameTokenPrincip /** * A WS-Security endpoint interceptor based on Apache's WSS4J. This interceptor supports * messages created by the - * {@link org.springframework.ws.soap.axiom.AxiomSoapMessageFactory} and the * {@link org.springframework.ws.soap.saaj.SaajSoapMessageFactory}. *

* The validation and securement actions executed by this interceptor are configured via @@ -207,7 +206,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl /** * Inject a customize {@link WSSecurityEngine}. - * @param securityEngine + * @param securityEngine the security engine to use */ public Wss4jSecurityInterceptor(WSSecurityEngine securityEngine) { this.securityEngine = securityEngine; @@ -236,20 +235,19 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl /** * Defines which key identifier type to use. The WS-Security specifications recommends * to use the identifier type {@code IssuerSerial}. For possible encryption key - * identifier types refer to - * {@link org.apache.ws.security.handler.WSHandlerConstants#keyIdentifier}. For - * encryption {@code IssuerSerial}, {@code X509KeyIdentifier}, - * {@code DirectReference}, {@code Thumbprint}, {@code SKIKeyIdentifier}, and - * {@code EmbeddedKeyName} are valid only. + * identifier types refer to {@link WSHandlerConstants}. For encryption + * {@code IssuerSerial}, {@code X509KeyIdentifier}, {@code DirectReference}, + * {@code Thumbprint}, {@code SKIKeyIdentifier}, and {@code EmbeddedKeyName} are valid + * only. */ public void setSecurementEncryptionKeyIdentifier(String securementEncryptionKeyIdentifier) { handler.setOption(WSHandlerConstants.ENC_KEY_ID, securementEncryptionKeyIdentifier); } /** - * Defines which algorithm to use to encrypt the generated symmetric key. Currently + * Defines which algorithm to use to encrypt the generated symmetric key. Currently, * WSS4J supports {@link WSConstants#KEYTRANSPORT_RSA15} and - * {@link WSConstants#KEYTRANSPORT_RSAOEP}. + * {@link WSConstants#KEYTRANSPORT_RSAOAEP}. */ public void setSecurementEncryptionKeyTransportAlgorithm(String securementEncryptionKeyTransportAlgorithm) { handler.setOption(WSHandlerConstants.ENC_KEY_TRANSPORT, securementEncryptionKeyTransportAlgorithm); @@ -277,7 +275,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl * The first entry of the list identifies the element {@code CreditCard} in the * namespace {@code http://example.org/paymentv2}, and will encrypt its content. Be * aware that the element name, the namespace identifier, and the encryption modifier - * are case sensitive. + * are case-sensitive. *

* The encryption modifier and the namespace identifier can be omitted. In this case * the encryption mode defaults to {@code Content} and the namespace is set to the @@ -289,7 +287,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl * namespace. *

* To specify an element without a namespace use the string {@code Null} as the - * namespace name (this is a case sensitive string) + * namespace name (this is a case-sensitive string) *

* If no list is specified, the handler encrypts the SOAP Body in {@code Content} mode * by default. @@ -300,7 +298,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl /** * Defines which symmetric encryption algorithm to use. WSS4J supports the following - * alorithms: {@link WSConstants#TRIPLE_DES}, {@link WSConstants#AES_128}, + * algorithms: {@link WSConstants#TRIPLE_DES}, {@link WSConstants#AES_128}, * {@link WSConstants#AES_256}, and {@link WSConstants#AES_192}. Except for AES 192 * all of these algorithms are required by the XML Encryption specification. */ @@ -315,14 +313,12 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl * the generated symmetric key. *

* If this parameter is not set, then the encryption function falls back to the - * {@link org.apache.ws.security.handler.WSHandlerConstants#USER} parameter to get the - * certificate. + * {@link WSHandlerConstants#USER} parameter to get the certificate. *

* If only encryption of the SOAP body data is requested, it is recommended to * use this parameter to define the username. The application can then use the - * standard user and password functions (see example at - * {@link org.apache.ws.security.handler.WSHandlerConstants#USER} to enable HTTP - * authentication functions. + * standard user and password functions, see example at + * {@link WSHandlerConstants#USER} to enable HTTP authentication functions. *

* Encryption only does not authenticate a user / sender, therefore it does not need a * password. @@ -339,7 +335,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl } /** - * Specific parameter for UsernameToken action to define the encoding of the passowrd. + * Specific parameter for UsernameToken action to define the encoding of the password. *

* The parameter can be set to either {@link WSConstants#PW_DIGEST} or to * {@link WSConstants#PW_TEXT}. @@ -373,9 +369,8 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl /** * Defines which key identifier type to use. The WS-Security specifications recommends * to use the identifier type {@code IssuerSerial}. For possible signature key - * identifier types refer to - * {@link org.apache.ws.security.handler.WSHandlerConstants#keyIdentifier}. For - * signature {@code IssuerSerial} and {@code DirectReference} are valid only. + * identifier types refer to {@link WSHandlerConstants}. For signature + * {@code IssuerSerial} and {@code DirectReference} are valid only. */ public void setSecurementSignatureKeyIdentifier(String securementSignatureKeyIdentifier) { handler.setOption(WSHandlerConstants.SIG_KEY_ID, securementSignatureKeyIdentifier); @@ -402,7 +397,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl * * * To specify an element without a namespace use the string {@code Null} as the - * namespace name (this is a case sensitive string) + * namespace name (this is a case-sensitive string) *

* If there is no other element in the request with a local name of {@code Body} then * the SOAP namespace identifier can be empty ({@code {}}). @@ -451,7 +446,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl /** * Sets the SAML Callback used for generating SAML tokens. - * @param samlCallback + * @param samlCallbackHandler the SAML callback handler */ public void setSecurementSamlCallbackHandler(CallbackHandler samlCallbackHandler) { this.samlCallbackHandler = samlCallbackHandler; @@ -509,8 +504,8 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl } /** - * Whether to enable signatureConfirmation or not. By default signatureConfirmation is - * enabled + * Whether to enable signatureConfirmation or not. By default, signatureConfirmation + * is enabled. */ public void setEnableSignatureConfirmation(boolean enableSignatureConfirmation) { @@ -524,8 +519,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl } /** - * Sets whether or not timestamp verification is done with the server-side time to - * live + * Sets whether timestamp verification is done with the server-side time to live */ public void setTimestampStrict(boolean timestampStrict) { this.timestampStrict = timestampStrict; @@ -540,7 +534,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl } /** - * Sets whether or not a {@code Nonce} element is added to the {@code UsernameToken}s. + * Sets whether a {@code Nonce} element is added to the {@code UsernameToken}s. * Default is {@code false}. */ public void setSecurementUsernameTokenNonce(boolean securementUsernameTokenNonce) { @@ -548,8 +542,8 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl } /** - * Sets whether or not a {@code Created} element is added to the - * {@code UsernameToken}s. Default is {@code false}. + * Sets whether a {@code Created} element is added to the {@code UsernameToken}s. + * Default is {@code false}. */ public void setSecurementUsernameTokenCreated(boolean securementUsernameTokenCreated) { handler.setOption(ConfigurationConstants.ADD_USERNAMETOKEN_CREATED, securementUsernameTokenCreated); @@ -839,7 +833,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl /** * Verifies the trust of a certificate. - * @param result + * @param result the {@link WSHandlerResult} to use */ protected void verifyCertificateTrust(WSHandlerResult result) throws WSSecurityException { @@ -863,7 +857,7 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl /** * Verifies the timestamp. - * @param result + * @param result the {@link WSHandlerResult} to use */ protected void verifyTimestamp(WSHandlerResult result) throws WSSecurityException { diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/package-info.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/package-info.java index 8d39041a..621cf55f 100644 --- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/package-info.java +++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/package-info.java @@ -15,6 +15,6 @@ */ /** - * Contains CallbackHandler implementations for WSS4J 2.0. + * Contains {@code CallbackHandler} implementations for WSS4J 2.0. */ package org.springframework.ws.soap.security.wss4j2.callback; 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 index 08b010c6..a504002d 100644 --- 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 @@ -39,7 +39,7 @@ import org.springframework.util.Assert; * @author Tareq Abed Rabbo * @author Arjen Poutsma * @author Jamin Hitchcock - * @see org.apache.ws.security.components.crypto.Crypto + * @see Crypto * @since 2.3.0 */ public class CryptoFactoryBean implements FactoryBean, InitializingBean { @@ -50,10 +50,12 @@ public class CryptoFactoryBean implements FactoryBean, InitializingBean private static final String CRYPTO_PROVIDER_PROPERTY = "org.apache.wss4j.crypto.provider"; + private static final String CRYPTO_MERLIN_FILE_PROPERTY = "org.apache.ws.security.crypto.merlin.file"; + /** * Sets the configuration of the Crypto. Setting this property overrides all * previously set configuration, through the type-safe properties - * @see org.apache.ws.security.components.crypto.CryptoFactory#getInstance(java.util.Properties) + * @see CryptoFactory#getInstance(java.util.Properties) */ public void setConfiguration(Properties properties) { Assert.notNull(properties, "'properties' must not be null"); @@ -61,11 +63,9 @@ public class CryptoFactoryBean implements FactoryBean, InitializingBean } /** - * Sets the {@link org.apache.ws.security.components.crypto.Crypto} provider name. - * Defaults to {@link org.apache.ws.security.components.crypto.Merlin}. + * Sets the {@link Crypto} provider name. Defaults to {@link Merlin}. *

- * This property maps to the WSS4J {@code org.apache.ws.security.crypto.provider} - * property. + * This property maps to the WSS4J {@value CRYPTO_PROVIDER_PROPERTY} property. * @param cryptoProviderClass the crypto provider class */ public void setCryptoProvider(Class cryptoProviderClass) { @@ -73,17 +73,15 @@ public class CryptoFactoryBean implements FactoryBean, InitializingBean } /** - * Sets the location of the key store to be loaded in the - * {@link org.apache.ws.security.components.crypto.Crypto} instance. + * Sets the location of the key store to be loaded in the {@link Crypto} instance. *

- * This property maps to the WSS4J {@code org.apache.ws.security.crypto.merlin.file} - * property. + * This property maps to the WSS4J {@value CRYPTO_MERLIN_FILE_PROPERTY} property. * @param location the key store location * @throws java.io.IOException when the resource cannot be opened */ public void setKeyStoreLocation(Resource location) throws IOException { String resourcePath = getResourcePath(location); - this.configuration.setProperty("org.apache.ws.security.crypto.merlin.file", resourcePath); + this.configuration.setProperty(CRYPTO_MERLIN_FILE_PROPERTY, resourcePath); } private String getResourcePath(Resource resource) throws IOException { diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHttpHandler.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHttpHandler.java index 01a899a4..c3fa326a 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHttpHandler.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/WebServiceMessageReceiverHttpHandler.java @@ -35,7 +35,6 @@ import org.springframework.ws.transport.support.SimpleWebServiceMessageReceiverO * registered}. * * @author Arjen Poutsma - * @see org.springframework.remoting.support.SimpleHttpServerFactoryBean * @since 1.5.0 */ public class WebServiceMessageReceiverHttpHandler extends SimpleWebServiceMessageReceiverObjectSupport diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsMessageSender.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsMessageSender.java index 8d70b069..596590f3 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsMessageSender.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/jms/JmsMessageSender.java @@ -24,6 +24,7 @@ import jakarta.jms.ConnectionFactory; import jakarta.jms.Destination; import jakarta.jms.JMSException; import jakarta.jms.Message; +import jakarta.jms.Queue; import jakarta.jms.Session; import jakarta.jms.Topic; @@ -41,47 +42,45 @@ import org.springframework.ws.transport.jms.support.JmsTransportUtils; * a JMS {@link ConnectionFactory} to operate. *

* This message sender supports URI's of the following format:

- * jms:destination[?param-name=param-value][&param-name=param-value]* - *
where the characters :, ?, and - * & stand for themselves. The destination represents the name - * of the {@link Queue} or {@link Topic} that will be resolved by the - * {@link #getDestinationResolver() destination resolver}. Valid param-name - * include:
+ * {@code jms:[?param-name=param-value][¶m-name=param-value]} + *
where the characters {@code :}, {@code ?}, and {@code &} stand for + * themselves. The {@code } represents the name of the {@link Queue} or + * {@link Topic} that will be resolved by the {@link #getDestinationResolver() destination + * resolver}. Valid {@code param-name} include: * * * * * * - * + * * * * - * - * + * + * * * - * + * * * * - * + * * + * be resolved by the {@link #getDestinationResolver() destination resolver} * * - * + * * * *
param-nameDescription
deliveryMode{@code deliveryMode}Indicates whether the request message is persistent or not. This may be - * PERSISTENT or NON_PERSISTENT. See + * {@code PERSISTENT} or {@code NON_PERSISTENT}. See * {@link jakarta.jms.MessageProducer#setDeliveryMode(int)}
messageTypeThe message type. This may be BINARY_MESSAGE (the default) or - * TEXT_MESSAGE{@code messageType}The message type. This may be {@code BINARY_MESSAGE} (the default) or + * {@code TEXT_MESSAGE}
priority{@code priority}The JMS priority (0-9) associated with the request message. See * {@link jakarta.jms.MessageProducer#setPriority(int)}
replyToName{@code replyToName}The name of the destination to which the response message must be sent, that will - * be resolved by the {@link #getDestinationResolver() destination resolver}.
timeToLive{@code timeToLive}The lifetime, in milliseconds, of the request message. See * {@link jakarta.jms.MessageProducer#setTimeToLive(long)}
- * *

- * If the replyToName is not set, a {@link Session#createTemporaryQueue() + * If the {@code replyToName} is not set, a {@link Session#createTemporaryQueue() * temporary queue} is used. *

* This class uses {@link jakarta.jms.BytesMessage} messages by default, but can be @@ -89,14 +88,14 @@ import org.springframework.ws.transport.jms.support.JmsTransportUtils; * {@code BytesMessages} are preferred, since {@code TextMessages} do not support * attachments and character encodings reliably. *

- * Some examples of JMS URIs are:

jms:SomeQueue
- * jms:SomeTopic?priority=3&deliveryMode=NON_PERSISTENT
- * jms:RequestQueue?replyToName=ResponseQueueName
- * jms:Queue?messageType=TEXT_MESSAGE
+ * Some examples of JMS URIs are:
{@code jms:SomeQueue}
+ * {@code jms:SomeTopic?priority=3&deliveryMode=NON_PERSISTENT}
+ * {@code jms:RequestQueue?replyToName=ResponseQueueName}
+ * {@code jms:Queue?messageType=TEXT_MESSAGE} * * @author Arjen Poutsma - * @see IRI Scheme for - * Java(tm) Message Service 1.0 + * @see IRI Scheme for Java(tm) Message + * Service 1.0 * @since 1.5.0 */ public class JmsMessageSender extends JmsDestinationAccessor implements WebServiceMessageSender { @@ -108,7 +107,7 @@ public class JmsMessageSender extends JmsDestinationAccessor implements WebServi public static final long DEFAULT_RECEIVE_TIMEOUT = -1; /** - * Default encoding used to read fromn and write to {@link jakarta.jms.TextMessage} + * Default encoding used to read from and write to {@link jakarta.jms.TextMessage} * messages. */ public static final String DEFAULT_TEXT_MESSAGE_ENCODING = "UTF-8"; diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageSender.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageSender.java index 4565e9a1..7e053cea 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageSender.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/MailMessageSender.java @@ -24,6 +24,7 @@ import jakarta.mail.Session; import jakarta.mail.URLName; import jakarta.mail.internet.AddressException; import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; @@ -42,7 +43,7 @@ import org.springframework.ws.transport.mail.support.MailTransportUtils; * created by this message sender will result in a blocking call, for the amount of * milliseconds specified by the {@link #setReceiveSleepTime(long) receiveSleepTime} * property. This will give the server time to formulate a response message. By default, - * this propery is set to 1 minute. For a proper request-response conversation to work, + * this property is set to 1 minute. For a proper request-response conversation to work, * this property value must not be smaller the * {@link PollingMonitoringStrategy#setPollingInterval(long) pollingInterval} property of * the server-side message receiver polling strategy. @@ -50,8 +51,8 @@ import org.springframework.ws.transport.mail.support.MailTransportUtils; * This message sender supports URI's of the following format:
* mailto:to[?param-name=param-value][&param-name=param-value]* *
where the characters :, ?, and - * & stand for themselves. The to represents a RFC 822 mailbox. - * Valid param-name include:
+ * & stand for themselves. The to represents an RFC 822 + * mailbox. Valid param-name include:
* * * @@ -133,7 +134,7 @@ public class MailMessageSender implements WebServiceMessageSender, InitializingB } /** - * Sets the JavaMail Store URI to be used for retrieving response messages. Typically + * Sets the JavaMail Store URI to be used for retrieving response messages. Typically, * takes the form of {@code [imap|pop3]://user:password@host:port/INBOX}. Setting this * property is required. *

@@ -145,9 +146,9 @@ public class MailMessageSender implements WebServiceMessageSender, InitializingB } /** - * Sets the JavaMail Transport URI to be used for sending response messages. Typically - * takes the form of {@code smtp://user:password@host:port}. Setting this property is - * required. + * Sets the JavaMail Transport URI to be used for sending response messages. + * Typically, takes the form of {@code smtp://user:password@host:port}. Setting this + * property is required. *

* For example, {@code smtp://john:secret@smtp.example.com} * @see Session#getTransport(URLName) diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/AbstractMonitoringStrategy.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/AbstractMonitoringStrategy.java index 814b4315..854978f4 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/AbstractMonitoringStrategy.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/mail/monitor/AbstractMonitoringStrategy.java @@ -138,7 +138,7 @@ public abstract class AbstractMonitoringStrategy implements MonitoringStrategy { /** * Fetches the specified messages from the specified folder. Default implementation * {@link Folder#fetch(Message[], FetchProfile) fetches} every - * {@link javax.mail.FetchProfile.Item}. + * {@link jakarta.mail.FetchProfile.Item}. * @param folder the folder to fetch messages from * @param messages the messages to fetch * @throws MessagingException in case of JavMail errors diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java index a077d35d..371fe54b 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/support/AbstractAsyncStandaloneMessageReceiver.java @@ -42,8 +42,8 @@ public abstract class AbstractAsyncStandaloneMessageReceiver extends AbstractSta * Default is {@link SimpleAsyncTaskExecutor}, starting up a number of new threads. *

* Specify an alternative task executor for integration with an existing thread pool, - * such as the {@link org.springframework.scheduling.commonj.WorkManagerTaskExecutor} - * to integrate with WebSphere or WebLogic. + * such as the + * {@link org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor}. */ public void setTaskExecutor(TaskExecutor taskExecutor) { this.taskExecutor = taskExecutor; 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 index 3f52ed11..6eddee48 100644 --- 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 @@ -20,7 +20,6 @@ import java.io.IOException; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.StanzaListener; -import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.filter.StanzaFilter; import org.jivesoftware.smack.filter.StanzaTypeFilter; @@ -32,8 +31,8 @@ import org.springframework.ws.transport.support.AbstractStandaloneMessageReceive /** * Server-side component for receiving XMPP (Jabber) messages. Requires a - * {@linkplain #setConnection(XMPPConnection) connection} to be set, in addition to the - * {@link #setMessageFactory(org.springframework.ws.WebServiceMessageFactory) + * {@linkplain #setConnection(XMPPTCPConnection)} connection} to be set, in addition to + * the {@link #setMessageFactory(org.springframework.ws.WebServiceMessageFactory) * messageFactory} and * {@link #setMessageReceiver(org.springframework.ws.transport.WebServiceMessageReceiver) * messageReceiver} required by the base class. diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageSender.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageSender.java index de97901d..258a7abd 100644 --- a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageSender.java +++ b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppMessageSender.java @@ -60,7 +60,9 @@ public class XmppMessageSender implements WebServiceMessageSender, InitializingB private XMPPConnection connection; - /** Sets the {@code XMPPConnection}. Setting this property is required. */ + /** + * Sets the {@code XMPPConnection}. Setting this property is required. + */ public void setConnection(XMPPConnection connection) { this.connection = connection; } @@ -68,7 +70,7 @@ public class XmppMessageSender implements WebServiceMessageSender, InitializingB /** * Set the timeout to use for receive calls. The default is -1, which means no * timeout. - * @see org.jivesoftware.smack.PacketCollector#nextResult(long) + * @see org.jivesoftware.smack.StanzaCollector#nextResult(long) */ public void setReceiveTimeout(long receiveTimeout) { this.receiveTimeout = receiveTimeout; diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/DiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/DiffMatcher.java index 9d9fe6ea..b7c36e63 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/DiffMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/DiffMatcher.java @@ -30,6 +30,7 @@ import static org.springframework.ws.test.support.AssertionErrors.assertTrue; * @deprecated Migrate to * {@link org.springframework.ws.test.support.matcher.xmlunit2.DiffMatcher}. */ +@Deprecated public abstract class DiffMatcher implements WebServiceMessageMatcher { @Override @@ -43,7 +44,6 @@ public abstract class DiffMatcher implements WebServiceMessageMatcher { * Creates a {@link Diff} for the given message. * @param message the message * @return the diff - * @throws Exception in case of errors */ protected abstract Diff createDiff(WebServiceMessage message); diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java index 8172e519..7ba82297 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/PayloadDiffMatcher.java @@ -38,6 +38,7 @@ import static org.springframework.ws.test.support.AssertionErrors.fail; * @deprecated Migrate to * {@link org.springframework.ws.test.support.matcher.xmlunit2.PayloadDiffMatcher}.s */ +@Deprecated public class PayloadDiffMatcher extends DiffMatcher { private final Source expected; diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java index 389e06e8..64d6b6e1 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/SoapEnvelopeDiffMatcher.java @@ -41,6 +41,7 @@ import static org.springframework.ws.test.support.AssertionErrors.fail; * @deprecated Migrate to * {@link org.springframework.ws.test.support.matcher.xmlunit2.SoapEnvelopeDiffMatcher}. */ +@Deprecated public class SoapEnvelopeDiffMatcher extends AbstractSoapMessageMatcher { private final Source expected; diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/DiffMatcher.java b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/DiffMatcher.java index 7632da39..c769e62f 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/DiffMatcher.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/support/matcher/xmlunit2/DiffMatcher.java @@ -43,7 +43,6 @@ public abstract class DiffMatcher implements WebServiceMessageMatcher { * Creates a {@link Diff} for the given message. * @param message the message * @return the diff - * @throws Exception in case of errors */ protected abstract Diff createDiff(WebServiceMessage message); diff --git a/spring-xml/src/main/java/org/springframework/xml/xsd/commons/package-info.java b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/package-info.java index 44b16411..a126cf07 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xsd/commons/package-info.java +++ b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/package-info.java @@ -15,7 +15,7 @@ */ /** - * Contains a implementation of the XsdSchema interfaces that uses Apache + * Contains a implementation of the {@code XsdSchema} interfaces that uses Apache * WS-Commons XML Schema. */ package org.springframework.xml.xsd.commons; diff --git a/spring-xml/src/main/java/org/springframework/xml/xsd/package-info.java b/spring-xml/src/main/java/org/springframework/xml/xsd/package-info.java index 04613956..91cfca19 100644 --- a/spring-xml/src/main/java/org/springframework/xml/xsd/package-info.java +++ b/spring-xml/src/main/java/org/springframework/xml/xsd/package-info.java @@ -15,7 +15,7 @@ */ /** - * Provides an abstraction over XSD XML schemas. Contains the XsdSchema and + * Provides an abstraction over XSD XML schemas. Contains the {@code XsdSchema} and * related interfaces. */ package org.springframework.xml.xsd;

param-name