Source:
public FeedbackSessionQuestionsBundle getFeedbackSessionQuestionsForInstructor( String feedbackSessionName, String courseId, String userEmail) throws EntityDoesNotExistException { FeedbackSessionAttributes fsa = fsDb.getFeedbackSession( courseId, feedbackSessionName); if (fsa == null) { throw new EntityDoesNotExistException(ERROR_NON_EXISTENT_FS_GET + courseId + "/" + feedbackSessionName); } InstructorAttributes instructor = instructorsLogic.getInstructorForEmail(courseId, userEmail); Map<FeedbackQuestionAttributes, List<FeedbackResponseAttributes>> bundle = new HashMap<>(); Map<String, Map<String, String>> recipientList = new HashMap<>(); List<FeedbackQuestionAttributes> questions = fqLogic.getFeedbackQuestionsForInstructor(feedbackSessionName, courseId, userEmail); InstructorAttributes instructorGiver = instructor; Map<String, List<FeedbackResponseCommentAttributes>> commentsForResponses = new HashMap<>(); CourseRoster roster = new CourseRoster(studentsLogic.getStudentsForCourse(courseId), instructorsLogic.getInstructorsForCourse(courseId)); Map<String, String> emailNameTable = new HashMap<>(); Map<String, String> emailLastNameTable = new HashMap<>(); Map<String, String> emailTeamNameTable = new HashMap<>(); for (FeedbackQuestionAttributes question : questions) { updateBundleAndRecipientListWithResponsesForInstructor(courseId, userEmail, fsa, instructor, bundle, recipientList, question, instructorGiver, null, commentsForResponses); for (FeedbackResponseAttributes response : bundle.get(question)) { addEmailNamePairsToTable(emailNameTable, response, question, roster); addEmailTeamNamePairsToTable(emailTeamNameTable, response, question, roster); } } return new FeedbackSessionQuestionsBundle(fsa, bundle, recipientList, commentsForResponses, emailNameTable, emailLastNameTable, emailTeamNameTable, roster); }

Target:
public FeedbackSessionQuestionsBundle getFeedbackSessionQuestionsForInstructor( String feedbackSessionName, String courseId, String userEmail) throws EntityDoesNotExistException { FeedbackSessionAttributes fsa = fsDb.getFeedbackSession( courseId, feedbackSessionName); if (fsa == null) { throw new EntityDoesNotExistException(ERROR_NON_EXISTENT_FS_GET + courseId + "/" + feedbackSessionName); } InstructorAttributes instructor = instructorsLogic.getInstructorForEmail(courseId, userEmail); Map<FeedbackQuestionAttributes, List<FeedbackResponseAttributes>> bundle = new HashMap<>(); Map<String, Map<String, String>> recipientList = new HashMap<>(); List<FeedbackQuestionAttributes> questions = fqLogic.getFeedbackQuestionsForInstructor(feedbackSessionName, courseId, userEmail); Map<String, List<FeedbackResponseCommentAttributes>> commentsForResponses = new HashMap<>(); CourseRoster roster = new CourseRoster(studentsLogic.getStudentsForCourse(courseId), instructorsLogic.getInstructorsForCourse(courseId)); for (FeedbackQuestionAttributes question : questions) { updateBundleAndRecipientListWithResponsesForInstructor(courseId, userEmail, fsa, instructor, bundle, recipientList, question, instructor, null); updateBundleWithCommentsForResponses(bundle.get(question), commentsForResponses); } return new FeedbackSessionQuestionsBundle(fsa, bundle, recipientList, commentsForResponses, roster); }