From 4ffe014733056da85cb66a8cb10c22662b08c33a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Thu, 27 Feb 2025 13:56:10 +0100 Subject: [PATCH] Fix Javadoc errors See gh-1467 --- pom.xml | 3 +-- .../ws/client/core/WebServiceTemplate.java | 4 +-- .../support/WebServiceGatewaySupport.java | 2 +- .../Wsdl11DestinationProvider.java | 1 + ...shallingEndpointsBeanDefinitionParser.java | 2 +- .../XPathEndpointsBeanDefinitionParser.java | 2 +- .../ws/config/annotation/EnableWs.java | 15 +++++------ .../MarshallingMethodEndpointAdapter.java | 13 +++------ .../adapter/MessageMethodEndpointAdapter.java | 5 ++-- .../adapter/PayloadMethodEndpointAdapter.java | 21 +++++---------- ...hParamAnnotationMethodEndpointAdapter.java | 20 +++++--------- .../jaxb/XmlRootElementEndpointMapping.java | 13 +++------ .../soap/client/core/SoapActionCallback.java | 6 ++--- .../endpoint/SoapFaultDefinitionEditor.java | 27 +++++-------------- ...apHeaderElementMethodArgumentResolver.java | 6 ++--- ...ActionAnnotationMethodEndpointMapping.java | 5 ++-- .../ws/soap/soap11/Soap11Body.java | 6 ++--- .../http/HttpComponents5ClientFactory.java | 4 +-- .../wsdl/wsdl11/DefaultWsdl11Definition.java | 7 ++--- .../soap/security/support/KeyStoreUtils.java | 6 ++--- .../wss4j2/Wss4jSecurityInterceptor.java | 18 ++++++------- .../ws/transport/jms/JmsMessageSender.java | 3 ++- .../ws/transport/mail/MailMessageSender.java | 16 +++++------ .../ws/transport/xmpp/XmppMessageSender.java | 2 +- .../ws/test/client/MockWebServiceServer.java | 9 ++----- .../ws/test/server/MockWebServiceClient.java | 9 ++----- .../xml/namespace/QNameEditor.java | 23 +++++----------- 27 files changed, 86 insertions(+), 162 deletions(-) diff --git a/pom.xml b/pom.xml index e514ba9d..d53880ac 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,6 @@ 17 - false UTF-8 UTF-8 0.0.5 @@ -827,7 +826,7 @@ maven-javadoc-plugin 2.10.4 - -Xdoclint:none + -Xdoclint:-missing -quiet diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java index c53a8c2b..5fd1da0f 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java @@ -94,14 +94,14 @@ import org.springframework.ws.transport.support.TransportUtils; *
  • Call {@link #hasError(WebServiceConnection,WebServiceMessage) hasError()} to check * if the connection has an error. For an HTTP transport, a status code other than * {@code 2xx} indicates an error. However, since a status code of 500 can also indicate a - * SOAP fault, the template verifies whether the error is not a fault.
    • + * SOAP fault, the template verifies whether the error is not a fault. *
      *
    • If the connection has an error, call the {@link #handleError handleError()} method, * which by default throws a {@link WebServiceTransportException}.
      • *
    • If the connection has no error, continue with the next step.
      • *
    *
  • Invoke {@link WebServiceConnection#receive(WebServiceMessageFactory) receive} on - * the connection to read the response message, if any.
    • + * the connection to read the response message, if any. *
      *
    • If no response was received, return {@code null} or {@code false}
      • *
    • Call {@link #hasFault(WebServiceConnection,WebServiceMessage) hasFault()} to diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java index f0b39341..a0011b14 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/client/core/support/WebServiceGatewaySupport.java @@ -41,7 +41,7 @@ import org.springframework.ws.transport.WebServiceMessageSender; * template are to be used. *

      * Note that when {@link #setWebServiceTemplate(WebServiceTemplate) injecting a - * {@code WebServiceTemplate}} directly, the convenience setters + * WebServiceTemplate directly}, the convenience setters * ({@link #setMarshaller(Marshaller)}, {@link #setUnmarshaller(Unmarshaller)}, * {@link #setMessageSender(WebServiceMessageSender)}, * {@link #setMessageSenders(WebServiceMessageSender[])}, and 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 index 04f6eeef..c66abfec 100644 --- 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 @@ -91,6 +91,7 @@ public class Wsdl11DestinationProvider extends AbstractCachingDestinationProvide *

      * The expression can use the following bound prefixes:

      * + * * * * diff --git a/spring-ws-core/src/main/java/org/springframework/ws/config/MarshallingEndpointsBeanDefinitionParser.java b/spring-ws-core/src/main/java/org/springframework/ws/config/MarshallingEndpointsBeanDefinitionParser.java index 138a27fe..d421dfaf 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/config/MarshallingEndpointsBeanDefinitionParser.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/config/MarshallingEndpointsBeanDefinitionParser.java @@ -25,7 +25,7 @@ import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; /** - * Parser for the <sws:marshalling-endpoints/> element. + * Parser for the {@code } element. * * @author Arjen Poutsma * @since 1.5.0 diff --git a/spring-ws-core/src/main/java/org/springframework/ws/config/XPathEndpointsBeanDefinitionParser.java b/spring-ws-core/src/main/java/org/springframework/ws/config/XPathEndpointsBeanDefinitionParser.java index b7b5be0d..df14b1cc 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/config/XPathEndpointsBeanDefinitionParser.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/config/XPathEndpointsBeanDefinitionParser.java @@ -27,7 +27,7 @@ import org.springframework.beans.factory.xml.ParserContext; import org.springframework.util.xml.DomUtils; /** - * Parser for the <sws:xpath-endpoints/> element. + * Parser for the {@code } element. * * @author Arjen Poutsma * @since 1.5.0 diff --git a/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/EnableWs.java b/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/EnableWs.java index fee584c7..9cb93ec2 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/EnableWs.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/config/annotation/EnableWs.java @@ -30,20 +30,19 @@ import org.springframework.context.annotation.Import; * Web Services configuration defined in {@link WsConfigurationSupport} imported. For * instance: * - * 
      + * 
      
  * @Configuration
  * @EnableWs
  * @ComponentScan(basePackageClasses = { MyConfiguration.class })
  * public class MyWsConfiguration {
  *
- * }
- * 
      
+ * }
      *

      * Customize the imported configuration by implementing the {@link WsConfigurer} interface * or more likely by extending the {@link WsConfigurerAdapter} base class and overriding * individual methods: * - * 

      + * 
      
  * @Configuration
  * @EnableWs
  * @ComponentScan(basePackageClasses = { MyConfiguration.class })
@@ -60,14 +59,13 @@ import org.springframework.context.annotation.Import;
  * 	}
  *
  * 	// More overridden methods ...
- * }
- * 
      
+ * }
      *

      * If the customization options of {@link WsConfigurer} do not expose something you need * to configure, consider removing the {@code @EnableWs} annotation and extending directly * from {@link WsConfigurationSupport} overriding selected {@code @Bean} methods: * - * 

      + * 
      
  * @Configuration
  * @ComponentScan(basePackageClasses = { MyConfiguration.class })
  * public class MyConfiguration extends WsConfigurationSupport {
@@ -83,8 +81,7 @@ import org.springframework.context.annotation.Import;
  * 		// Create or delegate to "super" to create and
  * 		// customize properties of DefaultMethodEndpointAdapter
  * 	}
- * }
- * 
      
+ * }
      * * @see WsConfigurer * @see WsConfigurerAdapter diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapter.java index af25e29c..f85c207e 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MarshallingMethodEndpointAdapter.java @@ -33,15 +33,10 @@ import org.springframework.ws.support.MarshallingUtils; * Adapter that supports endpoint methods that use marshalling. Supports methods with the * following signature: * - * 
      - * void handleMyMessage(MyUnmarshalledType request);
- *
      - * - * or - * - * 
      - * MyMarshalledType handleMyMessage(MyUnmarshalledType request);
- *
      + * 
      
+ * void handleMyMessage(MyUnmarshalledType request);
      or + * 
      
+ * MyMarshalledType handleMyMessage(MyUnmarshalledType request);
      * * I.e. methods that take a single parameter that {@link Unmarshaller#supports(Class) is * supported} by the {@link Unmarshaller}, and return either {@code void} or a type diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapter.java index b6fafae1..42a26d4c 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/MessageMethodEndpointAdapter.java @@ -27,9 +27,8 @@ import org.springframework.ws.soap.server.SoapMessageDispatcher; * Adapter that supports endpoint methods with message contexts. Supports methods with the * following signature: * - * 
      - * void handleMyMessage(MessageContext request);
- *
      + * 
      
+ * void handleMyMessage(MessageContext request);
      * * I.e. methods that take a single {@link MessageContext} parameter, and return * {@code void}. The method can have any name, as long as it is mapped by an diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapter.java index b537269a..fee4e354 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/PayloadMethodEndpointAdapter.java @@ -28,21 +28,12 @@ import org.springframework.ws.soap.server.SoapMessageDispatcher; /** * Adapter that supports endpoint methods that use marshalling. Supports methods with the - * following signature: - * - * 
      - * void handleMyMessage(Source request);
- *
      - * - * or - * - * 
      - * Source handleMyMessage(Source request);
- *
      - * - * I.e. methods that take a single {@link Source} parameter, and return either - * {@code void} or a {@link Source}. The method can have any name, as long as it is mapped - * by an {@link org.springframework.ws.server.EndpointMapping}. + * following signature: 
      
+ * void handleMyMessage(Source request);
      or 
      
+ * Source handleMyMessage(Source request);
      I.e. methods that take a single + * {@link Source} parameter, and return either {@code void} or a {@link Source}. The + * method can have any name, as long as it is mapped by an + * {@link org.springframework.ws.server.EndpointMapping}. *

      * This adapter is registered by default by the {@link MessageDispatcher} and * {@link SoapMessageDispatcher}. diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java index 5a21e17d..e5cf364a 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/XPathParamAnnotationMethodEndpointAdapter.java @@ -45,20 +45,14 @@ import org.springframework.xml.namespace.SimpleNamespaceContext; * Adapter that supports endpoint methods that use XPath expressions. Supports methods * with the following signature: * - * 

      - * void handleMyMessage(@XPathParam("/root/child/text") String param);
- *
      - * - * or - * - * 
      + * 
      
+ * void handleMyMessage(@XPathParam("/root/child/text") String param);
       or
+ * 
      
  * Source handleMyMessage(@XPathParam("/root/child/text") String param1,
- * 		@XPathParam("/root/child/number") double param2);
- * 
      
- *
- * I.e. methods that return either {@code void} or a {@link Source}, and have parameters
- * annotated with {@link XPathParam} that specify the XPath expression that should be
- * bound to that parameter. The parameter can be of the following types:
+ * 		@XPathParam("/root/child/number") double param2);
      I.e. methods + * that return either {@code void} or a {@link Source}, and have parameters annotated with + * {@link XPathParam} that specify the XPath expression that should be bound to that + * parameter. The parameter can be of the following types: *
        *
      • {@code boolean}, or {@link Boolean}
        • *
      • {@code double}, or {@link Double}
        • diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMapping.java index 05cc58f9..79ef00e7 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMapping.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMapping.java @@ -39,23 +39,18 @@ import org.springframework.xml.transform.TransformerHelper; *

        * Endpoints typically have the following form: * - * 

        + * 
        
  * @Endpoint
  * public class MyEndpoint{
  *	  public void doSomethingWithRequest(@RequestBody MyRootElement rootElement) {
  *		 ...
  *	  }
- * }
- * 
        
- *
- * where MyRootElement is annotated with {@code @XmlRootElement}:
- *
- * 
        + * }
         where MyRootElement is annotated with {@code @XmlRootElement}:
+ * 
        
  * @XmlRootElement(name = "myRoot", namespace = "http://springframework.org/spring-ws")
  * public class MyRootElement {
  *	 ...
- * }
- * 
        
+ * }
        * * @author Arjen Poutsma * @since 2.0 diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/client/core/SoapActionCallback.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/client/core/SoapActionCallback.java index 7f304fc4..8b7e8fec 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/client/core/SoapActionCallback.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/client/core/SoapActionCallback.java @@ -29,13 +29,11 @@ import org.springframework.ws.soap.SoapMessage; * the message. *

        * A usage example with {@link org.springframework.ws.client.core.WebServiceTemplate}: - * - * 

        + * 
        
  * WebServiceTemplate template = new WebServiceTemplate(messageFactory);
  * Result result = new DOMResult();
  * template.sendSourceAndReceiveToResult(new StringSource("<content xmlns=\"http://tempuri.org\"/>"),
- * 		new SoapActionCallback("http://tempuri.org/SOAPAction"), result);
- * 
        
+ * 		new SoapActionCallback("http://tempuri.org/SOAPAction"), result);
        * * @author Arjen Poutsma * @since 1.0.0 diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditor.java index 506d80c9..bee64241 100644 --- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditor.java +++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/SoapFaultDefinitionEditor.java @@ -27,11 +27,7 @@ import org.springframework.xml.namespace.QNameEditor; /** * PropertyEditor for {@code SoapFaultDefinition} objects. Takes strings of form - * - * 
        - * faultCode,faultString,locale
- *
        - * + * {@code faultCode,faultString,locale}
        * where {@code faultCode} is the string representation of a {@code QName}, * {@code faultStringOrReason} is the optional fault string, and {@code locale} is the * optional string representations for the {@code faultStringOrReason}language. By @@ -43,22 +39,11 @@ import org.springframework.xml.namespace.QNameEditor; * {@code SENDER} to{@code Client}/{@code Sender} fault respectively. *

        * For example: - * - * 

        - * RECEIVER,Server error
- *
        - * - * or - * - * 
        - * CLIENT,Client error
- *
        - * - * or - * - * 
        - * {http://springframework.org/spring-ws}spring-ws:FatalError},A fatal error has occurred
- *
        + *
          + *
        • {@code RECEIVER,Server error}
          • + *
        • {@code CLIENT,Client error}
          • + *
        • {http://springframework.org/spring-ws}spring-ws:FatalError},A fatal error has occurred
          • + *
        * * @author Arjen Poutsma * @see javax.xml.namespace.QName#toString() 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 8051f4da..b607c51d 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 @@ -39,10 +39,8 @@ import org.springframework.xml.namespace.QNameUtils; * {@link SoapHeader} to indicate the SOAP header to resolve. This resolver supports * simple {@link SoapHeaderElement} parameters and {@link List} parameters for elements * that appear multiple times in the same SOAP header. - *

        - * The following snippet shows an example of supported declarations. - * - * 
        + * 
        
+ * The following snippet shows an example of supported declarations. 
          * {@code
  * public void soapHeaderElement(@SoapHeader("{http://springframework.org/ws}header") SoapHeaderElement element)
  *
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java
index 3cac0b93..b2ce2a90 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/server/endpoint/mapping/SoapActionAnnotationMethodEndpointMapping.java
@@ -40,15 +40,14 @@ import org.springframework.ws.soap.server.endpoint.annotation.SoapActions;
  * 
        
  * Endpoints typically have the following form:
  *
- * 
        + * 
        
  * @Endpoint
  * public class MyEndpoint{
  *	  @SoapAction("http://springframework.org/spring-ws/SoapAction")
  *	  public Source doSomethingWithRequest() {
  *		 ...
  *	  }
- * }
- * 
        
+ * }
        
  *
  * @author Arjen Poutsma
  * @since 1.0.0
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/soap11/Soap11Body.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/soap11/Soap11Body.java
index 8e87014a..b7461e7d 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/soap/soap11/Soap11Body.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/soap/soap11/Soap11Body.java
@@ -34,12 +34,12 @@ import org.springframework.ws.soap.SoapFaultException;
 public interface Soap11Body extends SoapBody {
 
 	/**
-	 * Adds a SOAP 1.1 Fault to the body with a localized message.
-	 * Adding a fault removes the current content of the body.
+	 * Adds a SOAP 1.1 {@code Fault} to the body with a localized message. Adding a fault
+	 * removes the current content of the body.
 	 * @param faultCode the fully qualified fault faultCode
 	 * @param faultString the faultString
 	 * @param faultStringLocale the faultString locale. May be {@code null}
-	 * @return the added Soap11Fault
+	 * @return the added {@code Soap11Fault}
 	 * @throws IllegalArgumentException if the fault faultCode is not fully qualified
 	 */
 	Soap11Fault addFault(QName faultCode, String faultString, Locale faultStringLocale) throws SoapFaultException;
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 04101c38..580d8ea0 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
@@ -129,7 +129,7 @@ public class HttpComponents5ClientFactory implements FactoryBean maxConnectionsPerHost) {
 		this.maxConnectionsPerHost = maxConnectionsPerHost;
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java
index ec46690c..4b3a1271 100644
--- a/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java
+++ b/spring-ws-core/src/main/java/org/springframework/ws/wsdl/wsdl11/DefaultWsdl11Definition.java
@@ -37,9 +37,7 @@ import org.springframework.xml.xsd.XsdSchemaCollection;
  * {@link SuffixBasedPortTypesProvider}, {@link SoapProvider} underneath; effectively
  * equivalent to using a {@link ProviderBasedWsdl4jDefinition} with all these providers.
  * 
        
- * Example configuration:
- *
- * 
        + * Example configuration: 
        
  * <bean id="airline" class="org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition">
  *	 <property name="schema">
  *	   <bean class="org.springframework.xml.xsd.SimpleXsdSchema">
@@ -48,8 +46,7 @@ import org.springframework.xml.xsd.XsdSchemaCollection;
  *	 </property>
  *	 <property name="portTypeName" value="Airline"/>
  *	 <property name="locationUri" value="http://localhost:8080/airline/services"/>
- * </bean>
- * 
        
+ * </bean>
        
  *
  * @author Arjen Poutsma
  * @since 1.5.0
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreUtils.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreUtils.java
index e47973d1..efc9a5d6 100644
--- a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreUtils.java
+++ b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/support/KeyStoreUtils.java
@@ -84,9 +84,9 @@ public abstract class KeyStoreUtils {
 	 * If {@code javax.net.ssl.trustStore} is defined but the specified file does not
 	 * exist, then a default, empty trust store is created.
 	 * 
      • If the {@code javax.net.ssl.trustStore} system property was not specified, but
-	 * if the file {@code $JAVA_HOME/lib/security/jssecacerts} exists, that file is
-	 * used.
        •  Otherwise,
-	 * 
      • If the file {@code $JAVA_HOME/lib/security/cacerts} exists, that file is used.
+	 * if the file {@code $JAVA_HOME/lib/security/jssecacerts} exists, that file is used.
+	 * 
      • If the file {@code $JAVA_HOME/lib/security/cacerts} exists, that file is
+	 * used.
        • 
 	 * 
 	 * 
        
 	 * This behavior corresponds to the standard J2SDK behavior for SSL trust stores.
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 9c643368..80ba65ae 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
@@ -71,6 +71,7 @@ import org.springframework.ws.soap.security.wss4j2.callback.UsernameTokenPrincip
  * 
        
  * Valid validation actions are: 
        
  *
      Bound Prefixes
      PrefixNamespace
      + * * * * @@ -100,6 +101,7 @@ import org.springframework.ws.soap.security.wss4j2.callback.UsernameTokenPrincip *

      * Securement actions are:

      *
      Validation Actions
      Validation actionDescription
      + * * * * @@ -264,18 +266,14 @@ public class Wss4jSecurityInterceptor extends AbstractWsSecurityInterceptor impl * The encryption mode specifier is either {@code {Content}} or {@code {Element}}. * Please refer to the W3C XML Encryption specification about the differences between * Element and Content encryption. The encryption mode defaults to {@code Content} if - * it is omitted. Example of a list: - * - * 
      +	 * it is omitted. Example of a list: 
      
 	 * <property name="securementEncryptionParts"
 	 *	 value="{Content}{http://example.org/paymentv2}CreditCard;
-	 *			   {Element}{}UserName" />
-	 * 
      
-	 *
-	 * 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.
+	 *			   {Element}{}UserName" />
+	 *
      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. *

      * 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 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 596590f3..a557c249 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 @@ -48,6 +48,7 @@ import org.springframework.ws.transport.jms.support.JmsTransportUtils; * {@link Topic} that will be resolved by the {@link #getDestinationResolver() destination * resolver}. Valid {@code param-name} include: *

      Securement Actions
      Securement actionDescription
      + * * * * @@ -91,7 +92,7 @@ import org.springframework.ws.transport.jms.support.JmsTransportUtils; * 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} + * {@code jms:Queue?messageType=TEXT_MESSAGE}
      * * @author Arjen Poutsma * @see IRI Scheme for Java(tm) Message 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 7e053cea..3e47f979 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 @@ -49,25 +49,23 @@ import org.springframework.ws.transport.mail.support.MailTransportUtils; * the server-side message receiver polling strategy. *

      * 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 an RFC 822 - * mailbox. Valid param-name include:
      + * {@code mailto:[?param-name=param-value][¶m-name=param-value]*}
      + * where the characters {@code :}, {@code ?}, and {@code &} stand for themselves. The + * {@code to} represents an RFC 822 mailbox. Valid {@code param-name} include: *
      Parameter Names
      param-nameDescription
      + * * * * * * - * + * * * *
      Parameter Names
      param-nameDescription
      subject{@code subject}The subject of the request message.
      - *
      *

      - * Some examples of email URIs are:

      mailto:john@example.com
      - * mailto:john@example.com@?subject=SOAP%20Test
      - *
      + * Some examples of email URIs are: {@code mailto:john@example.com}
      + * {@code mailto:john@example.com@?subject=SOAP%20Test}
      * * @author Arjen Poutsma * @see       The mailto URL scheme 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 258a7abd..936541ab 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 @@ -34,7 +34,7 @@ import org.springframework.ws.transport.xmpp.support.XmppTransportUtils; * {@link #setConnection(org.jivesoftware.smack.XMPPConnection) connection}to be set. *

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

      - * xmpp:to
      The to represents a Jabber ID. + * {@code xmpp:} The {@code to} represents a Jabber ID. * * @author Gildas Cuisinier * @author Arjen Poutsma diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/client/MockWebServiceServer.java b/spring-ws-test/src/main/java/org/springframework/ws/test/client/MockWebServiceServer.java index 6c998a66..417b062e 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/client/MockWebServiceServer.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/client/MockWebServiceServer.java @@ -49,9 +49,7 @@ import org.springframework.ws.test.support.MockStrategiesHelper; * can typically use the Code Completion features (i.e. ctrl-space) in your IDE to set up * the mocks. *

      - * For example:

      - * - * 
      + * For example: 
      
  * import org.junit.*;
  * import org.springframework.beans.factory.annotation.Autowired;
  * import org.springframework.test.context.ContextConfiguration;
@@ -92,10 +90,7 @@ import org.springframework.ws.test.support.MockStrategiesHelper;
  *
  *	   mockServer.verify();
  *	 }
- * }
- * 
      
- *
- *
      + * } * * @author Arjen Poutsma * @author Lukas Krecan diff --git a/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java b/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java index 166fbb8c..60eb1c54 100644 --- a/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java +++ b/spring-ws-test/src/main/java/org/springframework/ws/test/server/MockWebServiceClient.java @@ -58,9 +58,7 @@ import static org.springframework.ws.test.support.AssertionErrors.fail; * can typically use the Code Completion features (i.e. ctrl-space) in your IDE to set up * the mocks. *

      - * For example:

      - * - * 
      + * For example: 
      
  * import org.junit.*;
  * import org.springframework.beans.factory.annotation.Autowired;
  * import org.springframework.context.ApplicationContext;
@@ -101,10 +99,7 @@ import static org.springframework.ws.test.support.AssertionErrors.fail;
  *
  *	   mockClient.sendRequest(withPayload(requestPayload)).andExpect(payload(expectedResponsePayload));
  *	 }
- * }
- * 
      
- *
- *
      + * } * * @author Arjen Poutsma * @author Lukas Krecan diff --git a/spring-xml/src/main/java/org/springframework/xml/namespace/QNameEditor.java b/spring-xml/src/main/java/org/springframework/xml/namespace/QNameEditor.java index 8cfca19a..1c0ace68 100644 --- a/spring-xml/src/main/java/org/springframework/xml/namespace/QNameEditor.java +++ b/spring-xml/src/main/java/org/springframework/xml/namespace/QNameEditor.java @@ -26,23 +26,12 @@ import org.springframework.util.StringUtils; * PropertyEditor for {@code javax.xml.namespace.QName}, to populate a property of type * QName from a String value. *

      - * Expects the syntax - * - * 

      - * localPart
- *
      - * - * or - * - * 
      - * {namespace}localPart
- *
      - * - * or - * - * 
      - * {namespace}prefix:localPart
- *
      + * Expects one of the following syntaxes: + *
        + *
      • {@code localPart}
        • + *
      • {@code {namespace}localPart}
        • + *
      • {@code {namespace}prefix:localPart}
        • + *
      * * This resembles the {@code toString()} representation of {@code QName} itself, but * allows for prefixes to be specified as well.