Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Hw 08 patches #198

Open
wants to merge 117 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
3d9b071
prepare to HW0 patch
kaklyugin Jan 28, 2024
205f3e2
1 opt 3 HW0 opt2
kaklyugin Feb 4, 2024
44cee28
1 1 HW0 streams
kaklyugin Feb 4, 2024
7eeade7
1_0_fix_rename
kaklyugin Feb 4, 2024
cc1c420
1_2_war
kaklyugin Feb 4, 2024
440d1c0
1_3_servlet_api
kaklyugin Feb 4, 2024
c47531c
1_5_simple_logging
kaklyugin Feb 4, 2024
5d43199
1_6_logging_config
kaklyugin Feb 4, 2024
59dd1eb
Brought to accordance with master@https://github.com/JavaWebinar/topj…
kaklyugin Feb 8, 2024
50ab0b0
Applied patch 2_1_HW1
kaklyugin Feb 9, 2024
241028f
Applied patch 2_2_HW1_optional
kaklyugin Feb 9, 2024
7826a04
Applied patch 2_3_app_layers
kaklyugin Feb 9, 2024
895fb46
Applied patch 2_4_add_spring
kaklyugin Feb 9, 2024
a674839
Applied patch 2_5_add_spring_context
kaklyugin Feb 9, 2024
fe29431
Applied patch 2_6_dependency_injection
kaklyugin Feb 9, 2024
238e0c2
Applied patch 2_6_dependency_injection
kaklyugin Feb 9, 2024
fabe0c8
Applied patch 2_7_annotation_processing.patch
kaklyugin Feb 9, 2024
c5dd75b
3 01 HW2 repositories
kaklyugin Feb 24, 2024
4809e5a
3 02 HW2 repo filters
kaklyugin Feb 24, 2024
37041a8
3_03_HW2_meal_layers Default changelist
kaklyugin Feb 24, 2024
5c32928
3 02 HW2 repo filters DateTimeUtil
kaklyugin Feb 24, 2024
8911827
3_03_HW2_meal_layers-3
kaklyugin Feb 24, 2024
cd3a556
3 04 refactor repository
kaklyugin Feb 24, 2024
985216a
3 05 HW2 optional MealServlet
kaklyugin Feb 24, 2024
e7ff345
3_03_HW2_meal_layers-3 DateTimeUtil
kaklyugin Feb 24, 2024
e78df79
3 06 HW2 optional filter
kaklyugin Feb 24, 2024
ab78bb4
3 07 HW2 optional select user
kaklyugin Feb 24, 2024
710f6ee
3_08_bean_life_cycle-2
kaklyugin Feb 24, 2024
02edd0f
3_09_add_junit-2
kaklyugin Feb 24, 2024
5235cef
3_10_add_spring_test
kaklyugin Feb 24, 2024
6dceb1f
3_11_add_postgresql
kaklyugin Feb 24, 2024
a00b675
3_12_db_implementation
kaklyugin Feb 24, 2024
ecdc83b
3_13_test_UserService
kaklyugin Feb 24, 2024
0ac5641
3 14 test logging
kaklyugin Feb 24, 2024
df3cfac
3 15 fix servlet
kaklyugin Feb 24, 2024
e4f08e2
4_1_HW_3 patch
kaklyugin Mar 2, 2024
4219d28
4_2_HW_3 patch
kaklyugin Mar 2, 2024
a5d3948
4_2_HW_3 patch
kaklyugin Mar 2, 2024
f509060
Added Codacy Badge. Updated Meal.java
kaklyugin Mar 2, 2024
2f6cd9a
Modified codacy badge
kaklyugin Mar 2, 2024
e6479b8
4_5_patch
kaklyugin Mar 2, 2024
563ac39
4_6_patch
kaklyugin Mar 2, 2024
fbf9610
update spring-app.xml
kaklyugin Mar 2, 2024
990f8cc
4_7_patch
kaklyugin Mar 2, 2024
54e1012
update_pom (hibernate+glassfish)
kaklyugin Mar 2, 2024
a746d6f
4_8_patch
kaklyugin Mar 2, 2024
5d07078
4_9_patch
kaklyugin Mar 2, 2024
034397c
Added logger for DB transactions
kaklyugin Mar 2, 2024
f19b0dc
4_10_patch
kaklyugin Mar 2, 2024
3c95bc9
4_1
kaklyugin Mar 2, 2024
ad8bb11
4_2
kaklyugin Mar 2, 2024
c39168c
4_3
kaklyugin Mar 2, 2024
407acf1
4_4
kaklyugin Mar 2, 2024
ff49e93
4_5
kaklyugin Mar 2, 2024
b13a00c
4_6
kaklyugin Mar 2, 2024
dce4473
4_7
kaklyugin Mar 2, 2024
2f5369d
4_8
kaklyugin Mar 2, 2024
ca48b10
4_9
kaklyugin Mar 2, 2024
7cb3c7b
4_10
kaklyugin Mar 2, 2024
ef8adfd
removed empty spaces to align ideally with reference master branch
kaklyugin Mar 2, 2024
db6d539
Merge remote-tracking branch 'origin/master'
kaklyugin Mar 2, 2024
5efa02c
Applied patch 5_1. JVM updated to v.21
kaklyugin Mar 5, 2024
bc83dfc
Applied patch 5_2 with homework of lesson 4
kaklyugin Mar 5, 2024
5e4e1d1
Applied patch 5_3 with fix of hibernate issue.
kaklyugin Mar 5, 2024
8a775df
Applied patch 5_4 with fix optional homework.
kaklyugin Mar 5, 2024
93552cf
Applied patch 5_5 with db connection pool and DB&Spring profiles
kaklyugin Mar 5, 2024
bf62f2c
Applied patch 5_6 with profile resolver.
kaklyugin Mar 5, 2024
79305e9
Applied patch 5_7 with spring jpa repository.
kaklyugin Mar 5, 2024
c737f5c
Applied patch 5_8 with spring cache.
kaklyugin Mar 5, 2024
71fa013
6_0_update_version
kaklyugin Mar 12, 2024
f510ccb
6_01 HW5 implement data jpa
kaklyugin Mar 12, 2024
ac1f2e5
6_02_HW5 profile for tests
kaklyugin Mar 12, 2024
0ceafd1
6_03 extract rules (TimingRules)
kaklyugin Mar 12, 2024
c74438e
6_04_HW5 optional fix jdbc profiles
kaklyugin Mar 12, 2024
4ae3a49
6_05 update hsqldb
kaklyugin Mar 12, 2024
755a425
6_06 HW5 optional fetch join
kaklyugin Mar 12, 2024
cc2bb27
6_07_HW5 entity graph batch size
kaklyugin Mar 12, 2024
d84dcaf
6_08_add_test_validation
kaklyugin Mar 12, 2024
f55a85d
6_09_hibernate_cache
kaklyugin Mar 12, 2024
f27b414
6_10 add cascade ddl
kaklyugin Mar 12, 2024
3efbff7
6_11 add spring web
kaklyugin Mar 12, 2024
30dd532
6_12 jsp_jstl i18n
kaklyugin Mar 12, 2024
31dc42b
6_13_tomcat_pool_jndi_cargo
kaklyugin Mar 12, 2024
f378c70
6_14_spring_webmvc
kaklyugin Mar 12, 2024
7ca6939
6_15_spring_i18n
kaklyugin Mar 12, 2024
908f696
Aligned with reference master branch
kaklyugin Mar 12, 2024
13febfd
Fixed JSP,tests, beans.
Mar 27, 2024
4b17370
7_02_HW6 fix meals
Mar 27, 2024
a58aa45
7_03_HW6 fix_relative url utf8
Mar 27, 2024
2ef5784
7_04_HW6 optional add role
Mar 27, 2024
4919d84
7_05_HW6 fix hint graph
Mar 27, 2024
b49c71a
7_06_HW6 jdbc transaction roles
Mar 27, 2024
b8d4f2d
7_07_HW6_jdbc_validation
Mar 27, 2024
76a76f9
7_08_HW06_disable_tests_cache
Mar 27, 2024
517b74a
7_09_controller_test
Mar 27, 2024
3ba5be3
7_10_JUnit5
Mar 27, 2024
e571a7a
7_11_rest_controller
Mar 27, 2024
446e4e1
7_12_rest_test_jackson
Mar 27, 2024
96f0b7c
7_13_jackson_object_mapper
Mar 27, 2024
e755d23
7_14_json_assert_tests
Mar 27, 2024
166c07c
7_15_tests_refactoring
Mar 27, 2024
79281ee
7_16_soapui_utf8_converter
Mar 27, 2024
ca890f3
Merge pull request #1 from kaklyugin/patches_07
kaklyugin Mar 27, 2024
bcf3243
8_01_HW07_controller_test
Mar 30, 2024
6c0ea88
8_02_HW07 rest controller and tests (strategy pattern)
Mar 31, 2024
4ab92c3
8_03_HW07_formatters
Mar 31, 2024
8bef51b
8_04_HW07_soapui_curl
Mar 31, 2024
126a1fc
8_05_HW07_with_meals
Mar 31, 2024
2b3eb94
8_06_HW07_test_with_meals
Mar 31, 2024
681ac45
8_07_webjars
Mar 31, 2024
01170c0
8_08_bootstrap4
Mar 31, 2024
418f639
8_09_ajax_datatables
Mar 31, 2024
86d41e6
8_10_refactor_js
Mar 31, 2024
e32c35b
8_11_notification
Mar 31, 2024
766a980
8_12_add_rest_security
Mar 31, 2024
c117b1b
Revert "8_12_add_rest_security"
Mar 31, 2024
344f2e8
8_12_add_rest_security
Mar 31, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .codacy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
exclude_paths:
- 'src/main/webapp/**'
- '**.md'
- '**.sql'
394 changes: 146 additions & 248 deletions README.md

