Merge pull request #508 from BillFarber/task/fixInitWIthoutUsername

Can now call mlInit and mlInstallAdmin without mlUsername or mlPassword

Author: BillFarber

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

@@ -19,6 +19,7 @@
 import com.marklogic.rest.util.Fragment;
 import com.marklogic.rest.util.RestConfig;
 import com.marklogic.rest.util.RestTemplateUtil;
+import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
 import org.springframework.http.*;
@@ -80,8 +81,9 @@ public boolean execute() {
                 HttpHeaders headers = new HttpHeaders();
                 headers.setContentType(MediaType.APPLICATION_JSON);
                 HttpEntity<String> entity = new HttpEntity<>(payload, headers);
+				ImmutablePair<Boolean, Boolean> credentialsStatus = checkCredentialsAndReplaceNulls(adminConfig);
                 try {
-                    ResponseEntity<String> response = getRestTemplate().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.
@@ -98,12 +100,14 @@ public boolean execute() {
                         logger.error("Caught error, response body: " + body);
                         throw hcee;
                     }
-                }
+                } finally {
+					restoreCredentials(adminConfig, credentialsStatus);
+				}
             }
         });
     }
 
-    public void installAdmin() {
+	public void installAdmin() {
         installAdmin(null, null);
     }
 
@@ -130,8 +134,9 @@ public boolean execute() {
                 HttpHeaders headers = new HttpHeaders();
                 headers.setContentType(MediaType.APPLICATION_JSON);
                 HttpEntity<String> entity = new HttpEntity<>(payload, headers);
+				ImmutablePair<Boolean, Boolean> credentialsStatus = checkCredentialsAndReplaceNulls(adminConfig);
                 try {
-                    ResponseEntity<String> response = getRestTemplate().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.
@@ -143,6 +148,8 @@ public boolean execute() {
                         return false;
                     }
                     throw hcee;
+				} finally {
+					restoreCredentials(adminConfig, credentialsStatus);
                 }
             }
         });
@@ -323,4 +330,31 @@ public RestTemplate getRestTemplate() {
 		}
 		return this.restTemplate;
 	}
+
+	private ImmutablePair<Boolean, Boolean> checkCredentialsAndReplaceNulls(AdminConfig adminConfig) {
+		boolean setNullUsername = false;
+		boolean setNullPassword = false;
+		if (adminConfig.getUsername() == null) {
+			adminConfig.setUsername("");
+			setNullUsername = true;
+			this.restTemplate = null;
+		}
+		if (adminConfig.getPassword() == null) {
+			adminConfig.setPassword("");
+			setNullPassword = true;
+			this.restTemplate = null;
+		}
+		return new ImmutablePair<>(setNullUsername, setNullPassword);
+	}
+
+	private void restoreCredentials(AdminConfig adminConfig, ImmutablePair<Boolean, Boolean> credentialsStatus) {
+		if (credentialsStatus.getLeft()) {
+			adminConfig.setUsername(null);
+			this.restTemplate = null;
+		}
+		if (credentialsStatus.getRight()) {
+			adminConfig.setPassword(null);
+			this.restTemplate = null;
+		}
+	}
 }

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

@@ -18,6 +18,10 @@
 import org.junit.jupiter.api.Test;
 
 import com.marklogic.mgmt.AbstractMgmtTest;
+import org.springframework.web.client.HttpClientErrorException;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class InitializeMarkLogicTest extends AbstractMgmtTest {
 
@@ -27,7 +31,33 @@ public class InitializeMarkLogicTest extends AbstractMgmtTest {
      * to ensure no errors are thrown from bad JSON.
      */
     @Test
-    public void initAgainstAnAlreadyInitializedMarkLogic() {
-        adminManager.init();
+    void initAgainstAnAlreadyInitializedMarkLogic() {
+		assertDoesNotThrow(() -> adminManager.init());
     }
+
+	@Test
+	void withNullUsername() {
+		String originalUsername = adminConfig.getUsername();
+		try {
+			adminConfig.setUsername(null);
+			HttpClientErrorException exception = assertThrows(HttpClientErrorException.class, () -> adminManager.init());
+			assertTrue(exception.getMessage().contains("Unauthorized"));
+			assertEquals(401, exception.getStatusCode().value());
+		} finally {
+			adminConfig.setUsername(originalUsername);
+		}
+	}
+
+	@Test
+	void withNullPassword() {
+		String originalPassword = adminConfig.getPassword();
+		try {
+			adminConfig.setPassword(null);
+			HttpClientErrorException exception = assertThrows(HttpClientErrorException.class, () -> adminManager.init());
+			assertTrue(exception.getMessage().contains("Unauthorized"));
+			assertEquals(401, exception.getStatusCode().value());
+		} finally {
+			adminConfig.setPassword(originalPassword);
+		}
+	}
 }

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

@@ -18,6 +18,9 @@
 import org.junit.jupiter.api.Test;
 
 import com.marklogic.mgmt.AbstractMgmtTest;
+import org.springframework.web.client.HttpClientErrorException;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class InstallAdminTest extends AbstractMgmtTest {
 
@@ -27,7 +30,33 @@ public class InstallAdminTest extends AbstractMgmtTest {
      * again. Instead, a message should be logged and ML should not be restarted.
      */
     @Test
-    public void adminAlreadyInstalled() {
-        adminManager.installAdmin("admin", "admin");
+    void adminAlreadyInstalled() {
+		assertDoesNotThrow(() -> adminManager.installAdmin("admin", "admin"));
     }
+
+	@Test
+	void withNullUsername() {
+		String originalUsername = adminConfig.getUsername();
+		try {
+			adminConfig.setUsername(null);
+			HttpClientErrorException exception = assertThrows(HttpClientErrorException.class, () -> adminManager.installAdmin("admin", "admin"));
+			assertTrue(exception.getMessage().contains("Unauthorized"));
+			assertEquals(401, exception.getStatusCode().value());
+		} finally {
+			adminConfig.setUsername(originalUsername);
+		}
+	}
+
+	@Test
+	void withNullPassword() {
+		String originalPassword = adminConfig.getPassword();
+		try {
+			adminConfig.setPassword(null);
+			HttpClientErrorException exception = assertThrows(HttpClientErrorException.class, () -> adminManager.installAdmin("admin", "admin"));
+			assertTrue(exception.getMessage().contains("Unauthorized"));
+			assertEquals(401, exception.getStatusCode().value());
+		} finally {
+			adminConfig.setPassword(originalPassword);
+		}
+	}
 }