#2945 Stabilise top level imports

Make sure that GeneratedType always gets the imported types from a Type before adding them
mapstruct · filiphr · Aug 24, 2022 · Aug 21, 2022 · Aug 21, 2022 · Aug 21, 2022
commit 7ba027fc756a99f78b1e6cc4ede8dc45419f86af
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/GeneratedType.java b/processor/src/main/java/org/mapstruct/ap/internal/model/GeneratedType.java
@@ -258,8 +258,10 @@ protected void addIfImportRequired(Collection<Type> collection, Type typeToAdd)
             return;
         }
 
-        if ( needsImportDeclaration( typeToAdd ) ) {
-            collection.add( typeToAdd );
+        for ( Type type : typeToAdd.getImportTypes() ) {
+            if ( needsImportDeclaration( type ) ) {
+                collection.add( type );
+            }
         }
     }
 

diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2945/Issue2945Mapper.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2945/Issue2945Mapper.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.ap.test.bugs._2945;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.ap.test.bugs._2945._target.Target;
+import org.mapstruct.ap.test.bugs._2945.source.Source;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * @author Filip Hrisafov
+ */
+@Mapper
+public interface Issue2945Mapper {
+
+    Issue2945Mapper INSTANCE = Mappers.getMapper( Issue2945Mapper.class );
+
+    Target map(Source source);
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2945/Issue2945Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2945/Issue2945Test.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2945;
+
+import org.mapstruct.ap.test.bugs._2945._target.EnumHolder;
+import org.mapstruct.ap.test.bugs._2945._target.Target;
+import org.mapstruct.ap.test.bugs._2945.source.Source;
+import org.mapstruct.ap.testutil.IssueKey;
+import org.mapstruct.ap.testutil.ProcessorTest;
+import org.mapstruct.ap.testutil.WithClasses;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Filip Hrisafov
+ */
+@IssueKey("2945")
+@WithClasses({
+    EnumHolder.class,
+    Issue2945Mapper.class,
+    Source.class,
+    Target.class,
+})
+class Issue2945Test {
+
+    @ProcessorTest
+    void shouldCompile() {
+        Target target = Issue2945Mapper.INSTANCE.map( new Source( "VALUE_1" ) );
+
+        assertThat( target.getProperty() ).isEqualTo( EnumHolder.Property.VALUE_1 );
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2945/_target/EnumHolder.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2945/_target/EnumHolder.java
@@ -0,0 +1,13 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2945._target;
+
+public class EnumHolder {
+    public enum Property {
+        VALUE_1,
+        VALUE_2;
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2945/_target/Target.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2945/_target/Target.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2945._target;
+
+public class Target {
+    private EnumHolder.Property property;
+
+    public EnumHolder.Property getProperty() {
+        return property;
+    }
+
+    public void setProperty(EnumHolder.Property property) {
+        this.property = property;
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2945/source/Source.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2945/source/Source.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.ap.test.bugs._2945.source;
+
+/**
+ * @author Filip Hrisafov
+ */
+public class Source {
+
+    private final String property;
+
+    public Source(String property) {
+        this.property = property;
+    }
+
+    public String getProperty() {
+        return property;
+    }
+}