diff --git a/README.md b/README.md index ae1f3e4..d6c93d0 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Cache resources TTL can be overridden from Configuration API with `cache.$name.t | service:id:ldap:people-internal-dn | ou=internal,ou=people,dc=sample,dc=com | DN within the people DN to separate internal (writable) users from the other. (not yet fully implemented). | | service:id:ldap:quarantine-dn | ou=quarantine,dc=sample,dc=com | DN outside the people DN. Receive the users moved from their source without deleting them. | | service:id:ldap:self-search | false | When `true`, at authentication time, the admin credentials are used search and filter the user, and then the credentials are verified. | -| | | When `false`, the user's credentials are checked without search. Suports only `service:id:ldap:login-attributes` = `uid,mail`. | +| | | When `false`, the user's credentials are checked without search. Supports only `service:id:ldap:login-attributes` = `uid,mail`. | | service:id:ldap:uid-attribute | uid | LDAP attribute name user identifier. | | service:id:ldap:url | ldap://localhost:389 | This value is encrypted in database. | | service:id:ldap:user-dn | cn=Manager,dc=sample,dc=com | DN of administrator. | \ No newline at end of file diff --git a/src/main/java/org/ligoj/app/plugin/id/ldap/resource/LdapPluginResource.java b/src/main/java/org/ligoj/app/plugin/id/ldap/resource/LdapPluginResource.java index 9f257f9..8bebdfc 100644 --- a/src/main/java/org/ligoj/app/plugin/id/ldap/resource/LdapPluginResource.java +++ b/src/main/java/org/ligoj/app/plugin/id/ldap/resource/LdapPluginResource.java @@ -677,7 +677,7 @@ private void validateGroup(final String group, final String ou, final String pke } /** - * Search the LDAP Groups matching to the given criteria and for type "Project". Node identifier is ignored for now. + * Search the LDAP groups matching to the given criteria and of type "Project". Node identifier is ignored for now. * * @param criteria the search criteria. * @return LDAP Groups matching the criteria. @@ -709,7 +709,7 @@ public List> findGroupsByName(@PathParam("criteria") final /** * Search the LDAP Customers matching to the given criteria and for type "Project". Node identifier is ignored for - * now. Node is ignored. + * now. * * @param criteria the search criteria. * @return LDAP Customers matching the criteria. diff --git a/src/test/java/org/ligoj/app/plugin/id/ldap/resource/LdapPluginResourceZDeleteTest.java b/src/test/java/org/ligoj/app/plugin/id/ldap/resource/LdapPluginResourceZDeleteTest.java index 1238ee5..5b9389d 100644 --- a/src/test/java/org/ligoj/app/plugin/id/ldap/resource/LdapPluginResourceZDeleteTest.java +++ b/src/test/java/org/ligoj/app/plugin/id/ldap/resource/LdapPluginResourceZDeleteTest.java @@ -61,7 +61,7 @@ void zzdeleteFromParentGroup() { final Subscription childSubscription = createSubGroup(parentSubscription.getProject(), "sea-parent-for-2deletion", "sea-parent-for-2deletion-sub"); - // Check the sub-group and the parent are there + // Check the subgroup and the parent are there Assertions.assertEquals(2, resource.findGroupsByName("sea-parent-for-2deletion").size()); final Map parentParameters = subscriptionResource.getParameters(parentSubscription.getId()); Assertions.assertTrue(resource.checkSubscriptionStatus(parentParameters).getStatus().isUp()); @@ -82,7 +82,7 @@ void zzdeleteFromParentGroup() { Assertions.assertEquals(1, resource.findGroupsByName("sea-parent-for-2deletion").size()); Assertions.assertTrue(getGroup().findAll().get("sea-parent-for-2deletion").getSubGroups().isEmpty()); Assertions.assertNull(getGroup().findAll().get("sea-parent-for-2deletion-sub")); - Assertions.assertEquals("sea-parent-for-2deletion", resource.findGroupsByName("sea-parent-for-2deletion").get(0).getId()); + Assertions.assertEquals("sea-parent-for-2deletion", resource.findGroupsByName("sea-parent-for-2deletion").getFirst().getId()); Assertions.assertNull(getGroup().findAllNoCache().get("sea-parent-for-2deletion-sub")); // Check the new status of the deleted child diff --git a/src/test/java/org/ligoj/app/plugin/id/resource/AbstractUserLdapResourceTest.java b/src/test/java/org/ligoj/app/plugin/id/resource/AbstractUserLdapResourceTest.java index 6496380..a2885d0 100644 --- a/src/test/java/org/ligoj/app/plugin/id/resource/AbstractUserLdapResourceTest.java +++ b/src/test/java/org/ligoj/app/plugin/id/resource/AbstractUserLdapResourceTest.java @@ -94,14 +94,14 @@ protected void checkResult(final TableItem tableItem) { Assertions.assertEquals(1, tableItem.getRecordsFiltered()); Assertions.assertEquals(1, tableItem.getData().size()); - final UserOrgVo userLdap = tableItem.getData().get(0); + final UserOrgVo userLdap = tableItem.getData().getFirst(); Assertions.assertEquals("flasta", userLdap.getId()); Assertions.assertEquals("Firsta", userLdap.getFirstName()); Assertions.assertEquals("Lasta", userLdap.getLastName()); Assertions.assertEquals("ing", userLdap.getCompany()); - Assertions.assertEquals("flasta@ing.com", userLdap.getMails().get(0)); + Assertions.assertEquals("flasta@ing.com", userLdap.getMails().getFirst()); Assertions.assertEquals(1, userLdap.getGroups().size()); - Assertions.assertEquals("DIG RHA", userLdap.getGroups().get(0).getName()); + Assertions.assertEquals("DIG RHA", userLdap.getGroups().getFirst().getName()); } @Override @@ -130,7 +130,7 @@ protected void findById(final UserOrg userLdap) { Assertions.assertEquals("Fabrice", userLdap.getFirstName()); Assertions.assertEquals("Daugan", userLdap.getLastName()); Assertions.assertEquals("ligoj", userLdap.getCompany()); - Assertions.assertEquals("fabrice.daugan@sample.com", userLdap.getMails().get(0)); + Assertions.assertEquals("fabrice.daugan@sample.com", userLdap.getMails().getFirst()); Assertions.assertEquals(1, userLdap.getGroups().size()); Assertions.assertEquals("Hub Paris", userLdap.getGroups().iterator().next()); } @@ -150,20 +150,20 @@ protected void rollbackUser() { Assertions.assertEquals(1, tableItem.getRecordsFiltered()); Assertions.assertEquals(1, tableItem.getData().size()); - UserOrgVo userLdap = tableItem.getData().get(0); + UserOrgVo userLdap = tableItem.getData().getFirst(); Assertions.assertEquals("jlast3", userLdap.getId()); Assertions.assertEquals("John3", userLdap.getFirstName()); Assertions.assertEquals("Last3", userLdap.getLastName()); Assertions.assertEquals("ing", userLdap.getCompany()); - Assertions.assertEquals("john3.last3@ing.com", userLdap.getMails().get(0)); + Assertions.assertEquals("john3.last3@ing.com", userLdap.getMails().getFirst()); Assertions.assertEquals(0, userLdap.getGroups().size()); } protected DirContextAdapter getContext(final String base, final String uid) { final AndFilter filter = new AndFilter(); - filter.and(new EqualsFilter("objectclass", "inetOrgPerson")); + filter.and(new EqualsFilter("objectClass", "inetOrgPerson")); filter.and(new EqualsFilter("uid", uid)); - return getTemplate().search(base, filter.encode(), (Object ctx) -> (DirContextAdapter) ctx).get(0); + return getTemplate().search(base, filter.encode(), (Object ctx) -> (DirContextAdapter) ctx).getFirst(); } protected DirContextAdapter getContext(final String uid) { @@ -186,10 +186,10 @@ protected void checkDnAndMember(final DirContextAdapter context, final String dn */ protected void checkMember(final String dn) { final AndFilter filter = new AndFilter(); - filter.and(new EqualsFilter("objectclass", "groupOfUniqueNames")); + filter.and(new EqualsFilter("objectClass", "groupOfUniqueNames")); filter.and(new EqualsFilter("cn", "ligoj-Jupiter")); final DirContextAdapter groupContext = getTemplate() - .search("ou=ligoj,ou=project,dc=sample,dc=com", filter.encode(), (Object ctx) -> (DirContextAdapter) ctx).get(0); + .search("ou=ligoj,ou=project,dc=sample,dc=com", filter.encode(), (Object ctx) -> (DirContextAdapter) ctx).getFirst(); final String[] members = groupContext.getStringAttributes("uniqueMember"); Assertions.assertEquals(1, members.length); Assertions.assertEquals(dn, members[0]); @@ -215,7 +215,7 @@ protected DirContextAdapter checkUnlockedAfter() { } protected DirContextAdapter checkUnlocked() { - assertUnlocked(resource.findAll("ligoj", null, "admin-test", newUriInfo()).getData().get(0)); + assertUnlocked(resource.findAll("ligoj", null, "admin-test", newUriInfo()).getData().getFirst()); assertUnlocked(getUser().findByIdNoCache("admin-test")); assertUnlocked(getUser().findById("admin-test")); Assertions.assertTrue(getGroup().findAll().get("ligoj-jupiter").getMembers().contains("admin-test")); @@ -228,7 +228,7 @@ protected DirContextAdapter checkUnlocked() { protected DirContextAdapter check(final String company, final String base, final String patternLocked, final Consumer checker) { // Check the status at business layer - checker.accept(resource.findAll(company, null, "admin-test", newUriInfo()).getData().get(0)); + checker.accept(resource.findAll(company, null, "admin-test", newUriInfo()).getData().getFirst()); checker.accept(resource.findById("admin-test")); // Check the status at cache layer