From b59a23965a0c77206851a118c5b1673819735dd4 Mon Sep 17 00:00:00 2001
From: Filip Hrisafov <filip.hrisafov@gmail.com>
Date: Sun, 29 Aug 2021 11:24:34 +0200
Subject: [PATCH] #2554 Records should not treat collections as alternative
 target accessors

---
 .../java/org/mapstruct/itest/records/Car.java | 24 ++++++++++++++
 .../itest/records/CarAndWheelMapper.java      | 31 +++++++++++++++++++
 .../org/mapstruct/itest/records/CarDto.java   | 15 +++++++++
 .../itest/records/WheelPosition.java          | 22 +++++++++++++
 .../mapstruct/itest/records/RecordsTest.java  | 14 +++++++++
 .../ap/internal/model/common/Type.java        |  7 +++++
 6 files changed, 113 insertions(+)
 create mode 100644 integrationtest/src/test/resources/recordsTest/src/main/java/org/mapstruct/itest/records/Car.java
 create mode 100644 integrationtest/src/test/resources/recordsTest/src/main/java/org/mapstruct/itest/records/CarAndWheelMapper.java
 create mode 100644 integrationtest/src/test/resources/recordsTest/src/main/java/org/mapstruct/itest/records/CarDto.java
 create mode 100644 integrationtest/src/test/resources/recordsTest/src/main/java/org/mapstruct/itest/records/WheelPosition.java

diff --git a/integrationtest/src/test/resources/recordsTest/src/main/java/org/mapstruct/itest/records/Car.java b/integrationtest/src/test/resources/recordsTest/src/main/java/org/mapstruct/itest/records/Car.java
new file mode 100644
index 000000000..9332c47df
--- /dev/null
+++ b/integrationtest/src/test/resources/recordsTest/src/main/java/org/mapstruct/itest/records/Car.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.itest.records;
+
+import java.util.List;
+
+/**
+ * @author Filip Hrisafov
+ */
+public class Car {
+
+    private List<WheelPosition> wheelPositions;
+
+    public List<WheelPosition> getWheelPositions() {
+        return wheelPositions;
+    }
+
+    public void setWheelPositions(List<WheelPosition> wheelPositions) {
+        this.wheelPositions = wheelPositions;
+    }
+}
diff --git a/integrationtest/src/test/resources/recordsTest/src/main/java/org/mapstruct/itest/records/CarAndWheelMapper.java b/integrationtest/src/test/resources/recordsTest/src/main/java/org/mapstruct/itest/records/CarAndWheelMapper.java
new file mode 100644
index 000000000..cc69ae760
--- /dev/null
+++ b/integrationtest/src/test/resources/recordsTest/src/main/java/org/mapstruct/itest/records/CarAndWheelMapper.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.itest.records;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * @author Filip Hrisafov
+ */
+@Mapper(unmappedTargetPolicy = ReportingPolicy.ERROR)
+public interface CarAndWheelMapper {
+
+    CarAndWheelMapper INSTANCE = Mappers.getMapper( CarAndWheelMapper.class );
+
+    default String stringFromWheelPosition(WheelPosition source) {
+        return source == null ? null : source.getPosition();
+    }
+
+    default WheelPosition wheelPositionFromString(String source) {
+        return source == null ? null : new WheelPosition(source);
+    }
+
+    CarDto carDtoFromCar(Car source);
+
+    Car carFromCarDto(CarDto source);
+}
diff --git a/integrationtest/src/test/resources/recordsTest/src/main/java/org/mapstruct/itest/records/CarDto.java b/integrationtest/src/test/resources/recordsTest/src/main/java/org/mapstruct/itest/records/CarDto.java
new file mode 100644
index 000000000..547055006
--- /dev/null
+++ b/integrationtest/src/test/resources/recordsTest/src/main/java/org/mapstruct/itest/records/CarDto.java
@@ -0,0 +1,15 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.itest.records;
+
+import java.util.List;
+
+/**
+ * @author Filip Hrisafov
+ */
+public record CarDto(List<String> wheelPositions) {
+
+}
diff --git a/integrationtest/src/test/resources/recordsTest/src/main/java/org/mapstruct/itest/records/WheelPosition.java b/integrationtest/src/test/resources/recordsTest/src/main/java/org/mapstruct/itest/records/WheelPosition.java
new file mode 100644
index 000000000..fe8016ddb
--- /dev/null
+++ b/integrationtest/src/test/resources/recordsTest/src/main/java/org/mapstruct/itest/records/WheelPosition.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.itest.records;
+
+/**
+ * @author Filip Hrisafov
+ */
+public class WheelPosition {
+
+    private final String position;
+
+    public WheelPosition(String position) {
+        this.position = position;
+    }
+
+    public String getPosition() {
+        return position;
+    }
+}
diff --git a/integrationtest/src/test/resources/recordsTest/src/test/java/org/mapstruct/itest/records/RecordsTest.java b/integrationtest/src/test/resources/recordsTest/src/test/java/org/mapstruct/itest/records/RecordsTest.java
index b40468180..e3d055345 100644
--- a/integrationtest/src/test/resources/recordsTest/src/test/java/org/mapstruct/itest/records/RecordsTest.java
+++ b/integrationtest/src/test/resources/recordsTest/src/test/java/org/mapstruct/itest/records/RecordsTest.java
@@ -5,6 +5,8 @@
  */
 package org.mapstruct.itest.records;
 
+import java.util.Arrays;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
@@ -47,4 +49,16 @@ public class RecordsTest {
         assertThat( value ).isNotNull();
         assertThat( value.value() ).isEqualTo( "Kermit" );
     }
+
+    @Test
+    public void shouldMapIntoRecordWithList() {
+        Car car = new Car();
+        car.setWheelPositions( Arrays.asList( new WheelPosition( "left" ) ) );
+
+        CarDto carDto = CarAndWheelMapper.INSTANCE.carDtoFromCar(car);
+
+        assertThat( carDto ).isNotNull();
+        assertThat( carDto.wheelPositions() )
+            .containsExactly( "left" );
+    }
 }
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java b/processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java
index 4da9128f9..e13d7b9dd 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java
@@ -874,6 +874,13 @@ public class Type extends ModelElement implements Comparable<Type> {
      * @return an unmodifiable list of alternative target accessors.
      */
     private List<Accessor> getAlternativeTargetAccessors() {
+        if ( alternativeTargetAccessors != null ) {
+            return alternativeTargetAccessors;
+        }
+
+        if ( isRecord() ) {
+            alternativeTargetAccessors = Collections.emptyList();
+        }
 
         if ( alternativeTargetAccessors == null ) {