From 35039f69da7c44e96faaf9d457d47bea98ab1fdc Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Mon, 21 Jun 2021 16:13:32 +0200
Subject: [PATCH] [Minor] code cleanup

---
 .../privilege/xml/PrivilegeRolesDomWriter.java       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeRolesDomWriter.java b/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeRolesDomWriter.java
index cc5f4ecad..f88b2e283 100644
--- a/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeRolesDomWriter.java
+++ b/li.strolch.privilege/src/main/java/li/strolch/privilege/xml/PrivilegeRolesDomWriter.java
@@ -15,9 +15,11 @@
  */
 package li.strolch.privilege.xml;
 
+import static java.util.Comparator.comparing;
+
 import java.io.File;
-import java.util.Comparator;
 import java.util.List;
+import java.util.Locale;
 
 import li.strolch.privilege.helper.XmlConstants;
 import li.strolch.privilege.model.internal.Role;
@@ -30,14 +32,12 @@ import org.w3c.dom.Element;
  */
 public class PrivilegeRolesDomWriter {
 
-	private List<Role> roles;
-	private File modelFile;
+	private final List<Role> roles;
+	private final File modelFile;
 
 	public PrivilegeRolesDomWriter(List<Role> roles, File modelFile) {
 		this.roles = roles;
 		this.modelFile = modelFile;
-
-		this.roles.sort(Comparator.comparing(Role::getName));
 	}
 
 	public void write() {
@@ -47,7 +47,7 @@ public class PrivilegeRolesDomWriter {
 		Element rootElement = doc.createElement(XmlConstants.XML_ROLES);
 		doc.appendChild(rootElement);
 
-		this.roles.forEach(role -> {
+		this.roles.stream().sorted(comparing(role1 -> role1.getName().toLowerCase(Locale.ROOT))).forEach(role -> {
 
 			// create the role element
 			Element roleElement = doc.createElement(XmlConstants.XML_ROLE);