Merge "Fixed sonar issues in FutureDAO.java"