- * SPI to implement Converters. - *
+ * SPI to implement Converters for the type conversion system. * */ package org.springframework.core.convert.converter; diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/package-info.java b/org.springframework.core/src/main/java/org/springframework/core/convert/package-info.java index 10847ae54633a125bb179b7faa9ce6d79ebd7347..8d8bd415f11e7b170c16eced298d8e49aa28ff9e 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/convert/package-info.java +++ b/org.springframework.core/src/main/java/org/springframework/core/convert/package-info.java @@ -1,9 +1,7 @@ /** * - ** Type conversion system API. - *
* */ package org.springframework.core.convert; diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/support/package-info.java b/org.springframework.core/src/main/java/org/springframework/core/convert/support/package-info.java index 5907b1ef3f5b21cba551e42c27f5544da39a8964..3c0c0deda9a6a5bcc246ae21831270239536ed36 100644 --- a/org.springframework.core/src/main/java/org/springframework/core/convert/support/package-info.java +++ b/org.springframework.core/src/main/java/org/springframework/core/convert/support/package-info.java @@ -1,9 +1,7 @@ /** * - *- * TypeConverter system implementation. - *
+ * Default implementation of the type conversion system. * */ package org.springframework.core.convert.support; diff --git a/org.springframework.jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java b/org.springframework.jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java index fae60ec671b7e30c70f728a3aa0e50fefd2e1472..9c508c793ee30c28a29f2f766a14b1be999a441c 100644 --- a/org.springframework.jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java +++ b/org.springframework.jms/src/main/java/org/springframework/jms/support/converter/MarshallingMessageConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -76,7 +76,7 @@ public class MarshallingMessageConverter implements MessageConverter, Initializi * {@link Unmarshaller} interface as well */ public MarshallingMessageConverter(Marshaller marshaller) { - Assert.notNull(marshaller, "marshaller must not be null"); + Assert.notNull(marshaller, "Marshaller must not be null"); if (!(marshaller instanceof Unmarshaller)) { throw new IllegalArgumentException( "Marshaller [" + marshaller + "] does not implement the Unmarshaller " + @@ -96,8 +96,8 @@ public class MarshallingMessageConverter implements MessageConverter, Initializi * @param unmarshaller the Unmarshaller to use */ public MarshallingMessageConverter(Marshaller marshaller, Unmarshaller unmarshaller) { - Assert.notNull(marshaller, "marshaller must not be null"); - Assert.notNull(unmarshaller, "unmarshaller must not be null"); + Assert.notNull(marshaller, "Marshaller must not be null"); + Assert.notNull(unmarshaller, "Unmarshaller must not be null"); this.marshaller = marshaller; this.unmarshaller = unmarshaller; } diff --git a/org.springframework.web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java b/org.springframework.web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java index a5709921670dc9ca5693712075b295fcdb86c328..efb6944ae52d374a00201c156c50b69f21f8c49a 100644 --- a/org.springframework.web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java +++ b/org.springframework.web/src/main/java/org/springframework/http/converter/xml/MarshallingHttpMessageConverter.java @@ -31,15 +31,15 @@ import org.springframework.oxm.UnmarshallingFailureException; import org.springframework.util.Assert; /** - * Implementation of {@link org.springframework.http.converter.HttpMessageConverter HttpMessageConverter} that can read - * and write XML using Spring's {@link Marshaller} and {@link Unmarshaller} abstractions. + * Implementation of {@link org.springframework.http.converter.HttpMessageConverter HttpMessageConverter} + * that can read and write XML using Spring's {@link Marshaller} and {@link Unmarshaller} abstractions. * - *This converter requires a {@code Marshaller} and {@code Unmarshaller} before it can be used. These can be injected - * by the {@linkplain #MarshallingHttpMessageConverter(Marshaller) constructor} or {@linkplain - * #setMarshaller(Marshaller) bean properties}. + *
This converter requires a {@code Marshaller} and {@code Unmarshaller} before it can be used. + * These can be injected by the {@linkplain #MarshallingHttpMessageConverter(Marshaller) constructor} + * or {@linkplain #setMarshaller(Marshaller) bean properties}. * - *
By default, this converter supports {@code text/xml} and {@code application/xml}. This can be overridden by - * setting the {@link #setSupportedMediaTypes(java.util.List) supportedMediaTypes} property. + *
By default, this converter supports {@code text/xml} and {@code application/xml}. This can be + * overridden by setting the {@link #setSupportedMediaTypes(java.util.List) supportedMediaTypes} property. * * @author Arjen Poutsma * @since 3.0 @@ -52,22 +52,23 @@ public class MarshallingHttpMessageConverter extends AbstractXmlHttpMessageConve /** - * Construct a new {@code MarshallingHttpMessageConverter} with no {@link Marshaller} or {@link Unmarshaller} set. The - * marshaller and unmarshaller must be set after construction by invoking {@link #setMarshaller(Marshaller)} and {@link - * #setUnmarshaller(Unmarshaller)} . + * Construct a new {@code MarshallingHttpMessageConverter} with no {@link Marshaller} or + * {@link Unmarshaller} set. The Marshaller and Unmarshaller must be set after construction + * by invoking {@link #setMarshaller(Marshaller)} and {@link #setUnmarshaller(Unmarshaller)} . */ public MarshallingHttpMessageConverter() { } /** - * Construct a new {@code MarshallingMessageConverter} with the given {@link Marshaller} set.
If the given {@link - * Marshaller} also implements the {@link Unmarshaller} interface, it is used for both marshalling and unmarshalling. - * Otherwise, an exception is thrown.
Note that all {@code Marshaller} implementations in Spring also implement the + * Construct a new {@code MarshallingMessageConverter} with the given {@link Marshaller} set. + *
If the given {@link Marshaller} also implements the {@link Unmarshaller} interface, + * it is used for both marshalling and unmarshalling. Otherwise, an exception is thrown. + *
Note that all {@code Marshaller} implementations in Spring also implement the
* {@code Unmarshaller} interface, so that you can safely use this constructor.
* @param marshaller object used as marshaller and unmarshaller
*/
public MarshallingHttpMessageConverter(Marshaller marshaller) {
- Assert.notNull(marshaller, "marshaller must not be null");
+ Assert.notNull(marshaller, "Marshaller must not be null");
this.marshaller = marshaller;
if (marshaller instanceof Unmarshaller) {
this.unmarshaller = (Unmarshaller) marshaller;
@@ -75,18 +76,19 @@ public class MarshallingHttpMessageConverter extends AbstractXmlHttpMessageConve
}
/**
- * Construct a new MarshallingMessageConverter with the given {@code Marshaller} and {@code
- * Unmarshaller}.
+ * Construct a new MarshallingMessageConverter with the given
+ * {@code Marshaller} and {@code Unmarshaller}.
* @param marshaller the Marshaller to use
* @param unmarshaller the Unmarshaller to use
*/
public MarshallingHttpMessageConverter(Marshaller marshaller, Unmarshaller unmarshaller) {
- Assert.notNull(marshaller, "marshaller must not be null");
- Assert.notNull(unmarshaller, "unmarshaller must not be null");
+ Assert.notNull(marshaller, "Marshaller must not be null");
+ Assert.notNull(unmarshaller, "Unmarshaller must not be null");
this.marshaller = marshaller;
this.unmarshaller = unmarshaller;
}
+
/**
* Set the {@link Marshaller} to be used by this message converter.
*/