You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2013/11/10 20:04:04 UTC
svn commit: r1540518 - in
/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils:
./ converters/
Author: oheger
Date: Sun Nov 10 19:04:04 2013
New Revision: 1540518
URL: http://svn.apache.org/r1540518
Log:
Fixed checkstyle errors.
Modified:
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConstructorUtils.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtils.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/DynaBeanPropertyMapDecorator.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ClassConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/NumberConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/URLConverter.java
commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/package-info.java
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java?rev=1540518&r1=1540517&r2=1540518&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/BeanMap.java Sun Nov 10 19:04:04 2013
@@ -64,7 +64,8 @@ public class BeanMap extends AbstractMap
*
* N.B. private & unmodifiable replacement for the (public & static) defaultTransformers instance.
*/
- private static final Map<Class<? extends Object>, Transformer> typeTransformers = Collections.unmodifiableMap(createTypeTransformers());
+ private static final Map<Class<? extends Object>, Transformer> typeTransformers =
+ Collections.unmodifiableMap(createTypeTransformers());
/**
* This HashMap has been made unmodifiable to prevent issues when
@@ -126,7 +127,8 @@ public class BeanMap extends AbstractMap
};
private static Map<Class<? extends Object>, Transformer> createTypeTransformers() {
- Map<Class<? extends Object>, Transformer> defaultTransformers = new HashMap<Class<? extends Object>, Transformer>();
+ Map<Class<? extends Object>, Transformer> defaultTransformers =
+ new HashMap<Class<? extends Object>, Transformer>();
defaultTransformers.put(
Boolean.TYPE,
new Transformer() {
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConstructorUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConstructorUtils.java?rev=1540518&r1=1540517&r2=1540518&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConstructorUtils.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConstructorUtils.java Sun Nov 10 19:04:04 2013
@@ -291,6 +291,7 @@ public class ConstructorUtils {
/**
* Returns a constructor given a class and signature.
+ * @param <T> the type to be constructed
* @param klass the class to be constructed
* @param parameterTypes the parameter array
* @return null if matching accessible constructor can not be found
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtils.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtils.java?rev=1540518&r1=1540517&r2=1540518&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtils.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtils.java Sun Nov 10 19:04:04 2013
@@ -358,6 +358,7 @@ public class ConvertUtils {
* useful for concrete converter implementations which typically treat
* primitive types like their corresponding wrapper types.
*
+ * @param <T> The type to be checked.
* @param type The class type to check.
* @return The converted type.
* @since 1.9
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java?rev=1540518&r1=1540517&r2=1540518&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/ConvertUtilsBean.java Sun Nov 10 19:04:04 2013
@@ -469,7 +469,6 @@ public class ConvertUtilsBean {
* Convert the specified value to an object of the specified class (if
* possible). Otherwise, return a String representation of the value.
*
- * @param <T> The desired target type of the conversion
* @param value Value to be converted (may be null)
* @param clazz Java class to be converted to (must not be null)
* @return The converted value
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/DynaBeanPropertyMapDecorator.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/DynaBeanPropertyMapDecorator.java?rev=1540518&r1=1540517&r2=1540518&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/DynaBeanPropertyMapDecorator.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/DynaBeanPropertyMapDecorator.java Sun Nov 10 19:04:04 2013
@@ -50,7 +50,8 @@ package org.apache.commons.beanutils;
* <code>DynaBeanPropertyMapDecorator</code> with the <b><i>read only</i></b>
* attribute set to <code>false</code>:</p>
*
- * <ul><li><code>Map<String, Object> fooMap = new DynaBeanPropertyMapDecorator(fooDynaBean, false);</code></li></ul>
+ * <ul><li><code>Map<String, Object> fooMap =
+ * new DynaBeanPropertyMapDecorator(fooDynaBean, false);</code></li></ul>
*
* <h3>Limitations</h3>
* <p>In this implementation the <code>entrySet()</code>, <code>keySet()</code>
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractConverter.java?rev=1540518&r1=1540517&r2=1540518&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/AbstractConverter.java Sun Nov 10 19:04:04 2013
@@ -202,6 +202,7 @@ public abstract class AbstractConverter
* Typical implementations will provide a minimum of
* <code>String --> type</code> conversion.
*
+ * @param <T> Target type of the conversion.
* @param type Data type to which this value should be converted.
* @param value The input value to be converted.
* @return The converted value.
@@ -247,6 +248,7 @@ public abstract class AbstractConverter
* If a default value has been specified then it is returned
* otherwise a ConversionException is thrown.
*
+ * @param <T> Target type of the conversion.
* @param type Data type to which this value should be converted.
* @param value The input value to be converted
* @param cause The exception thrown by the <code>convert</code> method
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java?rev=1540518&r1=1540517&r2=1540518&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ArrayConverter.java Sun Nov 10 19:04:04 2013
@@ -30,7 +30,7 @@ import org.apache.commons.beanutils.Conv
import org.apache.commons.beanutils.Converter;
/**
- * Generic {@link Converter} implementaion that handles conversion
+ * Generic {@link Converter} implementation that handles conversion
* to and from <b>array</b> objects.
* <p>
* Can be configured to either return a <i>default value</i> or throw a
@@ -122,7 +122,6 @@ import org.apache.commons.beanutils.Conv
* int[][] result = (int[][])matrixConverter.convert(int[][].class, matrixString);
* </pre>
*
- * @param <D> the default type of this array converter
* @version $Id$
* @since 1.8.0
*/
@@ -275,6 +274,7 @@ public class ArrayConverter extends Abst
/**
* Handles conversion to an array of the specified type.
*
+ * @param <T> Target type of the conversion.
* @param type The type to which this value should be converted.
* @param value The input value to be converted.
* @return The converted value.
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanConverter.java?rev=1540518&r1=1540517&r2=1540518&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/BooleanConverter.java Sun Nov 10 19:04:04 2013
@@ -16,12 +16,10 @@
*/
package org.apache.commons.beanutils.converters;
-import org.apache.commons.beanutils.ConversionException;
-
/**
- * {@link org.apache.commons.beanutils.Converter} implementaion that handles conversion
+ * {@link org.apache.commons.beanutils.Converter} implementation that handles conversion
* to and from <b>Boolean</b> objects.
- * {@link org.apache.commons.beanutils.Converter} implementaion that
+ * {@link org.apache.commons.beanutils.Converter} implementation that
* handles conversion to and from <b>java.lang.Boolean</b> objects.
* <p>
* Can be configured to either return a <i>default value</i> or throw a
@@ -58,7 +56,8 @@ public final class BooleanConverter exte
/**
- * Create a {@link org.apache.commons.beanutils.Converter} that will throw a {@link ConversionException}
+ * Create a {@link org.apache.commons.beanutils.Converter} that will throw a
+ * {@link org.apache.commons.beanutils.ConversionException}
* if a conversion error occurs, ie the string value being converted is
* not one of the known true strings, nor one of the known false strings.
*/
@@ -87,7 +86,8 @@ public final class BooleanConverter exte
}
/**
- * Create a {@link org.apache.commons.beanutils.Converter} that will throw a {@link ConversionException}
+ * Create a {@link org.apache.commons.beanutils.Converter} that will throw a
+ * {@link org.apache.commons.beanutils.ConversionException}
* if a conversion error occurs, ie the string value being converted is
* not one of the known true strings, nor one of the known false strings.
* <p>
@@ -186,6 +186,7 @@ public final class BooleanConverter exte
* Convert the specified input object into an output object of the
* specified type.
*
+ * @param <T> Target type of the conversion.
* @param type is the type to which this value should be converted. In the
* case of this BooleanConverter class, this value is ignored.
*
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterConverter.java?rev=1540518&r1=1540517&r2=1540518&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/CharacterConverter.java Sun Nov 10 19:04:04 2013
@@ -76,6 +76,7 @@ public final class CharacterConverter ex
/**
* <p>Convert the input object into a java.lang.Character.</p>
*
+ * @param <T> Target type of the conversion.
* @param type Data type to which this value should be converted.
* @param value The input value to be converted.
* @return The converted value.
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ClassConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ClassConverter.java?rev=1540518&r1=1540517&r2=1540518&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ClassConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/ClassConverter.java Sun Nov 10 19:04:04 2013
@@ -78,6 +78,7 @@ public final class ClassConverter extend
/**
* <p>Convert the input object into a java.lang.Class.</p>
*
+ * @param <T> Target type of the conversion.
* @param type Data type to which this value should be converted.
* @param value The input value to be converted.
* @return The converted value.
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/NumberConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/NumberConverter.java?rev=1540518&r1=1540517&r2=1540518&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/NumberConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/NumberConverter.java Sun Nov 10 19:04:04 2013
@@ -223,6 +223,7 @@ public abstract class NumberConverter ex
* Convert the input object into a Number object of the
* specified type.
*
+ * @param <T> Target type of the conversion.
* @param targetType Data type to which this value should be converted.
* @param value The input value to be converted.
* @return The converted value.
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringConverter.java?rev=1540518&r1=1540517&r2=1540518&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/StringConverter.java Sun Nov 10 19:04:04 2013
@@ -79,6 +79,7 @@ public final class StringConverter exten
* Convert the specified input object into an output object of the
* specified type.
*
+ * @param <T> Target type of the conversion.
* @param type Data type to which this value should be converted.
* @param value The input value to be converted.
* @return The converted value.
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/URLConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/URLConverter.java?rev=1540518&r1=1540517&r2=1540518&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/URLConverter.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/converters/URLConverter.java Sun Nov 10 19:04:04 2013
@@ -64,6 +64,7 @@ public final class URLConverter extends
/**
* <p>Convert a java.net.URL or object into a String.</p>
*
+ * @param <T> Target type of the conversion.
* @param type Data type to which this value should be converted.
* @param value The input value to be converted.
* @return The converted value.
Modified: commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/package-info.java
URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/package-info.java?rev=1540518&r1=1540517&r2=1540518&view=diff
==============================================================================
--- commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/package-info.java (original)
+++ commons/proper/beanutils/trunk/src/main/java/org/apache/commons/beanutils/package-info.java Sun Nov 10 19:04:04 2013
@@ -185,9 +185,12 @@
* <ul>
* <li> {@link org.apache.commons.beanutils.BeanMap org.apache.commons.beanutils.BeanMap}</li>
* <li> {@link org.apache.commons.beanutils.BeanPredicate org.apache.commons.beanutils.BeanPredicate}</li>
- * <li> {@link org.apache.commons.beanutils.BeanPropertyValueChangeClosure org.apache.commons.beanutils.BeanPropertyValueChangeClosure}</li>
- * <li> {@link org.apache.commons.beanutils.BeanPropertyValueEqualsPredicate org.apache.commons.beanutils.BeanPropertyValueEqualsPredicate}</li>
- * <li> {@link org.apache.commons.beanutils.BeanToPropertyValueTransformer org.apache.commons.beanutils.BeanToPropertyValueTransformer}</li>
+ * <li> {@link org.apache.commons.beanutils.BeanPropertyValueChangeClosure
+ * org.apache.commons.beanutils.BeanPropertyValueChangeClosure}</li>
+ * <li> {@link org.apache.commons.beanutils.BeanPropertyValueEqualsPredicate
+ * org.apache.commons.beanutils.BeanPropertyValueEqualsPredicate}</li>
+ * <li> {@link org.apache.commons.beanutils.BeanToPropertyValueTransformer
+ * org.apache.commons.beanutils.BeanToPropertyValueTransformer}</li>
* </ul>
* <p>
* then the following packages must also be available in the application's class path at runtime:
@@ -706,13 +709,14 @@
* dynaBean.set("address", 2, addressLine3); // indexed
* </pre>
*
- * <p><strong>2. {@link org.apache.commons.beanutils.LazyDynaMap}</strong> is a <i>light wieght</i> <code>DynaBean</code>
- * facade to a <code>Map</code> with all the usual <i>lazy</i> features. Its <i>light weight</i> because it doesn't
- * have an associated <code>DynaClass</code> containing all the properties. In fact it actually implements
- * the <code>DynaClass</code> interface itself (and <code>MutableDynaClass</code>) and derives all the <i>DynaClass</i>
- * information from the actual contents of the <code>Map</code>. A <code>LazyDynaMap</code> can be created around an
- * existing <code>Map</code> or can instantiate its own <code>Map</code>. After any <code>DynaBean</code>
- * processing has finished the <code>Map</code> can be retrieved and the DynaBean <i>facade</i> discarded.</p>
+ * <p><strong>2. {@link org.apache.commons.beanutils.LazyDynaMap}</strong> is a <i>light weight</i>
+ * <code>DynaBean</code> facade to a <code>Map</code> with all the usual <i>lazy</i> features. Its
+ * <i>light weight</i> because it doesn't have an associated <code>DynaClass</code> containing all the properties.
+ * In fact it actually implements the <code>DynaClass</code> interface itself (and <code>MutableDynaClass</code>)
+ * and derives all the <i>DynaClass</i> information from the actual contents of the <code>Map</code>. A
+ * <code>LazyDynaMap</code> can be created around an existing <code>Map</code> or can instantiate its own
+ * <code>Map</code>. After any <code>DynaBean</code> processing has finished the <code>Map</code> can be retrieved
+ * and the DynaBean <i>facade</i> discarded.</p>
*
* <p>If you need a new <code>Map</code> then to use....</p>
*