Merge branch 'dev' into dev

Author: rjrudin

gradle.properties

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

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

@@ -13,6 +13,7 @@
 import com.marklogic.client.ext.tokenreplacer.PropertiesSource;
 
 import javax.net.ssl.SSLContext;
+import javax.net.ssl.X509TrustManager;
 import java.io.FileFilter;
 import java.util.*;
 import java.util.regex.Pattern;
@@ -83,6 +84,7 @@ public class AppConfig {
     private String restCertFile;
     private String restCertPassword;
     private String restExternalName;
+    private X509TrustManager restTrustManager;
     private Integer restPort = DEFAULT_PORT;
     private Integer testRestPort;
 
@@ -96,6 +98,7 @@ public class AppConfig {
 	private String appServicesCertFile;
 	private String appServicesCertPassword;
 	private String appServicesExternalName;
+	private X509TrustManager appServicesTrustManager;
 
     // These can all be set to override the default names that are generated off of the "name" attribute.
     private String groupName = DEFAULT_GROUP;
@@ -300,12 +303,13 @@ public DatabaseClient newTestDatabaseClient() {
 
     public DatabaseClientConfig newRestDatabaseClientConfig(int port) {
 	    DatabaseClientConfig config = new DatabaseClientConfig(getHost(), port, getRestAdminUsername(), getRestAdminPassword());
-	    config.setSecurityContextType(restSecurityContextType);
-	    config.setSslHostnameVerifier(getRestSslHostnameVerifier());
-	    config.setSslContext(getRestSslContext());
 	    config.setCertFile(getRestCertFile());
 	    config.setCertPassword(getRestCertPassword());
 	    config.setExternalName(getRestExternalName());
+	    config.setSecurityContextType(restSecurityContextType);
+	    config.setSslContext(getRestSslContext());
+	    config.setSslHostnameVerifier(getRestSslHostnameVerifier());
+	    config.setTrustManager(restTrustManager);
 	    return config;
     }
 
@@ -328,13 +332,14 @@ public DatabaseClient newSchemasDatabaseClient() {
 
     public DatabaseClient newAppServicesDatabaseClient(String databaseName) {
 	    DatabaseClientConfig config = new DatabaseClientConfig(getHost(), getAppServicesPort(), getAppServicesUsername(), getAppServicesPassword());
-	    config.setDatabase(databaseName);
-	    config.setSecurityContextType(appServicesSecurityContextType);
-	    config.setSslHostnameVerifier(getAppServicesSslHostnameVerifier());
-	    config.setSslContext(getAppServicesSslContext());
 	    config.setCertFile(getAppServicesCertFile());
 	    config.setCertPassword(getAppServicesCertPassword());
+	    config.setDatabase(databaseName);
 	    config.setExternalName(getAppServicesExternalName());
+	    config.setSecurityContextType(appServicesSecurityContextType);
+	    config.setSslContext(getAppServicesSslContext());
+	    config.setSslHostnameVerifier(getAppServicesSslHostnameVerifier());
+	    config.setTrustManager(appServicesTrustManager);
 	    return configuredDatabaseClientFactory.newDatabaseClient(config);
     }
 
@@ -1226,4 +1231,20 @@ public boolean isUpdateMimetypeWhenPropertiesAreEqual() {
 	public void setUpdateMimetypeWhenPropertiesAreEqual(boolean updateMimetypeWhenPropertiesAreEqual) {
 		this.updateMimetypeWhenPropertiesAreEqual = updateMimetypeWhenPropertiesAreEqual;
 	}
+
+	public X509TrustManager getRestTrustManager() {
+		return restTrustManager;
+	}
+
+	public void setRestTrustManager(X509TrustManager restTrustManager) {
+		this.restTrustManager = restTrustManager;
+	}
+
+	public X509TrustManager getAppServicesTrustManager() {
+		return appServicesTrustManager;
+	}
+
+	public void setAppServicesTrustManager(X509TrustManager appServicesTrustManager) {
+		this.appServicesTrustManager = appServicesTrustManager;
+	}
 }

src/main/java/com/marklogic/appdeployer/command/forests/DeployForestsCommand.java

@@ -31,15 +31,35 @@
  */
 public class DeployForestsCommand extends AbstractCommand {
 
+	/**
+	 * This was added back in 3.8.2 to preserve backwards compatibility, as it was removed in 3.7.0.
+	 */
+	public static final String DEFAULT_FOREST_PAYLOAD = "{\"forest-name\": \"%%FOREST_NAME%%\", \"host\": \"%%FOREST_HOST%%\", "
+		+ "\"database\": \"%%FOREST_DATABASE%%\"}";
+
 	private int forestsPerHost = 1;
 	private String databaseName;
 	private String forestFilename;
 	private String forestPayload;
 	private boolean createForestsOnEachHost = true;
 	private HostCalculator hostCalculator;
 
-	public DeployForestsCommand(String databaseName) {
+	/**
+	 * This was added back in 3.8.2 to preserve backwards compatibility, as it was removed in 3.7.0. If you use this
+	 * constructor, be sure to call setDatabaseName.
+	 */
+	public DeployForestsCommand() {
 		setExecuteSortOrder(SortOrderConstants.DEPLOY_FORESTS);
+	}
+
+	/**
+	 * This is the preferred constructor to use for this class, as it requires a database name, which is required for
+	 * this command to execute correctly.
+	 *
+	 * @param databaseName
+	 */
+	public DeployForestsCommand(String databaseName) {
+		this();
 		this.databaseName = databaseName;
 	}
 
@@ -217,4 +237,13 @@ public void setCreateForestsOnEachHost(boolean createForestsOnEachHost) {
 	public void setHostCalculator(HostCalculator hostCalculator) {
 		this.hostCalculator = hostCalculator;
 	}
+
+	/**
+	 * This was added back in 3.8.2 to preserve backwards compatibility, as it was removed in 3.7.0.
+	 *
+	 * @param databaseName
+	 */
+	public void setDatabaseName(String databaseName) {
+		this.databaseName = databaseName;
+	}
 }

src/main/java/com/marklogic/appdeployer/command/restapis/DeployRestApiServersCommand.java

@@ -60,8 +60,8 @@ public Integer getUndoSortOrder() {
 	public void execute(CommandContext context) {
 		String payload = getRestApiPayload(context);
 		if (payload != null) {
-			RestApiManager mgr = new RestApiManager(context.getManageClient());
 			AppConfig appConfig = context.getAppConfig();
+			RestApiManager mgr = new RestApiManager(context.getManageClient(), appConfig.getGroupName());
 
 			mgr.createRestApi(payloadTokenReplacer.replaceTokens(payload, appConfig, false));
 
@@ -194,7 +194,7 @@ protected boolean deleteRestApi(String serverName, String groupName, ManageClien
 		request.setIncludeModules(includeModules);
 		request.setDeleteContentReplicaForests(isDeleteContentReplicaForests());
 		request.setDeleteModulesReplicaForests(isDeleteModulesReplicaForests());
-		return new RestApiManager(manageClient).deleteRestApi(request);
+		return new RestApiManager(manageClient, groupName).deleteRestApi(request);
 	}
 
 	public boolean isDeleteModulesDatabase() {

src/main/java/com/marklogic/mgmt/AbstractManager.java

@@ -60,17 +60,27 @@ protected String getResourceId(String payload) {
 
     protected ResponseEntity<String> putPayload(ManageClient client, String path, String payload) {
         boolean requiresSecurityUser = useSecurityUser(payload);
-        if (payloadParser.isJsonPayload(payload)) {
-            return requiresSecurityUser ? client.putJsonAsSecurityUser(path, payload) : client.putJson(path, payload);
+        try {
+	        if (payloadParser.isJsonPayload(payload)) {
+		        return requiresSecurityUser ? client.putJsonAsSecurityUser(path, payload) : client.putJson(path, payload);
+	        }
+	        return requiresSecurityUser ? client.putXmlAsSecurityUser(path, payload) : client.putXml(path, payload);
+        } catch (RuntimeException ex) {
+	        logger.error(format("Error occurred while sending PUT request to %s; logging request body to assist with debugging: %s", path, payload));
+	        throw ex;
         }
-        return requiresSecurityUser ? client.putXmlAsSecurityUser(path, payload) : client.putXml(path, payload);
     }
 
     protected ResponseEntity<String> postPayload(ManageClient client, String path, String payload) {
         boolean requiresSecurityUser = useSecurityUser(payload);
-        if (payloadParser.isJsonPayload(payload)) {
-            return requiresSecurityUser ? client.postJsonAsSecurityUser(path, payload) : client.postJson(path, payload);
+        try {
+	        if (payloadParser.isJsonPayload(payload)) {
+		        return requiresSecurityUser ? client.postJsonAsSecurityUser(path, payload) : client.postJson(path, payload);
+	        }
+	        return requiresSecurityUser ? client.postXmlAsSecurityUser(path, payload) : client.postXml(path, payload);
+        } catch (RuntimeException ex) {
+        	logger.error(format("Error occurred while sending POST request to %s; logging request body to assist with debugging: %s", path, payload));
+        	throw ex;
         }
-        return requiresSecurityUser ? client.postXmlAsSecurityUser(path, payload) : client.postXml(path, payload);
     }
 }

src/main/java/com/marklogic/mgmt/ManageClient.java

@@ -75,7 +75,13 @@ public void setManageConfig(ManageConfig config) {
 		    rc.setScheme(config.getScheme());
 		    rc.setConfigureSimpleSsl(config.isConfigureSimpleSsl());
 		    rc.setHostnameVerifier(config.getHostnameVerifier());
-		    rc.setSslContext(config.getSslContext());
+
+		    if (config.getSecuritySslContext() != null) {
+		    	rc.setSslContext(config.getSecuritySslContext());
+		    } else {
+		    	rc.setSslContext(config.getSslContext());
+		    }
+
 		    this.securityUserRestTemplate = RestTemplateUtil.newRestTemplate(rc);
 	    } else {
 		    this.securityUserRestTemplate = restTemplate;

src/main/java/com/marklogic/mgmt/ManageConfig.java

@@ -2,11 +2,16 @@
 
 import com.marklogic.rest.util.RestConfig;
 
+import javax.net.ssl.SSLContext;
+
 /**
  * Defines the configuration data for talking to the Mgmt REST API. Also includes properties for the security user, as this
  * user is typically needed for creating an app-specific user (which may depend on app-specific roles and privileges)
- * which is then used for deploying every other resources. If securityUsername and securityPassword are not set, they default
- * to the username/password attribute values.
+ * which is then used for deploying every other resources.
+ *
+ * If securityUsername and securityPassword are not set, they default to the username/password attribute values.
+ * Additionally, as of version 3.8.3, setSecuritySslContext can be called to provide an SSLContext for the connection
+ * made using securityUsername and securityPassword.
  */
 public class ManageConfig extends RestConfig {
 
@@ -19,6 +24,7 @@ public class ManageConfig extends RestConfig {
 
 	private String securityUsername;
 	private String securityPassword;
+	private SSLContext securitySslContext;
 
 	private boolean cleanJsonPayloads = false;
 
@@ -105,4 +111,12 @@ public String getSecurityPassword() {
 	public void setSecurityPassword(String securityPassword) {
 		this.securityPassword = securityPassword;
 	}
+
+	public SSLContext getSecuritySslContext() {
+		return securitySslContext;
+	}
+
+	public void setSecuritySslContext(SSLContext securitySslContext) {
+		this.securitySslContext = securitySslContext;
+	}
 }

src/main/java/com/marklogic/mgmt/api/restapi/RestApi.java

@@ -29,7 +29,7 @@ public String getJson() {
     }
 
     public String save() {
-        ResponseEntity<String> re = new RestApiManager(api.getManageClient()).createRestApi(name, getJson());
+        ResponseEntity<String> re = new RestApiManager(api.getManageClient(), this.group).createRestApi(name, getJson());
         if (re == null) {
             return String.format("REST API with name %s already exists", name);
         } else {

src/main/java/com/marklogic/mgmt/resource/restapis/RestApiManager.java

@@ -16,9 +16,15 @@ public class RestApiManager extends LoggingObject {
 
 	private PayloadParser payloadParser = new PayloadParser();
 	private ManageClient client;
+	private String groupName;
 
 	public RestApiManager(ManageClient client) {
+		this(client, ServerManager.DEFAULT_GROUP);
+	}
+
+	public RestApiManager(ManageClient client, String groupName) {
 		this.client = client;
+		this.groupName = groupName;
 	}
 
 	public ResponseEntity<String> createRestApi(String json) {
@@ -48,15 +54,20 @@ public String extractNameFromJson(String json) {
 	 * somewhere in it. With 9.0-4, the url-rewriter must match the pattern:
 	 * <p>
 	 * ^/MarkLogic/rest-api/(8000-rewriter|rewriter|rewriter-noxdbc)\.xml$
+	 * </p>
 	 * <p>
 	 * It's not likely that a user's custom rewriter will fit that pattern, so this method no longer uses /v1/rest-apis,
 	 * opting to use ServerManager instead.
-	 *
+	 * </p>
+	 * <p>
+	 * As of ml-app-deployer version 3.8.4, this now properly accounts for a group name.
+	 * </p>
 	 * @param name
 	 * @return
 	 */
 	public boolean restApiServerExists(String name) {
-		return new ServerManager(client).exists(name);
+		final String group = this.groupName != null ? this.groupName : ServerManager.DEFAULT_GROUP;
+		return new ServerManager(this.client, group).exists(name);
 	}
 
 	/**

src/main/java/com/marklogic/rest/util/configurer/SslConfigurer.java

@@ -69,7 +69,7 @@ public void verify(String host, String[] cns, String[] subjectAlts) {
 
 			@Override
 			public boolean verify(String s, SSLSession sslSession) {
-				return false;
+				return true;
 			}
 		});
 	}