Isolate the integration tests from the local environment #97

common/src/main/java/org/jboss/fuse/mvnd/common/Environment.java

@@ -25,6 +25,8 @@ import java.util.Optional;
 import java.util.Properties;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Collects system properties and environment variables used by mvnd client or server.
@@ -41,6 +43,7 @@ public enum Environment {
     DAEMON_IDLE_TIMEOUT("daemon.idleTimeout", null),
     DAEMON_UID("daemon.uid", null);
 
+    private static final Logger LOG = LoggerFactory.getLogger(Environment.class);
     static Properties properties = System.getProperties();
     static Map<String, String> env = System.getenv();
 
@@ -66,6 +69,10 @@ public enum Environment {
         return new EnvValue(this, environmentVariableSource());
     }
 
+    public EnvValue fromValueSource(ValueSource valueSource) {
+        return new EnvValue(this, valueSource);
+    }
+
     public String asCommandLineProperty(String value) {
         return "-D" + property + "=" + value;
     }
@@ -99,14 +106,6 @@ public enum Environment {
                 .toAbsolutePath().normalize();
     }
 
-    public static Path findMavenHome(Supplier<Properties> mvndProperties, Path mvndPropertiesPath) {
-        return findBasicMavenHome()
-                .orLocalProperty(mvndProperties, mvndPropertiesPath)
-                .orFail()
-                .asPath()
-                .toAbsolutePath().normalize();
-    }
-
     public static EnvValue findBasicMavenHome() {
         return MVND_HOME
                 .environmentVariable()
@@ -231,7 +230,7 @@ public enum Environment {
 
         public Environment.EnvValue orDefault(Supplier<String> defaultSupplier) {
             return new EnvValue(this, envKey,
-                    new ValueSource(sb -> sb.append("default").append(defaultSupplier.get()), defaultSupplier));
+                    new ValueSource(sb -> sb.append("default: ").append(defaultSupplier.get()), defaultSupplier));
         }
 
         public Environment.EnvValue orFail() {
@@ -265,7 +264,18 @@ public enum Environment {
                     return result;
                 }
             }
-            return valueSource.valueSupplier.get();
+            final String result = valueSource.valueSupplier.get();
+            if (result != null && LOG.isDebugEnabled()) {
+                StringBuilder sb = new StringBuilder("Loaded environment value for key [")
+                        .append(envKey.name())
+                        .append("] from ");
+                valueSource.descriptionFunction.apply(sb);
+                sb.append(": [")
+                        .append(result)
+                        .append(']');
+                LOG.debug(sb.toString());
+            }
+            return result;
         }
 
         public String asString() {
@@ -290,4 +300,5 @@ public enum Environment {
         }
 
     }
+
 }

common/src/main/java/org/jboss/fuse/mvnd/common/Layout.java

@@ -72,8 +72,8 @@ public class Layout {
 
             ENV_INSTANCE = new Layout(
                     mvndPropertiesPath,
-                    Environment.findBasicMavenHome()
-                            .orLocalProperty(mvndProperties, mvndPropertiesPath)
+                    Environment.MVND_HOME
+                            .systemProperty()
                             .orFail()
                             .asPath()
                             .toAbsolutePath().normalize(),

common/src/main/java/org/jboss/fuse/mvnd/common/ServerMain.java

@@ -71,7 +71,6 @@ public class ServerMain {
         Thread.currentThread().setContextClassLoader(loader);
         Class<?> clazz = loader.loadClass("org.jboss.fuse.mvnd.daemon.Server");
         try (AutoCloseable server = (AutoCloseable) clazz.getConstructor(String.class).newInstance(uidStr)) {
-            System.out.println("server = " + server);
             ((Runnable) server).run();
         }
     }