From 5831e824e14b61f5be8f2e0693b6442b1795a00d Mon Sep 17 00:00:00 2001
From: Andreas Gudian <agudian@apache.org>
Date: Fri, 18 Dec 2015 22:47:03 +0100
Subject: [PATCH] Organize imports to put static imports back on top.

---
 .../testutil/runner/ProcessorSuiteRunner.java |  8 ++++----
 .../AbstractJodaTypeToStringConversion.java   |  4 ++--
 .../BigDecimalToBigIntegerConversion.java     |  4 ++--
 .../BigDecimalToPrimitiveConversion.java      |  4 ++--
 .../BigDecimalToStringConversion.java         |  4 ++--
 .../BigDecimalToWrapperConversion.java        |  4 ++--
 .../BigIntegerToPrimitiveConversion.java      |  4 ++--
 .../BigIntegerToStringConversion.java         |  4 ++--
 .../BigIntegerToWrapperConversion.java        |  4 ++--
 .../ap/internal/conversion/Conversions.java   |  4 ++--
 .../conversion/DateToStringConversion.java    |  6 +++---
 .../conversion/EnumStringConversion.java      |  4 ++--
 .../JodaDateTimeToCalendarConversion.java     |  4 ++--
 .../conversion/JodaTimeToDateConversion.java  |  4 ++--
 .../ap/internal/model/Decorator.java          | 15 ++++++++-------
 .../mapstruct/ap/internal/model/Direct.java   |  8 ++++----
 .../ap/internal/model/EnumMappingMethod.java  |  4 ++--
 .../ap/internal/model/MappingMethod.java      |  6 +++---
 .../ap/internal/model/PropertyMapping.java    | 12 ++++++------
 .../ap/internal/model/ServicesEntry.java      |  6 +++---
 .../ap/internal/model/TypeConversion.java     |  8 ++++----
 .../model/assignment/ArrayCopyWrapper.java    |  6 +++---
 .../internal/model/common/Accessibility.java  |  1 +
 .../common/DateFormatValidatorFactory.java    |  8 ++++----
 .../ap/internal/model/common/TypeFactory.java |  4 ++--
 .../internal/model/source/MethodMatcher.java  |  4 ++--
 .../CalendarToXmlGregorianCalendar.java       |  4 ++--
 .../builtin/DateToXmlGregorianCalendar.java   |  4 ++--
 .../model/source/builtin/JaxbElemToValue.java |  4 ++--
 .../builtin/StringToXmlGregorianCalendar.java |  4 ++--
 .../XmlGregorianCalendarToCalendar.java       |  4 ++--
 .../builtin/XmlGregorianCalendarToDate.java   |  4 ++--
 .../builtin/XmlGregorianCalendarToString.java |  4 ++--
 .../source/selector/InheritanceSelector.java  |  4 ++--
 .../source/selector/SelectionCriteria.java    |  1 +
 .../naming/DefaultAccessorNamingStrategy.java |  1 +
 .../ap/internal/prism/PrismGenerator.java     |  6 +++---
 .../processor/MethodRetrievalProcessor.java   |  5 +++--
 .../ap/internal/util/MapperConfiguration.java | 19 ++++++++++---------
 .../mapstruct/ap/internal/util/Strings.java   |  4 ++--
 .../writer/FreeMarkerModelElementWriter.java  |  4 ++--
 .../writer/ModelIncludeDirective.java         |  4 ++--
 .../DateFormatValidatorFactoryTest.java       | 16 ++++++++--------
 .../common/DefaultConversionContextTest.java  | 18 +++++++++---------
 .../test/abstractclass/AbstractClassTest.java |  4 ++--
 .../generics/GenericsHierarchyTest.java       |  4 ++--
 .../ap/test/array/ArrayMappingTest.java       |  4 ++--
 .../ap/test/bool/BooleanMappingTest.java      |  4 ++--
 .../ap/test/bugs/_289/Issue289Test.java       |  1 +
 .../ap/test/bugs/_374/Issue374Mapper.java     |  1 +
 .../ap/test/bugs/_374/Issue374Test.java       |  4 +++-
 .../ap/test/bugs/_374/Issue374VoidMapper.java |  1 +
 .../SameClassNameInDifferentPackageTest.java  | 10 +++++-----
 .../SameNameForSourceAndTargetCarsMapper.java |  7 +++----
 .../ap/test/bugs/_405/PersonMapper.java       |  1 +
 .../ap/test/bugs/_513/Issue513Test.java       |  1 +
 .../ap/test/bugs/_516/Issue516Test.java       |  1 +
 .../ap/test/bugs/_580/Issue580Test.java       |  4 ++--
 .../ap/test/bugs/_581/SourceTargetMapper.java |  4 ++--
 .../ap/test/bugs/_625/Issue625Test.java       |  4 ++--
 .../ap/test/bugs/_631/Issue631Test.java       |  1 +
 .../ap/test/builtin/BuiltInTest.java          |  5 ++---
 .../builtin/bean/JaxbElementListProperty.java |  3 ++-
 .../mapper/IterableSourceTargetMapper.java    |  5 ++---
 .../builtin/mapper/MapSourceTargetMapper.java |  5 ++---
 .../mapper/SourceTargetWithDateMapper.java    |  2 +-
 .../ap/test/callbacks/CallbackMethodTest.java |  4 ++--
 .../MappingResultPostprocessorTest.java       |  6 +++---
 .../CallbackMethodTypeMatchingTest.java       |  4 ++--
 .../ap/test/collection/adder/AdderTest.java   | 14 ++++++--------
 .../ap/test/collection/adder/PetMapper.java   |  4 ++--
 .../NoSetterCollectionMappingTest.java        |  7 +++----
 .../EmptyItererableMappingMapper.java         |  1 +
 .../erroneous/EmptyMapMappingMapper.java      |  1 +
 .../ErroneousCollectionMappingTest.java       | 10 +++++-----
 ...oneousCollectionNoElementMappingFound.java |  1 +
 .../ErroneousCollectionNoKeyMappingFound.java |  1 +
 ...rroneousCollectionNoValueMappingFound.java |  1 +
 .../forged/CollectionMappingTest.java         |  4 ++--
 .../test/collection/map/MapMappingTest.java   |  7 +++----
 .../collection/map/SourceTargetMapper.java    |  2 +-
 .../test/collection/wildcard/BeanMapper.java  |  2 ++
 .../test/collection/wildcard/CunningPlan.java |  1 +
 ...neousIterableExtendsBoundTargetMapper.java |  1 +
 ...roneousIterableSuperBoundSourceMapper.java |  1 +
 ...ousIterableTypeVarBoundMapperOnMapper.java |  1 +
 ...ousIterableTypeVarBoundMapperOnMethod.java |  1 +
 .../ap/test/collection/wildcard/GoodIdea.java |  1 +
 .../collection/wildcard/WildCardTest.java     | 12 ++++++------
 .../mapstruct/ap/test/complex/CarMapper.java  |  2 +-
 .../test/conversion/SourceTargetMapper.java   |  2 +-
 .../java8time/Java8TimeConversionTest.java    |  4 ++--
 .../jodatime/JodaConversionTest.java          |  4 ++--
 .../nativetypes/BooleanConversionTest.java    |  4 ++--
 .../nativetypes/CharConversionTest.java       |  4 ++--
 .../nativetypes/NumberConversionTest.java     |  4 ++--
 .../string/StringConversionTest.java          |  4 ++--
 .../decorator/jsr330/Jsr330DecoratorTest.java |  4 ++--
 .../decorator/spring/SpringDecoratorTest.java |  4 ++--
 .../test/defaultvalue/DefaultValueTest.java   |  4 ++--
 .../ap/test/dependency/OrderingTest.java      |  4 ++--
 .../destination/DestinationClassNameTest.java |  4 ++--
 .../DestinationPackageNameTest.java           |  4 ++--
 .../ap/test/exceptions/ExceptionTest.java     |  5 +++--
 .../test/exceptions/SourceTargetMapper.java   |  3 ++-
 .../ap/test/generics/GenericsTest.java        |  4 ++--
 .../imports/ConflictingTypesNamesTest.java    |  4 ++--
 .../InheritedMappingMethodTest.java           |  4 ++--
 .../NestedMappingMethodInvocationTest.java    |  2 +-
 .../NestedSourcePropertiesTest.java           | 12 +++++-------
 .../nonvoidsetter/NonVoidSettersTest.java     |  4 ++--
 .../ap/test/nullcheck/NullCheckTest.java      |  1 +
 .../ap/test/nullvaluemapping/CarMapper.java   |  6 +++---
 .../CarMapperSettingOnMapper.java             |  2 +-
 .../NullValueMappingTest.java                 |  4 ++--
 .../ap/test/prism/EnumPrismsTest.java         |  4 ++--
 .../test/references/ReferencedMapperTest.java |  7 +++----
 .../test/references/statics/StaticsTest.java  |  9 +++++----
 .../InheritInverseConfigurationTest.java      |  4 ++--
 .../PrimitiveVsWrappedSelectionTest.java      |  1 +
 .../test/selection/qualifier/FactMapper.java  |  1 +
 .../selection/qualifier/KeyWordMapper.java    |  4 +++-
 .../selection/qualifier/QualifierTest.java    | 15 +++++++++------
 .../annotation/CreateGermanRelease.java       |  1 +
 .../qualifier/annotation/EnglishToGerman.java |  1 +
 .../qualifier/annotation/TitleTranslator.java |  1 +
 .../qualifier/handwritten/Facts.java          |  4 +++-
 .../qualifier/handwritten/PlotWords.java      |  4 +++-
 .../qualifier/handwritten/Titles.java         |  4 +++-
 .../resulttype/FruitFamilyMapper.java         |  1 +
 .../resulttype/InheritanceSelectionTest.java  |  4 ++--
 .../SeveralSourceParametersTest.java          |  4 ++--
 .../source/constants/SourceConstantsTest.java |  4 ++--
 .../expressions/java/SourceTargetMapper.java  |  2 +-
 .../template/InheritConfigurationTest.java    |  4 ++--
 .../test/updatemethods/UpdateMethodsTest.java |  4 ++--
 .../selection/ExternalHandWrittenMapper.java  |  1 +
 .../selection/ExternalSelectionTest.java      |  4 ++--
 .../testutil/runner/CompilingStatement.java   |  4 ++--
 139 files changed, 326 insertions(+), 286 deletions(-)

diff --git a/integrationtest/src/test/java/org/mapstruct/itest/testutil/runner/ProcessorSuiteRunner.java b/integrationtest/src/test/java/org/mapstruct/itest/testutil/runner/ProcessorSuiteRunner.java
index 6ee3d8e97..2f44fdc12 100644
--- a/integrationtest/src/test/java/org/mapstruct/itest/testutil/runner/ProcessorSuiteRunner.java
+++ b/integrationtest/src/test/java/org/mapstruct/itest/testutil/runner/ProcessorSuiteRunner.java
@@ -18,6 +18,10 @@
  */
 package org.mapstruct.itest.testutil.runner;
 
+import static org.apache.maven.it.util.ResourceExtractor.extractResourceToDestination;
+import static org.apache.maven.shared.utils.io.FileUtils.copyURLToFile;
+import static org.apache.maven.shared.utils.io.FileUtils.deleteDirectory;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -46,10 +50,6 @@ import org.mapstruct.itest.testutil.runner.ProcessorSuiteRunner.ProcessorTestCas
 import org.mapstruct.itest.testutil.runner.xml.Toolchains;
 import org.mapstruct.itest.testutil.runner.xml.Toolchains.ProviderDescription;
 
