From e22951c68ef8ee35110d6d46fe8f5913c9cc7c34 Mon Sep 17 00:00:00 2001 From: vraskulin Date: Mon, 19 Dec 2016 11:30:32 +0300 Subject: [PATCH] Repository objects refactoring SQL query is limited by 1, so there will be two cases - whether collection is empty or not. We should user convenient shortcut for checking emptiness of collection --- .../src/main/java/mage/server/record/UserStatsRepository.java | 4 ++-- .../main/java/mage/cards/repository/ExpansionRepository.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Mage.Server/src/main/java/mage/server/record/UserStatsRepository.java b/Mage.Server/src/main/java/mage/server/record/UserStatsRepository.java index 7a06d6741a9..4da53b93e33 100644 --- a/Mage.Server/src/main/java/mage/server/record/UserStatsRepository.java +++ b/Mage.Server/src/main/java/mage/server/record/UserStatsRepository.java @@ -71,7 +71,7 @@ public enum UserStatsRepository { QueryBuilder qb = dao.queryBuilder(); qb.limit(1L).where().eq("userName", userName); List users = dao.query(qb.prepare()); - if (users.size() == 1) { + if (!users.isEmpty()) { return users.get(0); } } catch (SQLException ex) { @@ -95,7 +95,7 @@ public enum UserStatsRepository { QueryBuilder qb = dao.queryBuilder(); qb.orderBy("endTimeMs", false).limit(1L); List users = dao.query(qb.prepare()); - if (users.size() == 1) { + if (!users.isEmpty()) { return users.get(0).getEndTimeMs(); } } catch (SQLException ex) { diff --git a/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java b/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java index b2ff360a115..a6a94d618ed 100644 --- a/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java +++ b/Mage/src/main/java/mage/cards/repository/ExpansionRepository.java @@ -115,7 +115,7 @@ public enum ExpansionRepository { QueryBuilder qb = expansionDao.queryBuilder(); qb.limit(1L).where().eq("code", new SelectArg(setCode)); List expansions = expansionDao.query(qb.prepare()); - if (expansions.size() > 0) { + if (!expansions.isEmpty()) { set = expansions.get(0); } } catch (SQLException ex) { @@ -129,7 +129,7 @@ public enum ExpansionRepository { QueryBuilder qb = expansionDao.queryBuilder(); qb.limit(1L).where().eq("name", new SelectArg(setName)); List expansions = expansionDao.query(qb.prepare()); - if (expansions.size() > 0) { + if (!expansions.isEmpty()) { set = expansions.get(0); } } catch (SQLException ex) {