You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by jl...@apache.org on 2023/10/11 14:39:09 UTC
[johnzon] 02/03: feat: Move Local converter implementation and tests to IETF's BCP 47, with an hyphen (-) Do not use the toString format which is for debugging as expressed in the javadoc
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/johnzon.git
commit 5e7c6ad9d0fa166d1756d34699af9c6cec59818e
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Wed Oct 11 16:37:57 2023 +0200
feat: Move Local converter implementation and tests to IETF's BCP 47, with an hyphen (-)
Do not use the toString format which is for debugging as expressed in the javadoc
Signed-off-by: Jean-Louis Monteiro <jl...@tomitribe.com>
---
.../java/org/apache/johnzon/mapper/converter/LocaleConverter.java | 2 +-
.../src/test/java/org/apache/johnzon/mapper/LocaleTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/LocaleConverter.java b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/LocaleConverter.java
index 565a2a42..66aa7fb4 100644
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/LocaleConverter.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/converter/LocaleConverter.java
@@ -45,7 +45,7 @@ public class LocaleConverter implements TypeAwareAdapter<Locale, String> {
@Override
public String from(final Locale instance) {
- return instance.toString();
+ return instance.toLanguageTag();
}
@Override
diff --git a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/LocaleTest.java b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/LocaleTest.java
index 3e3098ca..b52b85ee 100644
--- a/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/LocaleTest.java
+++ b/johnzon-mapper/src/test/java/org/apache/johnzon/mapper/LocaleTest.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertNotNull;
public class LocaleTest {
@Test
public void roundTrip() {
- final String expected = "{\"locale\":\"fr_FR\"}";
+ final String expected = "{\"locale\":\"fr-FR\"}";
final Mapper mapper = new MapperBuilder().setAccessMode(new FieldAccessMode(false, false)).build();
{
final Locale locale = Locale.FRANCE;
@@ -40,7 +40,7 @@ public class LocaleTest {
{
final LocaleHolder holder = mapper.readObject(expected, LocaleHolder.class);
assertNotNull(holder.locale);
- assertEquals("fr_FR", holder.locale.toString());
+ assertEquals("fr-FR", holder.locale.toLanguageTag());
}
}