-import static org.apache.maven.it.util.ResourceExtractor.extractResourceToDestination;
-import static org.apache.maven.shared.utils.io.FileUtils.copyURLToFile;
-import static org.apache.maven.shared.utils.io.FileUtils.deleteDirectory;
-
 /**
  * Runner for processor integration tests. Requires the annotation {@link ProcessorSuite} on the test class.
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/conversion/AbstractJodaTypeToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/AbstractJodaTypeToStringConversion.java
index 70942463e..d5b60aee2 100755
--- a/processor/src/main/java/org/mapstruct/ap/internal/conversion/AbstractJodaTypeToStringConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/AbstractJodaTypeToStringConversion.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.internal.conversion;
 
+import static org.mapstruct.ap.internal.util.Collections.asSet;
+
 import java.util.Collections;
 import java.util.Locale;
 import java.util.Set;
@@ -26,8 +28,6 @@ import org.mapstruct.ap.internal.model.common.ConversionContext;
 import org.mapstruct.ap.internal.model.common.Type;
 import org.mapstruct.ap.internal.util.JodaTimeConstants;
 
-import static org.mapstruct.ap.internal.util.Collections.asSet;
-
 /**
  * Base class for conversions between Joda-Time types and String.
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToBigIntegerConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToBigIntegerConversion.java
index d6f8ed660..0e29355b4 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToBigIntegerConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToBigIntegerConversion.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.internal.conversion;
 
+import static org.mapstruct.ap.internal.util.Collections.asSet;
+
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Set;
@@ -25,8 +27,6 @@ import java.util.Set;
 import org.mapstruct.ap.internal.model.common.ConversionContext;
 import org.mapstruct.ap.internal.model.common.Type;
 
-import static org.mapstruct.ap.internal.util.Collections.asSet;
-
 /**
  * Conversion between {@link BigDecimal} and {@link BigInteger}.
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToPrimitiveConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToPrimitiveConversion.java
index 67db380da..326ea198b 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToPrimitiveConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToPrimitiveConversion.java
@@ -18,14 +18,14 @@
  */
 package org.mapstruct.ap.internal.conversion;
 
+import static org.mapstruct.ap.internal.util.Collections.asSet;
+
 import java.math.BigDecimal;
 import java.util.Set;
 
 import org.mapstruct.ap.internal.model.common.ConversionContext;
 import org.mapstruct.ap.internal.model.common.Type;
 
-import static org.mapstruct.ap.internal.util.Collections.asSet;
-
 /**
  * Conversion between {@link BigDecimal} and native number types.
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToStringConversion.java
index 9828eb4b0..8e72600bf 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToStringConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToStringConversion.java
@@ -18,14 +18,14 @@
  */
 package org.mapstruct.ap.internal.conversion;
 
+import static org.mapstruct.ap.internal.util.Collections.asSet;
+
 import java.math.BigDecimal;
 import java.util.Set;
 
 import org.mapstruct.ap.internal.model.common.ConversionContext;
 import org.mapstruct.ap.internal.model.common.Type;
 
-import static org.mapstruct.ap.internal.util.Collections.asSet;
-
 /**
  * Conversion between {@link BigDecimal} and {@link String}.
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToWrapperConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToWrapperConversion.java
index 6982ac65a..064bd5db1 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToWrapperConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigDecimalToWrapperConversion.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.internal.conversion;
 
+import static org.mapstruct.ap.internal.util.Collections.asSet;
+
 import java.math.BigDecimal;
 import java.util.Set;
 
@@ -25,8 +27,6 @@ import org.mapstruct.ap.internal.model.common.ConversionContext;
 import org.mapstruct.ap.internal.model.common.Type;
 import org.mapstruct.ap.internal.util.NativeTypes;
 
-import static org.mapstruct.ap.internal.util.Collections.asSet;
-
 /**
  * Conversion between {@link BigDecimal} and wrappers of native number types.
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToPrimitiveConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToPrimitiveConversion.java
index 69e80e8f3..0d141aed4 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToPrimitiveConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToPrimitiveConversion.java
@@ -18,14 +18,14 @@
  */
 package org.mapstruct.ap.internal.conversion;
 
+import static org.mapstruct.ap.internal.util.Collections.asSet;
+
 import java.math.BigInteger;
 import java.util.Set;
 
 import org.mapstruct.ap.internal.model.common.ConversionContext;
 import org.mapstruct.ap.internal.model.common.Type;
 
-import static org.mapstruct.ap.internal.util.Collections.asSet;
-
 /**
  * Conversion between {@link BigInteger} and native number types.
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToStringConversion.java
index 156354603..2f22affcd 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToStringConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToStringConversion.java
@@ -18,14 +18,14 @@
  */
 package org.mapstruct.ap.internal.conversion;
 
+import static org.mapstruct.ap.internal.util.Collections.asSet;
+
 import java.math.BigInteger;
 import java.util.Set;
 
 import org.mapstruct.ap.internal.model.common.ConversionContext;
 import org.mapstruct.ap.internal.model.common.Type;
 
-import static org.mapstruct.ap.internal.util.Collections.asSet;
-
 /**
  * Conversion between {@link BigInteger} and {@link String}.
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToWrapperConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToWrapperConversion.java
index 9ba2e39b9..90061e782 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToWrapperConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/BigIntegerToWrapperConversion.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.internal.conversion;
 
+import static org.mapstruct.ap.internal.util.Collections.asSet;
+
 import java.math.BigInteger;
 import java.util.Set;
 
@@ -25,8 +27,6 @@ import org.mapstruct.ap.internal.model.common.ConversionContext;
 import org.mapstruct.ap.internal.model.common.Type;
 import org.mapstruct.ap.internal.util.NativeTypes;
 
-import static org.mapstruct.ap.internal.util.Collections.asSet;
-
 /**
  * Conversion between {@link BigInteger} and wrappers of native number types.
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/conversion/Conversions.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/Conversions.java
index 662c4bab3..7e77d5944 100755
--- a/processor/src/main/java/org/mapstruct/ap/internal/conversion/Conversions.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/Conversions.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.internal.conversion;
 
+import static org.mapstruct.ap.internal.conversion.ReverseConversion.reverse;
+
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Calendar;
@@ -32,8 +34,6 @@ import org.mapstruct.ap.internal.model.common.TypeFactory;
 import org.mapstruct.ap.internal.util.JavaTimeConstants;
 import org.mapstruct.ap.internal.util.JodaTimeConstants;
 
-import static org.mapstruct.ap.internal.conversion.ReverseConversion.reverse;
-
 /**
  * Holds built-in {@link ConversionProvider}s such as from {@code int} to {@code String}.
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/conversion/DateToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/DateToStringConversion.java
index 8cba76baa..cfacb7904 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/conversion/DateToStringConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/DateToStringConversion.java
@@ -18,6 +18,9 @@
  */
 package org.mapstruct.ap.internal.conversion;
 
+import static java.util.Arrays.asList;
+import static org.mapstruct.ap.internal.util.Collections.asSet;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Collections;
@@ -28,9 +31,6 @@ import org.mapstruct.ap.internal.model.assignment.Assignment;
 import org.mapstruct.ap.internal.model.common.ConversionContext;
 import org.mapstruct.ap.internal.model.common.Type;
 
-import static java.util.Arrays.asList;
-import static org.mapstruct.ap.internal.util.Collections.asSet;
-
 /**
  * Conversion between {@link String} and {@link Date}.
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/conversion/EnumStringConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/EnumStringConversion.java
index 215e7c466..4a89372a5 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/conversion/EnumStringConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/EnumStringConversion.java
@@ -18,13 +18,13 @@
  */
 package org.mapstruct.ap.internal.conversion;
 
+import static org.mapstruct.ap.internal.util.Collections.asSet;
+
 import java.util.Set;
 
 import org.mapstruct.ap.internal.model.common.ConversionContext;
 import org.mapstruct.ap.internal.model.common.Type;
 
-import static org.mapstruct.ap.internal.util.Collections.asSet;
-
 /**
  * Conversion between {@link String} and {@link Enum} types.
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaDateTimeToCalendarConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaDateTimeToCalendarConversion.java
index ff37151ba..417ad55c9 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaDateTimeToCalendarConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaDateTimeToCalendarConversion.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.internal.conversion;
 
+import static org.mapstruct.ap.internal.util.Collections.asSet;
+
 import java.util.Calendar;
 import java.util.Locale;
 import java.util.Set;
@@ -25,8 +27,6 @@ import java.util.Set;
 import org.mapstruct.ap.internal.model.common.ConversionContext;
 import org.mapstruct.ap.internal.model.common.Type;
 
-import static org.mapstruct.ap.internal.util.Collections.asSet;
-
 /**
  * Conversion between {@code DateTime} and {@link Calendar}.
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaTimeToDateConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaTimeToDateConversion.java
index 8164ce71a..ab92b7fdc 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaTimeToDateConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/JodaTimeToDateConversion.java
@@ -18,14 +18,14 @@
  */
 package org.mapstruct.ap.internal.conversion;
 
+import static org.mapstruct.ap.internal.util.Collections.asSet;
+
 import java.util.Date;
 import java.util.Set;
 
 import org.mapstruct.ap.internal.model.common.ConversionContext;
 import org.mapstruct.ap.internal.model.common.Type;
 
-import static org.mapstruct.ap.internal.util.Collections.asSet;
-
 /**
  * Conversion between the following Joda types and {@link Date}:
  * <ul>
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/Decorator.java b/processor/src/main/java/org/mapstruct/ap/internal/model/Decorator.java
index 454b9b600..08484b0d2 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/Decorator.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/Decorator.java
@@ -18,6 +18,14 @@
  */
 package org.mapstruct.ap.internal.model;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.SortedSet;
+
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.util.Elements;
+
 import org.mapstruct.ap.internal.model.common.Accessibility;
 import org.mapstruct.ap.internal.model.common.Type;
 import org.mapstruct.ap.internal.model.common.TypeFactory;
@@ -25,13 +33,6 @@ import org.mapstruct.ap.internal.option.Options;
 import org.mapstruct.ap.internal.prism.DecoratedWithPrism;
 import org.mapstruct.ap.internal.version.VersionInformation;
 
-import javax.lang.model.element.ElementKind;
-import javax.lang.model.element.TypeElement;
-import javax.lang.model.util.Elements;
-import java.util.Arrays;
-import java.util.List;
-import java.util.SortedSet;
-
 /**
  * Represents a decorator applied to a generated mapper type.
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/Direct.java b/processor/src/main/java/org/mapstruct/ap/internal/model/Direct.java
index a312adf9a..b12e02843 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/Direct.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/Direct.java
@@ -18,14 +18,14 @@
  */
 package org.mapstruct.ap.internal.model;
 
-import org.mapstruct.ap.internal.model.assignment.Assignment;
-import org.mapstruct.ap.internal.model.common.ModelElement;
-import org.mapstruct.ap.internal.model.common.Type;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
+import org.mapstruct.ap.internal.model.assignment.Assignment;
+import org.mapstruct.ap.internal.model.common.ModelElement;
+import org.mapstruct.ap.internal.model.common.Type;
+
 /**
  * Direct Assignment. Just a source reference
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/EnumMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/EnumMappingMethod.java
index 57eca3966..74ab36561 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/EnumMappingMethod.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/EnumMappingMethod.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.internal.model;
 
+import static org.mapstruct.ap.internal.util.Collections.first;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -32,8 +34,6 @@ import org.mapstruct.ap.internal.prism.BeanMappingPrism;
 import org.mapstruct.ap.internal.util.Message;
 import org.mapstruct.ap.internal.util.Strings;
 
-import static org.mapstruct.ap.internal.util.Collections.first;
-
 /**
  * A {@link MappingMethod} which maps one enum type to another, optionally configured by one or more
  * {@link EnumMapping}s.
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/MappingMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/MappingMethod.java
index 4f9705b46..f561ad3a3 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/MappingMethod.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/MappingMethod.java
@@ -18,6 +18,9 @@
  */
 package org.mapstruct.ap.internal.model;
 
+import static org.mapstruct.ap.internal.util.Strings.getSaveVariableName;
+import static org.mapstruct.ap.internal.util.Strings.join;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -30,9 +33,6 @@ import org.mapstruct.ap.internal.model.common.Parameter;
 import org.mapstruct.ap.internal.model.common.Type;
 import org.mapstruct.ap.internal.model.source.Method;
 
-import static org.mapstruct.ap.internal.util.Strings.getSaveVariableName;
-import static org.mapstruct.ap.internal.util.Strings.join;
-
 /**
  * A method implemented or referenced by a {@link Mapper} class.
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/PropertyMapping.java b/processor/src/main/java/org/mapstruct/ap/internal/model/PropertyMapping.java
index 40cbab29f..1d6cd5938 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/PropertyMapping.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/PropertyMapping.java
@@ -18,6 +18,12 @@
  */
 package org.mapstruct.ap.internal.model;
 
