From 904f4c330f59f8f45ed7e4ece52a61186ab65c12 Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Tue, 16 Jul 2019 20:20:57 +0200 Subject: [PATCH] clean code --- .../de/jalin/ldapadmin/web/GroupServlet.java | 7 +- .../ldapadmin/web/NaiveTrustManager.java | 6 +- .../de/jalin/ldapadmin/web/UserServlet.java | 6 +- .../ldap/DirectoryServiceRunner.java | 162 +++++++++--------- .../jalin/ldapadmin/ldap/TestCreateGroup.java | 6 - .../jalin/ldapadmin/ldap/TestCreateUser.java | 5 - .../jalin/ldapadmin/ldap/TestDeleteUser.java | 5 - .../de/jalin/ldapadmin/ldap/TestReadUser.java | 5 - .../ldapadmin/ldap/TestUpdateAsBindUser.java | 5 - .../ldap/TestUpdateAsSimpleUser.java | 5 - .../jalin/ldapadmin/ldap/TestUpdateUser.java | 5 - 11 files changed, 85 insertions(+), 132 deletions(-) diff --git a/src/main/java/de/jalin/ldapadmin/web/GroupServlet.java b/src/main/java/de/jalin/ldapadmin/web/GroupServlet.java index 35a54f0..3180f97 100644 --- a/src/main/java/de/jalin/ldapadmin/web/GroupServlet.java +++ b/src/main/java/de/jalin/ldapadmin/web/GroupServlet.java @@ -75,7 +75,8 @@ public class GroupServlet extends AbstractLDAPServlet { } final GroupsDAO groupsDAO = new GroupsDAO(ldapSession); final Group grp = new Group(); - final List members = new ArrayList(); + final List members; + members = new ArrayList<>(); final HttpSession httpSession = req.getSession(); cleanSession(httpSession); @SuppressWarnings("unchecked") final SortedMap usersHash = (SortedMap) httpSession.getAttribute("users"); //$NON-NLS-1$ @@ -94,7 +95,7 @@ public class GroupServlet extends AbstractLDAPServlet { final Group oldValue = groupsDAO.readGroup(dn, usersHash); grp.setDn(dn); grp.setName(oldValue.getName()); - if (grp.getMembers().size() == 0) { + if (grp.getMembers().isEmpty()) { httpSession.setAttribute("group", grp); //$NON-NLS-1$ httpSession.setAttribute("errormessage", messages.getString("GroupServlet.no_empty_group")); //$NON-NLS-1$ //$NON-NLS-2$ req.getRequestDispatcher("/WEB-INF/group.jsp").forward(req, resp); //$NON-NLS-1$ @@ -118,7 +119,7 @@ public class GroupServlet extends AbstractLDAPServlet { if ("create".equals(operation)) { //$NON-NLS-1$ final String grpName = req.getParameter("name"); //$NON-NLS-1$ grp.setName(grpName); - if (grp.getMembers().size() == 0) { + if (grp.getMembers().isEmpty()) { httpSession.setAttribute("group", grp); //$NON-NLS-1$ httpSession.setAttribute("errormessage", messages.getString("GroupServlet.no_empty_group")); //$NON-NLS-1$ //$NON-NLS-2$ req.getRequestDispatcher("/WEB-INF/group.jsp").forward(req, resp); //$NON-NLS-1$ diff --git a/src/main/java/de/jalin/ldapadmin/web/NaiveTrustManager.java b/src/main/java/de/jalin/ldapadmin/web/NaiveTrustManager.java index 1ae4675..8ff16de 100644 --- a/src/main/java/de/jalin/ldapadmin/web/NaiveTrustManager.java +++ b/src/main/java/de/jalin/ldapadmin/web/NaiveTrustManager.java @@ -14,16 +14,14 @@ import javax.net.ssl.X509TrustManager; public class NaiveTrustManager implements X509TrustManager { - private static SSLContext SSL_CONTEXT; + private static final SSLContext SSL_CONTEXT; static { try { SSL_CONTEXT = SSLContext.getInstance("TLSv1.2"); SSL_CONTEXT.init(null, new TrustManager[] { new NaiveTrustManager() }, null); SSLContext.setDefault(SSL_CONTEXT); - } catch (NoSuchAlgorithmException e) { - throw new RuntimeException("Unable to initialise SSL context", e); - } catch (KeyManagementException e) { + } catch (NoSuchAlgorithmException | KeyManagementException e) { throw new RuntimeException("Unable to initialise SSL context", e); } } diff --git a/src/main/java/de/jalin/ldapadmin/web/UserServlet.java b/src/main/java/de/jalin/ldapadmin/web/UserServlet.java index c1999d5..ba8b625 100644 --- a/src/main/java/de/jalin/ldapadmin/web/UserServlet.java +++ b/src/main/java/de/jalin/ldapadmin/web/UserServlet.java @@ -97,7 +97,8 @@ public class UserServlet extends AbstractLDAPServlet { usr.setEmail(email); usr.setPhone(phone); usr.setMobile(mobile); - final List memberships = new ArrayList(); + final List memberships; + memberships = new ArrayList<>(); @SuppressWarnings("unchecked") final SortedMap groupsHash = (SortedMap) httpSession.getAttribute("groups"); //$NON-NLS-1$ final Iterator groupDNIterator = groupsHash.keySet().iterator(); while (groupDNIterator.hasNext()) { @@ -174,17 +175,14 @@ public class UserServlet extends AbstractLDAPServlet { httpSession.setAttribute("user", usr); //$NON-NLS-1$ httpSession.setAttribute("errormessage", messages.getString("UserServlet.group_last_member")); //$NON-NLS-1$ //$NON-NLS-2$ req.getRequestDispatcher("/WEB-INF/user.jsp").forward(req, resp); //$NON-NLS-1$ - return; } catch (RequiredAttributeException e) { httpSession.setAttribute("user", usr); //$NON-NLS-1$ httpSession.setAttribute("errormessage", messages.getString("UserServlet.the_input_field") + " " + e.getFieldname() + " " + messages.getString("UserServlet.is_required")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ req.getRequestDispatcher("/WEB-INF/user.jsp").forward(req, resp); //$NON-NLS-1$ - return; } catch (AlreadyBoundException e) { httpSession.setAttribute("user", usr); //$NON-NLS-1$ httpSession.setAttribute("errormessage", messages.getString("UserServlet.user_exists")); //$NON-NLS-1$ //$NON-NLS-2$ req.getRequestDispatcher("/WEB-INF/user.jsp").forward(req, resp); //$NON-NLS-1$ - return; } } diff --git a/src/test/java/de/jalin/ldapadmin/ldap/DirectoryServiceRunner.java b/src/test/java/de/jalin/ldapadmin/ldap/DirectoryServiceRunner.java index 835fa36..b141a79 100644 --- a/src/test/java/de/jalin/ldapadmin/ldap/DirectoryServiceRunner.java +++ b/src/test/java/de/jalin/ldapadmin/ldap/DirectoryServiceRunner.java @@ -22,105 +22,97 @@ import org.apache.directory.server.protocol.shared.store.LdifFileLoader; import org.apache.directory.server.protocol.shared.store.LdifLoadFilter; import org.apache.directory.server.protocol.shared.transport.TcpTransport; -public class DirectoryServiceRunner -{ - private static DirectoryServiceRunner serviceRunner = null; - +public class DirectoryServiceRunner { + + private static DirectoryServiceRunner serviceRunner = null; + private final DirectoryService service; - - public DirectoryServiceRunner(final String dnString, final String ip, final String port) throws Exception - { - service = initService(); + + public DirectoryServiceRunner(final String dnString, final String ip, final String port) throws Exception { + service = initService(); addPartition("ou=config", "config"); addPartition(dnString, "example"); service.startup(); loadData(); - startServer(ip, port); + startServer(ip, port); } - private DirectoryService initService() throws Exception { - final DefaultDirectoryServiceFactory factory = new DefaultDirectoryServiceFactory(); - factory.init("example"); - final DirectoryService directoryService = factory.getDirectoryService(); - directoryService.setShutdownHookEnabled(true); - directoryService.getChangeLog().setEnabled(false); - directoryService.setAccessControlEnabled(true); - directoryService.setAllowAnonymousAccess(false); - directoryService.setPasswordHidden(true); - return directoryService; - } + private DirectoryService initService() throws Exception { + final DefaultDirectoryServiceFactory factory = new DefaultDirectoryServiceFactory(); + factory.init("example"); + final DirectoryService directoryService = factory.getDirectoryService(); + directoryService.setShutdownHookEnabled(true); + directoryService.getChangeLog().setEnabled(false); + directoryService.setAccessControlEnabled(true); + directoryService.setAllowAnonymousAccess(false); + directoryService.setPasswordHidden(true); + return directoryService; + } - private void addPartition(final String dnString, final String partitionId) throws LdapInvalidDnException, Exception { - final JdbmPartitionFactory partitionFactory = new JdbmPartitionFactory(); - final SchemaManager schemaManager = service.getSchemaManager(); - final CacheService cacheService = service.getCacheService(); - final Cache cache = cacheService.getCache("dnCache"); - final DefaultDnFactory defaultDnFactory = new DefaultDnFactory(schemaManager, cache); - final Partition partition = partitionFactory.createPartition(schemaManager, defaultDnFactory, partitionId, dnString, 400, new File("ldap-data." + Double.valueOf(Math.random()).hashCode())); - service.addPartition(partition); - } + private void addPartition(final String dnString, final String partitionId) throws LdapInvalidDnException, Exception { + final JdbmPartitionFactory partitionFactory = new JdbmPartitionFactory(); + final SchemaManager schemaManager = service.getSchemaManager(); + final CacheService cacheService = service.getCacheService(); + final Cache cache = cacheService.getCache("dnCache"); + final DefaultDnFactory defaultDnFactory = new DefaultDnFactory(schemaManager, cache); + final Partition partition = partitionFactory.createPartition(schemaManager, defaultDnFactory, partitionId, dnString, 400, new File("ldap-data." + Double.valueOf(Math.random()).hashCode())); + service.addPartition(partition); + } - private void startServer(final String ip, final String port) throws Exception { - final LdapServer ldapServer = new LdapServer(); - ldapServer.setTransports(new TcpTransport(ip, Integer.parseInt(port))); - ldapServer.setDirectoryService(service); - ldapServer.start(); - } + private void startServer(final String ip, final String port) throws Exception { + final LdapServer ldapServer = new LdapServer(); + ldapServer.setTransports(new TcpTransport(ip, Integer.parseInt(port))); + ldapServer.setDirectoryService(service); + ldapServer.start(); + } - private void loadData() { - final File ldifDirectory = new File("ldif"); - if (ldifDirectory.exists() && ldifDirectory.isDirectory()) { - final File[] ldifFiles = ldifDirectory.listFiles(new FilenameFilter() { - @Override - public boolean accept(final File dir, final String name) { - return name.endsWith(".ldif"); - } - }); - for (final File ldifFile : ldifFiles) { - final LdifFileLoader ldifFileLoader = new LdifFileLoader(service.getAdminSession(), ldifFile, (List) new ArrayList()); - ldifFileLoader.execute(); - System.out.println(ldifFile.getName() + " loaded"); - } - } - } - - public static void assureServiceRunning(final String name) throws DirectoryServiceException - { - if (serviceRunner == null) { - final String dnName = "dc=" + name + ",dc=example,dc=com"; - try { - serviceRunner = new DirectoryServiceRunner(dnName, "127.0.0.1", "10389"); - } catch (Exception e) { - throw new DirectoryServiceException(e); - } - } - } - - public static void main(final String[] args) - { - final String dnString = "dc=" + args[0] + ",dc=example,dc=com"; - final String ip = args[1]; - final String port = args[2]; - try - { - final DirectoryServiceRunner ads = new DirectoryServiceRunner(dnString, ip, port); - final Entry result = ads.service.getAdminSession().lookup(new Dn(dnString)); - System.out.println( "Found entry : " + result ); + private void loadData() { + final File ldifDirectory = new File("ldif"); + if (ldifDirectory.exists() && ldifDirectory.isDirectory()) { + final File[] ldifFiles; + ldifFiles = ldifDirectory.listFiles((final File dir, final String name) -> { + return name.endsWith(".ldif"); + }); + for (final File ldifFile : ldifFiles) { + final LdifFileLoader ldifFileLoader = new LdifFileLoader(service.getAdminSession(), ldifFile, (List) new ArrayList()); + ldifFileLoader.execute(); + System.out.println(ldifFile.getName() + " loaded"); + } } - catch ( Exception e ) - { + } + + public static void assureServiceRunning(final String name) throws DirectoryServiceException { + if (serviceRunner == null) { + final String dnName = "dc=" + name + ",dc=example,dc=com"; + try { + serviceRunner = new DirectoryServiceRunner(dnName, "127.0.0.1", "10389"); + } catch (Exception e) { + throw new DirectoryServiceException(e); + } + } + } + + public static void main(final String[] args) { + final String dnString = "dc=" + args[0] + ",dc=example,dc=com"; + final String ip = args[1]; + final String port = args[2]; + try { + final DirectoryServiceRunner ads = new DirectoryServiceRunner(dnString, ip, port); + final Entry result = ads.service.getAdminSession().lookup(new Dn(dnString)); + System.out.println("Found entry : " + result); + } catch (Exception e) { System.err.println(e.getMessage()); } } - - static class DirectoryServiceException extends Exception { - - private static final long serialVersionUID = 1L; - public DirectoryServiceException(final Throwable exc) { - super(exc); - } - + static class DirectoryServiceException extends Exception { + + private static final long serialVersionUID = 1L; + + public DirectoryServiceException(final Throwable exc) { + super(exc); + } + } - + } diff --git a/src/test/java/de/jalin/ldapadmin/ldap/TestCreateGroup.java b/src/test/java/de/jalin/ldapadmin/ldap/TestCreateGroup.java index b7e32bb..7cb8141 100644 --- a/src/test/java/de/jalin/ldapadmin/ldap/TestCreateGroup.java +++ b/src/test/java/de/jalin/ldapadmin/ldap/TestCreateGroup.java @@ -1,11 +1,5 @@ package de.jalin.ldapadmin.ldap; -import de.jalin.ldapadmin.ldap.LDAPSession; -import de.jalin.ldapadmin.ldap.AlreadyBoundException; -import de.jalin.ldapadmin.ldap.RequiredAttributeException; -import de.jalin.ldapadmin.ldap.UsersDAO; -import de.jalin.ldapadmin.ldap.LDAPSessionException; -import de.jalin.ldapadmin.ldap.GroupsDAO; import static org.junit.Assert.*; import java.util.Arrays; diff --git a/src/test/java/de/jalin/ldapadmin/ldap/TestCreateUser.java b/src/test/java/de/jalin/ldapadmin/ldap/TestCreateUser.java index 2208ad9..cacfba7 100644 --- a/src/test/java/de/jalin/ldapadmin/ldap/TestCreateUser.java +++ b/src/test/java/de/jalin/ldapadmin/ldap/TestCreateUser.java @@ -1,10 +1,5 @@ package de.jalin.ldapadmin.ldap; -import de.jalin.ldapadmin.ldap.LDAPSession; -import de.jalin.ldapadmin.ldap.AlreadyBoundException; -import de.jalin.ldapadmin.ldap.RequiredAttributeException; -import de.jalin.ldapadmin.ldap.UsersDAO; -import de.jalin.ldapadmin.ldap.LDAPSessionException; import static org.junit.Assert.*; import org.junit.After; diff --git a/src/test/java/de/jalin/ldapadmin/ldap/TestDeleteUser.java b/src/test/java/de/jalin/ldapadmin/ldap/TestDeleteUser.java index ce0046b..b3325ae 100644 --- a/src/test/java/de/jalin/ldapadmin/ldap/TestDeleteUser.java +++ b/src/test/java/de/jalin/ldapadmin/ldap/TestDeleteUser.java @@ -1,10 +1,5 @@ package de.jalin.ldapadmin.ldap; -import de.jalin.ldapadmin.ldap.LDAPSession; -import de.jalin.ldapadmin.ldap.AlreadyBoundException; -import de.jalin.ldapadmin.ldap.RequiredAttributeException; -import de.jalin.ldapadmin.ldap.UsersDAO; -import de.jalin.ldapadmin.ldap.LDAPSessionException; import static org.junit.Assert.*; import org.junit.After; diff --git a/src/test/java/de/jalin/ldapadmin/ldap/TestReadUser.java b/src/test/java/de/jalin/ldapadmin/ldap/TestReadUser.java index 7e0df36..999864d 100644 --- a/src/test/java/de/jalin/ldapadmin/ldap/TestReadUser.java +++ b/src/test/java/de/jalin/ldapadmin/ldap/TestReadUser.java @@ -1,10 +1,5 @@ package de.jalin.ldapadmin.ldap; -import de.jalin.ldapadmin.ldap.LDAPSession; -import de.jalin.ldapadmin.ldap.AlreadyBoundException; -import de.jalin.ldapadmin.ldap.RequiredAttributeException; -import de.jalin.ldapadmin.ldap.UsersDAO; -import de.jalin.ldapadmin.ldap.LDAPSessionException; import static org.junit.Assert.*; import org.junit.After; diff --git a/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateAsBindUser.java b/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateAsBindUser.java index cc0e973..9829414 100644 --- a/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateAsBindUser.java +++ b/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateAsBindUser.java @@ -1,10 +1,5 @@ package de.jalin.ldapadmin.ldap; -import de.jalin.ldapadmin.ldap.LDAPSession; -import de.jalin.ldapadmin.ldap.AlreadyBoundException; -import de.jalin.ldapadmin.ldap.RequiredAttributeException; -import de.jalin.ldapadmin.ldap.UsersDAO; -import de.jalin.ldapadmin.ldap.LDAPSessionException; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; diff --git a/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateAsSimpleUser.java b/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateAsSimpleUser.java index a7e108e..1dd0e3a 100644 --- a/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateAsSimpleUser.java +++ b/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateAsSimpleUser.java @@ -1,10 +1,5 @@ package de.jalin.ldapadmin.ldap; -import de.jalin.ldapadmin.ldap.LDAPSession; -import de.jalin.ldapadmin.ldap.AlreadyBoundException; -import de.jalin.ldapadmin.ldap.RequiredAttributeException; -import de.jalin.ldapadmin.ldap.UsersDAO; -import de.jalin.ldapadmin.ldap.LDAPSessionException; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateUser.java b/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateUser.java index 1e137e2..3dcfd49 100644 --- a/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateUser.java +++ b/src/test/java/de/jalin/ldapadmin/ldap/TestUpdateUser.java @@ -1,10 +1,5 @@ package de.jalin.ldapadmin.ldap; -import de.jalin.ldapadmin.ldap.LDAPSession; -import de.jalin.ldapadmin.ldap.AlreadyBoundException; -import de.jalin.ldapadmin.ldap.RequiredAttributeException; -import de.jalin.ldapadmin.ldap.UsersDAO; -import de.jalin.ldapadmin.ldap.LDAPSessionException; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue;