Skip to content

Commit f0d46c8

Browse files
authored
Deprecate getUserPass and add getPassword (#10064)
1 parent 09a8819 commit f0d46c8

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

modules/ldap/src/main/java/org/testcontainers/ldap/LLdapContainer.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,12 @@ public String getUser() {
7979
return String.format("cn=admin,ou=people,%s", getBaseDn());
8080
}
8181

82+
@Deprecated
8283
public String getUserPass() {
8384
return getEnvMap().getOrDefault("LLDAP_LDAP_USER_PASS", "password");
8485
}
86+
87+
public String getPassword() {
88+
return getEnvMap().getOrDefault("LLDAP_LDAP_USER_PASS", "password");
89+
}
8590
}

modules/ldap/src/test/java/org/testcontainers/ldap/LLdapContainerTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public void test() throws LDAPException {
1818
) {
1919
lldap.start();
2020
LDAPConnection connection = new LDAPConnection(lldap.getHost(), lldap.getLdapPort());
21-
BindResult result = connection.bind(lldap.getUser(), lldap.getUserPass());
21+
BindResult result = connection.bind(lldap.getUser(), lldap.getPassword());
2222
assertThat(result).isNotNull();
2323
}
2424
}
@@ -30,7 +30,7 @@ public void testUsingLdapUrl() throws LDAPException {
3030

3131
LDAPURL ldapUrl = new LDAPURL(lldap.getLdapUrl());
3232
LDAPConnection connection = new LDAPConnection(ldapUrl.getHost(), ldapUrl.getPort());
33-
BindResult result = connection.bind(lldap.getUser(), lldap.getUserPass());
33+
BindResult result = connection.bind(lldap.getUser(), lldap.getPassword());
3434
assertThat(result).isNotNull();
3535
}
3636
}
@@ -47,7 +47,7 @@ public void testWithCustomBaseDn() throws LDAPException {
4747

4848
LDAPURL ldapUrl = new LDAPURL(lldap.getLdapUrl());
4949
LDAPConnection connection = new LDAPConnection(ldapUrl.getHost(), ldapUrl.getPort());
50-
BindResult result = connection.bind(lldap.getUser(), lldap.getUserPass());
50+
BindResult result = connection.bind(lldap.getUser(), lldap.getPassword());
5151
assertThat(result).isNotNull();
5252
}
5353
}
@@ -59,7 +59,7 @@ public void testWithCustomUserPass() throws LDAPException {
5959

6060
LDAPURL ldapUrl = new LDAPURL(lldap.getLdapUrl());
6161
LDAPConnection connection = new LDAPConnection(ldapUrl.getHost(), ldapUrl.getPort());
62-
BindResult result = connection.bind(lldap.getUser(), lldap.getUserPass());
62+
BindResult result = connection.bind(lldap.getUser(), lldap.getPassword());
6363
assertThat(result).isNotNull();
6464
}
6565
}

0 commit comments

Comments
 (0)