diff --git a/core/src/main/java/org/mapstruct/Mappers.java b/core/src/main/java/org/mapstruct/Mappers.java index 9dac57563..f2c3b7762 100644 --- a/core/src/main/java/org/mapstruct/Mappers.java +++ b/core/src/main/java/org/mapstruct/Mappers.java @@ -25,7 +25,10 @@ package org.mapstruct; */ public class Mappers { - private final static String IMPLEMENTATION_SUFFIX = "Impl"; + private static final String IMPLEMENTATION_SUFFIX = "Impl"; + + private Mappers() { + } /** * Returns an instance of the given mapper type. diff --git a/core/src/test/java/org/mapstruct/MappersTest.java b/core/src/test/java/org/mapstruct/MappersTest.java index d27c36dd4..c1647d22e 100644 --- a/core/src/test/java/org/mapstruct/MappersTest.java +++ b/core/src/test/java/org/mapstruct/MappersTest.java @@ -18,12 +18,16 @@ */ package org.mapstruct; - import org.mapstruct.test.model.Foo; import org.testng.annotations.Test; import static org.fest.assertions.Assertions.assertThat; +/** + * Unit test for {@link Mappers}. + * + * @author Gunnar Morling + */ public class MappersTest { @Test diff --git a/integrationtest/src/main/java/org/mapstruct/itest/SourceTargetMapper.java b/integrationtest/src/main/java/org/mapstruct/itest/SourceTargetMapper.java index 8119a16ab..d84a3cfdd 100644 --- a/integrationtest/src/main/java/org/mapstruct/itest/SourceTargetMapper.java +++ b/integrationtest/src/main/java/org/mapstruct/itest/SourceTargetMapper.java @@ -26,7 +26,7 @@ import org.mapstruct.Mappings; @Mapper public interface SourceTargetMapper { - public static SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class ); + SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class ); @Mappings({ @Mapping(source = "qax", target = "baz"), diff --git a/processor/src/main/java/org/mapstruct/ap/MapperGenerationVisitor.java b/processor/src/main/java/org/mapstruct/ap/MapperGenerationVisitor.java index b0af47ee9..35b18af3a 100644 --- a/processor/src/main/java/org/mapstruct/ap/MapperGenerationVisitor.java +++ b/processor/src/main/java/org/mapstruct/ap/MapperGenerationVisitor.java @@ -62,7 +62,7 @@ import static javax.lang.model.util.ElementFilter.methodsIn; public class MapperGenerationVisitor extends ElementKindVisitor6 { - private final static String IMPLEMENTATION_SUFFIX = "Impl"; + private static final String IMPLEMENTATION_SUFFIX = "Impl"; private final ProcessingEnvironment processingEnvironment; private final Types typeUtils; @@ -235,7 +235,9 @@ public class MapperGenerationVisitor extends ElementKindVisitor6 { return mappings; } - private void reportErrorIfPropertyCanNotBeMapped(Method method, Method reverseMethod, MappedProperty property, Method propertyMappingMethod, Method reversePropertyMappingMethod, Conversion conversion) { + private void reportErrorIfPropertyCanNotBeMapped(Method method, Method reverseMethod, MappedProperty property, + Method propertyMappingMethod, Method reversePropertyMappingMethod, + Conversion conversion) { if ( property.getSourceType().equals( property.getTargetType() ) ) { return; } @@ -282,7 +284,8 @@ public class MapperGenerationVisitor extends ElementKindVisitor6 { } } - private String getIterableConversionString(Conversions conversions, Type sourceElementType, Type targetElementType, boolean isToConversion) { + private String getIterableConversionString(Conversions conversions, Type sourceElementType, Type targetElementType, + boolean isToConversion) { Conversion conversion = conversions.getConversion( sourceElementType, targetElementType ); if ( conversion == null ) { @@ -435,7 +438,8 @@ public class MapperGenerationVisitor extends ElementKindVisitor6 { String sourcePropertyName = Executables.getPropertyName( getterMethod ); Mapping mapping = mappings.get( sourcePropertyName ); - for ( ExecutableElement setterMethod : Filters.setterMethodsIn( returnTypeElement.getEnclosedElements() ) ) { + for ( ExecutableElement setterMethod :Filters.setterMethodsIn( returnTypeElement + .getEnclosedElements() ) ) { String targetPropertyName = Executables.getPropertyName( setterMethod ); diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToStringConversion.java index 4198532e3..b758975e0 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/conversion/PrimitiveToStringConversion.java @@ -43,6 +43,7 @@ public class PrimitiveToStringConversion implements Conversion { @Override public String from(String targetPropertyAccessor, Type type) { - return wrapperType.getSimpleName() + ".parse" + Strings.capitalize( sourceType.getSimpleName() ) + "( " + targetPropertyAccessor + " )"; + return wrapperType.getSimpleName() + ".parse" + Strings.capitalize( sourceType.getSimpleName() ) + "( " + + targetPropertyAccessor + " )"; } } diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/WrapperToStringConversion.java b/processor/src/main/java/org/mapstruct/ap/conversion/WrapperToStringConversion.java index 3a2b720f5..33d372e35 100644 --- a/processor/src/main/java/org/mapstruct/ap/conversion/WrapperToStringConversion.java +++ b/processor/src/main/java/org/mapstruct/ap/conversion/WrapperToStringConversion.java @@ -43,6 +43,7 @@ public class WrapperToStringConversion implements Conversion { @Override public String from(String targetPropertyAccessor, Type type) { - return sourceType.getSimpleName() + ".parse" + Strings.capitalize( primitiveType.getSimpleName() ) + "( " + targetPropertyAccessor + " )"; + return sourceType.getSimpleName() + ".parse" + Strings.capitalize( primitiveType.getSimpleName() ) + "( " + + targetPropertyAccessor + " )"; } } diff --git a/processor/src/main/java/org/mapstruct/ap/model/BeanMapping.java b/processor/src/main/java/org/mapstruct/ap/model/BeanMapping.java index f92d90757..b486ee8b1 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/BeanMapping.java +++ b/processor/src/main/java/org/mapstruct/ap/model/BeanMapping.java @@ -31,7 +31,8 @@ public class BeanMapping { private final String toConversion; private final String fromConversion; - public BeanMapping(Type sourceType, Type targetType, List propertyMappings, MappingMethod mappingMethod, + public BeanMapping(Type sourceType, Type targetType, List propertyMappings, + MappingMethod mappingMethod, MappingMethod reverseMappingMethod, String toConversion, String fromConversion) { this.sourceType = sourceType; this.targetType = targetType; diff --git a/processor/src/main/java/org/mapstruct/ap/model/Mapper.java b/processor/src/main/java/org/mapstruct/ap/model/Mapper.java index 008790842..9f4961ffc 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/Mapper.java +++ b/processor/src/main/java/org/mapstruct/ap/model/Mapper.java @@ -35,7 +35,8 @@ public class Mapper { private final SortedSet importedTypes; public Mapper(String packageName, String interfaceName, - String implementationName, List beanMappings, List usedMapperTypes, Options options) { + String implementationName, List beanMappings, List usedMapperTypes, + Options options) { this.packageName = packageName; this.interfaceName = interfaceName; this.implementationName = implementationName; diff --git a/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java b/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java index cdf0d47c7..e890ef360 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java +++ b/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java @@ -40,7 +40,10 @@ public class PropertyMapping { private final String toConversion; private final String fromConversion; - public PropertyMapping(String sourceReadAccessorName, String sourceWriteAccessorName, Type sourceType, String targetReadAccessorName, String targetWriteAccessorName, Type targetType, MappingMethod mappingMethod, MappingMethod reverseMappingMethod, String toConversion, String fromConversion) { + public PropertyMapping(String sourceReadAccessorName, String sourceWriteAccessorName, Type sourceType, + String targetReadAccessorName, String targetWriteAccessorName, Type targetType, + MappingMethod mappingMethod, MappingMethod reverseMappingMethod, String toConversion, + String fromConversion) { this.sourceReadAccessorName = sourceReadAccessorName; this.sourceWriteAccessorName = sourceWriteAccessorName; this.sourceType = sourceType; diff --git a/processor/src/main/java/org/mapstruct/ap/model/Type.java b/processor/src/main/java/org/mapstruct/ap/model/Type.java index 13b054858..a868391ad 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/Type.java +++ b/processor/src/main/java/org/mapstruct/ap/model/Type.java @@ -34,20 +34,22 @@ import java.util.concurrent.ConcurrentMap; */ public class Type implements Comparable { - private final static Set primitiveTypeNames = new HashSet( + private static final Set PRIMITIVE_TYPE_NAMES = new HashSet( Arrays.asList( "boolean", "char", "byte", "short", "int", "long", "float", "double" ) ); - private final static ConcurrentMap defaultIterableImplementationTypes = new ConcurrentHashMap(); - private final static ConcurrentMap defaultCollectionImplementationTypes = new ConcurrentHashMap(); + private static final ConcurrentMap DEFAULT_ITERABLE_IMPLEMENTATION_TYPES = + new ConcurrentHashMap(); + private static final ConcurrentMap DEFAULT_COLLECTION_IMPLEMENTATION_TYPES = + new ConcurrentHashMap(); static { - defaultCollectionImplementationTypes.put( List.class.getName(), forClass( ArrayList.class ) ); - defaultCollectionImplementationTypes.put( Set.class.getName(), forClass( HashSet.class ) ); - defaultCollectionImplementationTypes.put( Collection.class.getName(), forClass( ArrayList.class ) ); + DEFAULT_COLLECTION_IMPLEMENTATION_TYPES.put( List.class.getName(), forClass( ArrayList.class ) ); + DEFAULT_COLLECTION_IMPLEMENTATION_TYPES.put( Set.class.getName(), forClass( HashSet.class ) ); + DEFAULT_COLLECTION_IMPLEMENTATION_TYPES.put( Collection.class.getName(), forClass( ArrayList.class ) ); - defaultIterableImplementationTypes.put( Iterable.class.getName(), forClass( ArrayList.class ) ); - defaultIterableImplementationTypes.putAll( defaultCollectionImplementationTypes ); + DEFAULT_ITERABLE_IMPLEMENTATION_TYPES.put( Iterable.class.getName(), forClass( ArrayList.class ) ); + DEFAULT_ITERABLE_IMPLEMENTATION_TYPES.putAll( DEFAULT_COLLECTION_IMPLEMENTATION_TYPES ); } private final String packageName; @@ -81,7 +83,8 @@ public class Type implements Comparable { this( null, name, null, false, false, false ); } - public Type(String packageName, String name, Type elementType, boolean isEnumType, boolean isCollectionType, boolean isIterableType) { + public Type(String packageName, String name, Type elementType, boolean isEnumType, boolean isCollectionType, + boolean isIterableType) { this.packageName = packageName; this.name = name; this.elementType = elementType; @@ -90,14 +93,14 @@ public class Type implements Comparable { this.isIterableType = isIterableType; if ( isCollectionType ) { - collectionImplementationType = defaultCollectionImplementationTypes.get( packageName + "." + name ); + collectionImplementationType = DEFAULT_COLLECTION_IMPLEMENTATION_TYPES.get( packageName + "." + name ); } else { collectionImplementationType = null; } if ( isIterableType ) { - iterableImplementationType = defaultIterableImplementationTypes.get( packageName + "." + name ); + iterableImplementationType = DEFAULT_ITERABLE_IMPLEMENTATION_TYPES.get( packageName + "." + name ); } else { iterableImplementationType = null; @@ -117,7 +120,7 @@ public class Type implements Comparable { } public boolean isPrimitive() { - return packageName == null && primitiveTypeNames.contains( name ); + return packageName == null && PRIMITIVE_TYPE_NAMES.contains( name ); } public boolean isEnumType() { diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/MappedProperty.java b/processor/src/main/java/org/mapstruct/ap/model/source/MappedProperty.java index 215921893..1c0714a6a 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/MappedProperty.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/MappedProperty.java @@ -32,7 +32,8 @@ public class MappedProperty { private final Type targetType; public MappedProperty(String sourceName, String sourceReadAccessorName, String sourceWriteAccessorName, - Type sourceType, String targetName, String targetReadAccessorName, String targetWriteAccessorName, + Type sourceType, String targetName, String targetReadAccessorName, + String targetWriteAccessorName, Type targetType) { this.sourceName = sourceName; this.sourceReadAccessorName = sourceReadAccessorName; diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/Method.java b/processor/src/main/java/org/mapstruct/ap/model/source/Method.java index 1836c48ef..3bd2e79d0 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/Method.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/Method.java @@ -33,7 +33,8 @@ public class Method { private final Type targetType; private final List mappedProperties; - public Method(Type declaringMapper, ExecutableElement executable, String parameterName, Type sourceType, Type targetType, List mappedProperties) { + public Method(Type declaringMapper, ExecutableElement executable, String parameterName, Type sourceType, + Type targetType, List mappedProperties) { this.declaringMapper = declaringMapper; this.executable = executable; this.parameterName = parameterName; diff --git a/processor/src/main/java/org/mapstruct/ap/util/Executables.java b/processor/src/main/java/org/mapstruct/ap/util/Executables.java index 0beb2399d..0bce9fa80 100644 --- a/processor/src/main/java/org/mapstruct/ap/util/Executables.java +++ b/processor/src/main/java/org/mapstruct/ap/util/Executables.java @@ -30,6 +30,9 @@ import javax.lang.model.type.TypeKind; */ public class Executables { + private Executables() { + } + public static boolean isGetterMethod(ExecutableElement method) { return isNonBooleanGetterMethod( method ) || isBooleanGetterMethod( method ); } diff --git a/processor/src/main/java/org/mapstruct/ap/util/Filters.java b/processor/src/main/java/org/mapstruct/ap/util/Filters.java index e12aebd5b..9f675f7bd 100644 --- a/processor/src/main/java/org/mapstruct/ap/util/Filters.java +++ b/processor/src/main/java/org/mapstruct/ap/util/Filters.java @@ -32,6 +32,9 @@ import static javax.lang.model.util.ElementFilter.methodsIn; */ public class Filters { + private Filters() { + } + public static List getterMethodsIn(Iterable elements) { List getterMethods = new LinkedList(); diff --git a/processor/src/main/java/org/mapstruct/ap/util/NativeTypes.java b/processor/src/main/java/org/mapstruct/ap/util/NativeTypes.java index 6329bbf47..4c2b57787 100644 --- a/processor/src/main/java/org/mapstruct/ap/util/NativeTypes.java +++ b/processor/src/main/java/org/mapstruct/ap/util/NativeTypes.java @@ -30,8 +30,11 @@ import java.util.Map; */ public class NativeTypes { - private final static Map, Class> wrapperToPrimitiveTypes; - private final static Map, Class> primitiveToWrapperTypes; + private static final Map, Class> WRAPPER_TO_PRIMITIVE_TYPES; + private static final Map, Class> PRIMITIVE_TO_WRAPPER_TYPES; + + private NativeTypes() { + } static { Map, Class> tmp = new HashMap, Class>(); @@ -44,7 +47,7 @@ public class NativeTypes { tmp.put( Boolean.class, boolean.class ); tmp.put( Character.class, char.class ); - wrapperToPrimitiveTypes = Collections.unmodifiableMap( tmp ); + WRAPPER_TO_PRIMITIVE_TYPES = Collections.unmodifiableMap( tmp ); tmp = new HashMap, Class>(); tmp.put( byte.class, Byte.class ); @@ -56,7 +59,7 @@ public class NativeTypes { tmp.put( boolean.class, Boolean.class ); tmp.put( char.class, Character.class ); - primitiveToWrapperTypes = Collections.unmodifiableMap( tmp ); + PRIMITIVE_TO_WRAPPER_TYPES = Collections.unmodifiableMap( tmp ); } public static Class getWrapperType(Class clazz) { @@ -64,7 +67,7 @@ public class NativeTypes { throw new IllegalArgumentException( clazz + " is no primitive type." ); } - return primitiveToWrapperTypes.get( clazz ); + return PRIMITIVE_TO_WRAPPER_TYPES.get( clazz ); } public static Class getPrimitiveType(Class clazz) { @@ -72,6 +75,6 @@ public class NativeTypes { throw new IllegalArgumentException( clazz + " is no wrapper type." ); } - return wrapperToPrimitiveTypes.get( clazz ); + return WRAPPER_TO_PRIMITIVE_TYPES.get( clazz ); } } diff --git a/processor/src/main/java/org/mapstruct/ap/util/Strings.java b/processor/src/main/java/org/mapstruct/ap/util/Strings.java index ad617def3..e23e189cd 100644 --- a/processor/src/main/java/org/mapstruct/ap/util/Strings.java +++ b/processor/src/main/java/org/mapstruct/ap/util/Strings.java @@ -20,8 +20,10 @@ package org.mapstruct.ap.util; public class Strings { + private Strings() { + } + public static String capitalize(String name) { return name == null ? null : name.substring( 0, 1 ).toUpperCase() + name.substring( 1 ); } - } diff --git a/processor/src/main/java/org/mapstruct/ap/writer/ModelWriter.java b/processor/src/main/java/org/mapstruct/ap/writer/ModelWriter.java index 032c8b0ce..3db23a79e 100644 --- a/processor/src/main/java/org/mapstruct/ap/writer/ModelWriter.java +++ b/processor/src/main/java/org/mapstruct/ap/writer/ModelWriter.java @@ -25,16 +25,26 @@ import freemarker.template.Configuration; import freemarker.template.DefaultObjectWrapper; import freemarker.template.Template; +/** + * Writes Java source files based on given mapper models, using a FreeMarker + * template. + * + * @author Gunnar Morling + */ public class ModelWriter { - private static final Configuration configuration; + /** + * FreeMarker configuration. As per the documentation, thread-safe if not + * altered after original initialization + */ + private static final Configuration CONFIGURATION; private final String templateName; static { - configuration = new Configuration(); - configuration.setClassForTemplateLoading( ModelWriter.class, "/" ); - configuration.setObjectWrapper( new DefaultObjectWrapper() ); + CONFIGURATION = new Configuration(); + CONFIGURATION.setClassForTemplateLoading( ModelWriter.class, "/" ); + CONFIGURATION.setObjectWrapper( new DefaultObjectWrapper() ); } public ModelWriter(String templateName) { @@ -46,7 +56,7 @@ public class ModelWriter { try { BufferedWriter writer = new BufferedWriter( sourceFile.openWriter() ); - Template template = configuration.getTemplate( templateName ); + Template template = CONFIGURATION.getTemplate( templateName ); template.process( model, writer ); writer.flush(); writer.close(); diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/SourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/collection/SourceTargetMapper.java index b522c333c..beeb8a386 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/collection/SourceTargetMapper.java +++ b/processor/src/test/java/org/mapstruct/ap/test/collection/SourceTargetMapper.java @@ -28,7 +28,7 @@ import org.mapstruct.Mappings; @Mapper public interface SourceTargetMapper { - public static SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class ); + SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class ); @Mappings({ @Mapping(source = "integerList", target = "integerCollection"), diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/SourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/SourceTargetMapper.java index 4953c6a89..c0bb111a8 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/SourceTargetMapper.java +++ b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/SourceTargetMapper.java @@ -28,7 +28,7 @@ import org.mapstruct.Mappers; @Mapper public interface SourceTargetMapper { - public static SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class ); + SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class ); Target sourceToTarget(Source source); diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/SourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/SourceTargetMapper.java index 23cd7c841..541d0fbf0 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/SourceTargetMapper.java +++ b/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/SourceTargetMapper.java @@ -24,7 +24,7 @@ import org.mapstruct.Mappers; @Mapper(uses = StringListMapper.class) public interface SourceTargetMapper { - public static SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class ); + SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class ); Target sourceToTarget(Source source); 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 5b3908cc4..8a9990de0 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 @@ -26,7 +26,7 @@ import org.mapstruct.Mappings; @Mapper public interface SourceTargetMapper { - public static SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class ); + SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class ); @Mappings({ @Mapping(source = "qax", target = "baz"), diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanMapper.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanMapper.java index baa767754..e622bf782 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanMapper.java +++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/BooleanMapper.java @@ -24,7 +24,7 @@ import org.mapstruct.Mappers; @Mapper public interface BooleanMapper { - public static BooleanMapper INSTANCE = Mappers.getMapper( BooleanMapper.class ); + BooleanMapper INSTANCE = Mappers.getMapper( BooleanMapper.class ); BooleanTarget sourceToTarget(BooleanSource source); diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharMapper.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharMapper.java index b1eaa86be..fd93b5e06 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharMapper.java +++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/CharMapper.java @@ -24,7 +24,7 @@ import org.mapstruct.Mappers; @Mapper public interface CharMapper { - public static CharMapper INSTANCE = Mappers.getMapper( CharMapper.class ); + CharMapper INSTANCE = Mappers.getMapper( CharMapper.class ); CharTarget sourceToTarget(CharSource source); diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/SourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/SourceTargetMapper.java index 1a71d74da..a4643b030 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/SourceTargetMapper.java +++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/nativetypes/SourceTargetMapper.java @@ -24,7 +24,7 @@ import org.mapstruct.Mappers; @Mapper public interface SourceTargetMapper { - public static SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class ); + SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class ); ByteTarget sourceToTarget(ByteSource source); diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/precedence/SourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/precedence/SourceTargetMapper.java index edd968b0a..bd60fb3ff 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/conversion/precedence/SourceTargetMapper.java +++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/precedence/SourceTargetMapper.java @@ -24,7 +24,7 @@ import org.mapstruct.Mappers; @Mapper(uses = IntegerStringMapper.class) public interface SourceTargetMapper { - public static SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class ); + SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class ); Target sourceToTarget(Source source); diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/string/SourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/string/SourceTargetMapper.java index 6c45e4a0a..75f121bcb 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/conversion/string/SourceTargetMapper.java +++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/string/SourceTargetMapper.java @@ -24,7 +24,7 @@ import org.mapstruct.Mappers; @Mapper public interface SourceTargetMapper { - public static SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class ); + SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class ); Target sourceToTarget(Source source); diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/CompilationOutcomeDescriptor.java b/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/CompilationOutcomeDescriptor.java index 1f808876d..75e88e5b2 100644 --- a/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/CompilationOutcomeDescriptor.java +++ b/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/CompilationOutcomeDescriptor.java @@ -22,11 +22,11 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; +import javax.tools.Diagnostic; import javax.tools.Diagnostic.Kind; import javax.tools.JavaFileObject; import org.mapstruct.ap.testutil.compilation.annotation.CompilationResult; -import org.mapstruct.ap.testutil.compilation.annotation.Diagnostic; import org.mapstruct.ap.testutil.compilation.annotation.ExpectedCompilationOutcome; /** @@ -45,7 +45,8 @@ public class CompilationOutcomeDescriptor { this.diagnostics = diagnostics; } - public static CompilationOutcomeDescriptor forExpectedCompilationResult(ExpectedCompilationOutcome expectedCompilationResult) { + public static CompilationOutcomeDescriptor forExpectedCompilationResult( + ExpectedCompilationOutcome expectedCompilationResult) { if ( expectedCompilationResult == null ) { return new CompilationOutcomeDescriptor( CompilationResult.SUCCEEDED, @@ -54,7 +55,8 @@ public class CompilationOutcomeDescriptor { } else { Set diagnosticDescriptors = new HashSet(); - for ( Diagnostic diagnostic : expectedCompilationResult.diagnostics() ) { + for ( org.mapstruct.ap.testutil.compilation.annotation.Diagnostic diagnostic : + expectedCompilationResult.diagnostics() ) { diagnosticDescriptors.add( DiagnosticDescriptor.forDiagnostic( diagnostic ) ); } @@ -62,11 +64,13 @@ public class CompilationOutcomeDescriptor { } } - public static CompilationOutcomeDescriptor forResult(String sourceDir, boolean compilationSuccessful, List> diagnostics) { - CompilationResult compilationResult = compilationSuccessful ? CompilationResult.SUCCEEDED : CompilationResult.FAILED; + public static CompilationOutcomeDescriptor forResult(String sourceDir, boolean compilationSuccessful, + List> diagnostics) { + CompilationResult compilationResult = + compilationSuccessful ? CompilationResult.SUCCEEDED : CompilationResult.FAILED; Set diagnosticDescriptors = new HashSet(); - for ( javax.tools.Diagnostic diagnostic : diagnostics ) { + for ( Diagnostic diagnostic : diagnostics ) { //ignore notes created by the compiler if ( diagnostic.getKind() != Kind.NOTE ) { diagnosticDescriptors.add( DiagnosticDescriptor.forDiagnostic( sourceDir, diagnostic ) ); diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/DiagnosticDescriptor.java b/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/DiagnosticDescriptor.java index 79c7f7515..2a319f263 100644 --- a/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/DiagnosticDescriptor.java +++ b/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/DiagnosticDescriptor.java @@ -49,7 +49,8 @@ public class DiagnosticDescriptor { return new DiagnosticDescriptor( soureFileName, diagnostic.kind(), diagnostic.line(), "" ); } - public static DiagnosticDescriptor forDiagnostic(String sourceDir, javax.tools.Diagnostic diagnostic) { + public static DiagnosticDescriptor forDiagnostic(String sourceDir, + javax.tools.Diagnostic diagnostic) { return new DiagnosticDescriptor( getSourceName( sourceDir, diagnostic ), diagnostic.getKind(),