From 196528e5783ab39401982fae449ec91de98b06ab Mon Sep 17 00:00:00 2001
From: Zegveld <41897697+Zegveld@users.noreply.github.com>
Date: Wed, 11 Aug 2021 06:49:05 +0200
Subject: [PATCH] #2530: fix missing supporting fields for ReverseConversion

---
 .../conversion/ReverseConversion.java         |  5 +++
 .../ap/test/bugs/_2530/Issue2530Mapper.java   | 37 +++++++++++++++++++
 .../ap/test/bugs/_2530/Issue2530Test.java     | 34 +++++++++++++++++
 3 files changed, 76 insertions(+)
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_2530/Issue2530Mapper.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_2530/Issue2530Test.java

diff --git a/processor/src/main/java/org/mapstruct/ap/internal/conversion/ReverseConversion.java b/processor/src/main/java/org/mapstruct/ap/internal/conversion/ReverseConversion.java
index 7fd7f6bbb..0e2cd3d83 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/conversion/ReverseConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/conversion/ReverseConversion.java
@@ -9,6 +9,7 @@ import java.util.Collections;
 import java.util.List;
 import org.mapstruct.ap.internal.model.common.Assignment;
 import org.mapstruct.ap.internal.model.common.ConversionContext;
+import org.mapstruct.ap.internal.model.common.FieldReference;
 import org.mapstruct.ap.internal.model.HelperMethod;
 
 /**
@@ -44,4 +45,8 @@ public class ReverseConversion implements ConversionProvider {
         return Collections.emptyList();
     }
 
+    @Override
+    public List<FieldReference> getRequiredHelperFields(ConversionContext conversionContext) {
+        return conversionProvider.getRequiredHelperFields( conversionContext );
+    }
 }
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2530/Issue2530Mapper.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2530/Issue2530Mapper.java
new file mode 100644
index 000000000..268237376
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2530/Issue2530Mapper.java
@@ -0,0 +1,37 @@
+/*
+ * 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._2530;
+
+import java.time.LocalDate;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * @author Ben Zegveld
+ */
+@Mapper
+public interface Issue2530Mapper {
+
+    Issue2530Mapper INSTANCE = Mappers.getMapper( Issue2530Mapper.class );
+
+    @Mapping(target = "date", source = ".", dateFormat = "yyyy-MM-dd")
+    Test map(String s);
+
+    class Test {
+
+        LocalDate date;
+
+        public LocalDate getDate() {
+            return date;
+        }
+
+        public void setDate(LocalDate dateTime) {
+            this.date = dateTime;
+        }
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2530/Issue2530Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2530/Issue2530Test.java
new file mode 100644
index 000000000..a1ea466d0
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2530/Issue2530Test.java
@@ -0,0 +1,34 @@
+/*
+ * 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._2530;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.Month;
+
+import org.mapstruct.ap.testutil.IssueKey;
+import org.mapstruct.ap.testutil.ProcessorTest;
+import org.mapstruct.ap.testutil.WithClasses;
+
+/**
+ * @author Ben Zegveld
+ */
+@IssueKey("2530")
+@WithClasses({
+    Issue2530Mapper.class
+})
+public class Issue2530Test {
+
+    @ProcessorTest
+    public void shouldConvert() {
+        Issue2530Mapper.Test target = Issue2530Mapper.INSTANCE.map( "2021-07-31" );
+
+        assertThat( target ).isNotNull();
+        assertThat( target.getDate().getYear() ).isEqualTo( 2021 );
+        assertThat( target.getDate().getMonth() ).isEqualTo( Month.JULY );
+        assertThat( target.getDate().getDayOfMonth() ).isEqualTo( 31 );
+    }
+}