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

#782 Nested target properties should work for builders as well

Browse Source
This commit is contained in:
Filip Hrisafov 2018-02-11 13:38:51 +01:00
parent c3f0099698
commit 06a49090cc
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
processor/src/main/java/org/mapstruct/ap/internal/model/source/TargetReference.java
View File

@ -191,8 +191,9 @@ public class TargetReference {
// last entry // last entry
for ( int i = 0; i < entryNames.length; i++ ) { for ( int i = 0; i < entryNames.length; i++ ) {
Accessor targetReadAccessor = nextType.getPropertyReadAccessors().get( entryNames[i] ); Type mappingType = nextType.getMappingType();
Accessor targetWriteAccessor = nextType.getPropertyWriteAccessors( cms ).get( entryNames[i] ); Accessor targetReadAccessor = mappingType.getPropertyReadAccessors().get( entryNames[i] );
Accessor targetWriteAccessor = mappingType.getPropertyWriteAccessors( cms ).get( entryNames[i] );
boolean isLast = i == entryNames.length - 1; boolean isLast = i == entryNames.length - 1;
boolean isNotLast = i < entryNames.length - 1; boolean isNotLast = i < entryNames.length - 1;
if ( isWriteAccessorNotValidWhenNotLast( targetWriteAccessor, isNotLast ) if ( isWriteAccessorNotValidWhenNotLast( targetWriteAccessor, isNotLast )
@ -236,13 +237,13 @@ public class TargetReference {
if ( Executables.isGetterMethod( toUse ) || if ( Executables.isGetterMethod( toUse ) ||
Executables.isFieldAccessor( toUse ) ) { Executables.isFieldAccessor( toUse ) ) {
nextType = typeFactory.getReturnType( nextType = typeFactory.getReturnType(
(DeclaredType) initial.getTypeMirror(), (DeclaredType) initial.getMappingType().getTypeMirror(),
toUse toUse
); );
} }
else { else {
nextType = typeFactory.getSingleParameter( nextType = typeFactory.getSingleParameter(
(DeclaredType) initial.getTypeMirror(), (DeclaredType) initial.getMappingType().getTypeMirror(),
toUse toUse
).getType(); ).getType();
} }

6
processor/src/test/java/org/mapstruct/ap/test/builder/nestedprop/BuilderNestedPropertyTest.java
View File

@ -18,7 +18,6 @@
*/ */
package org.mapstruct.ap.test.builder.nestedprop; package org.mapstruct.ap.test.builder.nestedprop;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mapstruct.ap.testutil.WithClasses; import org.mapstruct.ap.testutil.WithClasses;
@ -36,7 +35,6 @@ import static org.assertj.core.api.Assertions.assertThat;
FlattenedMapper.class FlattenedMapper.class
}) })
@RunWith(AnnotationProcessorTestRunner.class) @RunWith(AnnotationProcessorTestRunner.class)
@Ignore("Nested target not working yet")
public class BuilderNestedPropertyTest { public class BuilderNestedPropertyTest {
@Test @Test
@ -47,5 +45,9 @@ public class BuilderNestedPropertyTest {
33 33
) ); ) );
assertThat( expandedTarget ).isNotNull(); assertThat( expandedTarget ).isNotNull();
assertThat( expandedTarget.getCount() ).isEqualTo( 33 );
assertThat( expandedTarget.getSecond() ).isNull();
assertThat( expandedTarget.getFirst() ).isNotNull();
assertThat( expandedTarget.getFirst().getFoo() ).isEqualTo( "33" );
} }
} }

2
processor/src/test/java/org/mapstruct/ap/test/builder/nestedprop/ExpandedTarget.java
View File

@ -50,7 +50,7 @@ public class ExpandedTarget {
private ImmutableTargetContainer first; private ImmutableTargetContainer first;
private ImmutableTargetContainer second; private ImmutableTargetContainer second;
public Builder count(int age) { public Builder count(int count) {
this.count = count; this.count = count;
return this; return this;
} }