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

#2748 Support mapping map keys with invalid chars for methods

Browse Source
This commit is contained in:
Chris DeLashmutt 2022-03-19 06:51:19 -04:00 committed by GitHub
parent ad00adfa86
commit ab52867831
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 100 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
processor/src/main/java/org/mapstruct/ap/internal/util/Strings.java
View File

@ -183,7 +183,19 @@ public class Strings {
if ( firstAlphabeticIndex < identifier.length()) {
// If it is not consisted of only underscores
return identifier.substring( firstAlphabeticIndex ).replace( "[]", "Array" );
String firstAlphaString = identifier.substring( firstAlphabeticIndex ).replace( "[]", "Array" );
StringBuilder sb = new StringBuilder( firstAlphaString.length() );
for ( int i = 0; i < firstAlphaString.length(); i++ ) {
int codePoint = firstAlphaString.codePointAt( i );
if ( Character.isJavaIdentifierPart( codePoint ) || codePoint == '.') {
sb.appendCodePoint( codePoint );
}
else {
sb.append( '_' );
}
}
return sb.toString();
}
return identifier.replace( "[]", "Array" );

3
processor/src/test/java/org/mapstruct/ap/internal/util/StringsTest.java
View File

@ -72,6 +72,7 @@ public class StringsTest {
assertThat( Strings.getSafeVariableName( "__Test" ) ).isEqualTo( "test" );
assertThat( Strings.getSafeVariableName( "_0Test" ) ).isEqualTo( "test" );
assertThat( Strings.getSafeVariableName( "_0123Test" ) ).isEqualTo( "test" );
assertThat( Strings.getSafeVariableName( "bad/test" ) ).isEqualTo( "bad_test" );
}
@Test
@ -94,6 +95,7 @@ public class StringsTest {
assertThat( Strings.getSafeVariableName( "__0Test", Arrays.asList( "test" ) ) ).isEqualTo( "test1" );
assertThat( Strings.getSafeVariableName( "___0", new ArrayList<>() ) ).isEqualTo( "___0" );
assertThat( Strings.getSafeVariableName( "__0123456789Test", Arrays.asList( "test" ) ) ).isEqualTo( "test1" );
assertThat( Strings.getSafeVariableName( "bad/test", Arrays.asList( "bad_test" ) ) ).isEqualTo( "bad_test1" );
}
@Test
@ -110,6 +112,7 @@ public class StringsTest {
assertThat( Strings.sanitizeIdentifierName( "_0int[]" ) ).isEqualTo( "intArray" );
assertThat( Strings.sanitizeIdentifierName( "__0int[]" ) ).isEqualTo( "intArray" );
assertThat( Strings.sanitizeIdentifierName( "___0" ) ).isEqualTo( "___0" );
assertThat( Strings.sanitizeIdentifierName( "bad/test" ) ).isEqualTo( "bad_test" );
}
@Test

48
processor/src/test/java/org/mapstruct/ap/test/bugs/_2748/Issue2748Mapper.java Normal file
View File

@ -0,0 +1,48 @@
/*
* 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._2748;
import java.util.Map;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.factory.Mappers;
/**
* @author Filip Hrisafov
*/
@Mapper
public interface Issue2748Mapper {
Issue2748Mapper INSTANCE = Mappers.getMapper( Issue2748Mapper.class );
@Mapping(target = "specificValue", source = "annotations.specific/value")
Target map(Source source);
class Target {
private final String specificValue;
public Target(String specificValue) {
this.specificValue = specificValue;
}
public String getSpecificValue() {
return specificValue;
}
}
class Source {
private final Map<String, String> annotations;
public Source(Map<String, String> annotations) {
this.annotations = annotations;
}
public Map<String, String> getAnnotations() {
return annotations;
}
}
}

36
processor/src/test/java/org/mapstruct/ap/test/bugs/_2748/Issue2748Test.java Normal file
View File

@ -0,0 +1,36 @@
/*
* 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._2748;
import java.util.Collections;
import java.util.Map;
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("2748")
@WithClasses( {
Issue2748Mapper.class
} )
class Issue2748Test {
@ProcessorTest
void shouldMapNonJavaIdentifier() {
Map<String, String> annotations = Collections.singletonMap( "specific/value", "value" );
Issue2748Mapper.Source source = new Issue2748Mapper.Source( annotations );
Issue2748Mapper.Target target = Issue2748Mapper.INSTANCE.map( source );
assertThat( target ).isNotNull();
assertThat( target.getSpecificValue() ).isEqualTo( "value" );
}
}