This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch 1.X in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
commit 6481a40c494da191a65736cdb304f901c3647623 Author: Gary Gregory <[email protected]> AuthorDate: Sun Aug 18 07:30:52 2024 -0400 Organize imports --- src/conf/checkstyle-suppressions.xml | 29 +++++++++ src/conf/checkstyle.xml | 71 ++++++++++++++++++++++ .../apache/commons/beanutils/BeanPredicate.java | 4 +- .../beanutils/BeanPropertyValueChangeClosure.java | 4 +- .../beanutils/BeanToPropertyValueTransformer.java | 4 +- .../converters/AbstractArrayConverter.java | 1 + .../converters/BooleanArrayConverter.java | 1 + .../beanutils/converters/ByteArrayConverter.java | 1 + .../converters/CharacterArrayConverter.java | 1 + .../beanutils/converters/DoubleArrayConverter.java | 1 + .../beanutils/converters/FloatArrayConverter.java | 1 + .../converters/IntegerArrayConverter.java | 1 + .../beanutils/converters/LongArrayConverter.java | 1 + .../beanutils/converters/ShortArrayConverter.java | 1 + .../beanutils/converters/StringArrayConverter.java | 1 + .../converters/BigDecimalLocaleConverter.java | 3 +- .../converters/BigIntegerLocaleConverter.java | 3 +- .../locale/converters/ByteLocaleConverter.java | 6 +- .../locale/converters/DecimalLocaleConverter.java | 8 +-- .../locale/converters/FloatLocaleConverter.java | 6 +- .../locale/converters/IntegerLocaleConverter.java | 6 +- .../locale/converters/LongLocaleConverter.java | 2 +- .../locale/converters/ShortLocaleConverter.java | 3 +- .../locale/converters/StringLocaleConverter.java | 9 +-- .../commons/beanutils/BasicDynaBeanTestCase.java | 3 +- .../commons/beanutils/DynaPropertyTestCase.java | 4 +- .../commons/beanutils/LazyDynaClassTestCase.java | 2 +- .../commons/beanutils/bugs/Jira520TestCase.java | 4 +- .../commons/beanutils/bugs/Jira87TestCase.java | 7 ++- .../converters/BigDecimalConverterTestCase.java | 1 + .../beanutils/converters/MemoryTestCase.java | 7 ++- .../beanutils/locale/LocaleBeanUtilsTestCase.java | 2 +- .../memoryleaktests/MemoryLeakTestCase.java | 7 ++- 33 files changed, 165 insertions(+), 40 deletions(-) diff --git a/src/conf/checkstyle-suppressions.xml b/src/conf/checkstyle-suppressions.xml new file mode 100644 index 00000000..33a1d704 --- /dev/null +++ b/src/conf/checkstyle-suppressions.xml @@ -0,0 +1,29 @@ +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<!DOCTYPE suppressions PUBLIC + "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" + "https://checkstyle.org/dtds/suppressions_1_2.dtd";> +<suppressions> + <!-- Be more lenient on tests. --> + <suppress checks="Javadoc" files=".*[/\\]test[/\\].*" /> + <suppress checks="MultipleStringLiterals" files=".*[/\\]test[/\\].*" /> + <suppress checks="DesignForExtension" files=".*[/\\]test[/\\].*" /> + <suppress checks="LineLength" files=".*[/\\]test[/\\].*" /> + <suppress checks="IllegalCatch" files=".*[/\\]test[/\\].*" /> + <suppress checks="MethodLength" files="(MersenneTwister64|Well44497[ab]|MultiplyWithCarry256)Test" /> +</suppressions> diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml new file mode 100644 index 00000000..9245c01c --- /dev/null +++ b/src/conf/checkstyle.xml @@ -0,0 +1,71 @@ +<?xml version="1.0"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--> + +<!DOCTYPE module PUBLIC + "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" + "https://checkstyle.org/dtds/configuration_1_3.dtd";> + +<!-- commons lang customization of default Checkstyle behavior --> +<module name="Checker"> + <property name="localeLanguage" value="en"/> + <module name="SuppressionFilter"> + <!-- Default property set by maven-checkstyle-plugin --> + <property name="file" value="${checkstyle.suppressions.file}"/> + <property name="optional" value="false"/> + </module> + <module name="JavadocPackage"> + <property name="allowLegacy" value="false"/> + </module> + <module name="FileTabCharacter"> + <property name="fileExtensions" value="java,xml"/> + </module> + <module name="LineLength"> + <property name="max" value="160"/> + </module> + <module name="TreeWalker"> + <module name="ExplicitInitializationCheck" /> + <module name="AvoidStarImport"/> + <module name="RedundantImport"/> + <module name="UnusedImports"/> + <module name="NeedBraces"/> + <module name="JavadocType"> + <property name="scope" value="protected"/> + </module> + <module name="JavadocMethod"> + <property name="accessModifiers" value="protected"/> + </module> + <module name="ImportOrder"> + <property name="option" value="top"/> + <property name="groups" value="java,javax,org"/> + <property name="ordered" value="true"/> + <property name="separated" value="true"/> + </module> + </module> + <!-- Line with trailing spaces --> + <module name="RegexpSingleline"> + <property name="format" value="\s+$"/> + <property name="message" value="Line has trailing spaces."/> + </module> + <!-- @author tags are deprecated --> + <module name="RegexpSingleline"> + <property name="format" value="^\s+\*\s+@author\s" /> + <property name="message" value="Deprecated @author tag" /> + <property name="fileExtensions" value="java" /> + <property name="severity" value="warning" /> + </module> +</module> diff --git a/src/main/java/org/apache/commons/beanutils/BeanPredicate.java b/src/main/java/org/apache/commons/beanutils/BeanPredicate.java index b21df894..a05bcb76 100644 --- a/src/main/java/org/apache/commons/beanutils/BeanPredicate.java +++ b/src/main/java/org/apache/commons/beanutils/BeanPredicate.java @@ -17,12 +17,12 @@ package org.apache.commons.beanutils; +import java.lang.reflect.InvocationTargetException; + import org.apache.commons.collections.Predicate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.lang.reflect.InvocationTargetException; - /** * <p>Predicate implementation that applies the given <code>Predicate</code> * to the result of calling the given property getter. diff --git a/src/main/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosure.java b/src/main/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosure.java index 03f4618d..4d715499 100644 --- a/src/main/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosure.java +++ b/src/main/java/org/apache/commons/beanutils/BeanPropertyValueChangeClosure.java @@ -17,12 +17,12 @@ package org.apache.commons.beanutils; +import java.lang.reflect.InvocationTargetException; + import org.apache.commons.collections.Closure; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.lang.reflect.InvocationTargetException; - /** * <p><code>Closure</code> that sets a property.</p> diff --git a/src/main/java/org/apache/commons/beanutils/BeanToPropertyValueTransformer.java b/src/main/java/org/apache/commons/beanutils/BeanToPropertyValueTransformer.java index b5013196..96d1aa20 100644 --- a/src/main/java/org/apache/commons/beanutils/BeanToPropertyValueTransformer.java +++ b/src/main/java/org/apache/commons/beanutils/BeanToPropertyValueTransformer.java @@ -17,12 +17,12 @@ package org.apache.commons.beanutils; +import java.lang.reflect.InvocationTargetException; + import org.apache.commons.collections.Transformer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.lang.reflect.InvocationTargetException; - /** * <p><code>Transformer</code> that outputs a property value.</p> diff --git a/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java b/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java index 6ede9ca8..1e283eb8 100644 --- a/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java +++ b/src/main/java/org/apache/commons/beanutils/converters/AbstractArrayConverter.java @@ -24,6 +24,7 @@ import java.io.StreamTokenizer; import java.io.StringReader; import java.util.ArrayList; import java.util.List; + import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.Converter; diff --git a/src/main/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java b/src/main/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java index 2cb83721..3c7f0d8f 100644 --- a/src/main/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java +++ b/src/main/java/org/apache/commons/beanutils/converters/BooleanArrayConverter.java @@ -20,6 +20,7 @@ package org.apache.commons.beanutils.converters; import java.util.List; + import org.apache.commons.beanutils.ConversionException; diff --git a/src/main/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java b/src/main/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java index 35e71ab5..3197d869 100644 --- a/src/main/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java +++ b/src/main/java/org/apache/commons/beanutils/converters/ByteArrayConverter.java @@ -20,6 +20,7 @@ package org.apache.commons.beanutils.converters; import java.util.List; + import org.apache.commons.beanutils.ConversionException; diff --git a/src/main/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java b/src/main/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java index aad265cb..14888ce3 100644 --- a/src/main/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java +++ b/src/main/java/org/apache/commons/beanutils/converters/CharacterArrayConverter.java @@ -20,6 +20,7 @@ package org.apache.commons.beanutils.converters; import java.util.List; + import org.apache.commons.beanutils.ConversionException; diff --git a/src/main/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java b/src/main/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java index f6a03583..7061d217 100644 --- a/src/main/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java +++ b/src/main/java/org/apache/commons/beanutils/converters/DoubleArrayConverter.java @@ -20,6 +20,7 @@ package org.apache.commons.beanutils.converters; import java.util.List; + import org.apache.commons.beanutils.ConversionException; diff --git a/src/main/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java b/src/main/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java index 213b1495..b92f6220 100644 --- a/src/main/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java +++ b/src/main/java/org/apache/commons/beanutils/converters/FloatArrayConverter.java @@ -20,6 +20,7 @@ package org.apache.commons.beanutils.converters; import java.util.List; + import org.apache.commons.beanutils.ConversionException; diff --git a/src/main/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java b/src/main/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java index 78db96e4..7dc77320 100644 --- a/src/main/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java +++ b/src/main/java/org/apache/commons/beanutils/converters/IntegerArrayConverter.java @@ -20,6 +20,7 @@ package org.apache.commons.beanutils.converters; import java.util.List; + import org.apache.commons.beanutils.ConversionException; diff --git a/src/main/java/org/apache/commons/beanutils/converters/LongArrayConverter.java b/src/main/java/org/apache/commons/beanutils/converters/LongArrayConverter.java index 25ed223d..5d692946 100644 --- a/src/main/java/org/apache/commons/beanutils/converters/LongArrayConverter.java +++ b/src/main/java/org/apache/commons/beanutils/converters/LongArrayConverter.java @@ -20,6 +20,7 @@ package org.apache.commons.beanutils.converters; import java.util.List; + import org.apache.commons.beanutils.ConversionException; diff --git a/src/main/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java b/src/main/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java index 4524611a..de2cd7db 100644 --- a/src/main/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java +++ b/src/main/java/org/apache/commons/beanutils/converters/ShortArrayConverter.java @@ -20,6 +20,7 @@ package org.apache.commons.beanutils.converters; import java.util.List; + import org.apache.commons.beanutils.ConversionException; diff --git a/src/main/java/org/apache/commons/beanutils/converters/StringArrayConverter.java b/src/main/java/org/apache/commons/beanutils/converters/StringArrayConverter.java index f97b88c7..c0e108fb 100644 --- a/src/main/java/org/apache/commons/beanutils/converters/StringArrayConverter.java +++ b/src/main/java/org/apache/commons/beanutils/converters/StringArrayConverter.java @@ -20,6 +20,7 @@ package org.apache.commons.beanutils.converters; import java.util.List; + import org.apache.commons.beanutils.ConversionException; diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverter.java index 87de4f9b..8d0d9c19 100644 --- a/src/main/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverter.java +++ b/src/main/java/org/apache/commons/beanutils/locale/converters/BigDecimalLocaleConverter.java @@ -17,9 +17,10 @@ package org.apache.commons.beanutils.locale.converters; -import java.util.Locale; import java.math.BigDecimal; import java.text.ParseException; +import java.util.Locale; + import org.apache.commons.beanutils.ConversionException; /** diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverter.java index f7400693..7e5877fb 100644 --- a/src/main/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverter.java +++ b/src/main/java/org/apache/commons/beanutils/locale/converters/BigIntegerLocaleConverter.java @@ -17,9 +17,10 @@ package org.apache.commons.beanutils.locale.converters; -import java.util.Locale; import java.math.BigInteger; import java.text.ParseException; +import java.util.Locale; + import org.apache.commons.beanutils.ConversionException; /** diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverter.java index 0215d95e..f83530f3 100644 --- a/src/main/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverter.java +++ b/src/main/java/org/apache/commons/beanutils/locale/converters/ByteLocaleConverter.java @@ -17,10 +17,10 @@ package org.apache.commons.beanutils.locale.converters; -import org.apache.commons.beanutils.ConversionException; - -import java.util.Locale; import java.text.ParseException; +import java.util.Locale; + +import org.apache.commons.beanutils.ConversionException; /** diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/DecimalLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/DecimalLocaleConverter.java index f5812c95..3adef33f 100644 --- a/src/main/java/org/apache/commons/beanutils/locale/converters/DecimalLocaleConverter.java +++ b/src/main/java/org/apache/commons/beanutils/locale/converters/DecimalLocaleConverter.java @@ -17,14 +17,14 @@ package org.apache.commons.beanutils.locale.converters; -import org.apache.commons.beanutils.locale.BaseLocaleConverter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.text.DecimalFormat; import java.text.ParseException; import java.util.Locale; +import org.apache.commons.beanutils.locale.BaseLocaleConverter; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** * <p>Standard {@link org.apache.commons.beanutils.locale.LocaleConverter} diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverter.java index 253c9a57..067bb091 100644 --- a/src/main/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverter.java +++ b/src/main/java/org/apache/commons/beanutils/locale/converters/FloatLocaleConverter.java @@ -17,10 +17,10 @@ package org.apache.commons.beanutils.locale.converters; -import org.apache.commons.beanutils.ConversionException; - -import java.util.Locale; import java.text.ParseException; +import java.util.Locale; + +import org.apache.commons.beanutils.ConversionException; /** diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverter.java index 4b0e396a..89a2822b 100644 --- a/src/main/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverter.java +++ b/src/main/java/org/apache/commons/beanutils/locale/converters/IntegerLocaleConverter.java @@ -17,10 +17,10 @@ package org.apache.commons.beanutils.locale.converters; -import org.apache.commons.beanutils.ConversionException; - -import java.util.Locale; import java.text.ParseException; +import java.util.Locale; + +import org.apache.commons.beanutils.ConversionException; /** diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverter.java index 8636e902..a103e4eb 100644 --- a/src/main/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverter.java +++ b/src/main/java/org/apache/commons/beanutils/locale/converters/LongLocaleConverter.java @@ -17,8 +17,8 @@ package org.apache.commons.beanutils.locale.converters; -import java.util.Locale; import java.text.ParseException; +import java.util.Locale; /** diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverter.java index 7b5d7021..1f559cc0 100644 --- a/src/main/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverter.java +++ b/src/main/java/org/apache/commons/beanutils/locale/converters/ShortLocaleConverter.java @@ -17,8 +17,9 @@ package org.apache.commons.beanutils.locale.converters; -import java.util.Locale; import java.text.ParseException; +import java.util.Locale; + import org.apache.commons.beanutils.ConversionException; diff --git a/src/main/java/org/apache/commons/beanutils/locale/converters/StringLocaleConverter.java b/src/main/java/org/apache/commons/beanutils/locale/converters/StringLocaleConverter.java index 704fe1ad..001ad6ea 100644 --- a/src/main/java/org/apache/commons/beanutils/locale/converters/StringLocaleConverter.java +++ b/src/main/java/org/apache/commons/beanutils/locale/converters/StringLocaleConverter.java @@ -17,10 +17,6 @@ package org.apache.commons.beanutils.locale.converters; -import org.apache.commons.beanutils.locale.BaseLocaleConverter; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.math.BigDecimal; import java.math.BigInteger; import java.text.DecimalFormat; @@ -30,6 +26,11 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; +import org.apache.commons.beanutils.ConversionException; +import org.apache.commons.beanutils.locale.BaseLocaleConverter; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** * <p>Standard {@link org.apache.commons.beanutils.locale.LocaleConverter} diff --git a/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java b/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java index 6af005ce..7a4b0e61 100644 --- a/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/BasicDynaBeanTestCase.java @@ -23,14 +23,13 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.TestCase; import junit.framework.Test; +import junit.framework.TestCase; import junit.framework.TestSuite; diff --git a/src/test/java/org/apache/commons/beanutils/DynaPropertyTestCase.java b/src/test/java/org/apache/commons/beanutils/DynaPropertyTestCase.java index ffc81fd3..fd5372fe 100644 --- a/src/test/java/org/apache/commons/beanutils/DynaPropertyTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/DynaPropertyTestCase.java @@ -16,12 +16,12 @@ */ package org.apache.commons.beanutils; +import java.util.Collection; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import java.util.Collection; - /** * Test case for {@link DynaProperty}. * diff --git a/src/test/java/org/apache/commons/beanutils/LazyDynaClassTestCase.java b/src/test/java/org/apache/commons/beanutils/LazyDynaClassTestCase.java index 77aa87d4..4497ff4b 100644 --- a/src/test/java/org/apache/commons/beanutils/LazyDynaClassTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/LazyDynaClassTestCase.java @@ -16,8 +16,8 @@ */ package org.apache.commons.beanutils; -import junit.framework.TestCase; import junit.framework.Test; +import junit.framework.TestCase; import junit.framework.TestSuite; /** diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira520TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira520TestCase.java index 597b56df..fc1ac77d 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira520TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira520TestCase.java @@ -16,12 +16,12 @@ */ package org.apache.commons.beanutils.bugs; +import junit.framework.TestCase; + import org.apache.commons.beanutils.AlphaBean; import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.SuppressPropertiesBeanIntrospector; -import junit.framework.TestCase; - /** * Fix CVE: https://nvd.nist.gov/vuln/detail/CVE-2014-0114 * diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira87TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira87TestCase.java index df6ff639..effea75c 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira87TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira87TestCase.java @@ -16,13 +16,14 @@ */ package org.apache.commons.beanutils.bugs; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.beanutils.bugs.other.Jira87BeanFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; /** * Test case for Jiar issue# BEANUTILS-87. diff --git a/src/test/java/org/apache/commons/beanutils/converters/BigDecimalConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/converters/BigDecimalConverterTestCase.java index 5c7eb8a0..9701be0c 100644 --- a/src/test/java/org/apache/commons/beanutils/converters/BigDecimalConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/converters/BigDecimalConverterTestCase.java @@ -20,6 +20,7 @@ package org.apache.commons.beanutils.converters; import java.math.BigDecimal; import junit.framework.TestSuite; + import org.apache.commons.beanutils.Converter; diff --git a/src/test/java/org/apache/commons/beanutils/converters/MemoryTestCase.java b/src/test/java/org/apache/commons/beanutils/converters/MemoryTestCase.java index f08ed3ae..c0d8bfa1 100644 --- a/src/test/java/org/apache/commons/beanutils/converters/MemoryTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/converters/MemoryTestCase.java @@ -17,8 +17,13 @@ package org.apache.commons.beanutils.converters; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import java.lang.ref.WeakReference; -import static org.junit.Assert.*; + import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.beanutils.Converter; import org.junit.Test; diff --git a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTestCase.java index 393e429d..15b9ec73 100644 --- a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTestCase.java @@ -16,8 +16,8 @@ */ package org.apache.commons.beanutils.locale; -import junit.framework.TestCase; import junit.framework.Test; +import junit.framework.TestCase; import junit.framework.TestSuite; import org.apache.commons.beanutils.TestBean; diff --git a/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java b/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java index 575fb034..5904d7f0 100644 --- a/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/memoryleaktests/MemoryLeakTestCase.java @@ -16,6 +16,12 @@ */ package org.apache.commons.beanutils.memoryleaktests; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; + import java.lang.ref.SoftReference; import java.lang.ref.WeakReference; import java.net.MalformedURLException; @@ -36,7 +42,6 @@ import org.apache.commons.beanutils.locale.LocaleConvertUtils; import org.apache.commons.beanutils.locale.converters.IntegerLocaleConverter; import org.junit.Assume; import org.junit.Test; -import static org.junit.Assert.*; /** * Tests BeanUtils memory leaks.
