From 75021ada1b85a2b8dea9434b034bdff2113b37a2 Mon Sep 17 00:00:00 2001
From: sjaakd <sjaakderksen@zonnet.nl>
Date: Sat, 13 Aug 2016 15:08:24 +0200
Subject: [PATCH] #846 Exclude updates methods from suitable constructor check

---
 .../processor/MapperCreationProcessor.java    |  5 +-
 .../ap/test/bugs/_846/Mapper846.java          | 78 +++++++++++++++++++
 .../ap/test/bugs/_846/UpdateTest.java         | 39 ++++++++++
 3 files changed, 120 insertions(+), 2 deletions(-)
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_846/Mapper846.java
 create mode 100644 processor/src/test/java/org/mapstruct/ap/test/bugs/_846/UpdateTest.java

diff --git a/processor/src/main/java/org/mapstruct/ap/internal/processor/MapperCreationProcessor.java b/processor/src/main/java/org/mapstruct/ap/internal/processor/MapperCreationProcessor.java
index c1bdd4056..e41fa1732 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/processor/MapperCreationProcessor.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/processor/MapperCreationProcessor.java
@@ -460,8 +460,9 @@ public class MapperCreationProcessor implements ModelElementProcessor<List<Sourc
 
             // is there a suitable constructor
             if ( method.isBeanMapping()
-                && !method.getResultType().isCollectionOrMapType()
-                && !method.getResultType().hasEmptyAccessibleContructor() ) {
+                && !method.isUpdateMethod()
+                && !method.getReturnType().isCollectionOrMapType()
+                && !method.getReturnType().hasEmptyAccessibleContructor() ) {
                 reportErrorWhenNoSuitableConstrutor( method, reversePrism );
                 return null;
             }
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_846/Mapper846.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_846/Mapper846.java
new file mode 100644
index 000000000..f2b83fddc
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_846/Mapper846.java
@@ -0,0 +1,78 @@
+/**
+ *  Copyright 2012-2016 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.mapstruct.ap.test.bugs._846;
+
+import org.mapstruct.InheritInverseConfiguration;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.MappingTarget;
+
+public class Mapper846 {
+
+    interface BInterface {
+
+        String getName();
+
+        void setName(String s);
+    }
+
+    static class B implements BInterface {
+
+        String name;
+
+        B() {
+        }
+
+        @Override
+        public String getName() {
+            return name;
+        }
+
+        @Override
+        public void setName(String name) {
+            this.name = name;
+        }
+    }
+
+    static class A {
+
+        String aName;
+
+        A() {
+        }
+
+        public String getaName() {
+            return aName;
+        }
+
+        public void setaName(String name) {
+            this.aName = name;
+        }
+    }
+
+    @Mapper
+    interface MyMapper {
+
+        @Mapping(source = "name", target = "aName")
+        A convert(BInterface b);
+
+        @InheritInverseConfiguration
+        void convert(@MappingTarget BInterface target, A source);
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_846/UpdateTest.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_846/UpdateTest.java
new file mode 100644
index 000000000..03b379adc
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_846/UpdateTest.java
@@ -0,0 +1,39 @@
+/**
+ *  Copyright 2012-2016 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.mapstruct.ap.test.bugs._846;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mapstruct.ap.testutil.IssueKey;
+import org.mapstruct.ap.testutil.WithClasses;
+import org.mapstruct.ap.testutil.runner.AnnotationProcessorTestRunner;
+
+@RunWith(AnnotationProcessorTestRunner.class)
+@IssueKey("846")
+@WithClasses({
+    Mapper846.class
+})
+public class UpdateTest {
+
+    @Test
+    public void shouldProduceMapper() {
+
+    }
+
+}