Skip to content

GH-1901 - Use type name for array types in FormattableType.of(ResolvableType). #1902

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

Closed
cwJohnPark wants to merge 1 commit into from
Closed

GH-1901 - Use type name for array types in FormattableType.of(ResolvableType). #1902

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
2 changes: 1 addition & 1 deletion spring-modulith-core/src/main/java/org/springframework/modulith/core/FormattableType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ public static FormattableType of(ResolvableType type) {
.toList();

return resolved != null
? CACHE.computeIfAbsent(type.toString(), __ -> new FormattableType(resolved.getName(), generics))
? CACHE.computeIfAbsent(type.toString(), __ -> new FormattableType(resolved.getTypeName(), generics))
: WILDCARD;
}

Expand Down
28 changes: 28 additions & 0 deletions ...dulith-core/src/test/java/org/springframework/modulith/core/FormattableTypeUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,40 @@ void rendersDeclaredGenerics() throws Exception {
assertThat(type.getAbbreviatedFullName()).isEqualTo("j.u.List<j.u.Map<j.l.String, j.l.Integer>>");
}

@Test // GH-1901
void handlesArrayTypesFromResolvableType() throws Exception {

var method = Sample.class.getMethod("arrays", Integer[].class, byte[].class, Integer[][].class, List.class);

assertThat(FormattableType.of(ResolvableType.forMethodParameter(method, 0)).getAbbreviatedFullName())
.isEqualTo("j.l.Integer[]");
assertThat(FormattableType.of(ResolvableType.forMethodParameter(method, 1)).getAbbreviatedFullName())
.isEqualTo("byte[]");
assertThat(FormattableType.of(ResolvableType.forMethodParameter(method, 2)).getFullName())
.isEqualTo("java.lang.Integer[][]");
assertThat(FormattableType.of(ResolvableType.forMethodParameter(method, 3)).getAbbreviatedFullName())
.isEqualTo("j.u.List<j.l.Integer[]>");
}

@Test // GH-1901
void rendersArrayTypesConsistentlyIndependentOfLookupOrder() {

var fromResolvableType = FormattableType.of(ResolvableType.forClass(Sample[].class));
var fromClass = FormattableType.of(Sample[].class);

assertThat(fromClass.getFullName())
.isEqualTo(fromResolvableType.getFullName())
.isEqualTo("org.springframework.modulith.core.FormattableTypeUnitTests.Sample[]");
}

interface Sample {

<T> List<?> wildcarded(List<T> parameterized);

void classWildcard(Class<?> type);

List<Map<String, Integer>> genericReturnType();

void arrays(Integer[] integers, byte[] bytes, Integer[][] matrix, List<Integer[]> list);
}
}