nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1638: Make Comparator for AccessIds in LdapClient NULL-safe

This commit is contained in:
Joerg Heffner 2021-05-11 13:42:59 +02:00 committed by gitgoodjhe
parent 1576480254
commit 4c94281a64
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/ldap/LdapClient.java
View File

@ -351,7 +351,8 @@ public class LdapClient {
void sortListOfAccessIdResources(List<AccessIdRepresentationModel> accessIds) {
accessIds.sort(
Comparator.comparing(
AccessIdRepresentationModel::getAccessId, String.CASE_INSENSITIVE_ORDER));
AccessIdRepresentationModel::getAccessId,
Comparator.nullsLast(String.CASE_INSENSITIVE_ORDER)));
}
String getNameWithoutBaseDn(String name) {

25
rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/ldap/LdapClientTest.java
View File

@ -10,6 +10,7 @@ import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@ -65,6 +66,30 @@ class LdapClientTest {
assertThat(cut.searchUsersAndGroups("test")).hasSize(2).containsExactlyInAnyOrder(user, group);
}
@Test
void should_CorrectlySortAccessIds_When_ContainingNullAccessId() throws Exception {
List<AccessIdRepresentationModel> accessIds = new ArrayList<>();
AccessIdRepresentationModel model1 = new AccessIdRepresentationModel("name1", "user-1");
AccessIdRepresentationModel model2 = new AccessIdRepresentationModel("name2", "user-2");
AccessIdRepresentationModel model3 = new AccessIdRepresentationModel("name3", null);
AccessIdRepresentationModel model4 = new AccessIdRepresentationModel("name4", "user-4");
// Can't use List.of because it returns an ImmutableCollection
accessIds.add(model4);
accessIds.add(model3);
accessIds.add(model2);
accessIds.add(model1);
LdapClient ldapClient = new LdapClient(environment, ldapTemplate);
ldapClient.sortListOfAccessIdResources(accessIds);
assertThat(accessIds.get(0).getAccessId()).isEqualTo("user-1");
assertThat(accessIds.get(1).getAccessId()).isEqualTo("user-2");
assertThat(accessIds.get(2).getAccessId()).isEqualTo("user-4");
assertThat(accessIds.get(3).getAccessId()).isNull();
}
@Test
void testLdap_getNameWithoutBaseDn() {