Merge pull request #476 from marklogic-community/feature/lazy-admin-fix

Lazily creating connection in AdminManager now too

Author: rjrudin

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

@@ -56,7 +56,6 @@ public AdminManager(AdminConfig adminConfig) {
 	 */
 	public void setAdminConfig(AdminConfig adminConfig) {
 	    this.adminConfig = adminConfig;
-	    this.restTemplate = RestTemplateUtil.newRestTemplate(adminConfig);
     }
 
     public void init() {
@@ -82,7 +81,7 @@ public boolean execute() {
                 headers.setContentType(MediaType.APPLICATION_JSON);
                 HttpEntity<String> entity = new HttpEntity<>(payload, headers);
                 try {
-                    ResponseEntity<String> response = restTemplate.exchange(uri, HttpMethod.POST, entity, String.class);
+                    ResponseEntity<String> response = getRestTemplate().exchange(uri, HttpMethod.POST, entity, String.class);
                     logger.info("Initialization response: " + response);
                     // According to http://docs.marklogic.com/REST/POST/admin/v1/init, a 202 is sent back in the event a
                     // restart is needed. A 400 or 401 will be thrown as an error by RestTemplate.
@@ -132,7 +131,7 @@ public boolean execute() {
                 headers.setContentType(MediaType.APPLICATION_JSON);
                 HttpEntity<String> entity = new HttpEntity<>(payload, headers);
                 try {
-                    ResponseEntity<String> response = restTemplate.exchange(uri, HttpMethod.POST, entity, String.class);
+                    ResponseEntity<String> response = getRestTemplate().exchange(uri, HttpMethod.POST, entity, String.class);
                     logger.info("Admin installation response: " + response);
                     // According to http://docs.marklogic.com/REST/POST/admin/v1/init, a 202 is sent back in the event a
                     // restart is needed. A 400 or 401 will be thrown as an error by RestTemplate.
@@ -166,7 +165,7 @@ public void invokeActionRequiringRestart(ActionRequiringRestart action) {
     }
 
     public String getLastRestartTimestamp() {
-        return restTemplate.getForEntity(adminConfig.buildUri("/admin/v1/timestamp"), String.class).getBody();
+        return getRestTemplate().getForEntity(adminConfig.buildUri("/admin/v1/timestamp"), String.class).getBody();
     }
 
     public void waitForRestart() {
@@ -230,7 +229,7 @@ public boolean execute() {
     }
 
     public Fragment getServerConfig() {
-        return new Fragment(restTemplate.getForObject(adminConfig.buildUri("/admin/v1/server-config"), String.class));
+        return new Fragment(getRestTemplate().getForObject(adminConfig.buildUri("/admin/v1/server-config"), String.class));
     }
 
     public String getServerVersion() {
@@ -271,7 +270,7 @@ public byte[] postJoiningHostConfig(Fragment joiningHostConfig, String group, St
 		HttpEntity<MultiValueMap<String, String>> entity = new HttpEntity<>(map, headers);
 
 		URI url = adminConfig.buildUri("/admin/v1/cluster-config");
-		ResponseEntity<byte[]> bytes = restTemplate.exchange(url, HttpMethod.POST, entity, byte[].class);
+		ResponseEntity<byte[]> bytes = getRestTemplate().exchange(url, HttpMethod.POST, entity, byte[].class);
 		return bytes.getBody();
 	}
 
@@ -288,7 +287,7 @@ public void postClustConfigToJoiningHost(byte[] clusterConfigZipBytes) {
 		URI clusterConfigUri = adminConfig.buildUri("/admin/v1/cluster-config");
 
 		HttpEntity<Resource> resourceEntity = new HttpEntity<>(new ByteArrayResource(clusterConfigZipBytes), headers);
-		ResponseEntity<String> response = restTemplate.exchange(clusterConfigUri, HttpMethod.POST, resourceEntity, String.class);
+		ResponseEntity<String> response = getRestTemplate().exchange(clusterConfigUri, HttpMethod.POST, resourceEntity, String.class);
 		if(response.getStatusCode().value() == 202){
 			waitForRestart();
 		}
@@ -299,7 +298,7 @@ public void postClustConfigToJoiningHost(byte[] clusterConfigZipBytes) {
 	 * Note that once it does so, the server will need to be initialized again
 	 */
 	public void leaveCluster() {
-		ResponseEntity<String> response = restTemplate.exchange(adminConfig.buildUri("/admin/v1/host-config"), HttpMethod.DELETE, null, String.class);
+		ResponseEntity<String> response = getRestTemplate().exchange(adminConfig.buildUri("/admin/v1/host-config"), HttpMethod.DELETE, null, String.class);
 		if (response.getStatusCode().value() == 202) {
 			waitForRestart();
 		}
@@ -310,6 +309,9 @@ public AdminConfig getAdminConfig() {
 	}
 
 	public RestTemplate getRestTemplate() {
-		return restTemplate;
+		if (this.restTemplate == null) {
+			this.restTemplate = RestTemplateUtil.newRestTemplate(adminConfig);
+		}
+		return this.restTemplate;
 	}
 }

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

@@ -0,0 +1,23 @@
+package com.marklogic.mgmt.admin;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class AdminManagerTest {
+
+	@Test
+	void invalidConfig() {
+		// As of 4.5.1, this should no longer throw an error as the connection to MarkLogic should
+		// be lazily constructed.
+		AdminManager mgr = new AdminManager(new AdminConfig("localhost", 8001, null, null));
+
+		RuntimeException ex = assertThrows(RuntimeException.class, () -> mgr.getRestTemplate());
+		assertTrue(ex.getMessage().contains("username must be of type String"),
+			"The call to get a RestTemplate is expected to fail because no username/password has been " +
+				"provided, and digest auth is used by default. Prior to 4.5.1, this failed when the AdminManager " +
+				"was instantiated, which proved problematic in 4.5.0 when the user tried to run an ml-gradle task " +
+				"without providing any credentials.");
+	}
+}