diff -r 30b840ed8c0e -r 822b7e3d064d src/main/java/de/uapcore/lightpit/dao/postgres/PGIssueDao.java --- a/src/main/java/de/uapcore/lightpit/dao/postgres/PGIssueDao.java Fri Oct 23 18:40:50 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/dao/postgres/PGIssueDao.java Fri Oct 23 20:34:57 2020 +0200 @@ -275,7 +275,7 @@ List comments = new ArrayList<>(); try (var result = listComments.executeQuery()) { while (result.next()) { - final var comment = new IssueComment(result.getInt("commentid"), issue); + final var comment = new IssueComment(result.getInt("commentid")); comment.setCreated(result.getTimestamp("created")); comment.setUpdated(result.getTimestamp("updated")); comment.setUpdateCount(result.getInt("updatecount")); @@ -288,15 +288,13 @@ } @Override - public void saveComment(IssueComment comment) throws SQLException { - Objects.requireNonNull(comment.getComment()); - Objects.requireNonNull(comment.getIssue()); + public void saveComment(Issue issue, IssueComment comment) throws SQLException { if (comment.getId() >= 0) { updateComment.setString(1, comment.getComment()); updateComment.setInt(2, comment.getId()); updateComment.execute(); } else { - insertComment.setInt(1, comment.getIssue().getId()); + insertComment.setInt(1, issue.getId()); insertComment.setString(2, comment.getComment()); setForeignKeyOrNull(insertComment, 3, comment.getAuthor(), User::getId); insertComment.execute();