From 77ee866891d10df8ca2e23cec4f4ba367f7eb318 Mon Sep 17 00:00:00 2001 From: Gareth Healy Date: Thu, 6 Jul 2017 20:49:29 +0100 Subject: [PATCH] Cleaned imports (#449) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Import cleanup * Replaced junit.framework with org.junit packages - framework is ‘internal’ --- core/src/main/java/org/dozer/DozerBeanMapper.java | 1 - core/src/main/java/org/dozer/DozerBeanMapperBuilder.java | 1 + .../java/org/dozer/DozerBeanMapperSingletonWrapper.java | 2 -- core/src/main/java/org/dozer/DozerModule.java | 1 + .../main/java/org/dozer/classmap/ClassMapKeyFactory.java | 1 - core/src/main/java/org/dozer/classmap/ClassMappings.java | 1 - core/src/main/java/org/dozer/classmap/DozerClass.java | 4 +--- .../java/org/dozer/converters/JAXBElementConverter.java | 1 - .../org/dozer/converters/PrimitiveOrWrapperConverter.java | 1 - core/src/main/java/org/dozer/fieldmap/HintContainer.java | 1 - core/src/main/java/org/dozer/loader/xml/XMLParser.java | 1 - .../main/java/org/dozer/loader/xml/XMLParserFactory.java | 1 - .../dozer/propertydescriptor/FieldPropertyDescriptor.java | 1 + .../propertydescriptor/JavaBeanPropertyDescriptor.java | 1 - core/src/main/java/org/dozer/util/ReflectionUtils.java | 1 + core/src/test/java/org/dozer/DozerBeanMapperTest.java | 1 - core/src/test/java/org/dozer/DozerInitializerTest.java | 2 +- .../test/java/org/dozer/cache/DozerCacheManagerTest.java | 1 - core/src/test/java/org/dozer/cache/DozerCacheTest.java | 1 - .../java/org/dozer/classmap/ClassMapKeyFactoryTest.java | 1 - core/src/test/java/org/dozer/classmap/ClassMapTest.java | 1 - .../test/java/org/dozer/classmap/ClassMappingsTest.java | 1 - .../org/dozer/classmap/generator/GeneratorUtilsTest.java | 6 ++++-- .../org/dozer/converters/CustomConverterContainerTest.java | 1 - .../dozer/converters/PrimitiveOrWrapperConverterTest.java | 1 - .../test/java/org/dozer/factory/JAXBBeanFactoryTest.java | 1 - core/src/test/java/org/dozer/fieldmap/FieldMapTest.java | 1 - core/src/test/java/org/dozer/fieldmap/MapFieldMapTest.java | 1 - .../org/dozer/functional_tests/AbstractFunctionalTest.java | 1 - .../java/org/dozer/functional_tests/ConstructorTest.java | 7 ++----- .../functional_tests/CustomConverterMapperAwareTest.java | 3 +-- .../InvalidMapping_WithExceptionsLoggedTest.java | 3 ++- .../JAXBBeansMapping_WithExceptionLoggedTest.java | 2 +- .../org/dozer/functional_tests/TopLevelMappingTest.java | 3 +-- .../java/org/dozer/functional_tests/VariablesTest.java | 5 +++-- .../org/dozer/functional_tests/builder/GenericsTest.java | 1 + .../org/dozer/functional_tests/builder/MapMappingTest.java | 3 +-- .../mapperaware/CachingCustomConverterTest.java | 1 + .../test/java/org/dozer/jmx/DozerAdminControllerTest.java | 2 +- .../java/org/dozer/jmx/DozerStatisticsControllerTest.java | 3 ++- core/src/test/java/org/dozer/jmx/JMXPlatformImplTest.java | 4 ++-- .../java/org/dozer/loader/CustomMappingsLoaderTest.java | 1 - .../test/java/org/dozer/loader/MappingsBuilderTest.java | 1 - .../src/test/java/org/dozer/loader/MappingsParserTest.java | 1 - .../test/java/org/dozer/loader/xml/DozerResolverTest.java | 1 - .../java/org/dozer/loader/xml/MappingStreamReaderTest.java | 1 - .../xml/MappingStreamReader_WithExceptionsLoggedTest.java | 1 - .../propertydescriptor/MapPropertyDescriptorTest.java | 1 - .../test/java/org/dozer/stats/StatisticManagerTest.java | 2 +- .../src/test/java/org/dozer/util/MappingValidatorTest.java | 1 - 50 files changed, 29 insertions(+), 57 deletions(-) diff --git a/core/src/main/java/org/dozer/DozerBeanMapper.java b/core/src/main/java/org/dozer/DozerBeanMapper.java index 569975072..2c6e7b1b9 100644 --- a/core/src/main/java/org/dozer/DozerBeanMapper.java +++ b/core/src/main/java/org/dozer/DozerBeanMapper.java @@ -60,7 +60,6 @@ import org.dozer.util.DozerClassLoader; import org.dozer.util.MappingValidator; import org.dozer.util.RuntimeUtils; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/dozer/DozerBeanMapperBuilder.java b/core/src/main/java/org/dozer/DozerBeanMapperBuilder.java index 5c6c82da5..04f285087 100644 --- a/core/src/main/java/org/dozer/DozerBeanMapperBuilder.java +++ b/core/src/main/java/org/dozer/DozerBeanMapperBuilder.java @@ -25,6 +25,7 @@ import java.util.Map; import java.util.function.Supplier; import java.util.stream.Collectors; + import org.dozer.builder.DestBeanBuilderCreator; import org.dozer.classmap.ClassMapBuilder; import org.dozer.classmap.MappingFileData; diff --git a/core/src/main/java/org/dozer/DozerBeanMapperSingletonWrapper.java b/core/src/main/java/org/dozer/DozerBeanMapperSingletonWrapper.java index 37beb5f1d..161c16690 100644 --- a/core/src/main/java/org/dozer/DozerBeanMapperSingletonWrapper.java +++ b/core/src/main/java/org/dozer/DozerBeanMapperSingletonWrapper.java @@ -15,8 +15,6 @@ */ package org.dozer; -import org.dozer.util.DozerConstants; - /** * Public Singleton wrapper for the DozerBeanMapper. Only supports a single mapping file named dozerBeanMapping.xml, so * configuration is very limited. Instead of using the DozerBeanMapperSingletonWrapper, it is recommended that the diff --git a/core/src/main/java/org/dozer/DozerModule.java b/core/src/main/java/org/dozer/DozerModule.java index 0a12f6290..2193f0ab4 100644 --- a/core/src/main/java/org/dozer/DozerModule.java +++ b/core/src/main/java/org/dozer/DozerModule.java @@ -17,6 +17,7 @@ import java.util.Collection; import java.util.Collections; + import org.dozer.builder.BeanBuilderCreationStrategy; import org.dozer.classmap.generator.BeanFieldsDetector; import org.dozer.config.BeanContainer; diff --git a/core/src/main/java/org/dozer/classmap/ClassMapKeyFactory.java b/core/src/main/java/org/dozer/classmap/ClassMapKeyFactory.java index cdbc28658..0fa78e417 100644 --- a/core/src/main/java/org/dozer/classmap/ClassMapKeyFactory.java +++ b/core/src/main/java/org/dozer/classmap/ClassMapKeyFactory.java @@ -16,7 +16,6 @@ package org.dozer.classmap; import org.apache.commons.lang3.StringUtils; - import org.dozer.config.BeanContainer; import org.dozer.util.MappingUtils; diff --git a/core/src/main/java/org/dozer/classmap/ClassMappings.java b/core/src/main/java/org/dozer/classmap/ClassMappings.java index 39fc6daea..c054f158a 100644 --- a/core/src/main/java/org/dozer/classmap/ClassMappings.java +++ b/core/src/main/java/org/dozer/classmap/ClassMappings.java @@ -23,7 +23,6 @@ import java.util.concurrent.ConcurrentMap; import org.apache.commons.lang3.StringUtils; - import org.dozer.config.BeanContainer; import org.dozer.util.MappingUtils; diff --git a/core/src/main/java/org/dozer/classmap/DozerClass.java b/core/src/main/java/org/dozer/classmap/DozerClass.java index 1332fbc0f..1471c50a6 100644 --- a/core/src/main/java/org/dozer/classmap/DozerClass.java +++ b/core/src/main/java/org/dozer/classmap/DozerClass.java @@ -15,10 +15,8 @@ */ package org.dozer.classmap; - import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; - import org.dozer.config.BeanContainer; import org.dozer.util.MappingUtils; @@ -148,4 +146,4 @@ public void setAccessible(Boolean accessible) { public String toString() { return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE); } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/dozer/converters/JAXBElementConverter.java b/core/src/main/java/org/dozer/converters/JAXBElementConverter.java index 270aa52e7..565005479 100644 --- a/core/src/main/java/org/dozer/converters/JAXBElementConverter.java +++ b/core/src/main/java/org/dozer/converters/JAXBElementConverter.java @@ -22,7 +22,6 @@ import org.apache.commons.beanutils.Converter; import org.apache.commons.lang3.StringUtils; - import org.dozer.config.BeanContainer; import org.dozer.util.MappingUtils; import org.dozer.util.ReflectionUtils; diff --git a/core/src/main/java/org/dozer/converters/PrimitiveOrWrapperConverter.java b/core/src/main/java/org/dozer/converters/PrimitiveOrWrapperConverter.java index e55dc2932..08af2068d 100644 --- a/core/src/main/java/org/dozer/converters/PrimitiveOrWrapperConverter.java +++ b/core/src/main/java/org/dozer/converters/PrimitiveOrWrapperConverter.java @@ -33,7 +33,6 @@ import org.apache.commons.beanutils.converters.DoubleConverter; import org.apache.commons.beanutils.converters.FloatConverter; import org.apache.commons.lang3.ClassUtils; - import org.dozer.config.BeanContainer; import org.dozer.util.MappingUtils; diff --git a/core/src/main/java/org/dozer/fieldmap/HintContainer.java b/core/src/main/java/org/dozer/fieldmap/HintContainer.java index 5f81b378d..13c08e90a 100755 --- a/core/src/main/java/org/dozer/fieldmap/HintContainer.java +++ b/core/src/main/java/org/dozer/fieldmap/HintContainer.java @@ -21,7 +21,6 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; - import org.dozer.config.BeanContainer; import org.dozer.util.MappingUtils; diff --git a/core/src/main/java/org/dozer/loader/xml/XMLParser.java b/core/src/main/java/org/dozer/loader/xml/XMLParser.java index c74e12a41..f181cf495 100644 --- a/core/src/main/java/org/dozer/loader/xml/XMLParser.java +++ b/core/src/main/java/org/dozer/loader/xml/XMLParser.java @@ -30,7 +30,6 @@ import org.dozer.loader.DozerBuilder; import org.dozer.loader.MappingsSource; import org.dozer.propertydescriptor.PropertyDescriptorFactory; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/dozer/loader/xml/XMLParserFactory.java b/core/src/main/java/org/dozer/loader/xml/XMLParserFactory.java index e5a084bba..fb7bc699a 100644 --- a/core/src/main/java/org/dozer/loader/xml/XMLParserFactory.java +++ b/core/src/main/java/org/dozer/loader/xml/XMLParserFactory.java @@ -26,7 +26,6 @@ import org.dozer.MappingException; import org.dozer.config.BeanContainer; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/dozer/propertydescriptor/FieldPropertyDescriptor.java b/core/src/main/java/org/dozer/propertydescriptor/FieldPropertyDescriptor.java index 6ff52706c..67c5cd7ee 100644 --- a/core/src/main/java/org/dozer/propertydescriptor/FieldPropertyDescriptor.java +++ b/core/src/main/java/org/dozer/propertydescriptor/FieldPropertyDescriptor.java @@ -17,6 +17,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Type; + import org.dozer.factory.DestBeanCreator; import org.dozer.fieldmap.FieldMap; import org.dozer.fieldmap.HintContainer; diff --git a/core/src/main/java/org/dozer/propertydescriptor/JavaBeanPropertyDescriptor.java b/core/src/main/java/org/dozer/propertydescriptor/JavaBeanPropertyDescriptor.java index f98426949..83761a17a 100644 --- a/core/src/main/java/org/dozer/propertydescriptor/JavaBeanPropertyDescriptor.java +++ b/core/src/main/java/org/dozer/propertydescriptor/JavaBeanPropertyDescriptor.java @@ -19,7 +19,6 @@ import java.lang.reflect.Method; import org.apache.commons.beanutils.PropertyUtils; - import org.dozer.config.BeanContainer; import org.dozer.factory.DestBeanCreator; import org.dozer.fieldmap.HintContainer; diff --git a/core/src/main/java/org/dozer/util/ReflectionUtils.java b/core/src/main/java/org/dozer/util/ReflectionUtils.java index 3021ab06b..68dfb8433 100644 --- a/core/src/main/java/org/dozer/util/ReflectionUtils.java +++ b/core/src/main/java/org/dozer/util/ReflectionUtils.java @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.List; import java.util.StringTokenizer; + import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang3.ClassUtils; import org.apache.commons.lang3.StringUtils; diff --git a/core/src/test/java/org/dozer/DozerBeanMapperTest.java b/core/src/test/java/org/dozer/DozerBeanMapperTest.java index 0ca78a22d..6a359de62 100644 --- a/core/src/test/java/org/dozer/DozerBeanMapperTest.java +++ b/core/src/test/java/org/dozer/DozerBeanMapperTest.java @@ -30,7 +30,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.commons.beanutils.PropertyUtils; - import org.dozer.builder.DestBeanBuilderCreator; import org.dozer.classmap.ClassMapBuilder; import org.dozer.classmap.generator.BeanMappingGenerator; diff --git a/core/src/test/java/org/dozer/DozerInitializerTest.java b/core/src/test/java/org/dozer/DozerInitializerTest.java index b0676a151..f721c26d4 100644 --- a/core/src/test/java/org/dozer/DozerInitializerTest.java +++ b/core/src/test/java/org/dozer/DozerInitializerTest.java @@ -25,10 +25,10 @@ import org.dozer.stats.StatisticsManagerImpl; import org.dozer.util.DefaultClassLoader; import org.dozer.util.DozerConstants; - import org.junit.After; import org.junit.Before; import org.junit.Test; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/core/src/test/java/org/dozer/cache/DozerCacheManagerTest.java b/core/src/test/java/org/dozer/cache/DozerCacheManagerTest.java index c0a80af4c..128ebb178 100644 --- a/core/src/test/java/org/dozer/cache/DozerCacheManagerTest.java +++ b/core/src/test/java/org/dozer/cache/DozerCacheManagerTest.java @@ -21,7 +21,6 @@ import org.dozer.AbstractDozerTest; import org.dozer.MappingException; import org.dozer.stats.StatisticsManager; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/core/src/test/java/org/dozer/cache/DozerCacheTest.java b/core/src/test/java/org/dozer/cache/DozerCacheTest.java index 9ecbc5481..b8ab5170d 100644 --- a/core/src/test/java/org/dozer/cache/DozerCacheTest.java +++ b/core/src/test/java/org/dozer/cache/DozerCacheTest.java @@ -17,7 +17,6 @@ import org.dozer.AbstractDozerTest; import org.dozer.stats.StatisticsManager; - import org.junit.Rule; import org.junit.Test; import org.mockito.Mock; diff --git a/core/src/test/java/org/dozer/classmap/ClassMapKeyFactoryTest.java b/core/src/test/java/org/dozer/classmap/ClassMapKeyFactoryTest.java index b101e9671..a25912beb 100644 --- a/core/src/test/java/org/dozer/classmap/ClassMapKeyFactoryTest.java +++ b/core/src/test/java/org/dozer/classmap/ClassMapKeyFactoryTest.java @@ -17,7 +17,6 @@ import org.dozer.AbstractDozerTest; import org.dozer.config.BeanContainer; - import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/org/dozer/classmap/ClassMapTest.java b/core/src/test/java/org/dozer/classmap/ClassMapTest.java index 903ab2c65..98e60149a 100644 --- a/core/src/test/java/org/dozer/classmap/ClassMapTest.java +++ b/core/src/test/java/org/dozer/classmap/ClassMapTest.java @@ -24,7 +24,6 @@ import org.dozer.fieldmap.FieldMap; import org.dozer.fieldmap.GenericFieldMap; import org.dozer.propertydescriptor.PropertyDescriptorFactory; - import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/org/dozer/classmap/ClassMappingsTest.java b/core/src/test/java/org/dozer/classmap/ClassMappingsTest.java index a109c0ff0..22fba59ef 100644 --- a/core/src/test/java/org/dozer/classmap/ClassMappingsTest.java +++ b/core/src/test/java/org/dozer/classmap/ClassMappingsTest.java @@ -20,7 +20,6 @@ import org.dozer.AbstractDozerTest; import org.dozer.MappingException; import org.dozer.config.BeanContainer; - import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/org/dozer/classmap/generator/GeneratorUtilsTest.java b/core/src/test/java/org/dozer/classmap/generator/GeneratorUtilsTest.java index 79ead9f51..daee77c46 100644 --- a/core/src/test/java/org/dozer/classmap/generator/GeneratorUtilsTest.java +++ b/core/src/test/java/org/dozer/classmap/generator/GeneratorUtilsTest.java @@ -15,13 +15,15 @@ */ package org.dozer.classmap.generator; -import static junit.framework.TestCase.assertFalse; -import static junit.framework.TestCase.assertTrue; + import org.dozer.config.BeanContainer; import org.dozer.functional_tests.runner.ProxyDataObjectInstantiator; import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + /** * @author Dmitry Spikhalskiy * @since 27.11.12 diff --git a/core/src/test/java/org/dozer/converters/CustomConverterContainerTest.java b/core/src/test/java/org/dozer/converters/CustomConverterContainerTest.java index 59620f17a..b464dcb83 100644 --- a/core/src/test/java/org/dozer/converters/CustomConverterContainerTest.java +++ b/core/src/test/java/org/dozer/converters/CustomConverterContainerTest.java @@ -22,7 +22,6 @@ import org.dozer.cache.CacheKeyFactory; import org.dozer.cache.DozerCache; import org.dozer.stats.StatisticsManager; - import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; diff --git a/core/src/test/java/org/dozer/converters/PrimitiveOrWrapperConverterTest.java b/core/src/test/java/org/dozer/converters/PrimitiveOrWrapperConverterTest.java index cb2da1bac..1c1f15385 100644 --- a/core/src/test/java/org/dozer/converters/PrimitiveOrWrapperConverterTest.java +++ b/core/src/test/java/org/dozer/converters/PrimitiveOrWrapperConverterTest.java @@ -32,7 +32,6 @@ import org.dozer.AbstractDozerTest; import org.dozer.config.BeanContainer; - import org.junit.Assert; import org.junit.Test; diff --git a/core/src/test/java/org/dozer/factory/JAXBBeanFactoryTest.java b/core/src/test/java/org/dozer/factory/JAXBBeanFactoryTest.java index 8e393c871..a30477a29 100644 --- a/core/src/test/java/org/dozer/factory/JAXBBeanFactoryTest.java +++ b/core/src/test/java/org/dozer/factory/JAXBBeanFactoryTest.java @@ -18,7 +18,6 @@ import org.dozer.AbstractDozerTest; import org.dozer.MappingException; import org.dozer.config.BeanContainer; - import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/org/dozer/fieldmap/FieldMapTest.java b/core/src/test/java/org/dozer/fieldmap/FieldMapTest.java index 01324e505..02d268e9e 100644 --- a/core/src/test/java/org/dozer/fieldmap/FieldMapTest.java +++ b/core/src/test/java/org/dozer/fieldmap/FieldMapTest.java @@ -27,7 +27,6 @@ import org.dozer.config.BeanContainer; import org.dozer.factory.DestBeanCreator; import org.dozer.propertydescriptor.PropertyDescriptorFactory; - import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/org/dozer/fieldmap/MapFieldMapTest.java b/core/src/test/java/org/dozer/fieldmap/MapFieldMapTest.java index 902cef8ec..8d8cb5db5 100644 --- a/core/src/test/java/org/dozer/fieldmap/MapFieldMapTest.java +++ b/core/src/test/java/org/dozer/fieldmap/MapFieldMapTest.java @@ -21,7 +21,6 @@ import org.dozer.config.BeanContainer; import org.dozer.factory.DestBeanCreator; import org.dozer.propertydescriptor.PropertyDescriptorFactory; - import org.junit.Test; import static org.mockito.Mockito.mock; diff --git a/core/src/test/java/org/dozer/functional_tests/AbstractFunctionalTest.java b/core/src/test/java/org/dozer/functional_tests/AbstractFunctionalTest.java index 2bc965b82..f2c6e100b 100644 --- a/core/src/test/java/org/dozer/functional_tests/AbstractFunctionalTest.java +++ b/core/src/test/java/org/dozer/functional_tests/AbstractFunctionalTest.java @@ -21,7 +21,6 @@ import org.dozer.functional_tests.runner.Proxied; import org.dozer.functional_tests.support.TestDataFactory; import org.dozer.util.DozerConstants; - import org.junit.Before; import org.junit.runner.RunWith; diff --git a/core/src/test/java/org/dozer/functional_tests/ConstructorTest.java b/core/src/test/java/org/dozer/functional_tests/ConstructorTest.java index 57417aa68..718f14f7d 100644 --- a/core/src/test/java/org/dozer/functional_tests/ConstructorTest.java +++ b/core/src/test/java/org/dozer/functional_tests/ConstructorTest.java @@ -21,9 +21,6 @@ import javax.xml.datatype.XMLGregorianCalendar; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertNotSame; - import com.sun.org.apache.xerces.internal.jaxp.datatype.XMLGregorianCalendarImpl; import org.dozer.DozerBeanMapperBuilder; @@ -32,8 +29,8 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; - - +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; /** * @author Dmitry Buzdin diff --git a/core/src/test/java/org/dozer/functional_tests/CustomConverterMapperAwareTest.java b/core/src/test/java/org/dozer/functional_tests/CustomConverterMapperAwareTest.java index c4d2970dc..91fbfb56d 100644 --- a/core/src/test/java/org/dozer/functional_tests/CustomConverterMapperAwareTest.java +++ b/core/src/test/java/org/dozer/functional_tests/CustomConverterMapperAwareTest.java @@ -20,8 +20,6 @@ import java.util.List; import java.util.Map; -import static junit.framework.Assert.assertTrue; - import org.dozer.DozerBeanMapperBuilder; import org.dozer.DozerConverter; import org.dozer.Mapper; @@ -30,6 +28,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * @author dmitry.buzdin diff --git a/core/src/test/java/org/dozer/functional_tests/InvalidMapping_WithExceptionsLoggedTest.java b/core/src/test/java/org/dozer/functional_tests/InvalidMapping_WithExceptionsLoggedTest.java index f2f82b0be..9c826684e 100644 --- a/core/src/test/java/org/dozer/functional_tests/InvalidMapping_WithExceptionsLoggedTest.java +++ b/core/src/test/java/org/dozer/functional_tests/InvalidMapping_WithExceptionsLoggedTest.java @@ -15,7 +15,6 @@ */ package org.dozer.functional_tests; -import static junit.framework.Assert.fail; import org.dozer.MappingException; import org.hamcrest.Matchers; @@ -25,6 +24,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.junit.Assert.fail; + public class InvalidMapping_WithExceptionsLoggedTest extends AbstractFunctionalTest { @Rule diff --git a/core/src/test/java/org/dozer/functional_tests/JAXBBeansMapping_WithExceptionLoggedTest.java b/core/src/test/java/org/dozer/functional_tests/JAXBBeansMapping_WithExceptionLoggedTest.java index 8dfca2b7f..c2aac3632 100644 --- a/core/src/test/java/org/dozer/functional_tests/JAXBBeansMapping_WithExceptionLoggedTest.java +++ b/core/src/test/java/org/dozer/functional_tests/JAXBBeansMapping_WithExceptionLoggedTest.java @@ -15,7 +15,6 @@ */ package org.dozer.functional_tests; -import static junit.framework.Assert.assertTrue; import org.dozer.vo.jaxb.employee.EmployeeType; import org.junit.Before; @@ -25,6 +24,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; public class JAXBBeansMapping_WithExceptionLoggedTest extends AbstractFunctionalTest { diff --git a/core/src/test/java/org/dozer/functional_tests/TopLevelMappingTest.java b/core/src/test/java/org/dozer/functional_tests/TopLevelMappingTest.java index 434716f7b..d89dcad95 100644 --- a/core/src/test/java/org/dozer/functional_tests/TopLevelMappingTest.java +++ b/core/src/test/java/org/dozer/functional_tests/TopLevelMappingTest.java @@ -17,11 +17,10 @@ import java.util.ArrayList; -import static junit.framework.Assert.assertTrue; - import org.junit.Test; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * @author dmitry.buzdin diff --git a/core/src/test/java/org/dozer/functional_tests/VariablesTest.java b/core/src/test/java/org/dozer/functional_tests/VariablesTest.java index 78799a659..58c34fee8 100644 --- a/core/src/test/java/org/dozer/functional_tests/VariablesTest.java +++ b/core/src/test/java/org/dozer/functional_tests/VariablesTest.java @@ -18,12 +18,13 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.Set; -import static junit.framework.Assert.assertNotNull; -import org.dozer.functional_tests.runner.ProxyDataObjectInstantiator; +import org.dozer.functional_tests.runner.ProxyDataObjectInstantiator; import org.junit.Before; import org.junit.Test; + import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** * @author dmitry.buzdin diff --git a/core/src/test/java/org/dozer/functional_tests/builder/GenericsTest.java b/core/src/test/java/org/dozer/functional_tests/builder/GenericsTest.java index 9f88e1b1c..696e6153c 100644 --- a/core/src/test/java/org/dozer/functional_tests/builder/GenericsTest.java +++ b/core/src/test/java/org/dozer/functional_tests/builder/GenericsTest.java @@ -23,6 +23,7 @@ import org.dozer.loader.api.BeanMappingBuilder; import org.junit.Assert; import org.junit.Test; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/core/src/test/java/org/dozer/functional_tests/builder/MapMappingTest.java b/core/src/test/java/org/dozer/functional_tests/builder/MapMappingTest.java index 52c35f1c1..7a524aab5 100644 --- a/core/src/test/java/org/dozer/functional_tests/builder/MapMappingTest.java +++ b/core/src/test/java/org/dozer/functional_tests/builder/MapMappingTest.java @@ -23,8 +23,6 @@ import java.util.Map; import java.util.TreeMap; -import static junit.framework.Assert.assertNotSame; - import org.dozer.DozerBeanMapperBuilder; import org.dozer.Mapper; import org.dozer.classmap.RelationshipType; @@ -36,6 +34,7 @@ import static org.dozer.loader.api.FieldsMappingOptions.collectionStrategy; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotSame; /** * @author Dmitry Buzdin diff --git a/core/src/test/java/org/dozer/functional_tests/mapperaware/CachingCustomConverterTest.java b/core/src/test/java/org/dozer/functional_tests/mapperaware/CachingCustomConverterTest.java index 798ba100e..d72105414 100644 --- a/core/src/test/java/org/dozer/functional_tests/mapperaware/CachingCustomConverterTest.java +++ b/core/src/test/java/org/dozer/functional_tests/mapperaware/CachingCustomConverterTest.java @@ -17,6 +17,7 @@ import java.util.HashSet; import java.util.Set; + import org.dozer.DozerBeanMapperBuilder; import org.dozer.DozerConverter; import org.dozer.Mapper; diff --git a/core/src/test/java/org/dozer/jmx/DozerAdminControllerTest.java b/core/src/test/java/org/dozer/jmx/DozerAdminControllerTest.java index 04715cd6f..b7ad2360c 100644 --- a/core/src/test/java/org/dozer/jmx/DozerAdminControllerTest.java +++ b/core/src/test/java/org/dozer/jmx/DozerAdminControllerTest.java @@ -18,13 +18,13 @@ import org.dozer.AbstractDozerTest; import org.dozer.config.GlobalSettings; import org.dozer.util.DozerConstants; - import org.junit.Rule; import org.junit.Test; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; + import static org.mockito.Mockito.verify; /** diff --git a/core/src/test/java/org/dozer/jmx/DozerStatisticsControllerTest.java b/core/src/test/java/org/dozer/jmx/DozerStatisticsControllerTest.java index cfa8df1e2..51b8efecb 100644 --- a/core/src/test/java/org/dozer/jmx/DozerStatisticsControllerTest.java +++ b/core/src/test/java/org/dozer/jmx/DozerStatisticsControllerTest.java @@ -16,17 +16,18 @@ package org.dozer.jmx; import java.util.Set; + import org.dozer.AbstractDozerTest; import org.dozer.config.GlobalSettings; import org.dozer.stats.StatisticType; import org.dozer.stats.StatisticsManager; - import org.junit.Rule; import org.junit.Test; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; + import static org.mockito.Mockito.verify; /** diff --git a/core/src/test/java/org/dozer/jmx/JMXPlatformImplTest.java b/core/src/test/java/org/dozer/jmx/JMXPlatformImplTest.java index 85cce846d..379296350 100644 --- a/core/src/test/java/org/dozer/jmx/JMXPlatformImplTest.java +++ b/core/src/test/java/org/dozer/jmx/JMXPlatformImplTest.java @@ -16,16 +16,16 @@ package org.dozer.jmx; import java.lang.management.ManagementFactory; + import javax.management.MBeanServer; import javax.management.ObjectName; + import org.dozer.AbstractDozerTest; import org.dozer.config.GlobalSettings; - import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; - import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; diff --git a/core/src/test/java/org/dozer/loader/CustomMappingsLoaderTest.java b/core/src/test/java/org/dozer/loader/CustomMappingsLoaderTest.java index 3e4e35169..400a0bf35 100644 --- a/core/src/test/java/org/dozer/loader/CustomMappingsLoaderTest.java +++ b/core/src/test/java/org/dozer/loader/CustomMappingsLoaderTest.java @@ -31,7 +31,6 @@ import org.dozer.converters.CustomConverterDescription; import org.dozer.factory.DestBeanCreator; import org.dozer.propertydescriptor.PropertyDescriptorFactory; - import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/org/dozer/loader/MappingsBuilderTest.java b/core/src/test/java/org/dozer/loader/MappingsBuilderTest.java index 15c8b7bc1..40feec2a4 100644 --- a/core/src/test/java/org/dozer/loader/MappingsBuilderTest.java +++ b/core/src/test/java/org/dozer/loader/MappingsBuilderTest.java @@ -20,7 +20,6 @@ import org.dozer.config.BeanContainer; import org.dozer.factory.DestBeanCreator; import org.dozer.propertydescriptor.PropertyDescriptorFactory; - import org.junit.Test; /** diff --git a/core/src/test/java/org/dozer/loader/MappingsParserTest.java b/core/src/test/java/org/dozer/loader/MappingsParserTest.java index 9f300155a..a977d2659 100644 --- a/core/src/test/java/org/dozer/loader/MappingsParserTest.java +++ b/core/src/test/java/org/dozer/loader/MappingsParserTest.java @@ -25,7 +25,6 @@ import org.dozer.loader.xml.XMLParser; import org.dozer.loader.xml.XMLParserFactory; import org.dozer.propertydescriptor.PropertyDescriptorFactory; - import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/org/dozer/loader/xml/DozerResolverTest.java b/core/src/test/java/org/dozer/loader/xml/DozerResolverTest.java index 7d80e323b..93c96d347 100644 --- a/core/src/test/java/org/dozer/loader/xml/DozerResolverTest.java +++ b/core/src/test/java/org/dozer/loader/xml/DozerResolverTest.java @@ -19,7 +19,6 @@ import org.dozer.AbstractDozerTest; import org.dozer.config.BeanContainer; - import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/org/dozer/loader/xml/MappingStreamReaderTest.java b/core/src/test/java/org/dozer/loader/xml/MappingStreamReaderTest.java index 7d54ed5e6..ef58dbe13 100644 --- a/core/src/test/java/org/dozer/loader/xml/MappingStreamReaderTest.java +++ b/core/src/test/java/org/dozer/loader/xml/MappingStreamReaderTest.java @@ -22,7 +22,6 @@ import org.dozer.config.BeanContainer; import org.dozer.factory.DestBeanCreator; import org.dozer.propertydescriptor.PropertyDescriptorFactory; - import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/org/dozer/loader/xml/MappingStreamReader_WithExceptionsLoggedTest.java b/core/src/test/java/org/dozer/loader/xml/MappingStreamReader_WithExceptionsLoggedTest.java index 4d84402c4..1e9769f06 100644 --- a/core/src/test/java/org/dozer/loader/xml/MappingStreamReader_WithExceptionsLoggedTest.java +++ b/core/src/test/java/org/dozer/loader/xml/MappingStreamReader_WithExceptionsLoggedTest.java @@ -20,7 +20,6 @@ import org.dozer.config.BeanContainer; import org.dozer.factory.DestBeanCreator; import org.dozer.propertydescriptor.PropertyDescriptorFactory; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/core/src/test/java/org/dozer/propertydescriptor/MapPropertyDescriptorTest.java b/core/src/test/java/org/dozer/propertydescriptor/MapPropertyDescriptorTest.java index d614cc064..574787ddc 100644 --- a/core/src/test/java/org/dozer/propertydescriptor/MapPropertyDescriptorTest.java +++ b/core/src/test/java/org/dozer/propertydescriptor/MapPropertyDescriptorTest.java @@ -22,7 +22,6 @@ import org.dozer.MappingException; import org.dozer.config.BeanContainer; import org.dozer.factory.DestBeanCreator; - import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/org/dozer/stats/StatisticManagerTest.java b/core/src/test/java/org/dozer/stats/StatisticManagerTest.java index 0dea6d141..fdc17abd9 100644 --- a/core/src/test/java/org/dozer/stats/StatisticManagerTest.java +++ b/core/src/test/java/org/dozer/stats/StatisticManagerTest.java @@ -17,9 +17,9 @@ import java.util.HashSet; import java.util.Set; + import org.dozer.AbstractDozerTest; import org.dozer.config.GlobalSettings; - import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; diff --git a/core/src/test/java/org/dozer/util/MappingValidatorTest.java b/core/src/test/java/org/dozer/util/MappingValidatorTest.java index 325f155eb..720ed9c61 100644 --- a/core/src/test/java/org/dozer/util/MappingValidatorTest.java +++ b/core/src/test/java/org/dozer/util/MappingValidatorTest.java @@ -18,7 +18,6 @@ import org.dozer.AbstractDozerTest; import org.dozer.MappingException; import org.dozer.config.BeanContainer; - import org.junit.Test; /**