#427 Added copy constructors for config classes

Author: rjrudin

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

@@ -25,7 +25,6 @@ public class ManageConfig extends RestConfig {
 	private String securityUsername;
 	private String securityPassword;
 	private SSLContext securitySslContext;
-
 	private boolean cleanJsonPayloads = false;
 
 	public ManageConfig() {
@@ -42,6 +41,13 @@ public ManageConfig(String host, int port, String username, String password) {
 		setSecurityPassword(password);
 	}
 
+	public ManageConfig(ManageConfig other) {
+		super(other);
+		this.securityUsername = other.securityUsername;
+		this.securityPassword = other.securityPassword;
+		this.securitySslContext = other.securitySslContext;
+		this.cleanJsonPayloads = other.cleanJsonPayloads;
+	}
 	@Override
 	public String toString() {
 		return String.format("[ManageConfig host: %s, port: %d, username: %s, security username: %s]", getHost(),

src/main/java/com/marklogic/mgmt/admin/AdminConfig.java

@@ -20,4 +20,7 @@ public AdminConfig(String host, int port, String username, String password) {
         super(host, port, username, password);
     }
 
+    public AdminConfig(AdminConfig other) {
+    	super(other);
+	}
 }

src/main/java/com/marklogic/rest/util/RestConfig.java

@@ -32,6 +32,19 @@ public RestConfig(String host, int port, String username, String password) {
 		this.password = password;
 	}
 
+	public RestConfig(RestConfig other) {
+		this(other.host, other.port, other.username, other.password);
+		if (other.scheme != null) {
+			this.scheme = other.scheme;
+		}
+		this.configureSimpleSsl = other.configureSimpleSsl;
+		this.useDefaultKeystore = other.useDefaultKeystore;
+		this.sslProtocol = other.sslProtocol;
+		this.trustManagementAlgorithm = other.trustManagementAlgorithm;
+		this.sslContext = other.sslContext;
+		this.hostnameVerifier = other.hostnameVerifier;
+	}
+
 	@Override
 	public String toString() {
 		return String.format("[scheme: %s, host: %s, port: %d, username: %s]", scheme, host, port, username);

src/test/java/com/marklogic/mgmt/ManageConfigTest.java

@@ -0,0 +1,44 @@
+package com.marklogic.mgmt;
+
+import com.marklogic.client.ext.modulesloader.ssl.SimpleX509TrustManager;
+import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class ManageConfigTest {
+
+	@Test
+	void copyConstructor() {
+		ManageConfig first = new ManageConfig("host", 8003, "user", "pwd");
+		first.setScheme("https");
+		first.setConfigureSimpleSsl(true);
+		first.setHostnameVerifier(new AllowAllHostnameVerifier());
+		first.setSslContext(SimpleX509TrustManager.newSSLContext());
+		first.setSslProtocol("TLSv1.3");
+		first.setTrustManagementAlgorithm("something");
+		first.setUseDefaultKeystore(true);
+		first.setSecurityUsername("secuser");
+		first.setSecurityPassword("secpwd");
+		first.setSecuritySslContext(SimpleX509TrustManager.newSSLContext());
+		first.setCleanJsonPayloads(true);
+
+		ManageConfig second = new ManageConfig(first);
+
+		assertEquals("host", second.getHost());
+		assertEquals(8003, second.getPort());
+		assertEquals("user", second.getUsername());
+		assertEquals("pwd", second.getPassword());
+		assertEquals("https", second.getScheme());
+		assertTrue(second.isConfigureSimpleSsl());
+		assertNotNull(second.getHostnameVerifier());
+		assertNotNull(second.getSslContext());
+		assertEquals("TLSv1.3", second.getSslProtocol());
+		assertEquals("something", second.getTrustManagementAlgorithm());
+		assertTrue(second.isUseDefaultKeystore());
+		assertEquals("secuser", second.getSecurityUsername());
+		assertEquals("secpwd", second.getSecurityPassword());
+		assertNotNull(second.getSecuritySslContext());
+		assertTrue(second.isCleanJsonPayloads());
+	}
+}

src/test/java/com/marklogic/mgmt/admin/AdminConfigTest.java

@@ -0,0 +1,35 @@
+package com.marklogic.mgmt.admin;
+
+import com.marklogic.client.ext.modulesloader.ssl.SimpleX509TrustManager;
+import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class AdminConfigTest {
+
+	@Test
+	void copyConstructor() {
+		AdminConfig first = new AdminConfig("host", 8003, "user", "pwd");
+		first.setScheme("https");
+		first.setConfigureSimpleSsl(true);
+		first.setHostnameVerifier(new AllowAllHostnameVerifier());
+		first.setSslContext(SimpleX509TrustManager.newSSLContext());
+		first.setSslProtocol("TLSv1.3");
+		first.setTrustManagementAlgorithm("something");
+		first.setUseDefaultKeystore(true);
+
+		AdminConfig second = new AdminConfig(first);
+		assertEquals("host", second.getHost());
+		assertEquals(8003, second.getPort());
+		assertEquals("user", second.getUsername());
+		assertEquals("pwd", second.getPassword());
+		assertEquals("https", second.getScheme());
+		assertTrue(second.isConfigureSimpleSsl());
+		assertNotNull(second.getHostnameVerifier());
+		assertNotNull(second.getSslContext());
+		assertEquals("TLSv1.3", second.getSslProtocol());
+		assertEquals("something", second.getTrustManagementAlgorithm());
+		assertTrue(second.isUseDefaultKeystore());
+	}
+}

src/test/java/com/marklogic/rest/util/RestConfigTest.java

@@ -0,0 +1,35 @@
+package com.marklogic.rest.util;
+
+import com.marklogic.client.ext.modulesloader.ssl.SimpleX509TrustManager;
+import org.apache.http.conn.ssl.AllowAllHostnameVerifier;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class RestConfigTest {
+
+	@Test
+	void copyConstructor() {
+		RestConfig first = new RestConfig("host", 8003, "user", "pwd");
+		first.setScheme("https");
+		first.setConfigureSimpleSsl(true);
+		first.setHostnameVerifier(new AllowAllHostnameVerifier());
+		first.setSslContext(SimpleX509TrustManager.newSSLContext());
+		first.setSslProtocol("TLSv1.3");
+		first.setTrustManagementAlgorithm("something");
+		first.setUseDefaultKeystore(true);
+
+		RestConfig second = new RestConfig(first);
+		assertEquals("host", second.getHost());
+		assertEquals(8003, second.getPort());
+		assertEquals("user", second.getUsername());
+		assertEquals("pwd", second.getPassword());
+		assertEquals("https", second.getScheme());
+		assertTrue(second.isConfigureSimpleSsl());
+		assertNotNull(second.getHostnameVerifier());
+		assertNotNull(second.getSslContext());
+		assertEquals("TLSv1.3", second.getSslProtocol());
+		assertEquals("something", second.getTrustManagementAlgorithm());
+		assertTrue(second.isUseDefaultKeystore());
+	}
+}