(karaf) branch main updated: Simplify SortedProperties.entrySet() (#2629)

[holgerf]

This is an automated email from the ASF dual-hosted git repository.

holgerfriedrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/main by this push:
     new fd9bd47312 Simplify SortedProperties.entrySet() (#2629)
fd9bd47312 is described below

commit fd9bd47312c5bf67c30f3dff53a664617de544c6
Author: Robert Varga <robert.va...@pantheon.tech>
AuthorDate: Sat Aug 22 18:42:02 2026 +0200

    Simplify SortedProperties.entrySet() (#2629)
    
    Use Comparator.comparing() and Collectors.toCollection() to make the
    method much more obvious.
    
    Signed-off-by: Robert Varga <robert.va...@pantheon.tech>
---
 .../apache/karaf/tools/utils/SortedProperties.java | 23 ++++------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git 
a/tooling/utils/src/main/java/org/apache/karaf/tools/utils/SortedProperties.java
 
b/tooling/utils/src/main/java/org/apache/karaf/tools/utils/SortedProperties.java
index 6658dc2b03..ae5ecc3709 100644
--- 
a/tooling/utils/src/main/java/org/apache/karaf/tools/utils/SortedProperties.java
+++ 
b/tooling/utils/src/main/java/org/apache/karaf/tools/utils/SortedProperties.java
@@ -19,12 +19,12 @@ package org.apache.karaf.tools.utils;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Enumeration;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.stream.Collectors;
 
 /**
  * Sort properties for better readability.
@@ -40,28 +40,13 @@ public class SortedProperties extends Properties {
 
     @Override
     public Set<Map.Entry<Object, Object>> entrySet() {
-        Set<Map.Entry<Object, Object>> origSet = super.entrySet();
-        Set<Map.Entry<Object, Object>> sortedSet = new 
LinkedHashSet<Map.Entry<Object, Object>>(origSet.size());
-
-        Iterator<Map.Entry<Object, Object>> iterator = 
origSet.stream().sorted(new Comparator<Map.Entry<Object, Object>>() {
-
-            @Override
-            public int compare(java.util.Map.Entry<Object, Object> o1, 
java.util.Map.Entry<Object, Object> o2) {
-                return 
o1.getKey().toString().compareTo(o2.getKey().toString());
-            }
-        }).iterator();
-
-        while (iterator.hasNext())
-            sortedSet.add(iterator.next());
-
-        return sortedSet;
+        return super.entrySet().stream()
+            .sorted(Comparator.comparing(entry -> entry.getKey().toString()))
+            .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
     @Override
     public synchronized Enumeration<Object> keys() {
         return Collections.enumeration(new TreeSet<>(super.keySet()));
     }
-    
-    
-    
 }