requested changes

Author: christiangoerdes

annot/src/main/java/com/predic8/membrane/annot/yaml/YamlParsingUtils.java

@@ -22,7 +22,6 @@
 import com.networknt.schema.SchemaRegistry;
 import com.predic8.membrane.annot.Grammar;
 import com.predic8.membrane.annot.beanregistry.BeanRegistryAware;
-import com.predic8.membrane.annot.yaml.spel.SpELContext;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 import org.jetbrains.annotations.NotNull;

annot/src/main/java/com/predic8/membrane/annot/yaml/spel/EnvPropertyAccessor.java

@@ -1,20 +1,23 @@
 package com.predic8.membrane.annot.yaml.spel;
 
 import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.expression.AccessException;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.PropertyAccessor;
 import org.springframework.expression.TypedValue;
 
 import static com.predic8.membrane.annot.yaml.spel.EnvPropertyAccessor.EnvVariables.INSTANCE;
 import static java.lang.System.getenv;
-import static java.util.Locale.ROOT;
 
 public final class EnvPropertyAccessor implements PropertyAccessor {
 
+    private static final Logger LOG = LoggerFactory.getLogger(EnvPropertyAccessor.class);
+
     @Override
     public Class<?>[] getSpecificTargetClasses() {
-        return new Class<?>[] { SpELContext.class, EnvVariables.class };
+        return new Class<?>[]{SpELContext.class, EnvVariables.class};
     }
 
     @Override
@@ -29,7 +32,11 @@ public boolean canRead(@NotNull EvaluationContext context, Object target, @NotNu
             return new TypedValue(INSTANCE);
         }
         if (target instanceof EnvVariables) {
-            return new TypedValue(getenv(name.toUpperCase(ROOT)));
+            String value = getenv(name);
+            if (value == null) {
+                LOG.warn("Environment variable '{}' not found. Note: env lookups are case-sensitive.", name);
+            }
+            return new TypedValue(value);
         }
         throw new AccessException("Unsupported target: " + target);
     }

annot/src/main/java/com/predic8/membrane/annot/yaml/spel/SpELContext.java

@@ -2,15 +2,4 @@
 
 public class SpELContext {
 
-    @SuppressWarnings("unused")
-    public String env(String key) {
-        return System.getenv(key);
-    }
-
-    @SuppressWarnings("unused")
-    public String env(String key, String defaultValue) {
-        String v = System.getenv(key);
-        return v != null ? v : defaultValue;
-    }
-
 }

annot/src/test/java/com/predic8/membrane/annot/YAMLParsingTest.java

@@ -613,7 +613,7 @@ public class DemoElement {
         assertCompilerResult(true, result);
 
         BeanRegistry br = parseYAML(result, """
-                root: "#{env('MEMBRANE_SPEL_TEST') ?: '42'}"
+                root: "#{env.MEMBRANE_SPEL_TEST ?: '42'}"
                 """);
 
         assertStructure(br,
@@ -641,7 +641,7 @@ public class DemoElement {
 
         BeanRegistry br = parseYAML(result, """
         root:
-          msg: "prefix-#{env('MEMBRANE_SPEL_TEST') ?: 'X'}-suffix"
+          msg: "prefix-#{env.MEMBRANE_SPEL_TEST ?: 'X'}-suffix"
         """);
 
         assertStructure(br,

distribution/tutorials/advanced/90-Environment-Variables.yaml

@@ -1,6 +1,6 @@
 # yaml-language-server: $schema=https://www.membrane-api.io/v7.0.6.json
 #
-# Tutorial: Environment Variables via SpEL (#{env(...)})
+# Tutorial: Environment Variables via SpEL (#{env.})
 #
 # This tutorial shows how to use environment variables in YAML using SpEL templates:
 #   - #{env.port} reads the environment variable PORT
@@ -11,7 +11,7 @@
 #     Windows PowerShell: $env:PORT="3000"
 #     Windows CMD: set PORT=3000
 #
-# 2) Start membrane from the same terminal
+# 2) Start membrane from the same terminal so the env var is available
 #
 # 3) Try:
 #     curl -v http://localhost:2000/