#97 XccTemplate now allows for special characters in the password

Author: rjrudin

src/main/java/com/marklogic/client/ext/spring/BasicConfig.java

@@ -1,15 +1,14 @@
 package com.marklogic.client.ext.spring;
 
+import com.marklogic.client.ext.DatabaseClientConfig;
+import com.marklogic.client.ext.helper.DatabaseClientProvider;
+import com.marklogic.xcc.template.XccTemplate;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 
-import com.marklogic.client.ext.DatabaseClientConfig;
-import com.marklogic.client.ext.helper.DatabaseClientProvider;
-import com.marklogic.xcc.template.XccTemplate;
-
 /**
  * Provides a basic configuration for Spring-based applications. Assumes that properties can be found in the
  * gradle.properties file, though that file does not need to exist - this can be subclassed and a different property
@@ -55,8 +54,7 @@ public DatabaseClientConfig databaseClientConfig() {
 
     @Bean
     public XccTemplate xccTemplate() {
-        return new XccTemplate(String.format("xcc://%s:%s@%s:8000/%s", getMlUsername(), getMlPassword(), getMlHost(),
-                buildContentDatabaseName(mlAppName)));
+    	return new XccTemplate(getMlHost(), 8000, getMlUsername(), getMlPassword(), buildContentDatabaseName(mlAppName));
     }
 
     /**

src/main/java/com/marklogic/xcc/template/XccTemplate.java

@@ -21,6 +21,7 @@ public class XccTemplate {
     private ContentSource contentSource;
 
     public XccTemplate(String uri) {
+    	logger.info("uri: " + uri);
         try {
             contentSource = ContentSourceFactory.newContentSource(new URI(uri));
             if (logger.isInfoEnabled()) {
@@ -35,6 +36,21 @@ public XccTemplate(String uri) {
         }
     }
 
+    public XccTemplate(String host, int port, String username, String password, String contentDatabaseName) {
+	    char[] charPassword;
+	    if (password != null) {
+		    charPassword = password.toCharArray();
+	    } else {
+		    charPassword = new char[]{};
+	    }
+
+	    if (contentDatabaseName != null) {
+		    this.contentSource = ContentSourceFactory.newContentSource(host, port, username, charPassword, contentDatabaseName);
+	    } else {
+		    this.contentSource = ContentSourceFactory.newContentSource(host, port, username, charPassword);
+	    }
+    }
+
     public XccTemplate(ContentSource contentSource) {
     	this.contentSource = contentSource;
     }

src/test/java/com/marklogic/client/ext/modulesloader/impl/StaticCheckModulesTest.java

@@ -6,7 +6,6 @@
 import org.junit.Test;
 import org.springframework.core.io.Resource;
 
-import java.io.File;
 import java.nio.file.Paths;
 import java.util.Set;
 
@@ -27,8 +26,8 @@ public void setup() {
 		client = newClient(database);
 		client.newServerEval().xquery("cts:uris((), (), cts:true-query()) ! xdmp:document-delete(.)").eval();
 
-		xccTemplate = new XccTemplate("xcc://" + clientConfig.getUsername() + ":" + clientConfig.getPassword()
-			+ "@" + clientConfig.getHost() + ":" + clientConfig.getPort() + "/" + database);
+		xccTemplate = new XccTemplate(clientConfig.getHost(), clientConfig.getPort(), clientConfig.getUsername(),
+			clientConfig.getPassword(), database);
 
 		staticChecker = new XccStaticChecker(xccTemplate);