Java Enterprise (Topjava)

Date	Description	Calories
++ <%--${meal.dateTime.toLocalDate()} ${meal.dateTime.toLocalTime()}--%> ++ <%--<%=TimeUtil.toString(meal.getDateTime())%>--%> ++ ${fn:formatDateTime(meal.dateTime)} ++	${meal.description}	${meal.calories}

Home

Meal list

++ Add Meal +

+ + +@@ -26,6 +27,8 @@ + + + ++ ++ + + + +@@ -37,6 +40,8 @@ + + + ++ ++ + + +

Date	Description	Calories
${meal.description}	${meal.calories}	Update	Delete

+\ No newline at end of file diff --git a/patchs/to_lesson02/2_3_app_layers.patch b/patchs/to_lesson02/2_3_app_layers.patch new file mode 100644 index 000000000000..fe6bc202d19b --- /dev/null +++ b/patchs/to_lesson02/2_3_app_layers.patch @@ -0,0 +1,582 @@ +Index: src/main/java/ru/javawebinar/topjava/web/user/AdminRestController.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/web/user/AdminRestController.java (revision ) ++++ src/main/java/ru/javawebinar/topjava/web/user/AdminRestController.java (revision ) +@@ -0,0 +1,36 @@ ++package ru.javawebinar.topjava.web.user; ++ ++import ru.javawebinar.topjava.model.User; ++ ++import java.util.List; ++ ++/** ++ * GKislin ++ * 06.03.2015. ++ */ ++public class AdminRestController extends AbstractUserController { ++ ++ public List getAll() { ++ return super.getAll(); ++ } ++ ++ public User get(int id) { ++ return super.get(id); ++ } ++ ++ public User create(User user) { ++ return super.create(user); ++ } ++ ++ public void delete(int id) { ++ super.delete(id); ++ } ++ ++ public void update(User user, int id) { ++ super.update(user, id); ++ } ++ ++ public User getByMail(String email) { ++ return super.getByMail(email); ++ } ++} +Index: src/main/java/ru/javawebinar/topjava/service/UserServiceImpl.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/service/UserServiceImpl.java (revision ) ++++ src/main/java/ru/javawebinar/topjava/service/UserServiceImpl.java (revision ) +@@ -0,0 +1,41 @@ ++package ru.javawebinar.topjava.service; ++ ++import ru.javawebinar.topjava.model.User; ++import ru.javawebinar.topjava.repository.UserRepository; ++import ru.javawebinar.topjava.util.exception.ExceptionUtil; ++import ru.javawebinar.topjava.util.exception.NotFoundException; ++ ++import java.util.List; ++ ++/** ++ * GKislin ++ * 06.03.2015. ++ */ ++public class UserServiceImpl implements UserService { ++ ++ private UserRepository repository; ++ ++ public User save(User user) { ++ return repository.save(user); ++ } ++ ++ public void delete(int id) { ++ ExceptionUtil.checkNotFoundWithId(repository.delete(id), id); ++ } ++ ++ public User get(int id) throws NotFoundException { ++ return ExceptionUtil.checkNotFoundWithId(repository.get(id), id); ++ } ++ ++ public User getByEmail(String email) throws NotFoundException { ++ return ExceptionUtil.checkNotFound(repository.getByEmail(email), "email=" + email); ++ } ++ ++ public List getAll() { ++ return repository.getAll(); ++ } ++ ++ public void update(User user) { ++ repository.save(user); ++ } ++} +Index: src/main/java/ru/javawebinar/topjava/service/UserMealServiceImpl.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/service/UserMealServiceImpl.java (revision ) ++++ src/main/java/ru/javawebinar/topjava/service/UserMealServiceImpl.java (revision ) +@@ -0,0 +1,13 @@ ++package ru.javawebinar.topjava.service; ++ ++import ru.javawebinar.topjava.repository.UserMealRepository; ++ ++/** ++ * GKislin ++ * 06.03.2015. ++ */ ++public class UserMealServiceImpl implements UserMealService { ++ ++ private UserMealRepository repository; ++ ++} +Index: src/main/java/ru/javawebinar/topjava/web/meal/UserMealRestController.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/web/meal/UserMealRestController.java (revision ) ++++ src/main/java/ru/javawebinar/topjava/web/meal/UserMealRestController.java (revision ) +@@ -0,0 +1,12 @@ ++package ru.javawebinar.topjava.web.meal; ++ ++import ru.javawebinar.topjava.service.UserMealService; ++ ++/** ++ * GKislin ++ * 06.03.2015. ++ */ ++public class UserMealRestController { ++ private UserMealService service; ++ ++} +Index: src/main/java/ru/javawebinar/topjava/util/exception/ExceptionUtil.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/util/exception/ExceptionUtil.java (revision ) ++++ src/main/java/ru/javawebinar/topjava/util/exception/ExceptionUtil.java (revision ) +@@ -0,0 +1,25 @@ ++package ru.javawebinar.topjava.util.exception; ++ ++ ++/** ++ * User: gkislin ++ * Date: 14.05.2014 ++ */ ++public class ExceptionUtil { ++ public static void checkNotFoundWithId(boolean found, int id) { ++ checkNotFound(found, "id=" + id); ++ } ++ ++ public static T checkNotFoundWithId(T object, int id) { ++ return checkNotFound(object, "id=" + id); ++ } ++ ++ public static T checkNotFound(T object, String msg) { ++ checkNotFound(object != null, msg); ++ return object; ++ } ++ ++ public static void checkNotFound(boolean found, String msg) { ++ if (!found) throw new NotFoundException("Not found entity with " + msg); ++ } ++} +Index: src/main/java/ru/javawebinar/topjava/model/NamedEntity.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/model/NamedEntity.java (revision ) ++++ src/main/java/ru/javawebinar/topjava/model/NamedEntity.java (revision ) +@@ -0,0 +1,31 @@ ++package ru.javawebinar.topjava.model; ++ ++/** ++ * User: gkislin ++ * Date: 22.08.2014 ++ */ ++public class NamedEntity extends BaseEntity { ++ ++ protected String name; ++ ++ public NamedEntity() { ++ } ++ ++ protected NamedEntity(Integer id, String name) { ++ super(id); ++ this.name = name; ++ } ++ ++ public void setName(String name) { ++ this.name = name; ++ } ++ ++ public String getName() { ++ return this.name; ++ } ++ ++ @Override ++ public String toString() { ++ return name; ++ } ++} +Index: src/main/java/ru/javawebinar/topjava/web/user/ProfileRestController.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/web/user/ProfileRestController.java (revision ) ++++ src/main/java/ru/javawebinar/topjava/web/user/ProfileRestController.java (revision ) +@@ -0,0 +1,23 @@ ++package ru.javawebinar.topjava.web.user; ++ ++import ru.javawebinar.topjava.LoggedUser; ++import ru.javawebinar.topjava.model.User; ++ ++/** ++ * GKislin ++ * 06.03.2015. ++ */ ++public class ProfileRestController extends AbstractUserController { ++ ++ public User get() { ++ return super.get(LoggedUser.id()); ++ } ++ ++ public void delete() { ++ super.delete(LoggedUser.id()); ++ } ++ ++ public void update(User user) { ++ super.update(user, LoggedUser.id()); ++ } ++} +\ No newline at end of file +Index: src/main/java/ru/javawebinar/topjava/service/UserService.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/service/UserService.java (revision ) ++++ src/main/java/ru/javawebinar/topjava/service/UserService.java (revision ) +@@ -0,0 +1,26 @@ ++package ru.javawebinar.topjava.service; ++ ++ ++import ru.javawebinar.topjava.model.User; ++import ru.javawebinar.topjava.util.exception.NotFoundException; ++ ++import java.util.List; ++ ++/** ++ * User: gkislin ++ * Date: 22.08.2014 ++ */ ++public interface UserService { ++ ++ User save(User user); ++ ++ void delete(int id) throws NotFoundException; ++ ++ User get(int id) throws NotFoundException; ++ ++ User getByEmail(String email) throws NotFoundException; ++ ++ List getAll(); ++ ++ void update(User user); ++} +Index: src/main/java/ru/javawebinar/topjava/repository/UserRepository.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/repository/UserRepository.java (revision ) ++++ src/main/java/ru/javawebinar/topjava/repository/UserRepository.java (revision ) +@@ -0,0 +1,24 @@ ++package ru.javawebinar.topjava.repository; ++ ++import ru.javawebinar.topjava.model.User; ++ ++import java.util.List; ++ ++/** ++ * User: gkislin ++ * Date: 22.08.2014 ++ */ ++public interface UserRepository { ++ User save(User user); ++ ++ // false if not found ++ boolean delete(int id); ++ ++ // null if not found ++ User get(int id); ++ ++ // null if not found ++ User getByEmail(String email); ++ ++ List getAll(); ++} +Index: src/main/java/ru/javawebinar/topjava/model/BaseEntity.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/model/BaseEntity.java (revision ) ++++ src/main/java/ru/javawebinar/topjava/model/BaseEntity.java (revision ) +@@ -0,0 +1,28 @@ ++package ru.javawebinar.topjava.model; ++ ++/** ++ * User: gkislin ++ * Date: 22.08.2014 ++ */ ++public class BaseEntity { ++ protected Integer id; ++ ++ public BaseEntity() { ++ } ++ ++ protected BaseEntity(Integer id) { ++ this.id = id; ++ } ++ ++ public void setId(Integer id) { ++ this.id = id; ++ } ++ ++ public Integer getId() { ++ return id; ++ } ++ ++ public boolean isNew() { ++ return (this.id == null); ++ } ++} +Index: src/main/java/ru/javawebinar/topjava/web/user/AbstractUserController.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/web/user/AbstractUserController.java (revision ) ++++ src/main/java/ru/javawebinar/topjava/web/user/AbstractUserController.java (revision ) +@@ -0,0 +1,49 @@ ++package ru.javawebinar.topjava.web.user; ++ ++import org.slf4j.Logger; ++import org.slf4j.LoggerFactory; ++import ru.javawebinar.topjava.model.User; ++import ru.javawebinar.topjava.service.UserService; ++ ++import java.util.List; ++ ++/** ++ * User: gkislin ++ */ ++public abstract class AbstractUserController { ++ protected final Logger LOG = LoggerFactory.getLogger(getClass()); ++ ++ private UserService service; ++ ++ public List getAll() { ++ LOG.info("getAll"); ++ return service.getAll(); ++ } ++ ++ public User get(int id) { ++ LOG.info("get " + id); ++ return service.get(id); ++ } ++ ++ public User create(User user) { ++ user.setId(null); ++ LOG.info("create " + user); ++ return service.save(user); ++ } ++ ++ public void delete(int id) { ++ LOG.info("delete " + id); ++ service.delete(id); ++ } ++ ++ public void update(User user, int id) { ++ user.setId(id); ++ LOG.info("update " + user); ++ service.update(user); ++ } ++ ++ public User getByMail(String email) { ++ LOG.info("getByEmail " + email); ++ return service.getByEmail(email); ++ } ++} +Index: src/main/java/ru/javawebinar/topjava/util/exception/NotFoundException.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/util/exception/NotFoundException.java (revision ) ++++ src/main/java/ru/javawebinar/topjava/util/exception/NotFoundException.java (revision ) +@@ -0,0 +1,11 @@ ++package ru.javawebinar.topjava.util.exception; ++ ++/** ++ * User: gkislin ++ * Date: 19.08.2014 ++ */ ++public class NotFoundException extends RuntimeException { ++ public NotFoundException(String message) { ++ super(message); ++ } ++} +Index: src/main/java/ru/javawebinar/topjava/service/UserMealService.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/service/UserMealService.java (revision ) ++++ src/main/java/ru/javawebinar/topjava/service/UserMealService.java (revision ) +@@ -0,0 +1,8 @@ ++package ru.javawebinar.topjava.service; ++ ++/** ++ * GKislin ++ * 15.06.2015. ++ */ ++public interface UserMealService { ++} +Index: src/main/java/ru/javawebinar/topjava/LoggedUser.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/LoggedUser.java (revision ) ++++ src/main/java/ru/javawebinar/topjava/LoggedUser.java (revision ) +@@ -0,0 +1,18 @@ ++package ru.javawebinar.topjava; ++ ++import ru.javawebinar.topjava.util.UserMealsUtil; ++ ++/** ++ * GKislin ++ * 06.03.2015. ++ */ ++public class LoggedUser { ++ ++ public static int id() { ++ return 1; ++ } ++ ++ public static int getCaloriesPerDay() { ++ return UserMealsUtil.DEFAULT_CALORIES_PER_DAY; ++ } ++} +Index: src/main/java/ru/javawebinar/topjava/model/Role.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/model/Role.java (revision ) ++++ src/main/java/ru/javawebinar/topjava/model/Role.java (revision ) +@@ -0,0 +1,10 @@ ++package ru.javawebinar.topjava.model; ++ ++/** ++ * User: gkislin ++ * Date: 22.08.2014 ++ */ ++public enum Role { ++ ROLE_USER, ++ ROLE_ADMIN ++} +Index: src/main/java/ru/javawebinar/topjava/model/User.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/model/User.java (revision ) ++++ src/main/java/ru/javawebinar/topjava/model/User.java (revision ) +@@ -0,0 +1,98 @@ ++package ru.javawebinar.topjava.model; ++ ++import ru.javawebinar.topjava.util.UserMealsUtil; ++ ++import java.util.Date; ++import java.util.EnumSet; ++import java.util.Set; ++ ++/** ++ * User: gkislin ++ * Date: 22.08.2014 ++ */ ++public class User extends NamedEntity { ++ ++ protected String email; ++ ++ protected String password; ++ ++ protected boolean enabled = true; ++ ++ protected Date registered = new Date(); ++ ++ protected Set roles; ++ ++ protected int caloriesPerDay = UserMealsUtil.DEFAULT_CALORIES_PER_DAY; ++ ++ public User() { ++ } ++ ++ public User(Integer id, String name, String email, String password, Role role, Role... roles) { ++ this(id, name, email, password, UserMealsUtil.DEFAULT_CALORIES_PER_DAY, true, EnumSet.of(role, roles)); ++ } ++ ++ public User(Integer id, String name, String email, String password, int caloriesPerDay, boolean enabled, Set roles) { ++ super(id, name); ++ this.email = email; ++ this.password = password; ++ this.caloriesPerDay = caloriesPerDay; ++ this.enabled = enabled; ++ this.roles = roles; ++ } ++ ++ public String getEmail() { ++ return email; ++ } ++ ++ public void setEmail(String email) { ++ this.email = email; ++ } ++ ++ public void setPassword(String password) { ++ this.password = password; ++ } ++ ++ public Date getRegistered() { ++ return registered; ++ } ++ ++ public void setRegistered(Date registered) { ++ this.registered = registered; ++ } ++ ++ public void setEnabled(boolean enabled) { ++ this.enabled = enabled; ++ } ++ ++ public int getCaloriesPerDay() { ++ return caloriesPerDay; ++ } ++ ++ public void setCaloriesPerDay(int caloriesPerDay) { ++ this.caloriesPerDay = caloriesPerDay; ++ } ++ ++ public boolean isEnabled() { ++ return enabled; ++ } ++ ++ public Set getRoles() { ++ return roles; ++ } ++ ++ public String getPassword() { ++ return password; ++ } ++ ++ @Override ++ public String toString() { ++ return "User (" + ++ "id=" + id + ++ ", email=" + email + ++ ", name=" + name + ++ ", enabled=" + enabled + ++ ", roles=" + roles + ++ ", caloriesPerDay=" + caloriesPerDay + ++ ')'; ++ } ++} diff --git a/patchs/to_lesson02/2_4_add_spring_context.patch b/patchs/to_lesson02/2_4_add_spring_context.patch new file mode 100644 index 000000000000..47b295408fb3 --- /dev/null +++ b/patchs/to_lesson02/2_4_add_spring_context.patch @@ -0,0 +1,167 @@ +Index: src/main/java/ru/javawebinar/topjava/SpringMain.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/SpringMain.java (revision ) ++++ src/main/java/ru/javawebinar/topjava/SpringMain.java (revision ) +@@ -0,0 +1,23 @@ ++package ru.javawebinar.topjava; ++ ++import org.springframework.context.ConfigurableApplicationContext; ++import org.springframework.context.support.ClassPathXmlApplicationContext; ++import ru.javawebinar.topjava.repository.UserRepository; ++ ++import java.util.Arrays; ++ ++/** ++ * User: gkislin ++ * Date: 22.08.2014 ++ */ ++public class SpringMain { ++ public static void main(String[] args) { ++ ConfigurableApplicationContext appCtx = new ClassPathXmlApplicationContext("spring/spring-app.xml"); ++ System.out.println(Arrays.toString(appCtx.getBeanDefinitionNames())); ++ ++// UserRepository userRepository = (UserRepository) appCtx.getBean("mockUserRepository"); ++ UserRepository userRepository = appCtx.getBean(UserRepository.class); ++ userRepository.getAll(); ++ appCtx.close(); ++ } ++} +Index: src/main/java/ru/javawebinar/topjava/repository/mock/MockUserRepositoryImpl.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/repository/mock/MockUserRepositoryImpl.java (revision ) ++++ src/main/java/ru/javawebinar/topjava/repository/mock/MockUserRepositoryImpl.java (revision ) +@@ -0,0 +1,47 @@ ++package ru.javawebinar.topjava.repository.mock; ++ ++import org.slf4j.Logger; ++import org.slf4j.LoggerFactory; ++import ru.javawebinar.topjava.model.User; ++import ru.javawebinar.topjava.repository.UserRepository; ++ ++import java.util.Collections; ++import java.util.List; ++ ++/** ++ * GKislin ++ * 15.06.2015. ++ */ ++public class MockUserRepositoryImpl implements UserRepository { ++ private static final Logger LOG = LoggerFactory.getLogger(MockUserRepositoryImpl.class); ++ ++ @Override ++ public boolean delete(int id) { ++ LOG.info("delete " + id); ++ return true; ++ } ++ ++ @Override ++ public User save(User user) { ++ LOG.info("save " + user); ++ return user; ++ } ++ ++ @Override ++ public User get(int id) { ++ LOG.info("get " + id); ++ return null; ++ } ++ ++ @Override ++ public List getAll() { ++ LOG.info("getAll"); ++ return Collections.emptyList(); ++ } ++ ++ @Override ++ public User getByEmail(String email) { ++ LOG.info("getByEmail " + email); ++ return null; ++ } ++} +Index: src/main/resources/spring/spring-app.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/resources/spring/spring-app.xml (revision ) ++++ src/main/resources/spring/spring-app.xml (revision ) +@@ -0,0 +1,8 @@ ++ ++ ++ ++ ++ +\ No newline at end of file +Index: src/main/java/ru/javawebinar/topjava/web/MealServlet.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/web/MealServlet.java (date 1465331514000) ++++ src/main/java/ru/javawebinar/topjava/web/MealServlet.java (revision ) +@@ -3,7 +3,7 @@ + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import ru.javawebinar.topjava.model.UserMeal; +-import ru.javawebinar.topjava.repository.InMemoryUserMealRepositoryImpl; ++import ru.javawebinar.topjava.repository.mock.InMemoryUserMealRepositoryImpl; + import ru.javawebinar.topjava.repository.UserMealRepository; + import ru.javawebinar.topjava.util.UserMealsUtil; + +Index: pom.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- pom.xml (date 1465331514000) ++++ pom.xml (revision ) +@@ -16,6 +16,8 @@ + UTF-8 + UTF-8 + ++ 4.2.6.RELEASE ++ + + 1.1.7 + 1.7.21 +@@ -67,6 +69,18 @@ + runtime + + ++ ++ ++ org.springframework ++ spring-context ++ ${spring.version} ++ ++ ++ commons-logging ++ commons-logging ++ ++ ++ + + javax.servlet + jstl +Index: src/main/java/ru/javawebinar/topjava/repository/InMemoryUserMealRepositoryImpl.java +=================================================================== +--- src/main/java/ru/javawebinar/topjava/repository/InMemoryUserMealRepositoryImpl.java (date 1465331514000) ++++ src/main/java/ru/javawebinar/topjava/repository/mock/InMemoryUserMealRepositoryImpl.java (revision ) +@@ -1,6 +1,7 @@ +-package ru.javawebinar.topjava.repository; ++package ru.javawebinar.topjava.repository.mock; + + import ru.javawebinar.topjava.model.UserMeal; ++import ru.javawebinar.topjava.repository.UserMealRepository; + import ru.javawebinar.topjava.util.UserMealsUtil; + + import java.util.Collection; diff --git a/patchs/to_lesson02/2_5_add_dependency_injection.patch b/patchs/to_lesson02/2_5_add_dependency_injection.patch new file mode 100644 index 000000000000..b655f05343c6 --- /dev/null +++ b/patchs/to_lesson02/2_5_add_dependency_injection.patch @@ -0,0 +1,68 @@ +Index: src/main/resources/spring/spring-app.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/resources/spring/spring-app.xml (date 1465332050000) ++++ src/main/resources/spring/spring-app.xml (revision ) +@@ -1,8 +1,10 @@ + ++ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + + ++ ++ ++ + +\ No newline at end of file +Index: src/main/java/ru/javawebinar/topjava/SpringMain.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/SpringMain.java (date 1465332050000) ++++ src/main/java/ru/javawebinar/topjava/SpringMain.java (revision ) +@@ -2,7 +2,10 @@ + + import org.springframework.context.ConfigurableApplicationContext; + import org.springframework.context.support.ClassPathXmlApplicationContext; ++import ru.javawebinar.topjava.model.Role; ++import ru.javawebinar.topjava.model.User; + import ru.javawebinar.topjava.repository.UserRepository; ++import ru.javawebinar.topjava.service.UserService; + + import java.util.Arrays; + +@@ -18,6 +21,10 @@ + // UserRepository userRepository = (UserRepository) appCtx.getBean("mockUserRepository"); + UserRepository userRepository = appCtx.getBean(UserRepository.class); + userRepository.getAll(); ++ ++ UserService userService = appCtx.getBean(UserService.class); ++ System.out.println(userService.save(new User(1, "userName", "email", "password", Role.ROLE_ADMIN))); ++ + appCtx.close(); + } + } +Index: src/main/java/ru/javawebinar/topjava/service/UserServiceImpl.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/service/UserServiceImpl.java (date 1465332050000) ++++ src/main/java/ru/javawebinar/topjava/service/UserServiceImpl.java (revision ) +@@ -15,6 +15,10 @@ + + private UserRepository repository; + ++ public void setRepository(UserRepository repository) { ++ this.repository = repository; ++ } ++ + public User save(User user) { + return repository.save(user); + } diff --git a/patchs/to_lesson02/2_6_add_annotation_processing.patch b/patchs/to_lesson02/2_6_add_annotation_processing.patch new file mode 100644 index 000000000000..acdf8f9f0db3 --- /dev/null +++ b/patchs/to_lesson02/2_6_add_annotation_processing.patch @@ -0,0 +1,197 @@ +Index: src/main/java/ru/javawebinar/topjava/repository/mock/MockUserRepositoryImpl.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/repository/mock/MockUserRepositoryImpl.java (date 1465332238000) ++++ src/main/java/ru/javawebinar/topjava/repository/mock/MockUserRepositoryImpl.java (revision ) +@@ -1,5 +1,6 @@ + package ru.javawebinar.topjava.repository.mock; + ++import org.springframework.stereotype.Repository; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import ru.javawebinar.topjava.model.User; +@@ -12,6 +13,7 @@ + * GKislin + * 15.06.2015. + */ ++@Repository + public class MockUserRepositoryImpl implements UserRepository { + private static final Logger LOG = LoggerFactory.getLogger(MockUserRepositoryImpl.class); + +Index: src/main/java/ru/javawebinar/topjava/web/user/ProfileRestController.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/web/user/ProfileRestController.java (date 1465332238000) ++++ src/main/java/ru/javawebinar/topjava/web/user/ProfileRestController.java (revision ) +@@ -1,5 +1,6 @@ + package ru.javawebinar.topjava.web.user; + ++import org.springframework.stereotype.Controller; + import ru.javawebinar.topjava.LoggedUser; + import ru.javawebinar.topjava.model.User; + +@@ -7,6 +8,7 @@ + * GKislin + * 06.03.2015. + */ ++@Controller + public class ProfileRestController extends AbstractUserController { + + public User get() { +\ No newline at end of file +Index: src/main/java/ru/javawebinar/topjava/web/user/AdminRestController.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/web/user/AdminRestController.java (date 1465332238000) ++++ src/main/java/ru/javawebinar/topjava/web/user/AdminRestController.java (revision ) +@@ -1,5 +1,6 @@ + package ru.javawebinar.topjava.web.user; + ++import org.springframework.stereotype.Controller; + import ru.javawebinar.topjava.model.User; + + import java.util.List; +@@ -8,6 +9,7 @@ + * GKislin + * 06.03.2015. + */ ++@Controller + public class AdminRestController extends AbstractUserController { + + public List getAll() { +Index: src/main/java/ru/javawebinar/topjava/web/user/AbstractUserController.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/web/user/AbstractUserController.java (date 1465332238000) ++++ src/main/java/ru/javawebinar/topjava/web/user/AbstractUserController.java (revision ) +@@ -1,5 +1,6 @@ + package ru.javawebinar.topjava.web.user; + ++import org.springframework.beans.factory.annotation.Autowired; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import ru.javawebinar.topjava.model.User; +@@ -13,6 +14,7 @@ + public abstract class AbstractUserController { + protected final Logger LOG = LoggerFactory.getLogger(getClass()); + ++ @Autowired + private UserService service; + + public List getAll() { +Index: src/main/resources/spring/spring-app.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/resources/spring/spring-app.xml (date 1465332238000) ++++ src/main/resources/spring/spring-app.xml (revision ) +@@ -1,10 +1,23 @@ + ++ xmlns:context="http://www.springframework.org/schema/context" ++ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd ++ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + +\ No newline at end of file +Index: src/main/java/ru/javawebinar/topjava/SpringMain.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/SpringMain.java (date 1465332238000) ++++ src/main/java/ru/javawebinar/topjava/SpringMain.java (revision ) +@@ -4,8 +4,7 @@ + import org.springframework.context.support.ClassPathXmlApplicationContext; + import ru.javawebinar.topjava.model.Role; + import ru.javawebinar.topjava.model.User; +-import ru.javawebinar.topjava.repository.UserRepository; +-import ru.javawebinar.topjava.service.UserService; ++import ru.javawebinar.topjava.web.user.AdminRestController; + + import java.util.Arrays; + +@@ -15,16 +14,11 @@ + */ + public class SpringMain { + public static void main(String[] args) { +- ConfigurableApplicationContext appCtx = new ClassPathXmlApplicationContext("spring/spring-app.xml"); ++ // java 7 Automatic resource management ++ try (ConfigurableApplicationContext appCtx = new ClassPathXmlApplicationContext("spring/spring-app.xml")) { +- System.out.println(Arrays.toString(appCtx.getBeanDefinitionNames())); ++ System.out.println(Arrays.toString(appCtx.getBeanDefinitionNames())); +- +-// UserRepository userRepository = (UserRepository) appCtx.getBean("mockUserRepository"); +- UserRepository userRepository = appCtx.getBean(UserRepository.class); +- userRepository.getAll(); +- +- UserService userService = appCtx.getBean(UserService.class); +- System.out.println(userService.save(new User(1, "userName", "email", "password", Role.ROLE_ADMIN))); +- +- appCtx.close(); ++ AdminRestController adminUserController = appCtx.getBean(AdminRestController.class); ++ System.out.println(adminUserController.create(new User(1, "userName", "email", "password", Role.ROLE_ADMIN))); ++ } + } + } +Index: src/main/java/ru/javawebinar/topjava/service/UserServiceImpl.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/service/UserServiceImpl.java (date 1465332238000) ++++ src/main/java/ru/javawebinar/topjava/service/UserServiceImpl.java (revision ) +@@ -1,5 +1,7 @@ + package ru.javawebinar.topjava.service; + ++import org.springframework.beans.factory.annotation.Autowired; ++import org.springframework.stereotype.Service; + import ru.javawebinar.topjava.model.User; + import ru.javawebinar.topjava.repository.UserRepository; + import ru.javawebinar.topjava.util.exception.ExceptionUtil; +@@ -11,13 +13,11 @@ + * GKislin + * 06.03.2015. + */ ++@Service + public class UserServiceImpl implements UserService { + ++ @Autowired + private UserRepository repository; +- +- public void setRepository(UserRepository repository) { +- this.repository = repository; +- } + + public User save(User user) { + return repository.save(user); diff --git a/patchs/to_lesson03/3_01_HW2_repository.patch b/patchs/to_lesson03/3_01_HW2_repository.patch new file mode 100644 index 000000000000..15deb9b2cbbb --- /dev/null +++ b/patchs/to_lesson03/3_01_HW2_repository.patch @@ -0,0 +1,349 @@ +Index: src/main/java/ru/javawebinar/topjava/repository/mock/InMemoryUserMealRepositoryImpl.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/repository/mock/InMemoryUserMealRepositoryImpl.java (date 1465849306000) ++++ src/main/java/ru/javawebinar/topjava/repository/mock/InMemoryUserMealRepositoryImpl.java (date 1465940521000) +@@ -1,48 +1,84 @@ + package ru.javawebinar.topjava.repository.mock; + ++import org.springframework.stereotype.Repository; + import ru.javawebinar.topjava.model.UserMeal; + import ru.javawebinar.topjava.repository.UserMealRepository; ++import ru.javawebinar.topjava.util.TimeUtil; + import ru.javawebinar.topjava.util.UserMealsUtil; + +-import java.util.Collection; +-import java.util.Map; ++import java.time.LocalDateTime; ++import java.time.Month; ++import java.util.*; + import java.util.concurrent.ConcurrentHashMap; + import java.util.concurrent.atomic.AtomicInteger; ++import java.util.stream.Collectors; + ++import static ru.javawebinar.topjava.repository.mock.InMemoryUserRepositoryImpl.ADMIN_ID; ++import static ru.javawebinar.topjava.repository.mock.InMemoryUserRepositoryImpl.USER_ID; ++ + /** + * GKislin + * 15.09.2015. + */ ++@Repository + public class InMemoryUserMealRepositoryImpl implements UserMealRepository { +- private Map repository = new ConcurrentHashMap<>(); ++ ++ private static final Comparator USER_MEAL_COMPARATOR = Comparator.comparing(UserMeal::getDateTime).reversed(); ++ ++ // Map userId -> (mealId-> meal) ++ private Map> repository = new ConcurrentHashMap<>(); + private AtomicInteger counter = new AtomicInteger(0); + + { +- UserMealsUtil.MEAL_LIST.forEach(this::save); ++ UserMealsUtil.MEAL_LIST.forEach(um -> save(um, USER_ID)); ++ ++ save(new UserMeal(LocalDateTime.of(2015, Month.JUNE, 1, 14, 0), "Админ ланч", 510), ADMIN_ID); ++ save(new UserMeal(LocalDateTime.of(2015, Month.JUNE, 1, 21, 0), "Админ ужин", 1500), ADMIN_ID); + } + + @Override +- public UserMeal save(UserMeal userMeal) { ++ public UserMeal save(UserMeal userMeal, int userId) { ++ Objects.requireNonNull(userMeal); ++ ++ Integer mealId = userMeal.getId(); ++ + if (userMeal.isNew()) { +- userMeal.setId(counter.incrementAndGet()); ++ mealId = counter.incrementAndGet(); ++ userMeal.setId(mealId); ++ } else if (get(mealId, userId) == null) { ++ return null; + } +- repository.put(userMeal.getId(), userMeal); ++ Map userMeals = repository.computeIfAbsent(userId, ConcurrentHashMap::new); ++ userMeals.put(mealId, userMeal); + return userMeal; + } + + @Override +- public void delete(int id) { +- repository.remove(id); ++ public boolean delete(int id, int userId) { ++ Map userMeals = repository.get(userId); ++ return userMeals != null && userMeals.remove(id) != null; + } + + @Override +- public UserMeal get(int id) { +- return repository.get(id); ++ public UserMeal get(int id, int userId) { ++ Map userMeals = repository.get(userId); ++ return userMeals == null ? null : userMeals.get(id); + } + + @Override +- public Collection getAll() { +- return repository.values(); ++ public Collection getAll(int userId) { ++ Map userMeals = repository.get(userId); ++ return userMeals == null ? ++ Collections.emptyList() : ++ userMeals.values().stream().sorted(USER_MEAL_COMPARATOR).collect(Collectors.toList()); + } +-} + ++ @Override ++ public Collection getBetween(LocalDateTime startDateTime, LocalDateTime endDateTime, int userId) { ++ Objects.requireNonNull(startDateTime); ++ Objects.requireNonNull(endDateTime); ++ return getAll(userId).stream() ++ .filter(um -> TimeUtil.isBetween(um.getDateTime(), startDateTime, endDateTime)) ++ .collect(Collectors.toList()); ++ } ++} +Index: src/main/java/ru/javawebinar/topjava/repository/mock/InMemoryUserRepositoryImpl.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/repository/mock/InMemoryUserRepositoryImpl.java (date 1465940521000) ++++ src/main/java/ru/javawebinar/topjava/repository/mock/InMemoryUserRepositoryImpl.java (date 1465940521000) +@@ -0,0 +1,64 @@ ++package ru.javawebinar.topjava.repository.mock; ++ ++import org.springframework.stereotype.Repository; ++import ru.javawebinar.topjava.model.User; ++import ru.javawebinar.topjava.repository.UserRepository; ++ ++import java.util.Comparator; ++import java.util.List; ++import java.util.Map; ++import java.util.Objects; ++import java.util.concurrent.ConcurrentHashMap; ++import java.util.concurrent.atomic.AtomicInteger; ++import java.util.stream.Collectors; ++ ++/** ++ * GKislin ++ * 15.06.2015. ++ */ ++@Repository ++public class InMemoryUserRepositoryImpl implements UserRepository { ++ private Map repository = new ConcurrentHashMap<>(); ++ private AtomicInteger counter = new AtomicInteger(0); ++ ++ private static final Comparator USER_COMPARATOR = Comparator.comparing(User::getName); ++ ++ public static final int USER_ID = 1; ++ public static final int ADMIN_ID = 2; ++ ++ @Override ++ public User save(User user) { ++ Objects.requireNonNull(user); ++ if (user.isNew()) { ++ user.setId(counter.incrementAndGet()); ++ } ++ repository.put(user.getId(), user); ++ return user; ++ } ++ ++ @Override ++ public boolean delete(int id) { ++ return repository.remove(id) != null; ++ } ++ ++ @Override ++ public User get(int id) { ++ return repository.get(id); ++ } ++ ++ @Override ++ public List getAll() { ++ return repository.values().stream() ++ .sorted(USER_COMPARATOR) ++ .collect(Collectors.toList()); ++ } ++ ++ @Override ++ public User getByEmail(String email) { ++ Objects.requireNonNull(email); ++ return repository.values().stream() ++ .filter(u -> email.equals(u.getEmail())) ++ .findFirst() ++ .orElse(null); ++ } ++} +Index: src/main/java/ru/javawebinar/topjava/repository/mock/MockUserRepositoryImpl.java +=================================================================== +--- src/main/java/ru/javawebinar/topjava/repository/mock/MockUserRepositoryImpl.java (date 1465849306000) ++++ src/main/java/ru/javawebinar/topjava/repository/mock/MockUserRepositoryImpl.java (date 1465849306000) +@@ -1,49 +0,0 @@ +-package ru.javawebinar.topjava.repository.mock; +- +-import org.springframework.stereotype.Repository; +-import org.slf4j.Logger; +-import org.slf4j.LoggerFactory; +-import ru.javawebinar.topjava.model.User; +-import ru.javawebinar.topjava.repository.UserRepository; +- +-import java.util.Collections; +-import java.util.List; +- +-/** +- * GKislin +- * 15.06.2015. +- */ +-@Repository +-public class MockUserRepositoryImpl implements UserRepository { +- private static final Logger LOG = LoggerFactory.getLogger(MockUserRepositoryImpl.class); +- +- @Override +- public boolean delete(int id) { +- LOG.info("delete " + id); +- return true; +- } +- +- @Override +- public User save(User user) { +- LOG.info("save " + user); +- return user; +- } +- +- @Override +- public User get(int id) { +- LOG.info("get " + id); +- return null; +- } +- +- @Override +- public List getAll() { +- LOG.info("getAll"); +- return Collections.emptyList(); +- } +- +- @Override +- public User getByEmail(String email) { +- LOG.info("getByEmail " + email); +- return null; +- } +-} +Index: src/main/java/ru/javawebinar/topjava/repository/UserMealRepository.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/repository/UserMealRepository.java (date 1465849306000) ++++ src/main/java/ru/javawebinar/topjava/repository/UserMealRepository.java (date 1465940521000) +@@ -2,6 +2,7 @@ + + import ru.javawebinar.topjava.model.UserMeal; + ++import java.time.LocalDateTime; + import java.util.Collection; + + /** +@@ -9,11 +10,18 @@ + * 06.03.2015. + */ + public interface UserMealRepository { +- UserMeal save(UserMeal userMeal); ++ // null if updated meal do not belong to userId ++ UserMeal save(UserMeal userMeal, int userId); + +- void delete(int id); ++ // false if meal do not belong to userId ++ boolean delete(int id, int userId); + +- UserMeal get(int id); ++ // null if meal do not belong to userId ++ UserMeal get(int id, int userId); + +- Collection getAll(); ++ // ORDERED dateTime ++ Collection getAll(int userId); ++ ++ // ORDERED dateTime ++ Collection getBetween(LocalDateTime startDate, LocalDateTime endDate, int userId); + } +Index: src/main/java/ru/javawebinar/topjava/util/TimeUtil.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/util/TimeUtil.java (date 1465849306000) ++++ src/main/java/ru/javawebinar/topjava/util/TimeUtil.java (date 1465940521000) +@@ -1,7 +1,6 @@ + package ru.javawebinar.topjava.util; + + import java.time.LocalDateTime; +-import java.time.LocalTime; + import java.time.format.DateTimeFormatter; + + /** +@@ -9,10 +8,10 @@ + * 07.01.2015. + */ + public class TimeUtil { +- public static final DateTimeFormatter DATE_TME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); ++ private static final DateTimeFormatter DATE_TME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); + +- public static boolean isBetween(LocalTime lt, LocalTime startTime, LocalTime endTime) { +- return lt.compareTo(startTime) >= 0 && lt.compareTo(endTime) <= 0; ++ public static > boolean isBetween(T value, T start, T end) { ++ return value.compareTo(start) >= 0 && value.compareTo(end) <= 0; + } + + public static String toString(LocalDateTime ldt) { +Index: src/main/java/ru/javawebinar/topjava/web/MealServlet.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/web/MealServlet.java (date 1465849306000) ++++ src/main/java/ru/javawebinar/topjava/web/MealServlet.java (date 1465940521000) +@@ -1,10 +1,11 @@ + package ru.javawebinar.topjava.web; + ++import ru.javawebinar.topjava.LoggedUser; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + import ru.javawebinar.topjava.model.UserMeal; +-import ru.javawebinar.topjava.repository.mock.InMemoryUserMealRepositoryImpl; + import ru.javawebinar.topjava.repository.UserMealRepository; ++import ru.javawebinar.topjava.repository.mock.InMemoryUserMealRepositoryImpl; + import ru.javawebinar.topjava.util.UserMealsUtil; + + import javax.servlet.ServletConfig; +@@ -39,7 +40,7 @@ + request.getParameter("description"), + Integer.valueOf(request.getParameter("calories"))); + LOG.info(userMeal.isNew() ? "Create {}" : "Update {}", userMeal); +- repository.save(userMeal); ++ repository.save(userMeal, LoggedUser.id()); + response.sendRedirect("meals"); + } + +@@ -49,17 +50,17 @@ + if (action == null) { + LOG.info("getAll"); + request.setAttribute("mealList", +- UserMealsUtil.getWithExceeded(repository.getAll(), UserMealsUtil.DEFAULT_CALORIES_PER_DAY)); ++ UserMealsUtil.getWithExceeded(repository.getAll(LoggedUser.id()), UserMealsUtil.DEFAULT_CALORIES_PER_DAY)); + request.getRequestDispatcher("/mealList.jsp").forward(request, response); + } else if (action.equals("delete")) { + int id = getId(request); + LOG.info("Delete {}", id); +- repository.delete(id); ++ repository.delete(id, LoggedUser.id()); + response.sendRedirect("meals"); + } else if (action.equals("create") || action.equals("update")) { + final UserMeal meal = action.equals("create") ? + new UserMeal(LocalDateTime.now().withNano(0).withSecond(0), "", 1000) : +- repository.get(getId(request)); ++ repository.get(getId(request), LoggedUser.id()); + request.setAttribute("meal", meal); + request.getRequestDispatcher("mealEdit.jsp").forward(request, response); + } diff --git a/patchs/to_lesson03/3_02_HW2_meal_layers.patch b/patchs/to_lesson03/3_02_HW2_meal_layers.patch new file mode 100644 index 000000000000..2baa6d25770a --- /dev/null +++ b/patchs/to_lesson03/3_02_HW2_meal_layers.patch @@ -0,0 +1,335 @@ +Index: src/main/java/ru/javawebinar/topjava/model/UserMeal.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/model/UserMeal.java (date 1465849318000) ++++ src/main/java/ru/javawebinar/topjava/model/UserMeal.java (revision ) +@@ -6,8 +6,7 @@ + * GKislin + * 11.01.2015. + */ +-public class UserMeal { +- private Integer id; ++public class UserMeal extends BaseEntity { + + private final LocalDateTime dateTime; + +@@ -20,16 +19,12 @@ + } + + public UserMeal(Integer id, LocalDateTime dateTime, String description, int calories) { +- this.id = id; ++ super(id); + this.dateTime = dateTime; + this.description = description; + this.calories = calories; + } + +- public void setId(int id) { +- this.id = id; +- } +- + public LocalDateTime getDateTime() { + return dateTime; + } +@@ -40,14 +35,6 @@ + + public int getCalories() { + return calories; +- } +- +- public Integer getId() { +- return id; +- } +- +- public boolean isNew() { +- return id == null; + } + + @Override +Index: src/main/java/ru/javawebinar/topjava/model/UserMealWithExceed.java +=================================================================== +--- src/main/java/ru/javawebinar/topjava/model/UserMealWithExceed.java (date 1465849318000) ++++ src/main/java/ru/javawebinar/topjava/to/UserMealWithExceed.java (revision ) +@@ -1,4 +1,4 @@ +-package ru.javawebinar.topjava.model; ++package ru.javawebinar.topjava.to; + + import java.time.LocalDateTime; + +Index: src/main/java/ru/javawebinar/topjava/util/TimeUtil.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/util/TimeUtil.java (date 1465849318000) ++++ src/main/java/ru/javawebinar/topjava/util/TimeUtil.java (revision ) +@@ -1,5 +1,6 @@ + package ru.javawebinar.topjava.util; + ++import java.time.LocalDate; + import java.time.LocalDateTime; + import java.time.format.DateTimeFormatter; + +@@ -9,6 +10,9 @@ + */ + public class TimeUtil { + private static final DateTimeFormatter DATE_TME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); ++ ++ public static final LocalDate MIN_DATE = LocalDate.of(1, 1, 1); ++ public static final LocalDate MAX_DATE = LocalDate.of(3000, 1, 1); + + public static > boolean isBetween(T value, T start, T end) { + return value.compareTo(start) >= 0 && value.compareTo(end) <= 0; +Index: src/main/java/ru/javawebinar/topjava/util/UserMealsUtil.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/util/UserMealsUtil.java (date 1465849318000) ++++ src/main/java/ru/javawebinar/topjava/util/UserMealsUtil.java (revision ) +@@ -1,7 +1,7 @@ + package ru.javawebinar.topjava.util; + + import ru.javawebinar.topjava.model.UserMeal; +-import ru.javawebinar.topjava.model.UserMealWithExceed; ++import ru.javawebinar.topjava.to.UserMealWithExceed; + + import java.time.LocalDate; + import java.time.LocalDateTime; +\ No newline at end of file +Index: src/main/java/ru/javawebinar/topjava/service/UserMealServiceImpl.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/service/UserMealServiceImpl.java (date 1465849318000) ++++ src/main/java/ru/javawebinar/topjava/service/UserMealServiceImpl.java (revision ) +@@ -1,13 +1,51 @@ + package ru.javawebinar.topjava.service; + ++import org.springframework.beans.factory.annotation.Autowired; ++import org.springframework.stereotype.Service; ++import ru.javawebinar.topjava.model.UserMeal; + import ru.javawebinar.topjava.repository.UserMealRepository; ++import ru.javawebinar.topjava.util.exception.ExceptionUtil; + ++import java.time.LocalDateTime; ++import java.util.Collection; ++ + /** + * GKislin + * 06.03.2015. + */ ++@Service + public class UserMealServiceImpl implements UserMealService { + ++ @Autowired + private UserMealRepository repository; + ++ @Override ++ public UserMeal get(int id, int userId) { ++ return ExceptionUtil.checkNotFoundWithId(repository.get(id, userId), id); ++ } ++ ++ @Override ++ public void delete(int id, int userId) { ++ ExceptionUtil.checkNotFoundWithId(repository.delete(id, userId), id); ++ } ++ ++ @Override ++ public Collection getBetweenDateTimes(LocalDateTime startDateTime, LocalDateTime endDateTime, int userId) { ++ return repository.getBetween(startDateTime, endDateTime, userId); ++ } ++ ++ @Override ++ public Collection getAll(int userId) { ++ return repository.getAll(userId); ++ } ++ ++ @Override ++ public UserMeal update(UserMeal meal, int userId) { ++ return ExceptionUtil.checkNotFoundWithId(repository.save(meal, userId), meal.getId()); ++ } ++ ++ @Override ++ public UserMeal save(UserMeal meal, int userId) { ++ return repository.save(meal, userId); ++ } + } +Index: src/main/java/ru/javawebinar/topjava/SpringMain.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/SpringMain.java (date 1465849318000) ++++ src/main/java/ru/javawebinar/topjava/SpringMain.java (revision ) +@@ -4,9 +4,15 @@ + import org.springframework.context.support.ClassPathXmlApplicationContext; + import ru.javawebinar.topjava.model.Role; + import ru.javawebinar.topjava.model.User; ++import ru.javawebinar.topjava.to.UserMealWithExceed; ++import ru.javawebinar.topjava.web.meal.UserMealRestController; + import ru.javawebinar.topjava.web.user.AdminRestController; + ++import java.time.LocalDate; ++import java.time.LocalTime; ++import java.time.Month; + import java.util.Arrays; ++import java.util.List; + + /** + * User: gkislin +@@ -19,6 +25,14 @@ + System.out.println(Arrays.toString(appCtx.getBeanDefinitionNames())); + AdminRestController adminUserController = appCtx.getBean(AdminRestController.class); + System.out.println(adminUserController.create(new User(1, "userName", "email", "password", Role.ROLE_ADMIN))); ++ System.out.println(); ++ ++ UserMealRestController mealController = appCtx.getBean(UserMealRestController.class); ++ List filteredMealsWithExceeded = ++ mealController.getBetween( ++ LocalDate.of(2015, Month.MAY, 30), LocalTime.of(7, 0), ++ LocalDate.of(2015, Month.MAY, 31), LocalTime.of(11, 0)); ++ filteredMealsWithExceeded.forEach(System.out::println); + } + } + } +Index: src/main/java/ru/javawebinar/topjava/service/UserMealService.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/service/UserMealService.java (date 1465849318000) ++++ src/main/java/ru/javawebinar/topjava/service/UserMealService.java (revision ) +@@ -1,8 +1,31 @@ + package ru.javawebinar.topjava.service; + ++import ru.javawebinar.topjava.model.UserMeal; ++import ru.javawebinar.topjava.util.exception.NotFoundException; ++ ++import java.time.LocalDate; ++import java.time.LocalDateTime; ++import java.time.LocalTime; ++import java.util.Collection; ++ + /** + * GKislin + * 15.06.2015. + */ + public interface UserMealService { ++ UserMeal get(int id, int userId) throws NotFoundException; ++ ++ void delete(int id, int userId) throws NotFoundException; ++ ++ default Collection getBetweenDates(LocalDate startDate, LocalDate endDate, int userId) { ++ return getBetweenDateTimes(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), userId); ++ } ++ ++ Collection getBetweenDateTimes(LocalDateTime startDateTime, LocalDateTime endDateTime, int userId); ++ ++ Collection getAll(int userId); ++ ++ UserMeal update(UserMeal meal, int userId) throws NotFoundException; ++ ++ UserMeal save(UserMeal meal, int userId); + } +Index: src/main/java/ru/javawebinar/topjava/web/meal/UserMealRestController.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/web/meal/UserMealRestController.java (date 1465849318000) ++++ src/main/java/ru/javawebinar/topjava/web/meal/UserMealRestController.java (revision ) +@@ -1,12 +1,71 @@ + package ru.javawebinar.topjava.web.meal; + ++import org.slf4j.Logger; ++import org.slf4j.LoggerFactory; ++import org.springframework.beans.factory.annotation.Autowired; ++import org.springframework.stereotype.Controller; ++import ru.javawebinar.topjava.LoggedUser; ++import ru.javawebinar.topjava.model.UserMeal; + import ru.javawebinar.topjava.service.UserMealService; ++import ru.javawebinar.topjava.to.UserMealWithExceed; ++import ru.javawebinar.topjava.util.TimeUtil; ++import ru.javawebinar.topjava.util.UserMealsUtil; + ++import java.time.LocalDate; ++import java.time.LocalTime; ++import java.util.List; ++ + /** + * GKislin + * 06.03.2015. + */ ++@Controller + public class UserMealRestController { ++ private static final Logger LOG = LoggerFactory.getLogger(UserMealRestController.class); ++ ++ @Autowired + private UserMealService service; + ++ public UserMeal get(int id) { ++ int userId = LoggedUser.id(); ++ LOG.info("get meal {} for User {}", id, userId); ++ return service.get(id, userId); ++ } ++ ++ public void delete(int id) { ++ int userId = LoggedUser.id(); ++ LOG.info("delete meal {} for User {}", id, userId); ++ service.delete(id, userId); ++ } ++ ++ public List getAll() { ++ int userId = LoggedUser.id(); ++ LOG.info("getAll for User {}", userId); ++ return UserMealsUtil.getWithExceeded(service.getAll(userId), LoggedUser.getCaloriesPerDay()); ++ } ++ ++ public void update(UserMeal meal, int id) { ++ meal.setId(id); ++ int userId = LoggedUser.id(); ++ LOG.info("update {} for User {}", meal, userId); ++ service.update(meal, userId); ++ } ++ ++ public UserMeal create(UserMeal meal) { ++ meal.setId(null); ++ int userId = LoggedUser.id(); ++ LOG.info("create {} for User {}", meal, userId); ++ return service.save(meal, userId); ++ } ++ ++ public List getBetween(LocalDate startDate, LocalTime startTime, LocalDate endDate, LocalTime endTime) { ++ int userId = LoggedUser.id(); ++ LOG.info("getBetween dates {} - {} for time {} - {} for User {}", startDate, endDate, startTime, endTime, userId); ++ ++ return UserMealsUtil.getFilteredWithExceeded( ++ service.getBetweenDates( ++ startDate != null ? startDate : TimeUtil.MIN_DATE, endDate != null ? endDate : TimeUtil.MAX_DATE, userId), ++ startTime != null ? startTime : LocalTime.MIN, endTime != null ? endTime : LocalTime.MAX, LoggedUser.getCaloriesPerDay() ++ ); ++ } +-} ++} +\ No newline at end of file +Index: src/main/webapp/mealList.jsp +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/webapp/mealList.jsp (date 1465849318000) ++++ src/main/webapp/mealList.jsp (revision ) +@@ -32,7 +32,7 @@ + + + +- ++ + + + <%--${meal.dateTime.toLocalDate()} ${meal.dateTime.toLocalTime()}--%> +\ No newline at end of file diff --git a/patchs/to_lesson03/3_03_HW2_optional_MealServlet.patch b/patchs/to_lesson03/3_03_HW2_optional_MealServlet.patch new file mode 100644 index 000000000000..58d5b809e9dc --- /dev/null +++ b/patchs/to_lesson03/3_03_HW2_optional_MealServlet.patch @@ -0,0 +1,90 @@ +Index: src/main/java/ru/javawebinar/topjava/web/MealServlet.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/web/MealServlet.java (date 1465849675000) ++++ src/main/java/ru/javawebinar/topjava/web/MealServlet.java (revision ) +@@ -1,12 +1,11 @@ + package ru.javawebinar.topjava.web; + +-import ru.javawebinar.topjava.LoggedUser; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; ++import org.springframework.context.ConfigurableApplicationContext; ++import org.springframework.context.support.ClassPathXmlApplicationContext; + import ru.javawebinar.topjava.model.UserMeal; +-import ru.javawebinar.topjava.repository.UserMealRepository; +-import ru.javawebinar.topjava.repository.mock.InMemoryUserMealRepositoryImpl; +-import ru.javawebinar.topjava.util.UserMealsUtil; ++import ru.javawebinar.topjava.web.meal.UserMealRestController; + + import javax.servlet.ServletConfig; + import javax.servlet.ServletException; +@@ -24,23 +23,37 @@ + public class MealServlet extends HttpServlet { + private static final Logger LOG = LoggerFactory.getLogger(MealServlet.class); + +- private UserMealRepository repository; ++ private ConfigurableApplicationContext springContext; ++ private UserMealRestController mealController; + + @Override + public void init(ServletConfig config) throws ServletException { + super.init(config); +- repository = new InMemoryUserMealRepositoryImpl(); ++ springContext = new ClassPathXmlApplicationContext("spring/spring-app.xml"); ++ mealController = springContext.getBean(UserMealRestController.class); + } + ++ @Override ++ public void destroy() { ++ springContext.close(); ++ super.destroy(); ++ } ++ + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + request.setCharacterEncoding("UTF-8"); +- String id = request.getParameter("id"); +- UserMeal userMeal = new UserMeal(id.isEmpty() ? null : Integer.valueOf(id), ++ ++ final UserMeal userMeal = new UserMeal( + LocalDateTime.parse(request.getParameter("dateTime")), + request.getParameter("description"), + Integer.valueOf(request.getParameter("calories"))); +- LOG.info(userMeal.isNew() ? "Create {}" : "Update {}", userMeal); +- repository.save(userMeal, LoggedUser.id()); ++ ++ if (request.getParameter("id").isEmpty()) { ++ LOG.info("Create {}", userMeal); ++ mealController.create(userMeal); ++ } else { ++ LOG.info("Update {}", userMeal); ++ mealController.update(userMeal, getId(request)); ++ } + response.sendRedirect("meals"); + } + +@@ -49,18 +62,17 @@ + + if (action == null) { + LOG.info("getAll"); +- request.setAttribute("mealList", +- UserMealsUtil.getWithExceeded(repository.getAll(LoggedUser.id()), UserMealsUtil.DEFAULT_CALORIES_PER_DAY)); +- request.getRequestDispatcher("/mealList.jsp").forward(request, response); ++ request.setAttribute("mealList", mealController.getAll()); ++ request.getRequestDispatcher("mealList.jsp").forward(request, response); + } else if (action.equals("delete")) { + int id = getId(request); + LOG.info("Delete {}", id); +- repository.delete(id, LoggedUser.id()); ++ mealController.delete(id); + response.sendRedirect("meals"); + } else if (action.equals("create") || action.equals("update")) { + final UserMeal meal = action.equals("create") ? + new UserMeal(LocalDateTime.now().withNano(0).withSecond(0), "", 1000) : +- repository.get(getId(request), LoggedUser.id()); ++ mealController.get(getId(request)); // update + request.setAttribute("meal", meal); + request.getRequestDispatcher("mealEdit.jsp").forward(request, response); + } diff --git a/patchs/to_lesson03/3_04_HW2_optional_filter.patch b/patchs/to_lesson03/3_04_HW2_optional_filter.patch new file mode 100644 index 000000000000..d6b29083bd7a --- /dev/null +++ b/patchs/to_lesson03/3_04_HW2_optional_filter.patch @@ -0,0 +1,231 @@ +Index: src/main/webapp/css/style.css +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/webapp/css/style.css (revision ) ++++ src/main/webapp/css/style.css (revision ) +@@ -0,0 +1,24 @@ ++dl { ++ background: none repeat scroll 0 0 #FAFAFA; ++ margin: 8px 0; ++ padding: 0; ++} ++ ++dt { ++ display: inline-block; ++ width: 170px; ++} ++ ++dd { ++ display: inline-block; ++ margin-left: 8px; ++ vertical-align: top; ++} ++ ++.normal { ++ color: green; ++} ++ ++.exceeded { ++ color: red; ++} +Index: src/main/webapp/mealEdit.jsp +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/webapp/mealEdit.jsp (date 1465850101000) ++++ src/main/webapp/mealEdit.jsp (revision ) +@@ -4,24 +4,7 @@ + + + Meal +- ++ + + +

+Index: src/main/java/ru/javawebinar/topjava/web/MealServlet.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/web/MealServlet.java (date 1465850101000) ++++ src/main/java/ru/javawebinar/topjava/web/MealServlet.java (revision ) +@@ -5,6 +5,7 @@ + import org.springframework.context.ConfigurableApplicationContext; + import org.springframework.context.support.ClassPathXmlApplicationContext; + import ru.javawebinar.topjava.model.UserMeal; ++import ru.javawebinar.topjava.util.TimeUtil; + import ru.javawebinar.topjava.web.meal.UserMealRestController; + + import javax.servlet.ServletConfig; +@@ -13,7 +14,9 @@ + import javax.servlet.http.HttpServletRequest; + import javax.servlet.http.HttpServletResponse; + import java.io.IOException; ++import java.time.LocalDate; + import java.time.LocalDateTime; ++import java.time.LocalTime; + import java.util.Objects; + + /** +@@ -41,21 +44,31 @@ + + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + request.setCharacterEncoding("UTF-8"); +- ++ String action = request.getParameter("action"); ++ if (action == null) { +- final UserMeal userMeal = new UserMeal( +- LocalDateTime.parse(request.getParameter("dateTime")), +- request.getParameter("description"), +- Integer.valueOf(request.getParameter("calories"))); ++ final UserMeal userMeal = new UserMeal( ++ LocalDateTime.parse(request.getParameter("dateTime")), ++ request.getParameter("description"), ++ Integer.valueOf(request.getParameter("calories"))); + +- if (request.getParameter("id").isEmpty()) { +- LOG.info("Create {}", userMeal); +- mealController.create(userMeal); +- } else { +- LOG.info("Update {}", userMeal); +- mealController.update(userMeal, getId(request)); +- } +- response.sendRedirect("meals"); ++ if (request.getParameter("id").isEmpty()) { ++ LOG.info("Create {}", userMeal); ++ mealController.create(userMeal); ++ } else { ++ LOG.info("Update {}", userMeal); ++ mealController.update(userMeal, getId(request)); ++ } ++ response.sendRedirect("meals"); ++ ++ } else if (action.equals("filter")) { ++ LocalDate startDate = TimeUtil.parseLocalDate(resetParam("startDate", request)); ++ LocalDate endDate = TimeUtil.parseLocalDate(resetParam("endDate", request)); ++ LocalTime startTime = TimeUtil.parseLocalTime(resetParam("startTime", request)); ++ LocalTime endTime = TimeUtil.parseLocalTime(resetParam("endTime", request)); ++ request.setAttribute("mealList", mealController.getBetween(startDate, startTime, endDate, endTime)); ++ request.getRequestDispatcher("/mealList.jsp").forward(request, response); +- } ++ } ++ } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + String action = request.getParameter("action"); +@@ -76,6 +89,12 @@ + request.setAttribute("meal", meal); + request.getRequestDispatcher("mealEdit.jsp").forward(request, response); + } ++ } ++ ++ private String resetParam(String param, HttpServletRequest request) { ++ String value = request.getParameter(param); ++ request.setAttribute(param, value); ++ return value; + } + + private int getId(HttpServletRequest request) { +Index: src/main/java/ru/javawebinar/topjava/util/TimeUtil.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/util/TimeUtil.java (date 1465850101000) ++++ src/main/java/ru/javawebinar/topjava/util/TimeUtil.java (revision ) +@@ -1,7 +1,10 @@ + package ru.javawebinar.topjava.util; + ++import org.springframework.util.StringUtils; ++ + import java.time.LocalDate; + import java.time.LocalDateTime; ++import java.time.LocalTime; + import java.time.format.DateTimeFormatter; + + /** +@@ -20,5 +23,13 @@ + + public static String toString(LocalDateTime ldt) { + return ldt == null ? "" : ldt.format(DATE_TME_FORMATTER); ++ } ++ ++ public static LocalDate parseLocalDate(String str) { ++ return StringUtils.isEmpty(str) ? null : LocalDate.parse(str); ++ } ++ ++ public static LocalTime parseLocalTime(String str) { ++ return StringUtils.isEmpty(str) ? null : LocalTime.parse(str); + } + } +Index: src/main/webapp/mealList.jsp +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/webapp/mealList.jsp (date 1465850101000) ++++ src/main/webapp/mealList.jsp (revision ) +@@ -5,20 +5,32 @@ + + + Meal list +- ++ + + +

Home

Meal list

++ ++

+ Add Meal +

+ +\ No newline at end of file diff --git a/patchs/to_lesson03/3_05_HW2_optional_select_user.patch b/patchs/to_lesson03/3_05_HW2_optional_select_user.patch new file mode 100644 index 000000000000..35694e33bd88 --- /dev/null +++ b/patchs/to_lesson03/3_05_HW2_optional_select_user.patch @@ -0,0 +1,81 @@ +Index: src/main/java/ru/javawebinar/topjava/LoggedUser.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/LoggedUser.java (date 1465850476000) ++++ src/main/java/ru/javawebinar/topjava/LoggedUser.java (revision ) +@@ -7,9 +7,14 @@ + * 06.03.2015. + */ + public class LoggedUser { ++ public static int id = 1; + + public static int id() { +- return 1; ++ return id; ++ } ++ ++ public static void setId(int id) { ++ LoggedUser.id = id; + } + + public static int getCaloriesPerDay() { +Index: src/main/webapp/index.html +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/webapp/index.html (date 1465850476000) ++++ src/main/webapp/index.html (revision ) +@@ -7,9 +7,13 @@ + +

Проект "Java Enterprise (Topjava)"

User List
Meal List

++ ++ Meal list of ++ ++ ++ + + +Index: src/main/java/ru/javawebinar/topjava/web/UserServlet.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/web/UserServlet.java (date 1465850476000) ++++ src/main/java/ru/javawebinar/topjava/web/UserServlet.java (revision ) +@@ -1,7 +1,7 @@ + package ru.javawebinar.topjava.web; + + import org.slf4j.Logger; +-import org.slf4j.LoggerFactory; ++import ru.javawebinar.topjava.LoggedUser; + + import javax.servlet.ServletException; + import javax.servlet.http.HttpServlet; +@@ -18,10 +18,14 @@ + public class UserServlet extends HttpServlet { + private static final Logger LOG = getLogger(UserServlet.class); + ++ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { ++ int userId = Integer.valueOf(request.getParameter("userId")); ++ LoggedUser.setId(userId); ++ response.sendRedirect("meals"); ++ } ++ + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + LOG.debug("redirect to userList"); +- +-// request.getRequestDispatcher("/userList.jsp").forward(request, response); + response.sendRedirect("userList.jsp"); + } + } diff --git a/patchs/to_lesson03/3_06_bean_life_cycle.patch b/patchs/to_lesson03/3_06_bean_life_cycle.patch new file mode 100644 index 000000000000..2d2d799f8201 --- /dev/null +++ b/patchs/to_lesson03/3_06_bean_life_cycle.patch @@ -0,0 +1,47 @@ +Index: src/main/java/ru/javawebinar/topjava/repository/mock/InMemoryUserRepositoryImpl.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/repository/mock/InMemoryUserRepositoryImpl.java (date 1465940660000) ++++ src/main/java/ru/javawebinar/topjava/repository/mock/InMemoryUserRepositoryImpl.java (revision ) +@@ -1,9 +1,13 @@ + package ru.javawebinar.topjava.repository.mock; + ++import org.slf4j.Logger; ++import org.slf4j.LoggerFactory; + import org.springframework.stereotype.Repository; + import ru.javawebinar.topjava.model.User; + import ru.javawebinar.topjava.repository.UserRepository; + ++import javax.annotation.PostConstruct; ++import javax.annotation.PreDestroy; + import java.util.Comparator; + import java.util.List; + import java.util.Map; +@@ -18,6 +22,8 @@ + */ + @Repository + public class InMemoryUserRepositoryImpl implements UserRepository { ++ private static final Logger LOG = LoggerFactory.getLogger(InMemoryUserRepositoryImpl.class); ++ + private Map repository = new ConcurrentHashMap<>(); + private AtomicInteger counter = new AtomicInteger(0); + +@@ -34,6 +40,16 @@ + } + repository.put(user.getId(), user); + return user; ++ } ++ ++ @PostConstruct ++ public void postConstruct() { ++ LOG.info("+++ PostConstruct"); ++ } ++ ++ @PreDestroy ++ public void preDestroy() { ++ LOG.info("+++ PreDestroy"); + } + + @Override diff --git a/patchs/to_lesson03/3_07_add_junit.patch b/patchs/to_lesson03/3_07_add_junit.patch new file mode 100644 index 000000000000..64cb2f39b256 --- /dev/null +++ b/patchs/to_lesson03/3_07_add_junit.patch @@ -0,0 +1,171 @@ +Index: src/main/java/ru/javawebinar/topjava/repository/mock/InMemoryUserMealRepositoryImpl.java +=================================================================== +--- src/main/java/ru/javawebinar/topjava/repository/mock/InMemoryUserMealRepositoryImpl.java (date 1465996980000) ++++ src/test/java/ru/javawebinar/topjava/repository/mock/InMemoryUserMealRepositoryImpl.java (revision ) +@@ -13,8 +13,8 @@ + import java.util.concurrent.atomic.AtomicInteger; + import java.util.stream.Collectors; + +-import static ru.javawebinar.topjava.repository.mock.InMemoryUserRepositoryImpl.ADMIN_ID; +-import static ru.javawebinar.topjava.repository.mock.InMemoryUserRepositoryImpl.USER_ID; ++import static ru.javawebinar.topjava.UserTestData.ADMIN_ID; ++import static ru.javawebinar.topjava.UserTestData.USER_ID; + + /** + * GKislin +Index: src/main/java/ru/javawebinar/topjava/repository/mock/InMemoryUserRepositoryImpl.java +=================================================================== +--- src/main/java/ru/javawebinar/topjava/repository/mock/InMemoryUserRepositoryImpl.java (date 1465996980000) ++++ src/test/java/ru/javawebinar/topjava/repository/mock/InMemoryUserRepositoryImpl.java (revision ) +@@ -29,9 +29,6 @@ + + private static final Comparator USER_COMPARATOR = Comparator.comparing(User::getName); + +- public static final int USER_ID = 1; +- public static final int ADMIN_ID = 2; +- + @Override + public User save(User user) { + Objects.requireNonNull(user); +Index: src/test/java/ru/javawebinar/topjava/web/InMemoryAdminRestControllerTest.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/test/java/ru/javawebinar/topjava/web/InMemoryAdminRestControllerTest.java (revision ) ++++ src/test/java/ru/javawebinar/topjava/web/InMemoryAdminRestControllerTest.java (revision ) +@@ -0,0 +1,55 @@ ++package ru.javawebinar.topjava.web; ++ ++import org.junit.*; ++import org.springframework.context.ConfigurableApplicationContext; ++import org.springframework.context.support.ClassPathXmlApplicationContext; ++import ru.javawebinar.topjava.UserTestData; ++import ru.javawebinar.topjava.model.User; ++import ru.javawebinar.topjava.repository.UserRepository; ++import ru.javawebinar.topjava.util.exception.NotFoundException; ++import ru.javawebinar.topjava.web.user.AdminRestController; ++ ++import java.util.Arrays; ++import java.util.Collection; ++ ++import static ru.javawebinar.topjava.UserTestData.ADMIN; ++import static ru.javawebinar.topjava.UserTestData.USER; ++ ++public class InMemoryAdminRestControllerTest { ++ private static ConfigurableApplicationContext appCtx; ++ private static AdminRestController controller; ++ ++ @BeforeClass ++ public static void beforeClass() { ++ appCtx = new ClassPathXmlApplicationContext("spring/spring-app.xml"); ++ System.out.println("\n" + Arrays.toString(appCtx.getBeanDefinitionNames()) + "\n"); ++ controller = appCtx.getBean(AdminRestController.class); ++ } ++ ++ @AfterClass ++ public static void afterClass() { ++ appCtx.close(); ++ } ++ ++ @Before ++ public void setUp() throws Exception { ++ // Re-initialize ++ UserRepository repository = appCtx.getBean(UserRepository.class); ++ repository.getAll().forEach(u -> repository.delete(u.getId())); ++ repository.save(USER); ++ repository.save(ADMIN); ++ } ++ ++ @Test ++ public void testDelete() throws Exception { ++ controller.delete(UserTestData.USER_ID); ++ Collection users = controller.getAll(); ++ Assert.assertEquals(users.size(), 1); ++ Assert.assertEquals(users.iterator().next(), ADMIN); ++ } ++ ++ @Test(expected = NotFoundException.class) ++ public void testDeleteNotFound() throws Exception { ++ controller.delete(10); ++ } ++} +\ No newline at end of file +Index: src/test/java/ru/javawebinar/topjava/UserTestData.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/test/java/ru/javawebinar/topjava/UserTestData.java (revision ) ++++ src/test/java/ru/javawebinar/topjava/UserTestData.java (revision ) +@@ -0,0 +1,16 @@ ++package ru.javawebinar.topjava; ++ ++import ru.javawebinar.topjava.model.Role; ++import ru.javawebinar.topjava.model.User; ++ ++/** ++ * GKislin ++ * 24.09.2015. ++ */ ++public class UserTestData { ++ public static final int USER_ID = 1; ++ public static final int ADMIN_ID = 2; ++ ++ public static final User USER = new User(USER_ID, "User", "user@yandex.ru", "password", Role.ROLE_USER); ++ public static final User ADMIN = new User(ADMIN_ID, "Admin", "admin@gmail.com", "admin", Role.ROLE_ADMIN); ++} +Index: pom.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- pom.xml (date 1465996980000) ++++ pom.xml (revision ) +@@ -21,6 +21,9 @@ + + 1.1.7 + 1.7.21 ++ ++ ++ 4.12 + + + +@@ -80,6 +83,14 @@ + commons-logging + + ++ ++ ++ ++ ++ junit ++ junit ++ ${junit.version} ++ test + + + javax.servlet +Index: src/main/java/ru/javawebinar/topjava/SpringMain.java +=================================================================== +--- src/main/java/ru/javawebinar/topjava/SpringMain.java (date 1465996980000) ++++ src/test/java/ru/javawebinar/topjava/SpringMain.java (revision ) +@@ -2,8 +2,6 @@ + + import org.springframework.context.ConfigurableApplicationContext; + import org.springframework.context.support.ClassPathXmlApplicationContext; +-import ru.javawebinar.topjava.model.Role; +-import ru.javawebinar.topjava.model.User; + import ru.javawebinar.topjava.to.UserMealWithExceed; + import ru.javawebinar.topjava.web.meal.UserMealRestController; + import ru.javawebinar.topjava.web.user.AdminRestController; +@@ -24,7 +22,7 @@ + try (ConfigurableApplicationContext appCtx = new ClassPathXmlApplicationContext("spring/spring-app.xml")) { + System.out.println(Arrays.toString(appCtx.getBeanDefinitionNames())); + AdminRestController adminUserController = appCtx.getBean(AdminRestController.class); +- System.out.println(adminUserController.create(new User(1, "userName", "email", "password", Role.ROLE_ADMIN))); ++ System.out.println(adminUserController.create(UserTestData.USER)); + System.out.println(); + + UserMealRestController mealController = appCtx.getBean(UserMealRestController.class); diff --git a/patchs/to_lesson03/3_08_add_spring_test.patch b/patchs/to_lesson03/3_08_add_spring_test.patch new file mode 100644 index 000000000000..04f5a20acd31 --- /dev/null +++ b/patchs/to_lesson03/3_08_add_spring_test.patch @@ -0,0 +1,83 @@ +Index: src/test/java/ru/javawebinar/topjava/web/InMemoryAdminRestControllerSpringTest.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/test/java/ru/javawebinar/topjava/web/InMemoryAdminRestControllerSpringTest.java (revision ) ++++ src/test/java/ru/javawebinar/topjava/web/InMemoryAdminRestControllerSpringTest.java (revision ) +@@ -0,0 +1,54 @@ ++package ru.javawebinar.topjava.web; ++ ++import org.junit.Assert; ++import org.junit.Before; ++import org.junit.Test; ++import org.junit.runner.RunWith; ++import org.springframework.beans.factory.annotation.Autowired; ++import org.springframework.test.context.ContextConfiguration; ++import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; ++import ru.javawebinar.topjava.UserTestData; ++import ru.javawebinar.topjava.model.User; ++import ru.javawebinar.topjava.repository.UserRepository; ++import ru.javawebinar.topjava.util.exception.NotFoundException; ++import ru.javawebinar.topjava.web.user.AdminRestController; ++ ++import java.util.Collection; ++ ++import static ru.javawebinar.topjava.UserTestData.ADMIN; ++import static ru.javawebinar.topjava.UserTestData.USER; ++ ++/** ++ * GKislin ++ * 13.03.2015. ++ */ ++@ContextConfiguration("classpath:spring/spring-app.xml") ++@RunWith(SpringJUnit4ClassRunner.class) ++public class InMemoryAdminRestControllerSpringTest { ++ ++ @Autowired ++ private AdminRestController controller; ++ ++ @Autowired ++ private UserRepository repository; ++ ++ @Before ++ public void setUp() throws Exception { ++ repository.getAll().forEach(u -> repository.delete(u.getId())); ++ repository.save(USER); ++ repository.save(ADMIN); ++ } ++ ++ @Test ++ public void testDelete() throws Exception { ++ controller.delete(UserTestData.USER_ID); ++ Collection users = controller.getAll(); ++ Assert.assertEquals(users.size(), 1); ++ Assert.assertEquals(users.iterator().next(), ADMIN); ++ } ++ ++ @Test(expected = NotFoundException.class) ++ public void testDeleteNotFound() throws Exception { ++ controller.delete(10); ++ } ++} +Index: pom.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- pom.xml (date 1465997509000) ++++ pom.xml (revision ) +@@ -104,6 +104,13 @@ + 2.5 + provided + ++ ++ org.springframework ++ spring-test ++ ${spring.version} ++ test ++ ++ + + + diff --git a/patchs/to_lesson03/3_09_add_postgresql.patch b/patchs/to_lesson03/3_09_add_postgresql.patch new file mode 100644 index 000000000000..0a6c919f7eb1 --- /dev/null +++ b/patchs/to_lesson03/3_09_add_postgresql.patch @@ -0,0 +1,45 @@ +Index: src/main/resources/db/postgres.properties +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>NATIVE_TO_ASCII_UTF-8 +=================================================================== +--- src/main/resources/db/postgres.properties (revision ) ++++ src/main/resources/db/postgres.properties (revision ) +@@ -0,0 +1,7 @@ ++#database.url=jdbc:postgresql://ec2-54-217-202-110.eu-west-1.compute.amazonaws.com:5432/dehm6lvm8bink0?ssl=true&sslfactory=org.postgresql.ssl.NonValidatingFactory ++#database.username=wegxlfzjjgxaxy ++#database.password=SSQyKKE_e93kiUCR-ehzMcKCxZ ++ ++database.url=jdbc:postgresql://localhost:5432/topjava ++database.username=user ++database.password=password +Index: pom.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- pom.xml (date 1465997620000) ++++ pom.xml (revision ) +@@ -22,6 +22,8 @@ + 1.1.7 + 1.7.21 + ++ ++ 9.4.1208 + + 4.12 + +@@ -83,6 +85,13 @@ + commons-logging + + ++ ++ ++ ++ ++ org.postgresql ++ postgresql ++ ${postgresql.version} + + + diff --git a/patchs/to_lesson03/3_0_correction.patch b/patchs/to_lesson03/3_0_correction.patch new file mode 100644 index 000000000000..278b0ac75460 --- /dev/null +++ b/patchs/to_lesson03/3_0_correction.patch @@ -0,0 +1,18 @@ +Index: src/main/webapp/mealEdit.jsp +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/webapp/mealEdit.jsp (date 1465332464000) ++++ src/main/webapp/mealEdit.jsp (revision ) +@@ -25,8 +25,8 @@ + + +

Home

Edit meal

Home

${param.action == 'create' ? 'Create meal' : 'Edit meal'}

+ + diff --git a/patchs/to_lesson03/3_10_populate_and_init_db.patch b/patchs/to_lesson03/3_10_populate_and_init_db.patch new file mode 100644 index 000000000000..0239545d20c9 --- /dev/null +++ b/patchs/to_lesson03/3_10_populate_and_init_db.patch @@ -0,0 +1,54 @@ +Index: src/main/resources/db/populateDB.sql +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/resources/db/populateDB.sql (revision ) ++++ src/main/resources/db/populateDB.sql (revision ) +@@ -0,0 +1,13 @@ ++DELETE FROM user_roles; ++DELETE FROM users; ++ALTER SEQUENCE global_seq RESTART WITH 100000; ++ ++INSERT INTO users (name, email, password) ++VALUES ('User', 'user@yandex.ru', 'password'); ++ ++INSERT INTO users (name, email, password) ++VALUES ('Admin', 'admin@gmail.com', 'admin'); ++ ++INSERT INTO user_roles (role, user_id) VALUES ++ ('ROLE_USER', 100000), ++ ('ROLE_ADMIN', 100001); +Index: src/main/resources/db/initDB.sql +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/resources/db/initDB.sql (revision ) ++++ src/main/resources/db/initDB.sql (revision ) +@@ -0,0 +1,25 @@ ++DROP TABLE IF EXISTS user_roles; ++DROP TABLE IF EXISTS users; ++DROP SEQUENCE IF EXISTS global_seq; ++ ++CREATE SEQUENCE global_seq START 100000; ++ ++CREATE TABLE users ++( ++ id INTEGER PRIMARY KEY DEFAULT nextval('global_seq'), ++ name VARCHAR NOT NULL, ++ email VARCHAR NOT NULL, ++ password VARCHAR NOT NULL, ++ registered TIMESTAMP DEFAULT now(), ++ enabled BOOL DEFAULT TRUE, ++ calories_per_day INTEGER DEFAULT 2000 NOT NULL ++); ++CREATE UNIQUE INDEX users_unique_email_idx ON users (email); ++ ++CREATE TABLE user_roles ++( ++ user_id INTEGER NOT NULL, ++ role VARCHAR, ++ CONSTRAINT user_roles_idx UNIQUE (user_id, role), ++ FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE ++); diff --git a/patchs/to_lesson03/3_11_impl_JdbcUserRepository.patch b/patchs/to_lesson03/3_11_impl_JdbcUserRepository.patch new file mode 100644 index 000000000000..f751a1d87416 --- /dev/null +++ b/patchs/to_lesson03/3_11_impl_JdbcUserRepository.patch @@ -0,0 +1,145 @@ +Index: pom.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- pom.xml (date 1465998544000) ++++ pom.xml (revision ) +@@ -119,6 +119,11 @@ + ${spring.version} + test + ++ ++ org.springframework ++ spring-jdbc ++ ${spring.version} ++ + + + +Index: src/main/java/ru/javawebinar/topjava/repository/jdbc/JdbcUserRepositoryImpl.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/repository/jdbc/JdbcUserRepositoryImpl.java (revision ) ++++ src/main/java/ru/javawebinar/topjava/repository/jdbc/JdbcUserRepositoryImpl.java (revision ) +@@ -0,0 +1,84 @@ ++package ru.javawebinar.topjava.repository.jdbc; ++ ++import org.springframework.beans.factory.annotation.Autowired; ++import org.springframework.dao.support.DataAccessUtils; ++import org.springframework.jdbc.core.BeanPropertyRowMapper; ++import org.springframework.jdbc.core.JdbcTemplate; ++import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; ++import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; ++import org.springframework.jdbc.core.simple.SimpleJdbcInsert; ++import org.springframework.stereotype.Repository; ++import ru.javawebinar.topjava.model.User; ++import ru.javawebinar.topjava.repository.UserRepository; ++ ++import javax.sql.DataSource; ++import java.util.List; ++ ++/** ++ * User: gkislin ++ * Date: 26.08.2014 ++ */ ++ ++@Repository ++public class JdbcUserRepositoryImpl implements UserRepository { ++ ++ private static final BeanPropertyRowMapper ROW_MAPPER = BeanPropertyRowMapper.newInstance(User.class); ++ ++ @Autowired ++ private JdbcTemplate jdbcTemplate; ++ ++ @Autowired ++ private NamedParameterJdbcTemplate namedParameterJdbcTemplate; ++ ++ private SimpleJdbcInsert insertUser; ++ ++ @Autowired ++ public JdbcUserRepositoryImpl(DataSource dataSource) { ++ this.insertUser = new SimpleJdbcInsert(dataSource) ++ .withTableName("USERS") ++ .usingGeneratedKeyColumns("id"); ++ } ++ ++ @Override ++ public User save(User user) { ++ MapSqlParameterSource map = new MapSqlParameterSource() ++ .addValue("id", user.getId()) ++ .addValue("name", user.getName()) ++ .addValue("email", user.getEmail()) ++ .addValue("password", user.getPassword()) ++ .addValue("registered", user.getRegistered()) ++ .addValue("enabled", user.isEnabled()) ++ .addValue("caloriesPerDay", user.getCaloriesPerDay()); ++ ++ if (user.isNew()) { ++ Number newKey = insertUser.executeAndReturnKey(map); ++ user.setId(newKey.intValue()); ++ } else { ++ namedParameterJdbcTemplate.update( ++ "UPDATE users SET name=:name, email=:email, password=:password, " + ++ "registered=:registered, enabled=:enabled, calories_per_day=:caloriesPerDay WHERE id=:id", map); ++ } ++ return user; ++ } ++ ++ @Override ++ public boolean delete(int id) { ++ return jdbcTemplate.update("DELETE FROM users WHERE id=?", id) != 0; ++ } ++ ++ @Override ++ public User get(int id) { ++ List users = jdbcTemplate.query("SELECT * FROM users WHERE id=?", ROW_MAPPER, id); ++ return DataAccessUtils.singleResult(users); ++ } ++ ++ @Override ++ public User getByEmail(String email) { ++ return jdbcTemplate.queryForObject("SELECT * FROM users WHERE email=?", ROW_MAPPER, email); ++ } ++ ++ @Override ++ public List getAll() { ++ return jdbcTemplate.query("SELECT * FROM users ORDER BY name, email", ROW_MAPPER); ++ } ++} +Index: src/main/resources/spring/spring-db.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/resources/spring/spring-db.xml (revision ) ++++ src/main/resources/spring/spring-db.xml (revision ) +@@ -0,0 +1,25 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +\ No newline at end of file diff --git a/patchs/to_lesson03/3_12_test_UserService.patch b/patchs/to_lesson03/3_12_test_UserService.patch new file mode 100644 index 000000000000..e35a481c1f80 --- /dev/null +++ b/patchs/to_lesson03/3_12_test_UserService.patch @@ -0,0 +1,435 @@ +Index: src/test/java/ru/javawebinar/topjava/matcher/ModelMatcher.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/test/java/ru/javawebinar/topjava/matcher/ModelMatcher.java (revision ) ++++ src/test/java/ru/javawebinar/topjava/matcher/ModelMatcher.java (revision ) +@@ -0,0 +1,34 @@ ++package ru.javawebinar.topjava.matcher; ++ ++import org.junit.Assert; ++ ++import java.util.Collection; ++import java.util.function.Function; ++import java.util.stream.Collectors; ++ ++/** ++ * GKislin ++ * 06.01.2015. ++ * ++ * @param : entity ++ * @param : testEntity, converter result for compare ++ */ ++public class ModelMatcher { ++ protected Function entityConverter; ++ ++ public ModelMatcher(Function entityConverter) { ++ this.entityConverter = entityConverter; ++ } ++ ++ public void assertEquals(T expected, T actual) { ++ Assert.assertEquals(entityConverter.apply(expected), entityConverter.apply(actual)); ++ } ++ ++ public void assertCollectionEquals(Collection expected, Collection actual) { ++ Assert.assertEquals(map(expected, entityConverter), map(actual, entityConverter)); ++ } ++ ++ public static Collection map(Collection collection, Function converter) { ++ return collection.stream().map(converter).collect(Collectors.toList()); ++ } ++} +Index: src/main/java/ru/javawebinar/topjava/model/BaseEntity.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/model/BaseEntity.java (date 1465998878000) ++++ src/main/java/ru/javawebinar/topjava/model/BaseEntity.java (revision ) +@@ -5,6 +5,8 @@ + * Date: 22.08.2014 + */ + public class BaseEntity { ++ public static final int START_SEQ = 100000; ++ + protected Integer id; + + public BaseEntity() { +@@ -25,4 +27,25 @@ + public boolean isNew() { + return (this.id == null); + } ++ ++ @Override ++ public boolean equals(Object o) { ++ if (this == o) { ++ return true; ++ } ++ if (o == null || getClass() != o.getClass()) { ++ return false; ++ } ++ BaseEntity that = (BaseEntity) o; ++ if (id == null || that.id == null) { ++ return false; ++ } ++ return id.equals(that.id); ++ } ++ ++ @Override ++ public int hashCode() { ++ return (id == null) ? 0 : id; ++ } ++ + } +Index: src/main/resources/spring/spring-app.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/resources/spring/spring-app.xml (date 1465998878000) ++++ src/main/resources/spring/spring-app.xml (revision ) +@@ -14,7 +14,7 @@ + + + +- ++ + + + +\ No newline at end of file +Index: src/test/java/ru/javawebinar/topjava/service/UserServiceTest.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/test/java/ru/javawebinar/topjava/service/UserServiceTest.java (revision ) ++++ src/test/java/ru/javawebinar/topjava/service/UserServiceTest.java (revision ) +@@ -0,0 +1,95 @@ ++package ru.javawebinar.topjava.service; ++ ++import org.junit.Before; ++import org.junit.Test; ++import org.junit.runner.RunWith; ++import org.springframework.beans.factory.annotation.Autowired; ++import org.springframework.dao.DataAccessException; ++import org.springframework.test.context.ContextConfiguration; ++import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; ++import ru.javawebinar.topjava.UserTestData.*; ++import ru.javawebinar.topjava.model.Role; ++import ru.javawebinar.topjava.model.User; ++import ru.javawebinar.topjava.util.DbPopulator; ++import ru.javawebinar.topjava.util.exception.NotFoundException; ++ ++import java.util.Arrays; ++import java.util.Collection; ++import java.util.Collections; ++ ++import static ru.javawebinar.topjava.UserTestData.*; ++ ++@ContextConfiguration({ ++ "classpath:spring/spring-app.xml", ++ "classpath:spring/spring-db.xml" ++}) ++@RunWith(SpringJUnit4ClassRunner.class) ++public class UserServiceTest { ++ ++ @Autowired ++ protected UserService service; ++ ++ @Autowired ++ private DbPopulator dbPopulator; ++ ++ @Before ++ public void setUp() throws Exception { ++ dbPopulator.execute(); ++ } ++ ++ @Test ++ public void testSave() throws Exception { ++ TestUser tu = new TestUser(null, "New", "new@gmail.com", "newPass", 1555, false, Collections.singleton(Role.ROLE_USER)); ++ User created = service.save(tu.asUser()); ++ tu.setId(created.getId()); ++ MATCHER.assertCollectionEquals(Arrays.asList(ADMIN, tu, USER), service.getAll()); ++ } ++ ++ @Test(expected = DataAccessException.class) ++ public void testDuplicateMailSave() throws Exception { ++ service.save(new TestUser("Duplicate", "user@yandex.ru", "newPass", Role.ROLE_USER).asUser()); ++ } ++ ++ @Test ++ public void testDelete() throws Exception { ++ service.delete(USER_ID); ++ MATCHER.assertCollectionEquals(Collections.singletonList(ADMIN), service.getAll()); ++ } ++ ++ @Test(expected = NotFoundException.class) ++ public void testNotFoundDelete() throws Exception { ++ service.delete(1); ++ } ++ ++ @Test ++ public void testGet() throws Exception { ++ User user = service.get(USER_ID); ++ MATCHER.assertEquals(USER, user); ++ } ++ ++ @Test(expected = NotFoundException.class) ++ public void testGetNotFound() throws Exception { ++ service.get(1); ++ } ++ ++ @Test ++ public void testGetByEmail() throws Exception { ++ User user = service.getByEmail("user@yandex.ru"); ++ MATCHER.assertEquals(USER, user); ++ } ++ ++ @Test ++ public void testGetAll() throws Exception { ++ Collection all = service.getAll(); ++ MATCHER.assertCollectionEquals(Arrays.asList(ADMIN, USER), all); ++ } ++ ++ @Test ++ public void testUpdate() throws Exception { ++ TestUser updated = new TestUser(USER); ++ updated.setName("UpdatedName"); ++ updated.setCaloriesPerDay(330); ++ service.update(updated.asUser()); ++ MATCHER.assertEquals(updated, service.get(USER_ID)); ++ } ++} +\ No newline at end of file +Index: src/test/java/ru/javawebinar/topjava/UserTestData.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/test/java/ru/javawebinar/topjava/UserTestData.java (date 1465998878000) ++++ src/test/java/ru/javawebinar/topjava/UserTestData.java (revision ) +@@ -1,16 +1,75 @@ + package ru.javawebinar.topjava; + ++import ru.javawebinar.topjava.matcher.ModelMatcher; + import ru.javawebinar.topjava.model.Role; + import ru.javawebinar.topjava.model.User; ++import ru.javawebinar.topjava.util.UserMealsUtil; + ++import java.util.EnumSet; ++import java.util.Objects; ++import java.util.Set; ++ ++import static ru.javawebinar.topjava.model.BaseEntity.START_SEQ; ++ + /** + * GKislin + * 24.09.2015. + */ + public class UserTestData { +- public static final int USER_ID = 1; +- public static final int ADMIN_ID = 2; ++ public static final int USER_ID = START_SEQ; ++ public static final int ADMIN_ID = START_SEQ + 1; + + public static final User USER = new User(USER_ID, "User", "user@yandex.ru", "password", Role.ROLE_USER); + public static final User ADMIN = new User(ADMIN_ID, "Admin", "admin@gmail.com", "admin", Role.ROLE_ADMIN); ++ ++ public static final ModelMatcher MATCHER = new ModelMatcher<>(u -> ((u instanceof TestUser) ? (TestUser) u : new TestUser(u))); ++ ++ public static class TestUser extends User { ++ ++ public TestUser(User u) { ++ this(u.getId(), u.getName(), u.getEmail(), u.getPassword(), u.getCaloriesPerDay(), u.isEnabled(), u.getRoles()); ++ } ++ ++ public TestUser(String name, String email, String password, Role role, Role... roles) { ++ this(null, name, email, password, UserMealsUtil.DEFAULT_CALORIES_PER_DAY, true, EnumSet.of(role, roles)); ++ } ++ ++ public TestUser(Integer id, String name, String email, String password, int caloriesPerDay, boolean enabled, Set roles) { ++ super(id, name, email, password, caloriesPerDay, enabled, roles); ++ } ++ ++ public User asUser() { ++ return new User(this); ++ } ++ ++ @Override ++ public String toString() { ++ return "User (" + ++ "id=" + id + ++ ", email=" + email + ++ ", name=" + name + ++ ", enabled=" + enabled + ++ ", password=" + password + ++ ", authorities=" + roles + ++ ')'; ++ } ++ ++ @Override ++ public boolean equals(Object o) { ++ if (this == o) { ++ return true; ++ } ++ if (o == null || getClass() != o.getClass()) { ++ return false; ++ } ++ ++ TestUser that = (TestUser) o; ++ return Objects.equals(this.password, that.password) ++ && Objects.equals(this.id, that.id) ++ && Objects.equals(this.name, that.name) ++ && Objects.equals(this.email, that.email) ++ && Objects.equals(this.caloriesPerDay, that.caloriesPerDay) ++ && Objects.equals(this.enabled, that.enabled); ++ } ++ } + } +Index: src/test/java/ru/javawebinar/topjava/MealTestData.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/test/java/ru/javawebinar/topjava/MealTestData.java (revision ) ++++ src/test/java/ru/javawebinar/topjava/MealTestData.java (revision ) +@@ -0,0 +1,14 @@ ++package ru.javawebinar.topjava; ++ ++import ru.javawebinar.topjava.matcher.ModelMatcher; ++import ru.javawebinar.topjava.model.UserMeal; ++ ++/** ++ * GKislin ++ * 13.03.2015. ++ */ ++public class MealTestData { ++ ++ public static final ModelMatcher MATCHER = new ModelMatcher<>(UserMeal::toString); ++ ++} +Index: src/main/java/ru/javawebinar/topjava/util/DbPopulator.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/util/DbPopulator.java (revision ) ++++ src/main/java/ru/javawebinar/topjava/util/DbPopulator.java (revision ) +@@ -0,0 +1,28 @@ ++package ru.javawebinar.topjava.util; ++ ++import org.springframework.beans.factory.annotation.Autowired; ++import org.springframework.core.io.DefaultResourceLoader; ++import org.springframework.core.io.ResourceLoader; ++import org.springframework.jdbc.datasource.init.DatabasePopulatorUtils; ++import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator; ++ ++import javax.sql.DataSource; ++ ++/** ++ * User: gkislin ++ * Date: 26.08.2014 ++ */ ++public class DbPopulator extends ResourceDatabasePopulator { ++ private static final ResourceLoader RESOURCE_LOADER = new DefaultResourceLoader(); ++ ++ @Autowired ++ private DataSource dataSource; ++ ++ public DbPopulator(String scriptLocation) { ++ super(RESOURCE_LOADER.getResource(scriptLocation)); ++ } ++ ++ public void execute() { ++ DatabasePopulatorUtils.execute(this, dataSource); ++ } ++} +Index: src/main/resources/spring/spring-db.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/resources/spring/spring-db.xml (date 1465998878000) ++++ src/main/resources/spring/spring-db.xml (revision ) +@@ -6,6 +6,10 @@ + + + ++ ++ ++ ++ + + +\ No newline at end of file +Index: src/main/java/ru/javawebinar/topjava/repository/jdbc/JdbcUserMealRepositoryImpl.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/repository/jdbc/JdbcUserMealRepositoryImpl.java (revision ) ++++ src/main/java/ru/javawebinar/topjava/repository/jdbc/JdbcUserMealRepositoryImpl.java (revision ) +@@ -0,0 +1,42 @@ ++package ru.javawebinar.topjava.repository.jdbc; ++ ++import org.springframework.stereotype.Repository; ++import ru.javawebinar.topjava.model.UserMeal; ++import ru.javawebinar.topjava.repository.UserMealRepository; ++ ++import java.time.LocalDateTime; ++import java.util.List; ++ ++/** ++ * User: gkislin ++ * Date: 26.08.2014 ++ */ ++ ++@Repository ++public class JdbcUserMealRepositoryImpl implements UserMealRepository { ++ ++ @Override ++ public UserMeal save(UserMeal UserMeal, int userId) { ++ return null; ++ } ++ ++ @Override ++ public boolean delete(int id, int userId) { ++ return false; ++ } ++ ++ @Override ++ public UserMeal get(int id, int userId) { ++ return null; ++ } ++ ++ @Override ++ public List getAll(int userId) { ++ return null; ++ } ++ ++ @Override ++ public List getBetween(LocalDateTime startDate, LocalDateTime endDate, int userId) { ++ return null; ++ } ++} +Index: src/main/java/ru/javawebinar/topjava/model/User.java +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +--- src/main/java/ru/javawebinar/topjava/model/User.java (date 1465998878000) ++++ src/main/java/ru/javawebinar/topjava/model/User.java (revision ) +@@ -27,6 +27,10 @@ + public User() { + } + ++ public User(User u) { ++ this(u.getId(), u.getName(), u.getEmail(), u.getPassword(), u.getCaloriesPerDay(), u.isEnabled(), u.getRoles()); ++ } ++ + public User(Integer id, String name, String email, String password, Role role, Role... roles) { + this(id, name, email, password, UserMealsUtil.DEFAULT_CALORIES_PER_DAY, true, EnumSet.of(role, roles)); + } diff --git a/pom.xml b/pom.xml index c8a1c78f3b29..9d5fb076404b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ ru.javawebinar topjava - jar + war 1.0-SNAPSHOT @@ -15,11 +15,22 @@ 1.8 UTF-8 UTF-8 + + 4.2.6.RELEASE + + + 1.1.7 + 1.7.21 + + + 9.4.1208 + + 4.12 topjava - install + package org.apache.maven.plugins @@ -34,6 +45,86 @@ + + + org.slf4j + slf4j-api + ${slf4j.version} + compile + + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + runtime + + + + org.slf4j + jul-to-slf4j + ${slf4j.version} + runtime + + + + ch.qos.logback + logback-classic + ${logback.version} + runtime + + + + + org.springframework + spring-context + ${spring.version} + + + commons-logging + commons-logging + + + + + + + org.postgresql + postgresql + ${postgresql.version} + + + + + junit + junit + ${junit.version} + test + + + javax.servlet + jstl + 1.2 + + + + javax.servlet + servlet-api + 2.5 + provided + + + org.springframework + spring-test + ${spring.version} + test + + + org.springframework + spring-jdbc + ${spring.version} + + diff --git a/src/main/java/ru/javawebinar/topjava/LoggedUser.java b/src/main/java/ru/javawebinar/topjava/LoggedUser.java new file mode 100644 index 000000000000..e1e2ac0f58c8 --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/LoggedUser.java @@ -0,0 +1,23 @@ +package ru.javawebinar.topjava; + +import ru.javawebinar.topjava.util.UserMealsUtil; + +/** + * GKislin + * 06.03.2015. + */ +public class LoggedUser { + public static int id = 1; + + public static int id() { + return id; + } + + public static void setId(int id) { + LoggedUser.id = id; + } + + public static int getCaloriesPerDay() { + return UserMealsUtil.DEFAULT_CALORIES_PER_DAY; + } +} diff --git a/src/main/java/ru/javawebinar/topjava/model/BaseEntity.java b/src/main/java/ru/javawebinar/topjava/model/BaseEntity.java new file mode 100644 index 000000000000..ba930b2c4394 --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/model/BaseEntity.java @@ -0,0 +1,51 @@ +package ru.javawebinar.topjava.model; + +/** + * User: gkislin + * Date: 22.08.2014 + */ +public class BaseEntity { + public static final int START_SEQ = 100000; + + protected Integer id; + + public BaseEntity() { + } + + protected BaseEntity(Integer id) { + this.id = id; + } + + public void setId(Integer id) { + this.id = id; + } + + public Integer getId() { + return id; + } + + public boolean isNew() { + return (this.id == null); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + BaseEntity that = (BaseEntity) o; + if (id == null || that.id == null) { + return false; + } + return id.equals(that.id); + } + + @Override + public int hashCode() { + return (id == null) ? 0 : id; + } + +} diff --git a/src/main/java/ru/javawebinar/topjava/model/NamedEntity.java b/src/main/java/ru/javawebinar/topjava/model/NamedEntity.java new file mode 100644 index 000000000000..b4de0fc0d649 --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/model/NamedEntity.java @@ -0,0 +1,31 @@ +package ru.javawebinar.topjava.model; + +/** + * User: gkislin + * Date: 22.08.2014 + */ +public class NamedEntity extends BaseEntity { + + protected String name; + + public NamedEntity() { + } + + protected NamedEntity(Integer id, String name) { + super(id); + this.name = name; + } + + public void setName(String name) { + this.name = name; + } + + public String getName() { + return this.name; + } + + @Override + public String toString() { + return name; + } +} diff --git a/src/main/java/ru/javawebinar/topjava/model/Role.java b/src/main/java/ru/javawebinar/topjava/model/Role.java new file mode 100644 index 000000000000..27f38aae7a3d --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/model/Role.java @@ -0,0 +1,10 @@ +package ru.javawebinar.topjava.model; + +/** + * User: gkislin + * Date: 22.08.2014 + */ +public enum Role { + ROLE_USER, + ROLE_ADMIN +} diff --git a/src/main/java/ru/javawebinar/topjava/model/User.java b/src/main/java/ru/javawebinar/topjava/model/User.java new file mode 100644 index 000000000000..980a9f0d494b --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/model/User.java @@ -0,0 +1,102 @@ +package ru.javawebinar.topjava.model; + +import ru.javawebinar.topjava.util.UserMealsUtil; + +import java.util.Date; +import java.util.EnumSet; +import java.util.Set; + +/** + * User: gkislin + * Date: 22.08.2014 + */ +public class User extends NamedEntity { + + protected String email; + + protected String password; + + protected boolean enabled = true; + + protected Date registered = new Date(); + + protected Set roles; + + protected int caloriesPerDay = UserMealsUtil.DEFAULT_CALORIES_PER_DAY; + + public User() { + } + + public User(User u) { + this(u.getId(), u.getName(), u.getEmail(), u.getPassword(), u.getCaloriesPerDay(), u.isEnabled(), u.getRoles()); + } + + public User(Integer id, String name, String email, String password, Role role, Role... roles) { + this(id, name, email, password, UserMealsUtil.DEFAULT_CALORIES_PER_DAY, true, EnumSet.of(role, roles)); + } + + public User(Integer id, String name, String email, String password, int caloriesPerDay, boolean enabled, Set roles) { + super(id, name); + this.email = email; + this.password = password; + this.caloriesPerDay = caloriesPerDay; + this.enabled = enabled; + this.roles = roles; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public void setPassword(String password) { + this.password = password; + } + + public Date getRegistered() { + return registered; + } + + public void setRegistered(Date registered) { + this.registered = registered; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + + public int getCaloriesPerDay() { + return caloriesPerDay; + } + + public void setCaloriesPerDay(int caloriesPerDay) { + this.caloriesPerDay = caloriesPerDay; + } + + public boolean isEnabled() { + return enabled; + } + + public Set getRoles() { + return roles; + } + + public String getPassword() { + return password; + } + + @Override + public String toString() { + return "User (" + + "id=" + id + + ", email=" + email + + ", name=" + name + + ", enabled=" + enabled + + ", roles=" + roles + + ", caloriesPerDay=" + caloriesPerDay + + ')'; + } +} diff --git a/src/main/java/ru/javawebinar/topjava/model/UserMeal.java b/src/main/java/ru/javawebinar/topjava/model/UserMeal.java new file mode 100644 index 000000000000..f63f195f13d0 --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/model/UserMeal.java @@ -0,0 +1,49 @@ +package ru.javawebinar.topjava.model; + +import java.time.LocalDateTime; + +/** + * GKislin + * 11.01.2015. + */ +public class UserMeal extends BaseEntity { + private final LocalDateTime dateTime; + private Integer id; + + private final String description; + + private final int calories; + + public UserMeal(LocalDateTime dateTime, String description, int calories) { + this(null, dateTime, description, calories); + } + + public UserMeal(Integer id, LocalDateTime dateTime, String description, int calories) { + super(id); + this.dateTime = dateTime; + this.description = description; + this.calories = calories; + } + + public LocalDateTime getDateTime() { + return dateTime; + } + + public String getDescription() { + return description; + } + + public int getCalories() { + return calories; + } + + @Override + public String toString() { + return "UserMeal{" + + "id=" + id + + ", dateTime=" + dateTime + + ", description='" + description + '\'' + + ", calories=" + calories + + '}'; + } +} diff --git a/src/main/java/ru/javawebinar/topjava/repository/UserMealRepository.java b/src/main/java/ru/javawebinar/topjava/repository/UserMealRepository.java new file mode 100644 index 000000000000..e7cc41241ac9 --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/repository/UserMealRepository.java @@ -0,0 +1,27 @@ +package ru.javawebinar.topjava.repository; + +import ru.javawebinar.topjava.model.UserMeal; + +import java.time.LocalDateTime; +import java.util.Collection; + +/** + * GKislin + * 06.03.2015. + */ +public interface UserMealRepository { + // null if updated meal do not belong to userId + UserMeal save(UserMeal userMeal, int userId); + + // false if meal do not belong to userId + boolean delete(int id, int userId); + + // null if meal do not belong to userId + UserMeal get(int id, int userId); + + // ORDERED dateTime + Collection getAll(int userId); + + // ORDERED dateTime + Collection getBetween(LocalDateTime startDate, LocalDateTime endDate, int userId); +} diff --git a/src/main/java/ru/javawebinar/topjava/repository/UserRepository.java b/src/main/java/ru/javawebinar/topjava/repository/UserRepository.java new file mode 100644 index 000000000000..b73bb1a95e7c --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/repository/UserRepository.java @@ -0,0 +1,24 @@ +package ru.javawebinar.topjava.repository; + +import ru.javawebinar.topjava.model.User; + +import java.util.List; + +/** + * User: gkislin + * Date: 22.08.2014 + */ +public interface UserRepository { + User save(User user); + + // false if not found + boolean delete(int id); + + // null if not found + User get(int id); + + // null if not found + User getByEmail(String email); + + List getAll(); +} diff --git a/src/main/java/ru/javawebinar/topjava/repository/jdbc/JdbcUserMealRepositoryImpl.java b/src/main/java/ru/javawebinar/topjava/repository/jdbc/JdbcUserMealRepositoryImpl.java new file mode 100644 index 000000000000..77c0ba8f639d --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/repository/jdbc/JdbcUserMealRepositoryImpl.java @@ -0,0 +1,42 @@ +package ru.javawebinar.topjava.repository.jdbc; + +import org.springframework.stereotype.Repository; +import ru.javawebinar.topjava.model.UserMeal; +import ru.javawebinar.topjava.repository.UserMealRepository; + +import java.time.LocalDateTime; +import java.util.List; + +/** + * User: gkislin + * Date: 26.08.2014 + */ + +@Repository +public class JdbcUserMealRepositoryImpl implements UserMealRepository { + + @Override + public UserMeal save(UserMeal UserMeal, int userId) { + return null; + } + + @Override + public boolean delete(int id, int userId) { + return false; + } + + @Override + public UserMeal get(int id, int userId) { + return null; + } + + @Override + public List getAll(int userId) { + return null; + } + + @Override + public List getBetween(LocalDateTime startDate, LocalDateTime endDate, int userId) { + return null; + } +} diff --git a/src/main/java/ru/javawebinar/topjava/repository/jdbc/JdbcUserRepositoryImpl.java b/src/main/java/ru/javawebinar/topjava/repository/jdbc/JdbcUserRepositoryImpl.java new file mode 100644 index 000000000000..5646bad071ed --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/repository/jdbc/JdbcUserRepositoryImpl.java @@ -0,0 +1,84 @@ +package ru.javawebinar.topjava.repository.jdbc; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.support.DataAccessUtils; +import org.springframework.jdbc.core.BeanPropertyRowMapper; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; +import org.springframework.jdbc.core.simple.SimpleJdbcInsert; +import org.springframework.stereotype.Repository; +import ru.javawebinar.topjava.model.User; +import ru.javawebinar.topjava.repository.UserRepository; + +import javax.sql.DataSource; +import java.util.List; + +/** + * User: gkislin + * Date: 26.08.2014 + */ + +@Repository +public class JdbcUserRepositoryImpl implements UserRepository { + + private static final BeanPropertyRowMapper ROW_MAPPER = BeanPropertyRowMapper.newInstance(User.class); + + @Autowired + private JdbcTemplate jdbcTemplate; + + @Autowired + private NamedParameterJdbcTemplate namedParameterJdbcTemplate; + + private SimpleJdbcInsert insertUser; + + @Autowired + public JdbcUserRepositoryImpl(DataSource dataSource) { + this.insertUser = new SimpleJdbcInsert(dataSource) + .withTableName("USERS") + .usingGeneratedKeyColumns("id"); + } + + @Override + public User save(User user) { + MapSqlParameterSource map = new MapSqlParameterSource() + .addValue("id", user.getId()) + .addValue("name", user.getName()) + .addValue("email", user.getEmail()) + .addValue("password", user.getPassword()) + .addValue("registered", user.getRegistered()) + .addValue("enabled", user.isEnabled()) + .addValue("caloriesPerDay", user.getCaloriesPerDay()); + + if (user.isNew()) { + Number newKey = insertUser.executeAndReturnKey(map); + user.setId(newKey.intValue()); + } else { + namedParameterJdbcTemplate.update( + "UPDATE users SET name=:name, email=:email, password=:password, " + + "registered=:registered, enabled=:enabled, calories_per_day=:caloriesPerDay WHERE id=:id", map); + } + return user; + } + + @Override + public boolean delete(int id) { + return jdbcTemplate.update("DELETE FROM users WHERE id=?", id) != 0; + } + + @Override + public User get(int id) { + List users = jdbcTemplate.query("SELECT * FROM users WHERE id=?", ROW_MAPPER, id); + return DataAccessUtils.singleResult(users); + } + + @Override + public User getByEmail(String email) { + return jdbcTemplate.queryForObject("SELECT * FROM users WHERE email=?", ROW_MAPPER, email); + } + + @Override + public List getAll() { + return jdbcTemplate.query("SELECT * FROM users ORDER BY name, email", ROW_MAPPER); + } +} diff --git a/src/main/java/ru/javawebinar/topjava/service/UserMealService.java b/src/main/java/ru/javawebinar/topjava/service/UserMealService.java new file mode 100644 index 000000000000..810220a803dd --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/service/UserMealService.java @@ -0,0 +1,31 @@ +package ru.javawebinar.topjava.service; + +import ru.javawebinar.topjava.model.UserMeal; +import ru.javawebinar.topjava.util.exception.NotFoundException; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.Collection; + +/** + * GKislin + * 15.06.2015. + */ +public interface UserMealService { + UserMeal get(int id, int userId) throws NotFoundException; + + void delete(int id, int userId) throws NotFoundException; + + default Collection getBetweenDates(LocalDate startDate, LocalDate endDate, int userId) { + return getBetweenDateTimes(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), userId); + } + + Collection getBetweenDateTimes(LocalDateTime startDateTime, LocalDateTime endDateTime, int userId); + + Collection getAll(int userId); + + UserMeal update(UserMeal meal, int userId) throws NotFoundException; + + UserMeal save(UserMeal meal, int userId); +} diff --git a/src/main/java/ru/javawebinar/topjava/service/UserMealServiceImpl.java b/src/main/java/ru/javawebinar/topjava/service/UserMealServiceImpl.java new file mode 100644 index 000000000000..a5db71cf1ce3 --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/service/UserMealServiceImpl.java @@ -0,0 +1,51 @@ +package ru.javawebinar.topjava.service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import ru.javawebinar.topjava.model.UserMeal; +import ru.javawebinar.topjava.repository.UserMealRepository; +import ru.javawebinar.topjava.util.exception.ExceptionUtil; + +import java.time.LocalDateTime; +import java.util.Collection; + +/** + * GKislin + * 06.03.2015. + */ +@Service +public class UserMealServiceImpl implements UserMealService { + + @Autowired + private UserMealRepository repository; + + @Override + public UserMeal get(int id, int userId) { + return ExceptionUtil.checkNotFoundWithId(repository.get(id, userId), id); + } + + @Override + public void delete(int id, int userId) { + ExceptionUtil.checkNotFoundWithId(repository.delete(id, userId), id); + } + + @Override + public Collection getBetweenDateTimes(LocalDateTime startDateTime, LocalDateTime endDateTime, int userId) { + return repository.getBetween(startDateTime, endDateTime, userId); + } + + @Override + public Collection getAll(int userId) { + return repository.getAll(userId); + } + + @Override + public UserMeal update(UserMeal meal, int userId) { + return ExceptionUtil.checkNotFoundWithId(repository.save(meal, userId), meal.getId()); + } + + @Override + public UserMeal save(UserMeal meal, int userId) { + return repository.save(meal, userId); + } +} diff --git a/src/main/java/ru/javawebinar/topjava/service/UserService.java b/src/main/java/ru/javawebinar/topjava/service/UserService.java new file mode 100644 index 000000000000..acab3bf3081d --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/service/UserService.java @@ -0,0 +1,26 @@ +package ru.javawebinar.topjava.service; + + +import ru.javawebinar.topjava.model.User; +import ru.javawebinar.topjava.util.exception.NotFoundException; + +import java.util.List; + +/** + * User: gkislin + * Date: 22.08.2014 + */ +public interface UserService { + + User save(User user); + + void delete(int id) throws NotFoundException; + + User get(int id) throws NotFoundException; + + User getByEmail(String email) throws NotFoundException; + + List getAll(); + + void update(User user); +} diff --git a/src/main/java/ru/javawebinar/topjava/service/UserServiceImpl.java b/src/main/java/ru/javawebinar/topjava/service/UserServiceImpl.java new file mode 100644 index 000000000000..9f36f2bc0b48 --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/service/UserServiceImpl.java @@ -0,0 +1,45 @@ +package ru.javawebinar.topjava.service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import ru.javawebinar.topjava.model.User; +import ru.javawebinar.topjava.repository.UserRepository; +import ru.javawebinar.topjava.util.exception.ExceptionUtil; +import ru.javawebinar.topjava.util.exception.NotFoundException; + +import java.util.List; + +/** + * GKislin + * 06.03.2015. + */ +@Service +public class UserServiceImpl implements UserService { + + @Autowired + private UserRepository repository; + + public User save(User user) { + return repository.save(user); + } + + public void delete(int id) { + ExceptionUtil.checkNotFoundWithId(repository.delete(id), id); + } + + public User get(int id) throws NotFoundException { + return ExceptionUtil.checkNotFoundWithId(repository.get(id), id); + } + + public User getByEmail(String email) throws NotFoundException { + return ExceptionUtil.checkNotFound(repository.getByEmail(email), "email=" + email); + } + + public List getAll() { + return repository.getAll(); + } + + public void update(User user) { + repository.save(user); + } +} diff --git a/src/main/java/ru/javawebinar/topjava/to/UserMealWithExceed.java b/src/main/java/ru/javawebinar/topjava/to/UserMealWithExceed.java new file mode 100644 index 000000000000..6472063f7e9c --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/to/UserMealWithExceed.java @@ -0,0 +1,62 @@ +package ru.javawebinar.topjava.to; + +import java.time.LocalDateTime; + +/** + * GKislin + * 11.01.2015. + */ +public class UserMealWithExceed { + private final Integer id; + + private final LocalDateTime dateTime; + + private final String description; + + private final int calories; + + private final boolean exceed; + + public UserMealWithExceed(LocalDateTime dateTime, String description, int calories, boolean exceed) { + this(null, dateTime, description, calories, exceed); + } + + public UserMealWithExceed(Integer id, LocalDateTime dateTime, String description, int calories, boolean exceed) { + this.id = id; + this.dateTime = dateTime; + this.description = description; + this.calories = calories; + this.exceed = exceed; + } + + public Integer getId() { + return id; + } + + public LocalDateTime getDateTime() { + return dateTime; + } + + public String getDescription() { + return description; + } + + public int getCalories() { + return calories; + } + + public boolean isExceed() { + return exceed; + } + + @Override + public String toString() { + return "UserMealWithExceed{" + + "id=" + id + + ", dateTime=" + dateTime + + ", description='" + description + '\'' + + ", calories=" + calories + + ", exceed=" + exceed + + '}'; + } +} diff --git a/src/main/java/ru/javawebinar/topjava/util/DbPopulator.java b/src/main/java/ru/javawebinar/topjava/util/DbPopulator.java new file mode 100644 index 000000000000..8d4a6cc3c719 --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/util/DbPopulator.java @@ -0,0 +1,28 @@ +package ru.javawebinar.topjava.util; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.DefaultResourceLoader; +import org.springframework.core.io.ResourceLoader; +import org.springframework.jdbc.datasource.init.DatabasePopulatorUtils; +import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator; + +import javax.sql.DataSource; + +/** + * User: gkislin + * Date: 26.08.2014 + */ +public class DbPopulator extends ResourceDatabasePopulator { + private static final ResourceLoader RESOURCE_LOADER = new DefaultResourceLoader(); + + @Autowired + private DataSource dataSource; + + public DbPopulator(String scriptLocation) { + super(RESOURCE_LOADER.getResource(scriptLocation)); + } + + public void execute() { + DatabasePopulatorUtils.execute(this, dataSource); + } +} diff --git a/src/main/java/ru/javawebinar/topjava/util/TimeUtil.java b/src/main/java/ru/javawebinar/topjava/util/TimeUtil.java new file mode 100644 index 000000000000..14bc39924f6e --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/util/TimeUtil.java @@ -0,0 +1,35 @@ +package ru.javawebinar.topjava.util; + +import org.springframework.util.StringUtils; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; + +/** + * GKislin + * 07.01.2015. + */ +public class TimeUtil { + private static final DateTimeFormatter DATE_TME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"); + + public static final LocalDate MIN_DATE = LocalDate.of(1, 1, 1); + public static final LocalDate MAX_DATE = LocalDate.of(3000, 1, 1); + + public static > boolean isBetween(T value, T start, T end) { + return value.compareTo(start) >= 0 && value.compareTo(end) <= 0; + } + + public static String toString(LocalDateTime ldt) { + return ldt == null ? "" : ldt.format(DATE_TME_FORMATTER); + } + + public static LocalDate parseLocalDate(String str) { + return StringUtils.isEmpty(str) ? null : LocalDate.parse(str); + } + + public static LocalTime parseLocalTime(String str) { + return StringUtils.isEmpty(str) ? null : LocalTime.parse(str); + } +} diff --git a/src/main/java/ru/javawebinar/topjava/util/UserMealsUtil.java b/src/main/java/ru/javawebinar/topjava/util/UserMealsUtil.java new file mode 100644 index 000000000000..cb796745215c --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/util/UserMealsUtil.java @@ -0,0 +1,71 @@ +package ru.javawebinar.topjava.util; + +import ru.javawebinar.topjava.model.UserMeal; +import ru.javawebinar.topjava.to.UserMealWithExceed; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.Month; +import java.util.*; +import java.util.stream.Collectors; + +/** + * GKislin + * 31.05.2015. + */ +public class UserMealsUtil { + public static final List MEAL_LIST = Arrays.asList( + new UserMeal(LocalDateTime.of(2015, Month.MAY, 30, 10, 0), "Завтрак", 500), + new UserMeal(LocalDateTime.of(2015, Month.MAY, 30, 13, 0), "Обед", 1000), + new UserMeal(LocalDateTime.of(2015, Month.MAY, 30, 20, 0), "Ужин", 500), + new UserMeal(LocalDateTime.of(2015, Month.MAY, 31, 10, 0), "Завтрак", 1000), + new UserMeal(LocalDateTime.of(2015, Month.MAY, 31, 13, 0), "Обед", 500), + new UserMeal(LocalDateTime.of(2015, Month.MAY, 31, 20, 0), "Ужин", 510) + ); + + public static final int DEFAULT_CALORIES_PER_DAY = 2000; + + public static void main(String[] args) { + List filteredMealsWithExceeded = getFilteredWithExceeded(MEAL_LIST, LocalTime.of(7, 0), LocalTime.of(12, 0), DEFAULT_CALORIES_PER_DAY); + filteredMealsWithExceeded.forEach(System.out::println); + + System.out.println(getFilteredWithExceededByCycle(MEAL_LIST, LocalTime.of(7, 0), LocalTime.of(12, 0), DEFAULT_CALORIES_PER_DAY)); + } + + public static List getWithExceeded(Collection mealList, int caloriesPerDay) { + return getFilteredWithExceeded(mealList, LocalTime.MIN, LocalTime.MAX, caloriesPerDay); + } + + public static List getFilteredWithExceeded(Collection mealList, LocalTime startTime, LocalTime endTime, int caloriesPerDay) { + Map caloriesSumByDate = mealList.stream() + .collect( + Collectors.groupingBy(um -> um.getDateTime().toLocalDate(), + Collectors.summingInt(UserMeal::getCalories)) + ); + + return mealList.stream() + .filter(um -> TimeUtil.isBetween(um.getDateTime().toLocalTime(), startTime, endTime)) + .map(um -> createWithExceed(um, caloriesSumByDate.get(um.getDateTime().toLocalDate()) > caloriesPerDay)) + .collect(Collectors.toList()); + } + + public static List getFilteredWithExceededByCycle(List mealList, LocalTime startTime, LocalTime endTime, int caloriesPerDay) { + + final Map caloriesSumPerDate = new HashMap<>(); + mealList.forEach(meal -> caloriesSumPerDate.merge(meal.getDateTime().toLocalDate(), meal.getCalories(), Integer::sum)); + + final List mealExceeded = new ArrayList<>(); + mealList.forEach(meal -> { + final LocalDateTime dateTime = meal.getDateTime(); + if (TimeUtil.isBetween(dateTime.toLocalTime(), startTime, endTime)) { + mealExceeded.add(createWithExceed(meal, caloriesSumPerDate.get(dateTime.toLocalDate()) > caloriesPerDay)); + } + }); + return mealExceeded; + } + + public static UserMealWithExceed createWithExceed(UserMeal um, boolean exceeded) { + return new UserMealWithExceed(um.getId(), um.getDateTime(), um.getDescription(), um.getCalories(), exceeded); + } +} \ No newline at end of file diff --git a/src/main/java/ru/javawebinar/topjava/util/exception/ExceptionUtil.java b/src/main/java/ru/javawebinar/topjava/util/exception/ExceptionUtil.java new file mode 100644 index 000000000000..1099bd9530ee --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/util/exception/ExceptionUtil.java @@ -0,0 +1,25 @@ +package ru.javawebinar.topjava.util.exception; + + +/** + * User: gkislin + * Date: 14.05.2014 + */ +public class ExceptionUtil { + public static void checkNotFoundWithId(boolean found, int id) { + checkNotFound(found, "id=" + id); + } + + public static T checkNotFoundWithId(T object, int id) { + return checkNotFound(object, "id=" + id); + } + + public static T checkNotFound(T object, String msg) { + checkNotFound(object != null, msg); + return object; + } + + public static void checkNotFound(boolean found, String msg) { + if (!found) throw new NotFoundException("Not found entity with " + msg); + } +} diff --git a/src/main/java/ru/javawebinar/topjava/util/exception/NotFoundException.java b/src/main/java/ru/javawebinar/topjava/util/exception/NotFoundException.java new file mode 100644 index 000000000000..1106389dc853 --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/util/exception/NotFoundException.java @@ -0,0 +1,11 @@ +package ru.javawebinar.topjava.util.exception; + +/** + * User: gkislin + * Date: 19.08.2014 + */ +public class NotFoundException extends RuntimeException { + public NotFoundException(String message) { + super(message); + } +} diff --git a/src/main/java/ru/javawebinar/topjava/web/MealServlet.java b/src/main/java/ru/javawebinar/topjava/web/MealServlet.java new file mode 100644 index 000000000000..49a1530c2e8b --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/web/MealServlet.java @@ -0,0 +1,104 @@ +package ru.javawebinar.topjava.web; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; +import ru.javawebinar.topjava.model.UserMeal; +import ru.javawebinar.topjava.util.TimeUtil; +import ru.javawebinar.topjava.web.meal.UserMealRestController; + +import javax.servlet.ServletConfig; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.Objects; + +/** + * User: gkislin + * Date: 19.08.2014 + */ +public class MealServlet extends HttpServlet { + private static final Logger LOG = LoggerFactory.getLogger(MealServlet.class); + + private ConfigurableApplicationContext springContext; + private UserMealRestController mealController; + + @Override + public void init(ServletConfig config) throws ServletException { + super.init(config); + springContext = new ClassPathXmlApplicationContext("spring/spring-app.xml"); + mealController = springContext.getBean(UserMealRestController.class); + } + + @Override + public void destroy() { + springContext.close(); + super.destroy(); + } + + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + request.setCharacterEncoding("UTF-8"); + String action = request.getParameter("action"); + if (action == null) { + final UserMeal userMeal = new UserMeal( + LocalDateTime.parse(request.getParameter("dateTime")), + request.getParameter("description"), + Integer.valueOf(request.getParameter("calories"))); + + if (request.getParameter("id").isEmpty()) { + LOG.info("Create {}", userMeal); + mealController.create(userMeal); + } else { + LOG.info("Update {}", userMeal); + mealController.update(userMeal, getId(request)); + } + response.sendRedirect("meals"); + + } else if (action.equals("filter")) { + LocalDate startDate = TimeUtil.parseLocalDate(resetParam("startDate", request)); + LocalDate endDate = TimeUtil.parseLocalDate(resetParam("endDate", request)); + LocalTime startTime = TimeUtil.parseLocalTime(resetParam("startTime", request)); + LocalTime endTime = TimeUtil.parseLocalTime(resetParam("endTime", request)); + request.setAttribute("mealList", mealController.getBetween(startDate, startTime, endDate, endTime)); + request.getRequestDispatcher("/mealList.jsp").forward(request, response); + } + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + String action = request.getParameter("action"); + + if (action == null) { + LOG.info("getAll"); + request.setAttribute("mealList", mealController.getAll()); + request.getRequestDispatcher("mealList.jsp").forward(request, response); + } else if (action.equals("delete")) { + int id = getId(request); + LOG.info("Delete {}", id); + mealController.delete(id); + response.sendRedirect("meals"); + } else if (action.equals("create") || action.equals("update")) { + final UserMeal meal = action.equals("create") ? + new UserMeal(LocalDateTime.now().withNano(0).withSecond(0), "", 1000) : + mealController.get(getId(request)); // update + request.setAttribute("meal", meal); + request.getRequestDispatcher("mealEdit.jsp").forward(request, response); + } + } + + private String resetParam(String param, HttpServletRequest request) { + String value = request.getParameter(param); + request.setAttribute(param, value); + return value; + } + + private int getId(HttpServletRequest request) { + String paramId = Objects.requireNonNull(request.getParameter("id")); + return Integer.valueOf(paramId); + } +} diff --git a/src/main/java/ru/javawebinar/topjava/web/UserServlet.java b/src/main/java/ru/javawebinar/topjava/web/UserServlet.java new file mode 100644 index 000000000000..ba9635c5e922 --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/web/UserServlet.java @@ -0,0 +1,31 @@ +package ru.javawebinar.topjava.web; + +import org.slf4j.Logger; +import ru.javawebinar.topjava.LoggedUser; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +import static org.slf4j.LoggerFactory.getLogger; + +/** + * User: gkislin + * Date: 19.08.2014 + */ +public class UserServlet extends HttpServlet { + private static final Logger LOG = getLogger(UserServlet.class); + + protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + int userId = Integer.valueOf(request.getParameter("userId")); + LoggedUser.setId(userId); + response.sendRedirect("meals"); + } + + protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + LOG.debug("redirect to userList"); + response.sendRedirect("userList.jsp"); + } +} diff --git a/src/main/java/ru/javawebinar/topjava/web/meal/UserMealRestController.java b/src/main/java/ru/javawebinar/topjava/web/meal/UserMealRestController.java new file mode 100644 index 000000000000..1a9b74cab364 --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/web/meal/UserMealRestController.java @@ -0,0 +1,71 @@ +package ru.javawebinar.topjava.web.meal; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import ru.javawebinar.topjava.LoggedUser; +import ru.javawebinar.topjava.model.UserMeal; +import ru.javawebinar.topjava.service.UserMealService; +import ru.javawebinar.topjava.to.UserMealWithExceed; +import ru.javawebinar.topjava.util.TimeUtil; +import ru.javawebinar.topjava.util.UserMealsUtil; + +import java.time.LocalDate; +import java.time.LocalTime; +import java.util.List; + +/** + * GKislin + * 06.03.2015. + */ +@Controller +public class UserMealRestController { + private static final Logger LOG = LoggerFactory.getLogger(UserMealRestController.class); + + @Autowired + private UserMealService service; + + public UserMeal get(int id) { + int userId = LoggedUser.id(); + LOG.info("get meal {} for User {}", id, userId); + return service.get(id, userId); + } + + public void delete(int id) { + int userId = LoggedUser.id(); + LOG.info("delete meal {} for User {}", id, userId); + service.delete(id, userId); + } + + public List getAll() { + int userId = LoggedUser.id(); + LOG.info("getAll for User {}", userId); + return UserMealsUtil.getWithExceeded(service.getAll(userId), LoggedUser.getCaloriesPerDay()); + } + + public void update(UserMeal meal, int id) { + meal.setId(id); + int userId = LoggedUser.id(); + LOG.info("update {} for User {}", meal, userId); + service.update(meal, userId); + } + + public UserMeal create(UserMeal meal) { + meal.setId(null); + int userId = LoggedUser.id(); + LOG.info("create {} for User {}", meal, userId); + return service.save(meal, userId); + } + + public List getBetween(LocalDate startDate, LocalTime startTime, LocalDate endDate, LocalTime endTime) { + int userId = LoggedUser.id(); + LOG.info("getBetween dates {} - {} for time {} - {} for User {}", startDate, endDate, startTime, endTime, userId); + + return UserMealsUtil.getFilteredWithExceeded( + service.getBetweenDates( + startDate != null ? startDate : TimeUtil.MIN_DATE, endDate != null ? endDate : TimeUtil.MAX_DATE, userId), + startTime != null ? startTime : LocalTime.MIN, endTime != null ? endTime : LocalTime.MAX, LoggedUser.getCaloriesPerDay() + ); + } +} \ No newline at end of file diff --git a/src/main/java/ru/javawebinar/topjava/web/user/AbstractUserController.java b/src/main/java/ru/javawebinar/topjava/web/user/AbstractUserController.java new file mode 100644 index 000000000000..47ba49234a94 --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/web/user/AbstractUserController.java @@ -0,0 +1,51 @@ +package ru.javawebinar.topjava.web.user; + +import org.springframework.beans.factory.annotation.Autowired; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import ru.javawebinar.topjava.model.User; +import ru.javawebinar.topjava.service.UserService; + +import java.util.List; + +/** + * User: gkislin + */ +public abstract class AbstractUserController { + protected final Logger LOG = LoggerFactory.getLogger(getClass()); + + @Autowired + private UserService service; + + public List getAll() { + LOG.info("getAll"); + return service.getAll(); + } + + public User get(int id) { + LOG.info("get " + id); + return service.get(id); + } + + public User create(User user) { + user.setId(null); + LOG.info("create " + user); + return service.save(user); + } + + public void delete(int id) { + LOG.info("delete " + id); + service.delete(id); + } + + public void update(User user, int id) { + user.setId(id); + LOG.info("update " + user); + service.update(user); + } + + public User getByMail(String email) { + LOG.info("getByEmail " + email); + return service.getByEmail(email); + } +} diff --git a/src/main/java/ru/javawebinar/topjava/web/user/AdminRestController.java b/src/main/java/ru/javawebinar/topjava/web/user/AdminRestController.java new file mode 100644 index 000000000000..c38fd790e101 --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/web/user/AdminRestController.java @@ -0,0 +1,38 @@ +package ru.javawebinar.topjava.web.user; + +import org.springframework.stereotype.Controller; +import ru.javawebinar.topjava.model.User; + +import java.util.List; + +/** + * GKislin + * 06.03.2015. + */ +@Controller +public class AdminRestController extends AbstractUserController { + + public List getAll() { + return super.getAll(); + } + + public User get(int id) { + return super.get(id); + } + + public User create(User user) { + return super.create(user); + } + + public void delete(int id) { + super.delete(id); + } + + public void update(User user, int id) { + super.update(user, id); + } + + public User getByMail(String email) { + return super.getByMail(email); + } +} diff --git a/src/main/java/ru/javawebinar/topjava/web/user/ProfileRestController.java b/src/main/java/ru/javawebinar/topjava/web/user/ProfileRestController.java new file mode 100644 index 000000000000..7325a01b1c1d --- /dev/null +++ b/src/main/java/ru/javawebinar/topjava/web/user/ProfileRestController.java @@ -0,0 +1,25 @@ +package ru.javawebinar.topjava.web.user; + +import org.springframework.stereotype.Controller; +import ru.javawebinar.topjava.LoggedUser; +import ru.javawebinar.topjava.model.User; + +/** + * GKislin + * 06.03.2015. + */ +@Controller +public class ProfileRestController extends AbstractUserController { + + public User get() { + return super.get(LoggedUser.id()); + } + + public void delete() { + super.delete(LoggedUser.id()); + } + + public void update(User user) { + super.update(user, LoggedUser.id()); + } +} \ No newline at end of file diff --git a/src/main/resources/db/initDB.sql b/src/main/resources/db/initDB.sql new file mode 100644 index 000000000000..a0631c79567b --- /dev/null +++ b/src/main/resources/db/initDB.sql @@ -0,0 +1,25 @@ +DROP TABLE IF EXISTS user_roles; +DROP TABLE IF EXISTS users; +DROP SEQUENCE IF EXISTS global_seq; + +CREATE SEQUENCE global_seq START 100000; + +CREATE TABLE users +( + id INTEGER PRIMARY KEY DEFAULT nextval('global_seq'), + name VARCHAR NOT NULL, + email VARCHAR NOT NULL, + password VARCHAR NOT NULL, + registered TIMESTAMP DEFAULT now(), + enabled BOOL DEFAULT TRUE, + calories_per_day INTEGER DEFAULT 2000 NOT NULL +); +CREATE UNIQUE INDEX users_unique_email_idx ON users (email); + +CREATE TABLE user_roles +( + user_id INTEGER NOT NULL, + role VARCHAR, + CONSTRAINT user_roles_idx UNIQUE (user_id, role), + FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE +); diff --git a/src/main/resources/db/populateDB.sql b/src/main/resources/db/populateDB.sql new file mode 100644 index 000000000000..199e2ace615d --- /dev/null +++ b/src/main/resources/db/populateDB.sql @@ -0,0 +1,13 @@ +DELETE FROM user_roles; +DELETE FROM users; +ALTER SEQUENCE global_seq RESTART WITH 100000; + +INSERT INTO users (name, email, password) +VALUES ('User', 'user@yandex.ru', 'password'); + +INSERT INTO users (name, email, password) +VALUES ('Admin', 'admin@gmail.com', 'admin'); + +INSERT INTO user_roles (role, user_id) VALUES + ('ROLE_USER', 100000), + ('ROLE_ADMIN', 100001); diff --git a/src/main/resources/db/postgres.properties b/src/main/resources/db/postgres.properties new file mode 100644 index 000000000000..44dd64eb26b8 --- /dev/null +++ b/src/main/resources/db/postgres.properties @@ -0,0 +1,7 @@ +#database.url=jdbc:postgresql://ec2-54-217-202-110.eu-west-1.compute.amazonaws.com:5432/dehm6lvm8bink0?ssl=true&sslfactory=org.postgresql.ssl.NonValidatingFactory +#database.username=wegxlfzjjgxaxy +#database.password=SSQyKKE_e93kiUCR-ehzMcKCxZ + +database.url=jdbc:postgresql://localhost:5432/topjava +database.username=user +database.password=password diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 000000000000..86dea516174d --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,33 @@ + + + + + true + + + + + + + ${TOPJAVA_ROOT}/log/topjava.log + + + UTF-8 + %date %-5level %logger{0} [%file:%line] %msg%n + + + + + + UTF-8 + %-5level %logger{0} [%file:%line] %msg%n + + + + + + + + + + diff --git a/src/main/resources/spring/spring-app.xml b/src/main/resources/spring/spring-app.xml new file mode 100644 index 000000000000..3688d3a84cd8 --- /dev/null +++ b/src/main/resources/spring/spring-app.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/spring/spring-db.xml b/src/main/resources/spring/spring-db.xml new file mode 100644 index 000000000000..051f225300cd --- /dev/null +++ b/src/main/resources/spring/spring-db.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tld/functions.tld b/src/main/webapp/WEB-INF/tld/functions.tld new file mode 100644 index 000000000000..122c4197cc32 --- /dev/null +++ b/src/main/webapp/WEB-INF/tld/functions.tld @@ -0,0 +1,16 @@ + + + + 1.0 + functions + http://topjava.javawebinar.ru/functions + + + formatDateTime + ru.javawebinar.topjava.util.TimeUtil + java.lang.String toString(java.time.LocalDateTime) + + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 000000000000..9e6a31e58952 --- /dev/null +++ b/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,28 @@ + + + Topjava + + + userServlet + ru.javawebinar.topjava.web.UserServlet + 0 + + + userServlet + /users + + + + mealServlet + ru.javawebinar.topjava.web.MealServlet + 0 + + + mealServlet + /meals + + + diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css new file mode 100644 index 000000000000..0c9fc667371c --- /dev/null +++ b/src/main/webapp/css/style.css @@ -0,0 +1,24 @@ +dl { + background: none repeat scroll 0 0 #FAFAFA; + margin: 8px 0; + padding: 0; +} + +dt { + display: inline-block; + width: 170px; +} + +dd { + display: inline-block; + margin-left: 8px; + vertical-align: top; +} + +.normal { + color: green; +} + +.exceeded { + color: red; +} diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html new file mode 100644 index 000000000000..b3f17eb0bf40 --- /dev/null +++ b/src/main/webapp/index.html @@ -0,0 +1,19 @@ + + + + + Java Enterprise (Topjava) + + +
Проект "Java Enterprise (Topjava)"
+
+ + Meal list of + + + + + diff --git a/src/main/webapp/mealEdit.jsp b/src/main/webapp/mealEdit.jsp new file mode 100644 index 000000000000..3a5b3bc07647 --- /dev/null +++ b/src/main/webapp/mealEdit.jsp @@ -0,0 +1,34 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + Meal + + + +
+
Home
+
${param.action == 'create' ? 'Create meal' : 'Edit meal'}
+
+ +
+ +
+
DateTime:
+
+
+
+
Description:
+
+
+
+
Calories:
+
+
+ + + +
+ + diff --git a/src/main/webapp/mealList.jsp b/src/main/webapp/mealList.jsp new file mode 100644 index 000000000000..f2d2377335e8 --- /dev/null +++ b/src/main/webapp/mealList.jsp @@ -0,0 +1,63 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="fn" uri="http://topjava.javawebinar.ru/functions" %> + + + Meal list + + + +
+
Home
+
Meal list
+
+
+
From Date:
+
+
+
+
To Date:
+
+
+
+
From Time:
+
+
+
+
To Time:
+
+
+ + +
+ Add Meal +
+

+ + + + + + + + + ~~+ + +~~ + + + + + + ~~+ +~~

Date	Description	Calories
+ <%--${meal.dateTime.toLocalDate()} ${meal.dateTime.toLocalTime()}--%> + <%--<%=TimeUtil.toString(meal.getDateTime())%>--%> + ${fn:formatDateTime(meal.dateTime)} +	${meal.description}	${meal.calories}	Update	Delete

+ + \ No newline at end of file diff --git a/src/main/webapp/userList.jsp b/src/main/webapp/userList.jsp new file mode 100644 index 000000000000..31084b82fd3f --- /dev/null +++ b/src/main/webapp/userList.jsp @@ -0,0 +1,10 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + User list + + +
Home
+
User list
+ + diff --git a/src/test/java/ru/javawebinar/topjava/MealTestData.java b/src/test/java/ru/javawebinar/topjava/MealTestData.java new file mode 100644 index 000000000000..ac44047caa52 --- /dev/null +++ b/src/test/java/ru/javawebinar/topjava/MealTestData.java @@ -0,0 +1,14 @@ +package ru.javawebinar.topjava; + +import ru.javawebinar.topjava.matcher.ModelMatcher; +import ru.javawebinar.topjava.model.UserMeal; + +/** + * GKislin + * 13.03.2015. + */ +public class MealTestData { + + public static final ModelMatcher MATCHER = new ModelMatcher<>(UserMeal::toString); + +} diff --git a/src/test/java/ru/javawebinar/topjava/SpringMain.java b/src/test/java/ru/javawebinar/topjava/SpringMain.java new file mode 100644 index 000000000000..97d10049a1c7 --- /dev/null +++ b/src/test/java/ru/javawebinar/topjava/SpringMain.java @@ -0,0 +1,36 @@ +package ru.javawebinar.topjava; + +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; +import ru.javawebinar.topjava.to.UserMealWithExceed; +import ru.javawebinar.topjava.web.meal.UserMealRestController; +import ru.javawebinar.topjava.web.user.AdminRestController; + +import java.time.LocalDate; +import java.time.LocalTime; +import java.time.Month; +import java.util.Arrays; +import java.util.List; + +/** + * User: gkislin + * Date: 22.08.2014 + */ +public class SpringMain { + public static void main(String[] args) { + // java 7 Automatic resource management + try (ConfigurableApplicationContext appCtx = new ClassPathXmlApplicationContext("spring/spring-app.xml")) { + System.out.println(Arrays.toString(appCtx.getBeanDefinitionNames())); + AdminRestController adminUserController = appCtx.getBean(AdminRestController.class); + System.out.println(adminUserController.create(UserTestData.USER)); + System.out.println(); + + UserMealRestController mealController = appCtx.getBean(UserMealRestController.class); + List filteredMealsWithExceeded = + mealController.getBetween( + LocalDate.of(2015, Month.MAY, 30), LocalTime.of(7, 0), + LocalDate.of(2015, Month.MAY, 31), LocalTime.of(11, 0)); + filteredMealsWithExceeded.forEach(System.out::println); + } + } +} diff --git a/src/test/java/ru/javawebinar/topjava/UserTestData.java b/src/test/java/ru/javawebinar/topjava/UserTestData.java new file mode 100644 index 000000000000..c6855207f44e --- /dev/null +++ b/src/test/java/ru/javawebinar/topjava/UserTestData.java @@ -0,0 +1,75 @@ +package ru.javawebinar.topjava; + +import ru.javawebinar.topjava.matcher.ModelMatcher; +import ru.javawebinar.topjava.model.Role; +import ru.javawebinar.topjava.model.User; +import ru.javawebinar.topjava.util.UserMealsUtil; + +import java.util.EnumSet; +import java.util.Objects; +import java.util.Set; + +import static ru.javawebinar.topjava.model.BaseEntity.START_SEQ; + +/** + * GKislin + * 24.09.2015. + */ +public class UserTestData { + public static final int USER_ID = START_SEQ; + public static final int ADMIN_ID = START_SEQ + 1; + + public static final User USER = new User(USER_ID, "User", "user@yandex.ru", "password", Role.ROLE_USER); + public static final User ADMIN = new User(ADMIN_ID, "Admin", "admin@gmail.com", "admin", Role.ROLE_ADMIN); + + public static final ModelMatcher MATCHER = new ModelMatcher<>(u -> ((u instanceof TestUser) ? (TestUser) u : new TestUser(u))); + + public static class TestUser extends User { + + public TestUser(User u) { + this(u.getId(), u.getName(), u.getEmail(), u.getPassword(), u.getCaloriesPerDay(), u.isEnabled(), u.getRoles()); + } + + public TestUser(String name, String email, String password, Role role, Role... roles) { + this(null, name, email, password, UserMealsUtil.DEFAULT_CALORIES_PER_DAY, true, EnumSet.of(role, roles)); + } + + public TestUser(Integer id, String name, String email, String password, int caloriesPerDay, boolean enabled, Set roles) { + super(id, name, email, password, caloriesPerDay, enabled, roles); + } + + public User asUser() { + return new User(this); + } + + @Override + public String toString() { + return "User (" + + "id=" + id + + ", email=" + email + + ", name=" + name + + ", enabled=" + enabled + + ", password=" + password + + ", authorities=" + roles + + ')'; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + TestUser that = (TestUser) o; + return Objects.equals(this.password, that.password) + && Objects.equals(this.id, that.id) + && Objects.equals(this.name, that.name) + && Objects.equals(this.email, that.email) + && Objects.equals(this.caloriesPerDay, that.caloriesPerDay) + && Objects.equals(this.enabled, that.enabled); + } + } +} diff --git a/src/test/java/ru/javawebinar/topjava/matcher/ModelMatcher.java b/src/test/java/ru/javawebinar/topjava/matcher/ModelMatcher.java new file mode 100644 index 000000000000..f2b18b2e34bd --- /dev/null +++ b/src/test/java/ru/javawebinar/topjava/matcher/ModelMatcher.java @@ -0,0 +1,34 @@ +package ru.javawebinar.topjava.matcher; + +import org.junit.Assert; + +import java.util.Collection; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * GKislin + * 06.01.2015. + * + * @param : entity + * @param : testEntity, converter result for compare + */ +public class ModelMatcher { + protected Function entityConverter; + + public ModelMatcher(Function entityConverter) { + this.entityConverter = entityConverter; + } + + public void assertEquals(T expected, T actual) { + Assert.assertEquals(entityConverter.apply(expected), entityConverter.apply(actual)); + } + + public void assertCollectionEquals(Collection expected, Collection actual) { + Assert.assertEquals(map(expected, entityConverter), map(actual, entityConverter)); + } + + public static Collection map(Collection collection, Function converter) { + return collection.stream().map(converter).collect(Collectors.toList()); + } +} diff --git a/src/test/java/ru/javawebinar/topjava/repository/mock/InMemoryUserMealRepositoryImpl.java b/src/test/java/ru/javawebinar/topjava/repository/mock/InMemoryUserMealRepositoryImpl.java new file mode 100644 index 000000000000..f181bc40a6cc --- /dev/null +++ b/src/test/java/ru/javawebinar/topjava/repository/mock/InMemoryUserMealRepositoryImpl.java @@ -0,0 +1,86 @@ +package ru.javawebinar.topjava.repository.mock; + +import org.springframework.stereotype.Repository; +import ru.javawebinar.topjava.model.UserMeal; +import ru.javawebinar.topjava.repository.UserMealRepository; +import ru.javawebinar.topjava.util.TimeUtil; +import ru.javawebinar.topjava.util.UserMealsUtil; + +import java.util.Collection; +import java.util.Map; +import java.time.LocalDateTime; +import java.time.Month; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; + +import static ru.javawebinar.topjava.UserTestData.ADMIN_ID; +import static ru.javawebinar.topjava.UserTestData.USER_ID; + +/** + * GKislin + * 15.09.2015. + */ +@Repository +public class InMemoryUserMealRepositoryImpl implements UserMealRepository { + private static final Comparator USER_MEAL_COMPARATOR = Comparator.comparing(UserMeal::getDateTime).reversed(); + + // Map userId -> (mealId-> meal) + private Map> repository = new ConcurrentHashMap<>(); + private AtomicInteger counter = new AtomicInteger(0); + + { + UserMealsUtil.MEAL_LIST.forEach(um -> save(um, USER_ID)); + + save(new UserMeal(LocalDateTime.of(2015, Month.JUNE, 1, 14, 0), "Админ ланч", 510), ADMIN_ID); + save(new UserMeal(LocalDateTime.of(2015, Month.JUNE, 1, 21, 0), "Админ ужин", 1500), ADMIN_ID); + } + + @Override + public UserMeal save(UserMeal userMeal, int userId) { + Objects.requireNonNull(userMeal); + + Integer mealId = userMeal.getId(); + + if (userMeal.isNew()) { + mealId = counter.incrementAndGet(); + userMeal.setId(mealId); + } else if (get(mealId, userId) == null) { + return null; + } + Map userMeals = repository.computeIfAbsent(userId, ConcurrentHashMap::new); + userMeals.put(mealId, userMeal); + return userMeal; + } + + @Override + public boolean delete(int id, int userId) { + Map userMeals = repository.get(userId); + return userMeals != null && userMeals.remove(id) != null; + } + + @Override + public UserMeal get(int id, int userId) { + Map userMeals = repository.get(userId); + return userMeals == null ? null : userMeals.get(id); + } + + @Override + public Collection getAll(int userId) { + Map userMeals = repository.get(userId); + return userMeals == null ? + Collections.emptyList() : + userMeals.values().stream().sorted(USER_MEAL_COMPARATOR).collect(Collectors.toList()); + } + + @Override + public Collection getBetween(LocalDateTime startDateTime, LocalDateTime + endDateTime, int userId) { + Objects.requireNonNull(startDateTime); + Objects.requireNonNull(endDateTime); + return getAll(userId).stream() + .filter(um -> TimeUtil.isBetween(um.getDateTime(), startDateTime, endDateTime)) + .collect(Collectors.toList()); + } +} diff --git a/src/test/java/ru/javawebinar/topjava/repository/mock/InMemoryUserRepositoryImpl.java b/src/test/java/ru/javawebinar/topjava/repository/mock/InMemoryUserRepositoryImpl.java new file mode 100644 index 000000000000..8bdae5d96824 --- /dev/null +++ b/src/test/java/ru/javawebinar/topjava/repository/mock/InMemoryUserRepositoryImpl.java @@ -0,0 +1,77 @@ +package ru.javawebinar.topjava.repository.mock; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Repository; +import ru.javawebinar.topjava.model.User; +import ru.javawebinar.topjava.repository.UserRepository; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; + +/** + * GKislin + * 15.06.2015. + */ +@Repository +public class InMemoryUserRepositoryImpl implements UserRepository { + private static final Logger LOG = LoggerFactory.getLogger(InMemoryUserRepositoryImpl.class); + + private Map repository = new ConcurrentHashMap<>(); + private AtomicInteger counter = new AtomicInteger(0); + + private static final Comparator USER_COMPARATOR = Comparator.comparing(User::getName); + + @Override + public User save(User user) { + Objects.requireNonNull(user); + if (user.isNew()) { + user.setId(counter.incrementAndGet()); + } + repository.put(user.getId(), user); + return user; + } + + @PostConstruct + public void postConstruct() { + LOG.info("+++ PostConstruct"); + } + + @PreDestroy + public void preDestroy() { + LOG.info("+++ PreDestroy"); + } + + @Override + public boolean delete(int id) { + return repository.remove(id) != null; + } + + @Override + public User get(int id) { + return repository.get(id); + } + + @Override + public List getAll() { + return repository.values().stream() + .sorted(USER_COMPARATOR) + .collect(Collectors.toList()); + } + + @Override + public User getByEmail(String email) { + Objects.requireNonNull(email); + return repository.values().stream() + .filter(u -> email.equals(u.getEmail())) + .findFirst() + .orElse(null); + } +} diff --git a/src/test/java/ru/javawebinar/topjava/service/UserServiceTest.java b/src/test/java/ru/javawebinar/topjava/service/UserServiceTest.java new file mode 100644 index 000000000000..c9c6eb8fd0f0 --- /dev/null +++ b/src/test/java/ru/javawebinar/topjava/service/UserServiceTest.java @@ -0,0 +1,95 @@ +package ru.javawebinar.topjava.service; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DataAccessException; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import ru.javawebinar.topjava.UserTestData.*; +import ru.javawebinar.topjava.model.Role; +import ru.javawebinar.topjava.model.User; +import ru.javawebinar.topjava.util.DbPopulator; +import ru.javawebinar.topjava.util.exception.NotFoundException; + +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; + +import static ru.javawebinar.topjava.UserTestData.*; + +@ContextConfiguration({ + "classpath:spring/spring-app.xml", + "classpath:spring/spring-db.xml" +}) +@RunWith(SpringJUnit4ClassRunner.class) +public class UserServiceTest { + + @Autowired + protected UserService service; + + @Autowired + private DbPopulator dbPopulator; + + @Before + public void setUp() throws Exception { + dbPopulator.execute(); + } + + @Test + public void testSave() throws Exception { + TestUser tu = new TestUser(null, "New", "new@gmail.com", "newPass", 1555, false, Collections.singleton(Role.ROLE_USER)); + User created = service.save(tu.asUser()); + tu.setId(created.getId()); + MATCHER.assertCollectionEquals(Arrays.asList(ADMIN, tu, USER), service.getAll()); + } + + @Test(expected = DataAccessException.class) + public void testDuplicateMailSave() throws Exception { + service.save(new TestUser("Duplicate", "user@yandex.ru", "newPass", Role.ROLE_USER).asUser()); + } + + @Test + public void testDelete() throws Exception { + service.delete(USER_ID); + MATCHER.assertCollectionEquals(Collections.singletonList(ADMIN), service.getAll()); + } + + @Test(expected = NotFoundException.class) + public void testNotFoundDelete() throws Exception { + service.delete(1); + } + + @Test + public void testGet() throws Exception { + User user = service.get(USER_ID); + MATCHER.assertEquals(USER, user); + } + + @Test(expected = NotFoundException.class) + public void testGetNotFound() throws Exception { + service.get(1); + } + + @Test + public void testGetByEmail() throws Exception { + User user = service.getByEmail("user@yandex.ru"); + MATCHER.assertEquals(USER, user); + } + + @Test + public void testGetAll() throws Exception { + Collection all = service.getAll(); + MATCHER.assertCollectionEquals(Arrays.asList(ADMIN, USER), all); + } + + @Test + public void testUpdate() throws Exception { + TestUser updated = new TestUser(USER); + updated.setName("UpdatedName"); + updated.setCaloriesPerDay(330); + service.update(updated.asUser()); + MATCHER.assertEquals(updated, service.get(USER_ID)); + } +} \ No newline at end of file diff --git a/src/test/java/ru/javawebinar/topjava/web/InMemoryAdminRestControllerSpringTest.java b/src/test/java/ru/javawebinar/topjava/web/InMemoryAdminRestControllerSpringTest.java new file mode 100644 index 000000000000..9396810afe48 --- /dev/null +++ b/src/test/java/ru/javawebinar/topjava/web/InMemoryAdminRestControllerSpringTest.java @@ -0,0 +1,54 @@ +package ru.javawebinar.topjava.web; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import ru.javawebinar.topjava.UserTestData; +import ru.javawebinar.topjava.model.User; +import ru.javawebinar.topjava.repository.UserRepository; +import ru.javawebinar.topjava.util.exception.NotFoundException; +import ru.javawebinar.topjava.web.user.AdminRestController; + +import java.util.Collection; + +import static ru.javawebinar.topjava.UserTestData.ADMIN; +import static ru.javawebinar.topjava.UserTestData.USER; + +/** + * GKislin + * 13.03.2015. + */ +@ContextConfiguration("classpath:spring/spring-app.xml") +@RunWith(SpringJUnit4ClassRunner.class) +public class InMemoryAdminRestControllerSpringTest { + + @Autowired + private AdminRestController controller; + + @Autowired + private UserRepository repository; + + @Before + public void setUp() throws Exception { + repository.getAll().forEach(u -> repository.delete(u.getId())); + repository.save(USER); + repository.save(ADMIN); + } + + @Test + public void testDelete() throws Exception { + controller.delete(UserTestData.USER_ID); + Collection users = controller.getAll(); + Assert.assertEquals(users.size(), 1); + Assert.assertEquals(users.iterator().next(), ADMIN); + } + + @Test(expected = NotFoundException.class) + public void testDeleteNotFound() throws Exception { + controller.delete(10); + } +} diff --git a/src/test/java/ru/javawebinar/topjava/web/InMemoryAdminRestControllerTest.java b/src/test/java/ru/javawebinar/topjava/web/InMemoryAdminRestControllerTest.java new file mode 100644 index 000000000000..043542ec585a --- /dev/null +++ b/src/test/java/ru/javawebinar/topjava/web/InMemoryAdminRestControllerTest.java @@ -0,0 +1,55 @@ +package ru.javawebinar.topjava.web; + +import org.junit.*; +import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; +import ru.javawebinar.topjava.UserTestData; +import ru.javawebinar.topjava.model.User; +import ru.javawebinar.topjava.repository.UserRepository; +import ru.javawebinar.topjava.util.exception.NotFoundException; +import ru.javawebinar.topjava.web.user.AdminRestController; + +import java.util.Arrays; +import java.util.Collection; + +import static ru.javawebinar.topjava.UserTestData.ADMIN; +import static ru.javawebinar.topjava.UserTestData.USER; + +public class InMemoryAdminRestControllerTest { + private static ConfigurableApplicationContext appCtx; + private static AdminRestController controller; + + @BeforeClass + public static void beforeClass() { + appCtx = new ClassPathXmlApplicationContext("spring/spring-app.xml"); + System.out.println("\n" + Arrays.toString(appCtx.getBeanDefinitionNames()) + "\n"); + controller = appCtx.getBean(AdminRestController.class); + } + + @AfterClass + public static void afterClass() { + appCtx.close(); + } + + @Before + public void setUp() throws Exception { + // Re-initialize + UserRepository repository = appCtx.getBean(UserRepository.class); + repository.getAll().forEach(u -> repository.delete(u.getId())); + repository.save(USER); + repository.save(ADMIN); + } + + @Test + public void testDelete() throws Exception { + controller.delete(UserTestData.USER_ID); + Collection users = controller.getAll(); + Assert.assertEquals(users.size(), 1); + Assert.assertEquals(users.iterator().next(), ADMIN); + } + + @Test(expected = NotFoundException.class) + public void testDeleteNotFound() throws Exception { + controller.delete(0); + } +} \ No newline at end of file