From c5c292f602b7a60e762d1cbac04283e3330c6d87 Mon Sep 17 00:00:00 2001
From: Filip Hrisafov <filip.hrisafov@gmail.com>
Date: Sat, 26 Jun 2021 11:28:37 +0200
Subject: [PATCH] #2501 Add test case

---
 .../ap/test/bugs/_2501/Issue2501Mapper.java   | 62 +++++++++++++++++++
 .../ap/test/bugs/_2501/Issue2501Test.java     | 30 +++++++++
 2 files changed, 92 insertions(+)
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_2501/Issue2501Mapper.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_2501/Issue2501Test.java

diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2501/Issue2501Mapper.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2501/Issue2501Mapper.java
new file mode 100644
index 000000000..08fa63779
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2501/Issue2501Mapper.java
@@ -0,0 +1,62 @@
+/*
+ * 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._2501;
+
+import java.util.Optional;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * @author Filip Hrisafov
+ */
+@Mapper
+public interface Issue2501Mapper {
+
+    Issue2501Mapper INSTANCE = Mappers.getMapper( Issue2501Mapper.class );
+
+    Customer map(CustomerDTO value);
+
+    CustomerStatus map(DtoStatus status);
+
+    default <T> T unwrap(Optional<T> optional) {
+        return optional.orElse( null );
+    }
+
+    enum CustomerStatus {
+        ENABLED, DISABLED,
+    }
+
+    class Customer {
+
+        private CustomerStatus status;
+
+        public CustomerStatus getStatus() {
+            return status;
+        }
+
+        public void setStatus(CustomerStatus stat) {
+            this.status = stat;
+        }
+    }
+
+    enum DtoStatus {
+        ENABLED, DISABLED
+    }
+
+    class CustomerDTO {
+
+        private DtoStatus status;
+
+        public Optional<DtoStatus> getStatus() {
+            return Optional.ofNullable( status );
+        }
+
+        public void setStatus(DtoStatus stat) {
+            this.status = stat;
+        }
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2501/Issue2501Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2501/Issue2501Test.java
new file mode 100644
index 000000000..c5eb1e0ae
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2501/Issue2501Test.java
@@ -0,0 +1,30 @@
+/*
+ * 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._2501;
+
+import org.mapstruct.ap.testutil.ProcessorTest;
+import org.mapstruct.ap.testutil.WithClasses;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Filip Hrisafov
+ */
+@WithClasses({
+    Issue2501Mapper.class
+})
+class Issue2501Test {
+
+    @ProcessorTest
+    void shouldUnwrapEnumOptional() {
+        Issue2501Mapper.CustomerDTO source = new Issue2501Mapper.CustomerDTO();
+        source.setStatus( Issue2501Mapper.DtoStatus.DISABLED );
+
+        Issue2501Mapper.Customer target = Issue2501Mapper.INSTANCE.map( source );
+
+        assertThat( target.getStatus() ).isEqualTo( Issue2501Mapper.CustomerStatus.DISABLED );
+    }
+}