+import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.DIRECT;
+import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.MAPPED;
+import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.MAPPED_TYPE_CONVERTED;
+import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.TYPE_CONVERTED;
+import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.TYPE_CONVERTED_MAPPED;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -48,12 +54,6 @@ import org.mapstruct.ap.internal.util.MapperConfiguration;
 import org.mapstruct.ap.internal.util.Message;
 import org.mapstruct.ap.internal.util.Strings;
 
-import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.DIRECT;
-import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.MAPPED;
-import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.MAPPED_TYPE_CONVERTED;
-import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.TYPE_CONVERTED;
-import static org.mapstruct.ap.internal.model.assignment.Assignment.AssignmentType.TYPE_CONVERTED_MAPPED;
-
 /**
  * Represents the mapping between a source and target property, e.g. from {@code String Source#foo} to
  * {@code int Target#bar}. Name and type of source and target property can differ. If they have different types, the
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/ServicesEntry.java b/processor/src/main/java/org/mapstruct/ap/internal/model/ServicesEntry.java
index a22f053e9..026b3a8c4 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/ServicesEntry.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/ServicesEntry.java
@@ -18,12 +18,12 @@
  */
 package org.mapstruct.ap.internal.model;
 
-import org.mapstruct.ap.internal.model.common.ModelElement;
-import org.mapstruct.ap.internal.model.common.Type;
-
 import java.util.Collections;
 import java.util.Set;
 
+import org.mapstruct.ap.internal.model.common.ModelElement;
+import org.mapstruct.ap.internal.model.common.Type;
+
 /**
  * @author Christophe Labouisse on 14/07/2015.
  */
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/TypeConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/model/TypeConversion.java
index f90241e74..8c5969c09 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/TypeConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/TypeConversion.java
@@ -18,14 +18,14 @@
  */
 package org.mapstruct.ap.internal.model;
 
-import org.mapstruct.ap.internal.model.assignment.Assignment;
-import org.mapstruct.ap.internal.model.common.ModelElement;
-import org.mapstruct.ap.internal.model.common.Type;
-
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.mapstruct.ap.internal.model.assignment.Assignment;
+import org.mapstruct.ap.internal.model.common.ModelElement;
+import org.mapstruct.ap.internal.model.common.Type;
+
 /**
  * An inline conversion between source and target type of a mapping.
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/ArrayCopyWrapper.java b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/ArrayCopyWrapper.java
index 41618a8e5..ba41d8bd7 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/ArrayCopyWrapper.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/assignment/ArrayCopyWrapper.java
@@ -18,6 +18,9 @@
  */
 package org.mapstruct.ap.internal.model.assignment;
 
+import static org.mapstruct.ap.internal.util.Strings.decapitalize;
+import static org.mapstruct.ap.internal.util.Strings.getSaveVariableName;
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -26,9 +29,6 @@ import java.util.Set;
 import org.mapstruct.ap.internal.model.common.Type;
 import org.mapstruct.ap.internal.util.Strings;
 
-import static org.mapstruct.ap.internal.util.Strings.decapitalize;
-import static org.mapstruct.ap.internal.util.Strings.getSaveVariableName;
-
 /**
  * Decorates the assignment as a Map or Collection constructor
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/common/Accessibility.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/Accessibility.java
index dead371bc..bb83ebb35 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/common/Accessibility.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/common/Accessibility.java
@@ -19,6 +19,7 @@
 package org.mapstruct.ap.internal.model.common;
 
 import java.util.Set;
+
 import javax.lang.model.element.Modifier;
 
 /**
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/common/DateFormatValidatorFactory.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/DateFormatValidatorFactory.java
index 037494593..df0db07b6 100755
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/common/DateFormatValidatorFactory.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/common/DateFormatValidatorFactory.java
@@ -18,14 +18,14 @@
  */
 package org.mapstruct.ap.internal.model.common;
 
-import org.mapstruct.ap.internal.util.JavaTimeConstants;
-import org.mapstruct.ap.internal.util.JodaTimeConstants;
-import org.mapstruct.ap.internal.util.Message;
-
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;
 
+import org.mapstruct.ap.internal.util.JavaTimeConstants;
+import org.mapstruct.ap.internal.util.JodaTimeConstants;
+import org.mapstruct.ap.internal.util.Message;
+
 /**
  * Factory for {@link DateFormatValidator}. <p> Based on the types of source / target type  a specific {@link
  * DateFormatValidator} will be instantiated. <br /> <ul> <li>Joda Time</li> <li>Java 8 Time and</li>
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/common/TypeFactory.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/TypeFactory.java
index 90e9ce881..9842073dc 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/common/TypeFactory.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/common/TypeFactory.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.internal.model.common;
 
+import static org.mapstruct.ap.internal.util.workarounds.SpecificCompilerWorkarounds.replaceTypeElementIfNecessary;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -57,8 +59,6 @@ import org.mapstruct.ap.internal.prism.TargetTypePrism;
 import org.mapstruct.ap.internal.util.AnnotationProcessingException;
 import org.mapstruct.ap.internal.util.Collections;
 
-import static org.mapstruct.ap.internal.util.workarounds.SpecificCompilerWorkarounds.replaceTypeElementIfNecessary;
-
 /**
  * Factory creating {@link Type} instances.
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/MethodMatcher.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/MethodMatcher.java
index 474cd1a65..ae2940fff 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/source/MethodMatcher.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/MethodMatcher.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.internal.model.source;
 
+import static org.mapstruct.ap.internal.util.Collections.hasNonNullElements;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -38,8 +40,6 @@ import org.mapstruct.ap.internal.model.common.Parameter;
 import org.mapstruct.ap.internal.model.common.Type;
 import org.mapstruct.ap.internal.model.common.TypeFactory;
 
-import static org.mapstruct.ap.internal.util.Collections.hasNonNullElements;
-
 /**
  * SourceMethodMatcher $8.4 of the JavaLanguage specification describes a method body as such:
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/CalendarToXmlGregorianCalendar.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/CalendarToXmlGregorianCalendar.java
index 78093c323..9c3c00235 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/CalendarToXmlGregorianCalendar.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/CalendarToXmlGregorianCalendar.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.internal.model.source.builtin;
 
+import static org.mapstruct.ap.internal.util.Collections.asSet;
+
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.Set;
@@ -30,8 +32,6 @@ import org.mapstruct.ap.internal.model.common.Parameter;
 import org.mapstruct.ap.internal.model.common.Type;
 import org.mapstruct.ap.internal.model.common.TypeFactory;
 
-import static org.mapstruct.ap.internal.util.Collections.asSet;
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/DateToXmlGregorianCalendar.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/DateToXmlGregorianCalendar.java
index d027e89ad..2abf9eff3 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/DateToXmlGregorianCalendar.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/DateToXmlGregorianCalendar.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.internal.model.source.builtin;
 
+import static org.mapstruct.ap.internal.util.Collections.asSet;
+
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Set;
@@ -30,8 +32,6 @@ import org.mapstruct.ap.internal.model.common.Parameter;
 import org.mapstruct.ap.internal.model.common.Type;
 import org.mapstruct.ap.internal.model.common.TypeFactory;
 
-import static org.mapstruct.ap.internal.util.Collections.asSet;
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/JaxbElemToValue.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/JaxbElemToValue.java
index 0f71e8479..fee5163e1 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/JaxbElemToValue.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/JaxbElemToValue.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.internal.model.source.builtin;
 
+import static org.mapstruct.ap.internal.util.Collections.asSet;
+
 import java.util.Set;
 
 import javax.xml.bind.JAXBElement;
@@ -26,8 +28,6 @@ import org.mapstruct.ap.internal.model.common.Parameter;
 import org.mapstruct.ap.internal.model.common.Type;
 import org.mapstruct.ap.internal.model.common.TypeFactory;
 
-import static org.mapstruct.ap.internal.util.Collections.asSet;
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/StringToXmlGregorianCalendar.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/StringToXmlGregorianCalendar.java
index acc71e85b..d53308fd7 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/StringToXmlGregorianCalendar.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/StringToXmlGregorianCalendar.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.internal.model.source.builtin;
 
+import static org.mapstruct.ap.internal.util.Collections.asSet;
+
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -33,8 +35,6 @@ import org.mapstruct.ap.internal.model.common.Parameter;
 import org.mapstruct.ap.internal.model.common.Type;
 import org.mapstruct.ap.internal.model.common.TypeFactory;
 
-import static org.mapstruct.ap.internal.util.Collections.asSet;
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/XmlGregorianCalendarToCalendar.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/XmlGregorianCalendarToCalendar.java
index f9fd517b2..821619aad 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/XmlGregorianCalendarToCalendar.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/XmlGregorianCalendarToCalendar.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.internal.model.source.builtin;
 
+import static org.mapstruct.ap.internal.util.Collections.asSet;
+
 import java.util.Calendar;
 import java.util.Set;
 
@@ -27,8 +29,6 @@ import org.mapstruct.ap.internal.model.common.Parameter;
 import org.mapstruct.ap.internal.model.common.Type;
 import org.mapstruct.ap.internal.model.common.TypeFactory;
 
-import static org.mapstruct.ap.internal.util.Collections.asSet;
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/XmlGregorianCalendarToDate.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/XmlGregorianCalendarToDate.java
index 1a3281f66..8bcd45ee9 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/XmlGregorianCalendarToDate.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/XmlGregorianCalendarToDate.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.internal.model.source.builtin;
 
+import static org.mapstruct.ap.internal.util.Collections.asSet;
+
 import java.util.Date;
 import java.util.Set;
 
@@ -27,8 +29,6 @@ import org.mapstruct.ap.internal.model.common.Parameter;
 import org.mapstruct.ap.internal.model.common.Type;
 import org.mapstruct.ap.internal.model.common.TypeFactory;
 
-import static org.mapstruct.ap.internal.util.Collections.asSet;
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/XmlGregorianCalendarToString.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/XmlGregorianCalendarToString.java
index 6cf6f7a80..faa53705e 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/XmlGregorianCalendarToString.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/builtin/XmlGregorianCalendarToString.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.internal.model.source.builtin;
 
+import static org.mapstruct.ap.internal.util.Collections.asSet;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Set;
@@ -29,8 +31,6 @@ import org.mapstruct.ap.internal.model.common.Parameter;
 import org.mapstruct.ap.internal.model.common.Type;
 import org.mapstruct.ap.internal.model.common.TypeFactory;
 
-import static org.mapstruct.ap.internal.util.Collections.asSet;
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/InheritanceSelector.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/InheritanceSelector.java
index 0356d4330..79db7554c 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/InheritanceSelector.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/InheritanceSelector.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.internal.model.source.selector;
 
+import static org.mapstruct.ap.internal.util.Collections.first;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,8 +27,6 @@ import org.mapstruct.ap.internal.model.common.Parameter;
 import org.mapstruct.ap.internal.model.common.Type;
 import org.mapstruct.ap.internal.model.source.Method;
 
-import static org.mapstruct.ap.internal.util.Collections.first;
-
 /**
  * Selects on inheritance distance, e.g. the amount of inheritance steps from the parameter type.
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/SelectionCriteria.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/SelectionCriteria.java
index 9520d4ad0..a3c65d90a 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/SelectionCriteria.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/selector/SelectionCriteria.java
@@ -19,6 +19,7 @@
 package org.mapstruct.ap.internal.model.source.selector;
 
 import java.util.List;
+
 import javax.lang.model.type.TypeMirror;
 
 /**
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/naming/DefaultAccessorNamingStrategy.java b/processor/src/main/java/org/mapstruct/ap/internal/naming/DefaultAccessorNamingStrategy.java
index b93c06464..84fec1210 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/naming/DefaultAccessorNamingStrategy.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/naming/DefaultAccessorNamingStrategy.java
@@ -19,6 +19,7 @@
 package org.mapstruct.ap.internal.naming;
 
 import java.beans.Introspector;
+
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.DeclaredType;
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/prism/PrismGenerator.java b/processor/src/main/java/org/mapstruct/ap/internal/prism/PrismGenerator.java
index 2c5937aae..df5d71a46 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/prism/PrismGenerator.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/prism/PrismGenerator.java
@@ -20,9 +20,6 @@ package org.mapstruct.ap.internal.prism;
 
 import javax.xml.bind.annotation.XmlElementDecl;
 
-import net.java.dev.hickory.prism.GeneratePrism;
-import net.java.dev.hickory.prism.GeneratePrisms;
-
 import org.mapstruct.AfterMapping;
 import org.mapstruct.BeanMapping;
 import org.mapstruct.BeforeMapping;
@@ -39,6 +36,9 @@ import org.mapstruct.Mappings;
 import org.mapstruct.Qualifier;
 import org.mapstruct.TargetType;
 
+import net.java.dev.hickory.prism.GeneratePrism;
+import net.java.dev.hickory.prism.GeneratePrisms;
+
 /**
  * Triggers the generation of prism types using <a href="https://java.net/projects/hickory">Hickory</a>.
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/processor/MethodRetrievalProcessor.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/MethodRetrievalProcessor.java
index ed8905bce..ee102ca9b 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/processor/MethodRetrievalProcessor.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/MethodRetrievalProcessor.java
@@ -18,11 +18,14 @@
  */
 package org.mapstruct.ap.internal.processor;
 
