Skip to content

Commit d83b601

Browse files
poutsmapoutsma
committed
Javadoc
1 parent 516cc02 commit d83b601

File tree

3 files changed

+22
-23
lines changed

3 files changed

+22
-23
lines changed

‎org.springframework.oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030

3131
import org.exolab.castor.mapping.Mapping;
3232
import org.exolab.castor.mapping.MappingException;
33+
import org.exolab.castor.xml.MarshalException;
3334
import org.exolab.castor.xml.Marshaller;
3435
import org.exolab.castor.xml.ResolverException;
3536
import org.exolab.castor.xml.UnmarshalHandler;
3637
import org.exolab.castor.xml.Unmarshaller;
38+
import org.exolab.castor.xml.ValidationException;
3739
import org.exolab.castor.xml.XMLContext;
3840
import org.exolab.castor.xml.XMLException;
39-
import org.exolab.castor.xml.ValidationException;
40-
import org.exolab.castor.xml.MarshalException;
4141
import org.w3c.dom.Node;
4242
import org.xml.sax.ContentHandler;
4343
import org.xml.sax.InputSource;
@@ -47,11 +47,11 @@
4747

4848
import org.springframework.beans.factory.InitializingBean;
4949
import org.springframework.core.io.Resource;
50-
import org.springframework.oxm.UnmarshallingFailureException;
51-
import org.springframework.oxm.XmlMappingException;
52-
import org.springframework.oxm.ValidationFailureException;
5350
import org.springframework.oxm.MarshallingFailureException;
5451
import org.springframework.oxm.UncategorizedMappingException;
52+
import org.springframework.oxm.UnmarshallingFailureException;
53+
import org.springframework.oxm.ValidationFailureException;
54+
import org.springframework.oxm.XmlMappingException;
5555
import org.springframework.oxm.support.AbstractMarshaller;
5656
import org.springframework.oxm.support.SaxResourceUtils;
5757
import org.springframework.util.ObjectUtils;
@@ -296,7 +296,7 @@ private void marshal(Object graph, Marshaller marshaller) {
296296
* Template method that allows for customizing of the given Castor {@link Marshaller}.
297297
* <p>The default implementation invokes {@link Marshaller#setValidation(boolean)}
298298
* with the property set on this marshaller, and calls {@link Marshaller#setNamespaceMapping(String, String)}
299-
* with the {@linkplain #setNamespaceMappings(java.util.Properties) namespace mappings}.
299+
* with the {@linkplain #setNamespaceMappings(java.util.Map) namespace mappings}.
300300
*/
301301
protected void customizeMarshaller(Marshaller marshaller) {
302302
marshaller.setValidation(this.validating);
@@ -410,7 +410,6 @@ protected void customizeUnmarshaller(Unmarshaller unmarshaller) {
410410
* @param marshalling indicates whether the exception occurs during marshalling (<code>true</code>),
411411
* or unmarshalling (<code>false</code>)
412412
* @return the corresponding <code>XmlMappingException</code>
413-
* @see CastorUtils#convertCastorException
414413
*/
415414
protected XmlMappingException convertCastorException(XMLException ex, boolean marshalling) {
416415
if (ex instanceof ValidationException) {

‎org.springframework.oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
* @see #setUnmarshallerProperties(Map)
9696
* @see #setSchema(Resource)
9797
* @see #setSchemas(Resource[])
98-
* @see #setMarshallerListener(Marshaller.Listener)
98+
* @see #setMarshallerListener(javax.xml.bind.Marshaller.Listener)
9999
* @see #setUnmarshallerListener(javax.xml.bind.Unmarshaller.Listener)
100100
* @see #setAdapters(XmlAdapter[])
101101
* @since 3.0
@@ -178,11 +178,11 @@ public void setJaxbContextProperties(Map<String, ?> jaxbContextProperties) {
178178
* Set the JAXB <code>Marshaller</code> properties. These properties will be set on the
179179
* underlying JAXB <code>Marshaller</code>, and allow for features such as indentation.
180180
* @param properties the properties
181-
* @see Marshaller#setProperty(String,Object)
182-
* @see Marshaller#JAXB_ENCODING
183-
* @see Marshaller#JAXB_FORMATTED_OUTPUT
184-
* @see Marshaller#JAXB_NO_NAMESPACE_SCHEMA_LOCATION
185-
* @see Marshaller#JAXB_SCHEMA_LOCATION
181+
* @see javax.xml.bind.Marshaller#setProperty(String,Object)
182+
* @see javax.xml.bind.Marshaller#JAXB_ENCODING
183+
* @see javax.xml.bind.Marshaller#JAXB_FORMATTED_OUTPUT
184+
* @see javax.xml.bind.Marshaller#JAXB_NO_NAMESPACE_SCHEMA_LOCATION
185+
* @see javax.xml.bind.Marshaller#JAXB_SCHEMA_LOCATION
186186
*/
187187
public void setMarshallerProperties(Map<String, Object> properties) {
188188
this.marshallerProperties = properties;
@@ -424,8 +424,8 @@ protected Marshaller createMarshaller() {
424424
* Gets called after creation of JAXB <code>Marshaller</code>, and after the respective properties have been set.
425425
* <p>The default implementation sets the {@link #setMarshallerProperties(Map) defined properties}, the {@link
426426
* #setValidationEventHandler(ValidationEventHandler) validation event handler}, the {@link #setSchemas(Resource[])
427-
* schemas}, {@link #setMarshallerListener(Marshaller.Listener) listener}, and {@link #setAdapters(XmlAdapter[])
428-
* adapters}.
427+
* schemas}, {@link #setMarshallerListener(javax.xml.bind.Marshaller.Listener) listener}, and
428+
* {@link #setAdapters(XmlAdapter[]) adapters}.
429429
*/
430430
protected void initJaxbMarshaller(Marshaller marshaller) throws JAXBException {
431431
if (this.marshallerProperties != null) {
@@ -509,8 +509,8 @@ protected Unmarshaller createUnmarshaller() {
509509
* Gets called after creation of JAXB <code>Marshaller</code>, and after the respective properties have been set.
510510
* <p>The default implementation sets the {@link #setUnmarshallerProperties(Map) defined properties}, the {@link
511511
* #setValidationEventHandler(ValidationEventHandler) validation event handler}, the {@link #setSchemas(Resource[])
512-
* schemas}, {@link #setUnmarshallerListener(Unmarshaller.Listener) listener}, and {@link #setAdapters(XmlAdapter[])
513-
* adapters}.
512+
* schemas}, {@link #setUnmarshallerListener(javax.xml.bind.Unmarshaller.Listener) listener}, and
513+
* {@link #setAdapters(XmlAdapter[]) adapters}.
514514
*/
515515
protected void initJaxbUnmarshaller(Unmarshaller unmarshaller) throws JAXBException {
516516
if (this.unmarshallerProperties != null) {

‎org.springframework.oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
import javax.xml.stream.XMLStreamReader;
2929
import javax.xml.stream.XMLStreamWriter;
3030

31+
import org.apache.xmlbeans.XMLStreamValidationException;
3132
import org.apache.xmlbeans.XmlError;
3233
import org.apache.xmlbeans.XmlException;
3334
import org.apache.xmlbeans.XmlObject;
3435
import org.apache.xmlbeans.XmlOptions;
3536
import org.apache.xmlbeans.XmlSaxHandler;
3637
import org.apache.xmlbeans.XmlValidationError;
37-
import org.apache.xmlbeans.XMLStreamValidationException;
3838
import org.w3c.dom.Document;
3939
import org.w3c.dom.Node;
4040
import org.w3c.dom.NodeList;
@@ -47,11 +47,11 @@
4747
import org.xml.sax.ext.LexicalHandler;
4848

4949
import org.springframework.oxm.Marshaller;
50-
import org.springframework.oxm.ValidationFailureException;
51-
import org.springframework.oxm.XmlMappingException;
5250
import org.springframework.oxm.MarshallingFailureException;
53-
import org.springframework.oxm.UnmarshallingFailureException;
5451
import org.springframework.oxm.UncategorizedMappingException;
52+
import org.springframework.oxm.UnmarshallingFailureException;
53+
import org.springframework.oxm.ValidationFailureException;
54+
import org.springframework.oxm.XmlMappingException;
5555
import org.springframework.oxm.support.AbstractMarshaller;
5656
import org.springframework.util.xml.StaxUtils;
5757

@@ -63,7 +63,7 @@
6363
*
6464
* <p>Unmarshalled objects can be validated by setting the <code>validating</code> property,
6565
* or by calling the {@link #validate(XmlObject)} method directly. Invalid objects will
66-
* result in an {@link XmlBeansValidationFailureException}.
66+
* result in an {@link ValidationFailureException}.
6767
*
6868
* <p><b>NOTE:</b> Due to the nature of XMLBeans, this marshaller requires
6969
* all passed objects to be of type {@link XmlObject}.
@@ -257,7 +257,7 @@ protected final Object unmarshalXmlStreamReader(XMLStreamReader streamReader) th
257257
/**
258258
* Validate the given <code>XmlObject</code>.
259259
* @param object the xml object to validate
260-
* @throws XmlBeansValidationFailureException if the given object is not valid
260+
* @throws ValidationFailureException if the given object is not valid
261261
*/
262262
protected void validate(XmlObject object) throws ValidationFailureException {
263263
if (isValidating() && object != null) {

0 commit comments

Comments
 (0)