Large diffs are not rendered by default.

609 changes: 609 additions & 0 deletions config/Topjava-soapui-project.xml

Large diffs are not rendered by default.

29 changes: 29 additions & 0 deletions config/curl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
### curl samples (application deployed at application context `topjava`).
> For windows use `Git Bash`

#### get All Users
`curl -s http://localhost:8080/topjava/rest/admin/users --user [email protected]:admin`

#### get Users 100001
`curl -s http://localhost:8080/topjava/rest/admin/users/100001 --user [email protected]:admin`

#### get All Meals
`curl -s http://localhost:8080/topjava/rest/profile/meals --user [email protected]:password`

#### get Meals 100003
`curl -s http://localhost:8080/topjava/rest/profile/meals/100003 --user [email protected]:password`

#### filter Meals
`curl -s "http://localhost:8080/topjava/rest/profile/meals/filter?startDate=2020-01-30&startTime=07:00:00&endDate=2020-01-31&endTime=11:00:00" --user [email protected]:password`

#### get Meals not found
`curl -s -v http://localhost:8080/topjava/rest/profile/meals/100008 --user [email protected]:password`

#### delete Meals
`curl -s -X DELETE http://localhost:8080/topjava/rest/profile/meals/100002 --user [email protected]:password`

#### create Meals
`curl -s -X POST -d '{"dateTime":"2020-02-01T12:00","description":"Created lunch","calories":300}' -H 'Content-Type:application/json;charset=UTF-8' http://localhost:8080/topjava/rest/profile/meals --user [email protected]:password`

