From 8c3caab640e33a65facd2ea5c67aead6ec6d0b81 Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Thu, 30 May 2019 16:15:13 +0200
Subject: [PATCH] [Fix] use Locale.toLanguageTag() instead of toString()

---
 .../json/PrivilegeElementToJsonVisitor.java      |  2 +-
 .../rest/endpoint/AuthenticationService.java     |  2 +-
 .../li/strolch/rest/endpoint/ReportResource.java | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/li.strolch.model/src/main/java/li/strolch/model/json/PrivilegeElementToJsonVisitor.java b/li.strolch.model/src/main/java/li/strolch/model/json/PrivilegeElementToJsonVisitor.java
index a3d60200d..4a25ce6d1 100644
--- a/li.strolch.model/src/main/java/li/strolch/model/json/PrivilegeElementToJsonVisitor.java
+++ b/li.strolch.model/src/main/java/li/strolch/model/json/PrivilegeElementToJsonVisitor.java
@@ -19,7 +19,7 @@ public class PrivilegeElementToJsonVisitor implements PrivilegeElementVisitor<Js
 		jsonObject.addProperty("firstname", userRep.getFirstname());
 		jsonObject.addProperty("lastname", userRep.getLastname());
 		jsonObject.addProperty("userState", userRep.getUserState().name());
-		jsonObject.addProperty("locale", userRep.getLocale().toString());
+		jsonObject.addProperty("locale", userRep.getLocale().toLanguageTag());
 
 		JsonArray rolesArr = new JsonArray();
 		jsonObject.add("roles", rolesArr);
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/AuthenticationService.java b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/AuthenticationService.java
index 604a2f973..43bf2178a 100644
--- a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/AuthenticationService.java
+++ b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/AuthenticationService.java
@@ -293,7 +293,7 @@ public class AuthenticationService {
 		loginResult.addProperty("username", certificate.getUsername());
 		loginResult.addProperty("firstname", certificate.getFirstname());
 		loginResult.addProperty("lastname", certificate.getLastname());
-		loginResult.addProperty("locale", certificate.getLocale().toString());
+		loginResult.addProperty("locale", certificate.getLocale().toLanguageTag());
 
 		if (!certificate.getPropertyMap().isEmpty()) {
 			JsonObject propObj = new JsonObject();
diff --git a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/ReportResource.java b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/ReportResource.java
index 48a7f91e0..2fbf285ef 100644
--- a/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/ReportResource.java
+++ b/li.strolch.rest/src/main/java/li/strolch/rest/endpoint/ReportResource.java
@@ -101,8 +101,8 @@ public class ReportResource {
 		if (localesF.exists()) {
 			JsonObject localesJ = new JsonParser().parse(new String(Files.readAllBytes(localesF.toPath())))
 					.getAsJsonObject();
-			if (localesJ.has(cert.getLocale().toString()))
-				localeJ = localesJ.get(cert.getLocale().toString()).getAsJsonObject();
+			if (localesJ.has(cert.getLocale().toLanguageTag()))
+				localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
 		}
 
 		JsonArray result = new JsonArray();
@@ -156,8 +156,8 @@ public class ReportResource {
 		if (localesF.exists()) {
 			JsonObject localesJ = new JsonParser().parse(new String(Files.readAllBytes(localesF.toPath())))
 					.getAsJsonObject();
-			if (localesJ.has(cert.getLocale().toString()))
-				localeJ = localesJ.get(cert.getLocale().toString()).getAsJsonObject();
+			if (localesJ.has(cert.getLocale().toLanguageTag()))
+				localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
 		}
 
 		try (StrolchTransaction tx = RestfulStrolchComponent.getInstance().openTx(cert, realm, getContext());
@@ -255,8 +255,8 @@ public class ReportResource {
 		if (localesF.exists()) {
 			JsonObject localesJ = new JsonParser().parse(new String(Files.readAllBytes(localesF.toPath())))
 					.getAsJsonObject();
-			if (localesJ.has(cert.getLocale().toString()))
-				localeJ = localesJ.get(cert.getLocale().toString()).getAsJsonObject();
+			if (localesJ.has(cert.getLocale().toLanguageTag()))
+				localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
 		}
 
 		long start = System.nanoTime();
@@ -375,8 +375,8 @@ public class ReportResource {
 		if (localesF.exists()) {
 			JsonObject localesJ = new JsonParser().parse(new String(Files.readAllBytes(localesF.toPath())))
 					.getAsJsonObject();
-			if (localesJ.has(cert.getLocale().toString()))
-				localeJ = localesJ.get(cert.getLocale().toString()).getAsJsonObject();
+			if (localesJ.has(cert.getLocale().toLanguageTag()))
+				localeJ = localesJ.get(cert.getLocale().toLanguageTag()).getAsJsonObject();
 		}
 
 		// create CSV printer with header