#38 Only treat public non static getters and setter as potential accessors

Author: filiphr

src/main/java/org/mapstruct/intellij/util/MapstructUtil.java

@@ -153,6 +153,10 @@ public static boolean isPublic(@NotNull PsiMethod method) {
         return method.hasModifierProperty( PsiModifier.PUBLIC );
     }
 
+    public static boolean isPublicNonStatic(@NotNull PsiMethod method) {
+        return isPublic( method ) && !method.hasModifierProperty( PsiModifier.STATIC );
+    }
+
     public static boolean isPublicStatic(@NotNull PsiMethod method) {
         return isPublic( method ) && method.hasModifierProperty( PsiModifier.STATIC );
     }

src/main/java/org/mapstruct/intellij/util/SourceUtils.java

@@ -135,7 +135,7 @@ private static Map<String, Pair<PsiMethod, PsiSubstitutor>> publicGetters(@NotNu
 
     @Nullable
     private static String extractPublicGetterPropertyName(PsiMethod method) {
-        if ( method.getParameterList().getParametersCount() != 0 || !MapstructUtil.isPublic( method ) ) {
+        if ( method.getParameterList().getParametersCount() != 0 || !MapstructUtil.isPublicNonStatic( method ) ) {
             return null;
         }
         // This logic is aligned with the DefaultAccessorNamingStrategy

src/main/java/org/mapstruct/intellij/util/TargetUtils.java

@@ -133,7 +133,7 @@ private static Map<String, Pair<? extends PsiMember, PsiSubstitutor>> publicSett
     @Nullable
     private static String extractPublicSetterPropertyName(PsiMethod method, @NotNull PsiType typeToUse,
         boolean builderSupportPresent) {
-        if ( method.getParameterList().getParametersCount() != 1 || !MapstructUtil.isPublic( method ) ) {
+        if ( method.getParameterList().getParametersCount() != 1 || !MapstructUtil.isPublicNonStatic( method ) ) {
             // If the method does not have 1 parameter or is not public then there is no property
             return null;
         }

src/test/java/org/mapstruct/intellij/bugs/_38/Issue38Test.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.intellij.bugs._38;
+
+import com.intellij.codeInsight.lookup.LookupElement;
+import org.mapstruct.intellij.MapstructBaseCompletionTestCase;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Filip Hrisafov
+ */
+public class Issue38Test extends MapstructBaseCompletionTestCase {
+
+    @Override
+    protected String getTestDataPath() {
+        return "testData/bugs/_38";
+    }
+
+    public void testUnmappedTargetWithPublicStaticProperty() {
+        configureByTestName();
+        assertThat( myItems )
+            .extracting( LookupElement::getLookupString )
+            .containsExactlyInAnyOrder(
+                "isbn"
+            );
+    }
+
+    public void testUnmappedSourceWithPublicStaticProperty() {
+        configureByTestName();
+        assertThat( myItems )
+            .extracting( LookupElement::getLookupString )
+            .containsExactlyInAnyOrder(
+                "isbn"
+            );
+    }
+}

testData/bugs/_38/UnmappedSourceWithPublicStaticProperty.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+
+@Mapper
+public interface Issue38Mapper {
+
+    @Mapping(source = "<caret>")
+    Book map(BookDto isbn);
+}
+
+public class Book {
+
+    public String isbn;
+
+}
+
+public class BookDto {
+
+    protected static Integer inStock = 10;
+
+    protected String isbn;
+
+    public String getIsbn() {
+        return isbn;
+    }
+
+    public void setIsbn(String isbn) {
+        this.isbn = isbn;
+    }
+
+    public static Integer getInStock() {
+        return inStock;
+    }
+}
+

testData/bugs/_38/UnmappedTargetWithPublicStaticProperty.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
+ */
+
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+
+@Mapper
+public interface Issue38Mapper {
+
+    @Mapping(target = "<caret>")
+    BookDto map(String isbn);
+}
+
+public class BookDto {
+
+    protected String isbn;
+
+    public String getIsbn() {
+        return isbn;
+    }
+
+    public void setIsbn(String isbn) {
+        this.isbn = isbn;
+    }
+
+    public static BookDto fromIsbn(String isbn) {
+        BookDto dto = new BookDto();
+        dto.setIsbn( isbn );
+        return dto;
+    }
+}
+