Cleaned imports (#449)

* Import cleanup * Replaced junit.framework with org.junit packages - framework is ‘internal’
DozerMapper · Jul 6, 2017 · 77ee866 · 77ee866
1 parent 485aff9
commit 77ee866
Show file tree

Hide file tree

Showing 50 changed files with 29 additions and 57 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
   }
-}
+}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -17,6 +17,7 @@
 
 import java.util.HashSet;
 import java.util.Set;
+
 import org.dozer.DozerBeanMapperBuilder;
 import org.dozer.DozerConverter;
 import org.dozer.Mapper;