From 0beccbebc0c16521fabe08d3033d4c8d821cffc9 Mon Sep 17 00:00:00 2001 From: Rob Rudin Date: Mon, 1 Dec 2025 16:02:39 -0500 Subject: [PATCH] MLE-25666 Fixing small logging issue "null" was being logged for security API calls when doing cloud auth. No longer. --- .../src/main/java/com/marklogic/mgmt/ManageClient.java | 2 +- .../test/java/com/marklogic/mgmt/ManageClientTest.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ml-app-deployer/src/main/java/com/marklogic/mgmt/ManageClient.java b/ml-app-deployer/src/main/java/com/marklogic/mgmt/ManageClient.java index 3267b1ee..e8ad62d4 100644 --- a/ml-app-deployer/src/main/java/com/marklogic/mgmt/ManageClient.java +++ b/ml-app-deployer/src/main/java/com/marklogic/mgmt/ManageClient.java @@ -280,7 +280,7 @@ protected String determineUsernameForSecurityUserRequest() { username = manageConfig.getUsername(); } } - return username; + return username == null ? "" : username; } private void initializeSecurityUserRestTemplate() { diff --git a/ml-app-deployer/src/test/java/com/marklogic/mgmt/ManageClientTest.java b/ml-app-deployer/src/test/java/com/marklogic/mgmt/ManageClientTest.java index 9ba07ae5..d987ad9d 100644 --- a/ml-app-deployer/src/test/java/com/marklogic/mgmt/ManageClientTest.java +++ b/ml-app-deployer/src/test/java/com/marklogic/mgmt/ManageClientTest.java @@ -24,6 +24,14 @@ void determineUsernameForSecurityUserRequest() { assertEquals("someone", client.determineUsernameForSecurityUserRequest()); } + @Test + void nullUsername() { + // Will be the case when doing cloud auth. + ManageConfig config = new ManageConfig("localhost", 8002, null, null); + ManageClient client = new ManageClient(config); + assertEquals("", client.determineUsernameForSecurityUserRequest()); + } + @Test void nullManageConfig() { ManageClient client = new ManageClient((ManageConfig) null);