Skip to content

Commit 49a7f94

Browse files
committed
refactor guestbook
1 parent a33728d commit 49a7f94

1 file changed

Lines changed: 7 additions & 24 deletions

File tree

src/main/java/edu/harvard/iq/dataverse/GuestbookResponseServiceBean.java

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -762,30 +762,13 @@ private void initCustomQuestions(GuestbookResponse guestbookResponse, Dataset da
762762
}
763763
}
764764

765-
private void setUserDefaultResponses(GuestbookResponse guestbookResponse, DataverseSession session, User userIn) {
766-
User user;
767-
User sessionUser = session.getUser();
768-
769-
if (userIn != null){
770-
user = userIn;
771-
} else{
772-
user = sessionUser;
773-
}
774-
775-
if (user != null) {
776-
guestbookResponse.setEmail(getUserEMail(user));
777-
guestbookResponse.setName(getUserName(user));
778-
guestbookResponse.setInstitution(getUserInstitution(user));
779-
guestbookResponse.setPosition(getUserPosition(user));
780-
guestbookResponse.setAuthenticatedUser(getAuthenticatedUser(user));
781-
} else {
782-
guestbookResponse.setEmail("");
783-
guestbookResponse.setName("");
784-
guestbookResponse.setInstitution("");
785-
guestbookResponse.setPosition("");
786-
guestbookResponse.setAuthenticatedUser(null);
787-
}
788-
guestbookResponse.setSessionId(session.toString());
765+
private void setUserDefaultResponses(GuestbookResponse guestbookResponse, DataverseSession session, User user) {
766+
guestbookResponse.setEmail(getUserEMail(user));
767+
guestbookResponse.setName(getUserName(user));
768+
guestbookResponse.setInstitution(getUserInstitution(user));
769+
guestbookResponse.setPosition(getUserPosition(user));
770+
guestbookResponse.setAuthenticatedUser(getAuthenticatedUser(user));
771+
guestbookResponse.setSessionId(session != null ? session.toString() : "");
789772
}
790773

791774
private void setUserDefaultResponses(GuestbookResponse guestbookResponse, DataverseSession session) {

0 commit comments

Comments
 (0)