From 865371255a769f6a7415254b6585876227fee9db Mon Sep 17 00:00:00 2001
From: Filip Hrisafov <filip.hrisafov@gmail.com>
Date: Sat, 11 Feb 2017 19:09:56 +0100
Subject: [PATCH] #1057 Add forged named based parameter to distinguish between
 our methods that MapStruct has to create and methods that we create for the
 internal framework

---
 .../model/AbstractMappingMethodBuilder.java     |  3 ++-
 .../ap/internal/model/BeanMappingMethod.java    |  2 +-
 .../ap/internal/model/PropertyMapping.java      | 17 +++++++++++++++--
 .../ap/internal/model/source/ForgedMethod.java  | 13 +++++++++----
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/AbstractMappingMethodBuilder.java b/processor/src/main/java/org/mapstruct/ap/internal/model/AbstractMappingMethodBuilder.java
index 5be3fb186e..1c34d85ad7 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/AbstractMappingMethodBuilder.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/AbstractMappingMethodBuilder.java
@@ -69,7 +69,8 @@ Assignment forgeMapping(SourceRHS sourceRHS, Type sourceType, Type targetType) {
                 shouldUsePropertyNamesInHistory(),
                 sourceRHS.getSourceErrorMessagePart()
             ),
-            null
+            null,
+            true
         );
 
         return createForgedBeanAssignment( sourceRHS, forgedMethod );
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/BeanMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/BeanMappingMethod.java
index 314659d526..b9ba81639c 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/BeanMappingMethod.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/BeanMappingMethod.java
@@ -664,7 +664,7 @@ private void reportErrorForUnmappedTargetPropertiesIfRequired() {
             ReportingPolicyPrism unmappedTargetPolicy = getUnmappedTargetPolicy();
 
             //we handle automapping forged methods differently than the usual source ones. in
-            if ( method instanceof ForgedMethod && ( (ForgedMethod) method ).isAutoMapping() ) {
+            if ( method instanceof ForgedMethod && ( (ForgedMethod) method ).isForgedNamedBased() ) {
 
                 ForgedMethod forgedMethod = (ForgedMethod) this.method;
                 if ( targetProperties.isEmpty() || !unprocessedTargetProperties.isEmpty() ) {
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 e036e1d906..6e3bcd30db 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
@@ -188,6 +188,7 @@ public static class PropertyMappingBuilder extends MappingBuilderBase<PropertyMa
         private SelectionParameters selectionParameters;
         private MappingOptions forgeMethodWithMappingOptions;
         private boolean forceUpdateMethod;
+        private boolean forgedNamedBased = true;
 
         PropertyMappingBuilder() {
             super( PropertyMappingBuilder.class );
@@ -229,6 +230,16 @@ public PropertyMappingBuilder forceUpdateMethod(boolean forceUpdateMethod) {
             return this;
         }
 
+        /**
+         * @param forgedNamedBased mapping is based on forging
+         *
+         * @return the builder for chaining
+         */
+        public PropertyMappingBuilder forgedNamedBased(boolean forgedNamedBased) {
+            this.forgedNamedBased = forgedNamedBased;
+            return this;
+        }
+
         public PropertyMapping build() {
             // handle source
             this.rightHandSide = getSourceRHS( sourceReference );
@@ -587,7 +598,8 @@ private ForgedMethod prepareForgedMethod(Type sourceType, Type targetType, Sourc
                 method.getContextParameters(),
                 method.getContextProvidedMethods(),
                 getForgedMethodHistory( source, suffix ),
-                null
+                null,
+                forgedNamedBased
             );
         }
 
@@ -638,7 +650,8 @@ private Assignment forgeMapping(SourceRHS sourceRHS) {
                 parameters,
                 method.getContextProvidedMethods(),
                 getForgedMethodHistory( sourceRHS ),
-                forgeMethodWithMappingOptions
+                forgeMethodWithMappingOptions,
+                forgedNamedBased
             );
             return createForgedBeanAssignment( sourceRHS, forgedMethod );
         }
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/source/ForgedMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/source/ForgedMethod.java
index 88517f6c10..47f1a8d7b2 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/source/ForgedMethod.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/source/ForgedMethod.java
@@ -50,6 +50,7 @@ public class ForgedMethod implements Method {
     private final Parameter mappingTargetParameter;
     private final MappingOptions mappingOptions;
     private final ParameterProvidedMethods contextProvidedMethods;
+    private final boolean forgedNameBased;
 
     /**
      * Creates a new forged method with the given name.
@@ -75,7 +76,8 @@ public ForgedMethod(String name, Type sourceType, Type returnType, MapperConfigu
             additionalParameters,
             parameterProvidedMethods,
             null,
-            null );
+            null,
+            false );
     }
 
      /**
@@ -91,11 +93,12 @@ public ForgedMethod(String name, Type sourceType, Type returnType, MapperConfigu
      *            parameters
      * @param history a parent forged method if this is a forged method within a forged method
      * @param mappingOptions the mapping options for this method
+     * @param forgedNameBased forges a name based (matched) mapping method
      */
     public ForgedMethod(String name, Type sourceType, Type returnType, MapperConfiguration mapperConfiguration,
                         ExecutableElement positionHintElement, List<Parameter> additionalParameters,
                         ParameterProvidedMethods parameterProvidedMethods, ForgedMethodHistory history,
-                        MappingOptions mappingOptions) {
+                        MappingOptions mappingOptions, boolean forgedNameBased) {
         String sourceParamName = Strings.decapitalize( sourceType.getName() );
         String sourceParamSafeName = Strings.getSaveVariableName( sourceParamName );
 
@@ -116,6 +119,7 @@ public ForgedMethod(String name, Type sourceType, Type returnType, MapperConfigu
         this.history = history;
         this.mappingOptions = mappingOptions == null ? MappingOptions.empty() : mappingOptions;
         this.mappingOptions.initWithParameter( sourceParameter );
+        this.forgedNameBased = forgedNameBased;
     }
 
     /**
@@ -138,6 +142,7 @@ public ForgedMethod(String name, ForgedMethod forgedMethod) {
         this.contextProvidedMethods = forgedMethod.contextProvidedMethods;
 
         this.name = name;
+        this.forgedNameBased = forgedMethod.forgedNameBased;
     }
 
     @Override
@@ -224,8 +229,8 @@ public ForgedMethodHistory getHistory() {
         return history;
     }
 
-    public boolean isAutoMapping() {
-        return mappingOptions.getValueMappings().isEmpty();
+    public boolean isForgedNamedBased() {
+        return forgedNameBased;
     }
 
     public void addThrownTypes(List<Type> thrownTypesToAdd) {