Skip to content

Commit 3980642

Browse files
committed
chore: remove useless variable in ShiroAuthenticationService
1 parent 16b7b2a commit 3980642

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

zeppelin-server/src/main/java/org/apache/zeppelin/service/ShiroAuthenticationService.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,8 @@ private List<String> getUserList(JdbcRealm obj, String searchText, int numUsersT
466466
ps = con.prepareStatement(userquery);
467467
ps.setString(1, "%" + searchText + "%");
468468
rs = ps.executeQuery();
469-
int count = 0;
470-
while (rs.next() && count < numUsersToFetch) {
471-
userlist.add(rs.getString(1).trim());
472-
count++;
469+
while (rs.next() && userlist.size() < numUsersToFetch) {
470+
userlist.add(rs.getString(1));
473471
}
474472
} catch (Exception e) {
475473
LOGGER.error("Error retrieving User list from JDBC Realm", e);

zeppelin-server/src/test/java/org/apache/zeppelin/service/ShiroAuthenticationServiceTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,12 @@ void testGetMatchedUsersWithJdbcRealm() throws Exception {
7575
try (Connection conn = dataSource.getConnection(); Statement stmt = conn.createStatement()) {
7676
stmt.execute("CREATE TABLE users (username VARCHAR PRIMARY KEY, password VARCHAR)");
7777
stmt.execute("INSERT INTO users VALUES ('admin', '')");
78+
stmt.execute("INSERT INTO users VALUES ('admin1', '')");
7879
stmt.execute("INSERT INTO users VALUES ('test', '')");
7980
}
8081

8182
// when
82-
List<String> users = shiroSecurityService.getMatchedUsers("adm", 10);
83+
List<String> users = shiroSecurityService.getMatchedUsers("adm", 1);
8384

8485
// then
8586
assertEquals(1, users.size());

0 commit comments

Comments
 (0)