#283 Static module checker now uses safe XccTemplate constructor

Author: rjrudin

gradle.properties

@@ -1,6 +1,6 @@
 group=com.marklogic
 javadocsDir=../gh-pages-marklogic-java/javadocs
 version=3.7.1
-mlJavaclientUtilVersion=3.7.0
+mlJavaclientUtilVersion=3.7.1
 mlJunitVersion=3.1.0
 

src/main/java/com/marklogic/appdeployer/command/modules/DefaultModulesLoaderFactory.java

@@ -14,7 +14,6 @@
 import com.marklogic.xcc.template.XccTemplate;
 
 import java.util.Map;
-import java.util.Properties;
 import java.util.regex.Pattern;
 
 public class DefaultModulesLoaderFactory extends LoggingObject implements ModulesLoaderFactory {
@@ -81,10 +80,9 @@ public ModulesLoader newModulesLoader(AppConfig appConfig) {
 	 * @return
 	 */
 	protected StaticChecker newStaticChecker(AppConfig appConfig) {
-		String xccUri = "xcc://%s:%s@%s:%d";
-		xccUri = String.format(xccUri, appConfig.getRestAdminUsername(), appConfig.getRestAdminPassword(),
-			appConfig.getHost(), appConfig.getRestPort());
-		XccStaticChecker checker = new XccStaticChecker(new XccTemplate(xccUri));
+		XccTemplate t = new XccTemplate(appConfig.getHost(), appConfig.getRestPort(), appConfig.getRestAdminUsername(),
+			appConfig.getRestAdminPassword(), null);
+		XccStaticChecker checker = new XccStaticChecker(t);
 		checker.setBulkCheck(appConfig.isBulkLoadAssets());
 		checker.setCheckLibraryModules(appConfig.isStaticCheckLibraryAssets());
 		return checker;

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

@@ -66,8 +66,8 @@ protected void undeploySampleApp() {
     }
 
     protected XccTemplate newModulesXccTemplate() {
-        return new XccTemplate(format("xcc://%s:%s@%s:8000/%s", appConfig.getRestAdminUsername(),
-                appConfig.getRestAdminPassword(), appConfig.getHost(), appConfig.getModulesDatabaseName()));
+    	return new XccTemplate(appConfig.getHost(), appConfig.getAppServicesPort(), appConfig.getRestAdminUsername(),
+		    appConfig.getRestAdminPassword(), appConfig.getModulesDatabaseName());
     }
 
     /**

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

@@ -19,8 +19,8 @@ public class LoadModulesTest extends AbstractAppDeployerTest {
 
 	@Before
 	public void setup() {
-		xccTemplate = new XccTemplate(format("xcc://%s:%s@%s:8000/%s", appConfig.getRestAdminUsername(),
-			appConfig.getRestAdminPassword(), appConfig.getHost(), appConfig.getModulesDatabaseName()));
+		xccTemplate = new XccTemplate(appConfig.getHost(), appConfig.getAppServicesPort(), appConfig.getRestAdminUsername(),
+			appConfig.getRestAdminPassword(), appConfig.getModulesDatabaseName());
 	}
 
 	@After