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

#2596 Record components should have the highest priority for read accessors

Browse Source
This commit is contained in:
Filip Hrisafov 2021-10-16 18:50:04 +02:00
parent 935c03e822
commit 564455ee45
5 changed files with 111 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
integrationtest/src/test/resources/recordsTest/src/main/java/org/mapstruct/itest/records/MemberDto.java Normal file
View File

@ -0,0 +1,13 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.itest.records;
/**
* @author Filip Hrisafov
*/
public record MemberDto(Boolean isActive, Boolean premium) {
}

31
integrationtest/src/test/resources/recordsTest/src/main/java/org/mapstruct/itest/records/MemberEntity.java Normal file
View File

@ -0,0 +1,31 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.itest.records;
/**
* @author Filip Hrisafov
*/
public class MemberEntity {
private Boolean isActive;
private Boolean premium;
public Boolean getIsActive() {
return isActive;
}
public void setIsActive(Boolean active) {
isActive = active;
}
public Boolean getPremium() {
return premium;
}
public void setPremium(Boolean premium) {
this.premium = premium;
}
}

24
integrationtest/src/test/resources/recordsTest/src/main/java/org/mapstruct/itest/records/MemberMapper.java Normal file
View File

@ -0,0 +1,24 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.itest.records;
import org.mapstruct.Mapper;
import org.mapstruct.ReportingPolicy;
import org.mapstruct.factory.Mappers;
/**
* @author Filip Hrisafov
*/
@Mapper(unmappedSourcePolicy = ReportingPolicy.ERROR)
public interface MemberMapper {
MemberMapper INSTANCE = Mappers.getMapper( MemberMapper.class );
MemberEntity fromRecord(MemberDto record);
MemberDto toRecord(MemberEntity entity);
}

22
integrationtest/src/test/resources/recordsTest/src/test/java/org/mapstruct/itest/records/RecordsTest.java
View File

@ -61,4 +61,26 @@ public class RecordsTest {
assertThat( carDto.wheelPositions() )
.containsExactly( "left" );
}
@Test
public void shouldMapMemberRecord() {
MemberEntity member = MemberMapper.INSTANCE.fromRecord( new MemberDto( true, false ) );
assertThat( member ).isNotNull();
assertThat( member.getIsActive() ).isTrue();
assertThat( member.getPremium() ).isFalse();
}
@Test
public void shouldMapIntoMemberRecord() {
MemberEntity entity = new MemberEntity();
entity.setIsActive( false );
entity.setPremium( true );
MemberDto value = MemberMapper.INSTANCE.toRecord( entity );
assertThat( value ).isNotNull();
assertThat( value.isActive() ).isEqualTo( false );
assertThat( value.premium() ).isEqualTo( true );
}
}

28
processor/src/main/java/org/mapstruct/ap/internal/model/common/Type.java
View File

@ -576,14 +576,33 @@ public class Type extends ModelElement implements Comparable<Type> {
*/
public Map<String, Accessor> getPropertyReadAccessors() {
if ( readAccessors == null ) {
List<Accessor> getterList = filters.getterMethodsIn( getAllMethods() );
Map<String, Accessor> modifiableGetters = new LinkedHashMap<>();
Map<String, Accessor> recordAccessors = filters.recordAccessorsIn( getRecordComponents() );
modifiableGetters.putAll( recordAccessors );
List<Accessor> getterList = filters.getterMethodsIn( getAllMethods() );
for ( Accessor getter : getterList ) {
String simpleName = getter.getSimpleName();
if ( recordAccessors.containsKey( simpleName ) ) {
// If there is already a record accessor that contains the simple name
// then it means that the getter is actually a record component.
// In that case we need to ignore it.
// e.g. record component named isActive.
// The DefaultAccessorNamingStrategy will return active as property name,
// but the property name is isActive, since it is a record
continue;
}
String propertyName = getPropertyName( getter );
if ( recordAccessors.containsKey( propertyName ) ) {
// If there is already a record accessor, the property needs to be ignored
continue;
}
if ( modifiableGetters.containsKey( propertyName ) ) {
// In the DefaultAccessorNamingStrategy, this can only be the case for Booleans: isFoo() and
// getFoo(); The latter is preferred.
if ( !getter.getSimpleName().startsWith( "is" ) ) {
if ( !simpleName.startsWith( "is" ) ) {
modifiableGetters.put( propertyName, getter );
}
@ -593,11 +612,6 @@ public class Type extends ModelElement implements Comparable<Type> {
}
}
Map<String, Accessor> recordAccessors = filters.recordAccessorsIn( getRecordComponents() );
for ( Map.Entry<String, Accessor> recordEntry : recordAccessors.entrySet() ) {
modifiableGetters.putIfAbsent( recordEntry.getKey(), recordEntry.getValue() );
}
List<Accessor> fieldsList = filters.fieldsIn( getAllFields() );
for ( Accessor field : fieldsList ) {
String propertyName = getPropertyName( field );