Skip to content

Avoid redundant registration of legacy date converters #36953

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

Open
arnabnandy7 wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −3
Open

Avoid redundant registration of legacy date converters #36953

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
3 changes: 0 additions & 3 deletions ...ontext/src/main/java/org/springframework/format/datetime/standard/DateTimeConverters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

import org.springframework.core.convert.converter.Converter;
import org.springframework.core.convert.converter.ConverterRegistry;
import org.springframework.format.datetime.DateFormatterRegistrar;

/**
* Installs lower-level type converters required to integrate
Expand All @@ -52,8 +51,6 @@ private DateTimeConverters() {
* @param registry the converter registry
*/
public static void registerConverters(ConverterRegistry registry) {
DateFormatterRegistrar.addDateConverters(registry);

registry.addConverter(new LocalDateTimeToLocalDateConverter());
registry.addConverter(new LocalDateTimeToLocalTimeConverter());
registry.addConverter(new ZonedDateTimeToLocalDateConverter());
Expand Down
18 changes: 18 additions & 0 deletions ...xt/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,24 @@ void proxiedConverterFactory() {
assertThat(formattingService.convert("1", Integer.class)).isEqualTo(Integer.valueOf(1));
}

@Test
void defaultFormattingConversionServiceHasNoDuplicateDateConverters() {
DefaultFormattingConversionService service = new DefaultFormattingConversionService();
String serviceString = service.toString();
int count = countOccurrences(serviceString, "DateFormatterRegistrar$DateToLongConverter");
assertThat(count).isEqualTo(1);
}

private int countOccurrences(String str, String subStr) {
int count = 0;
int idx = 0;
while ((idx = str.indexOf(subStr, idx)) != -1) {
count++;
idx += subStr.length();
}
return count;
}


static class NullReturningFormatter implements Formatter<Integer> {

Expand Down