Skip to content

Pass configured locale to SimpleDateFormat in DateTimeConverter #421

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
garydgregory merged 2 commits into from
Jul 18, 2026
+23 −1
Merged

Pass configured locale to SimpleDateFormat in DateTimeConverter #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80d24ef
pass configured locale to date pattern in DateTimeConverter
rootvector2 Jul 17, 2026
bcb1626
use junit pioneer to set the default locale in testLocaleWithPattern
rootvector2 Jul 18, 2026
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
5 changes: 5 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit-pioneer</groupId>
<artifactId>junit-pioneer</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ protected DateFormat getFormat(final Locale locale, final TimeZone timeZone) {
* @return The DateFormat
*/
private DateFormat getFormat(final String pattern) {
final DateFormat format = new SimpleDateFormat(pattern);
final DateFormat format = locale == null ? new SimpleDateFormat(pattern) : new SimpleDateFormat(pattern, locale);
if (timeZone != null) {
format.setTimeZone(timeZone);
}
Expand Down
17 changes: 17 additions & 0 deletions src/test/java/org/apache/commons/beanutils2/converters/AbstractDateConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import org.apache.commons.beanutils2.ConversionException;
import org.apache.commons.beanutils2.Converter;
import org.junit.jupiter.api.Test;
import org.junitpioneer.jupiter.DefaultLocale;

/**
* Abstract base for &lt;Date&gt;Converter classes.
Expand Down Expand Up @@ -268,6 +269,22 @@ public void testLocale() {
Locale.setDefault(defaultLocale);
}

/**
* Test that a configured Locale is honored when a pattern is also set.
*/
@Test

@garydgregory garydgregory Jul 17, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use JUnit Pioneer to set a temporary Locale.

@rootvector2 rootvector2 Jul 18, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, switched the test to Pioneer's @DefaultLocale and dropped the manual save/restore. Added junit-pioneer as a test dependency since it wasn't in the pom yet (version comes from commons-parent). All 9 subclass runs still pass.

@DefaultLocale(language = "en", country = "US")
void testLocaleWithPattern() {
// The default Locale's month names differ from the configured Locale's.
final String pattern = "dd MMMM yyyy"; // month name is Locale-sensitive
final DateTimeConverter<T> converter = makeConverter();
converter.setLocale(Locale.GERMANY);
converter.setPattern(pattern);
final String testString = "28 Oktober 2006";
final Object expected = toType(testString, pattern, Locale.GERMANY);
validConversion(converter, expected, testString);
}

/**
* Test Converter with multiple patterns
*/
Expand Down
Loading