#313 AppConfig now constructs paths relative to a project directory

This allows ml-gradle work when using Java 11 and the Gradle daemon

Author: rjrudin

build.gradle

@@ -13,6 +13,7 @@ targetCompatibility = "1.8"
 repositories {
 	mavenLocal()
   jcenter()
+	mavenCentral()
 }
 
 dependencies {
@@ -27,6 +28,11 @@ dependencies {
 	// For PreviewInterceptor; can be excluded if that feature is not used
 	compile "com.flipkart.zjsonpatch:zjsonpatch:0.4.6"
 
+	// Required for Java 11
+	compile "javax.xml.bind:jaxb-api:2.3.1"
+	compile "com.sun.xml.bind:jaxb-core:2.3.0.1"
+	compile "com.sun.xml.bind:jaxb-impl:2.3.2"
+
 	// Don't want to include this in the published jar, just the executable jar
 	compileOnly "com.beust:jcommander:1.72"
 

gradle.properties

@@ -1,6 +1,6 @@
 group=com.marklogic
 javadocsDir=../gh-pages-marklogic-java/javadocs
-version=3.11.0
+version=3.12.dev
 mlJavaclientUtilVersion=3.10.0
 mlJunitVersion=3.1.0
 

src/main/java/com/marklogic/appdeployer/AppConfig.java

@@ -14,6 +14,7 @@
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.X509TrustManager;
+import java.io.File;
 import java.io.FileFilter;
 import java.util.*;
 import java.util.regex.Pattern;
@@ -223,20 +224,23 @@ public class AppConfig {
 
 	private Map<String, Object> additionalProperties = new HashMap<>();
 
+	private File projectDir;
+
 	public AppConfig() {
-        this(DEFAULT_MODULES_PATH, DEFAULT_SCHEMAS_PATH);
+        this(null);
     }
 
-    public AppConfig(String defaultModulePath) {
-        this(defaultModulePath, DEFAULT_SCHEMAS_PATH);
-    }
+    public AppConfig(File projectDir) {
+		this.projectDir = projectDir;
+
+		modulePaths = new ArrayList<>();
+		String path = projectDir != null ? new File(projectDir, DEFAULT_MODULES_PATH).getAbsolutePath() : DEFAULT_MODULES_PATH;
+		modulePaths.add(path);
 
-    public AppConfig(String defaultModulePath, String defaultSchemasPath) {
-        modulePaths = new ArrayList<>();
-        modulePaths.add(defaultModulePath);
-        configDirs = new ArrayList<>();
-        configDirs.add(new ConfigDir());
-        schemasPath = defaultSchemasPath;
+	    schemasPath = projectDir != null ? new File(projectDir, DEFAULT_SCHEMAS_PATH).getAbsolutePath() : DEFAULT_SCHEMAS_PATH;
+
+	    configDirs = new ArrayList<>();
+	    configDirs.add(ConfigDir.withProjectDir(projectDir));
     }
 
 	public void populateCustomTokens(PropertiesSource propertiesSource) {
@@ -552,7 +556,7 @@ public ConfigDir getConfigDir() {
 	public ConfigDir getFirstConfigDir() {
 	    if (configDirs == null || configDirs.isEmpty()) {
 		    this.configDirs = new ArrayList<>();
-		    this.configDirs.add(new ConfigDir());
+		    this.configDirs.add(ConfigDir.withProjectDir(this.projectDir));
 	    }
 	    return configDirs.get(0);
     }
@@ -1269,4 +1273,8 @@ public boolean isDeployPrivilegesWithCma() {
 	public void setDeployPrivilegesWithCma(boolean deployPrivilegesWithCma) {
 		this.deployPrivilegesWithCma = deployPrivilegesWithCma;
 	}
+
+	public File getProjectDir() {
+		return projectDir;
+	}
 }

src/main/java/com/marklogic/appdeployer/ConfigDir.java

@@ -1,7 +1,6 @@
 package com.marklogic.appdeployer;
 
 import java.io.File;
-import java.io.FileFilter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -13,6 +12,8 @@
  */
 public class ConfigDir {
 
+	public final static String DEFAULT_PATH = "src/main/ml-config";
+
 	private File baseDir;
 
 	private String databasesPath = "databases";
@@ -22,8 +23,17 @@ public class ConfigDir {
 
 	private List<File> contentDatabaseFiles;
 
+	private File projectDir;
+
+	public static ConfigDir withProjectDir(File projectDir) {
+		File baseDir = projectDir != null ? new File(projectDir, DEFAULT_PATH) : new File(DEFAULT_PATH);
+		ConfigDir configDir = new ConfigDir(baseDir);
+		configDir.projectDir = projectDir;
+		return configDir;
+	}
+
 	public ConfigDir() {
-		this(new File("src/main/ml-config"));
+		new File(DEFAULT_PATH);
 	}
 
 	public ConfigDir(File baseDir) {
@@ -226,4 +236,8 @@ public String getDefaultContentDatabaseFilename() {
 	public void setDefaultContentDatabaseFilename(String contentDatabaseFilename) {
 		this.defaultContentDatabaseFilename = contentDatabaseFilename;
 	}
+
+	public File getProjectDir() {
+		return projectDir;
+	}
 }

src/main/java/com/marklogic/appdeployer/DefaultAppConfigFactory.java

@@ -11,6 +11,8 @@
 
 public class DefaultAppConfigFactory extends PropertySourceFactory implements AppConfigFactory {
 
+	private File projectDir;
+
 	public DefaultAppConfigFactory() {
 		super();
 		initialize();
@@ -84,18 +86,19 @@ public void initialize() {
 			logger.info("Config paths: " + prop);
 			List<ConfigDir> list = new ArrayList<>();
 			for (String path : prop.split(",")) {
-				list.add(new ConfigDir(new File(path)));
+				list.add(buildConfigDir(path));
 			}
 			config.setConfigDirs(list);
 		});
+
 		// TODO Only process if mlConfigPaths not set?
 		propertyConsumerMap.put("mlConfigDir", (config, prop) -> {
 			logger.info("mlConfigDir is deprecated; please use mlConfigPath; Config dir: " + prop);
-			config.setConfigDir(new ConfigDir(new File(prop)));
+			config.setConfigDir(buildConfigDir(prop));
 		});
 		propertyConsumerMap.put("mlConfigPath", (config, prop) -> {
 			logger.info("Config path: " + prop);
-			config.setConfigDir(new ConfigDir(new File(prop)));
+			config.setConfigDir(buildConfigDir(prop));
 		});
 
 		/**
@@ -263,7 +266,8 @@ public void initialize() {
 		 */
 		propertyConsumerMap.put("mlSchemasPath", (config, prop) -> {
 			logger.info("Schemas path: " + prop);
-			config.setSchemasPath(prop);
+			String path = this.projectDir != null ? new File(this.projectDir, prop).getAbsolutePath() : prop;
+			config.setSchemasPath(path);
 		});
 
 		propertyConsumerMap.put("mlSchemasDatabaseName", (config, prop) -> {
@@ -502,7 +506,8 @@ public void initialize() {
 			// Ensure we have a modifiable list
 			List<String> list = new ArrayList<>();
 			for (String s : paths) {
-				list.add(s);
+				String path = this.projectDir != null ? new File(projectDir, s).getAbsolutePath() : s;
+				list.add(path);
 			}
 			config.setModulePaths(list);
 		});
@@ -662,7 +667,7 @@ public void initialize() {
 
 	@Override
 	public AppConfig newAppConfig() {
-		final AppConfig appConfig = new AppConfig();
+		final AppConfig appConfig = new AppConfig(this.projectDir);
 		for (String propertyName : propertyConsumerMap.keySet()) {
 			String value = getProperty(propertyName);
 			if (value != null) {
@@ -675,6 +680,11 @@ public AppConfig newAppConfig() {
 		return appConfig;
 	}
 
+	protected ConfigDir buildConfigDir(String path) {
+		File baseDir = this.projectDir != null ? new File(this.projectDir, path) : new File(path);
+		return new ConfigDir(baseDir);
+	}
+
 	protected void setDefaultsForDatabasesWithForestsOnOneHost(AppConfig appConfig) {
 		Set<String> set = appConfig.getDatabasesWithForestsOnOneHost();
 		if (set == null || set.isEmpty()) {
@@ -725,4 +735,8 @@ protected Map<String, List<String>> buildMapOfListsFromDelimitedString(String st
 	public Map<String, BiConsumer<AppConfig, String>> getPropertyConsumerMap() {
 		return propertyConsumerMap;
 	}
+
+	public void setProjectDir(File projectDir) {
+		this.projectDir = projectDir;
+	}
 }

src/test/java/com/marklogic/appdeployer/AbstractAppDeployerTest.java

@@ -33,7 +33,11 @@ public void initialize() {
     }
 
     protected void initializeAppConfig() {
-        appConfig = new AppConfig("src/test/resources/sample-app/src/main/ml-modules", "src/test/resources/sample-app/src/main/ml-schemas");
+        appConfig = new AppConfig();
+        appConfig.getModulePaths().clear();
+        appConfig.getModulePaths().add("src/test/resources/sample-app/src/main/ml-modules");
+        appConfig.setSchemasPath("src/test/resources/sample-app/src/main/ml-schemas");
+
         appConfig.setName(SAMPLE_APP_NAME);
         appConfig.setRestPort(SAMPLE_APP_REST_PORT);
         ConfigDir configDir = new ConfigDir(new File("src/test/resources/sample-app/src/main/ml-config"));