Skip to content

Replace all non-word characters with underscores. #113

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
Chessray merged 1 commit into from
Jan 20, 2025
Merged

Replace all non-word characters with underscores. #113

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
11 changes: 6 additions & 5 deletions ...ain/java/org/mapstruct/extensions/spring/converter/ConversionServiceAdapterGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import java.util.List;
import java.util.Locale;
import java.util.Optional;
import java.util.regex.Pattern;
import java.util.stream.Stream;

public class ConversionServiceAdapterGenerator extends AdapterRelatedGenerator {
Expand All @@ -25,6 +26,7 @@ public class ConversionServiceAdapterGenerator extends AdapterRelatedGenerator {
ClassName.get("org.springframework.core.convert", "TypeDescriptor");
private static final ClassName COMPONENT_ANNOTATION_CLASS_NAME =
ClassName.get("org.springframework.stereotype", "Component");
private static final Pattern NON_WORD_PATTERN = Pattern.compile("\\W");

public ConversionServiceAdapterGenerator(final Clock clock) {
super(clock);
Expand Down Expand Up @@ -58,13 +60,12 @@ private List<FieldSpec> buildTypeDescriptorFields(ConversionServiceAdapterDescri
}

private String fieldName(TypeName typeName) {
String fieldName = "TYPE_DESCRIPTOR_" + typeName.toString()
.replace('.', '_')
.replace('<', '_')
.replace('>', '_')
.replace("[]", "_ARRAY")
String fieldName = "TYPE_DESCRIPTOR_" + NON_WORD_PATTERN.matcher(typeName.toString())
.replaceAll("_")
.toUpperCase(Locale.ROOT);

if (fieldName.lastIndexOf('_') == fieldName.length() - 1) {
// drop trailing underscore
return fieldName.substring(0, fieldName.length() - 1);
} else {
return fieldName;
Expand Down