Skip to content

Deprecate getUserPass and add getPassword #10064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 4, 2025
Merged

Deprecate getUserPass and add getPassword #10064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions modules/ldap/src/main/java/org/testcontainers/ldap/LLdapContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,12 @@ public String getUser() {
return String.format("cn=admin,ou=people,%s", getBaseDn());
}

@Deprecated
public String getUserPass() {
return getEnvMap().getOrDefault("LLDAP_LDAP_USER_PASS", "password");
}

public String getPassword() {
return getEnvMap().getOrDefault("LLDAP_LDAP_USER_PASS", "password");
}
}
8 changes: 4 additions & 4 deletions modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public void test() throws LDAPException {
) {
lldap.start();
LDAPConnection connection = new LDAPConnection(lldap.getHost(), lldap.getLdapPort());
BindResult result = connection.bind(lldap.getUser(), lldap.getUserPass());
BindResult result = connection.bind(lldap.getUser(), lldap.getPassword());
assertThat(result).isNotNull();
}
}
Expand All @@ -30,7 +30,7 @@ public void testUsingLdapUrl() throws LDAPException {

LDAPURL ldapUrl = new LDAPURL(lldap.getLdapUrl());
LDAPConnection connection = new LDAPConnection(ldapUrl.getHost(), ldapUrl.getPort());
BindResult result = connection.bind(lldap.getUser(), lldap.getUserPass());
BindResult result = connection.bind(lldap.getUser(), lldap.getPassword());
assertThat(result).isNotNull();
}
}
Expand All @@ -47,7 +47,7 @@ public void testWithCustomBaseDn() throws LDAPException {

LDAPURL ldapUrl = new LDAPURL(lldap.getLdapUrl());
LDAPConnection connection = new LDAPConnection(ldapUrl.getHost(), ldapUrl.getPort());
BindResult result = connection.bind(lldap.getUser(), lldap.getUserPass());
BindResult result = connection.bind(lldap.getUser(), lldap.getPassword());
assertThat(result).isNotNull();
}
}
Expand All @@ -59,7 +59,7 @@ public void testWithCustomUserPass() throws LDAPException {

LDAPURL ldapUrl = new LDAPURL(lldap.getLdapUrl());
LDAPConnection connection = new LDAPConnection(ldapUrl.getHost(), ldapUrl.getPort());
BindResult result = connection.bind(lldap.getUser(), lldap.getUserPass());
BindResult result = connection.bind(lldap.getUser(), lldap.getPassword());
assertThat(result).isNotNull();
}
}
Expand Down
Loading