diff options
Diffstat (limited to 'juick-core/src/main/java/com/juick/server/TagQueries.java')
-rw-r--r-- | juick-core/src/main/java/com/juick/server/TagQueries.java | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/juick-core/src/main/java/com/juick/server/TagQueries.java b/juick-core/src/main/java/com/juick/server/TagQueries.java index 766f9bcd..76c12425 100644 --- a/juick-core/src/main/java/com/juick/server/TagQueries.java +++ b/juick-core/src/main/java/com/juick/server/TagQueries.java @@ -42,10 +42,9 @@ public class TagQueries { try { return sql.queryForObject("SELECT synonym_id,name FROM tags WHERE tag_id=?", (rs, num) -> { - Tag ret = new Tag(); + Tag ret = new Tag(rs.getString(2)); ret.TID = tid; ret.SynonymID = rs.getInt(1); - ret.Name = rs.getString(2); return ret; }, tid); } catch (EmptyResultDataAccessException e) { @@ -58,19 +57,17 @@ public class TagQueries { try { ret = sql.queryForObject("SELECT tag_id,synonym_id,name FROM tags WHERE name=?", (rs, rowNum) -> { - Tag ret1 = new Tag(); + Tag ret1 = new Tag(rs.getString(3)); ret1.TID = rs.getInt(1); ret1.SynonymID = rs.getInt(2); - ret1.Name = rs.getString(3); return ret1; }, tag); } catch (EmptyResultDataAccessException e) { // tag not found } if (ret == null && autoCreate) { - ret = new com.juick.Tag(); + ret = new com.juick.Tag(tag); ret.TID = createTag(sql, tag); - ret.Name = tag; } return ret; @@ -117,8 +114,7 @@ public class TagQueries { "AND messages.message_id=messages_tags.message_id)) " + "INNER JOIN tags ON messages_tags.tag_id=tags.tag_id GROUP BY tags.tag_id ORDER BY tags.name ASC", (rs, rowNum) -> { - Tag t = new Tag(); - t.Name = rs.getString(1); + Tag t = new Tag(rs.getString(1)); t.UsageCnt = rs.getInt(2); return t; }, uid); @@ -160,7 +156,7 @@ public class TagQueries { return Collections.emptyList(); } public static String toString(List<Tag> tags) { - return tags.stream().map(t -> " *" + t.Name) + return tags.stream().map(t -> " *" + t.getName()) .collect(Collectors.joining()); } } |