Skip to content

Fix var and function declarations in NicknameServlet #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stephanie-fu wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix var and function declarations in NicknameServlet #44

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1845201
Declare datastore and userService once
stephanie-fu Jul 6, 2020
239ac5b
Make getUserNickname static
stephanie-fu Jul 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions ...cation/examples/user-nicknames/src/main/java/com/google/sps/servlets/NicknameServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,15 @@

@WebServlet("/nickname")
public class NicknameServlet extends HttpServlet {
private static final DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
private static final UserService userService = UserServiceFactory.getUserService();

@Override
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
response.setContentType("text/html");
PrintWriter out = response.getWriter();
out.println("<h1>Set Nickname</h1>");

UserService userService = UserServiceFactory.getUserService();
if (userService.isUserLoggedIn()) {
String nickname = getUserNickname(userService.getCurrentUser().getUserId());
out.println("<p>Set your nickname here:</p>");
Expand All @@ -54,7 +55,6 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro

@Override
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
UserService userService = UserServiceFactory.getUserService();
if (!userService.isUserLoggedIn()) {
response.sendRedirect("/nickname");
return;
Expand All @@ -63,7 +63,6 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
String nickname = request.getParameter("nickname");
String id = userService.getCurrentUser().getUserId();

DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
Entity entity = new Entity("UserInfo", id);
entity.setProperty("id", id);
entity.setProperty("nickname", nickname);
Expand All @@ -76,8 +75,7 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
/**
* Returns the nickname of the user with id, or empty String if the user has not set a nickname.
*/
private String getUserNickname(String id) {
DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
private static String getUserNickname(String id) {
Query query =
new Query("UserInfo")
.setFilter(new Query.FilterPredicate("id", Query.FilterOperator.EQUAL, id));
Expand Down