#1075, forge map to bean method

ckosmowski · ckosmowski · commit f439ab29328c · 2021-01-17T14:44:55.000+01:00
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
@@ -296,6 +296,9 @@ private Assignment forge( ) {
             else if ( sourceType.isMapType() && targetType.isMapType() ) {
                 assignment = forgeMapMapping( sourceType, targetType, rightHandSide );
             }
+            else if ( sourceType.isMapType() && !targetType.isMapType()) {
+                assignment = forgeMapToBeanMapping( sourceType, targetType, rightHandSide );
+            }
             else if ( ( sourceType.isIterableType() && targetType.isStreamType() )
                         || ( sourceType.isStreamType() && targetType.isStreamType() )
                         || ( sourceType.isStreamType() && targetType.isIterableType() ) ) {
@@ -690,6 +693,19 @@ private Assignment forgeMapMapping(Type sourceType, Type targetType, SourceRHS s
             return createForgedAssignment( source, methodRef, mapMappingMethod );
         }
 
+        private Assignment forgeMapToBeanMapping(Type sourceType, Type targetType, SourceRHS source) {
+
+            targetType = targetType.withoutBounds();
+            ForgedMethod methodRef = prepareForgedMethod( sourceType, targetType, source, "{}" );
+
+            BeanMappingMethod.Builder builder = new BeanMappingMethod.Builder();
+            final BeanMappingMethod mapToBeanMappingMethod = builder.mappingContext( ctx )
+                .forgedMethod( methodRef )
+                .build();
+
+            return createForgedAssignment( source, methodRef, mapToBeanMappingMethod );
+        }
+
         private Assignment forgeMapping(SourceRHS sourceRHS) {
             Type sourceType;
             if ( targetWriteAccessorType == AccessorType.ADDER ) {
diff --git a/processor/src/test/java/org/mapstruct/ap/test/frommap/MapToBeanFromMapAndNestedMap.java b/processor/src/test/java/org/mapstruct/ap/test/frommap/MapToBeanFromMapAndNestedMap.java
@@ -21,7 +21,7 @@ public interface MapToBeanFromMapAndNestedMap {
 
     Target toTarget(Source source);
 
-    NestedTarget toNestedTarget(Map<String, String> nestedMap);
+    //NestedTarget toNestedTarget(Map<String, String> nestedMap);
 
     class Source {
 
