From 77e6890b00913b52de833cbaa99bcd8f91e99721 Mon Sep 17 00:00:00 2001 From: Gunnar Morling Date: Sun, 19 Jan 2014 23:56:35 +0100 Subject: [PATCH] #94 Formatting, renaming test --- .../org/mapstruct/ap/model/source/Mapping.java | 2 +- .../org/mapstruct/ap/model/source/Method.java | 10 +++++----- .../ap/processor/MapperCreationProcessor.java | 15 +++++++-------- .../ap/processor/MethodRetrievalProcessor.java | 7 +++---- .../ap/test/severaltargets/Source.java | 1 - ...a => SourcePropertyMapSeveralTimesTest.java} | 17 ++++++++++------- .../test/severaltargets/SourceTargetMapper.java | 11 +++++------ .../ap/test/severaltargets/Target.java | 1 - .../ap/test/severaltargets/TimeAndFormat.java | 1 - .../severaltargets/TimeAndFormatMapper.java | 1 - 10 files changed, 31 insertions(+), 35 deletions(-) rename processor/src/test/java/org/mapstruct/ap/test/severaltargets/{MultipleSourcesTest.java => SourcePropertyMapSeveralTimesTest.java} (87%) diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/Mapping.java b/processor/src/main/java/org/mapstruct/ap/model/source/Mapping.java index 037c71818..78562366b 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/source/Mapping.java +++ b/processor/src/main/java/org/mapstruct/ap/model/source/Mapping.java @@ -50,7 +50,7 @@ public class Mapping { Map> mappings = new HashMap>(); for ( MappingPrism mapping : mappingsAnnotation.value() ) { - if (!mappings.containsKey( mapping.source())) { + if ( !mappings.containsKey( mapping.source() ) ) { mappings.put( mapping.source(), new ArrayList() ); } mappings.get( mapping.source() ).add( fromMappingPrism( mapping, element ) ); 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 52531ce88..05736cf33 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 @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; - import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.Modifier; @@ -64,9 +63,10 @@ public class Method { executable, parameters, returnType, - Collections.> emptyMap(), + Collections.>emptyMap(), null, - null ); + null + ); } private Method(Type declaringMapper, ExecutableElement executable, List parameters, Type returnType, @@ -207,8 +207,8 @@ public class Method { } public Mapping getMapping(String targetPropertyName) { - for ( Map.Entry> entry : mappings.entrySet() ) { - for ( Mapping mapping : entry.getValue()) { + for ( Map.Entry> entry : mappings.entrySet() ) { + for ( Mapping mapping : entry.getValue() ) { if ( mapping.getTargetName().equals( targetPropertyName ) ) { return mapping; } diff --git a/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java b/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java index f13bdab97..0b227911f 100644 --- a/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java +++ b/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java @@ -220,9 +220,9 @@ public class MapperCreationProcessor implements ModelElementProcessor> reversed = new HashMap>(); for ( List mappingList : mappings.values() ) { - for (Mapping mapping : mappingList) { - if (!reversed.containsKey( mapping.getTargetName())) { - reversed.put( mapping.getTargetName(), new ArrayList()); + for ( Mapping mapping : mappingList ) { + if ( !reversed.containsKey( mapping.getTargetName() ) ) { + reversed.put( mapping.getTargetName(), new ArrayList() ); } reversed.get( mapping.getTargetName() ).add( mapping.reverse() ); } @@ -244,8 +244,8 @@ public class MapperCreationProcessor implements ModelElementProcessor sourceMappings = method.getMappings().get( sourcePropertyName ); - if (method.getMappings().containsKey( sourcePropertyName ) ) { - for (Mapping sourceMapping : sourceMappings) { + if ( method.getMappings().containsKey( sourcePropertyName ) ) { + for ( Mapping sourceMapping : sourceMappings ) { boolean mapsToOtherTarget = !sourceMapping.getTargetName().equals( targetPropertyName ); if ( executables.getPropertyName( getter ).equals( sourcePropertyName ) && !mapsToOtherTarget ) { return getPropertyMapping( @@ -259,8 +259,7 @@ public class MapperCreationProcessor implements ModelElementProcessor mappedProperties : method.getMappings().values() ) { - for (Mapping mappedProperty : mappedProperties) { + for ( Mapping mappedProperty : mappedProperties ) { if ( mappedProperty.getSourceParameterName() != null ) { Parameter sourceParameter = method.getSourceParameter( mappedProperty.getSourceParameterName() ); diff --git a/processor/src/main/java/org/mapstruct/ap/processor/MethodRetrievalProcessor.java b/processor/src/main/java/org/mapstruct/ap/processor/MethodRetrievalProcessor.java index 2316a093d..86506e3ea 100644 --- a/processor/src/main/java/org/mapstruct/ap/processor/MethodRetrievalProcessor.java +++ b/processor/src/main/java/org/mapstruct/ap/processor/MethodRetrievalProcessor.java @@ -18,13 +18,10 @@ */ package org.mapstruct.ap.processor; -import static javax.lang.model.util.ElementFilter.methodsIn; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.annotation.processing.Messager; import javax.lang.model.element.ExecutableElement; import javax.lang.model.element.Modifier; @@ -49,6 +46,8 @@ import org.mapstruct.ap.model.source.Method; import org.mapstruct.ap.util.Executables; import org.mapstruct.ap.util.TypeFactory; +import static javax.lang.model.util.ElementFilter.methodsIn; + /** * A {@link ModelElementProcessor} which retrieves a list of {@link Method}s * representing all the mapping methods of the given bean mapper type as well as @@ -273,7 +272,7 @@ public class MethodRetrievalProcessor implements ModelElementProcessor() ); } mappings.get( mappingAnnotation.source() ).add( Mapping.fromMappingPrism( mappingAnnotation, method ) ); diff --git a/processor/src/test/java/org/mapstruct/ap/test/severaltargets/Source.java b/processor/src/test/java/org/mapstruct/ap/test/severaltargets/Source.java index b8e9dd6fa..5c0c85224 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/severaltargets/Source.java +++ b/processor/src/test/java/org/mapstruct/ap/test/severaltargets/Source.java @@ -19,7 +19,6 @@ package org.mapstruct.ap.test.severaltargets; /** - * * @author Sjaak Derksen */ public class Source { diff --git a/processor/src/test/java/org/mapstruct/ap/test/severaltargets/MultipleSourcesTest.java b/processor/src/test/java/org/mapstruct/ap/test/severaltargets/SourcePropertyMapSeveralTimesTest.java similarity index 87% rename from processor/src/test/java/org/mapstruct/ap/test/severaltargets/MultipleSourcesTest.java rename to processor/src/test/java/org/mapstruct/ap/test/severaltargets/SourcePropertyMapSeveralTimesTest.java index 1fb332758..6daba34ae 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/severaltargets/MultipleSourcesTest.java +++ b/processor/src/test/java/org/mapstruct/ap/test/severaltargets/SourcePropertyMapSeveralTimesTest.java @@ -18,28 +18,31 @@ */ package org.mapstruct.ap.test.severaltargets; +import static org.fest.assertions.Assertions.assertThat; + import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; + +import org.mapstruct.ap.testutil.IssueKey; import org.mapstruct.ap.testutil.MapperTestBase; import org.mapstruct.ap.testutil.WithClasses; import org.testng.annotations.Test; -import static org.fest.assertions.Assertions.assertThat; -import org.mapstruct.ap.testutil.IssueKey; - /** * Test for the generation of implementation of abstract base classes. * * @author Sjaak Derksen */ -@WithClasses({ Source.class, Target.class, SourceTargetMapper.class, TimeAndFormat.class, - TimeAndFormatMapper.class }) -public class MultipleSourcesTest extends MapperTestBase { +@WithClasses({ + Source.class, Target.class, SourceTargetMapper.class, TimeAndFormat.class, + TimeAndFormatMapper.class +}) +public class SourcePropertyMapSeveralTimesTest extends MapperTestBase { @Test @IssueKey("94") - public void shouldMapMultipleSources() throws ParseException { + public void shouldMapSameSourcePropertyToSeveralTargetProperties() throws ParseException { Source source = new Source(); String sourceFormat = "dd-MM-yyyy"; SimpleDateFormat dateFormat = new SimpleDateFormat( sourceFormat ); diff --git a/processor/src/test/java/org/mapstruct/ap/test/severaltargets/SourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/severaltargets/SourceTargetMapper.java index 2ebb8f42c..4741cdd1c 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/severaltargets/SourceTargetMapper.java +++ b/processor/src/test/java/org/mapstruct/ap/test/severaltargets/SourceTargetMapper.java @@ -24,7 +24,6 @@ import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; /** - * * @author Sjaak Derksen */ @Mapper(uses = TimeAndFormatMapper.class) @@ -32,9 +31,9 @@ public interface SourceTargetMapper { SourceTargetMapper INSTANCE = Mappers.getMapper( SourceTargetMapper.class ); @Mappings( - { - @Mapping(source = "timeAndFormat", target = "time"), - @Mapping(source = "timeAndFormat", target = "format") - }) - Target sourceToTarget( Source s ); + { + @Mapping(source = "timeAndFormat", target = "time"), + @Mapping(source = "timeAndFormat", target = "format") + }) + Target sourceToTarget(Source s); } diff --git a/processor/src/test/java/org/mapstruct/ap/test/severaltargets/Target.java b/processor/src/test/java/org/mapstruct/ap/test/severaltargets/Target.java index 3486bae20..10005684f 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/severaltargets/Target.java +++ b/processor/src/test/java/org/mapstruct/ap/test/severaltargets/Target.java @@ -21,7 +21,6 @@ package org.mapstruct.ap.test.severaltargets; import java.util.Date; /** - * * @author Sjaak Derksen */ public class Target { diff --git a/processor/src/test/java/org/mapstruct/ap/test/severaltargets/TimeAndFormat.java b/processor/src/test/java/org/mapstruct/ap/test/severaltargets/TimeAndFormat.java index b995d4f6d..d3e7996e8 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/severaltargets/TimeAndFormat.java +++ b/processor/src/test/java/org/mapstruct/ap/test/severaltargets/TimeAndFormat.java @@ -21,7 +21,6 @@ package org.mapstruct.ap.test.severaltargets; import java.util.Date; /** - * * @author Sjaak Derksen */ public class TimeAndFormat { diff --git a/processor/src/test/java/org/mapstruct/ap/test/severaltargets/TimeAndFormatMapper.java b/processor/src/test/java/org/mapstruct/ap/test/severaltargets/TimeAndFormatMapper.java index 235abc0ec..96376abdc 100644 --- a/processor/src/test/java/org/mapstruct/ap/test/severaltargets/TimeAndFormatMapper.java +++ b/processor/src/test/java/org/mapstruct/ap/test/severaltargets/TimeAndFormatMapper.java @@ -21,7 +21,6 @@ package org.mapstruct.ap.test.severaltargets; import java.util.Date; /** - * * @author Sjaak Derksen */ public class TimeAndFormatMapper {