0.1.0

Author: sysnetcz

env-utils/jar/env-utils-0.1.0.jar

@@ -97,5 +97,5 @@
 		</dependency>
 	</dependencies>
 	<description>Nástroje pro čtení systémových proměnných</description>
-	<version>0.0.3</version>
+	<version>0.1.0</version>
 </project>

env-utils/pom.xml

@@ -66,10 +66,13 @@ public static long getEnvLong(String variableName, long defaultValue) {
 		}
 		return out;
 	}
-
 
 	public static boolean getEnvBoolean(String variableName) {
-		boolean out = false;
+		return getEnvBoolean(variableName, false);
+	}
+
+	public static boolean getEnvBoolean(String variableName, boolean defaultValue) {
+		boolean out = defaultValue;
 		String s = getEnvString(variableName);
 		if (s.isEmpty()) return out;
 		try {
@@ -128,12 +131,23 @@ public static Map<String, String> getEnv() {
 	}
 
 	public static List<String> getEnvList(String variableName) {
-		return getEnvList(variableName, null);
-	}		
+		return getEnvList(variableName, null, null);
+	}
+	
+	public static List<String> getEnvList(String variableName, List<String> defaultValue) {
+		return getEnvList(variableName, null, defaultValue);
+	}
 
 	public static List<String> getEnvList(String variableName, String delimiter) {
+		return getEnvList(variableName, delimiter, null);
+	}
+
+	public static List<String> getEnvList(String variableName, String delimiter, List<String> defaultValue) {
 		String env = getEnvString(variableName);
-		return parseStringToList(env, delimiter);
+		List<String> out = parseStringToList(env, delimiter);
+		if (out == null) out = defaultValue;
+		if (out == null) out = new ArrayList<String>();
+		return out;
 	}
 
 	public static List<String> parseStringToList(String source) {
@@ -144,11 +158,14 @@ public static List<String> parseStringToList(String source, String delimiter) {
 		List<String> out = new ArrayList<String>();
 		String d = ":";
 		try {
+			if (source == null) return null; 
 			if (delimiter != null) if (!delimiter.isEmpty()) d = delimiter;
 			if(!source.isEmpty()) {
 				String[] a = source.split(d);
 				out = Arrays.asList(a);				
-			}					
+			} else {
+				return null;
+			}
 		} catch (Exception e) {
 			System.out.println("EnvUtils.parseStringToList: " + e.getMessage());
 			e.printStackTrace();
@@ -159,11 +176,23 @@ public static List<String> parseStringToList(String source, String delimiter) {
 	}
 
 	public static Map<String, String> getEnvMap(String variableName) {
-		return getEnvMap(variableName, null);
+		return getEnvMap(variableName, null, null);
+	}
+	
+	public static Map<String, String> getEnvMap(String variableName, Map<String, String> defaultValue) {
+		return getEnvMap(variableName, null, defaultValue);
 	}
 
 	public static Map<String, String> getEnvMap(String variableName, String delimiter) {
+		return getEnvMap(variableName, delimiter, null);
+	}
+	
+	public static Map<String, String> getEnvMap(String variableName, String delimiter, Map<String, String> defaultValue) {
+		Map<String, String> out = defaultValue;
+		if (out == null) out = new HashMap<String, String>(); 
 		String env = getEnvString(variableName);
+		if (env == null) return out;
+		if (env.isEmpty()) return out;		
 		return parseStringToMap(env, delimiter);
 	}
 

env-utils/src/main/java/cz/sysnet/utils/EnvUtils.java

@@ -9,7 +9,8 @@
 import cz.sysnet.utils.EnvUtils;
 
 public class TestEnvUtils {
-	String TESTMAP = "key1=Value1:key2=Value2:key3=Value3:key4=Value4:key5=Value5:key6=Value6:key7=Value7:key8=Value8";
+	String TEST_MAP = "key1=Value1:key2=Value2:key3=Value3:key4=Value4:key5=Value5:key6=Value6:key7=Value7:key8=Value8";
+	String TEST_LIST = "item1:item2:item3:item4";
 
 	@Test
 	public void testGetEnv() {
@@ -27,6 +28,14 @@ public void testGetEnvString() {
 		//System.out.println(out);		
 	}
 
+	@Test
+	public void testGetEnvStringDefault() {
+		String out = EnvUtils.getEnvString("XXX", "AAA");
+		assertTrue(out != null);
+		assertTrue(out.equalsIgnoreCase("AAA"));
+		//System.out.println(out);		
+	}
+	
 	@Test
 	public void testGetEnvList() {
 		String os = System.getProperty("os.name");
@@ -46,10 +55,26 @@ public void testGetEnvList() {
 	}
 
 	@Test
-	public void testParseMap() {
-		Map<String, String> out = EnvUtils.parseStringToMap(TESTMAP);
+	public void testGetEnvListDefault() {
+		List<String> dl = EnvUtils.parseStringToList(TEST_LIST, ":");
+		assertTrue(dl != null);
+		assertTrue(!dl.isEmpty());
+		
+		List<String> out = EnvUtils.getEnvList("XXX", ":", dl);
 		assertTrue(out != null);
 		assertTrue(!out.isEmpty());
-		//System.out.println(out.toString());			
+		assertTrue(out.size() == 4);		
+		//System.out.println(out.toString());
 	}
+	
+	@Test
+	public void testGetEnvMapDefault() {
+		Map<String, String> dm = EnvUtils.parseStringToMap(TEST_MAP);
+		assertTrue(dm != null);
+		assertTrue(!dm.isEmpty());
+		Map<String, String> out = EnvUtils.getEnvMap("XXX", ":", dm);
+		assertTrue(out != null);
+		assertTrue(!out.isEmpty());
+		assertTrue(out.size() == 8);				
+	}	
 }

env-utils/src/test/java/cz/sysnet/utils/test/TestEnvUtils.java

@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Fri Mar 26 19:04:45 CET 2021
+#Mon Mar 29 17:06:00 CEST 2021
 m2e.projectLocation=D\:\\development\\git\\java-utils\\geo-utils
 m2e.projectName=geo.utils
 groupId=cz.sysnet