third_codes/mapstruct
1
0
Fork 0
mirror of https://github.com/mapstruct/mapstruct.git synced 2025-07-26 00:00:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

#1150 Improve error reporting for nested properties

Browse Source
This commit is contained in:
Filip Hrisafov 2017-06-29 20:25:42 +02:00 committed by GitHub
parent a3eca8c8ca
commit 7a9464c525
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
processor/src/main/java/org/mapstruct/ap/internal/model/PropertyMapping.java
View File

@ -324,7 +324,9 @@ public class PropertyMapping extends ModelElement {
*/ */
private void reportCannotCreateMapping() { private void reportCannotCreateMapping() {
if ( method instanceof ForgedMethod && ( (ForgedMethod) method ).getHistory() != null ) { if ( method instanceof ForgedMethod && ( (ForgedMethod) method ).getHistory() != null ) {
ForgedMethodHistory history = ( (ForgedMethod) method ).getHistory(); // The history that is part of the ForgedMethod misses the information from the current right hand
// side. Therefore we need to extract the most relevant history and use that in the error reporting.
ForgedMethodHistory history = getForgedMethodHistory( rightHandSide );
reportCannotCreateMapping( reportCannotCreateMapping(
method, method,
history.createSourcePropertyErrorMessage(), history.createSourcePropertyErrorMessage(),

8
processor/src/test/java/org/mapstruct/ap/test/nestedbeans/exclusions/ErroneousJavaInternalTest.java
View File

@ -57,7 +57,13 @@ public class ErroneousJavaInternalTest {
line = 29, line = 29,
messageRegExp = "Can't map property \".*List<.*MyType> types\" to \".*List<.*String> types\"\\" + messageRegExp = "Can't map property \".*List<.*MyType> types\" to \".*List<.*String> types\"\\" +
". Consider to declare/implement a mapping method: \".*List<.*String> map\\(.*List<.*MyType> " + ". Consider to declare/implement a mapping method: \".*List<.*String> map\\(.*List<.*MyType> " +
"value\\)\"\\.") "value\\)\"\\."),
@Diagnostic(type = ErroneousJavaInternalMapper.class,
kind = javax.tools.Diagnostic.Kind.ERROR,
line = 29,
messageRegExp = "Can't map property \".*List<.*MyType> nestedMyType\\.deepNestedType\\.types\" to \"" +
".*List<.*String> nestedMyType\\.deepNestedType\\.types\"\\. Consider to declare/implement a " +
"mapping method: \".*List<.*String> map\\(.*List<.*MyType> value\\)\"\\.")
}) })
@Test @Test
public void shouldNotNestIntoJavaPackageObjects() throws Exception { public void shouldNotNestIntoJavaPackageObjects() throws Exception {

4
processor/src/test/java/org/mapstruct/ap/test/nestedbeans/exclusions/Source.java
View File

@ -47,8 +47,6 @@ class Source {
public MyType date; public MyType date;
public MyType calendar; public MyType calendar;
public List<MyType> types; public List<MyType> types;
//TODO Nested error messages do not work yet. I think that this should be solved as part of #1150 public NestedMyType nestedMyType;
// (or we solve that one first :))
//public NestedMyType nestedMyType;
//CHECKSTYLE:ON //CHECKSTYLE:ON
} }

2
processor/src/test/java/org/mapstruct/ap/test/nestedbeans/exclusions/Target.java
View File

@ -43,6 +43,6 @@ class Target {
public Date date; public Date date;
public GregorianCalendar calendar; public GregorianCalendar calendar;
public List<String> types; public List<String> types;
//public TargetNested nestedMyType; public TargetNested nestedMyType;
//CHECKSTYLE:ON //CHECKSTYLE:ON
} }