#### update Meals
`curl -s -X PUT -d '{"dateTime":"2020-01-30T07:00", "description":"Updated breakfast", "calories":200}' -H 'Content-Type: application/json' http://localhost:8080/topjava/rest/profile/meals/100003 --user [email protected]:password`
32 changes: 32 additions & 0 deletions config/messages/app.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
app.title=Calories management
app.footer=<a href="https://github.com/JavaOPs/topjava" target=_blank>Spring 5/JPA Enterprise (Topjava)</a> internship application
app.login=Login as

user.title=Users
user.edit=Edit user
user.add=Add user
user.name=Name
user.email=Email
user.roles=Roles
user.active=Active
user.registered=Registered
user.password=Password

meal.title=Meals
meal.edit=Edit meal
meal.add=Add meal
meal.filter=Filter
meal.startDate=From date (inclusive)
meal.endDate=To date (inclusive)
meal.startTime=From time (inclusive)
meal.endTime=To time (exclusive)
meal.description=Description
meal.dateTime=Date/Time
meal.calories=Calories

common.add=Add
common.select=Select
common.delete=Delete
common.update=Update
common.save=Save
common.cancel=Cancel
32 changes: 32 additions & 0 deletions config/messages/app_ru.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
app.title=Подсчет калорий
app.footer=Приложение стажировки <a href="https://github.com/JavaOPs/topjava" target=_blank>Spring 5/JPA Enterprise (Topjava)</a>
app.login=Зайти как

user.title=Пользователи
user.edit=Редактировать пользователя
user.add=Добавить пользователя
user.name=Имя
user.email=Почта
user.roles=Роли
user.active=Активный
user.registered=Зарегистрирован
user.password=Пароль

meal.title=Моя еда
meal.edit=Редактировать еду
meal.add=Добавить еду
meal.filter=Отфильтровать
meal.startDate=От даты (включая)
meal.endDate=До даты (включая)
meal.startTime=От времени (включая)
meal.endTime=До времени (исключая)
meal.description=Описание
meal.dateTime=Дата/Время
meal.calories=Калории

common.add=Добавить
common.select=Выбрать
common.delete=Удалить
common.update=Обновить
common.save=Сохранить
common.cancel=Отменить
Loading