+import static org.mapstruct.ap.internal.util.Executables.getAllEnclosedExecutableElements;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
@@ -52,8 +55,6 @@ import org.mapstruct.ap.internal.util.FormattingMessager;
 import org.mapstruct.ap.internal.util.MapperConfiguration;
 import org.mapstruct.ap.internal.util.Message;
 
-import static org.mapstruct.ap.internal.util.Executables.getAllEnclosedExecutableElements;
-
 /**
  * A {@link ModelElementProcessor} which retrieves a list of {@link SourceMethod}s
  * representing all the mapping methods of the given bean mapper type as well as
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/util/MapperConfiguration.java b/processor/src/main/java/org/mapstruct/ap/internal/util/MapperConfiguration.java
index e79a6fe8f..51bd3b600 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/util/MapperConfiguration.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/util/MapperConfiguration.java
@@ -18,21 +18,22 @@
  */
 package org.mapstruct.ap.internal.util;
 
-import org.mapstruct.ap.internal.prism.CollectionMappingStrategyPrism;
-import org.mapstruct.ap.internal.prism.MapperConfigPrism;
-import org.mapstruct.ap.internal.prism.MapperPrism;
-import org.mapstruct.ap.internal.prism.MappingInheritanceStrategyPrism;
-import org.mapstruct.ap.internal.prism.NullValueMappingStrategyPrism;
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
 
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
+
+import org.mapstruct.ap.internal.prism.CollectionMappingStrategyPrism;
+import org.mapstruct.ap.internal.prism.MapperConfigPrism;
+import org.mapstruct.ap.internal.prism.MapperPrism;
+import org.mapstruct.ap.internal.prism.MappingInheritanceStrategyPrism;
+import org.mapstruct.ap.internal.prism.NullValueMappingStrategyPrism;
 
 /**
  * Provides an aggregated view to the settings given via {@link org.mapstruct.Mapper} and
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/util/Strings.java b/processor/src/main/java/org/mapstruct/ap/internal/util/Strings.java
index 6288bbc9f..89af7ca3a 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/util/Strings.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/util/Strings.java
@@ -18,13 +18,13 @@
  */
 package org.mapstruct.ap.internal.util;
 
+import static org.mapstruct.ap.internal.util.Collections.asSet;
+
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import static org.mapstruct.ap.internal.util.Collections.asSet;
-
 /**
  * Helper class for dealing with strings.
  *
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/writer/FreeMarkerModelElementWriter.java b/processor/src/main/java/org/mapstruct/ap/internal/writer/FreeMarkerModelElementWriter.java
index d0705b36b..0c4bfa49f 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/writer/FreeMarkerModelElementWriter.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/writer/FreeMarkerModelElementWriter.java
@@ -21,6 +21,8 @@ package org.mapstruct.ap.internal.writer;
 import java.io.Writer;
 import java.util.Map;
 
+import org.mapstruct.ap.internal.writer.Writable.Context;
+
 import freemarker.ext.beans.BeanModel;
 import freemarker.ext.beans.BeansWrapper;
 import freemarker.ext.beans.SimpleMapModel;
@@ -30,8 +32,6 @@ import freemarker.template.TemplateHashModel;
 import freemarker.template.TemplateModel;
 import freemarker.template.TemplateModelException;
 
-import org.mapstruct.ap.internal.writer.Writable.Context;
-
 /**
  * Delegate for writing given {@link Writable}s into a {@link Writer} using
  * FreeMarker templates. Any parameters passed to the
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/writer/ModelIncludeDirective.java b/processor/src/main/java/org/mapstruct/ap/internal/writer/ModelIncludeDirective.java
index 6e5f07f9b..64a4ddab4 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/writer/ModelIncludeDirective.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/writer/ModelIncludeDirective.java
@@ -22,6 +22,8 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.mapstruct.ap.internal.writer.ModelWriter.DefaultModelElementWriterContext;
+
 import freemarker.core.Environment;
 import freemarker.ext.beans.BeanModel;
 import freemarker.template.Configuration;
@@ -30,8 +32,6 @@ import freemarker.template.TemplateDirectiveModel;
 import freemarker.template.TemplateException;
 import freemarker.template.TemplateModel;
 
-import org.mapstruct.ap.internal.writer.ModelWriter.DefaultModelElementWriterContext;
-
 /**
  * A {@link TemplateDirectiveModel} which allows to recursively write a graph of
  * {@link Writable}s, with each element using its own template. Elements are
diff --git a/processor/src/test/java/org/mapstruct/ap/internal/model/common/DateFormatValidatorFactoryTest.java b/processor/src/test/java/org/mapstruct/ap/internal/model/common/DateFormatValidatorFactoryTest.java
index 8403afe57..d2230e953 100755
--- a/processor/src/test/java/org/mapstruct/ap/internal/model/common/DateFormatValidatorFactoryTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/internal/model/common/DateFormatValidatorFactoryTest.java
@@ -18,20 +18,20 @@
  */
 package org.mapstruct.ap.internal.model.common;
 
-import org.junit.Test;
-import org.mapstruct.ap.internal.util.JavaTimeConstants;
-import org.mapstruct.ap.internal.util.JodaTimeConstants;
-import org.mapstruct.ap.testutil.IssueKey;
+import static org.fest.assertions.Assertions.assertThat;
+
+import java.lang.annotation.Annotation;
+import java.util.List;
 
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.type.TypeVisitor;
 
-import java.lang.annotation.Annotation;
-import java.util.List;
-
-import static org.fest.assertions.Assertions.assertThat;
+import org.junit.Test;
+import org.mapstruct.ap.internal.util.JavaTimeConstants;
+import org.mapstruct.ap.internal.util.JodaTimeConstants;
+import org.mapstruct.ap.testutil.IssueKey;
 
 /**
  * Tests for {@link org.mapstruct.ap.internal.model.common.DateFormatValidatorFactory}.
diff --git a/processor/src/test/java/org/mapstruct/ap/internal/model/common/DefaultConversionContextTest.java b/processor/src/test/java/org/mapstruct/ap/internal/model/common/DefaultConversionContextTest.java
index af81303c2..1ffc375e0 100755
--- a/processor/src/test/java/org/mapstruct/ap/internal/model/common/DefaultConversionContextTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/internal/model/common/DefaultConversionContextTest.java
@@ -18,11 +18,10 @@
  */
 package org.mapstruct.ap.internal.model.common;
 
-import org.junit.Test;
-import org.mapstruct.ap.internal.util.FormattingMessager;
-import org.mapstruct.ap.internal.util.JavaTimeConstants;
-import org.mapstruct.ap.internal.util.Message;
-import org.mapstruct.ap.testutil.IssueKey;
+import static org.fest.assertions.Assertions.assertThat;
+
+import java.lang.annotation.Annotation;
+import java.util.List;
 
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.AnnotationValue;
@@ -32,10 +31,11 @@ import javax.lang.model.type.TypeMirror;
 import javax.lang.model.type.TypeVisitor;
 import javax.tools.Diagnostic;
 
-import java.lang.annotation.Annotation;
-import java.util.List;
-
-import static org.fest.assertions.Assertions.assertThat;
+import org.junit.Test;
+import org.mapstruct.ap.internal.util.FormattingMessager;
+import org.mapstruct.ap.internal.util.JavaTimeConstants;
+import org.mapstruct.ap.internal.util.Message;
+import org.mapstruct.ap.testutil.IssueKey;
 
 /**
  * Testing DefaultConversionContext for dateFormat
diff --git a/processor/src/test/java/org/mapstruct/ap/test/abstractclass/AbstractClassTest.java b/processor/src/test/java/org/mapstruct/ap/test/abstractclass/AbstractClassTest.java
index 3ea86580b..63934f7ef 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/abstractclass/AbstractClassTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/abstractclass/AbstractClassTest.java
@@ -18,14 +18,14 @@
  */
 package org.mapstruct.ap.test.abstractclass;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * Test for the generation of implementation of abstract base classes.
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/abstractclass/generics/GenericsHierarchyTest.java b/processor/src/test/java/org/mapstruct/ap/test/abstractclass/generics/GenericsHierarchyTest.java
index f504c28a7..7e1d592c4 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/abstractclass/generics/GenericsHierarchyTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/abstractclass/generics/GenericsHierarchyTest.java
@@ -18,14 +18,14 @@
  */
 package org.mapstruct.ap.test.abstractclass.generics;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * @author Andreas Gudian
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/array/ArrayMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/array/ArrayMappingTest.java
index 392b3a53d..41857ca08 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/array/ArrayMappingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/array/ArrayMappingTest.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.array;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import java.util.Arrays;
 import java.util.List;
 
