[Core] Default param to Optional.empty instead of IllegalArgumentExce…

…ption
vertigo-io · Apr 2, 2024 · 4276e7a · 4276e7a
1 parent 8bd939c
commit 4276e7a
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/vertigo-core/src/main/java/io/vertigo/core/param/EnvParamUtil.java b/vertigo-core/src/main/java/io/vertigo/core/param/EnvParamUtil.java
@@ -62,13 +62,10 @@ public static Optional<Param> getParam(final String paramName, final String para
 					: Optional.empty();
 			if (paramManagerOpt.isPresent()) {
 				return paramManagerOpt.get().getOptionalParam(property)
-						.or(() -> Optional
-								.of(Param.of(paramName, defaultValueOpt.orElseThrow(() -> new IllegalArgumentException(
-										"Param '" + property + "' not found (paramManager)")))));
+						.or(() -> defaultValueOpt.map(defaultValue -> Param.of(paramName, defaultValue)));
 			} else {
-				return getOptionalSysEnvParam(paramName, property).or(() -> Optional
-						.of(Param.of(paramName, defaultValueOpt.orElseThrow(() -> new IllegalArgumentException(
-								"Param '" + property + "' not found (system and env)")))));
+				return getOptionalSysEnvParam(paramName, property)
+						.or(() -> defaultValueOpt.map(defaultValue -> Param.of(paramName, defaultValue)));
 			}
 		}
 		return Optional.of(Param.of(paramName, paramValue));