#121 Tweaking property names

Author: rjrudin

build.gradle

@@ -15,7 +15,7 @@ repositories {
 }
 
 dependencies {
-  compile 'com.marklogic:ml-javaclient-util:issue-38'
+  compile 'com.marklogic:ml-javaclient-util:2.11.0'
   compile 'jaxen:jaxen:1.1.6'
   compile 'org.apache.httpcomponents:httpclient:4.3.5'
   compile 'org.springframework:spring-web:4.1.5.RELEASE'

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

@@ -83,10 +83,9 @@ public class AppConfig {
     private String schemasDatabaseName;
 
     private List<String> modulePaths;
-	private boolean staticCheckAssetModules = false;
-	private boolean staticCheckAssetLibraryModules = false;
-	private boolean bulkLoadAssetModules = true;
-	private boolean catchExceptionsForAssetModules = false;
+	private boolean staticCheckAssets = false;
+	private boolean staticCheckLibraryAssets = false;
+	private boolean bulkLoadAssets = true;
 
     private String schemasPath;
     private ConfigDir configDir;
@@ -176,12 +175,12 @@ public DatabaseClient newSchemasDatabaseClient() {
     }
 
 	public StaticChecker newStaticChecker() {
-		if (isStaticCheckAssetModules()) {
+		if (isStaticCheckAssets()) {
 			String xccUri = "xcc://%s:%s@%s:%d";
 			xccUri = String.format(xccUri, getRestAdminUsername(), getRestAdminPassword(), getHost(), getRestPort());
 			XccStaticChecker checker = new XccStaticChecker(new XccTemplate(xccUri));
-			checker.setBulkCheck(isBulkLoadAssetModules());
-			checker.setCheckLibraryModules(isStaticCheckAssetLibraryModules());
+			checker.setBulkCheck(isBulkLoadAssets());
+			checker.setCheckLibraryModules(isStaticCheckLibraryAssets());
 			return checker;
 		}
 		return null;
@@ -222,7 +221,7 @@ public XccAssetLoader newXccAssetLoader() {
             l.setModuleTokenReplacer(buildModuleTokenReplacer());
         }
 
-		l.setBulkLoad(isBulkLoadAssetModules());
+		l.setBulkLoad(isBulkLoadAssets());
         return l;
     }
 
@@ -598,35 +597,27 @@ public void setModuleTokensPropertiesSources(List<PropertiesSource> moduleTokens
         this.moduleTokensPropertiesSources = moduleTokensPropertiesSources;
     }
 
-	public boolean isStaticCheckAssetModules() {
-		return staticCheckAssetModules;
+	public boolean isStaticCheckAssets() {
+		return staticCheckAssets;
 	}
 
-	public void setStaticCheckAssetModules(boolean staticCheckAssetModules) {
-		this.staticCheckAssetModules = staticCheckAssetModules;
+	public void setStaticCheckAssets(boolean staticCheckAssets) {
+		this.staticCheckAssets = staticCheckAssets;
 	}
 
-	public boolean isStaticCheckAssetLibraryModules() {
-		return staticCheckAssetLibraryModules;
+	public boolean isStaticCheckLibraryAssets() {
+		return staticCheckLibraryAssets;
 	}
 
-	public void setStaticCheckAssetLibraryModules(boolean staticCheckAssetLibraryModules) {
-		this.staticCheckAssetLibraryModules = staticCheckAssetLibraryModules;
+	public void setStaticCheckLibraryAssets(boolean staticCheckLibraryAssets) {
+		this.staticCheckLibraryAssets = staticCheckLibraryAssets;
 	}
 
-	public boolean isBulkLoadAssetModules() {
-		return bulkLoadAssetModules;
+	public boolean isBulkLoadAssets() {
+		return bulkLoadAssets;
 	}
 
-	public void setBulkLoadAssetModules(boolean bulkLoadAssetModules) {
-		this.bulkLoadAssetModules = bulkLoadAssetModules;
-	}
-
-	public boolean isCatchExceptionsForAssetModules() {
-		return catchExceptionsForAssetModules;
-	}
-
-	public void setCatchExceptionsForAssetModules(boolean catchExceptionsForAssetModules) {
-		this.catchExceptionsForAssetModules = catchExceptionsForAssetModules;
+	public void setBulkLoadAssets(boolean bulkLoadAssets) {
+		this.bulkLoadAssets = bulkLoadAssets;
 	}
 }

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

@@ -242,7 +242,7 @@ public AppConfig newAppConfig() {
 		prop = getProperty("mlBulkLoadAssets");
 		if (prop != null) {
 			logger.info("Bulk load modules: " + prop);
-			c.setBulkLoadAssetModules(Boolean.parseBoolean(prop));
+			c.setBulkLoadAssets(Boolean.parseBoolean(prop));
 		}
 
 		/**
@@ -251,7 +251,7 @@ public AppConfig newAppConfig() {
 		prop = getProperty("mlStaticCheckAssets");
 		if (prop != null) {
 			logger.info("Statically check asset modules: " + prop);
-			c.setStaticCheckAssetModules(Boolean.parseBoolean(prop));
+			c.setStaticCheckAssets(Boolean.parseBoolean(prop));
 		}
 
 		/**
@@ -262,7 +262,7 @@ public AppConfig newAppConfig() {
 		prop = getProperty("mlStaticCheckLibraryAssets");
 		if (prop != null) {
 			logger.info("Statically check asset library modules: " + prop);
-			c.setStaticCheckAssetLibraryModules(Boolean.parseBoolean(prop));
+			c.setStaticCheckLibraryAssets(Boolean.parseBoolean(prop));
 		}
 
 		return c;

src/test/java/com/marklogic/appdeployer/command/modules/LoadModulesTest.java

@@ -32,14 +32,14 @@ public void teardown() {
 	public void loadModulesWithStaticCheck() {
 		appConfig.getModulePaths().clear();
 		appConfig.getModulePaths().add("src/test/resources/sample-app/static-check-modules");
-		appConfig.setStaticCheckAssetModules(false);
+		appConfig.setStaticCheckAssets(false);
 		initializeAppDeployer(new DeployRestApiServersCommand(true), buildLoadModulesCommand());
 
 		// This should succeed because modules aren't statically checked
 		appDeployer.deploy(appConfig);
 
 		// Now load modules with static check enabled
-		appConfig.setStaticCheckAssetModules(true);
+		appConfig.setStaticCheckAssets(true);
 		initializeAppDeployer(buildLoadModulesCommand());
 		try {
 			appDeployer.deploy(appConfig);