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

#400 fix nested property mappings with Eclipse JDT compiler, extend the integration test accordingly.

Browse Source
This commit is contained in:
Andreas Gudian 2014-12-29 16:17:00 +01:00
parent 2435f0206a
commit 640d9dd571
6 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
integrationtest/src/test/resources/simpleTest/src/main/java/org/mapstruct/itest/simple/Source.java
View File

@ -26,6 +26,7 @@ public class Source {
private Long baz;
private int zip;
private String someType;
private SomeType forNested;
public int getFoo() {
return foo;
@ -74,4 +75,12 @@ public class Source {
public void setSomeType(String someType) {
this.someType = someType;
}
public SomeType getForNested() {
return forNested;
}
public void setForNested(SomeType forNested) {
this.forNested = forNested;
}
}

4
integrationtest/src/test/resources/simpleTest/src/main/java/org/mapstruct/itest/simple/SourceTargetAbstractMapper.java
View File

@ -30,10 +30,12 @@ public abstract class SourceTargetAbstractMapper {
@Mappings({
@Mapping(source = "qax", target = "baz"),
@Mapping(source = "baz", target = "qax")
@Mapping(source = "baz", target = "qax"),
@Mapping(source = "forNested.value", target = "fromNested")
})
public abstract Target sourceToTarget(Source source);
@Mapping(target = "forNested", ignore = true)
public abstract Source targetToSource(Target target);
protected void isNeverCalled(Source source) {

4
integrationtest/src/test/resources/simpleTest/src/main/java/org/mapstruct/itest/simple/SourceTargetMapper.java
View File

@ -31,10 +31,12 @@ public interface SourceTargetMapper {
@Mappings({
@Mapping(source = "qax", target = "baz"),
@Mapping(source = "baz", target = "qax")
@Mapping(source = "baz", target = "qax"),
@Mapping(source = "forNested.value", target = "fromNested")
})
Target sourceToTarget(Source source);
@InheritInverseConfiguration
@Mapping(target = "forNested", ignore = true)
Source targetToSource(Target target);
}

9
integrationtest/src/test/resources/simpleTest/src/main/java/org/mapstruct/itest/simple/Target.java
View File

@ -28,6 +28,7 @@ public class Target {
private int qax;
private String zip;
private SomeType someType;
private String fromNested;
public Long getFoo() {
return foo;
@ -76,4 +77,12 @@ public class Target {
public void setSomeType(SomeType someType) {
this.someType = someType;
}
public String getFormNested() {
return fromNested;
}
public void setFromNested(String fromNested) {
this.fromNested = fromNested;
}
}

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

@ -153,6 +153,10 @@ public class NestedPropertyMappingMethod extends MappingMethod {
public String getName() {
return safeName;
}
public String getAccessorName() {
return getAccessor().getSimpleName().toString();
}
}
}

2
processor/src/main/resources/org.mapstruct.ap.model.NestedPropertyMappingMethod.ftl
View File

@ -24,7 +24,7 @@
return ${returnType.null};
}
<#list propertyEntries as entry>
<@includeModel object=entry.type/> ${entry.name} = <#if entry_index == 0>${sourceParameter.name}.${entry.accessor}<#else>${propertyEntries[entry_index-1].name}.${entry.accessor}</#if>;
<@includeModel object=entry.type/> ${entry.name} = <#if entry_index == 0>${sourceParameter.name}.${entry.accessorName}()<#else>${propertyEntries[entry_index-1].name}.${entry.accessorName}()</#if>;
<#if !entry.type.primitive>
if ( ${entry.name} == null ) {
return ${returnType.null};