Skip to content

#3153 Do not use compress directive to strip whitespaces for value mapping switch method #3224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
filiphr merged 1 commit into from
Apr 22, 2023
Merged

#3153 Do not use compress directive to strip whitespaces for value mapping switch method #3224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 13 additions & 17 deletions processor/src/main/resources/org/mapstruct/ap/internal/model/ValueMappingMethod.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,26 +48,22 @@
</#if>
}
<#macro writeSource source="">
<@compress single_line=true>
<#if sourceParameter.type.enumType>
${source}
<#elseif sourceParameter.type.string>
"${source}"
</#if>
</@compress>
<#if sourceParameter.type.enumType>
${source}<#t>
<#elseif sourceParameter.type.string>
"${source}"<#t>
</#if>
</#macro>
<#macro writeTarget target="">
<@compress single_line=true>
<#if target?has_content>
<#if returnType.enumType>
<@includeModel object=returnType/>.${target}
<#elseif returnType.string>
"${target}"
</#if>
<#else>
null
<#if target?has_content>
<#if returnType.enumType>
<@includeModel object=returnType/>.${target}<#t>
<#elseif returnType.string>
"${target}"<#t>
</#if>
</@compress>
<#else>
null<#t>
</#if>
</#macro>
<#macro throws>
<#if (thrownTypes?size > 0)><#lt> throws </#if><@compress single_line=true>
Expand Down
33 changes: 33 additions & 0 deletions processor/src/test/java/org/mapstruct/ap/test/bugs/_3153/Issue3153Mapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* 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._3153;

import org.mapstruct.Mapper;
import org.mapstruct.MappingConstants;
import org.mapstruct.ValueMapping;
import org.mapstruct.factory.Mappers;

/**
* @author Filip Hrisafov
*/
@Mapper
interface Issue3153Mapper {

Issue3153Mapper INSTANCE = Mappers.getMapper( Issue3153Mapper.class );

@ValueMapping(source = " PR", target = "PR")
@ValueMapping(source = " PR", target = "PR")
@ValueMapping(source = " PR", target = "PR")
@ValueMapping(source = MappingConstants.ANY_REMAINING, target = MappingConstants.NULL)
Target mapToEnum(String value);

@ValueMapping(source = "PR", target = " PR")
String mapFromEnum(Target value);

enum Target {
PR,
}
}
30 changes: 30 additions & 0 deletions processor/src/test/java/org/mapstruct/ap/test/bugs/_3153/Issue3153Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*
* 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._3153;

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
*/
@WithClasses(Issue3153Mapper.class)
@IssueKey("3153")
class Issue3153Test {

@ProcessorTest
void shouldNotTrimStringValueSource() {
assertThat( Issue3153Mapper.INSTANCE.mapToEnum( "PR" ) ).isEqualTo( Issue3153Mapper.Target.PR );
assertThat( Issue3153Mapper.INSTANCE.mapToEnum( " PR" ) ).isEqualTo( Issue3153Mapper.Target.PR );
assertThat( Issue3153Mapper.INSTANCE.mapToEnum( " PR" ) ).isEqualTo( Issue3153Mapper.Target.PR );
assertThat( Issue3153Mapper.INSTANCE.mapToEnum( " PR" ) ).isEqualTo( Issue3153Mapper.Target.PR );

assertThat( Issue3153Mapper.INSTANCE.mapFromEnum( Issue3153Mapper.Target.PR ) ).isEqualTo( " PR" );
}
}