spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 08:24:13 +00:00
Code Issues Projects Releases Wiki Activity

Polish DateTimeFormatterRegistrar to refine null-safety

Browse Source 
Narrow the scope of the @⁠SuppressWarnings("NullAway") annotation in
DateTimeFormatterRegistrar from the class level to a single, new
getFactory(Type) accessor.

The `factories` map is a private, final EnumMap that is fully populated
for every `Type` in the constructor and never mutated afterward, so the
suppression only needs to cover that one lookup instead of masking
unrelated issues across the whole class.

Closes gh-37225

Signed-off-by: Junhwan Choi <devjunsday@gmail.com>C
This commit is contained in:
JunHwan
2026-09-04 15:32:23 +02:00
committed by GitHub
parent 21ee87448c
commit 34b9815215
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-context/src/main/java/org/springframework/format/datetime/standard/DateTimeFormatterRegistrar.java
+13 -8
View File
@@ -43,6 +43,7 @@ import org.springframework.format.annotation.DateTimeFormat.ISO;
*
* @author Juergen Hoeller
* @author Phillip Webb
* @author Junhwan Choi
* @since 4.0
* @see #setDateStyle
* @see #setTimeStyle
@@ -51,7 +52,6 @@ import org.springframework.format.annotation.DateTimeFormat.ISO;
* @see org.springframework.format.FormatterRegistrar#registerFormatters
* @see org.springframework.format.datetime.DateFormatterRegistrar
*/
@SuppressWarnings("NullAway") // Well-known map keys
public class DateTimeFormatterRegistrar implements FormatterRegistrar {
private enum Type {DATE, TIME, DATE_TIME}
@@ -82,9 +82,9 @@ public class DateTimeFormatterRegistrar implements FormatterRegistrar {
* properties are effectively ignored.
*/
public void setUseIsoFormat(boolean useIsoFormat) {
this.factories.get(Type.DATE).setIso(useIsoFormat ? ISO.DATE : ISO.NONE);
this.factories.get(Type.TIME).setIso(useIsoFormat ? ISO.TIME : ISO.NONE);
this.factories.get(Type.DATE_TIME).setIso(useIsoFormat ? ISO.DATE_TIME : ISO.NONE);
getFactory(Type.DATE).setIso(useIsoFormat ? ISO.DATE : ISO.NONE);
getFactory(Type.TIME).setIso(useIsoFormat ? ISO.TIME : ISO.NONE);
getFactory(Type.DATE_TIME).setIso(useIsoFormat ? ISO.DATE_TIME : ISO.NONE);
}
/**
@@ -92,7 +92,7 @@ public class DateTimeFormatterRegistrar implements FormatterRegistrar {
* <p>Default is {@link java.time.format.FormatStyle#SHORT}.
*/
public void setDateStyle(FormatStyle dateStyle) {
this.factories.get(Type.DATE).setDateStyle(dateStyle);
getFactory(Type.DATE).setDateStyle(dateStyle);
}
/**
@@ -100,7 +100,7 @@ public class DateTimeFormatterRegistrar implements FormatterRegistrar {
* <p>Default is {@link java.time.format.FormatStyle#SHORT}.
*/
public void setTimeStyle(FormatStyle timeStyle) {
this.factories.get(Type.TIME).setTimeStyle(timeStyle);
getFactory(Type.TIME).setTimeStyle(timeStyle);
}
/**
@@ -108,7 +108,7 @@ public class DateTimeFormatterRegistrar implements FormatterRegistrar {
* <p>Default is {@link java.time.format.FormatStyle#SHORT}.
*/
public void setDateTimeStyle(FormatStyle dateTimeStyle) {
this.factories.get(Type.DATE_TIME).setDateTimeStyle(dateTimeStyle);
getFactory(Type.DATE_TIME).setDateTimeStyle(dateTimeStyle);
}
/**
@@ -207,7 +207,12 @@ public class DateTimeFormatterRegistrar implements FormatterRegistrar {
return formatter;
}
DateTimeFormatter fallbackFormatter = getFallbackFormatter(type);
return this.factories.get(type).createDateTimeFormatter(fallbackFormatter);
return getFactory(type).createDateTimeFormatter(fallbackFormatter);
}
@SuppressWarnings("NullAway") // Well-known map keys
private DateTimeFormatterFactory getFactory(Type type) {
return this.factories.get(type);
}
private DateTimeFormatter getFallbackFormatter(Type type) {