From 6e24db8196625e3c6a24afb938d6da2efac4f4e1 Mon Sep 17 00:00:00 2001 From: Gunnar Morling Date: Sun, 12 Oct 2014 18:29:39 +0200 Subject: [PATCH] #302 Renaming MappingContext -> MappingBuilderContext --- .../org/mapstruct/ap/model/AssignmentFactory.java | 2 +- .../org/mapstruct/ap/model/BeanMappingMethod.java | 4 ++-- .../org/mapstruct/ap/model/EnumMappingMethod.java | 4 ++-- .../mapstruct/ap/model/IterableMappingMethod.java | 4 ++-- .../org/mapstruct/ap/model/MapMappingMethod.java | 4 ++-- ...appingContext.java => MappingBuilderContext.java} | 7 ++++--- .../java/org/mapstruct/ap/model/PropertyMapping.java | 12 ++++++------ .../ap/processor/MapperCreationProcessor.java | 6 +++--- .../ap/processor/creation/MappingResolverImpl.java | 2 +- 9 files changed, 23 insertions(+), 22 deletions(-) rename processor/src/main/java/org/mapstruct/ap/model/{MappingContext.java => MappingBuilderContext.java} (97%) diff --git a/processor/src/main/java/org/mapstruct/ap/model/AssignmentFactory.java b/processor/src/main/java/org/mapstruct/ap/model/AssignmentFactory.java index 8c6e5ef74..808fed806 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/AssignmentFactory.java +++ b/processor/src/main/java/org/mapstruct/ap/model/AssignmentFactory.java @@ -56,7 +56,7 @@ public class AssignmentFactory { return new Direct( sourceRef ); } - public static FactoryMethod createFactoryMethod( Type returnType, MappingContext ctx ) { + public static FactoryMethod createFactoryMethod( Type returnType, MappingBuilderContext ctx ) { FactoryMethod result = null; for ( SourceMethod method : ctx.getSourceModel() ) { if ( !method.overridesMethod() && !method.isIterableMapping() && !method.isMapMapping() diff --git a/processor/src/main/java/org/mapstruct/ap/model/BeanMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/model/BeanMappingMethod.java index 4e414d380..7dcb182e1 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/BeanMappingMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/model/BeanMappingMethod.java @@ -56,10 +56,10 @@ public class BeanMappingMethod extends MappingMethod { public static class Builder { - private MappingContext ctx; + private MappingBuilderContext ctx; private SourceMethod method; - public Builder mappingContext(MappingContext mappingContext) { + public Builder mappingContext(MappingBuilderContext mappingContext) { this.ctx = mappingContext; return this; } diff --git a/processor/src/main/java/org/mapstruct/ap/model/EnumMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/model/EnumMappingMethod.java index 3fb0886d3..6efdd1518 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/EnumMappingMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/model/EnumMappingMethod.java @@ -44,9 +44,9 @@ public class EnumMappingMethod extends MappingMethod { public static class Builder { private SourceMethod method; - private MappingContext ctx; + private MappingBuilderContext ctx; - public Builder mappingContext( MappingContext mappingContext ) { + public Builder mappingContext( MappingBuilderContext mappingContext ) { this.ctx = mappingContext; return this; } diff --git a/processor/src/main/java/org/mapstruct/ap/model/IterableMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/model/IterableMappingMethod.java index 9ed811c20..da50e320a 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/IterableMappingMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/model/IterableMappingMethod.java @@ -45,11 +45,11 @@ public class IterableMappingMethod extends MappingMethod { public static class Builder { private Method method; - private MappingContext ctx; + private MappingBuilderContext ctx; private String dateFormat; private List qualifiers; - public Builder mappingContext(MappingContext mappingContext) { + public Builder mappingContext(MappingBuilderContext mappingContext) { this.ctx = mappingContext; return this; } diff --git a/processor/src/main/java/org/mapstruct/ap/model/MapMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/model/MapMappingMethod.java index 037667ae8..300bc00dd 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/MapMappingMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/model/MapMappingMethod.java @@ -50,9 +50,9 @@ public class MapMappingMethod extends MappingMethod { private List keyQualifiers; private List valueQualifiers; private Method method; - private MappingContext ctx; + private MappingBuilderContext ctx; - public Builder mappingContext(MappingContext mappingContext) { + public Builder mappingContext(MappingBuilderContext mappingContext) { this.ctx = mappingContext; return this; } diff --git a/processor/src/main/java/org/mapstruct/ap/model/MappingContext.java b/processor/src/main/java/org/mapstruct/ap/model/MappingBuilderContext.java similarity index 97% rename from processor/src/main/java/org/mapstruct/ap/model/MappingContext.java rename to processor/src/main/java/org/mapstruct/ap/model/MappingBuilderContext.java index 7f6eda32f..bbee23977 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/MappingContext.java +++ b/processor/src/main/java/org/mapstruct/ap/model/MappingBuilderContext.java @@ -21,6 +21,7 @@ package org.mapstruct.ap.model; import java.util.ArrayList; import java.util.List; import java.util.Set; + import javax.annotation.processing.Messager; import javax.lang.model.element.TypeElement; import javax.lang.model.type.TypeMirror; @@ -38,7 +39,7 @@ import org.mapstruct.ap.option.Options; * This class provides the context for the builders. * *

