This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push: new fcbcd90ec0 Fix checkstyle warnings fcbcd90ec0 is described below commit fcbcd90ec0943a42d12b056c3f1eae87c959b4f8 Author: Mark Thomas <ma...@apache.org> AuthorDate: Mon Aug 8 13:19:08 2022 +0100 Fix checkstyle warnings --- java/org/apache/catalina/users/MemoryGroup.java | 1 - java/org/apache/catalina/users/MemoryUserDatabase.java | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/java/org/apache/catalina/users/MemoryGroup.java b/java/org/apache/catalina/users/MemoryGroup.java index 9de5b959f9..7f5d90eb2b 100644 --- a/java/org/apache/catalina/users/MemoryGroup.java +++ b/java/org/apache/catalina/users/MemoryGroup.java @@ -17,7 +17,6 @@ package org.apache.catalina.users; -import org.apache.catalina.Role; import org.apache.catalina.UserDatabase; import org.apache.tomcat.util.buf.StringUtils; import org.apache.tomcat.util.security.Escape; diff --git a/java/org/apache/catalina/users/MemoryUserDatabase.java b/java/org/apache/catalina/users/MemoryUserDatabase.java index 9c0ce74851..d251bbdbe6 100644 --- a/java/org/apache/catalina/users/MemoryUserDatabase.java +++ b/java/org/apache/catalina/users/MemoryUserDatabase.java @@ -296,7 +296,7 @@ public class MemoryUserDatabase implements UserDatabase { throw new IllegalArgumentException(msg); } - Group group = new GenericGroup(this, groupname, description, null); + Group group = new GenericGroup<>(this, groupname, description, null); readLock.lock(); try { groups.put(group.getGroupname(), group); @@ -321,7 +321,7 @@ public class MemoryUserDatabase implements UserDatabase { throw new IllegalArgumentException(msg); } - Role role = new GenericRole(this, rolename, description); + Role role = new GenericRole<>(this, rolename, description); readLock.lock(); try { roles.put(role.getRolename(), role); @@ -348,7 +348,7 @@ public class MemoryUserDatabase implements UserDatabase { throw new IllegalArgumentException(msg); } - User user = new GenericUser(this, username, password, fullName, null, null); + User user = new GenericUser<>(this, username, password, fullName, null, null); readLock.lock(); try { users.put(user.getUsername(), user); @@ -622,7 +622,7 @@ public class MemoryUserDatabase implements UserDatabase { writer.print("\""); } writer.print(" roles=\""); - for(Iterator<Role> roles=group.getRoles(); roles.hasNext(); ) { + for (Iterator<Role> roles=group.getRoles(); roles.hasNext();) { Role role = roles.next(); writer.print(Escape.xml(role.getRolename())); if(roles.hasNext()) { @@ -646,7 +646,7 @@ public class MemoryUserDatabase implements UserDatabase { writer.print("\""); } writer.print(" groups=\""); - for(Iterator<Group> groups=user.getGroups(); groups.hasNext(); ) { + for (Iterator<Group> groups=user.getGroups(); groups.hasNext();) { Group group = groups.next(); writer.print(Escape.xml(group.getGroupname())); if(groups.hasNext()) { @@ -654,7 +654,7 @@ public class MemoryUserDatabase implements UserDatabase { } } writer.print("\" roles=\""); - for(Iterator<Role> roles=user.getRoles(); roles.hasNext(); ) { + for (Iterator<Role> roles=user.getRoles(); roles.hasNext();) { Role role = roles.next(); writer.print(Escape.xml(role.getRolename())); if(roles.hasNext()) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org