Remove most useless parens like 'return (false);' -> 'return false;'
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/beanutils/trunk@1843176 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java b/src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java
index 67b5a72..f7f1cc7 100644
--- a/src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java
+++ b/src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java
@@ -122,7 +122,7 @@
public boolean containsKey(final Object key) {
final DynaClass dynaClass = getDynaBean().getDynaClass();
final DynaProperty dynaProperty = dynaClass.getDynaProperty(toString(key));
- return (dynaProperty == null ? false : true);
+ return dynaProperty == null ? false : true;
}
/**
@@ -196,7 +196,7 @@
*/
@Override
public boolean isEmpty() {
- return (getDynaProperties().length == 0);
+ return getDynaProperties().length == 0;
}
/**
@@ -352,7 +352,7 @@
* @return String representation of the object
*/
private String toString(final Object obj) {
- return (obj == null ? null : obj.toString());
+ return obj == null ? null : obj.toString();
}
/**
@@ -371,9 +371,9 @@
return false;
}
final Map.Entry<?, ?> e = (Map.Entry<?, ?>)o;
- return ((key.equals(e.getKey())) &&
+ return key.equals(e.getKey()) &&
(value == null ? e.getValue() == null
- : value.equals(e.getValue())));
+ : value.equals(e.getValue()));
}
@Override
public int hashCode() {
diff --git a/src/main/java/org/apache/commons/beanutils2/BasicDynaBean.java b/src/main/java/org/apache/commons/beanutils2/BasicDynaBean.java
index 5c779e1..7c9f23c 100644
--- a/src/main/java/org/apache/commons/beanutils2/BasicDynaBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/BasicDynaBean.java
@@ -122,7 +122,7 @@
throw new NullPointerException
("No mapped value for '" + name + "(" + key + ")'");
} else if (value instanceof Map) {
- return (((Map<?, ?>) value).containsKey(key));
+ return ((Map<?, ?>) value).containsKey(key);
} else {
throw new IllegalArgumentException
("Non-mapped property for '" + name + "(" + key + ")'");
@@ -146,34 +146,34 @@
// Return any non-null value for the specified property
final Object value = values.get(name);
if (value != null) {
- return (value);
+ return value;
}
// Return a null value for a non-primitive property
final Class<?> type = getDynaProperty(name).getType();
if (!type.isPrimitive()) {
- return (value);
+ return value;
}
// Manufacture default values for primitive properties
if (type == Boolean.TYPE) {
- return (Boolean.FALSE);
+ return Boolean.FALSE;
} else if (type == Byte.TYPE) {
- return (Byte.valueOf((byte) 0));
+ return Byte.valueOf((byte) 0);
} else if (type == Character.TYPE) {
- return (Character.valueOf((char) 0));
+ return Character.valueOf((char) 0);
} else if (type == Double.TYPE) {
- return (Double.valueOf(0.0));
+ return Double.valueOf(0.0);
} else if (type == Float.TYPE) {
- return (Float.valueOf((float) 0.0));
+ return Float.valueOf((float) 0.0);
} else if (type == Integer.TYPE) {
- return (Integer.valueOf(0));
+ return Integer.valueOf(0);
} else if (type == Long.TYPE) {
- return (Long.valueOf(0));
+ return Long.valueOf(0);
} else if (type == Short.TYPE) {
- return (Short.valueOf((short) 0));
+ return Short.valueOf((short) 0);
} else {
- return (null);
+ return null;
}
}
@@ -203,7 +203,7 @@
throw new NullPointerException
("No indexed value for '" + name + "[" + index + "]'");
} else if (value.getClass().isArray()) {
- return (Array.get(value, index));
+ return Array.get(value, index);
} else if (value instanceof List) {
return ((List<?>) value).get(index);
} else {
@@ -235,7 +235,7 @@
throw new NullPointerException
("No mapped value for '" + name + "(" + key + ")'");
} else if (value instanceof Map) {
- return (((Map<?, ?>) value).get(key));
+ return ((Map<?, ?>) value).get(key);
} else {
throw new IllegalArgumentException
("Non-mapped property for '" + name + "(" + key + ")'");
@@ -253,7 +253,7 @@
@Override
public DynaClass getDynaClass() {
- return (this.dynaClass);
+ return this.dynaClass;
}
@@ -419,7 +419,7 @@
throw new IllegalArgumentException
("Invalid property name '" + name + "'");
}
- return (descriptor);
+ return descriptor;
}
@@ -435,17 +435,17 @@
protected boolean isAssignable(final Class<?> dest, final Class<?> source) {
if (dest.isAssignableFrom(source) ||
- ((dest == Boolean.TYPE) && (source == Boolean.class)) ||
- ((dest == Byte.TYPE) && (source == Byte.class)) ||
- ((dest == Character.TYPE) && (source == Character.class)) ||
- ((dest == Double.TYPE) && (source == Double.class)) ||
- ((dest == Float.TYPE) && (source == Float.class)) ||
- ((dest == Integer.TYPE) && (source == Integer.class)) ||
- ((dest == Long.TYPE) && (source == Long.class)) ||
- ((dest == Short.TYPE) && (source == Short.class))) {
- return (true);
+ dest == Boolean.TYPE && source == Boolean.class ||
+ dest == Byte.TYPE && source == Byte.class ||
+ dest == Character.TYPE && source == Character.class ||
+ dest == Double.TYPE && source == Double.class ||
+ dest == Float.TYPE && source == Float.class ||
+ dest == Integer.TYPE && source == Integer.class ||
+ dest == Long.TYPE && source == Long.class ||
+ dest == Short.TYPE && source == Short.class) {
+ return true;
}
- return (false);
+ return false;
}
diff --git a/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java b/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java
index 3ea04cb..ee8d9e8 100644
--- a/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java
@@ -156,7 +156,7 @@
@Override
public String getName() {
- return (this.name);
+ return this.name;
}
@@ -197,7 +197,7 @@
@Override
public DynaProperty[] getDynaProperties() {
- return (properties);
+ return properties;
}
@@ -223,7 +223,7 @@
setDynaBeanClass(this.dynaBeanClass);
}
// Invoke the constructor to create a new bean instance
- return ((DynaBean) constructor.newInstance(constructorValues));
+ return (DynaBean) constructor.newInstance(constructorValues);
} catch (final InvocationTargetException e) {
throw new InstantiationException
(e.getTargetException().getMessage());
@@ -244,7 +244,7 @@
*/
public Class<?> getDynaBeanClass() {
- return (this.dynaBeanClass);
+ return this.dynaBeanClass;
}
diff --git a/src/main/java/org/apache/commons/beanutils2/BeanComparator.java b/src/main/java/org/apache/commons/beanutils2/BeanComparator.java
index 7f99a7c..4b4000c 100644
--- a/src/main/java/org/apache/commons/beanutils2/BeanComparator.java
+++ b/src/main/java/org/apache/commons/beanutils2/BeanComparator.java
@@ -206,7 +206,7 @@
}
else
{
- return (beanComparator.property == null);
+ return beanComparator.property == null;
}
return true;
diff --git a/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueChangeClosure.java b/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueChangeClosure.java
index 0717476..37836eb 100644
--- a/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueChangeClosure.java
+++ b/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueChangeClosure.java
@@ -135,7 +135,7 @@
public BeanPropertyValueChangeClosure(final String propertyName, final Object propertyValue, final boolean ignoreNull) {
super();
- if ((propertyName != null) && (propertyName.length() > 0)) {
+ if (propertyName != null && propertyName.length() > 0) {
this.propertyName = propertyName;
this.propertyValue = propertyValue;
this.ignoreNull = ignoreNull;
diff --git a/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicate.java b/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicate.java
index 16f8e50..e9c30dc 100644
--- a/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicate.java
+++ b/src/main/java/org/apache/commons/beanutils2/BeanPropertyValueEqualsPredicate.java
@@ -165,7 +165,7 @@
public BeanPropertyValueEqualsPredicate(final String propertyName, final Object propertyValue, final boolean ignoreNull) {
super();
- if ((propertyName != null) && (propertyName.length() > 0)) {
+ if (propertyName != null && propertyName.length() > 0) {
this.propertyName = propertyName;
this.propertyValue = propertyValue;
this.ignoreNull = ignoreNull;
@@ -247,7 +247,7 @@
* @return True if they are equal; false otherwise.
*/
protected boolean evaluateValue(final Object expected, final Object actual) {
- return (expected == actual) || ((expected != null) && expected.equals(actual));
+ return expected == actual || expected != null && expected.equals(actual);
}
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java b/src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java
index aebcce6..99fe54d 100644
--- a/src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java
+++ b/src/main/java/org/apache/commons/beanutils2/BeanToPropertyValueTransformer.java
@@ -120,7 +120,7 @@
public BeanToPropertyValueTransformer(final String propertyName, final boolean ignoreNull) {
super();
- if ((propertyName != null) && (propertyName.length() > 0)) {
+ if (propertyName != null && propertyName.length() > 0) {
this.propertyName = propertyName;
this.ignoreNull = ignoreNull;
} else {
diff --git a/src/main/java/org/apache/commons/beanutils2/BeanUtils.java b/src/main/java/org/apache/commons/beanutils2/BeanUtils.java
index 762eda7..54dc0c9 100644
--- a/src/main/java/org/apache/commons/beanutils2/BeanUtils.java
+++ b/src/main/java/org/apache/commons/beanutils2/BeanUtils.java
@@ -64,7 +64,7 @@
*/
@Deprecated
public static int getDebug() {
- return (debug);
+ return debug;
}
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java b/src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java
index 00e3649..2b44a97 100644
--- a/src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/BeanUtilsBean.java
@@ -180,7 +180,7 @@
newBean = bean.getClass().newInstance();
}
getPropertyUtils().copyProperties(newBean, bean);
- return (newBean);
+ return newBean;
}
@@ -488,7 +488,7 @@
if (bean == null) {
// return (Collections.EMPTY_MAP);
- return (new java.util.HashMap<>());
+ return new java.util.HashMap<>();
}
if (log.isDebugEnabled()) {
@@ -514,7 +514,7 @@
}
}
}
- return (description);
+ return description;
}
@@ -540,7 +540,7 @@
final Object value = getPropertyUtils().getProperty(bean, name);
if (value == null) {
- return (null);
+ return null;
} else if (value instanceof Collection) {
final ArrayList<String> values = new ArrayList<>();
for (final Object item : (Collection<?>) value) {
@@ -551,7 +551,7 @@
values.add(getConvertUtils().convert(item));
}
}
- return (values.toArray(new String[values.size()]));
+ return values.toArray(new String[values.size()]);
} else if (value.getClass().isArray()) {
final int n = Array.getLength(value);
final String[] results = new String[n];
@@ -564,11 +564,11 @@
results[i] = getConvertUtils().convert(item);
}
}
- return (results);
+ return results;
} else {
final String[] results = new String[1];
results[0] = getConvertUtils().convert(value);
- return (results);
+ return results;
}
}
@@ -598,7 +598,7 @@
NoSuchMethodException {
final Object value = getPropertyUtils().getIndexedProperty(bean, name);
- return (getConvertUtils().convert(value));
+ return getConvertUtils().convert(value);
}
@@ -626,7 +626,7 @@
NoSuchMethodException {
final Object value = getPropertyUtils().getIndexedProperty(bean, name, index);
- return (getConvertUtils().convert(value));
+ return getConvertUtils().convert(value);
}
@@ -655,7 +655,7 @@
NoSuchMethodException {
final Object value = getPropertyUtils().getMappedProperty(bean, name);
- return (getConvertUtils().convert(value));
+ return getConvertUtils().convert(value);
}
@@ -683,7 +683,7 @@
NoSuchMethodException {
final Object value = getPropertyUtils().getMappedProperty(bean, name, key);
- return (getConvertUtils().convert(value));
+ return getConvertUtils().convert(value);
}
@@ -710,7 +710,7 @@
NoSuchMethodException {
final Object value = getPropertyUtils().getNestedProperty(bean, name);
- return (getConvertUtils().convert(value));
+ return getConvertUtils().convert(value);
}
@@ -735,7 +735,7 @@
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
- return (getNestedProperty(bean, name));
+ return getNestedProperty(bean, name);
}
@@ -760,7 +760,7 @@
NoSuchMethodException {
final Object value = getPropertyUtils().getSimpleProperty(bean, name);
- return (getConvertUtils().convert(value));
+ return getConvertUtils().convert(value);
}
@@ -804,7 +804,7 @@
throws IllegalAccessException, InvocationTargetException {
// Do nothing unless both arguments have been specified
- if ((bean == null) || (properties == null)) {
+ if (bean == null || properties == null) {
return;
}
if (log.isDebugEnabled()) {
@@ -967,7 +967,7 @@
}
return; // Read-only, skip this property setter
}
- type = (value == null) ? Object.class : value.getClass();
+ type = value == null ? Object.class : value.getClass();
} else {
if (descriptor.getWriteMethod() == null) {
if (log.isDebugEnabled()) {
@@ -981,7 +981,7 @@
// Convert the specified value to the required type
Object newValue = null;
- if (type.isArray() && (index < 0)) { // Scalar value into array
+ if (type.isArray() && index < 0) { // Scalar value into array
if (value == null) {
final String[] values = new String[1];
values[0] = null;
@@ -1092,7 +1092,7 @@
* @return the converted value
*/
private Object convertForCopy(final Object value, final Class<?> type) {
- return (value != null) ? convert(value, type) : value;
+ return value != null ? convert(value, type) : value;
}
/**
@@ -1136,6 +1136,6 @@
if (!dynaProperty.isMapped()) {
return dynaProperty.getType();
}
- return (value == null) ? String.class : value.getClass();
+ return value == null ? String.class : value.getClass();
}
}
diff --git a/src/main/java/org/apache/commons/beanutils2/ConstructorUtils.java b/src/main/java/org/apache/commons/beanutils2/ConstructorUtils.java
index 59f39ae..6cfb227 100644
--- a/src/main/java/org/apache/commons/beanutils2/ConstructorUtils.java
+++ b/src/main/java/org/apache/commons/beanutils2/ConstructorUtils.java
@@ -306,7 +306,7 @@
return getAccessibleConstructor(
klass.getConstructor(parameterTypes));
} catch (final NoSuchMethodException e) {
- return (null);
+ return null;
}
}
@@ -321,18 +321,18 @@
// Make sure we have a method to check
if (ctor == null) {
- return (null);
+ return null;
}
// If the requested method is not public we cannot call it
if (!Modifier.isPublic(ctor.getModifiers())) {
- return (null);
+ return null;
}
// If the declaring class is public, we are done
final Class<T> clazz = ctor.getDeclaringClass();
if (Modifier.isPublic(clazz.getModifiers())) {
- return (ctor);
+ return ctor;
}
// what else can we do?
diff --git a/src/main/java/org/apache/commons/beanutils2/ContextClassLoaderLocal.java b/src/main/java/org/apache/commons/beanutils2/ContextClassLoaderLocal.java
index 888e5b6..cd9bbd6 100644
--- a/src/main/java/org/apache/commons/beanutils2/ContextClassLoaderLocal.java
+++ b/src/main/java/org/apache/commons/beanutils2/ContextClassLoaderLocal.java
@@ -150,7 +150,7 @@
if (contextClassLoader != null) {
T value = valueByClassLoader.get(contextClassLoader);
- if ((value == null)
+ if (value == null
&& !valueByClassLoader.containsKey(contextClassLoader)) {
value = initialValue();
valueByClassLoader.put(contextClassLoader, value);
diff --git a/src/main/java/org/apache/commons/beanutils2/ConversionException.java b/src/main/java/org/apache/commons/beanutils2/ConversionException.java
index 9a206b6..4ac53a8 100644
--- a/src/main/java/org/apache/commons/beanutils2/ConversionException.java
+++ b/src/main/java/org/apache/commons/beanutils2/ConversionException.java
@@ -87,7 +87,7 @@
*/
@Override
public Throwable getCause() {
- return (this.cause);
+ return this.cause;
}
diff --git a/src/main/java/org/apache/commons/beanutils2/ConvertUtils.java b/src/main/java/org/apache/commons/beanutils2/ConvertUtils.java
index 4d8c01c..2b87ebc 100644
--- a/src/main/java/org/apache/commons/beanutils2/ConvertUtils.java
+++ b/src/main/java/org/apache/commons/beanutils2/ConvertUtils.java
@@ -42,7 +42,7 @@
*/
@Deprecated
public static boolean getDefaultBoolean() {
- return (ConvertUtilsBean.getInstance().getDefaultBoolean());
+ return ConvertUtilsBean.getInstance().getDefaultBoolean();
}
/**
@@ -180,7 +180,7 @@
*/
@Deprecated
public static long getDefaultLong() {
- return (ConvertUtilsBean.getInstance().getDefaultLong());
+ return ConvertUtilsBean.getInstance().getDefaultLong();
}
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java b/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java
index 150f979..58b364f 100644
--- a/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/ConvertUtilsBean.java
@@ -180,7 +180,7 @@
*/
@Deprecated
public boolean getDefaultBoolean() {
- return (defaultBoolean.booleanValue());
+ return defaultBoolean.booleanValue();
}
/**
@@ -191,7 +191,7 @@
*/
@Deprecated
public void setDefaultBoolean(final boolean newDefaultBoolean) {
- defaultBoolean = (newDefaultBoolean ? Boolean.TRUE : Boolean.FALSE);
+ defaultBoolean = newDefaultBoolean ? Boolean.TRUE : Boolean.FALSE;
register(new BooleanConverter(defaultBoolean), Boolean.TYPE);
register(new BooleanConverter(defaultBoolean), Boolean.class);
}
@@ -213,7 +213,7 @@
*/
@Deprecated
public byte getDefaultByte() {
- return (defaultByte.byteValue());
+ return defaultByte.byteValue();
}
/**
@@ -246,7 +246,7 @@
*/
@Deprecated
public char getDefaultCharacter() {
- return (defaultCharacter.charValue());
+ return defaultCharacter.charValue();
}
/**
@@ -281,7 +281,7 @@
*/
@Deprecated
public double getDefaultDouble() {
- return (defaultDouble.doubleValue());
+ return defaultDouble.doubleValue();
}
/**
@@ -314,7 +314,7 @@
*/
@Deprecated
public float getDefaultFloat() {
- return (defaultFloat.floatValue());
+ return defaultFloat.floatValue();
}
/**
@@ -347,7 +347,7 @@
*/
@Deprecated
public int getDefaultInteger() {
- return (defaultInteger.intValue());
+ return defaultInteger.intValue();
}
/**
@@ -380,7 +380,7 @@
*/
@Deprecated
public long getDefaultLong() {
- return (defaultLong.longValue());
+ return defaultLong.longValue();
}
/**
@@ -413,7 +413,7 @@
*/
@Deprecated
public short getDefaultShort() {
- return (defaultShort.shortValue());
+ return defaultShort.shortValue();
}
/**
@@ -448,17 +448,17 @@
return null;
} else if (value.getClass().isArray()) {
if (Array.getLength(value) < 1) {
- return (null);
+ return null;
}
value = Array.get(value, 0);
if (value == null) {
return null;
}
final Converter converter = lookup(String.class);
- return (converter.convert(String.class, value));
+ return converter.convert(String.class, value);
} else {
final Converter converter = lookup(String.class);
- return (converter.convert(String.class, value));
+ return converter.convert(String.class, value);
}
}
@@ -487,7 +487,7 @@
if (log.isTraceEnabled()) {
log.trace(" Using converter " + converter);
}
- return (converter.convert(clazz, value));
+ return converter.convert(clazz, value);
}
@@ -526,7 +526,7 @@
for (int i = 0; i < values.length; i++) {
Array.set(array, i, converter.convert(type, values[i]));
}
- return (array);
+ return array;
}
@@ -830,7 +830,7 @@
*/
public Converter lookup(final Class<?> clazz) {
- return (converters.get(clazz));
+ return converters.get(clazz);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/DynaProperty.java b/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
index e7b7544..bfefdd6 100644
--- a/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
+++ b/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
@@ -122,7 +122,7 @@
* @return the name of the property
*/
public String getName() {
- return (this.name);
+ return this.name;
}
/** Property type */
@@ -140,7 +140,7 @@
* @return the property type
*/
public Class<?> getType() {
- return (this.type);
+ return this.type;
}
@@ -173,13 +173,13 @@
public boolean isIndexed() {
if (type == null) {
- return (false);
+ return false;
} else if (type.isArray()) {
- return (true);
+ return true;
} else if (List.class.isAssignableFrom(type)) {
- return (true);
+ return true;
} else {
- return (false);
+ return false;
}
}
@@ -194,9 +194,9 @@
public boolean isMapped() {
if (type == null) {
- return (false);
+ return false;
}
- return (Map.class.isAssignableFrom(type));
+ return Map.class.isAssignableFrom(type);
}
@@ -213,14 +213,14 @@
boolean result = false;
- result = (obj == this);
+ result = obj == this;
- if ((!result) && obj instanceof DynaProperty) {
+ if (!result && obj instanceof DynaProperty) {
final DynaProperty that = (DynaProperty) obj;
result =
- ((this.name == null) ? (that.name == null) : (this.name.equals(that.name))) &&
- ((this.type == null) ? (that.type == null) : (this.type.equals(that.type))) &&
- ((this.contentType == null) ? (that.contentType == null) : (this.contentType.equals(that.contentType)));
+ (this.name == null ? that.name == null : this.name.equals(that.name)) &&
+ (this.type == null ? that.type == null : this.type.equals(that.type)) &&
+ (this.contentType == null ? that.contentType == null : this.contentType.equals(that.contentType));
}
return result;
@@ -236,9 +236,9 @@
int result = 1;
- result = result * 31 + ((name == null) ? 0 : name.hashCode());
- result = result * 31 + ((type == null) ? 0 : type.hashCode());
- result = result * 31 + ((contentType == null) ? 0 : contentType.hashCode());
+ result = result * 31 + (name == null ? 0 : name.hashCode());
+ result = result * 31 + (type == null ? 0 : type.hashCode());
+ result = result * 31 + (contentType == null ? 0 : contentType.hashCode());
return result;
}
@@ -258,7 +258,7 @@
sb.append(" <").append(this.contentType).append(">");
}
sb.append("]");
- return (sb.toString());
+ return sb.toString();
}
@@ -371,6 +371,6 @@
}
// it's another class
- return ((Class<?>) in.readObject());
+ return (Class<?>) in.readObject();
}
}
diff --git a/src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java b/src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java
index 5514f76..99206f9 100644
--- a/src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java
+++ b/src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java
@@ -162,7 +162,7 @@
private String propertyName(final Method m) {
final String methodName = m.getName().substring(
getWriteMethodPrefix().length());
- return (methodName.length() > 1) ? Introspector.decapitalize(methodName) : methodName
+ return methodName.length() > 1 ? Introspector.decapitalize(methodName) : methodName
.toLowerCase(Locale.ENGLISH);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java b/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
index 35c8b27..daed984 100644
--- a/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
@@ -83,7 +83,7 @@
@Override
public String getName() {
- return (this.getClass().getName());
+ return this.getClass().getName();
}
@@ -102,7 +102,7 @@
if (name == null) {
throw new IllegalArgumentException("No property name specified");
}
- return (propertiesMap.get(name));
+ return propertiesMap.get(name);
}
@@ -114,7 +114,7 @@
@Override
public DynaProperty[] getDynaProperties() {
- return (properties);
+ return properties;
}
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java b/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
index bc8eb31..e1d3c63 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
@@ -249,7 +249,7 @@
return ((List<?>)value).size();
}
- if ((value.getClass().isArray())) {
+ if (value.getClass().isArray()) {
return Array.getLength(value);
}
@@ -283,7 +283,7 @@
}
if (value instanceof Map) {
- return (((Map<?, ?>) value).containsKey(key));
+ return ((Map<?, ?>) value).containsKey(key);
}
return false;
@@ -411,7 +411,7 @@
// Get the value from the Map
if (mappedProperty instanceof Map) {
- return (((Map<?, ?>) mappedProperty).get(key));
+ return ((Map<?, ?>) mappedProperty).get(key);
}
throw new IllegalArgumentException
("Non-mapped property for '" + name + "(" + key + ")'"
@@ -641,12 +641,12 @@
}
// Grow an Array to the appropriate size
- if ((indexedProperty.getClass().isArray())) {
+ if (indexedProperty.getClass().isArray()) {
final int length = Array.getLength(indexedProperty);
if (index >= length) {
final Class<?> componentType = indexedProperty.getClass().getComponentType();
- final Object newArray = Array.newInstance(componentType, (index + 1));
+ final Object newArray = Array.newInstance(componentType, index + 1);
System.arraycopy(indexedProperty, 0, newArray, 0, length);
indexedProperty = newArray;
set(name, indexedProperty);
@@ -928,17 +928,17 @@
protected boolean isAssignable(final Class<?> dest, final Class<?> source) {
if (dest.isAssignableFrom(source) ||
- ((dest == Boolean.TYPE) && (source == Boolean.class)) ||
- ((dest == Byte.TYPE) && (source == Byte.class)) ||
- ((dest == Character.TYPE) && (source == Character.class)) ||
- ((dest == Double.TYPE) && (source == Double.class)) ||
- ((dest == Float.TYPE) && (source == Float.class)) ||
- ((dest == Integer.TYPE) && (source == Integer.class)) ||
- ((dest == Long.TYPE) && (source == Long.class)) ||
- ((dest == Short.TYPE) && (source == Short.class))) {
- return (true);
+ dest == Boolean.TYPE && source == Boolean.class ||
+ dest == Byte.TYPE && source == Byte.class ||
+ dest == Character.TYPE && source == Character.class ||
+ dest == Double.TYPE && source == Double.class ||
+ dest == Float.TYPE && source == Float.class ||
+ dest == Integer.TYPE && source == Integer.class ||
+ dest == Long.TYPE && source == Long.class ||
+ dest == Short.TYPE && source == Short.class) {
+ return true;
}
- return (false);
+ return false;
}
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaClass.java b/src/main/java/org/apache/commons/beanutils2/LazyDynaClass.java
index 3e996c7..2fdcd62 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaClass.java
@@ -287,7 +287,7 @@
final DynaProperty[] newProperties = new DynaProperty[oldProperties.length-1];
int j = 0;
for (int i = 0; i < oldProperties.length; i++) {
- if (!(name.equals(oldProperties[i].getName()))) {
+ if (!name.equals(oldProperties[i].getName())) {
newProperties[j] = oldProperties[i];
j++;
}
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaList.java b/src/main/java/org/apache/commons/beanutils2/LazyDynaList.java
index 5193918..50909cd 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaList.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaList.java
@@ -444,12 +444,12 @@
public <T> T[] toArray(final T[] model) {
final Class<?> arrayType = model.getClass().getComponentType();
- if ((DynaBean.class.isAssignableFrom(arrayType))
- || (size() == 0 && elementType == null)) {
+ if (DynaBean.class.isAssignableFrom(arrayType)
+ || size() == 0 && elementType == null) {
return super.toArray(model);
}
- if ((arrayType.isAssignableFrom(elementType))) {
+ if (arrayType.isAssignableFrom(elementType)) {
T[] array;
if (model.length >= size()) {
array = model;
@@ -516,7 +516,7 @@
throw new IllegalArgumentException("Element Type is missing");
}
- final boolean changeType = (this.elementType != null && !this.elementType.equals(elementType));
+ final boolean changeType = this.elementType != null && !this.elementType.equals(elementType);
if (changeType && size() > 0) {
throw new IllegalStateException("Element Type cannot be reset");
}
@@ -715,6 +715,6 @@
* Return the DynaClass.
*/
private DynaClass getDynaClass() {
- return (elementDynaClass == null ? wrapDynaClass : elementDynaClass);
+ return elementDynaClass == null ? wrapDynaClass : elementDynaClass;
}
}
diff --git a/src/main/java/org/apache/commons/beanutils2/MappedPropertyDescriptor.java b/src/main/java/org/apache/commons/beanutils2/MappedPropertyDescriptor.java
index 32e35a6..baa0dab 100644
--- a/src/main/java/org/apache/commons/beanutils2/MappedPropertyDescriptor.java
+++ b/src/main/java/org/apache/commons/beanutils2/MappedPropertyDescriptor.java
@@ -120,7 +120,7 @@
mappedWriteMethod = getMethod(beanClass, "set" + base, 2);
}
- if ((mappedReadMethod == null) && (mappedWriteMethod == null)) {
+ if (mappedReadMethod == null && mappedWriteMethod == null) {
throw new IntrospectionException("Property '" + propertyName +
"' not found on " +
beanClass.getName());
@@ -406,7 +406,7 @@
return method;
}
- final int parameterCount = (parameterTypes == null) ? 0 : parameterTypes.length;
+ final int parameterCount = parameterTypes == null ? 0 : parameterTypes.length;
// No Method found
throw new IntrospectionException("No method \"" + methodName +
diff --git a/src/main/java/org/apache/commons/beanutils2/MethodUtils.java b/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
index 54a1423..e5e14a6 100644
--- a/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
+++ b/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
@@ -737,7 +737,7 @@
cacheMethod(md, method);
return method;
} catch (final NoSuchMethodException e) {
- return (null);
+ return null;
}
}
@@ -753,7 +753,7 @@
// Make sure we have a method to check
if (method == null) {
- return (null);
+ return null;
}
return getAccessibleMethod(method.getDeclaringClass(), method);
@@ -775,12 +775,12 @@
// Make sure we have a method to check
if (method == null) {
- return (null);
+ return null;
}
// If the requested method is not public we cannot call it
if (!Modifier.isPublic(method.getModifiers())) {
- return (null);
+ return null;
}
boolean sameClass = true;
@@ -799,7 +799,7 @@
if (!sameClass && !Modifier.isPublic(method.getDeclaringClass().getModifiers())) {
setMethodAccessible(method); // Default access superclass workaround
}
- return (method);
+ return method;
}
final String methodName = method.getName();
@@ -818,7 +818,7 @@
parameterTypes);
}
- return (method);
+ return method;
}
@@ -908,7 +908,7 @@
}
// We did not find anything
- return (null);
+ return null;
}
/**
@@ -1347,12 +1347,10 @@
}
final MethodDescriptor md = (MethodDescriptor)obj;
- return (
- exact == md.exact &&
- methodName.equals(md.methodName) &&
- cls.equals(md.cls) &&
- java.util.Arrays.equals(paramTypes, md.paramTypes)
- );
+ return exact == md.exact &&
+ methodName.equals(md.methodName) &&
+ cls.equals(md.cls) &&
+ java.util.Arrays.equals(paramTypes, md.paramTypes);
}
/**
* Returns the string length of method name. I.e. if the
diff --git a/src/main/java/org/apache/commons/beanutils2/PropertyUtils.java b/src/main/java/org/apache/commons/beanutils2/PropertyUtils.java
index 0481e92..a5c05c9 100644
--- a/src/main/java/org/apache/commons/beanutils2/PropertyUtils.java
+++ b/src/main/java/org/apache/commons/beanutils2/PropertyUtils.java
@@ -122,7 +122,7 @@
*/
@Deprecated
public static int getDebug() {
- return (debug);
+ return debug;
}
/**
@@ -240,7 +240,7 @@
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
- return (PropertyUtilsBean.getInstance().describe(bean));
+ return PropertyUtilsBean.getInstance().describe(bean);
}
@@ -272,7 +272,7 @@
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
- return (PropertyUtilsBean.getInstance().getIndexedProperty(bean, name));
+ return PropertyUtilsBean.getInstance().getIndexedProperty(bean, name);
}
@@ -305,7 +305,7 @@
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
- return (PropertyUtilsBean.getInstance().getIndexedProperty(bean, name, index));
+ return PropertyUtilsBean.getInstance().getIndexedProperty(bean, name, index);
}
@@ -332,7 +332,7 @@
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
- return (PropertyUtilsBean.getInstance().getMappedProperty(bean, name));
+ return PropertyUtilsBean.getInstance().getMappedProperty(bean, name);
}
@@ -457,7 +457,7 @@
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
- return (PropertyUtilsBean.getInstance().getProperty(bean, name));
+ return PropertyUtilsBean.getInstance().getProperty(bean, name);
}
@@ -611,7 +611,7 @@
*/
public static Method getReadMethod(final PropertyDescriptor descriptor) {
- return (PropertyUtilsBean.getInstance().getReadMethod(descriptor));
+ return PropertyUtilsBean.getInstance().getReadMethod(descriptor);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java b/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
index ac5ac67..9fe7bfe 100644
--- a/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
@@ -380,7 +380,7 @@
}
}
}
- return (description);
+ return description;
}
@@ -439,7 +439,7 @@
name = resolver.getProperty(name);
// Request the specified indexed property value
- return (getIndexedProperty(bean, name, index));
+ return getIndexedProperty(bean, name, index);
}
@@ -494,7 +494,7 @@
throw new NoSuchMethodException("Unknown property '" +
name + "' on bean class '" + bean.getClass() + "'");
}
- return (((DynaBean) bean).get(name, index));
+ return ((DynaBean) bean).get(name, index);
}
// Retrieve the property descriptor for the specified property
@@ -514,7 +514,7 @@
final Object[] subscript = new Object[1];
subscript[0] = Integer.valueOf(index);
try {
- return (invokeMethod(readMethod,bean, subscript));
+ return invokeMethod(readMethod,bean, subscript);
} catch (final InvocationTargetException e) {
if (e.getTargetException() instanceof
IndexOutOfBoundsException) {
@@ -545,7 +545,7 @@
}
//get the array's value
try {
- return (Array.get(value, index));
+ return Array.get(value, index);
} catch (final ArrayIndexOutOfBoundsException e) {
throw new ArrayIndexOutOfBoundsException("Index: " +
index + ", Size: " + Array.getLength(value) +
@@ -604,7 +604,7 @@
name = resolver.getProperty(name);
// Request the specified indexed property value
- return (getMappedProperty(bean, name, key));
+ return getMappedProperty(bean, name, key);
}
@@ -650,7 +650,7 @@
throw new NoSuchMethodException("Unknown property '" +
name + "'+ on bean class '" + bean.getClass() + "'");
}
- return (((DynaBean) bean).get(name, key));
+ return ((DynaBean) bean).get(name, key);
}
Object result = null;
@@ -729,7 +729,7 @@
if (bean == null) {
return null;
}
- return (getMappedPropertyDescriptors(bean.getClass()));
+ return getMappedPropertyDescriptors(bean.getClass());
}
@@ -870,7 +870,7 @@
throws IllegalAccessException, InvocationTargetException,
NoSuchMethodException {
- return (getNestedProperty(bean, name));
+ return getNestedProperty(bean, name);
}
@@ -937,7 +937,7 @@
// Look up and return this property from our cache
// creating and adding it to the cache if not found.
if (name == null) {
- return (null);
+ return null;
}
final BeanIntrospectionData data = getIntrospectionData(bean.getClass());
@@ -1008,7 +1008,7 @@
if (bean == null) {
throw new IllegalArgumentException("No bean specified");
}
- return (getPropertyDescriptors(bean.getClass()));
+ return getPropertyDescriptors(bean.getClass());
}
@@ -1058,9 +1058,9 @@
final PropertyDescriptor descriptor =
getPropertyDescriptor(bean, name);
if (descriptor != null) {
- return (descriptor.getPropertyEditorClass());
+ return descriptor.getPropertyEditorClass();
}
- return (null);
+ return null;
}
@@ -1130,30 +1130,30 @@
final DynaProperty descriptor =
((DynaBean) bean).getDynaClass().getDynaProperty(name);
if (descriptor == null) {
- return (null);
+ return null;
}
final Class<?> type = descriptor.getType();
if (type == null) {
- return (null);
+ return null;
} else if (type.isArray()) {
- return (type.getComponentType());
+ return type.getComponentType();
} else {
- return (type);
+ return type;
}
}
final PropertyDescriptor descriptor =
getPropertyDescriptor(bean, name);
if (descriptor == null) {
- return (null);
+ return null;
} else if (descriptor instanceof IndexedPropertyDescriptor) {
- return (((IndexedPropertyDescriptor) descriptor).
- getIndexedPropertyType());
+ return ((IndexedPropertyDescriptor) descriptor).
+ getIndexedPropertyType();
} else if (descriptor instanceof MappedPropertyDescriptor) {
- return (((MappedPropertyDescriptor) descriptor).
- getMappedPropertyType());
+ return ((MappedPropertyDescriptor) descriptor).
+ getMappedPropertyType();
} else {
- return (descriptor.getPropertyType());
+ return descriptor.getPropertyType();
}
}
@@ -1170,7 +1170,7 @@
*/
public Method getReadMethod(final PropertyDescriptor descriptor) {
- return (MethodUtils.getAccessibleMethod(descriptor.getReadMethod()));
+ return MethodUtils.getAccessibleMethod(descriptor.getReadMethod());
}
@@ -1186,7 +1186,7 @@
* @return The read method
*/
Method getReadMethod(final Class<?> clazz, final PropertyDescriptor descriptor) {
- return (MethodUtils.getAccessibleMethod(clazz, descriptor.getReadMethod()));
+ return MethodUtils.getAccessibleMethod(clazz, descriptor.getReadMethod());
}
@@ -1245,7 +1245,7 @@
name + "' on dynaclass '" +
((DynaBean) bean).getDynaClass() + "'" );
}
- return (((DynaBean) bean).get(name));
+ return ((DynaBean) bean).get(name);
}
// Retrieve the property getter method for the specified property
@@ -1263,7 +1263,7 @@
// Call the property getter and return the value
final Object value = invokeMethod(readMethod, bean, EMPTY_OBJECT_ARRAY);
- return (value);
+ return value;
}
@@ -1284,7 +1284,7 @@
*/
public Method getWriteMethod(final PropertyDescriptor descriptor) {
- return (MethodUtils.getAccessibleMethod(descriptor.getWriteMethod()));
+ return MethodUtils.getAccessibleMethod(descriptor.getWriteMethod());
}
@@ -1302,8 +1302,8 @@
*/
public Method getWriteMethod(final Class<?> clazz, final PropertyDescriptor descriptor) {
final BeanIntrospectionData data = getIntrospectionData(clazz);
- return (MethodUtils.getAccessibleMethod(clazz,
- data.getWriteMethod(clazz, descriptor)));
+ return MethodUtils.getAccessibleMethod(clazz,
+ data.getWriteMethod(clazz, descriptor));
}
@@ -1367,7 +1367,7 @@
// Return the requested result
if (bean instanceof DynaBean) {
// All DynaBean properties are readable
- return (((DynaBean) bean).getDynaClass().getDynaProperty(name) != null);
+ return ((DynaBean) bean).getDynaClass().getDynaProperty(name) != null;
}
try {
final PropertyDescriptor desc =
@@ -1382,15 +1382,15 @@
}
readMethod = MethodUtils.getAccessibleMethod(bean.getClass(), readMethod);
}
- return (readMethod != null);
+ return readMethod != null;
}
- return (false);
+ return false;
} catch (final IllegalAccessException e) {
- return (false);
+ return false;
} catch (final InvocationTargetException e) {
- return (false);
+ return false;
} catch (final NoSuchMethodException e) {
- return (false);
+ return false;
}
}
@@ -1456,7 +1456,7 @@
// Return the requested result
if (bean instanceof DynaBean) {
// All DynaBean properties are writeable
- return (((DynaBean) bean).getDynaClass().getDynaProperty(name) != null);
+ return ((DynaBean) bean).getDynaClass().getDynaProperty(name) != null;
}
try {
final PropertyDescriptor desc =
@@ -1471,15 +1471,15 @@
}
writeMethod = MethodUtils.getAccessibleMethod(bean.getClass(), writeMethod);
}
- return (writeMethod != null);
+ return writeMethod != null;
}
- return (false);
+ return false;
} catch (final IllegalAccessException e) {
- return (false);
+ return false;
} catch (final InvocationTargetException e) {
- return (false);
+ return false;
} catch (final NoSuchMethodException e) {
- return (false);
+ return false;
}
}
@@ -2120,7 +2120,7 @@
if (values[i] == null) {
valueString += "<null>";
} else {
- valueString += (values[i]).getClass().getName();
+ valueString += values[i].getClass().getName();
}
}
}
@@ -2157,7 +2157,7 @@
if (values[i] == null) {
valueString += "<null>";
} else {
- valueString += (values[i]).getClass().getName();
+ valueString += values[i].getClass().getName();
}
}
}
diff --git a/src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java b/src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java
index 4d667d4..b3f27a1 100644
--- a/src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/ResultSetDynaClass.java
@@ -192,7 +192,7 @@
*/
public Iterator<DynaBean> iterator() {
- return (new ResultSetIterator(this));
+ return new ResultSetIterator(this);
}
@@ -218,7 +218,7 @@
*/
ResultSet getResultSet() {
- return (this.resultSet);
+ return this.resultSet;
}
diff --git a/src/main/java/org/apache/commons/beanutils2/ResultSetIterator.java b/src/main/java/org/apache/commons/beanutils2/ResultSetIterator.java
index 219c3f2..3407514 100644
--- a/src/main/java/org/apache/commons/beanutils2/ResultSetIterator.java
+++ b/src/main/java/org/apache/commons/beanutils2/ResultSetIterator.java
@@ -182,7 +182,7 @@
@Override
public DynaClass getDynaClass() {
- return (this.dynaClass);
+ return this.dynaClass;
}
@@ -298,7 +298,7 @@
try {
advance();
- return (!eof);
+ return !eof;
} catch (final SQLException e) {
throw new RuntimeException("hasNext(): SQLException: " + e);
}
@@ -320,7 +320,7 @@
throw new NoSuchElementException();
}
current = false;
- return (this);
+ return this;
} catch (final SQLException e) {
throw new RuntimeException("next(): SQLException: " + e);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/RowSetDynaClass.java b/src/main/java/org/apache/commons/beanutils2/RowSetDynaClass.java
index 02e95c0..40f57a6 100644
--- a/src/main/java/org/apache/commons/beanutils2/RowSetDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/RowSetDynaClass.java
@@ -263,7 +263,7 @@
*/
public List<DynaBean> getRows() {
- return (this.rows);
+ return this.rows;
}
@@ -306,7 +306,7 @@
*/
protected DynaBean createDynaBean() {
- return (new BasicDynaBean(this));
+ return new BasicDynaBean(this);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/WeakFastHashMap.java b/src/main/java/org/apache/commons/beanutils2/WeakFastHashMap.java
index ad4bf5b..c0fa56c 100644
--- a/src/main/java/org/apache/commons/beanutils2/WeakFastHashMap.java
+++ b/src/main/java/org/apache/commons/beanutils2/WeakFastHashMap.java
@@ -127,7 +127,7 @@
* @return true if this map is operating in fast mode
*/
public boolean getFast() {
- return (this.fast);
+ return this.fast;
}
/**
@@ -157,10 +157,10 @@
@Override
public V get(final Object key) {
if (fast) {
- return (map.get(key));
+ return map.get(key);
}
synchronized (map) {
- return (map.get(key));
+ return map.get(key);
}
}
@@ -172,10 +172,10 @@
@Override
public int size() {
if (fast) {
- return (map.size());
+ return map.size();
}
synchronized (map) {
- return (map.size());
+ return map.size();
}
}
@@ -187,10 +187,10 @@
@Override
public boolean isEmpty() {
if (fast) {
- return (map.isEmpty());
+ return map.isEmpty();
}
synchronized (map) {
- return (map.isEmpty());
+ return map.isEmpty();
}
}
@@ -204,10 +204,10 @@
@Override
public boolean containsKey(final Object key) {
if (fast) {
- return (map.containsKey(key));
+ return map.containsKey(key);
}
synchronized (map) {
- return (map.containsKey(key));
+ return map.containsKey(key);
}
}
@@ -221,10 +221,10 @@
@Override
public boolean containsValue(final Object value) {
if (fast) {
- return (map.containsValue(value));
+ return map.containsValue(value);
}
synchronized (map) {
- return (map.containsValue(value));
+ return map.containsValue(value);
}
}
@@ -250,11 +250,11 @@
final Map<K, V> temp = cloneMap(map);
final V result = temp.put(key, value);
map = temp;
- return (result);
+ return result;
}
}
synchronized (map) {
- return (map.put(key, value));
+ return map.put(key, value);
}
}
@@ -293,11 +293,11 @@
final Map<K, V> temp = cloneMap(map);
final V result = temp.remove(key);
map = temp;
- return (result);
+ return result;
}
}
synchronized (map) {
- return (map.remove(key));
+ return map.remove(key);
}
}
@@ -333,51 +333,51 @@
public boolean equals(final Object o) {
// Simple tests that require no synchronization
if (o == this) {
- return (true);
+ return true;
} else if (!(o instanceof Map)) {
- return (false);
+ return false;
}
final Map<?, ?> mo = (Map<?, ?>) o;
// Compare the two maps for equality
if (fast) {
if (mo.size() != map.size()) {
- return (false);
+ return false;
}
for (final Map.Entry<K, V> e : map.entrySet()) {
final K key = e.getKey();
final V value = e.getValue();
if (value == null) {
if (!(mo.get(key) == null && mo.containsKey(key))) {
- return (false);
+ return false;
}
} else {
if (!value.equals(mo.get(key))) {
- return (false);
+ return false;
}
}
}
- return (true);
+ return true;
}
synchronized (map) {
if (mo.size() != map.size()) {
- return (false);
+ return false;
}
for (final Map.Entry<K, V> e : map.entrySet()) {
final K key = e.getKey();
final V value = e.getValue();
if (value == null) {
if (!(mo.get(key) == null && mo.containsKey(key))) {
- return (false);
+ return false;
}
} else {
if (!value.equals(mo.get(key))) {
- return (false);
+ return false;
}
}
}
- return (true);
+ return true;
}
}
@@ -395,14 +395,14 @@
for (final Map.Entry<K, V> e : map.entrySet()) {
h += e.hashCode();
}
- return (h);
+ return h;
}
synchronized (map) {
int h = 0;
for (final Map.Entry<K, V> e : map.entrySet()) {
h += e.hashCode();
}
- return (h);
+ return h;
}
}
@@ -423,7 +423,7 @@
}
}
results.setFast(getFast());
- return (results);
+ return results;
}
// Map views
diff --git a/src/main/java/org/apache/commons/beanutils2/WrapDynaBean.java b/src/main/java/org/apache/commons/beanutils2/WrapDynaBean.java
index b158465..af3f655 100644
--- a/src/main/java/org/apache/commons/beanutils2/WrapDynaBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/WrapDynaBean.java
@@ -76,7 +76,7 @@
public WrapDynaBean(final Object instance, final WrapDynaClass cls) {
this.instance = instance;
- this.dynaClass = (cls != null) ? cls : (WrapDynaClass) getDynaClass();
+ this.dynaClass = cls != null ? cls : (WrapDynaClass) getDynaClass();
}
@@ -145,7 +145,7 @@
("Error reading property '" + name +
"', exception - " + t);
}
- return (value);
+ return value;
}
@@ -184,7 +184,7 @@
("Error reading indexed property '" + name +
"', exception - " + t);
}
- return (value);
+ return value;
}
@@ -218,7 +218,7 @@
("Error reading mapped property '" + name +
"', exception - " + t);
}
- return (value);
+ return value;
}
@@ -235,7 +235,7 @@
dynaClass = WrapDynaClass.createDynaClass(instance.getClass());
}
- return (this.dynaClass);
+ return this.dynaClass;
}
@@ -396,7 +396,7 @@
throw new IllegalArgumentException
("Invalid property name '" + name + "'");
}
- return (descriptor);
+ return descriptor;
}
@@ -412,7 +412,7 @@
if (dynaClass != null) {
propUtils = dynaClass.getPropertyUtilsBean();
}
- return (propUtils != null) ? propUtils : PropertyUtilsBean.getInstance();
+ return propUtils != null ? propUtils : PropertyUtilsBean.getInstance();
}
}
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/AbstractArrayConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/AbstractArrayConverter.java
index beffc15..a8f7c2d 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/AbstractArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/AbstractArrayConverter.java
@@ -190,8 +190,8 @@
final List<String> list = new ArrayList<>();
while (true) {
final int ttype = st.nextToken();
- if ((ttype == StreamTokenizer.TT_WORD) ||
- (ttype > 0)) {
+ if (ttype == StreamTokenizer.TT_WORD ||
+ ttype > 0) {
list.add(st.sval);
} else if (ttype == StreamTokenizer.TT_EOF) {
break;
@@ -202,7 +202,7 @@
}
// Return the completed list
- return (list);
+ return list;
} catch (final IOException e) {
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/AbstractConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/AbstractConverter.java
index b3e1a88..8c51f42 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/AbstractConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/AbstractConverter.java
@@ -306,7 +306,7 @@
if (useDefault || type.equals(String.class)) {
Object value = getDefault(type);
- if (useDefault && value != null && !(type.equals(value.getClass()))) {
+ if (useDefault && value != null && !type.equals(value.getClass())) {
try {
value = convertToType(type, defaultValue);
} catch (final Throwable t) {
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/ArrayConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/ArrayConverter.java
index 936369d..6191328 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/ArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/ArrayConverter.java
@@ -461,7 +461,7 @@
List<String> list = null;
while (true) {
final int ttype = st.nextToken();
- if ((ttype == StreamTokenizer.TT_WORD) || (ttype > 0)) {
+ if (ttype == StreamTokenizer.TT_WORD || ttype > 0) {
if (st.sval != null) {
if (list == null) {
list = new ArrayList<>();
@@ -484,7 +484,7 @@
}
// Return the completed list
- return (list);
+ return list;
} catch (final IOException e) {
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/BooleanArrayConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/BooleanArrayConverter.java
index f261f54..cd8bfcc 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/BooleanArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/BooleanArrayConverter.java
@@ -186,14 +186,14 @@
// Deal with a null value
if (value == null) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException("No value specified");
}
// Deal with the no-conversion-needed case
if (MODEL == value.getClass()) {
- return (value);
+ return value;
}
// Deal with input value as a String array
@@ -209,10 +209,10 @@
final Object result = booleanConverter.convert(Boolean.class, stringValue);
results[i] = ((Boolean) result).booleanValue();
}
- return (results);
+ return results;
} catch (final Exception e) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException(value.toString(), e);
}
@@ -230,10 +230,10 @@
final Object result = booleanConverter.convert(Boolean.class, stringValue);
results[i] = ((Boolean) result).booleanValue();
}
- return (results);
+ return results;
} catch (final Exception e) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException(value.toString(), e);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/ByteArrayConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/ByteArrayConverter.java
index c109462..682fea4 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/ByteArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/ByteArrayConverter.java
@@ -96,14 +96,14 @@
// Deal with a null value
if (value == null) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException("No value specified");
}
// Deal with the no-conversion-needed case
if (MODEL.getClass() == value.getClass()) {
- return (value);
+ return value;
}
// Deal with input value as a String array
@@ -114,10 +114,10 @@
for (int i = 0; i < values.length; i++) {
results[i] = Byte.parseByte(values[i]);
}
- return (results);
+ return results;
} catch (final Exception e) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException(value.toString(), e);
}
@@ -131,10 +131,10 @@
for (int i = 0; i < results.length; i++) {
results[i] = Byte.parseByte(list.get(i));
}
- return (results);
+ return results;
} catch (final Exception e) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException(value.toString(), e);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/CharacterArrayConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/CharacterArrayConverter.java
index 7117325..681845f 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/CharacterArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/CharacterArrayConverter.java
@@ -97,14 +97,14 @@
// Deal with a null value
if (value == null) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException("No value specified");
}
// Deal with the no-conversion-needed case
if (MODEL.getClass() == value.getClass()) {
- return (value);
+ return value;
}
// Deal with input value as a String array
@@ -115,10 +115,10 @@
for (int i = 0; i < values.length; i++) {
results[i] = values[i].charAt(0);
}
- return (results);
+ return results;
} catch (final Exception e) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException(value.toString(), e);
}
@@ -130,12 +130,12 @@
final List<String> list = parseElements(value.toString());
final char[] results = new char[list.size()];
for (int i = 0; i < results.length; i++) {
- results[i] = (list.get(i)).charAt(0);
+ results[i] = list.get(i).charAt(0);
}
- return (results);
+ return results;
} catch (final Exception e) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException(value.toString(), e);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/ClassConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/ClassConverter.java
index c916f0d..19c109e 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/ClassConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/ClassConverter.java
@@ -72,7 +72,7 @@
*/
@Override
protected String convertToString(final Object value) {
- return (value instanceof Class) ? ((Class<?>)value).getName() : value.toString();
+ return value instanceof Class ? ((Class<?>)value).getName() : value.toString();
}
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/DoubleArrayConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/DoubleArrayConverter.java
index 004c561..c09796f 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/DoubleArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/DoubleArrayConverter.java
@@ -96,14 +96,14 @@
// Deal with a null value
if (value == null) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException("No value specified");
}
// Deal with the no-conversion-needed case
if (MODEL.getClass() == value.getClass()) {
- return (value);
+ return value;
}
// Deal with input value as a String array
@@ -114,10 +114,10 @@
for (int i = 0; i < values.length; i++) {
results[i] = Double.parseDouble(values[i]);
}
- return (results);
+ return results;
} catch (final Exception e) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException(value.toString(), e);
}
@@ -131,10 +131,10 @@
for (int i = 0; i < results.length; i++) {
results[i] = Double.parseDouble(list.get(i));
}
- return (results);
+ return results;
} catch (final Exception e) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException(value.toString(), e);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/FloatArrayConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/FloatArrayConverter.java
index 081d136..85c4edf 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/FloatArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/FloatArrayConverter.java
@@ -97,14 +97,14 @@
// Deal with a null value
if (value == null) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException("No value specified");
}
// Deal with the no-conversion-needed case
if (MODEL.getClass() == value.getClass()) {
- return (value);
+ return value;
}
// Deal with input value as a String array
@@ -115,10 +115,10 @@
for (int i = 0; i < values.length; i++) {
results[i] = Float.parseFloat(values[i]);
}
- return (results);
+ return results;
} catch (final Exception e) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException(value.toString(), e);
}
@@ -132,10 +132,10 @@
for (int i = 0; i < results.length; i++) {
results[i] = Float.parseFloat(list.get(i));
}
- return (results);
+ return results;
} catch (final Exception e) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException(value.toString(), e);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/IntegerArrayConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/IntegerArrayConverter.java
index 274c9ed..2f4ce0f 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/IntegerArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/IntegerArrayConverter.java
@@ -97,14 +97,14 @@
// Deal with a null value
if (value == null) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException("No value specified");
}
// Deal with the no-conversion-needed case
if (MODEL.getClass() == value.getClass()) {
- return (value);
+ return value;
}
// Deal with input value as a String array
@@ -115,10 +115,10 @@
for (int i = 0; i < values.length; i++) {
results[i] = Integer.parseInt(values[i]);
}
- return (results);
+ return results;
} catch (final Exception e) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException(value.toString(), e);
}
@@ -132,10 +132,10 @@
for (int i = 0; i < results.length; i++) {
results[i] = Integer.parseInt(list.get(i));
}
- return (results);
+ return results;
} catch (final Exception e) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException(value.toString(), e);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/LongArrayConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/LongArrayConverter.java
index 3c243b6..3bb719c 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/LongArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/LongArrayConverter.java
@@ -97,14 +97,14 @@
// Deal with a null value
if (value == null) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException("No value specified");
}
// Deal with the no-conversion-needed case
if (MODEL.getClass() == value.getClass()) {
- return (value);
+ return value;
}
// Deal with input value as a String array
@@ -115,10 +115,10 @@
for (int i = 0; i < values.length; i++) {
results[i] = Long.parseLong(values[i]);
}
- return (results);
+ return results;
} catch (final Exception e) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException(value.toString(), e);
}
@@ -132,10 +132,10 @@
for (int i = 0; i < results.length; i++) {
results[i] = Long.parseLong(list.get(i));
}
- return (results);
+ return results;
} catch (final Exception e) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException(value.toString(), e);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/ShortArrayConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/ShortArrayConverter.java
index a67504d..4393d7a 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/ShortArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/ShortArrayConverter.java
@@ -97,14 +97,14 @@
// Deal with a null value
if (value == null) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException("No value specified");
}
// Deal with the no-conversion-needed case
if (MODEL.getClass() == value.getClass()) {
- return (value);
+ return value;
}
// Deal with input value as a String array
@@ -115,10 +115,10 @@
for (int i = 0; i < values.length; i++) {
results[i] = Short.parseShort(values[i]);
}
- return (results);
+ return results;
} catch (final Exception e) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException(value.toString(), e);
}
@@ -132,10 +132,10 @@
for (int i = 0; i < results.length; i++) {
results[i] = Short.parseShort(list.get(i));
}
- return (results);
+ return results;
} catch (final Exception e) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException(value.toString(), e);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/converters/StringArrayConverter.java b/src/main/java/org/apache/commons/beanutils2/converters/StringArrayConverter.java
index 2a8ee27..804c9b0 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/StringArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/StringArrayConverter.java
@@ -127,14 +127,14 @@
// Deal with a null value
if (value == null) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException("No value specified");
}
// Deal with the no-conversion-needed case
if (MODEL.getClass() == value.getClass()) {
- return (value);
+ return value;
}
// Deal with the input value as an int array
@@ -147,7 +147,7 @@
results[i] = Integer.toString(values[i]);
}
- return (results);
+ return results;
}
// Parse the input value as a String into elements
@@ -158,10 +158,10 @@
for (int i = 0; i < results.length; i++) {
results[i] = list.get(i);
}
- return (results);
+ return results;
} catch (final Exception e) {
if (useDefault) {
- return (defaultValue);
+ return defaultValue;
}
throw new ConversionException(value.toString(), e);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/expression/DefaultResolver.java b/src/main/java/org/apache/commons/beanutils2/expression/DefaultResolver.java
index cd3d6dd..1f960fa 100644
--- a/src/main/java/org/apache/commons/beanutils2/expression/DefaultResolver.java
+++ b/src/main/java/org/apache/commons/beanutils2/expression/DefaultResolver.java
@@ -168,7 +168,7 @@
if (expression == null || expression.length() == 0) {
return false;
}
- return (remove(expression) != null);
+ return remove(expression) != null;
}
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsBean.java b/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsBean.java
index 8a394c8..eea4563 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsBean.java
@@ -765,7 +765,7 @@
Object newValue = null;
- if (type.isArray() && (index < 0)) { // Scalar value into array
+ if (type.isArray() && index < 0) { // Scalar value into array
if (value instanceof String) {
final String[] values = new String[1];
values[0] = (String) value;
@@ -818,7 +818,7 @@
Object newValue = null;
- if (type.isArray() && (index < 0)) { // Scalar value into array
+ if (type.isArray() && index < 0) { // Scalar value into array
if (value instanceof String) {
final String[] values = new String[1];
values[0] = (String) value;
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java b/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java
index 53e22a9..2c7e83e 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsBean.java
@@ -283,7 +283,7 @@
log.trace(" Using converter " + converter);
}
- return (converter.convert(targetClass, value, pattern));
+ return converter.convert(targetClass, value, pattern);
}
/**
@@ -349,7 +349,7 @@
Array.set(array, i, convert(values[i], type, locale, pattern));
}
- return (array);
+ return array;
}
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverter.java
index 685fadb..6f26fea 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverter.java
@@ -218,7 +218,7 @@
if (result instanceof Long) {
return Double.valueOf(result.doubleValue());
}
- return (result);
+ return result;
}
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverter.java
index 3c95022..6ba1f11 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/FloatLocaleConverter.java
@@ -219,7 +219,7 @@
protected Object parse(final Object value, final String pattern) throws ParseException {
final Number parsed = (Number) super.parse(value, pattern);
final double doubleValue = parsed.doubleValue();
- final double posDouble = (doubleValue >= 0) ? doubleValue : (doubleValue * -1);
+ final double posDouble = doubleValue >= 0 ? doubleValue : doubleValue * -1;
if (posDouble != 0 && (posDouble < Float.MIN_VALUE || posDouble > Float.MAX_VALUE)) {
throw new ConversionException("Supplied number is not of type Float: "+parsed);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java b/src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java
index 775b21c..2649525 100644
--- a/src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/locale/converters/StringLocaleConverter.java
@@ -233,17 +233,17 @@
String result = null;
- if ((value instanceof Integer) ||
- (value instanceof Long) ||
- (value instanceof BigInteger) ||
- (value instanceof Byte) ||
- (value instanceof Short)) {
+ if (value instanceof Integer ||
+ value instanceof Long ||
+ value instanceof BigInteger ||
+ value instanceof Byte ||
+ value instanceof Short) {
result = getDecimalFormat(locale, pattern).format(((Number) value).longValue());
}
- else if ((value instanceof Double) ||
- (value instanceof BigDecimal) ||
- (value instanceof Float)) {
+ else if (value instanceof Double ||
+ value instanceof BigDecimal ||
+ value instanceof Float) {
result = getDecimalFormat(locale, pattern).format(((Number) value).doubleValue());
}
diff --git a/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java b/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
index 33851b7..7612ef1 100644
--- a/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
@@ -156,7 +156,7 @@
*/
public static Test suite() {
- return (new TestSuite(BasicDynaBeanTestCase.class));
+ return new TestSuite(BasicDynaBeanTestCase.class);
}
@@ -472,7 +472,7 @@
try {
final Object value = bean.get("booleanProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Boolean));
+ assertTrue("Got correct type", value instanceof Boolean);
assertTrue("Got correct value",
((Boolean) value).booleanValue() == true);
} catch (final Throwable e) {
@@ -490,7 +490,7 @@
try {
final Object value = bean.get("doubleProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Double));
+ assertTrue("Got correct type", value instanceof Double);
assertEquals("Got correct value",
((Double) value).doubleValue(),
321.0, 0.005);
@@ -509,7 +509,7 @@
try {
final Object value = bean.get("floatProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Float));
+ assertTrue("Got correct type", value instanceof Float);
assertEquals("Got correct value",
((Float) value).floatValue(),
(float) 123.0,
@@ -529,7 +529,7 @@
try {
final Object value = bean.get("intProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Integer));
+ assertTrue("Got correct type", value instanceof Integer);
assertEquals("Got correct value",
((Integer) value).intValue(),
123);
@@ -548,7 +548,7 @@
try {
final Object value = bean.get("longProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Long));
+ assertTrue("Got correct type", value instanceof Long);
assertEquals("Got correct value",
((Long) value).longValue(),
321);
@@ -567,7 +567,7 @@
try {
final Object value = bean.get("shortProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Short));
+ assertTrue("Got correct type", value instanceof Short);
assertEquals("Got correct value",
((Short) value).shortValue(),
(short) 987);
@@ -586,7 +586,7 @@
try {
final Object value = bean.get("stringProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof String));
+ assertTrue("Got correct type", value instanceof String);
assertEquals("Got correct value",
(String) value,
"This is a string");
@@ -1010,7 +1010,7 @@
new DynaProperty("stringIndexed", stringArray.getClass()),
new DynaProperty("stringProperty", String.class),
});
- return (dynaClass);
+ return dynaClass;
}
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanComparatorTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanComparatorTestCase.java
index 1d7c566..7dc4296 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanComparatorTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanComparatorTestCase.java
@@ -76,7 +76,7 @@
* Return the tests included in this test suite.
*/
public static Test suite() {
- return (new TestSuite(BeanComparatorTestCase.class));
+ return new TestSuite(BeanComparatorTestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanUtils2TestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanUtils2TestCase.java
index fe643e0..d1c4846 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanUtils2TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanUtils2TestCase.java
@@ -61,7 +61,7 @@
* Return the tests included in this test suite.
*/
public static Test suite() {
- return (new TestSuite(BeanUtils2TestCase.class));
+ return new TestSuite(BeanUtils2TestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
index 0277839..9461b8f 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
@@ -154,7 +154,7 @@
*/
public static Test suite() {
- return (new TestSuite(BeanUtilsBenchCase.class));
+ return new TestSuite(BeanUtilsBenchCase.class);
}
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java
index 8582488..233e816 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanUtilsTestCase.java
@@ -167,7 +167,7 @@
* Return the tests included in this test suite.
*/
public static Test suite() {
- return (new TestSuite(BeanUtilsTestCase.class));
+ return new TestSuite(BeanUtilsTestCase.class);
}
/**
@@ -447,13 +447,13 @@
final String comp[] = bean.getStringArray();
assertTrue("String array length = " + comp.length,
- (comp.length == arr.length));
+ comp.length == arr.length);
arr = BeanUtils.getArrayProperty(bean, "intArray");
final int iarr[] = bean.getIntArray();
assertTrue("String array length = " + iarr.length,
- (iarr.length == arr.length));
+ iarr.length == arr.length);
// Test property which isn't array or collection
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java
index 2834b15..de713cd 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java
@@ -84,7 +84,7 @@
* Return the tests included in this test suite.
*/
public static Test suite() {
- return (new TestSuite(BeanificationTestCase.class));
+ return new TestSuite(BeanificationTestCase.class);
}
diff --git a/src/test/java/org/apache/commons/beanutils2/BenchBean.java b/src/test/java/org/apache/commons/beanutils2/BenchBean.java
index 85156ca..c8e50ce 100644
--- a/src/test/java/org/apache/commons/beanutils2/BenchBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/BenchBean.java
@@ -37,7 +37,7 @@
private boolean booleanProperty = true;
public boolean getBooleanProperty() {
- return (booleanProperty);
+ return booleanProperty;
}
public void setBooleanProperty(final boolean booleanProperty) {
@@ -51,7 +51,7 @@
private byte byteProperty = (byte) 121;
public byte getByteProperty() {
- return (this.byteProperty);
+ return this.byteProperty;
}
public void setByteProperty(final byte byteProperty) {
@@ -65,7 +65,7 @@
private double doubleProperty = 321.0;
public double getDoubleProperty() {
- return (this.doubleProperty);
+ return this.doubleProperty;
}
public void setDoubleProperty(final double doubleProperty) {
@@ -79,7 +79,7 @@
private float floatProperty = (float) 123.0;
public float getFloatProperty() {
- return (this.floatProperty);
+ return this.floatProperty;
}
public void setFloatProperty(final float floatProperty) {
@@ -93,7 +93,7 @@
private int intProperty = 123;
public int getIntProperty() {
- return (this.intProperty);
+ return this.intProperty;
}
public void setIntProperty(final int intProperty) {
@@ -107,7 +107,7 @@
private long longProperty = 321;
public long getLongProperty() {
- return (this.longProperty);
+ return this.longProperty;
}
public void setLongProperty(final long longProperty) {
@@ -121,7 +121,7 @@
private short shortProperty = (short) 987;
public short getShortProperty() {
- return (this.shortProperty);
+ return this.shortProperty;
}
public void setShortProperty(final short shortProperty) {
@@ -135,7 +135,7 @@
private String stringProperty = "This is a string";
public String getStringProperty() {
- return (this.stringProperty);
+ return this.stringProperty;
}
public void setStringProperty(final String stringProperty) {
diff --git a/src/test/java/org/apache/commons/beanutils2/ConstructorUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/ConstructorUtilsTestCase.java
index ce761d2..fc0e120 100644
--- a/src/test/java/org/apache/commons/beanutils2/ConstructorUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/ConstructorUtilsTestCase.java
@@ -64,7 +64,7 @@
* Return the tests included in this test suite.
*/
public static Test suite() {
- return (new TestSuite(ConstructorUtilsTestCase.class));
+ return new TestSuite(ConstructorUtilsTestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java
index 8488d08..57cd061 100644
--- a/src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java
@@ -80,7 +80,7 @@
* Return the tests included in this test suite.
*/
public static Test suite() {
- return (new TestSuite(ConvertUtilsTestCase.class));
+ return new TestSuite(ConvertUtilsTestCase.class);
}
diff --git a/src/test/java/org/apache/commons/beanutils2/DynaBeanMapDecoratorTestCase.java b/src/test/java/org/apache/commons/beanutils2/DynaBeanMapDecoratorTestCase.java
index 084c443..0c9d39d 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaBeanMapDecoratorTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaBeanMapDecoratorTestCase.java
@@ -88,7 +88,7 @@
* Return the tests included in this test suite.
*/
public static Test suite() {
- return (new TestSuite(DynaBeanMapDecoratorTestCase.class));
+ return new TestSuite(DynaBeanMapDecoratorTestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
index a8fe975..3a3be1d 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
@@ -173,7 +173,7 @@
*/
public static Test suite() {
- return (new TestSuite(DynaBeanUtilsTestCase.class));
+ return new TestSuite(DynaBeanUtilsTestCase.class);
}
@@ -575,13 +575,13 @@
final String comp[] = (String[]) bean.get("stringArray");
assertTrue("String array length = " + comp.length,
- (comp.length == arr.length));
+ comp.length == arr.length);
arr = BeanUtils.getArrayProperty(bean, "intArray");
final int iarr[] = (int[]) bean.get("intArray");
assertTrue("String array length = " + iarr.length,
- (iarr.length == arr.length));
+ iarr.length == arr.length);
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
} catch (final InvocationTargetException e) {
@@ -1267,7 +1267,7 @@
new DynaProperty("stringIndexed", stringArray.getClass()),
new DynaProperty("stringProperty", String.class),
});
- return (dynaClass);
+ return dynaClass;
}
diff --git a/src/test/java/org/apache/commons/beanutils2/DynaPropertyTestCase.java b/src/test/java/org/apache/commons/beanutils2/DynaPropertyTestCase.java
index b85040c..6677565 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaPropertyTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaPropertyTestCase.java
@@ -53,7 +53,7 @@
*/
public static Test suite() {
- return (new TestSuite(DynaPropertyTestCase.class));
+ return new TestSuite(DynaPropertyTestCase.class);
}
diff --git a/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
index b338987..8a54271 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
@@ -168,7 +168,7 @@
*/
public static Test suite() {
- return (new TestSuite(DynaPropertyUtilsTestCase.class));
+ return new TestSuite(DynaPropertyUtilsTestCase.class);
}
@@ -936,7 +936,7 @@
PropertyUtils.getNestedProperty
(bean, "nested.booleanProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Boolean));
+ assertTrue("Got correct type", value instanceof Boolean);
final TestBean nested = (TestBean) bean.get("nested");
assertTrue("Got correct value",
((Boolean) value).booleanValue() ==
@@ -964,7 +964,7 @@
PropertyUtils.getNestedProperty
(bean, "nested.doubleProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Double));
+ assertTrue("Got correct type", value instanceof Double);
final TestBean nested = (TestBean) bean.get("nested");
assertEquals("Got correct value",
((Double) value).doubleValue(),
@@ -993,7 +993,7 @@
PropertyUtils.getNestedProperty
(bean, "nested.floatProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Float));
+ assertTrue("Got correct type", value instanceof Float);
final TestBean nested = (TestBean) bean.get("nested");
assertEquals("Got correct value",
((Float) value).floatValue(),
@@ -1022,7 +1022,7 @@
PropertyUtils.getNestedProperty
(bean, "nested.intProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Integer));
+ assertTrue("Got correct type", value instanceof Integer);
final TestBean nested = (TestBean) bean.get("nested");
assertEquals("Got correct value",
((Integer) value).intValue(),
@@ -1050,7 +1050,7 @@
PropertyUtils.getNestedProperty
(bean, "nested.longProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Long));
+ assertTrue("Got correct type", value instanceof Long);
final TestBean nested = (TestBean) bean.get("nested");
assertEquals("Got correct value",
((Long) value).longValue(),
@@ -1078,7 +1078,7 @@
PropertyUtils.getNestedProperty
(bean, "nested.readOnlyProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof String));
+ assertTrue("Got correct type", value instanceof String);
final TestBean nested = (TestBean) bean.get("nested");
assertEquals("Got correct value",
(String) value,
@@ -1106,7 +1106,7 @@
PropertyUtils.getNestedProperty
(bean, "nested.shortProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Short));
+ assertTrue("Got correct type", value instanceof Short);
final TestBean nested = (TestBean) bean.get("nested");
assertEquals("Got correct value",
((Short) value).shortValue(),
@@ -1134,10 +1134,10 @@
PropertyUtils.getNestedProperty
(bean, "nested.stringProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof String));
+ assertTrue("Got correct type", value instanceof String);
final TestBean nested = (TestBean) bean.get("nested");
assertEquals("Got correct value",
- ((String) value),
+ (String) value,
nested.getStringProperty());
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
@@ -1209,7 +1209,7 @@
PropertyUtils.getSimpleProperty(bean,
"booleanProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Boolean));
+ assertTrue("Got correct type", value instanceof Boolean);
assertTrue("Got correct value",
((Boolean) value).booleanValue() == true);
} catch (final IllegalAccessException e) {
@@ -1235,7 +1235,7 @@
PropertyUtils.getSimpleProperty(bean,
"doubleProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Double));
+ assertTrue("Got correct type", value instanceof Double);
assertEquals("Got correct value",
((Double) value).doubleValue(), 321.0, 0.005);
} catch (final IllegalAccessException e) {
@@ -1261,7 +1261,7 @@
PropertyUtils.getSimpleProperty(bean,
"floatProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Float));
+ assertTrue("Got correct type", value instanceof Float);
assertEquals("Got correct value",
((Float) value).floatValue(),
(float) 123.0,
@@ -1311,7 +1311,7 @@
PropertyUtils.getSimpleProperty(bean,
"intProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Integer));
+ assertTrue("Got correct type", value instanceof Integer);
assertEquals("Got correct value",
((Integer) value).intValue(),
123);
@@ -1338,7 +1338,7 @@
PropertyUtils.getSimpleProperty(bean,
"longProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Long));
+ assertTrue("Got correct type", value instanceof Long);
assertEquals("Got correct value",
((Long) value).longValue(),
321);
@@ -1387,7 +1387,7 @@
PropertyUtils.getSimpleProperty(bean,
"shortProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Short));
+ assertTrue("Got correct type", value instanceof Short);
assertEquals("Got correct value",
((Short) value).shortValue(),
(short) 987);
@@ -1414,7 +1414,7 @@
PropertyUtils.getSimpleProperty(bean,
"stringProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof String));
+ assertTrue("Got correct type", value instanceof String);
assertEquals("Got correct value",
(String) value,
"This is a string");
@@ -2642,7 +2642,7 @@
new DynaProperty("stringIndexed", stringArray.getClass()),
new DynaProperty("stringProperty", String.class),
});
- return (dynaClass);
+ return dynaClass;
}
diff --git a/src/test/java/org/apache/commons/beanutils2/DynaResultSetTestCase.java b/src/test/java/org/apache/commons/beanutils2/DynaResultSetTestCase.java
index 0da7a41..09a2f33 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaResultSetTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaResultSetTestCase.java
@@ -97,7 +97,7 @@
*/
public static Test suite() {
- return (new TestSuite(DynaResultSetTestCase.class));
+ return new TestSuite(DynaResultSetTestCase.class);
}
@@ -140,7 +140,7 @@
// Negative test
DynaProperty dynaProp = dynaClass.getDynaProperty("unknownProperty");
assertTrue("unknown property returns null",
- (dynaProp == null));
+ dynaProp == null);
// Positive test
dynaProp = dynaClass.getDynaProperty("stringproperty");
diff --git a/src/test/java/org/apache/commons/beanutils2/DynaRowSetTestCase.java b/src/test/java/org/apache/commons/beanutils2/DynaRowSetTestCase.java
index 23bd651..c673b12 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaRowSetTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaRowSetTestCase.java
@@ -100,7 +100,7 @@
*/
public static Test suite() {
- return (new TestSuite(DynaRowSetTestCase.class));
+ return new TestSuite(DynaRowSetTestCase.class);
}
@@ -143,7 +143,7 @@
// Negative test
DynaProperty dynaProp = dynaClass.getDynaProperty("unknownProperty");
assertTrue("unknown property returns null",
- (dynaProp == null));
+ dynaProp == null);
// Positive test
dynaProp = dynaClass.getDynaProperty("stringproperty");
diff --git a/src/test/java/org/apache/commons/beanutils2/LazyDynaBeanTestCase.java b/src/test/java/org/apache/commons/beanutils2/LazyDynaBeanTestCase.java
index fedd969..345c8c6 100644
--- a/src/test/java/org/apache/commons/beanutils2/LazyDynaBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaBeanTestCase.java
@@ -75,7 +75,7 @@
* Return the tests included in this test suite.
*/
public static Test suite() {
- return (new TestSuite(LazyDynaBeanTestCase.class));
+ return new TestSuite(LazyDynaBeanTestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/LazyDynaClassTestCase.java b/src/test/java/org/apache/commons/beanutils2/LazyDynaClassTestCase.java
index f85582b..73750ca 100644
--- a/src/test/java/org/apache/commons/beanutils2/LazyDynaClassTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaClassTestCase.java
@@ -66,7 +66,7 @@
* Return the tests included in this test suite.
*/
public static Test suite() {
- return (new TestSuite(LazyDynaClassTestCase.class));
+ return new TestSuite(LazyDynaClassTestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java b/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
index 2f2dd9f..c15b47c 100644
--- a/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
@@ -83,7 +83,7 @@
* Return the tests included in this test suite.
*/
public static Test suite() {
- return (new TestSuite(LazyDynaListTestCase.class));
+ return new TestSuite(LazyDynaListTestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java b/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java
index 9e37519..b54ab31 100644
--- a/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java
@@ -74,7 +74,7 @@
* Return the tests included in this test suite.
*/
public static Test suite() {
- return (new TestSuite(LazyDynaMapTestCase.class));
+ return new TestSuite(LazyDynaMapTestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestBean.java b/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestBean.java
index 0b27d45..511a310 100644
--- a/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestBean.java
@@ -48,7 +48,7 @@
}
public void setMappedBoolean(final String key, final boolean value) {
- map.put(key, (value ? Boolean.TRUE : Boolean.FALSE));
+ map.put(key, value ? Boolean.TRUE : Boolean.FALSE);
}
protected String getProtectedMapped(final String key) {
diff --git a/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestCase.java b/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestCase.java
index 05282ee..b222c2f 100644
--- a/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestCase.java
@@ -61,7 +61,7 @@
* Return the tests included in this test suite.
*/
public static Test suite() {
- return (new TestSuite(MappedPropertyTestCase.class));
+ return new TestSuite(MappedPropertyTestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java
index 2de100b..c95af7e 100644
--- a/src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java
@@ -63,7 +63,7 @@
* Return the tests included in this test suite.
*/
public static Test suite() {
- return (new TestSuite(MethodUtilsTestCase.class));
+ return new TestSuite(MethodUtilsTestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/NestedTestBean.java b/src/test/java/org/apache/commons/beanutils2/NestedTestBean.java
index f4c4f0a..5a1185b 100644
--- a/src/test/java/org/apache/commons/beanutils2/NestedTestBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/NestedTestBean.java
@@ -84,7 +84,7 @@
}
public NestedTestBean getIndexedProperty(final int index) {
- return (this.indexedBeans[index]);
+ return this.indexedBeans[index];
}
public void setIndexedProperty(final int index, final NestedTestBean value) {
diff --git a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
index 42e809b..874da38 100644
--- a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
@@ -143,7 +143,7 @@
*/
public static Test suite() {
- return (new TestSuite(PropertyUtilsBenchCase.class));
+ return new TestSuite(PropertyUtilsBenchCase.class);
}
diff --git a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
index 18006d9..46487c8 100644
--- a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
@@ -240,7 +240,7 @@
*/
public static Test suite() {
- return (new TestSuite(PropertyUtilsTestCase.class));
+ return new TestSuite(PropertyUtilsTestCase.class);
}
@@ -1451,7 +1451,7 @@
PropertyUtils.getNestedProperty
(bean, "nested.booleanProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Boolean));
+ assertTrue("Got correct type", value instanceof Boolean);
assertTrue("Got correct value",
((Boolean) value).booleanValue() ==
bean.getNested().getBooleanProperty());
@@ -1478,7 +1478,7 @@
PropertyUtils.getNestedProperty
(bean, "nested.doubleProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Double));
+ assertTrue("Got correct type", value instanceof Double);
assertEquals("Got correct value",
((Double) value).doubleValue(),
bean.getNested().getDoubleProperty(),
@@ -1506,7 +1506,7 @@
PropertyUtils.getNestedProperty
(bean, "nested.floatProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Float));
+ assertTrue("Got correct type", value instanceof Float);
assertEquals("Got correct value",
((Float) value).floatValue(),
bean.getNested().getFloatProperty(),
@@ -1534,7 +1534,7 @@
PropertyUtils.getNestedProperty
(bean, "nested.intProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Integer));
+ assertTrue("Got correct type", value instanceof Integer);
assertEquals("Got correct value",
((Integer) value).intValue(),
bean.getNested().getIntProperty());
@@ -1561,7 +1561,7 @@
PropertyUtils.getNestedProperty
(bean, "nested.longProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Long));
+ assertTrue("Got correct type", value instanceof Long);
assertEquals("Got correct value",
((Long) value).longValue(),
bean.getNested().getLongProperty());
@@ -1588,7 +1588,7 @@
PropertyUtils.getNestedProperty
(bean, "nested.readOnlyProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof String));
+ assertTrue("Got correct type", value instanceof String);
assertEquals("Got correct value",
(String) value,
bean.getReadOnlyProperty());
@@ -1615,7 +1615,7 @@
PropertyUtils.getNestedProperty
(bean, "nested.shortProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Short));
+ assertTrue("Got correct type", value instanceof Short);
assertEquals("Got correct value",
((Short) value).shortValue(),
bean.getNested().getShortProperty());
@@ -1642,9 +1642,9 @@
PropertyUtils.getNestedProperty
(bean, "nested.stringProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof String));
+ assertTrue("Got correct type", value instanceof String);
assertEquals("Got correct value",
- ((String) value),
+ (String) value,
bean.getNested().getStringProperty());
} catch (final IllegalAccessException e) {
fail("IllegalAccessException");
@@ -1984,7 +1984,7 @@
PropertyUtils.getSimpleProperty(bean,
"booleanProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Boolean));
+ assertTrue("Got correct type", value instanceof Boolean);
assertTrue("Got correct value",
((Boolean) value).booleanValue() ==
bean.getBooleanProperty());
@@ -2011,7 +2011,7 @@
PropertyUtils.getSimpleProperty(bean,
"doubleProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Double));
+ assertTrue("Got correct type", value instanceof Double);
assertEquals("Got correct value",
((Double) value).doubleValue(),
bean.getDoubleProperty(), 0.005);
@@ -2038,7 +2038,7 @@
PropertyUtils.getSimpleProperty(bean,
"floatProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Float));
+ assertTrue("Got correct type", value instanceof Float);
assertEquals("Got correct value",
((Float) value).floatValue(),
bean.getFloatProperty(),
@@ -2088,7 +2088,7 @@
PropertyUtils.getSimpleProperty(bean,
"intProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Integer));
+ assertTrue("Got correct type", value instanceof Integer);
assertEquals("Got correct value",
((Integer) value).intValue(),
bean.getIntProperty());
@@ -2115,7 +2115,7 @@
PropertyUtils.getSimpleProperty(bean,
"longProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Long));
+ assertTrue("Got correct type", value instanceof Long);
assertEquals("Got correct value",
((Long) value).longValue(),
bean.getLongProperty());
@@ -2164,7 +2164,7 @@
PropertyUtils.getSimpleProperty(bean,
"readOnlyProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof String));
+ assertTrue("Got correct type", value instanceof String);
assertEquals("Got correct value",
(String) value,
bean.getReadOnlyProperty());
@@ -2191,7 +2191,7 @@
PropertyUtils.getSimpleProperty(bean,
"shortProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof Short));
+ assertTrue("Got correct type", value instanceof Short);
assertEquals("Got correct value",
((Short) value).shortValue(),
bean.getShortProperty());
@@ -2218,7 +2218,7 @@
PropertyUtils.getSimpleProperty(bean,
"stringProperty");
assertNotNull("Got a value", value);
- assertTrue("Got correct type", (value instanceof String));
+ assertTrue("Got correct type", value instanceof String);
assertEquals("Got correct value",
(String) value,
bean.getStringProperty());
@@ -3959,7 +3959,7 @@
try {
final PropertyDescriptor pd =
PropertyUtils.getPropertyDescriptor(bean, name);
- if ((read != null) || (write != null)) {
+ if (read != null || write != null) {
assertNotNull("Got descriptor", pd);
} else {
assertNull("Got descriptor", pd);
diff --git a/src/test/java/org/apache/commons/beanutils2/TestBean.java b/src/test/java/org/apache/commons/beanutils2/TestBean.java
index cfbcc8b..2c47f4b 100644
--- a/src/test/java/org/apache/commons/beanutils2/TestBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/TestBean.java
@@ -112,7 +112,7 @@
private boolean booleanProperty = true;
public boolean getBooleanProperty() {
- return (booleanProperty);
+ return booleanProperty;
}
public void setBooleanProperty(final boolean booleanProperty) {
@@ -126,7 +126,7 @@
private boolean booleanSecond = true;
public boolean isBooleanSecond() {
- return (booleanSecond);
+ return booleanSecond;
}
public void setBooleanSecond(final boolean booleanSecond) {
@@ -140,7 +140,7 @@
private byte byteProperty = (byte) 121;
public byte getByteProperty() {
- return (this.byteProperty);
+ return this.byteProperty;
}
public void setByteProperty(final byte byteProperty) {
@@ -180,7 +180,7 @@
private double doubleProperty = 321.0;
public double getDoubleProperty() {
- return (this.doubleProperty);
+ return this.doubleProperty;
}
public void setDoubleProperty(final double doubleProperty) {
@@ -196,11 +196,11 @@
{ "Dup 0", "Dup 1", "Dup 2", "Dup 3", "Dup 4" };
public String[] getDupProperty() {
- return (this.dupProperty);
+ return this.dupProperty;
}
public String getDupProperty(final int index) {
- return (this.dupProperty[index]);
+ return this.dupProperty[index];
}
public void setDupProperty(final int index, final String value) {
@@ -218,7 +218,7 @@
private float floatProperty = (float) 123.0;
public float getFloatProperty() {
- return (this.floatProperty);
+ return this.floatProperty;
}
public void setFloatProperty(final float floatProperty) {
@@ -232,7 +232,7 @@
private int intArray[] = { 0, 10, 20, 30, 40 };
public int[] getIntArray() {
- return (this.intArray);
+ return this.intArray;
}
public void setIntArray(final int[] intArray) {
@@ -246,7 +246,7 @@
private final int intIndexed[] = { 0, 10, 20, 30, 40 };
public int getIntIndexed(final int index) {
- return (intIndexed[index]);
+ return intIndexed[index];
}
public void setIntIndexed(final int index, final int value) {
@@ -260,7 +260,7 @@
private int intProperty = 123;
public int getIntProperty() {
- return (this.intProperty);
+ return this.intProperty;
}
public void setIntProperty(final int intProperty) {
@@ -274,7 +274,7 @@
private List<Object> listIndexed = new ArrayList<>();
public List<Object> getListIndexed() {
- return (listIndexed);
+ return listIndexed;
}
@@ -284,7 +284,7 @@
private long longProperty = 321;
public long getLongProperty() {
- return (this.longProperty);
+ return this.longProperty;
}
public void setLongProperty(final long longProperty) {
@@ -304,7 +304,7 @@
mapProperty.put("First Key", "First Value");
mapProperty.put("Second Key", "Second Value");
}
- return (mapProperty);
+ return mapProperty;
}
public void setMapProperty(Map<String, Object> mapProperty) {
@@ -330,7 +330,7 @@
mappedObjects.put("First Key", "First Value");
mappedObjects.put("Second Key", "Second Value");
}
- return (mappedObjects.get(key));
+ return mappedObjects.get(key);
}
public void setMappedObjects(final String key, final Object value) {
@@ -356,7 +356,7 @@
mappedProperty.put("First Key", "First Value");
mappedProperty.put("Second Key", "Second Value");
}
- return (mappedProperty.get(key));
+ return mappedProperty.get(key);
}
public void setMappedProperty(final String key, final String value) {
@@ -383,7 +383,7 @@
mappedIntProperty.put("Two", 2);
}
final Integer x = mappedIntProperty.get(key);
- return ((x == null) ? 0 : x.intValue());
+ return x == null ? 0 : x.intValue();
}
public void setMappedIntProperty(final String key, final int value) {
@@ -400,7 +400,7 @@
if (nested == null) {
nested = new TestBean();
}
- return (nested);
+ return nested;
}
/**
@@ -453,7 +453,7 @@
private String nullProperty = null;
public String getNullProperty() {
- return (this.nullProperty);
+ return this.nullProperty;
}
public void setNullProperty(final String nullProperty) {
@@ -467,7 +467,7 @@
private final String readOnlyProperty = "Read Only String Property";
public String getReadOnlyProperty() {
- return (this.readOnlyProperty);
+ return this.readOnlyProperty;
}
@@ -477,7 +477,7 @@
private short shortProperty = (short) 987;
public short getShortProperty() {
- return (this.shortProperty);
+ return this.shortProperty;
}
public void setShortProperty(final short shortProperty) {
@@ -492,7 +492,7 @@
{ "String 0", "String 1", "String 2", "String 3", "String 4" };
public String[] getStringArray() {
- return (this.stringArray);
+ return this.stringArray;
}
public void setStringArray(final String[] stringArray) {
@@ -507,7 +507,7 @@
{ "String 0", "String 1", "String 2", "String 3", "String 4" };
public String getStringIndexed(final int index) {
- return (stringIndexed[index]);
+ return stringIndexed[index];
}
public void setStringIndexed(final int index, final String value) {
@@ -525,7 +525,7 @@
private String stringProperty = "This is a string";
public String getStringProperty() {
- return (this.stringProperty);
+ return this.stringProperty;
}
public void setStringProperty(final String stringProperty) {
@@ -539,7 +539,7 @@
private String writeOnlyProperty = "Write Only String Property";
public String getWriteOnlyPropertyValue() {
- return (this.writeOnlyProperty);
+ return this.writeOnlyProperty;
}
public void setWriteOnlyProperty(final String writeOnlyProperty) {
@@ -559,11 +559,11 @@
private boolean invalidBoolean = false;
public boolean getInvalidBoolean() {
- return (this.invalidBoolean);
+ return this.invalidBoolean;
}
public boolean isInvalidBoolean() {
- return (this.invalidBoolean);
+ return this.invalidBoolean;
}
public void setInvalidBoolean(final String invalidBoolean) {
@@ -593,7 +593,7 @@
*/
public static int currentCounter() {
- return (counter);
+ return counter;
}
diff --git a/src/test/java/org/apache/commons/beanutils2/TestResultSet.java b/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
index c9b7ba3..4b7e5b5 100644
--- a/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
+++ b/src/test/java/org/apache/commons/beanutils2/TestResultSet.java
@@ -135,7 +135,7 @@
} if ("getTimestamp".equals(methodName)) {
return getTimestamp(columnName(args[0]));
} if ("next".equals(methodName)) {
- return (next() ? Boolean.TRUE : Boolean.FALSE);
+ return next() ? Boolean.TRUE : Boolean.FALSE;
} if ("updateObject".equals(methodName)) {
updateObject((String)args[0], args[1]);
return null;
@@ -169,56 +169,56 @@
throw new SQLException("No current row");
}
if ("bigDecimalProperty".equals(columnName)) {
- return (new BigDecimal(123.45));
+ return new BigDecimal(123.45);
} else if ("booleanProperty".equals(columnName)) {
- if ((row % 2) == 0) {
- return (Boolean.TRUE);
+ if (row % 2 == 0) {
+ return Boolean.TRUE;
}
- return (Boolean.FALSE);
+ return Boolean.FALSE;
} else if ("byteProperty".equals(columnName)) {
- return (new Byte((byte) row));
+ return new Byte((byte) row);
} else if ("dateProperty".equals(columnName)) {
- return (new Date(timestamp));
+ return new Date(timestamp);
} else if ("doubleProperty".equals(columnName)) {
- return (new Double(321.0));
+ return new Double(321.0);
} else if ("floatProperty".equals(columnName)) {
- return (new Float((float) 123.0));
+ return new Float((float) 123.0);
} else if ("intProperty".equals(columnName)) {
- return (new Integer(100 + row));
+ return new Integer(100 + row);
} else if ("longProperty".equals(columnName)) {
- return (new Long(200 + row));
+ return new Long(200 + row);
} else if ("nullProperty".equals(columnName)) {
- return (null);
+ return null;
} else if ("shortProperty".equals(columnName)) {
- return (new Short((short) (300 + row)));
+ return new Short((short) (300 + row));
} else if ("stringProperty".equals(columnName)) {
- return ("This is a string");
+ return "This is a string";
} else if ("timeProperty".equals(columnName)) {
- return (new Time(timestamp));
+ return new Time(timestamp);
} else if ("timestampProperty".equals(columnName)) {
- return (new Timestamp(timestamp));
+ return new Timestamp(timestamp);
} else {
throw new SQLException("Unknown column name " + columnName);
}
}
public Date getDate(final String columnName) throws SQLException {
- return (new Date(timestamp));
+ return new Date(timestamp);
}
public Time getTime(final String columnName) throws SQLException {
- return (new Time(timestamp));
+ return new Time(timestamp);
}
public Timestamp getTimestamp(final String columnName) throws SQLException {
- return (new Timestamp(timestamp));
+ return new Timestamp(timestamp);
}
public boolean next() throws SQLException {
if (row++ < 5) {
- return (true);
+ return true;
}
- return (false);
+ return false;
}
diff --git a/src/test/java/org/apache/commons/beanutils2/TestResultSetMetaData.java b/src/test/java/org/apache/commons/beanutils2/TestResultSetMetaData.java
index caa7254..5988e57 100644
--- a/src/test/java/org/apache/commons/beanutils2/TestResultSetMetaData.java
+++ b/src/test/java/org/apache/commons/beanutils2/TestResultSetMetaData.java
@@ -112,16 +112,16 @@
public String getColumnClassName(final int columnIndex) throws SQLException {
- return (metadata[columnIndex - 1][1]);
+ return metadata[columnIndex - 1][1];
}
public int getColumnCount() throws SQLException {
- return (metadata.length);
+ return metadata.length;
}
public String getColumnName(final int columnIndex) throws SQLException {
- return (metadata[columnIndex - 1][0]);
+ return metadata[columnIndex - 1][0];
}
diff --git a/src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java b/src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java
index 14fdc07..75e9fbf 100644
--- a/src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java
@@ -80,7 +80,7 @@
*/
public static Test suite() {
- return (new TestSuite(WrapDynaBeanTestCase.class));
+ return new TestSuite(WrapDynaBeanTestCase.class);
}
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira157TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira157TestCase.java
index a57205e..2686ea9 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira157TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira157TestCase.java
@@ -63,7 +63,7 @@
* @return a test suite
*/
public static Test suite() {
- return (new TestSuite(Jira157TestCase.class));
+ return new TestSuite(Jira157TestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira18TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira18TestCase.java
index 30f9007..a4330fa 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira18TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira18TestCase.java
@@ -62,7 +62,7 @@
* @return a test suite
*/
public static Test suite() {
- return (new TestSuite(Jira18TestCase.class));
+ return new TestSuite(Jira18TestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira273TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira273TestCase.java
index 91d391e..695bfde 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira273TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira273TestCase.java
@@ -60,7 +60,7 @@
* @return a test suite
*/
public static Test suite() {
- return (new TestSuite(Jira273TestCase.class));
+ return new TestSuite(Jira273TestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira298TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira298TestCase.java
index fc89073..cc47a1f 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira298TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira298TestCase.java
@@ -61,7 +61,7 @@
* @return a test suite
*/
public static Test suite() {
- return (new TestSuite(Jira298TestCase.class));
+ return new TestSuite(Jira298TestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira339TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira339TestCase.java
index 436bda0..e436640 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira339TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira339TestCase.java
@@ -61,7 +61,7 @@
* @return a test suite
*/
public static Test suite() {
- return (new TestSuite(Jira339TestCase.class));
+ return new TestSuite(Jira339TestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira345TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira345TestCase.java
index b0e825e..b11aa6d 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira345TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira345TestCase.java
@@ -52,7 +52,7 @@
* @return a test suite
*/
public static Test suite() {
- return (new TestSuite(Jira345TestCase.class));
+ return new TestSuite(Jira345TestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira347TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira347TestCase.java
index 829dddb..a4208cb 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira347TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira347TestCase.java
@@ -110,7 +110,7 @@
try {
long i = 0;
while (true && ref.get() != null) {
- list.add("A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String " + (i++));
+ list.add("A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String " + i++);
}
} catch (final Throwable ignored) {
}
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira349TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira349TestCase.java
index 600eb4d..28c535f 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira349TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira349TestCase.java
@@ -56,7 +56,7 @@
* @return a test suite
*/
public static Test suite() {
- return (new TestSuite(Jira349TestCase.class));
+ return new TestSuite(Jira349TestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira357TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira357TestCase.java
index 4628f03..3693f0b 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira357TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira357TestCase.java
@@ -54,7 +54,7 @@
* @return a test suite
*/
public static Test suite() {
- return (new TestSuite(Jira357TestCase.class));
+ return new TestSuite(Jira357TestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira358TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira358TestCase.java
index 2960e9e..9b664f7 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira358TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira358TestCase.java
@@ -53,7 +53,7 @@
* @return a test suite
*/
public static Test suite() {
- return (new TestSuite(Jira358TestCase.class));
+ return new TestSuite(Jira358TestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira359TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira359TestCase.java
index 6202dcc..483db7a 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira359TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira359TestCase.java
@@ -55,7 +55,7 @@
* @return a test suite
*/
public static Test suite() {
- return (new TestSuite(Jira359TestCase.class));
+ return new TestSuite(Jira359TestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira368TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira368TestCase.java
index 1422a17..34b927e 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira368TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira368TestCase.java
@@ -52,7 +52,7 @@
* @return a test suite
*/
public static Test suite() {
- return (new TestSuite(Jira368TestCase.class));
+ return new TestSuite(Jira368TestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira369TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira369TestCase.java
index c744a73..136adbe 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira369TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira369TestCase.java
@@ -52,7 +52,7 @@
* @return a test suite
*/
public static Test suite() {
- return (new TestSuite(Jira369TestCase.class));
+ return new TestSuite(Jira369TestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira509TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira509TestCase.java
index 95f51a3..e7496d0 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira509TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira509TestCase.java
@@ -44,7 +44,7 @@
public class Jira509TestCase {
protected int random(final int max) {
- return ((int) (Math.random() * 100_000)) % max;
+ return (int) (Math.random() * 100_000) % max;
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira61TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira61TestCase.java
index a9f5ccb..11e9e77 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira61TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira61TestCase.java
@@ -73,7 +73,7 @@
* @return a test suite
*/
public static Test suite() {
- return (new TestSuite(Jira61TestCase.class));
+ return new TestSuite(Jira61TestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira87TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira87TestCase.java
index 5f3ebe1..f700253 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira87TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira87TestCase.java
@@ -67,7 +67,7 @@
* @return a test suite
*/
public static Test suite() {
- return (new TestSuite(Jira87TestCase.class));
+ return new TestSuite(Jira87TestCase.class);
}
/**
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java b/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java
index 18c49ae..263abd8 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestBase.java
@@ -392,12 +392,12 @@
* @param value The value to convert
*/
void validConversion(final Converter converter, final Object expected, final Object value) {
- final String valueType = (value == null ? "null" : value.getClass().getName());
+ final String valueType = value == null ? "null" : value.getClass().getName();
final String msg = "Converting '" + valueType + "' value '" + value + "'";
try {
final Object result = converter.convert(getExpectedType(), value);
- final Class<?> resultType = (result == null ? null : result.getClass());
- final Class<?> expectType = (expected == null ? null : expected.getClass());
+ final Class<?> resultType = result == null ? null : result.getClass();
+ final Class<?> expectType = expected == null ? null : expected.getClass();
assertEquals("TYPE " + msg, expectType, resultType);
assertEquals("VALUE " + msg, expected, result);
} catch (final Exception ex) {
@@ -412,12 +412,12 @@
* @param value The value to convert
*/
void stringConversion(final Converter converter, final String expected, final Object value) {
- final String valueType = (value == null ? "null" : value.getClass().getName());
+ final String valueType = value == null ? "null" : value.getClass().getName();
final String msg = "Converting '" + valueType + "' value '" + value + "' to String";
try {
final Object result = converter.convert(String.class, value);
- final Class<?> resultType = (result == null ? null : result.getClass());
- final Class<?> expectType = (expected == null ? null : expected.getClass());
+ final Class<?> resultType = result == null ? null : result.getClass();
+ final Class<?> expectType = expected == null ? null : expected.getClass();
assertEquals("TYPE " + msg, expectType, resultType);
assertEquals("VALUE " + msg, expected, result);
} catch (final Exception ex) {
@@ -431,7 +431,7 @@
* @param value The value to convert
*/
void invalidConversion(final Converter converter, final Object value) {
- final String valueType = (value == null ? "null" : value.getClass().getName());
+ final String valueType = value == null ? "null" : value.getClass().getName();
final String msg = "Converting '" + valueType + "' value '" + value + "'";
try {
final Object result = converter.convert(getExpectedType(), value);
@@ -463,7 +463,7 @@
Calendar toCalendar(final String value, final String pattern, final Locale locale) {
Calendar calendar = null;
try {
- final DateFormat format = (locale == null)
+ final DateFormat format = locale == null
? new SimpleDateFormat(pattern)
: new SimpleDateFormat(pattern, locale);
format.setLenient(false);
@@ -525,7 +525,7 @@
// didn't include the milliseconds. The following code
// ensures it works consistently accross JDK versions
final java.sql.Timestamp timestamp = (java.sql.Timestamp)date;
- long timeInMillis = ((timestamp.getTime() / 1000) * 1000);
+ long timeInMillis = timestamp.getTime() / 1000 * 1000;
timeInMillis += timestamp.getNanos() / 1000000;
return timeInMillis;
}
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java
index 4fbdf0b..51aa833 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java
@@ -132,17 +132,17 @@
assertEquals(
message[i] + " to Double",
expected[i].doubleValue(),
- (converter.convert(Double.class,input[i])).doubleValue(),
+ converter.convert(Double.class,input[i]).doubleValue(),
0.00001D);
assertEquals(
message[i] + " to double",
expected[i].doubleValue(),
- (converter.convert(Double.TYPE,input[i])).doubleValue(),
+ converter.convert(Double.TYPE,input[i]).doubleValue(),
0.00001D);
assertEquals(
message[i] + " to null type",
expected[i].doubleValue(),
- ((Double)(converter.convert(null,input[i]))).doubleValue(),
+ ((Double)converter.convert(null,input[i])).doubleValue(),
0.00001D);
}
}
diff --git a/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java
index c8ea506..c7f55a6 100644
--- a/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java
@@ -132,17 +132,17 @@
assertEquals(
message[i] + " to Float",
expected[i].floatValue(),
- (converter.convert(Float.class,input[i])).floatValue(),
+ converter.convert(Float.class,input[i]).floatValue(),
0.00001);
assertEquals(
message[i] + " to float",
expected[i].floatValue(),
- (converter.convert(Float.TYPE,input[i])).floatValue(),
+ converter.convert(Float.TYPE,input[i]).floatValue(),
0.00001);
assertEquals(
message[i] + " to null type",
expected[i].floatValue(),
- ((Float)(converter.convert(null,input[i]))).floatValue(),
+ ((Float)converter.convert(null,input[i])).floatValue(),
0.00001);
}
}
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsTestCase.java
index a803ca4..1ed83f6 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanUtilsTestCase.java
@@ -60,7 +60,7 @@
* @return Test Suite
*/
public static Test suite() {
- return (new TestSuite(LocaleBeanUtilsTestCase.class));
+ return new TestSuite(LocaleBeanUtilsTestCase.class);
}
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java b/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java
index da2d06f..f534e0d 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/locale/LocaleBeanificationTestCase.java
@@ -91,7 +91,7 @@
* Return the tests included in this test suite.
*/
public static Test suite() {
- return (new TestSuite(LocaleBeanificationTestCase.class));
+ return new TestSuite(LocaleBeanificationTestCase.class);
}
diff --git a/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java
index 116f607..c7a0ab0 100644
--- a/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java
@@ -86,7 +86,7 @@
* Return the tests included in this test suite.
*/
public static Test suite() {
- return (new TestSuite(LocaleConvertUtilsTestCase.class));
+ return new TestSuite(LocaleConvertUtilsTestCase.class);
}
diff --git a/src/test/java/org/apache/commons/beanutils2/memoryleaktests/MemoryLeakTestCase.java b/src/test/java/org/apache/commons/beanutils2/memoryleaktests/MemoryLeakTestCase.java
index bba62ed..a30752d 100644
--- a/src/test/java/org/apache/commons/beanutils2/memoryleaktests/MemoryLeakTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/memoryleaktests/MemoryLeakTestCase.java
@@ -479,7 +479,7 @@
try {
long i = 0;
while (true && ref.get() != null) {
- list.add("A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String " + (i++));
+ list.add("A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String A Big String " + i++);
}
System.out.println("Count(1) " + count + " : " + getMemoryStats());
} catch (final OutOfMemoryError ignored) {
diff --git a/src/test/java/org/apache/commons/beanutils2/priv/PackageBean.java b/src/test/java/org/apache/commons/beanutils2/priv/PackageBean.java
index cdd2b00..8843d2f 100644
--- a/src/test/java/org/apache/commons/beanutils2/priv/PackageBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/priv/PackageBean.java
@@ -56,7 +56,7 @@
public String getBar() {
- return (this.bar);
+ return this.bar;
}
diff --git a/src/test/java/org/apache/commons/beanutils2/priv/PrivateBean.java b/src/test/java/org/apache/commons/beanutils2/priv/PrivateBean.java
index 1102b67..be63ae6 100644
--- a/src/test/java/org/apache/commons/beanutils2/priv/PrivateBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/priv/PrivateBean.java
@@ -58,7 +58,7 @@
public String getFoo() {
- return (this.foo);
+ return this.foo;
}
@@ -71,7 +71,7 @@
@Override
public String getBar() {
- return (this.bar);
+ return this.bar;
}
@@ -82,7 +82,7 @@
@Override
public String methodBar(final String in) {
- return (in);
+ return in;
}
@@ -95,7 +95,7 @@
@Override
public String getBaz() {
- return (this.baz);
+ return this.baz;
}
@@ -106,7 +106,7 @@
@Override
public String methodBaz(final String in) {
- return (in);
+ return in;
}
diff --git a/src/test/java/org/apache/commons/beanutils2/priv/PrivateBeanFactory.java b/src/test/java/org/apache/commons/beanutils2/priv/PrivateBeanFactory.java
index 04a2038..06452c8 100644
--- a/src/test/java/org/apache/commons/beanutils2/priv/PrivateBeanFactory.java
+++ b/src/test/java/org/apache/commons/beanutils2/priv/PrivateBeanFactory.java
@@ -33,7 +33,7 @@
*/
public static PrivateDirect create() {
- return (new PrivateBean());
+ return new PrivateBean();
}
@@ -43,7 +43,7 @@
*/
public static PrivateDirect createSubclass() {
- return (new PrivateBeanSubclass());
+ return new PrivateBeanSubclass();
}
diff --git a/src/test/java/org/apache/commons/beanutils2/priv/PrivateBeanSubclass.java b/src/test/java/org/apache/commons/beanutils2/priv/PrivateBeanSubclass.java
index 9c6ee07..17cdf14 100644
--- a/src/test/java/org/apache/commons/beanutils2/priv/PrivateBeanSubclass.java
+++ b/src/test/java/org/apache/commons/beanutils2/priv/PrivateBeanSubclass.java
@@ -51,7 +51,7 @@
@Override
public String getBar() {
- return (super.getBar());
+ return super.getBar();
}
diff --git a/src/test/java/org/apache/commons/beanutils2/priv/PublicSubBean.java b/src/test/java/org/apache/commons/beanutils2/priv/PublicSubBean.java
index 9db3890..2485418 100644
--- a/src/test/java/org/apache/commons/beanutils2/priv/PublicSubBean.java
+++ b/src/test/java/org/apache/commons/beanutils2/priv/PublicSubBean.java
@@ -57,7 +57,7 @@
public String getFoo() {
- return (this.foo);
+ return this.foo;
}