@@ -29,8 +31,6 @@ import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 @WithClasses( { Scientist.class, ScientistDto.class, ScienceMapper.class } )
 @RunWith(AnnotationProcessorTestRunner.class)
 @IssueKey("108")
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bool/BooleanMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/bool/BooleanMappingTest.java
index efcadb6a5..8d8a89187 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bool/BooleanMappingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bool/BooleanMappingTest.java
@@ -18,13 +18,13 @@
  */
 package org.mapstruct.ap.test.bool;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 @WithClasses({
     Person.class,
     PersonDto.class,
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_289/Issue289Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_289/Issue289Test.java
index 0a6d9ac1c..eda40bdc2 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_289/Issue289Test.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_289/Issue289Test.java
@@ -19,6 +19,7 @@
 package org.mapstruct.ap.test.bugs._289;
 
 import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.testutil.IssueKey;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_374/Issue374Mapper.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_374/Issue374Mapper.java
index 6069f2297..c903cb0c6 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_374/Issue374Mapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_374/Issue374Mapper.java
@@ -20,6 +20,7 @@ package org.mapstruct.ap.test.bugs._374;
 
 import java.util.List;
 import java.util.Map;
+
 import org.mapstruct.BeanMapping;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_374/Issue374Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_374/Issue374Test.java
index 8366e5ed0..efe5b3334 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_374/Issue374Test.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_374/Issue374Test.java
@@ -18,16 +18,18 @@
  */
 package org.mapstruct.ap.test.bugs._374;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
-import static org.fest.assertions.Assertions.assertThat;
 
 /**
  * Reproducer for https://github.com/mapstruct/mapstruct/issues/306.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_374/Issue374VoidMapper.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_374/Issue374VoidMapper.java
index 60ca29d9e..6a7076d33 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_374/Issue374VoidMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_374/Issue374VoidMapper.java
@@ -20,6 +20,7 @@ package org.mapstruct.ap.test.bugs._374;
 
 import java.util.List;
 import java.util.Map;
+
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingTarget;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_394/SameClassNameInDifferentPackageTest.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_394/SameClassNameInDifferentPackageTest.java
index d709ebe04..fc00724ea 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_394/SameClassNameInDifferentPackageTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_394/SameClassNameInDifferentPackageTest.java
@@ -18,6 +18,11 @@
  */
 package org.mapstruct.ap.test.bugs._394;
 
+import static org.fest.assertions.Assertions.assertThat;
+
+import java.util.HashMap;
+import java.util.Map;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.test.bugs._394.source.AnotherCar;
@@ -26,11 +31,6 @@ import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.fest.assertions.Assertions.assertThat;
-
 @WithClasses( {
     SameNameForSourceAndTargetCarsMapper.class,
     Cars.class,
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_394/SameNameForSourceAndTargetCarsMapper.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_394/SameNameForSourceAndTargetCarsMapper.java
index 090200157..b1388b0aa 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_394/SameNameForSourceAndTargetCarsMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_394/SameNameForSourceAndTargetCarsMapper.java
@@ -18,6 +18,9 @@
  */
 package org.mapstruct.ap.test.bugs._394;
 
+import java.util.List;
+
+import org.mapstruct.InheritInverseConfiguration;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Mappings;
@@ -25,10 +28,6 @@ import org.mapstruct.ap.test.bugs._394._target.AnotherCar;
 import org.mapstruct.ap.test.bugs._394.source.Cars;
 import org.mapstruct.factory.Mappers;
 
-import java.util.List;
-
-import org.mapstruct.InheritInverseConfiguration;
-
 @Mapper
 public interface SameNameForSourceAndTargetCarsMapper {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_405/PersonMapper.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_405/PersonMapper.java
index 1ce8ac07d..2389d991a 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_405/PersonMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_405/PersonMapper.java
@@ -20,6 +20,7 @@ package org.mapstruct.ap.test.bugs._405;
 
 import java.util.List;
 import java.util.Map;
+
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Mappings;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/Issue513Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/Issue513Test.java
index 39d809e94..fe7be8760 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/Issue513Test.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_513/Issue513Test.java
@@ -20,6 +20,7 @@ package org.mapstruct.ap.test.bugs._513;
 
 import java.util.Arrays;
 import java.util.HashMap;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.testutil.IssueKey;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_516/Issue516Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_516/Issue516Test.java
index 27f141373..ca3af8c33 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_516/Issue516Test.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_516/Issue516Test.java
@@ -19,6 +19,7 @@
 package org.mapstruct.ap.test.bugs._516;
 
 import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.testutil.IssueKey;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_580/Issue580Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_580/Issue580Test.java
index 116a165ec..cd70a1a18 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_580/Issue580Test.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_580/Issue580Test.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.bugs._580;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import java.time.LocalDate;
 
 import javax.xml.datatype.DatatypeConstants;
@@ -33,8 +35,6 @@ import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * @author Andreas Gudian
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_581/SourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_581/SourceTargetMapper.java
index 1f3c664aa..e0448667f 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_581/SourceTargetMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_581/SourceTargetMapper.java
@@ -18,12 +18,12 @@
  */
 package org.mapstruct.ap.test.bugs._581;
 
+import java.util.List;
+
 import org.mapstruct.Mapper;
 import org.mapstruct.ap.test.bugs._581.source.Car;
 import org.mapstruct.factory.Mappers;
 
-import java.util.List;
-
 @Mapper
 public interface SourceTargetMapper {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_625/Issue625Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_625/Issue625Test.java
index 3a1b172fb..daf3c299a 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_625/Issue625Test.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_625/Issue625Test.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.bugs._625;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.testutil.IssueKey;
@@ -25,8 +27,6 @@ import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 import org.mapstruct.factory.Mappers;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * @author Andreas Gudian
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_631/Issue631Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_631/Issue631Test.java
index a73f764c0..5f56433c7 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/bugs/_631/Issue631Test.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_631/Issue631Test.java
@@ -20,6 +20,7 @@ package org.mapstruct.ap.test.bugs._631;
 
 
 import javax.tools.Diagnostic.Kind;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.testutil.IssueKey;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/builtin/BuiltInTest.java b/processor/src/test/java/org/mapstruct/ap/test/builtin/BuiltInTest.java
index 248f3569f..8ddacc385 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builtin/BuiltInTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builtin/BuiltInTest.java
@@ -18,7 +18,7 @@
  */
 package org.mapstruct.ap.test.builtin;
 
-import org.mapstruct.ap.test.builtin.mapper.ErroneousSourceTargetWithSqlDateMapper;
+import static org.fest.assertions.Assertions.assertThat;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -58,6 +58,7 @@ import org.mapstruct.ap.test.builtin.mapper.CalendarToStringMapper;
 import org.mapstruct.ap.test.builtin.mapper.CalendarToXmlGregCalMapper;
 import org.mapstruct.ap.test.builtin.mapper.DateToCalendarMapper;
 import org.mapstruct.ap.test.builtin.mapper.DateToXmlGregCalMapper;
+import org.mapstruct.ap.test.builtin.mapper.ErroneousSourceTargetWithSqlDateMapper;
 import org.mapstruct.ap.test.builtin.mapper.IterableSourceTargetMapper;
 import org.mapstruct.ap.test.builtin.mapper.JaxbListMapper;
 import org.mapstruct.ap.test.builtin.mapper.JaxbMapper;
@@ -78,8 +79,6 @@ import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic;
 import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * Test for the generation of built-in mapping methods.
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/JaxbElementListProperty.java b/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/JaxbElementListProperty.java
index c251bb34a..db0b19c9f 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/JaxbElementListProperty.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builtin/bean/JaxbElementListProperty.java
@@ -18,9 +18,10 @@
  */
 package org.mapstruct.ap.test.builtin.bean;
 
-import javax.xml.bind.JAXBElement;
 import java.util.List;
 
+import javax.xml.bind.JAXBElement;
+
 public class JaxbElementListProperty {
 
     private List<JAXBElement<String>> prop;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/builtin/mapper/IterableSourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/builtin/mapper/IterableSourceTargetMapper.java
index 0c697f6c6..4ca975315 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builtin/mapper/IterableSourceTargetMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builtin/mapper/IterableSourceTargetMapper.java
@@ -18,15 +18,14 @@
  */
 package org.mapstruct.ap.test.builtin.mapper;
 
-import org.mapstruct.ap.test.builtin._target.IterableTarget;
-import org.mapstruct.ap.test.builtin.source.IterableSource;
-
 import java.util.List;
 
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.mapstruct.IterableMapping;
 import org.mapstruct.Mapper;
+import org.mapstruct.ap.test.builtin._target.IterableTarget;
+import org.mapstruct.ap.test.builtin.source.IterableSource;
 import org.mapstruct.factory.Mappers;
 
 @Mapper
diff --git a/processor/src/test/java/org/mapstruct/ap/test/builtin/mapper/MapSourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/builtin/mapper/MapSourceTargetMapper.java
index a1a46567f..66ab1c216 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builtin/mapper/MapSourceTargetMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builtin/mapper/MapSourceTargetMapper.java
@@ -18,15 +18,14 @@
  */
 package org.mapstruct.ap.test.builtin.mapper;
 
-import org.mapstruct.ap.test.builtin._target.MapTarget;
-import org.mapstruct.ap.test.builtin.source.MapSource;
-
 import java.util.Map;
 
 import javax.xml.bind.JAXBElement;
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.mapstruct.Mapper;
+import org.mapstruct.ap.test.builtin._target.MapTarget;
+import org.mapstruct.ap.test.builtin.source.MapSource;
 import org.mapstruct.factory.Mappers;
 
 @Mapper
diff --git a/processor/src/test/java/org/mapstruct/ap/test/builtin/mapper/SourceTargetWithDateMapper.java b/processor/src/test/java/org/mapstruct/ap/test/builtin/mapper/SourceTargetWithDateMapper.java
index d4e339cf5..04222482d 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builtin/mapper/SourceTargetWithDateMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builtin/mapper/SourceTargetWithDateMapper.java
@@ -18,9 +18,9 @@
  */
 package org.mapstruct.ap.test.builtin.mapper;
 
+import org.mapstruct.Mapper;
 import org.mapstruct.ap.test.builtin._target.TargetWithDate;
 import org.mapstruct.ap.test.builtin.source.SourceWithDate;
-import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
 /**
diff --git a/processor/src/test/java/org/mapstruct/ap/test/callbacks/CallbackMethodTest.java b/processor/src/test/java/org/mapstruct/ap/test/callbacks/CallbackMethodTest.java
index cd65ddcc3..506322214 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/callbacks/CallbackMethodTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/callbacks/CallbackMethodTest.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.callbacks;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -34,8 +36,6 @@ import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * Test for callback methods that are defined using {@link BeforeMapping} / {@link AfterMapping}
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/callbacks/ongeneratedmethods/MappingResultPostprocessorTest.java b/processor/src/test/java/org/mapstruct/ap/test/callbacks/ongeneratedmethods/MappingResultPostprocessorTest.java
index 497ed7964..ee544976f 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/callbacks/ongeneratedmethods/MappingResultPostprocessorTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/callbacks/ongeneratedmethods/MappingResultPostprocessorTest.java
@@ -18,16 +18,16 @@
  */
 package org.mapstruct.ap.test.callbacks.ongeneratedmethods;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import java.util.Arrays;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
 import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/callbacks/typematching/CallbackMethodTypeMatchingTest.java b/processor/src/test/java/org/mapstruct/ap/test/callbacks/typematching/CallbackMethodTypeMatchingTest.java
index f05fb8138..00cac8c4f 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/callbacks/typematching/CallbackMethodTypeMatchingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/callbacks/typematching/CallbackMethodTypeMatchingTest.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.callbacks.typematching;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.test.callbacks.typematching.CarMapper.CarDto;
@@ -25,8 +27,6 @@ import org.mapstruct.ap.test.callbacks.typematching.CarMapper.CarEntity;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * @author Andreas Gudian
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/adder/AdderTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/adder/AdderTest.java
index 50687e6ee..deb3928c1 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/adder/AdderTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/adder/AdderTest.java
@@ -18,11 +18,13 @@
  */
 package org.mapstruct.ap.test.collection.adder;
 
+import static org.fest.assertions.Assertions.assertThat;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.test.collection.adder._target.AdderUsageObserver;
@@ -36,19 +38,15 @@ import org.mapstruct.ap.test.collection.adder._target.TargetHuman;
 import org.mapstruct.ap.test.collection.adder._target.TargetOnlyGetter;
 import org.mapstruct.ap.test.collection.adder._target.TargetViaTargetType;
 import org.mapstruct.ap.test.collection.adder._target.TargetWithoutSetter;
+import org.mapstruct.ap.test.collection.adder.source.Foo;
 import org.mapstruct.ap.test.collection.adder.source.SingleElementSource;
 import org.mapstruct.ap.test.collection.adder.source.Source;
+import org.mapstruct.ap.test.collection.adder.source.Source2;
 import org.mapstruct.ap.test.collection.adder.source.SourceTeeth;
 import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.mapstruct.ap.test.collection.adder.source.Foo;
-import org.mapstruct.ap.test.collection.adder.source.Source2;
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/adder/PetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/collection/adder/PetMapper.java
index 0f53407ec..4ac5e2fa0 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/adder/PetMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/adder/PetMapper.java
@@ -22,13 +22,13 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import com.google.common.collect.ImmutableMap;
-
 import org.mapstruct.TargetType;
 import org.mapstruct.ap.test.collection.adder._target.IndoorPet;
 import org.mapstruct.ap.test.collection.adder._target.OutdoorPet;
 import org.mapstruct.ap.test.collection.adder._target.Pet;
 
+import com.google.common.collect.ImmutableMap;
+
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/NoSetterCollectionMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/NoSetterCollectionMappingTest.java
index c8214732f..4e20ad761 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/NoSetterCollectionMappingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/NoSetterCollectionMappingTest.java
@@ -18,6 +18,9 @@
  */
 package org.mapstruct.ap.test.collection.defaultimplementation;
 
+import static org.fest.assertions.Assertions.assertThat;
+import static org.fest.assertions.MapAssert.entry;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -29,10 +32,6 @@ import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
-import static org.fest.assertions.MapAssert.entry;
-
 /**
  * @author Andreas Gudian
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/EmptyItererableMappingMapper.java b/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/EmptyItererableMappingMapper.java
index 2ae982ff4..ca0529c7e 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/EmptyItererableMappingMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/EmptyItererableMappingMapper.java
@@ -20,6 +20,7 @@ package org.mapstruct.ap.test.collection.erroneous;
 
 import java.util.Date;
 import java.util.List;
+
 import org.mapstruct.IterableMapping;
 import org.mapstruct.Mapper;
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/EmptyMapMappingMapper.java b/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/EmptyMapMappingMapper.java
index 1995bf485..7e29b501c 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/EmptyMapMappingMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/EmptyMapMappingMapper.java
@@ -20,6 +20,7 @@ package org.mapstruct.ap.test.collection.erroneous;
 
 import java.util.Date;
 import java.util.Map;
+
 import org.mapstruct.MapMapping;
 import org.mapstruct.Mapper;
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/ErroneousCollectionMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/ErroneousCollectionMappingTest.java
index 414d36497..df0449236 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/ErroneousCollectionMappingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/ErroneousCollectionMappingTest.java
@@ -64,7 +64,7 @@ public class ErroneousCollectionMappingTest {
         diagnostics = {
             @Diagnostic(type = EmptyItererableMappingMapper.class,
                 kind = Kind.ERROR,
-                line = 35,
+                line = 36,
                 messageRegExp = "'nullValueMappingStrategy','dateformat', 'qualifiedBy' and 'elementTargetType' are "
                     + "undefined in @IterableMapping, define at least one of them.")
         }
@@ -80,7 +80,7 @@ public class ErroneousCollectionMappingTest {
         diagnostics = {
             @Diagnostic(type = EmptyMapMappingMapper.class,
                 kind = Kind.ERROR,
-                line = 34,
+                line = 35,
                 messageRegExp = "'nullValueMappingStrategy', 'keyDateFormat', 'keyQualifiedBy', 'keyTargetType', "
                     + "'valueDateFormat', 'valueQualfiedBy' and 'valueTargetType' are all undefined in @MapMapping, "
                     + "define at least one of them.")
@@ -97,7 +97,7 @@ public class ErroneousCollectionMappingTest {
         diagnostics = {
             @Diagnostic(type = ErroneousCollectionNoElementMappingFound.class,
                 kind = Kind.ERROR,
-                line = 36,
+                line = 37,
                 messageRegExp = "No implementation can be generated for this method. Found no method nor implicit "
                     + "conversion for mapping source element type into target element type.")
         }
@@ -113,7 +113,7 @@ public class ErroneousCollectionMappingTest {
         diagnostics = {
             @Diagnostic(type = ErroneousCollectionNoKeyMappingFound.class,
                 kind = Kind.ERROR,
-                line = 36,
+                line = 37,
                 messageRegExp = "No implementation can be generated for this method. Found no method nor implicit "
                     + "conversion for mapping source key type to target key type.")
         }
@@ -129,7 +129,7 @@ public class ErroneousCollectionMappingTest {
         diagnostics = {
             @Diagnostic(type = ErroneousCollectionNoValueMappingFound.class,
                 kind = Kind.ERROR,
-                line = 36,
+                line = 37,
                 messageRegExp = "No implementation can be generated for this method. Found no method nor implicit "
                     + "conversion for mapping source value type to target value type.")
         }
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/ErroneousCollectionNoElementMappingFound.java b/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/ErroneousCollectionNoElementMappingFound.java
index 15ef3a16b..0483fcbbb 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/ErroneousCollectionNoElementMappingFound.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/ErroneousCollectionNoElementMappingFound.java
@@ -20,6 +20,7 @@ package org.mapstruct.ap.test.collection.erroneous;
 
 import java.text.AttributedString;
 import java.util.List;
+
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/ErroneousCollectionNoKeyMappingFound.java b/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/ErroneousCollectionNoKeyMappingFound.java
index 7ff8aa3ec..0e5f510a5 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/ErroneousCollectionNoKeyMappingFound.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/ErroneousCollectionNoKeyMappingFound.java
@@ -20,6 +20,7 @@ package org.mapstruct.ap.test.collection.erroneous;
 
 import java.text.AttributedString;
 import java.util.Map;
+
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/ErroneousCollectionNoValueMappingFound.java b/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/ErroneousCollectionNoValueMappingFound.java
index 3d6534b4d..6aaeb64f8 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/ErroneousCollectionNoValueMappingFound.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/erroneous/ErroneousCollectionNoValueMappingFound.java
@@ -20,6 +20,7 @@ package org.mapstruct.ap.test.collection.erroneous;
 
 import java.text.AttributedString;
 import java.util.Map;
+
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/forged/CollectionMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/forged/CollectionMappingTest.java
index 593318d12..c2a9413e8 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/forged/CollectionMappingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/forged/CollectionMappingTest.java
@@ -19,6 +19,8 @@
 package org.mapstruct.ap.test.collection.forged;
 
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import java.util.Map;
 
 import javax.tools.Diagnostic.Kind;
@@ -35,8 +37,6 @@ import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
 import com.google.common.collect.ImmutableMap;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * Test for mappings between collection types,
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/map/MapMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/map/MapMappingTest.java
index 9b82ef783..302b44512 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/map/MapMappingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/map/MapMappingTest.java
@@ -18,6 +18,9 @@
  */
 package org.mapstruct.ap.test.collection.map;
 
+import static org.fest.assertions.Assertions.assertThat;
+import static org.fest.assertions.MapAssert.entry;
+
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
@@ -30,10 +33,6 @@ import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
-import static org.fest.assertions.MapAssert.entry;
-
 /**
  * Test for implementation of {@code Map} mapping methods.
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/map/SourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/collection/map/SourceTargetMapper.java
index be29325a2..38f50d957 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/map/SourceTargetMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/map/SourceTargetMapper.java
@@ -21,10 +21,10 @@ package org.mapstruct.ap.test.collection.map;
 import java.util.Date;
 import java.util.Map;
 
+import org.mapstruct.InheritInverseConfiguration;
 import org.mapstruct.MapMapping;
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingTarget;
-import org.mapstruct.InheritInverseConfiguration;
 import org.mapstruct.factory.Mappers;
 
 @Mapper(uses = CustomNumberMapper.class)
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/BeanMapper.java b/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/BeanMapper.java
index f81c2dd65..fae3c2727 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/BeanMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/BeanMapper.java
@@ -19,8 +19,10 @@
 package org.mapstruct.ap.test.collection.wildcard;
 
 import java.math.BigDecimal;
+
 import javax.xml.bind.JAXBElement;
 import javax.xml.namespace.QName;
+
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/CunningPlan.java b/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/CunningPlan.java
index d39ba55bc..355f58f7e 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/CunningPlan.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/CunningPlan.java
@@ -19,6 +19,7 @@
 package org.mapstruct.ap.test.collection.wildcard;
 
 import java.math.BigDecimal;
+
 import javax.xml.bind.JAXBElement;
 
 /**
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/ErroneousIterableExtendsBoundTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/ErroneousIterableExtendsBoundTargetMapper.java
index 9207c0fe7..d81075fa4 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/ErroneousIterableExtendsBoundTargetMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/ErroneousIterableExtendsBoundTargetMapper.java
@@ -20,6 +20,7 @@ package org.mapstruct.ap.test.collection.wildcard;
 
 import java.math.BigDecimal;
 import java.util.List;
+
 import org.mapstruct.Mapper;
 
 /**
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/ErroneousIterableSuperBoundSourceMapper.java b/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/ErroneousIterableSuperBoundSourceMapper.java
index 81f7ca358..45b761f6c 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/ErroneousIterableSuperBoundSourceMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/ErroneousIterableSuperBoundSourceMapper.java
@@ -20,6 +20,7 @@ package org.mapstruct.ap.test.collection.wildcard;
 
 import java.math.BigDecimal;
 import java.util.List;
+
 import org.mapstruct.Mapper;
 
 /**
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/ErroneousIterableTypeVarBoundMapperOnMapper.java b/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/ErroneousIterableTypeVarBoundMapperOnMapper.java
index cd0332f6c..2a7e2627b 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/ErroneousIterableTypeVarBoundMapperOnMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/ErroneousIterableTypeVarBoundMapperOnMapper.java
@@ -20,6 +20,7 @@ package org.mapstruct.ap.test.collection.wildcard;
 
 import java.math.BigDecimal;
 import java.util.List;
+
 import org.mapstruct.Mapper;
 
 /**
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/ErroneousIterableTypeVarBoundMapperOnMethod.java b/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/ErroneousIterableTypeVarBoundMapperOnMethod.java
index 9bc379ef5..749150580 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/ErroneousIterableTypeVarBoundMapperOnMethod.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/ErroneousIterableTypeVarBoundMapperOnMethod.java
@@ -20,6 +20,7 @@ package org.mapstruct.ap.test.collection.wildcard;
 
 import java.math.BigDecimal;
 import java.util.List;
+
 import org.mapstruct.Mapper;
 
 /**
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/GoodIdea.java b/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/GoodIdea.java
index fe5db039a..b38f8e2ed 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/GoodIdea.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/GoodIdea.java
@@ -19,6 +19,7 @@
 package org.mapstruct.ap.test.collection.wildcard;
 
 import java.math.BigDecimal;
+
 import javax.xml.bind.JAXBElement;
 
 /**
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/WildCardTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/WildCardTest.java
index d8ce4faa2..3eaf0c7f9 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/WildCardTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/wildcard/WildCardTest.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.collection.wildcard;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import java.math.BigDecimal;
 
 import javax.xml.bind.JAXBElement;
@@ -32,8 +34,6 @@ import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic;
 import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * Reproducer for https://github.com/mapstruct/mapstruct/issues/527.
  *
@@ -88,7 +88,7 @@ public class WildCardTest {
             diagnostics = {
                 @Diagnostic( type = ErroneousIterableSuperBoundSourceMapper.class,
                         kind = javax.tools.Diagnostic.Kind.ERROR,
-                        line = 32,
+                        line = 33,
                         messageRegExp = "Can't generate mapping method for a wildcard super bound source." )
             }
     )
@@ -102,7 +102,7 @@ public class WildCardTest {
             diagnostics = {
                 @Diagnostic( type = ErroneousIterableExtendsBoundTargetMapper.class,
                         kind = javax.tools.Diagnostic.Kind.ERROR,
-                        line = 32,
+                        line = 33,
                         messageRegExp = "Can't generate mapping method for a wildcard extends bound result." )
             }
     )
@@ -116,7 +116,7 @@ public class WildCardTest {
             diagnostics = {
             @Diagnostic(type = ErroneousIterableTypeVarBoundMapperOnMethod.class,
                         kind = javax.tools.Diagnostic.Kind.ERROR,
-                        line = 32,
+                        line = 33,
                         messageRegExp = "Can't generate mapping method for a generic type variable target." )
             }
     )
@@ -130,7 +130,7 @@ public class WildCardTest {
             diagnostics = {
                 @Diagnostic( type = ErroneousIterableTypeVarBoundMapperOnMapper.class,
                         kind = javax.tools.Diagnostic.Kind.ERROR,
-                        line = 32,
+                        line = 33,
                         messageRegExp = "Can't generate mapping method for a generic type variable source." )
             }
     )
diff --git a/processor/src/test/java/org/mapstruct/ap/test/complex/CarMapper.java b/processor/src/test/java/org/mapstruct/ap/test/complex/CarMapper.java
index 913f5cece..b202904e9 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/complex/CarMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/complex/CarMapper.java
@@ -20,10 +20,10 @@ package org.mapstruct.ap.test.complex;
 
 import java.util.List;
 
+import org.mapstruct.InheritInverseConfiguration;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Mappings;
-import org.mapstruct.InheritInverseConfiguration;
 import org.mapstruct.ap.test.complex._target.CarDto;
 import org.mapstruct.ap.test.complex._target.PersonDto;
 import org.mapstruct.ap.test.complex.other.DateMapper;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/SourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/SourceTargetMapper.java
index e03c7b3c7..4509378f5 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/SourceTargetMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/SourceTargetMapper.java
@@ -18,10 +18,10 @@
  */
 package org.mapstruct.ap.test.conversion;
 
+import org.mapstruct.InheritInverseConfiguration;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Mappings;
-import org.mapstruct.InheritInverseConfiguration;
 import org.mapstruct.factory.Mappers;
 
 @Mapper
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/Java8TimeConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/Java8TimeConversionTest.java
index 3dafe4395..9a0cfea9a 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/Java8TimeConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/java8time/Java8TimeConversionTest.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.conversion.java8time;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -32,8 +34,6 @@ import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  *
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/jodatime/JodaConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/jodatime/JodaConversionTest.java
index 19d6ae816..92ea06282 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/jodatime/JodaConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/jodatime/JodaConversionTest.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.conversion.jodatime;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import java.util.Calendar;
 import java.util.Locale;
 import java.util.TimeZone;
@@ -34,8 +36,6 @@ import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * Tests the conversion between Joda-Time types and String/Date/Calendar.
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanConversionTest.java
index cd830faeb..cefccb5ad 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanConversionTest.java
@@ -18,14 +18,14 @@
  */
 package org.mapstruct.ap.test.conversion.nativetypes;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 @WithClasses({
     BooleanSource.class,
     BooleanTarget.class,
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharConversionTest.java
index ff2b03eb7..5cf35945f 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharConversionTest.java
@@ -18,14 +18,14 @@
  */
 package org.mapstruct.ap.test.conversion.nativetypes;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 @WithClasses({
     CharSource.class,
     CharTarget.class,
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/NumberConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/NumberConversionTest.java
index 134bc2040..94ed5a977 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/NumberConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/NumberConversionTest.java
@@ -18,14 +18,14 @@
  */
 package org.mapstruct.ap.test.conversion.nativetypes;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 @WithClasses({
     ByteSource.class,
     ByteTarget.class,
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/string/StringConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/string/StringConversionTest.java
index 5353d19ce..5a1b374bd 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/string/StringConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/string/StringConversionTest.java
@@ -18,14 +18,14 @@
  */
 package org.mapstruct.ap.test.conversion.string;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 @WithClasses({
     Source.class,
     Target.class,
diff --git a/processor/src/test/java/org/mapstruct/ap/test/decorator/jsr330/Jsr330DecoratorTest.java b/processor/src/test/java/org/mapstruct/ap/test/decorator/jsr330/Jsr330DecoratorTest.java
index 758adea47..fe7b0ad7a 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/decorator/jsr330/Jsr330DecoratorTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/decorator/jsr330/Jsr330DecoratorTest.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.decorator.jsr330;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import java.util.Calendar;
 
 import javax.inject.Inject;
@@ -39,8 +41,6 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * Test for the application of decorators using component model jsr330.
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/decorator/spring/SpringDecoratorTest.java b/processor/src/test/java/org/mapstruct/ap/test/decorator/spring/SpringDecoratorTest.java
index 33968c6cf..60ceaa6cd 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/decorator/spring/SpringDecoratorTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/decorator/spring/SpringDecoratorTest.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.decorator.spring;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import java.util.Calendar;
 
 import org.junit.After;
@@ -37,8 +39,6 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * Test for the application of decorators using component model spring.
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/defaultvalue/DefaultValueTest.java b/processor/src/test/java/org/mapstruct/ap/test/defaultvalue/DefaultValueTest.java
index 4bb0eca2a..7e29f04f8 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/defaultvalue/DefaultValueTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/defaultvalue/DefaultValueTest.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.defaultvalue;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import java.text.ParseException;
 
 import org.junit.Test;
@@ -30,8 +32,6 @@ import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic;
 import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 @IssueKey( "600" )
 @RunWith( AnnotationProcessorTestRunner.class )
 @WithClasses( {
diff --git a/processor/src/test/java/org/mapstruct/ap/test/dependency/OrderingTest.java b/processor/src/test/java/org/mapstruct/ap/test/dependency/OrderingTest.java
index 88767ee8d..59affc6cb 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/dependency/OrderingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/dependency/OrderingTest.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.dependency;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.Mapping;
@@ -28,8 +30,6 @@ import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic;
 import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * Test for ordering mapped attributes by means of {@link Mapping#dependsOn()}.
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/destination/DestinationClassNameTest.java b/processor/src/test/java/org/mapstruct/ap/test/destination/DestinationClassNameTest.java
index a6db9825b..01c377512 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/destination/DestinationClassNameTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/destination/DestinationClassNameTest.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.destination;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -25,8 +27,6 @@ import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 import org.mapstruct.factory.Mappers;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * @author Christophe Labouisse on 27/05/2015.
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/destination/DestinationPackageNameTest.java b/processor/src/test/java/org/mapstruct/ap/test/destination/DestinationPackageNameTest.java
index 06815307a..2fa11e506 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/destination/DestinationPackageNameTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/destination/DestinationPackageNameTest.java
@@ -18,14 +18,14 @@
  */
 package org.mapstruct.ap.test.destination;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * @author Christophe Labouisse on 27/05/2015.
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/exceptions/ExceptionTest.java b/processor/src/test/java/org/mapstruct/ap/test/exceptions/ExceptionTest.java
index 83f96fe22..cc443183e 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/exceptions/ExceptionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/exceptions/ExceptionTest.java
@@ -19,14 +19,15 @@
 package org.mapstruct.ap.test.exceptions;
 
 import java.text.ParseException;
-import org.mapstruct.ap.test.exceptions.imports.TestException1;
-import org.mapstruct.ap.test.exceptions.imports.TestExceptionBase;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mapstruct.ap.test.exceptions.imports.TestException1;
+import org.mapstruct.ap.test.exceptions.imports.TestExceptionBase;
 import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/exceptions/SourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/exceptions/SourceTargetMapper.java
index b7e7ca295..29c0222b8 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/exceptions/SourceTargetMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/exceptions/SourceTargetMapper.java
@@ -20,11 +20,12 @@ package org.mapstruct.ap.test.exceptions;
 
 
 import java.text.ParseException;
-import org.mapstruct.ap.test.exceptions.imports.TestExceptionBase;
 import java.util.List;
 import java.util.Map;
+
 import org.mapstruct.DecoratedWith;
 import org.mapstruct.Mapper;
+import org.mapstruct.ap.test.exceptions.imports.TestExceptionBase;
 import org.mapstruct.factory.Mappers;
 
 /**
diff --git a/processor/src/test/java/org/mapstruct/ap/test/generics/GenericsTest.java b/processor/src/test/java/org/mapstruct/ap/test/generics/GenericsTest.java
index ec6dcafb7..506378f43 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/generics/GenericsTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/generics/GenericsTest.java
@@ -18,14 +18,14 @@
  */
 package org.mapstruct.ap.test.generics;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * @author Andreas Gudian
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/imports/ConflictingTypesNamesTest.java b/processor/src/test/java/org/mapstruct/ap/test/imports/ConflictingTypesNamesTest.java
index a232ec3e6..630ce76ad 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/imports/ConflictingTypesNamesTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/imports/ConflictingTypesNamesTest.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.imports;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -32,8 +34,6 @@ import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 import org.mapstruct.ap.testutil.runner.GeneratedSource;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * Test for generating a mapper which references types whose names clash with names of used annotations and exceptions.
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/inheritedmappingmethod/InheritedMappingMethodTest.java b/processor/src/test/java/org/mapstruct/ap/test/inheritedmappingmethod/InheritedMappingMethodTest.java
index 6d87be86c..b495a8de8 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/inheritedmappingmethod/InheritedMappingMethodTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/inheritedmappingmethod/InheritedMappingMethodTest.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.inheritedmappingmethod;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.test.inheritedmappingmethod._target.CarDto;
@@ -28,8 +30,6 @@ import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 @IssueKey( "274" )
 @WithClasses({
  Car.class, CarDto.class, UnboundMappable.class, CarMapper.class, //
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nestedmethodcall/NestedMappingMethodInvocationTest.java b/processor/src/test/java/org/mapstruct/ap/test/nestedmethodcall/NestedMappingMethodInvocationTest.java
index 56a6d99c5..ddfb85bb6 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/nestedmethodcall/NestedMappingMethodInvocationTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/nestedmethodcall/NestedMappingMethodInvocationTest.java
@@ -31,8 +31,8 @@ import javax.xml.datatype.DatatypeConstants;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
-import org.junit.Before;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.testutil.IssueKey;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/NestedSourcePropertiesTest.java b/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/NestedSourcePropertiesTest.java
index 9b6f91ae1..432297c37 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/NestedSourcePropertiesTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/nestedsourceproperties/NestedSourcePropertiesTest.java
@@ -18,6 +18,10 @@
  */
 package org.mapstruct.ap.test.nestedsourceproperties;
 
+import static org.fest.assertions.Assertions.assertThat;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import java.util.Arrays;
 
 import org.junit.Test;
@@ -32,16 +36,10 @@ import org.mapstruct.ap.test.nestedsourceproperties.source.Song;
 import org.mapstruct.ap.test.nestedsourceproperties.source.Studio;
 import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
-import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
-
-import static org.fest.assertions.Assertions.assertThat;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import org.mapstruct.ap.testutil.compilation.annotation.CompilationResult;
 import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic;
 import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome;
+import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
 /**
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nonvoidsetter/NonVoidSettersTest.java b/processor/src/test/java/org/mapstruct/ap/test/nonvoidsetter/NonVoidSettersTest.java
index f62a9901d..743fa489b 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/nonvoidsetter/NonVoidSettersTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/nonvoidsetter/NonVoidSettersTest.java
@@ -18,14 +18,14 @@
  */
 package org.mapstruct.ap.test.nonvoidsetter;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * Test for using non-void setters (fluent style) in the target.
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nullcheck/NullCheckTest.java b/processor/src/test/java/org/mapstruct/ap/test/nullcheck/NullCheckTest.java
index 89f726c4f..df2128b67 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/nullcheck/NullCheckTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/nullcheck/NullCheckTest.java
@@ -19,6 +19,7 @@
 package org.mapstruct.ap.test.nullcheck;
 
 import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.testutil.IssueKey;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/CarMapper.java b/processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/CarMapper.java
index 1da3360a8..e3f3385cf 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/CarMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/CarMapper.java
@@ -18,13 +18,15 @@
  */
 package org.mapstruct.ap.test.nullvaluemapping;
 
+import static org.mapstruct.NullValueMappingStrategy.RETURN_DEFAULT;
+
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+
 import org.mapstruct.BeanMapping;
 import org.mapstruct.IterableMapping;
 import org.mapstruct.MapMapping;
-
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Mappings;
@@ -34,8 +36,6 @@ import org.mapstruct.ap.test.nullvaluemapping.source.Car;
 import org.mapstruct.ap.test.nullvaluemapping.source.Driver;
 import org.mapstruct.factory.Mappers;
 
-import static org.mapstruct.NullValueMappingStrategy.RETURN_DEFAULT;
-
 @Mapper(imports = UUID.class)
 public interface CarMapper {
 
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/CarMapperSettingOnMapper.java b/processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/CarMapperSettingOnMapper.java
index 597b750ac..e427666a8 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/CarMapperSettingOnMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/CarMapperSettingOnMapper.java
@@ -21,9 +21,9 @@ package org.mapstruct.ap.test.nullvaluemapping;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+
 import org.mapstruct.IterableMapping;
 import org.mapstruct.MapMapping;
-
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Mappings;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/NullValueMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/NullValueMappingTest.java
index b2e8fb755..f0debaf44 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/NullValueMappingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/nullvaluemapping/NullValueMappingTest.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.nullvaluemapping;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -33,8 +35,6 @@ import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * Tests for the strategies for mapping {@code null} values, given via {@code NullValueMapping} etc.
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/prism/EnumPrismsTest.java b/processor/src/test/java/org/mapstruct/ap/test/prism/EnumPrismsTest.java
index 48dae1b5e..cbe5c95e3 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/prism/EnumPrismsTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/prism/EnumPrismsTest.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.prism;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -29,8 +31,6 @@ import org.mapstruct.ap.internal.prism.CollectionMappingStrategyPrism;
 import org.mapstruct.ap.internal.prism.MappingInheritanceStrategyPrism;
 import org.mapstruct.ap.internal.prism.NullValueMappingStrategyPrism;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * Test for manually created prisms on enumeration types
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/references/ReferencedMapperTest.java b/processor/src/test/java/org/mapstruct/ap/test/references/ReferencedMapperTest.java
index 3062503dd..a551dd4e6 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/references/ReferencedMapperTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/references/ReferencedMapperTest.java
@@ -18,6 +18,9 @@
  */
 package org.mapstruct.ap.test.references;
 
+import static org.fest.assertions.Assertions.assertThat;
+import static org.fest.assertions.MapAssert.entry;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -29,10 +32,6 @@ import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
-import static org.fest.assertions.MapAssert.entry;
-
 /**
  * @author Andreas Gudian
  *
diff --git a/processor/src/test/java/org/mapstruct/ap/test/references/statics/StaticsTest.java b/processor/src/test/java/org/mapstruct/ap/test/references/statics/StaticsTest.java
index b6cc69a84..f967ab316 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/references/statics/StaticsTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/references/statics/StaticsTest.java
@@ -18,14 +18,15 @@
  */
 package org.mapstruct.ap.test.references.statics;
 
+import static org.fest.assertions.Assertions.assertThat;
+
+import org.junit.Rule;
+import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mapstruct.ap.test.references.statics.nonused.NonUsedMapper;
 import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
-import static org.fest.assertions.Assertions.assertThat;
-import org.junit.Rule;
-import org.junit.Test;
-import org.mapstruct.ap.test.references.statics.nonused.NonUsedMapper;
 import org.mapstruct.ap.testutil.runner.GeneratedSource;
 
 /**
diff --git a/processor/src/test/java/org/mapstruct/ap/test/reverse/InheritInverseConfigurationTest.java b/processor/src/test/java/org/mapstruct/ap/test/reverse/InheritInverseConfigurationTest.java
index 1e305f2b6..a3131fda1 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/reverse/InheritInverseConfigurationTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/reverse/InheritInverseConfigurationTest.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.reverse;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import javax.tools.Diagnostic.Kind;
 
 import org.junit.Test;
@@ -33,8 +35,6 @@ import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic;
 import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/primitives/PrimitiveVsWrappedSelectionTest.java b/processor/src/test/java/org/mapstruct/ap/test/selection/primitives/PrimitiveVsWrappedSelectionTest.java
index acb930e15..40f87e9a6 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/selection/primitives/PrimitiveVsWrappedSelectionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/selection/primitives/PrimitiveVsWrappedSelectionTest.java
@@ -19,6 +19,7 @@
 package org.mapstruct.ap.test.selection.primitives;
 
 import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.testutil.IssueKey;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/FactMapper.java b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/FactMapper.java
index 588d36b10..c036a9333 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/FactMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/FactMapper.java
@@ -20,6 +20,7 @@ package org.mapstruct.ap.test.selection.qualifier;
 
 import java.util.List;
 import java.util.Map;
+
 import org.mapstruct.MapMapping;
 import org.mapstruct.Mapper;
 import org.mapstruct.ap.test.selection.qualifier.annotation.EnglishToGerman;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/KeyWordMapper.java b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/KeyWordMapper.java
index b5a19041b..b0fd653f7 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/KeyWordMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/KeyWordMapper.java
@@ -18,15 +18,17 @@
  */
 package org.mapstruct.ap.test.selection.qualifier;
 
-import com.google.common.collect.ImmutableMap;
 import java.util.List;
 import java.util.Map;
+
 import org.mapstruct.IterableMapping;
 import org.mapstruct.Mapper;
 import org.mapstruct.ap.test.selection.qualifier.annotation.EnglishToGerman;
 import org.mapstruct.ap.test.selection.qualifier.handwritten.SomeOtherMapper;
 import org.mapstruct.factory.Mappers;
 
+import com.google.common.collect.ImmutableMap;
+
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/QualifierTest.java b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/QualifierTest.java
index c58d5726f..1912338b4 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/QualifierTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/QualifierTest.java
@@ -18,28 +18,31 @@
  */
 package org.mapstruct.ap.test.selection.qualifier;
 
-import org.mapstruct.ap.test.selection.qualifier.bean.GermanRelease;
-import org.mapstruct.ap.test.selection.qualifier.bean.OriginalRelease;
-import org.mapstruct.ap.test.selection.qualifier.bean.AbstractEntry;
-import org.mapstruct.ap.test.selection.qualifier.handwritten.Titles;
+import static org.fest.assertions.Assertions.assertThat;
+import static org.fest.assertions.MapAssert.entry;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.tools.Diagnostic.Kind;
-import static org.fest.assertions.Assertions.assertThat;
-import static org.fest.assertions.MapAssert.entry;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.test.selection.qualifier.annotation.CreateGermanRelease;
 import org.mapstruct.ap.test.selection.qualifier.annotation.EnglishToGerman;
 import org.mapstruct.ap.test.selection.qualifier.annotation.NonQualifierAnnotated;
 import org.mapstruct.ap.test.selection.qualifier.annotation.TitleTranslator;
+import org.mapstruct.ap.test.selection.qualifier.bean.AbstractEntry;
+import org.mapstruct.ap.test.selection.qualifier.bean.GermanRelease;
+import org.mapstruct.ap.test.selection.qualifier.bean.OriginalRelease;
 import org.mapstruct.ap.test.selection.qualifier.bean.ReleaseFactory;
 import org.mapstruct.ap.test.selection.qualifier.handwritten.Facts;
 import org.mapstruct.ap.test.selection.qualifier.handwritten.PlotWords;
 import org.mapstruct.ap.test.selection.qualifier.handwritten.Reverse;
 import org.mapstruct.ap.test.selection.qualifier.handwritten.SomeOtherMapper;
+import org.mapstruct.ap.test.selection.qualifier.handwritten.Titles;
 import org.mapstruct.ap.test.selection.qualifier.handwritten.YetAnotherMapper;
 import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/CreateGermanRelease.java b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/CreateGermanRelease.java
index b35df2d49..3fae0e26f 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/CreateGermanRelease.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/CreateGermanRelease.java
@@ -22,6 +22,7 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import org.mapstruct.Qualifier;
 
 /**
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/EnglishToGerman.java b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/EnglishToGerman.java
index 24b2aa3f7..69e1424ce 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/EnglishToGerman.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/EnglishToGerman.java
@@ -22,6 +22,7 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import org.mapstruct.Qualifier;
 
 /**
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/TitleTranslator.java b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/TitleTranslator.java
index a2ddeac30..ef8ffbb98 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/TitleTranslator.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/annotation/TitleTranslator.java
@@ -22,6 +22,7 @@ import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import org.mapstruct.Qualifier;
 
 /**
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/handwritten/Facts.java b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/handwritten/Facts.java
index 257613fd2..57cd4a7ce 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/handwritten/Facts.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/handwritten/Facts.java
@@ -18,10 +18,12 @@
  */
 package org.mapstruct.ap.test.selection.qualifier.handwritten;
 
-import com.google.common.collect.ImmutableMap;
 import java.util.Map;
+
 import org.mapstruct.ap.test.selection.qualifier.annotation.EnglishToGerman;
 
+import com.google.common.collect.ImmutableMap;
+
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/handwritten/PlotWords.java b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/handwritten/PlotWords.java
index 07d050346..0d1353969 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/handwritten/PlotWords.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/handwritten/PlotWords.java
@@ -18,12 +18,14 @@
  */
 package org.mapstruct.ap.test.selection.qualifier.handwritten;
 
-import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+
 import org.mapstruct.ap.test.selection.qualifier.annotation.EnglishToGerman;
 
+import com.google.common.collect.ImmutableMap;
+
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/handwritten/Titles.java b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/handwritten/Titles.java
index 683ffc97a..9e721636c 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/handwritten/Titles.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/selection/qualifier/handwritten/Titles.java
@@ -18,12 +18,14 @@
  */
 package org.mapstruct.ap.test.selection.qualifier.handwritten;
 
-import com.google.common.collect.ImmutableMap;
 import java.util.Map;
+
 import org.mapstruct.ap.test.selection.qualifier.annotation.EnglishToGerman;
 import org.mapstruct.ap.test.selection.qualifier.annotation.TitleTranslator;
 //import org.mapstruct.ap.test.selection.qualifier.annotation.TitleTranslator;
 
+import com.google.common.collect.ImmutableMap;
+
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/resulttype/FruitFamilyMapper.java b/processor/src/test/java/org/mapstruct/ap/test/selection/resulttype/FruitFamilyMapper.java
index a53942968..b116739fa 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/selection/resulttype/FruitFamilyMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/selection/resulttype/FruitFamilyMapper.java
@@ -20,6 +20,7 @@ package org.mapstruct.ap.test.selection.resulttype;
 
 import java.util.List;
 import java.util.Map;
+
 import org.mapstruct.BeanMapping;
 import org.mapstruct.IterableMapping;
 import org.mapstruct.MapMapping;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/selection/resulttype/InheritanceSelectionTest.java b/processor/src/test/java/org/mapstruct/ap/test/selection/resulttype/InheritanceSelectionTest.java
index bd8756e5e..b808f7682 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/selection/resulttype/InheritanceSelectionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/selection/resulttype/InheritanceSelectionTest.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.selection.resulttype;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -34,8 +36,6 @@ import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic;
 import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/severalsources/SeveralSourceParametersTest.java b/processor/src/test/java/org/mapstruct/ap/test/severalsources/SeveralSourceParametersTest.java
index c5d300553..f020f886b 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/severalsources/SeveralSourceParametersTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/severalsources/SeveralSourceParametersTest.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.severalsources;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import javax.tools.Diagnostic.Kind;
 
 import org.junit.Before;
@@ -31,8 +33,6 @@ import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutco
 import org.mapstruct.ap.testutil.compilation.annotation.ProcessorOption;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * Test for propagation of attribute without setter in source and getter in
  * target.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/source/constants/SourceConstantsTest.java b/processor/src/test/java/org/mapstruct/ap/test/source/constants/SourceConstantsTest.java
index 64cc7179a..481f60298 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/source/constants/SourceConstantsTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/source/constants/SourceConstantsTest.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.source.constants;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
@@ -34,8 +36,6 @@ import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic;
 import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/source/expressions/java/SourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/source/expressions/java/SourceTargetMapper.java
index 18300e6f0..1a5491b48 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/source/expressions/java/SourceTargetMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/source/expressions/java/SourceTargetMapper.java
@@ -18,11 +18,11 @@
  */
 package org.mapstruct.ap.test.source.expressions.java;
 
-import org.mapstruct.ap.test.source.expressions.java.mapper.TimeAndFormat;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingTarget;
 import org.mapstruct.Mappings;
+import org.mapstruct.ap.test.source.expressions.java.mapper.TimeAndFormat;
 import org.mapstruct.factory.Mappers;
 
 /**
diff --git a/processor/src/test/java/org/mapstruct/ap/test/template/InheritConfigurationTest.java b/processor/src/test/java/org/mapstruct/ap/test/template/InheritConfigurationTest.java
index 9c010ef19..12c010ad6 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/template/InheritConfigurationTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/template/InheritConfigurationTest.java
@@ -19,6 +19,8 @@
 package org.mapstruct.ap.test.template;
 
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import javax.tools.Diagnostic.Kind;
 
 import org.junit.Test;
@@ -34,8 +36,6 @@ import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic;
 import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * @author Sjaak Derksen
  */
diff --git a/processor/src/test/java/org/mapstruct/ap/test/updatemethods/UpdateMethodsTest.java b/processor/src/test/java/org/mapstruct/ap/test/updatemethods/UpdateMethodsTest.java
index fc187d20e..33332407a 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/updatemethods/UpdateMethodsTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/updatemethods/UpdateMethodsTest.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.updatemethods;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mapstruct.ap.testutil.IssueKey;
@@ -27,8 +29,6 @@ import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic;
 import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/test/updatemethods/selection/ExternalHandWrittenMapper.java b/processor/src/test/java/org/mapstruct/ap/test/updatemethods/selection/ExternalHandWrittenMapper.java
index fd2d5d06b..572272dce 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/updatemethods/selection/ExternalHandWrittenMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/updatemethods/selection/ExternalHandWrittenMapper.java
@@ -20,6 +20,7 @@ package org.mapstruct.ap.test.updatemethods.selection;
 
 import java.util.List;
 import java.util.Map;
+
 import org.mapstruct.MappingTarget;
 import org.mapstruct.ap.test.updatemethods.DepartmentDto;
 import org.mapstruct.ap.test.updatemethods.DepartmentEntity;
diff --git a/processor/src/test/java/org/mapstruct/ap/test/updatemethods/selection/ExternalSelectionTest.java b/processor/src/test/java/org/mapstruct/ap/test/updatemethods/selection/ExternalSelectionTest.java
index 7f8ccb0b1..68113018c 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/updatemethods/selection/ExternalSelectionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/updatemethods/selection/ExternalSelectionTest.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.test.updatemethods.selection;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
@@ -40,8 +42,6 @@ import org.mapstruct.ap.testutil.IssueKey;
 import org.mapstruct.ap.testutil.WithClasses;
 import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  *
  * @author Sjaak Derksen
diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/runner/CompilingStatement.java b/processor/src/test/java/org/mapstruct/ap/testutil/runner/CompilingStatement.java
index c2f4e7ffd..dc9f5135f 100644
--- a/processor/src/test/java/org/mapstruct/ap/testutil/runner/CompilingStatement.java
+++ b/processor/src/test/java/org/mapstruct/ap/testutil/runner/CompilingStatement.java
@@ -18,6 +18,8 @@
  */
 package org.mapstruct.ap.testutil.runner;
 
+import static org.fest.assertions.Assertions.assertThat;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -50,8 +52,6 @@ import com.puppycrawl.tools.checkstyle.ConfigurationLoader;
 import com.puppycrawl.tools.checkstyle.DefaultLogger;
 import com.puppycrawl.tools.checkstyle.PropertiesExpander;
 
-import static org.fest.assertions.Assertions.assertThat;
-
 /**
  * A JUnit4 statement that performs source generation using the annotation processor and compiles those sources.
  *