Sync with underscore-java

Author: javadev

pom-central17.xml

@@ -132,6 +132,12 @@
       <version>[5.10.0,)</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
+      <version>[1.10.0,)</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>

pom-central21.xml

@@ -132,6 +132,12 @@
       <version>[5.10.0,)</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
+      <version>[1.10.0,)</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>

pom-pack17.xml

@@ -241,6 +241,12 @@
       <version>[5.10.0,)</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
+      <version>[1.10.0,)</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>

pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.javadev</groupId>
-  <artifactId>underscore11</artifactId>
+  <artifactId>underscore17</artifactId>
   <packaging>jar</packaging>
   <version>1.51-SNAPSHOT</version>
   <name>java 17 port of Underscore.js</name>
@@ -145,7 +145,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.10</version>
+        <version>0.8.11</version>
         <configuration>
           <excludes>
             <exclude>**/U$BaseHttpSslSocketFactory*.class</exclude>
@@ -162,7 +162,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>3.1.1</version>
+        <version>3.3.1</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -214,6 +214,12 @@
       <version>[5.10.0,)</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
+      <version>[1.10.0,)</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>

src/main/java/com/github/underscore/U.java

@@ -40,6 +40,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -48,6 +49,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Properties;
 import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
@@ -3491,4 +3493,28 @@ public String toString() {
             return data.toString();
         }
     }
+
+    public static Map<String, Object> propertiesToMap(Properties properties) {
+        Map<String, Object> map = new LinkedHashMap<>();
+        if (properties != null && !properties.isEmpty()) {
+            Enumeration<?> enumProperties = properties.propertyNames();
+            while (enumProperties.hasMoreElements()) {
+                String name = (String)enumProperties.nextElement();
+                map.put(name, properties.getProperty(name));
+            }
+        }
+        return map;
+    }
+
+    public static Properties mapToProperties(Map<String, Object> map) {
+        Properties  properties = new Properties();
+        if (map != null) {
+            for (final Map.Entry<String, Object> entry : map.entrySet()) {
+                if (!isNull(entry.getValue())) {
+                    properties.put(entry.getKey(), String.valueOf(entry.getValue()));
+                }
+            }
+        }
+        return properties;
+    }
 }

src/test/java/com/github/underscore/UnderscoreTest.java

@@ -40,6 +40,7 @@
 import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Properties;
 import java.util.function.Predicate;
 import org.junit.jupiter.api.Test;
 
@@ -745,4 +746,53 @@ void jobtest() {
                         + "{string=Hear it all the time, come back rewind, longestWord=6}]",
                 result.toString());
     }
+
+    @Test
+    void testPropertiesToMap() {
+        Properties properties = new Properties();
+        properties.setProperty("key1", "value1");
+        properties.setProperty("key2", "value2");
+        properties.setProperty("key3", "value3");
+        Map<String, Object> map = U.propertiesToMap(properties);
+        assertEquals(3, map.size());
+        assertEquals("value1", map.get("key1"));
+        assertEquals("value2", map.get("key2"));
+        assertEquals("value3", map.get("key3"));
+    }
+
+    @Test
+    void testPropertiesToMapWithEmptyProperties() {
+        Properties properties = new Properties();
+        Map<String, Object> map = U.propertiesToMap(properties);
+        assertEquals(0, map.size());
+        Map<String, Object> map2 = U.propertiesToMap(null);
+        assertEquals(0, map.size());
+    }
+
+    @Test
+    void testMapToProperties() {
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("key1", "value1");
+        map.put("key2", "value2");
+        map.put("key3", "value3");
+        Properties properties = U.mapToProperties(map);
+        assertEquals(3, properties.size());
+        assertEquals("value1", properties.getProperty("key1"));
+        assertEquals("value2", properties.getProperty("key2"));
+        assertEquals("value3", properties.getProperty("key3"));
+    }
+
+    @Test
+    void testMapToPropertiesWithNullValues() {
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("key1", "value1");
+        map.put("key2", null);
+        map.put("key3", "value3");
+        Properties properties = U.mapToProperties(map);
+        assertEquals(2, properties.size());
+        assertEquals("value1", properties.getProperty("key1"));
+        assertEquals("value3", properties.getProperty("key3"));
+        Properties properties2 = U.mapToProperties(null);
+        assertEquals(0, properties2.size());
+    }
 }