From d398618aa5e514eb5c87ccfdf7ebc72fe4ecedfe Mon Sep 17 00:00:00 2001 From: sjaakd Date: Mon, 19 Dec 2016 21:44:36 +0100 Subject: [PATCH] #60 automapping removing commented-out-code and copyright --- copyright.txt | 1 + .../mapstruct/ap/internal/model/MapMappingMethod.java | 9 --------- .../org/mapstruct/ap/internal/model/PropertyMapping.java | 8 ++++---- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/copyright.txt b/copyright.txt index 01b7b4dc9..b59651d46 100644 --- a/copyright.txt +++ b/copyright.txt @@ -6,6 +6,7 @@ Christian Schuster Christophe Labouisse Ciaran Liedeman Dilip Krishnan +Dmytro Polovinkin Ewald Volkert Filip Hrisafov Gunnar Morling diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/MapMappingMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/MapMappingMethod.java index 0471f01be..75179453b 100644 --- a/processor/src/main/java/org/mapstruct/ap/internal/model/MapMappingMethod.java +++ b/processor/src/main/java/org/mapstruct/ap/internal/model/MapMappingMethod.java @@ -120,16 +120,7 @@ public class MapMappingMethod extends MappingMethod { ); if ( keyAssignment == null ) { - keyAssignment = forgeMapping( keySourceRHS, keySourceType, keyTargetType ); -// if ( method instanceof ForgedMethod ) { -// // leave messaging to calling property mapping -// return null; -// } -// else { -// ctx.getMessager().printMessage( method.getExecutable(), -// Message.MAPMAPPING_KEY_MAPPING_NOT_FOUND ); -// } } // find mapping method or conversion for value 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 7dae55e7a..253603b7b 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 @@ -82,10 +82,6 @@ public class PropertyMapping extends ModelElement { private final Assignment defaultValueAssignment; private List forgedMethods = new ArrayList(); - public List getForgedMethods() { - return forgedMethods; - } - private enum TargetWriteAccessorType { FIELD, GETTER, @@ -967,6 +963,10 @@ public class PropertyMapping extends ModelElement { return dependsOn; } + public List getForgedMethods() { + return forgedMethods; + } + @Override public String toString() { return "PropertyMapping {"