Move env var resolution from ProcessedOptionBuilder to ProcessedOption

Co-authored-by: stalep <[email protected]>

Author: Copilot

aesh/src/main/java/org/aesh/command/impl/internal/ProcessedOption.java

@@ -392,7 +392,7 @@ public void injectValueIntoField(Object instance, InvocationProviders invocation
                 if(getValue() != null)
                     field.set(instance, doConvert(getValue(), invocationProviders, instance, aeshContext, doValidation));
                 else if(defaultValues.size() > 0) {
-                    field.set(instance, doConvert(defaultValues.get(0), invocationProviders, instance, aeshContext, doValidation));
+                    field.set(instance, doConvert(resolveEnvironmentVariable(defaultValues.get(0)), invocationProviders, instance, aeshContext, doValidation));
                 }
             }
             else if(optionType == OptionType.LIST || optionType == OptionType.ARGUMENTS) {
@@ -403,7 +403,7 @@ else if(optionType == OptionType.LIST || optionType == OptionType.ARGUMENTS) {
                 }
                 else if(defaultValues.size() > 0) {
                     for(String in : defaultValues)
-                        tmpSet.add(doConvert(in, invocationProviders, instance, aeshContext, doValidation));
+                        tmpSet.add(doConvert(resolveEnvironmentVariable(in), invocationProviders, instance, aeshContext, doValidation));
                 }
 
                 field.set(instance, tmpSet);
@@ -512,6 +512,33 @@ boolean isTypeAssignableByResourcesOrFile() {
                    Path.class.isAssignableFrom(type));
     }
 
+    /**
+     * Resolves a single environment variable reference.
+     * If the value matches the pattern $(ENV_VAR_NAME), it will be replaced
+     * with the value of the environment variable. If the environment variable
+     * is not set, the original value is returned.
+     *
+     * @param value the value to resolve
+     * @return the resolved value
+     */
+    private String resolveEnvironmentVariable(String value) {
+        if (value == null) {
+            return null;
+        }
+        // Check if the value matches the pattern $(ENV_VAR_NAME)
+        // Minimum length is 4 for "$(X)" where X is at least one character
+        if (value.length() > 3 && value.startsWith("$(") && value.endsWith(")")) {
+            String envVarName = value.substring(2, value.length() - 1);
+            if (!envVarName.isEmpty()) {
+                String envValue = System.getenv(envVarName);
+                if (envValue != null) {
+                    return envValue;
+                }
+            }
+        }
+        return value;
+    }
+
     @Override
     public String toString() {
         return "ProcessedOption{" +

aesh/src/main/java/org/aesh/command/impl/internal/ProcessedOptionBuilder.java

@@ -342,55 +342,8 @@ else if(hasMultipleValues)
         //if(renderer == null)
         //    renderer = new NullOptionRenderer();
 
-        // Resolve environment variables in default values
-        List<String> resolvedDefaultValues = resolveEnvironmentVariables(defaultValues);
-
         return new ProcessedOption(shortName, name, description, argument, required,
-                valueSeparator, askIfNotSet, selectorType, resolvedDefaultValues, type, fieldName, optionType, converter,
+                valueSeparator, askIfNotSet, selectorType, defaultValues, type, fieldName, optionType, converter,
                 completer, validator, activator, renderer, parser, overrideRequired);
     }
-
-    /**
-     * Resolves environment variables in default values.
-     * If a default value matches the pattern $(ENV_VAR_NAME), it will be replaced
-     * with the value of the environment variable.
-     *
-     * @param values the list of default values
-     * @return a new list with environment variables resolved, or the original list if null
-     */
-    private List<String> resolveEnvironmentVariables(List<String> values) {
-        if (values == null) {
-            return null;
-        }
-        List<String> resolved = new ArrayList<>();
-        for (String value : values) {
-            resolved.add(resolveEnvironmentVariable(value));
-        }
-        return resolved;
-    }
-
-    /**
-     * Resolves a single environment variable reference.
-     * If the value matches the pattern $(ENV_VAR_NAME), it will be replaced
-     * with the value of the environment variable. If the environment variable
-     * is not set, the original value is returned.
-     *
-     * @param value the value to resolve
-     * @return the resolved value
-     */
-    private String resolveEnvironmentVariable(String value) {
-        if (value == null) {
-            return null;
-        }
-        // Check if the value matches the pattern $(ENV_VAR_NAME)
-        // Minimum length is 4 for "$(X)" where X is at least one character
-        if (value.length() > 3 && value.startsWith("$(") && value.endsWith(")")) {
-            String envVarName = value.substring(2, value.length() - 1);
-            String envValue = System.getenv(envVarName);
-            if (envValue != null) {
-                return envValue;
-            }
-        }
-        return value;
-    }
 }