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

#3317 Do not generate source parameter if check for only primitives

Browse Source
This commit is contained in:
Filip Hrisafov 2023-07-08 18:32:10 +02:00
parent 53c73324ff
commit 4abf2d4202
3 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@
</#if>
</#list>
<#if !mapNullToDefault>
<#if !mapNullToDefault && !sourceParametersExcludingPrimitives.empty>
if ( <#list sourceParametersExcludingPrimitives as sourceParam>${sourceParam.name} == null<#if sourceParam_has_next> && </#if></#list> ) {
return<#if returnType.name != "void"> <#if existingInstanceMapping>${resultName}<#if finalizerMethod??>.<@includeModel object=finalizerMethod /></#if><#else>null</#if></#if>;
}

39
processor/src/test/java/org/mapstruct/ap/test/bugs/_3317/Issue3317Mapper.java Normal file
View File

@ -0,0 +1,39 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.ap.test.bugs._3317;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
/**
* @author Filip Hrisafov
*/
@Mapper
public interface Issue3317Mapper {
Issue3317Mapper INSTANCE = Mappers.getMapper( Issue3317Mapper.class );
Target map(int id, long value);
class Target {
private final int id;
private final long value;
public Target(int id, long value) {
this.id = id;
this.value = value;
}
public int getId() {
return id;
}
public long getValue() {
return value;
}
}
}

28
processor/src/test/java/org/mapstruct/ap/test/bugs/_3317/Issue3317Test.java Normal file
View File

@ -0,0 +1,28 @@
/*
* Copyright MapStruct Authors.
*
* Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
*/
package org.mapstruct.ap.test.bugs._3317;
import org.mapstruct.ap.testutil.IssueKey;
import org.mapstruct.ap.testutil.ProcessorTest;
import org.mapstruct.ap.testutil.WithClasses;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Filip Hrisafov
*/
@IssueKey("3317")
@WithClasses(Issue3317Mapper.class)
class Issue3317Test {
@ProcessorTest
void shouldGenerateValidCode() {
Issue3317Mapper.Target target = Issue3317Mapper.INSTANCE.map( 10, 42L );
assertThat( target ).isNotNull();
assertThat( target.getId() ).isEqualTo( 10 );
assertThat( target.getValue() ).isEqualTo( 42L );
}
}