- * The following mappers make use of this context: + * The following builders make use of this context: *

    *
  • {@link BeanMappingMethod.Builder}
    • *
  • {@link PropertyMappingMethod.Builder}
    • @@ -59,7 +60,7 @@ import org.mapstruct.ap.option.Options; * * @author Sjaak Derksen */ -public class MappingContext { +public class MappingBuilderContext { /** * Resolves the most suitable way for mapping an element (property, iterable element etc.) from source to target. @@ -119,7 +120,7 @@ public class MappingContext { private final MappingResolver mappingResolver; private final List mappingsToGenerate = new ArrayList(); - public MappingContext(TypeFactory typeFactory, + public MappingBuilderContext(TypeFactory typeFactory, Elements elementUtils, Types typeUtils, Messager messager, 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 bdb9066be..8f70640ff 100644 --- a/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java +++ b/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java @@ -63,13 +63,13 @@ public class PropertyMapping extends ModelElement { public static class PropertyMappingBuilder { - private MappingContext ctx; + private MappingBuilderContext ctx; private SourceMethod method; private ExecutableElement targetAccessor; private String targetPropertyName; private Parameter parameter; - public PropertyMappingBuilder mappingContext(MappingContext mappingContext) { + public PropertyMappingBuilder mappingContext(MappingBuilderContext mappingContext) { this.ctx = mappingContext; return this; } @@ -321,14 +321,14 @@ public class PropertyMapping extends ModelElement { public static class ConstantMappingBuilder { - private MappingContext ctx; + private MappingBuilderContext ctx; private SourceMethod method; private String constantExpression; private ExecutableElement targetAccessor; private String dateFormat; private List qualifiers; - public ConstantMappingBuilder mappingContext(MappingContext mappingContext) { + public ConstantMappingBuilder mappingContext(MappingBuilderContext mappingContext) { this.ctx = mappingContext; return this; } @@ -415,12 +415,12 @@ public class PropertyMapping extends ModelElement { public static class JavaExpressionMappingBuilder { - private MappingContext ctx; + private MappingBuilderContext ctx; private SourceMethod method; private String javaExpression; private ExecutableElement targetAccessor; - public JavaExpressionMappingBuilder mappingContext(MappingContext mappingContext) { + public JavaExpressionMappingBuilder mappingContext(MappingBuilderContext mappingContext) { this.ctx = mappingContext; return this; } 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 cee4bf208..e4d878ce4 100644 --- a/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java +++ b/processor/src/main/java/org/mapstruct/ap/processor/MapperCreationProcessor.java @@ -44,7 +44,7 @@ import org.mapstruct.ap.model.IterableMappingMethod; import org.mapstruct.ap.model.MapMappingMethod; import org.mapstruct.ap.model.Mapper; import org.mapstruct.ap.model.MapperReference; -import org.mapstruct.ap.model.MappingContext; +import org.mapstruct.ap.model.MappingBuilderContext; import org.mapstruct.ap.model.MappingMethod; import org.mapstruct.ap.model.common.Type; import org.mapstruct.ap.model.common.TypeFactory; @@ -69,7 +69,7 @@ public class MapperCreationProcessor implements ModelElementProcessor sourceModel) { @@ -81,7 +81,7 @@ public class MapperCreationProcessor implements ModelElementProcessor mapperReferences = initReferencedMappers( mapperTypeElement ); - MappingContext ctx = new MappingContext( + MappingBuilderContext ctx = new MappingBuilderContext( typeFactory, elementUtils, typeUtils, diff --git a/processor/src/main/java/org/mapstruct/ap/processor/creation/MappingResolverImpl.java b/processor/src/main/java/org/mapstruct/ap/processor/creation/MappingResolverImpl.java index 0fbc6f3ed..c666e679c 100644 --- a/processor/src/main/java/org/mapstruct/ap/processor/creation/MappingResolverImpl.java +++ b/processor/src/main/java/org/mapstruct/ap/processor/creation/MappingResolverImpl.java @@ -33,7 +33,7 @@ import org.mapstruct.ap.conversion.Conversions; import org.mapstruct.ap.model.AssignmentFactory; import org.mapstruct.ap.model.Direct; import org.mapstruct.ap.model.MapperReference; -import org.mapstruct.ap.model.MappingContext.MappingResolver; +import org.mapstruct.ap.model.MappingBuilderContext.MappingResolver; import org.mapstruct.ap.model.VirtualMappingMethod; import org.mapstruct.ap.model.assignment.Assignment; import org.mapstruct.ap.model.common.ConversionContext;