Skip to content

Commit e052d6d

Browse files
gunnarmorlinggunnarmorling
committed
mapstruct#200 Formatting; Fixing some typos
1 parent 0656d74 commit e052d6d

4 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
.settings
66
.factorypath
77
.checkstyle
8+
.externalToolBuilders
89

910
# IntelliJ
1011
*.iml

‎processor/src/main/java/org/mapstruct/ap/conversion/ReverseConversion.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ private ReverseConversion(ConversionProvider conversionProvider) {
4040
}
4141

4242
@Override
43-
public Assignment to( ConversionContext conversionContext) {
43+
public Assignment to(ConversionContext conversionContext) {
4444
return conversionProvider.from( conversionContext );
4545
}
4646

‎processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919
package org.mapstruct.ap.processor;
2020

21-
import org.mapstruct.ap.processor.creation.MappingResolver;
2221
import java.text.MessageFormat;
2322
import java.util.ArrayList;
2423
import java.util.HashMap;
@@ -27,6 +26,7 @@
2726
import java.util.List;
2827
import java.util.Map;
2928
import java.util.Set;
29+
3030
import javax.annotation.processing.Messager;
3131
import javax.lang.model.element.ExecutableElement;
3232
import javax.lang.model.element.TypeElement;
@@ -36,8 +36,8 @@
3636
import javax.lang.model.util.Elements;
3737
import javax.lang.model.util.Types;
3838
import javax.tools.Diagnostic.Kind;
39-
import org.mapstruct.ap.model.Assignment;
4039

40+
import org.mapstruct.ap.model.Assignment;
4141
import org.mapstruct.ap.model.BeanMappingMethod;
4242
import org.mapstruct.ap.model.Decorator;
4343
import org.mapstruct.ap.model.DefaultMapperReference;
@@ -51,8 +51,8 @@
5151
import org.mapstruct.ap.model.MappingMethod;
5252
import org.mapstruct.ap.model.PropertyMapping;
5353
import org.mapstruct.ap.model.assignment.AssignmentFactory;
54-
import org.mapstruct.ap.model.assignment.NewCollectionOrMapWrapper;
5554
import org.mapstruct.ap.model.assignment.LocalVarWrapper;
55+
import org.mapstruct.ap.model.assignment.NewCollectionOrMapWrapper;
5656
import org.mapstruct.ap.model.assignment.NullCheckWrapper;
5757
import org.mapstruct.ap.model.assignment.SetterWrapper;
5858
import org.mapstruct.ap.model.common.Parameter;
@@ -66,6 +66,7 @@
6666
import org.mapstruct.ap.option.ReportingPolicy;
6767
import org.mapstruct.ap.prism.DecoratedWithPrism;
6868
import org.mapstruct.ap.prism.MapperPrism;
69+
import org.mapstruct.ap.processor.creation.MappingResolver;
6970
import org.mapstruct.ap.util.Executables;
7071
import org.mapstruct.ap.util.MapperConfig;
7172
import org.mapstruct.ap.util.Strings;
@@ -88,7 +89,6 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Sourc
8889
private MappingResolver mappingResolver;
8990

9091

91-
9292
@Override
9393
public Mapper process(ProcessorContext context, TypeElement mapperTypeElement, List<SourceMethod> sourceModel) {
9494
this.elementUtils = context.getElementUtils();
@@ -98,7 +98,7 @@ public Mapper process(ProcessorContext context, TypeElement mapperTypeElement, L
9898

9999
this.typeFactory = context.getTypeFactory();
100100

101-
this.mappingResolver = new MappingResolver(messager, typeFactory, elementUtils, typeUtils );
101+
this.mappingResolver = new MappingResolver( messager, typeFactory, elementUtils, typeUtils );
102102

103103

104104
return getMapper( mapperTypeElement, sourceModel );
@@ -322,7 +322,7 @@ else if ( method.isEnumMapping() ) {
322322
}
323323

324324
private FactoryMethod getFactoryMethod(List<MapperReference> mapperReferences, List<SourceMethod> methods,
325-
Type returnType) {
325+
Type returnType) {
326326
FactoryMethod result = null;
327327
for ( SourceMethod method : methods ) {
328328
if ( !method.requiresImplementation() && !method.isIterableMapping() && !method.isMapMapping()
@@ -669,37 +669,37 @@ else if ( Executables.isGetterMethod( targetAcessor ) ) {
669669
}
670670
}
671671

672-
// target accessor is setter, so decorate assigmment as setter
672+
// target accessor is setter, so decorate assignment as setter
673673
assignment = new SetterWrapper( assignment, method.getThrownTypes() );
674674

675-
// decorate assigment with null check of source can be null (is not primitive)
675+
// decorate assignment with null check of source can be null (is not primitive)
676676
if ( !sourceType.isPrimitive() ) {
677677
assignment = new NullCheckWrapper( assignment );
678678
}
679679

680680
}
681681
else {
682682
messager.printMessage(
683-
Kind.ERROR,
684-
String.format(
685-
"Can't map property \"%s %s\" to \"%s %s\".",
686-
sourceType,
687-
Executables.getPropertyName( sourceAccessor ),
688-
targetType,
689-
Executables.getPropertyName( targetAcessor )
690-
),
691-
method.getExecutable()
683+
Kind.ERROR,
684+
String.format(
685+
"Can't map property \"%s %s\" to \"%s %s\".",
686+
sourceType,
687+
Executables.getPropertyName( sourceAccessor ),
688+
targetType,
689+
Executables.getPropertyName( targetAcessor )
690+
),
691+
method.getExecutable()
692692
);
693693
}
694694
return new PropertyMapping(
695-
parameter.getName(),
696-
Executables.getPropertyName( sourceAccessor ),
697-
sourceAccessor.getSimpleName().toString(),
698-
sourceType,
699-
Executables.getPropertyName( targetAcessor ),
700-
targetAcessor.getSimpleName().toString(),
701-
targetType,
702-
assignment
695+
parameter.getName(),
696+
Executables.getPropertyName( sourceAccessor ),
697+
sourceAccessor.getSimpleName().toString(),
698+
sourceType,
699+
Executables.getPropertyName( targetAcessor ),
700+
targetAcessor.getSimpleName().toString(),
701+
targetType,
702+
assignment
703703
);
704704
}
705705

@@ -735,7 +735,7 @@ private IterableMappingMethod getIterableMappingMethod(List<MapperReference> map
735735
);
736736
}
737737

738-
// target accessor is setter, so decorate assigmment as setter
738+
// target accessor is setter, so decorate assignment as setter
739739
assignment = new SetterWrapper( assignment, method.getThrownTypes() );
740740

741741
FactoryMethod factoryMethod = getFactoryMethod( mapperReferences, methods, method.getReturnType() );
@@ -810,7 +810,7 @@ private MapMappingMethod getMapMappingMethod(List<MapperReference> mapperReferen
810810
keyAssignment = new LocalVarWrapper( keyAssignment, method.getThrownTypes() );
811811
valueAssignment = new LocalVarWrapper( valueAssignment, method.getThrownTypes() );
812812

813-
return new MapMappingMethod( method, keyAssignment, valueAssignment, factoryMethod );
813+
return new MapMappingMethod( method, keyAssignment, valueAssignment, factoryMethod );
814814
}
815815

816816
private EnumMappingMethod getEnumMappingMethod(SourceMethod method) {

‎processor/src/main/java/org/mapstruct/ap/processor/creation/MappingResolver.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.util.HashSet;
2323
import java.util.List;
2424
import java.util.Set;
25+
2526
import javax.annotation.processing.Messager;
2627
import javax.lang.model.type.TypeMirror;
2728
import javax.lang.model.util.Elements;
@@ -32,9 +33,9 @@
3233
import org.mapstruct.ap.conversion.Conversions;
3334
import org.mapstruct.ap.model.Assignment;
3435
import org.mapstruct.ap.model.MapperReference;
35-
import org.mapstruct.ap.model.assignment.Simple;
3636
import org.mapstruct.ap.model.VirtualMappingMethod;
3737
import org.mapstruct.ap.model.assignment.AssignmentFactory;
38+
import org.mapstruct.ap.model.assignment.Simple;
3839
import org.mapstruct.ap.model.common.ConversionContext;
3940
import org.mapstruct.ap.model.common.DefaultConversionContext;
4041
import org.mapstruct.ap.model.common.Type;
@@ -189,7 +190,7 @@ private Assignment getTargetAssignment( Type sourceType, Type targetType ) {
189190

190191
// then direct assignable
191192
if ( sourceType.isAssignableTo( targetType ) || context.isPropertyMappable( sourceType, targetType ) ) {
192-
Simple simpleAssignment = AssignmentFactory.createSimple( sourceReference );
193+
Assignment simpleAssignment = AssignmentFactory.createSimple( sourceReference );
193194
return simpleAssignment;
194195
}
195196

@@ -226,16 +227,14 @@ private Assignment getTargetAssignment( Type sourceType, Type targetType ) {
226227
}
227228

228229
private Assignment resolveViaConversion( Type sourceType, Type targetType ) {
229-
230230
ConversionProvider conversionProvider = context.conversions.getConversion( sourceType, targetType );
231231

232232
if ( conversionProvider == null ) {
233233
return null;
234234
}
235235

236236
ConversionContext ctx = new DefaultConversionContext( context.typeFactory, targetType, dateFormat );
237-
Assignment typeConversion = conversionProvider.to( ctx );
238-
return typeConversion;
237+
return conversionProvider.to( ctx );
239238
}
240239

241240
/**
@@ -372,7 +371,7 @@ private Assignment resolveViaMethodAndConversion( Type sourceType, Type targetTy
372371

373372
Assignment conversionYRef = null;
374373

375-
// search the other way arround
374+
// search the other way around
376375
for ( Method methodXCandidate : methodXCandidates ) {
377376
if ( methodXCandidate.getSourceParameters().size() == 1 ) {
378377
Assignment methodRefX = resolveViaMethod(

0 commit comments

Comments
 (0)