Skip to content

Commit b380fe9

Browse files
committed
MLE-25666 Fixing small logging issue
"null" was being logged for security API calls when doing cloud auth. No longer.
1 parent 3fc5055 commit b380fe9

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

ml-app-deployer/src/main/java/com/marklogic/mgmt/ManageClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ protected String determineUsernameForSecurityUserRequest() {
280280
username = manageConfig.getUsername();
281281
}
282282
}
283-
return username;
283+
return username == null ? "" : username;
284284
}
285285

286286
private void initializeSecurityUserRestTemplate() {

ml-app-deployer/src/test/java/com/marklogic/mgmt/ManageClientTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ void determineUsernameForSecurityUserRequest() {
2424
assertEquals("someone", client.determineUsernameForSecurityUserRequest());
2525
}
2626

27+
@Test
28+
void nullUsername() {
29+
// Will be the case when doing cloud auth.
30+
ManageConfig config = new ManageConfig("localhost", 8002, null, null);
31+
ManageClient client = new ManageClient(config);
32+
assertEquals("", client.determineUsernameForSecurityUserRequest());
33+
}
34+
2735
@Test
2836
void nullManageConfig() {
2937
ManageClient client = new ManageClient((ManageConfig) null);

0 commit comments

Comments
 (0)