From 63087ddd548e5c19da6244355d4dbb4865c71407 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Wed, 22 Jul 2020 21:25:11 -0700 Subject: [PATCH] Updating Documentation --- README.md | 4 +- .../.gitignore | 0 .../.mvn/wrapper/MavenWrapperDownloader.java | 0 .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 usermodel-exceptions-initial/README.md | 1054 ++ .../javadocs/allclasses-index.html | 177 +- .../javadocs/allclasses.html | 10 +- .../javadocs/allpackages-index.html | 109 +- .../com/lambdaschool/usermodel/SeedData.html | 230 +- .../usermodel/UserModelApplication.html | 226 +- .../config/H2ServerConfiguration.html | 245 +- .../usermodel/config/Swagger2Config.html | 229 +- .../usermodel/config/package-summary.html | 103 +- .../usermodel/config/package-tree.html | 95 +- .../controllers/RolesController.html | 358 +- .../usermodel/controllers/UserController.html | 445 +- .../controllers/UseremailController.html | 335 +- .../controllers/package-summary.html | 103 +- .../usermodel/controllers/package-tree.html | 95 +- .../lambdaschool/usermodel/models/Role.html | 372 +- .../lambdaschool/usermodel/models/User.html | 484 +- .../usermodel/models/UserRoles.html | 372 +- .../usermodel/models/UserRolesId.html | 351 + .../usermodel/models/Useremail.html | 372 +- .../usermodel/models/package-summary.html | 109 +- .../usermodel/models/package-tree.html | 96 +- .../usermodel/package-summary.html | 120 +- .../lambdaschool/usermodel/package-tree.html | 96 +- .../usermodel/repository/RoleRepository.html | 197 +- .../usermodel/repository/UserRepository.html | 236 + .../repository/UseremailRepository.html | 160 + .../usermodel/repository/package-summary.html | 103 +- .../usermodel/repository/package-tree.html | 95 +- .../usermodel/services/RoleService.html | 247 +- .../usermodel/services/RoleServiceImpl.html | 311 +- .../usermodel/services/UserAuditing.html | 226 +- .../usermodel/services/UserService.html | 317 +- .../usermodel/services/UserServiceImpl.html | 398 +- .../usermodel/services/UseremailService.html | 247 +- .../services/UseremailServiceImpl.html | 316 +- .../usermodel/services/package-summary.html | 111 +- .../usermodel/services/package-tree.html | 97 +- .../javadocs/constant-values.html | 95 +- .../javadocs/deprecated-list.html | 93 +- .../javadocs/element-list | 1 - .../javadocs/help-doc.html | 141 +- .../javadocs/index-files/index-1.html | 110 +- .../javadocs/index-files/index-10.html | 108 + .../javadocs/index-files/index-11.html | 100 +- .../javadocs/index-files/index-12.html | 112 +- .../javadocs/index-files/index-13.html | 122 +- .../javadocs/index-files/index-2.html | 110 +- .../javadocs/index-files/index-3.html | 133 +- .../javadocs/index-files/index-4.html | 102 +- .../javadocs/index-files/index-5.html | 114 +- .../javadocs/index-files/index-6.html | 134 +- .../javadocs/index-files/index-7.html | 102 +- .../javadocs/index-files/index-8.html | 100 +- .../javadocs/index-files/index-9.html | 100 +- .../javadocs/index.html | 105 +- .../javadocs/jquery/external/jquery/jquery.js | 0 .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin .../images/ui-bg_glass_65_dadada_1x400.png | Bin .../images/ui-bg_glass_75_dadada_1x400.png | Bin .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin .../jquery/images/ui-icons_222222_256x240.png | Bin .../jquery/images/ui-icons_2e83ff_256x240.png | Bin .../jquery/images/ui-icons_454545_256x240.png | Bin .../jquery/images/ui-icons_888888_256x240.png | Bin .../jquery/images/ui-icons_cd0a0a_256x240.png | Bin .../javadocs/jquery/jquery-3.4.1.js | 0 .../javadocs/jquery/jquery-ui.css | 0 .../javadocs/jquery/jquery-ui.js | 0 .../javadocs/jquery/jquery-ui.min.css | 0 .../javadocs/jquery/jquery-ui.min.js | 0 .../javadocs/jquery/jquery-ui.structure.css | 0 .../jquery/jquery-ui.structure.min.css | 0 .../jquery/jszip-utils/dist/jszip-utils-ie.js | 0 .../jszip-utils/dist/jszip-utils-ie.min.js | 0 .../jquery/jszip-utils/dist/jszip-utils.js | 0 .../jszip-utils/dist/jszip-utils.min.js | 0 .../javadocs/jquery/jszip/dist/jszip.js | 0 .../javadocs/jquery/jszip/dist/jszip.min.js | 0 .../javadocs/member-search-index.js | 1 + .../javadocs/member-search-index.zip | Bin 0 -> 1417 bytes .../javadocs/overview-summary.html | 11 +- .../javadocs/overview-tree.html | 104 +- .../javadocs/package-search-index.js | 2 +- .../javadocs/package-search-index.zip | Bin 0 -> 283 bytes .../javadocs/resources/glass.png | Bin .../javadocs/resources/x.png | Bin .../script-dir/external/jquery/jquery.js | 10598 ++++++++++++++ .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 0 -> 335 bytes .../images/ui-bg_glass_65_dadada_1x400.png | Bin 0 -> 262 bytes .../images/ui-bg_glass_75_dadada_1x400.png | Bin 0 -> 262 bytes .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 0 -> 262 bytes .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 0 -> 332 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 0 -> 280 bytes .../images/ui-icons_222222_256x240.png | Bin 0 -> 6922 bytes .../images/ui-icons_2e83ff_256x240.png | Bin 0 -> 4549 bytes .../images/ui-icons_454545_256x240.png | Bin 0 -> 6992 bytes .../images/ui-icons_888888_256x240.png | Bin 0 -> 6999 bytes .../images/ui-icons_cd0a0a_256x240.png | Bin 0 -> 4549 bytes .../javadocs/script-dir/jquery-3.4.1.js | 10598 ++++++++++++++ .../javadocs/script-dir/jquery-ui.css | 582 + .../javadocs/script-dir/jquery-ui.js | 2659 ++++ .../javadocs/script-dir/jquery-ui.min.css | 7 + .../javadocs/script-dir/jquery-ui.min.js | 6 + .../script-dir/jquery-ui.structure.css | 156 + .../script-dir/jquery-ui.structure.min.css | 5 + .../jszip-utils/dist/jszip-utils-ie.js | 56 + .../jszip-utils/dist/jszip-utils-ie.min.js | 10 + .../jszip-utils/dist/jszip-utils.js | 118 + .../jszip-utils/dist/jszip-utils.min.js | 10 + .../javadocs/script-dir/jszip/dist/jszip.js | 11367 ++++++++++++++++ .../script-dir/jszip/dist/jszip.min.js | 13 + .../javadocs/script.js | 82 +- .../javadocs/search.js | 358 + .../javadocs/serialized-form.html | 135 +- .../javadocs/stylesheet.css | 432 +- .../javadocs/system-properties.html | 105 + .../javadocs/type-search-index.js | 1 + .../javadocs/type-search-index.zip | Bin 0 -> 429 bytes .../mvnw | 0 .../mvnw.cmd | 0 .../pom.xml | 7 +- .../com/lambdaschool/usermodel/SeedData.java | 158 + .../usermodel/UserModelApplication.java | 2 +- .../config/H2ServerConfiguration.java | 20 +- .../usermodel/config/Swagger2Config.java | 31 +- .../usermodel/config/package-info.java | 0 .../controllers/RolesController.java | 97 +- .../usermodel/controllers/UserController.java | 140 +- .../controllers/UseremailController.java | 66 +- .../usermodel/controllers/package-info.java | 0 .../usermodel/models/Auditable.java | 0 .../lambdaschool/usermodel/models/Role.java | 38 +- .../lambdaschool/usermodel/models/User.java | 71 +- .../usermodel/models/UserRoles.java | 33 +- .../usermodel/models/UserRolesId.java | 90 + .../usermodel/models/Useremail.java | 19 +- .../usermodel/models/package-info.java | 0 .../lambdaschool/usermodel/package-info.java | 0 .../usermodel/repository/RoleRepository.java | 11 +- .../usermodel/repository/UserRepository.java | 29 + .../repository/UseremailRepository.java | 12 + .../usermodel/repository/package-info.java | 0 .../usermodel/services/RoleService.java | 13 +- .../usermodel/services/RoleServiceImpl.java | 35 +- .../usermodel/services/UserAuditing.java | 2 +- .../usermodel/services/UserService.java | 35 +- .../usermodel/services/UserServiceImpl.java | 186 + .../usermodel/services/UseremailService.java | 17 +- .../services/UseremailServiceImpl.java | 28 +- .../usermodel/services/package-info.java | 0 .../src/main/resources/application.properties | 0 .../usermodel/UserModelApplication.java | 52 + usermodel-exceptions-initial/usersdb.png | Bin 0 -> 108198 bytes .../usersfinaldb.png | Bin usermodel-exceptions/README.md | 2562 +--- .../javadocs/allclasses-index.html | 203 +- usermodel-exceptions/javadocs/allclasses.html | 21 +- .../javadocs/allpackages-index.html | 109 +- .../com/lambdaschool/usermodel/SeedData.html | 230 +- .../usermodel/SeedData_backup.html | 330 - .../usermodel/UserModelApplication.html | 310 +- .../usermodel/UserModelApplicationTests.html | 306 - .../config/H2ServerConfiguration.html | 245 +- .../usermodel/config/Swagger2Config.html | 229 +- .../usermodel/config/SwaggerWebMVC.html | 234 +- .../usermodel/config/package-summary.html | 103 +- .../usermodel/config/package-tree.html | 95 +- .../controllers/CountryDataController.html | 266 +- .../controllers/RolesController.html | 365 +- .../usermodel/controllers/UserController.html | 457 +- .../controllers/UseremailController.html | 335 +- .../controllers/package-summary.html | 103 +- .../usermodel/controllers/package-tree.html | 95 +- .../exceptions/CustomErrorDetails.html | 265 +- .../exceptions/ResourceFoundException.html | 220 +- .../exceptions/ResourceNotFoundException.html | 220 +- .../usermodel/exceptions/package-summary.html | 109 +- .../usermodel/exceptions/package-tree.html | 95 +- .../usermodel/handlers/HelperFunctions.html | 316 - .../handlers/RestExceptionHandler.html | 680 +- .../usermodel/handlers/package-summary.html | 109 +- .../usermodel/handlers/package-tree.html | 96 +- .../usermodel/models/CountryData.html | 367 +- .../usermodel/models/Currency.html | 289 +- .../usermodel/models/ErrorDetail.html | 367 +- .../lambdaschool/usermodel/models/Role.html | 372 +- .../lambdaschool/usermodel/models/User.html | 484 +- .../usermodel/models/UserRoles.html | 372 +- .../usermodel/models/UserRolesId.html | 351 + .../usermodel/models/Useremail.html | 372 +- .../usermodel/models/ValidationError.html | 276 +- .../usermodel/models/package-summary.html | 109 +- .../usermodel/models/package-tree.html | 96 +- .../usermodel/package-summary.html | 124 +- .../lambdaschool/usermodel/package-tree.html | 96 +- .../usermodel/repository/RoleRepository.html | 197 +- .../usermodel/repository/UserRepository.html | 299 +- .../repository/UseremailRepository.html | 192 +- .../usermodel/repository/package-summary.html | 103 +- .../usermodel/repository/package-tree.html | 95 +- .../usermodel/services/HelperFunctions.html | 191 +- .../services/HelperFunctionsImpl.html | 311 + .../usermodel/services/RoleService.html | 247 +- .../usermodel/services/RoleServiceImpl.html | 311 +- .../usermodel/services/UserAuditing.html | 226 +- .../usermodel/services/UserService.html | 323 +- .../usermodel/services/UserServiceImpl.html | 406 +- .../usermodel/services/UseremailService.html | 247 +- .../services/UseremailServiceImpl.html | 316 +- .../usermodel/services/package-summary.html | 131 +- .../usermodel/services/package-tree.html | 99 +- .../usermodel/views/JustTheCount.html | 256 - .../usermodel/views/UserNameCountEmails.html | 277 - .../usermodel/views/package-summary.html | 177 - .../usermodel/views/package-tree.html | 158 - .../javadocs/constant-values.html | 95 +- .../javadocs/deprecated-list.html | 93 +- usermodel-exceptions/javadocs/element-list | 1 - usermodel-exceptions/javadocs/help-doc.html | 141 +- .../javadocs/index-files/index-1.html | 110 +- .../javadocs/index-files/index-10.html | 123 +- .../javadocs/index-files/index-11.html | 113 +- .../javadocs/index-files/index-12.html | 161 +- .../javadocs/index-files/index-13.html | 275 +- .../javadocs/index-files/index-14.html | 165 +- .../javadocs/index-files/index-15.html | 278 +- .../javadocs/index-files/index-16.html | 110 +- .../javadocs/index-files/index-17.html | 285 - .../javadocs/index-files/index-18.html | 155 - .../javadocs/index-files/index-2.html | 110 +- .../javadocs/index-files/index-3.html | 135 +- .../javadocs/index-files/index-4.html | 102 +- .../javadocs/index-files/index-5.html | 114 +- .../javadocs/index-files/index-6.html | 141 +- .../javadocs/index-files/index-7.html | 108 +- .../javadocs/index-files/index-8.html | 123 +- .../javadocs/index-files/index-9.html | 110 +- usermodel-exceptions/javadocs/index.html | 105 +- .../javadocs/member-search-index.js | 2 +- .../javadocs/member-search-index.zip | Bin 2911 -> 2650 bytes .../javadocs/overview-summary.html | 11 +- .../javadocs/overview-tree.html | 107 +- .../javadocs/package-search-index.js | 2 +- .../javadocs/package-search-index.zip | Bin 297 -> 295 bytes .../script-dir/external/jquery/jquery.js | 10598 ++++++++++++++ .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 0 -> 335 bytes .../images/ui-bg_glass_65_dadada_1x400.png | Bin 0 -> 262 bytes .../images/ui-bg_glass_75_dadada_1x400.png | Bin 0 -> 262 bytes .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 0 -> 262 bytes .../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 0 -> 332 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 0 -> 280 bytes .../images/ui-icons_222222_256x240.png | Bin 0 -> 6922 bytes .../images/ui-icons_2e83ff_256x240.png | Bin 0 -> 4549 bytes .../images/ui-icons_454545_256x240.png | Bin 0 -> 6992 bytes .../images/ui-icons_888888_256x240.png | Bin 0 -> 6999 bytes .../images/ui-icons_cd0a0a_256x240.png | Bin 0 -> 4549 bytes .../javadocs/script-dir/jquery-3.4.1.js | 10598 ++++++++++++++ .../javadocs/script-dir/jquery-ui.css | 582 + .../javadocs/script-dir/jquery-ui.js | 2659 ++++ .../javadocs/script-dir/jquery-ui.min.css | 7 + .../javadocs/script-dir/jquery-ui.min.js | 6 + .../script-dir/jquery-ui.structure.css | 156 + .../script-dir/jquery-ui.structure.min.css | 5 + .../jszip-utils/dist/jszip-utils-ie.js | 56 + .../jszip-utils/dist/jszip-utils-ie.min.js | 10 + .../jszip-utils/dist/jszip-utils.js | 118 + .../jszip-utils/dist/jszip-utils.min.js | 10 + .../javadocs/script-dir/jszip/dist/jszip.js | 11367 ++++++++++++++++ .../script-dir/jszip/dist/jszip.min.js | 13 + usermodel-exceptions/javadocs/script.js | 82 +- usermodel-exceptions/javadocs/search.js | 270 +- .../javadocs/serialized-form.html | 145 +- usermodel-exceptions/javadocs/stylesheet.css | 432 +- .../javadocs/system-properties.html | 105 + .../javadocs/type-search-index.js | 2 +- .../javadocs/type-search-index.zip | Bin 572 -> 547 bytes usermodel-exceptions/pom.xml | 2 - .../com/lambdaschool/usermodel/SeedData.java | 144 +- .../usermodel/UserModelApplication.java | 2 +- .../config/H2ServerConfiguration.java | 20 +- .../usermodel/config/Swagger2Config.java | 29 +- .../usermodel/config/SwaggerWebMVC.java | 7 +- .../controllers/CountryDataController.java | 16 +- .../controllers/RolesController.java | 97 +- .../usermodel/controllers/UserController.java | 242 +- .../controllers/UseremailController.java | 66 +- .../exceptions/CustomErrorDetails.java | 14 +- .../exceptions/ResourceFoundException.java | 2 +- .../exceptions/ResourceNotFoundException.java | 2 +- .../handlers/RestExceptionHandler.java | 283 +- .../lambdaschool/usermodel/models/Role.java | 40 +- .../lambdaschool/usermodel/models/User.java | 106 +- .../usermodel/models/UserRoles.java | 33 +- .../usermodel/models/UserRolesId.java | 91 + .../usermodel/models/Useremail.java | 22 +- .../usermodel/repository/RoleRepository.java | 11 +- .../usermodel/repository/UserRepository.java | 61 +- .../repository/UseremailRepository.java | 11 +- .../usermodel/services/HelperFunctions.java | 21 + .../HelperFunctionsImpl.java} | 21 +- .../usermodel/services/RoleService.java | 13 +- .../usermodel/services/RoleServiceImpl.java | 47 +- .../usermodel/services/UserAuditing.java | 2 +- .../usermodel/services/UserService.java | 35 +- .../usermodel/services/UserServiceImpl.java | 160 +- .../usermodel/services/UseremailService.java | 17 +- .../services/UseremailServiceImpl.java | 34 +- .../usermodel/views/JustTheCount.java | 14 - .../usermodel/views/UserNameCountEmails.java | 21 - .../usermodel/views/package-info.java | 6 - .../usermodel/UserModelApplication.java | 52 + .../usermodel/UserModelApplicationTests.java | 21 - usermodel-exceptions/usermodel.env | 6 - usermodel-exceptions/usersdb.png | Bin 236752 -> 108198 bytes usermodel-exceptions/usersfinaldb.png | Bin 0 -> 236752 bytes usermodel-initial/README.md | 2335 ---- .../usermodel/SeedData_backup.html | 330 - .../usermodel/UserModelApplicationTests.html | 306 - .../usermodel/repository/UserRepository.html | 405 - .../repository/UseremailRepository.html | 270 - .../usermodel/views/UserNameCountEmails.html | 277 - .../usermodel/views/package-summary.html | 177 - .../usermodel/views/package-tree.html | 158 - .../javadocs/index-files/index-12.html | 164 - .../javadocs/index-files/index-8.html | 153 - .../javadocs/index-files/index-9.html | 153 - .../javadocs/member-search-index.js | 1 - .../javadocs/member-search-index.zip | Bin 1678 -> 0 bytes .../javadocs/package-search-index.zip | Bin 286 -> 0 bytes usermodel-initial/javadocs/search.js | 326 - .../javadocs/type-search-index.js | 1 - .../javadocs/type-search-index.zip | Bin 463 -> 0 bytes .../com/lambdaschool/usermodel/SeedData.java | 166 - .../usermodel/repository/UserRepository.java | 88 - .../repository/UseremailRepository.java | 21 - .../usermodel/services/UserServiceImpl.java | 266 - .../usermodel/views/JustTheCount.java | 14 - .../usermodel/views/UserNameCountEmails.java | 21 - .../usermodel/views/package-info.java | 6 - .../usermodel/UserModelApplicationTests.java | 21 - 348 files changed, 85797 insertions(+), 28815 deletions(-) rename {usermodel-initial => usermodel-exceptions-initial}/.gitignore (100%) rename {usermodel-initial => usermodel-exceptions-initial}/.mvn/wrapper/MavenWrapperDownloader.java (100%) rename {usermodel-initial => usermodel-exceptions-initial}/.mvn/wrapper/maven-wrapper.jar (100%) rename {usermodel-initial => usermodel-exceptions-initial}/.mvn/wrapper/maven-wrapper.properties (100%) create mode 100644 usermodel-exceptions-initial/README.md rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/allclasses-index.html (66%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/allclasses.html (78%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/allpackages-index.html (63%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/SeedData.html (62%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/UserModelApplication.html (58%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/config/H2ServerConfiguration.html (61%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/config/Swagger2Config.html (58%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/config/package-summary.html (59%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/config/package-tree.html (58%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/controllers/RolesController.html (54%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/controllers/UserController.html (55%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/controllers/UseremailController.html (57%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/controllers/package-summary.html (61%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/controllers/package-tree.html (60%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/models/Role.html (61%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/models/User.html (60%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/models/UserRoles.html (63%) create mode 100644 usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/UserRolesId.html rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/models/Useremail.html (63%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/models/package-summary.html (63%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/models/package-tree.html (60%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/package-summary.html (59%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/package-tree.html (56%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/repository/RoleRepository.html (62%) create mode 100644 usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/repository/UserRepository.html create mode 100644 usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/repository/UseremailRepository.html rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/repository/package-summary.html (62%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/repository/package-tree.html (61%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/services/RoleService.html (61%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/services/RoleServiceImpl.html (65%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/services/UserAuditing.html (60%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/services/UserService.html (56%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/services/UserServiceImpl.html (59%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/services/UseremailService.html (58%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/services/UseremailServiceImpl.html (61%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/services/package-summary.html (68%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/com/lambdaschool/usermodel/services/package-tree.html (67%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/constant-values.html (52%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/deprecated-list.html (51%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/element-list (86%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/help-doc.html (69%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/index-files/index-1.html (53%) create mode 100644 usermodel-exceptions-initial/javadocs/index-files/index-10.html rename usermodel-initial/javadocs/index-files/index-13.html => usermodel-exceptions-initial/javadocs/index-files/index-11.html (69%) rename usermodel-initial/javadocs/index-files/index-14.html => usermodel-exceptions-initial/javadocs/index-files/index-12.html (77%) rename usermodel-initial/javadocs/index-files/index-15.html => usermodel-exceptions-initial/javadocs/index-files/index-13.html (79%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/index-files/index-2.html (51%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/index-files/index-3.html (50%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/index-files/index-4.html (51%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/index-files/index-5.html (70%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/index-files/index-6.html (67%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/index-files/index-7.html (61%) rename usermodel-initial/javadocs/index-files/index-10.html => usermodel-exceptions-initial/javadocs/index-files/index-8.html (59%) rename usermodel-initial/javadocs/index-files/index-11.html => usermodel-exceptions-initial/javadocs/index-files/index-9.html (51%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/index.html (63%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/external/jquery/jquery.js (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/images/ui-bg_glass_65_dadada_1x400.png (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/images/ui-bg_glass_75_dadada_1x400.png (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/images/ui-bg_glass_95_fef1ec_1x400.png (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/images/ui-icons_222222_256x240.png (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/images/ui-icons_2e83ff_256x240.png (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/images/ui-icons_454545_256x240.png (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/images/ui-icons_888888_256x240.png (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/images/ui-icons_cd0a0a_256x240.png (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/jquery-3.4.1.js (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/jquery-ui.css (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/jquery-ui.js (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/jquery-ui.min.css (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/jquery-ui.min.js (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/jquery-ui.structure.css (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/jquery-ui.structure.min.css (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/jszip-utils/dist/jszip-utils-ie.js (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/jszip-utils/dist/jszip-utils-ie.min.js (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/jszip-utils/dist/jszip-utils.js (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/jszip-utils/dist/jszip-utils.min.js (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/jszip/dist/jszip.js (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/jquery/jszip/dist/jszip.min.js (100%) create mode 100644 usermodel-exceptions-initial/javadocs/member-search-index.js create mode 100644 usermodel-exceptions-initial/javadocs/member-search-index.zip rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/overview-summary.html (70%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/overview-tree.html (75%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/package-search-index.js (86%) create mode 100644 usermodel-exceptions-initial/javadocs/package-search-index.zip rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/resources/glass.png (100%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/resources/x.png (100%) create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/external/jquery/jquery.js create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/images/ui-bg_glass_55_fbf9ee_1x400.png create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/images/ui-bg_glass_65_dadada_1x400.png create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/images/ui-bg_glass_75_dadada_1x400.png create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/images/ui-bg_glass_75_e6e6e6_1x400.png create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/images/ui-bg_glass_95_fef1ec_1x400.png create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/images/ui-bg_highlight-soft_75_cccccc_1x100.png create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/images/ui-icons_222222_256x240.png create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/images/ui-icons_2e83ff_256x240.png create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/images/ui-icons_454545_256x240.png create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/images/ui-icons_888888_256x240.png create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/images/ui-icons_cd0a0a_256x240.png create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/jquery-3.4.1.js create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/jquery-ui.css create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/jquery-ui.js create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/jquery-ui.min.css create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/jquery-ui.min.js create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/jquery-ui.structure.css create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/jquery-ui.structure.min.css create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/jszip-utils/dist/jszip-utils-ie.js create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/jszip-utils/dist/jszip-utils-ie.min.js create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/jszip-utils/dist/jszip-utils.js create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/jszip-utils/dist/jszip-utils.min.js create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/jszip/dist/jszip.js create mode 100644 usermodel-exceptions-initial/javadocs/script-dir/jszip/dist/jszip.min.js rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/script.js (52%) create mode 100644 usermodel-exceptions-initial/javadocs/search.js rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/serialized-form.html (59%) rename {usermodel-initial => usermodel-exceptions-initial}/javadocs/stylesheet.css (70%) create mode 100644 usermodel-exceptions-initial/javadocs/system-properties.html create mode 100644 usermodel-exceptions-initial/javadocs/type-search-index.js create mode 100644 usermodel-exceptions-initial/javadocs/type-search-index.zip rename {usermodel-initial => usermodel-exceptions-initial}/mvnw (100%) rename {usermodel-initial => usermodel-exceptions-initial}/mvnw.cmd (100%) rename {usermodel-initial => usermodel-exceptions-initial}/pom.xml (93%) create mode 100755 usermodel-exceptions-initial/src/main/java/com/lambdaschool/usermodel/SeedData.java rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/UserModelApplication.java (94%) rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/config/H2ServerConfiguration.java (81%) rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/config/Swagger2Config.java (59%) rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/config/package-info.java (100%) rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/controllers/RolesController.java (66%) rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/controllers/UserController.java (66%) rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/controllers/UseremailController.java (75%) rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/controllers/package-info.java (100%) rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/models/Auditable.java (100%) rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/models/Role.java (77%) rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/models/User.java (77%) rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/models/UserRoles.java (78%) create mode 100644 usermodel-exceptions-initial/src/main/java/com/lambdaschool/usermodel/models/UserRolesId.java rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/models/Useremail.java (89%) rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/models/package-info.java (100%) rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/package-info.java (100%) rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/repository/RoleRepository.java (86%) create mode 100755 usermodel-exceptions-initial/src/main/java/com/lambdaschool/usermodel/repository/UserRepository.java create mode 100644 usermodel-exceptions-initial/src/main/java/com/lambdaschool/usermodel/repository/UseremailRepository.java rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/repository/package-info.java (100%) rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/services/RoleService.java (89%) rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/services/RoleServiceImpl.java (78%) rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/services/UserAuditing.java (93%) rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/services/UserService.java (65%) create mode 100755 usermodel-exceptions-initial/src/main/java/com/lambdaschool/usermodel/services/UserServiceImpl.java rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/services/UseremailService.java (79%) rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/services/UseremailServiceImpl.java (80%) rename {usermodel-initial => usermodel-exceptions-initial}/src/main/java/com/lambdaschool/usermodel/services/package-info.java (100%) rename {usermodel-initial => usermodel-exceptions-initial}/src/main/resources/application.properties (100%) create mode 100644 usermodel-exceptions-initial/src/test/java/com/lambdaschool/usermodel/UserModelApplication.java create mode 100644 usermodel-exceptions-initial/usersdb.png rename usermodel-initial/usersdb.png => usermodel-exceptions-initial/usersfinaldb.png (100%) delete mode 100644 usermodel-exceptions/javadocs/com/lambdaschool/usermodel/SeedData_backup.html delete mode 100644 usermodel-exceptions/javadocs/com/lambdaschool/usermodel/UserModelApplicationTests.html delete mode 100644 usermodel-exceptions/javadocs/com/lambdaschool/usermodel/handlers/HelperFunctions.html create mode 100644 usermodel-exceptions/javadocs/com/lambdaschool/usermodel/models/UserRolesId.html rename usermodel-initial/javadocs/com/lambdaschool/usermodel/views/JustTheCount.html => usermodel-exceptions/javadocs/com/lambdaschool/usermodel/services/HelperFunctions.html (52%) create mode 100644 usermodel-exceptions/javadocs/com/lambdaschool/usermodel/services/HelperFunctionsImpl.html delete mode 100644 usermodel-exceptions/javadocs/com/lambdaschool/usermodel/views/JustTheCount.html delete mode 100644 usermodel-exceptions/javadocs/com/lambdaschool/usermodel/views/UserNameCountEmails.html delete mode 100644 usermodel-exceptions/javadocs/com/lambdaschool/usermodel/views/package-summary.html delete mode 100644 usermodel-exceptions/javadocs/com/lambdaschool/usermodel/views/package-tree.html delete mode 100644 usermodel-exceptions/javadocs/index-files/index-17.html delete mode 100644 usermodel-exceptions/javadocs/index-files/index-18.html create mode 100644 usermodel-exceptions/javadocs/script-dir/external/jquery/jquery.js create mode 100644 usermodel-exceptions/javadocs/script-dir/images/ui-bg_glass_55_fbf9ee_1x400.png create mode 100644 usermodel-exceptions/javadocs/script-dir/images/ui-bg_glass_65_dadada_1x400.png create mode 100644 usermodel-exceptions/javadocs/script-dir/images/ui-bg_glass_75_dadada_1x400.png create mode 100644 usermodel-exceptions/javadocs/script-dir/images/ui-bg_glass_75_e6e6e6_1x400.png create mode 100644 usermodel-exceptions/javadocs/script-dir/images/ui-bg_glass_95_fef1ec_1x400.png create mode 100644 usermodel-exceptions/javadocs/script-dir/images/ui-bg_highlight-soft_75_cccccc_1x100.png create mode 100644 usermodel-exceptions/javadocs/script-dir/images/ui-icons_222222_256x240.png create mode 100644 usermodel-exceptions/javadocs/script-dir/images/ui-icons_2e83ff_256x240.png create mode 100644 usermodel-exceptions/javadocs/script-dir/images/ui-icons_454545_256x240.png create mode 100644 usermodel-exceptions/javadocs/script-dir/images/ui-icons_888888_256x240.png create mode 100644 usermodel-exceptions/javadocs/script-dir/images/ui-icons_cd0a0a_256x240.png create mode 100644 usermodel-exceptions/javadocs/script-dir/jquery-3.4.1.js create mode 100644 usermodel-exceptions/javadocs/script-dir/jquery-ui.css create mode 100644 usermodel-exceptions/javadocs/script-dir/jquery-ui.js create mode 100644 usermodel-exceptions/javadocs/script-dir/jquery-ui.min.css create mode 100644 usermodel-exceptions/javadocs/script-dir/jquery-ui.min.js create mode 100644 usermodel-exceptions/javadocs/script-dir/jquery-ui.structure.css create mode 100644 usermodel-exceptions/javadocs/script-dir/jquery-ui.structure.min.css create mode 100644 usermodel-exceptions/javadocs/script-dir/jszip-utils/dist/jszip-utils-ie.js create mode 100644 usermodel-exceptions/javadocs/script-dir/jszip-utils/dist/jszip-utils-ie.min.js create mode 100644 usermodel-exceptions/javadocs/script-dir/jszip-utils/dist/jszip-utils.js create mode 100644 usermodel-exceptions/javadocs/script-dir/jszip-utils/dist/jszip-utils.min.js create mode 100644 usermodel-exceptions/javadocs/script-dir/jszip/dist/jszip.js create mode 100644 usermodel-exceptions/javadocs/script-dir/jszip/dist/jszip.min.js create mode 100644 usermodel-exceptions/javadocs/system-properties.html create mode 100644 usermodel-exceptions/src/main/java/com/lambdaschool/usermodel/models/UserRolesId.java create mode 100644 usermodel-exceptions/src/main/java/com/lambdaschool/usermodel/services/HelperFunctions.java rename usermodel-exceptions/src/main/java/com/lambdaschool/usermodel/{handlers/HelperFunctions.java => services/HelperFunctionsImpl.java} (76%) delete mode 100644 usermodel-exceptions/src/main/java/com/lambdaschool/usermodel/views/JustTheCount.java delete mode 100644 usermodel-exceptions/src/main/java/com/lambdaschool/usermodel/views/UserNameCountEmails.java delete mode 100644 usermodel-exceptions/src/main/java/com/lambdaschool/usermodel/views/package-info.java create mode 100644 usermodel-exceptions/src/test/java/com/lambdaschool/usermodel/UserModelApplication.java delete mode 100644 usermodel-exceptions/src/test/java/com/lambdaschool/usermodel/UserModelApplicationTests.java delete mode 100644 usermodel-exceptions/usermodel.env create mode 100644 usermodel-exceptions/usersfinaldb.png delete mode 100644 usermodel-initial/README.md delete mode 100644 usermodel-initial/javadocs/com/lambdaschool/usermodel/SeedData_backup.html delete mode 100644 usermodel-initial/javadocs/com/lambdaschool/usermodel/UserModelApplicationTests.html delete mode 100644 usermodel-initial/javadocs/com/lambdaschool/usermodel/repository/UserRepository.html delete mode 100644 usermodel-initial/javadocs/com/lambdaschool/usermodel/repository/UseremailRepository.html delete mode 100644 usermodel-initial/javadocs/com/lambdaschool/usermodel/views/UserNameCountEmails.html delete mode 100644 usermodel-initial/javadocs/com/lambdaschool/usermodel/views/package-summary.html delete mode 100644 usermodel-initial/javadocs/com/lambdaschool/usermodel/views/package-tree.html delete mode 100644 usermodel-initial/javadocs/index-files/index-12.html delete mode 100644 usermodel-initial/javadocs/index-files/index-8.html delete mode 100644 usermodel-initial/javadocs/index-files/index-9.html delete mode 100644 usermodel-initial/javadocs/member-search-index.js delete mode 100644 usermodel-initial/javadocs/member-search-index.zip delete mode 100644 usermodel-initial/javadocs/package-search-index.zip delete mode 100644 usermodel-initial/javadocs/search.js delete mode 100644 usermodel-initial/javadocs/type-search-index.js delete mode 100644 usermodel-initial/javadocs/type-search-index.zip delete mode 100755 usermodel-initial/src/main/java/com/lambdaschool/usermodel/SeedData.java delete mode 100755 usermodel-initial/src/main/java/com/lambdaschool/usermodel/repository/UserRepository.java delete mode 100644 usermodel-initial/src/main/java/com/lambdaschool/usermodel/repository/UseremailRepository.java delete mode 100755 usermodel-initial/src/main/java/com/lambdaschool/usermodel/services/UserServiceImpl.java delete mode 100644 usermodel-initial/src/main/java/com/lambdaschool/usermodel/views/JustTheCount.java delete mode 100644 usermodel-initial/src/main/java/com/lambdaschool/usermodel/views/UserNameCountEmails.java delete mode 100644 usermodel-initial/src/main/java/com/lambdaschool/usermodel/views/package-info.java delete mode 100644 usermodel-initial/src/test/java/com/lambdaschool/usermodel/UserModelApplicationTests.java diff --git a/README.md b/README.md index 2b1ca70..a1e89ea 100644 --- a/README.md +++ b/README.md @@ -24,5 +24,5 @@ The table layout is as follows Two different applications exist -- usermodel_initial - This is the initial application to which we will add the "bells and whistles" related to exception handling, custom swagger documentation, and accessing other API's data. -- usermodel - the finished version with many "bells and whistles" added. Note that a few additions to the application seem "forced" or out of place. These are done specifically to show how to use certain commands! +- usermodel-exceptions-initial - This is the initial application to which we will add the "bells and whistles" related to exception handling, custom swagger documentation, and accessing other API's data. +- usermodel-exceptions - the finished version with many "bells and whistles" added. Note that a few additions to the application seem "forced" or out of place. These are done specifically to show how to use certain commands! diff --git a/usermodel-initial/.gitignore b/usermodel-exceptions-initial/.gitignore similarity index 100% rename from usermodel-initial/.gitignore rename to usermodel-exceptions-initial/.gitignore diff --git a/usermodel-initial/.mvn/wrapper/MavenWrapperDownloader.java b/usermodel-exceptions-initial/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from usermodel-initial/.mvn/wrapper/MavenWrapperDownloader.java rename to usermodel-exceptions-initial/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/usermodel-initial/.mvn/wrapper/maven-wrapper.jar b/usermodel-exceptions-initial/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from usermodel-initial/.mvn/wrapper/maven-wrapper.jar rename to usermodel-exceptions-initial/.mvn/wrapper/maven-wrapper.jar diff --git a/usermodel-initial/.mvn/wrapper/maven-wrapper.properties b/usermodel-exceptions-initial/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from usermodel-initial/.mvn/wrapper/maven-wrapper.properties rename to usermodel-exceptions-initial/.mvn/wrapper/maven-wrapper.properties diff --git a/usermodel-exceptions-initial/README.md b/usermodel-exceptions-initial/README.md new file mode 100644 index 0000000..c053784 --- /dev/null +++ b/usermodel-exceptions-initial/README.md @@ -0,0 +1,1054 @@ +# Java User Model Final Version / Exceptions Initial Application + +## Introduction + +This is a basic database scheme with users, user emails, and user roles. This Java Spring REST API application will provide endpoints for clients to read various data sets contained in the application's data. This application will also form the basis of a user authentication application developed elsewhere in the course + +### Database layout + +The table layout is similar to the initial version with the following exceptions: + +* The join table userroles is explicitly created. This allows us to add additional columns to the join table +* Since we are creating the join table ourselves, the Many to Many relationship that formed the join table is now two Many to One relationships +* All tables now have audit fields + +Thus the new table layout is as follows + +* User is the driving table. +* Useremails have a Many-To-One relationship with User. Each User has many user email combinations. Each user email combination has only one User. +* Roles have a Many-To-Many relationship with Users. + +![Image of Database Layout](usersfinaldb.png) + +Using the provided seed data, expand each endpoint below to see the output it generates. + +
+http://localhost:2019/useremails/useremails + +```JSON +[ + { + "useremailid": 5, + "useremail": "admin@email.local", + "user": { + "userid": 4, + "username": "admin", + "primaryemail": "admin@lambdaschool.local", + "roles": [ + { + "role": { + "roleid": 3, + "name": "DATA" + } + }, + { + "role": { + "roleid": 1, + "name": "ADMIN" + } + }, + { + "role": { + "roleid": 2, + "name": "USER" + } + } + ] + } + }, + { + "useremailid": 6, + "useremail": "admin@mymail.local", + "user": { + "userid": 4, + "username": "admin", + "primaryemail": "admin@lambdaschool.local", + "roles": [ + { + "role": { + "roleid": 3, + "name": "DATA" + } + }, + { + "role": { + "roleid": 1, + "name": "ADMIN" + } + }, + { + "role": { + "roleid": 2, + "name": "USER" + } + } + ] + } + }, + { + "useremailid": 8, + "useremail": "cinnamon@mymail.local", + "user": { + "userid": 7, + "username": "cinnamon", + "primaryemail": "cinnamon@lambdaschool.local", + "roles": [ + { + "role": { + "roleid": 2, + "name": "USER" + } + }, + { + "role": { + "roleid": 3, + "name": "DATA" + } + } + ] + } + }, + { + "useremailid": 9, + "useremail": "hops@mymail.local", + "user": { + "userid": 7, + "username": "cinnamon", + "primaryemail": "cinnamon@lambdaschool.local", + "roles": [ + { + "role": { + "roleid": 2, + "name": "USER" + } + }, + { + "role": { + "roleid": 3, + "name": "DATA" + } + } + ] + } + }, + { + "useremailid": 10, + "useremail": "bunny@email.local", + "user": { + "userid": 7, + "username": "cinnamon", + "primaryemail": "cinnamon@lambdaschool.local", + "roles": [ + { + "role": { + "roleid": 2, + "name": "USER" + } + }, + { + "role": { + "roleid": 3, + "name": "DATA" + } + } + ] + } + }, + { + "useremailid": 12, + "useremail": "barnbarn@email.local", + "user": { + "userid": 11, + "username": "barnbarn", + "primaryemail": "barnbarn@lambdaschool.local", + "roles": [ + { + "role": { + "roleid": 2, + "name": "USER" + } + } + ] + } + } +] +``` + +
+ +
+http://localhost:2019/useremails/useremail/8 + +```JSON +{ + "useremailid": 8, + "useremail": "cinnamon@mymail.local", + "user": { + "userid": 7, + "username": "cinnamon", + "primaryemail": "cinnamon@lambdaschool.local", + "roles": [ + { + "role": { + "roleid": 2, + "name": "USER" + } + }, + { + "role": { + "roleid": 3, + "name": "DATA" + } + } + ] + } +} +``` + +
+ +
+DELETE http://localhost:2019/useremails/useremail/8 + +```TEXT +No Body Data + +Status OK +``` + +
+ +
+http://localhost:2019/useremails/useremail/8 + +```JSON +{ + "timestamp": "2020-07-16T00:02:02.969+0000", + "status": 500, + "error": "Internal Server Error", + "message": "Useremail with id 8 Not Found!", + "trace": "javax.persistence.EntityNotFoundException: Useremail with id 8 Not Found!\n\tat com.lambdaschool.usermodel.services.UseremailServiceImpl.lambda$findUseremailById$0(UseremailServiceImpl.java:52)\n\tat java.base/java.util.Optional.orElseThrow(Optional.java:401)\n\tat com.lambdaschool.usermodel.services.UseremailServiceImpl.findUseremailById(UseremailServiceImpl.java:52)\n\tat com.lambdaschool.usermodel.services.UseremailServiceImpl$$FastClassBySpringCGLIB$$f1b1885e.invoke()\n\tat org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)\n\tat org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:769)\n\tat org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)\n\tat org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:747)\n\tat org.springframework.transaction.interceptor.TransactionAspectSupport.invokeWithinTransaction(TransactionAspectSupport.java:366)\n\tat org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:99)\n\tat org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\n\tat org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:747)\n\tat org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:689)\n\tat com.lambdaschool.usermodel.services.UseremailServiceImpl$$EnhancerBySpringCGLIB$$c45ba8ca.findUseremailById()\n\tat com.lambdaschool.usermodel.controllers.UseremailController.getUserEmailById(UseremailController.java:63)\n\tat java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n\tat java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n\tat java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:564)\n\tat org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:190)\n\tat org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:138)\n\tat org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:106)\n\tat org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:879)\n\tat org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:793)\n\tat org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87)\n\tat org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1040)\n\tat org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:943)\n\tat org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006)\n\tat org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:898)\n\tat javax.servlet.http.HttpServlet.service(HttpServlet.java:634)\n\tat org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883)\n\tat javax.servlet.http.HttpServlet.service(HttpServlet.java:741)\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231)\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\n\tat org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\n\tat org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100)\n\tat org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\n\tat org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93)\n\tat org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\n\tat org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201)\n\tat org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\n\tat org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:202)\n\tat org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:96)\n\tat org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:541)\n\tat org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:139)\n\tat org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)\n\tat org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74)\n\tat org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:343)\n\tat org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:367)\n\tat org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65)\n\tat org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:868)\n\tat org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1639)\n\tat org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)\n\tat java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1130)\n\tat java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:630)\n\tat org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)\n\tat java.base/java.lang.Thread.run(Thread.java:832)\n", + "path": "/useremails/useremail/8" +} +``` +
+ +
+PUT http://localhost:2019/useremails/useremail/9/email/favbun@hops.local + +OUTPUT + +```TEXT +Status OK +``` + +
+ +
+http://localhost:2019/useremails/useremail/9 + +```JSON +{ + "useremailid": 9, + "useremail": "favbun@hops.local", + "user": { + "userid": 7, + "username": "cinnamon", + "primaryemail": "cinnamon@lambdaschool.local", + "roles": [ + { + "role": { + "roleid": 2, + "name": "USER" + } + }, + { + "role": { + "roleid": 3, + "name": "DATA" + } + } + ] + } +} +``` + +
+ +
+POST http://localhost:2019/useremails/user/14/email/favbun@hops.local + +OUTPUT + +```TEXT +Status CREATED + +Location Header: http://localhost:2019/useremails/useremail/15 +``` + +
+ +
+http://localhost:2019/useremails/useremail/15 + +```JSON +{ + "useremailid": 15, + "useremail": "favbun@hops.local", + "user": { + "userid": 14, + "username": "misskitty", + "primaryemail": "misskitty@school.lambda", + "roles": [ + { + "role": { + "roleid": 2, + "name": "USER" + } + } + ] + } +} +``` + +
+ +--- + +
+http://localhost:2019/roles/roles + +```JSON +[ + { + "roleid": 1, + "name": "ADMIN", + "users": [ + { + "user": { + "userid": 4, + "username": "admin", + "primaryemail": "admin@lambdaschool.local", + "useremails": [ + { + "useremailid": 5, + "useremail": "admin@email.local" + }, + { + "useremailid": 6, + "useremail": "admin@mymail.local" + } + ] + } + } + ] + }, + { + "roleid": 2, + "name": "USER", + "users": [ + { + "user": { + "userid": 14, + "username": "misskitty", + "primaryemail": "misskitty@school.lambda", + "useremails": [ + { + "useremailid": 15, + "useremail": "favbun@hops.local" + } + ] + } + }, + { + "user": { + "userid": 13, + "username": "puttat", + "primaryemail": "puttat@school.lambda", + "useremails": [] + } + }, + { + "user": { + "userid": 11, + "username": "barnbarn", + "primaryemail": "barnbarn@lambdaschool.local", + "useremails": [ + { + "useremailid": 12, + "useremail": "barnbarn@email.local" + } + ] + } + }, + { + "user": { + "userid": 7, + "username": "cinnamon", + "primaryemail": "cinnamon@lambdaschool.local", + "useremails": [ + { + "useremailid": 9, + "useremail": "favbun@hops.local" + }, + { + "useremailid": 10, + "useremail": "bunny@email.local" + } + ] + } + }, + { + "user": { + "userid": 4, + "username": "admin", + "primaryemail": "admin@lambdaschool.local", + "useremails": [ + { + "useremailid": 5, + "useremail": "admin@email.local" + }, + { + "useremailid": 6, + "useremail": "admin@mymail.local" + } + ] + } + } + ] + }, + { + "roleid": 3, + "name": "DATA", + "users": [ + { + "user": { + "userid": 4, + "username": "admin", + "primaryemail": "admin@lambdaschool.local", + "useremails": [ + { + "useremailid": 5, + "useremail": "admin@email.local" + }, + { + "useremailid": 6, + "useremail": "admin@mymail.local" + } + ] + } + }, + { + "user": { + "userid": 7, + "username": "cinnamon", + "primaryemail": "cinnamon@lambdaschool.local", + "useremails": [ + { + "useremailid": 9, + "useremail": "favbun@hops.local" + }, + { + "useremailid": 10, + "useremail": "bunny@email.local" + } + ] + } + } + ] + } +] +``` + +
+ +
+http://localhost:2019/roles/role/3 + +```JSON +{ + "roleid": 3, + "name": "DATA", + "users": [ + { + "user": { + "userid": 4, + "username": "admin", + "primaryemail": "admin@lambdaschool.local", + "useremails": [ + { + "useremailid": 5, + "useremail": "admin@email.local" + }, + { + "useremailid": 6, + "useremail": "admin@mymail.local" + } + ] + } + }, + { + "user": { + "userid": 7, + "username": "cinnamon", + "primaryemail": "cinnamon@lambdaschool.local", + "useremails": [ + { + "useremailid": 9, + "useremail": "favbun@hops.local" + }, + { + "useremailid": 10, + "useremail": "bunny@email.local" + } + ] + } + } + ] +} +``` + +
+ +
+http://localhost:2019/roles/role/name/data + +```JSON +{ + "roleid": 3, + "name": "DATA", + "users": [ + { + "user": { + "userid": 4, + "username": "admin", + "primaryemail": "admin@lambdaschool.local", + "useremails": [ + { + "useremailid": 5, + "useremail": "admin@email.local" + }, + { + "useremailid": 6, + "useremail": "admin@mymail.local" + } + ] + } + }, + { + "user": { + "userid": 7, + "username": "cinnamon", + "primaryemail": "cinnamon@lambdaschool.local", + "useremails": [ + { + "useremailid": 9, + "useremail": "favbun@hops.local" + }, + { + "useremailid": 10, + "useremail": "bunny@email.local" + } + ] + } + } + ] +} +``` + +
+ +
+POST http://localhost:2019/roles/role + +DATA + +```JSON +{ + "name" : "ANewRole" +} +``` + +OUTPUT + +```TEXT +Status CREATED + +Location Header: http://localhost:2019/roles/role/16 +``` + +
+ +
+http://localhost:2019/roles/role/name/anewrole + +```JSON +{ + "roleid": 16, + "name": "ANEWROLE", + "users": [] +} +``` + +
+ +
+PUT http://localhost:2019/roles/role/16 + +DATA + +```JSON +{ + "name" : "ANewRole" +} +``` + +OUTPUT + +```TEXT +Status OK +``` + +
+ +--- + +
+http://localhost:2019/users/users + +```JSON +[ + { + "userid": 4, + "username": "admin", + "primaryemail": "admin@lambdaschool.local", + "useremails": [ + { + "useremailid": 5, + "useremail": "admin@email.local" + }, + { + "useremailid": 6, + "useremail": "admin@mymail.local" + } + ], + "roles": [ + { + "role": { + "roleid": 3, + "name": "DATA" + } + }, + { + "role": { + "roleid": 1, + "name": "ADMIN" + } + }, + { + "role": { + "roleid": 2, + "name": "USER" + } + } + ] + }, + { + "userid": 7, + "username": "cinnamon", + "primaryemail": "cinnamon@lambdaschool.local", + "useremails": [ + { + "useremailid": 9, + "useremail": "favbun@hops.local" + }, + { + "useremailid": 10, + "useremail": "bunny@email.local" + } + ], + "roles": [ + { + "role": { + "roleid": 2, + "name": "USER" + } + }, + { + "role": { + "roleid": 3, + "name": "DATA" + } + } + ] + }, + { + "userid": 11, + "username": "barnbarn", + "primaryemail": "barnbarn@lambdaschool.local", + "useremails": [ + { + "useremailid": 12, + "useremail": "barnbarn@email.local" + } + ], + "roles": [ + { + "role": { + "roleid": 2, + "name": "USER" + } + } + ] + }, + { + "userid": 13, + "username": "puttat", + "primaryemail": "puttat@school.lambda", + "useremails": [], + "roles": [ + { + "role": { + "roleid": 2, + "name": "USER" + } + } + ] + }, + { + "userid": 14, + "username": "misskitty", + "primaryemail": "misskitty@school.lambda", + "useremails": [ + { + "useremailid": 15, + "useremail": "favbun@hops.local" + } + ], + "roles": [ + { + "role": { + "roleid": 2, + "name": "USER" + } + } + ] + } +] +``` + +
+ +
+http://localhost:2019/users/user/7 + +```JSON +{ + "userid": 7, + "username": "cinnamon", + "primaryemail": "cinnamon@lambdaschool.local", + "useremails": [ + { + "useremailid": 9, + "useremail": "favbun@hops.local" + }, + { + "useremailid": 10, + "useremail": "bunny@email.local" + } + ], + "roles": [ + { + "role": { + "roleid": 2, + "name": "USER" + } + }, + { + "role": { + "roleid": 3, + "name": "DATA" + } + } + ] +} +``` + +
+ +
+http://localhost:2019/users/user/name/cinnamon + +```JSON +{ + "userid": 7, + "username": "cinnamon", + "primaryemail": "cinnamon@lambdaschool.local", + "useremails": [ + { + "useremailid": 9, + "useremail": "favbun@hops.local" + }, + { + "useremailid": 10, + "useremail": "bunny@email.local" + } + ], + "roles": [ + { + "role": { + "roleid": 2, + "name": "USER" + } + }, + { + "role": { + "roleid": 3, + "name": "DATA" + } + } + ] +} +``` + +
+ +
+http://localhost:2019/users/user/name/like/da + +```JSON +[] +``` + +
+ +
+POST http://localhost:2019/users/user + +DATA + +```JSON +{ + "username": "Mojo", + "primaryemail": "mojo@lambdaschool.local", + "password" : "Coffee123", + "useremails": [ + { + "useremail": "mojo@mymail.local" + }, + { + "useremail": "mojo@email.local" + } + ], + "roles": [ + { + "role": { + "roleid": 1 + } + }, + { + "role": { + "roleid": 2 + } + } + ] +} +``` + +OUTPUT + +```TEXT +No Body Data + +Location Header: http://localhost:2019/users/user/17 +Status 201 Created +``` + +
+ +
+http://localhost:2019/users/user/name/mojo + +
+ +
+PUT http://localhost:2019/users/user/14 + +DATA + +```JSON +{ + "username": "stumps", + "primaryemail": "stumps@lambdaschool.local", + "password" : "EarlGray123", + "useremails": [ + { + "useremail": "stumps@mymail.local" + }, + { + "useremail": "stumps@email.local" + } + ], + "roles": [ + { + "role": { + "roleid": 3 + } + }, + { + "role": { + "roleid": 1 + } + } + ] +} +``` + +OUTPUT + +```TEXT +No Body Data + +Status OK +``` + +
+ +
+http://localhost:2019/users/user/name/stumps + +```JSON +{ + "userid": 16, + "username": "stumps", + "primaryemail": "stumps@lambdaschool.local", + "useremails": [ + { + "useremailid": 19, + "useremail": "stumps@mymail.local" + }, + { + "useremailid": 20, + "useremail": "stumps@email.local" + } + ], + "roles": [ + { + "role": { + "roleid": 1, + "name": "ADMIN" + } + }, + { + "role": { + "roleid": 3, + "name": "DATA" + } + } + ] +} +``` + +
+ +
+PATCH http://localhost:2019/users/user/7 + +DATA + +```JSON +{ + "username": "cinabun", + "primaryemail": "cinabun@lambdaschool.home", + "useremails": [ + { + "useremail": "cinnamon@mymail.home" + }, + { + "useremail": "hops@mymail.home" + }, + { + "useremail": "bunny@email.home" + } + ] +} +``` + +OUTPUT + +```TEXT +No Body Data + +Status OK +``` + +
+ +
+http://localhost:2019/users/user/name/cinabun + +
+ +```JSON +{ + "userid": 7, + "username": "cinabun", + "primaryemail": "cinabun@lambdaschool.home", + "useremails": [ + { + "useremailid": 21, + "useremail": "cinnamon@mymail.home" + }, + { + "useremailid": 22, + "useremail": "hops@mymail.home" + }, + { + "useremailid": 23, + "useremail": "bunny@email.home" + } + ], + "roles": [ + { + "role": { + "roleid": 2, + "name": "USER" + } + }, + { + "role": { + "roleid": 3, + "name": "DATA" + } + } + ] +} +``` + +
+ +DELETE http://localhost:2019/users/user/14 + +```TEXT +No Body Data + +Status OK +``` + +
+ +
+http://localhost:2019/users/user/14 + +```JSON +{ + "timestamp": "2020-07-23T03:40:24.533+0000", + "status": 500, + "error": "Internal Server Error", + "message": "User id 14 not found!", + "trace": "javax.persistence.EntityNotFoundException: User id 14 not found!\n\tat com.lambdaschool.usermodel.services.UserServiceImpl.lambda$findUserById$0(UserServiceImpl.java:40)\n\tat java.base/java.util.Optional.orElseThrow(Optional.java:401)\n\tat com.lambdaschool.usermodel.services.UserServiceImpl.findUserById(UserServiceImpl.java:40)\n\tat com.lambdaschool.usermodel.services.UserServiceImpl$$FastClassBySpringCGLIB$$3cdcb410.invoke()\n\tat org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)\n\tat org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.invokeJoinpoint(CglibAopProxy.java:771)\n\tat org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:163)\n\tat org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:749)\n\tat org.springframework.transaction.interceptor.TransactionAspectSupport.invokeWithinTransaction(TransactionAspectSupport.java:367)\n\tat org.springframework.transaction.interceptor.TransactionInterceptor.invoke(TransactionInterceptor.java:118)\n\tat org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186)\n\tat org.springframework.aop.framework.CglibAopProxy$CglibMethodInvocation.proceed(CglibAopProxy.java:749)\n\tat org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:691)\n\tat com.lambdaschool.usermodel.services.UserServiceImpl$$EnhancerBySpringCGLIB$$adbe5f8.findUserById()\n\tat com.lambdaschool.usermodel.controllers.UserController.getUserById(UserController.java:68)\n\tat java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\n\tat java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)\n\tat java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)\n\tat java.base/java.lang.reflect.Method.invoke(Method.java:564)\n\tat org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:190)\n\tat org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:138)\n\tat org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:105)\n\tat org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:879)\n\tat org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:793)\n\tat org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87)\n\tat org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1040)\n\tat org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:943)\n\tat org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006)\n\tat org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:898)\n\tat javax.servlet.http.HttpServlet.service(HttpServlet.java:634)\n\tat org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883)\n\tat javax.servlet.http.HttpServlet.service(HttpServlet.java:741)\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231)\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\n\tat org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\n\tat org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100)\n\tat org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\n\tat org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93)\n\tat org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\n\tat org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201)\n\tat org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119)\n\tat org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)\n\tat org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)\n\tat org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:202)\n\tat org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:96)\n\tat org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:541)\n\tat org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:139)\n\tat org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)\n\tat org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74)\n\tat org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:343)\n\tat org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:373)\n\tat org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65)\n\tat org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:868)\n\tat org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1590)\n\tat org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)\n\tat java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1130)\n\tat java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:630)\n\tat org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)\n\tat java.base/java.lang.Thread.run(Thread.java:832)\n", + "path": "/users/user/14" +} +``` + +
diff --git a/usermodel-initial/javadocs/allclasses-index.html b/usermodel-exceptions-initial/javadocs/allclasses-index.html similarity index 66% rename from usermodel-initial/javadocs/allclasses-index.html rename to usermodel-exceptions-initial/javadocs/allclasses-index.html index d2e6ddd..bff7448 100644 --- a/usermodel-initial/javadocs/allclasses-index.html +++ b/usermodel-exceptions-initial/javadocs/allclasses-index.html @@ -2,46 +2,38 @@ - + All Classes - + + + - + - - + + - - + + - - -
+
+ +

All Classes

-
    -
  • - - +
    +
    +
    +
    All Classes Interface Summary Class Summary 
    + - + + + - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - + - + - + + + + + - + +
    Class Description
    H2ServerConfiguration
    Configures H2 access through the JetBrains IntelliJ IDEA IDE.
    JustTheCount -
    Used when a custom query is to just count how many of something are in the table
    -
    Role
    The entity allowing interaction with the roles table.
    RoleRepository
    The CRUD Repository connecting Role to the rest of the application
    RolesController
    The entry point for clients to access role data
    RoleService
    The service that works with the Role Model.
    RoleServiceImpl
    Implements the RoleService Interface
    SeedData
    SeedData puts both known and random data into the database.
    Swagger2Config
    Configures the default Swagger Documentation
    User
    The entity allowing interaction with the users table
    UserAuditing
    Spring Boot needs to know what username to use for the auditing fields CreatedBy and ModifiedBy For now, a default name will be used
    UserController
    The entry point for clients to access user data
    Useremail
    The entity allowing interaction with the useremails table
    UseremailController
    The entry point for client to access user, email combinations
    UseremailRepository
    The CRUD Repository connecting Useremail to the rest of the application
    UseremailService
    The Service that works with the Useremail Model
    UseremailServiceImpl
    Implements the UseremailService Interface
    UserModelApplication
    Main class to start the application.
    UserModelApplicationTests -
    Starting class for testing
    -
    UserNameCountEmails -
    Used to format the JSON output for a custom query that gathers information on username and the count of how many emails they have
    -
    UserRepository
    The CRUD repository connecting User to the rest of the application
    UserRoles
    The entity allowing interaction with the userroles table.
    UserRolesId +
    Class to represent the complex primary key for UserRoles
    +
    UserService
    The Service that works with User Model.
    UserServiceImpl -
    Implements the Userservice Interface
    +
    Implements UserService Interface
    -
    • -
+
+
@@ -280,30 +240,13 @@

All Classes

  • Help
    • -
    - -
    - - -
    -
    +
    + + diff --git a/usermodel-initial/javadocs/allclasses.html b/usermodel-exceptions-initial/javadocs/allclasses.html similarity index 78% rename from usermodel-initial/javadocs/allclasses.html rename to usermodel-exceptions-initial/javadocs/allclasses.html index 04dc9e8..9b0de09 100644 --- a/usermodel-initial/javadocs/allclasses.html +++ b/usermodel-exceptions-initial/javadocs/allclasses.html @@ -2,10 +2,10 @@ - + All Classes - + @@ -22,16 +22,13 @@

    All Classes

    diff --git a/usermodel-initial/javadocs/allpackages-index.html b/usermodel-exceptions-initial/javadocs/allpackages-index.html similarity index 63% rename from usermodel-initial/javadocs/allpackages-index.html rename to usermodel-exceptions-initial/javadocs/allpackages-index.html index 816ed25..81706f4 100644 --- a/usermodel-initial/javadocs/allpackages-index.html +++ b/usermodel-exceptions-initial/javadocs/allpackages-index.html @@ -2,40 +2,32 @@ - + All Packages - + + + - + - - + + - - + + - - -
    +
    + +

    All Packages

    -
      -
    • - +
      +
      + + @@ -141,16 +110,9 @@

      All Packages

      Contains the services that are used to retrieve and manipulate data in the application.
      - - - -
      Package Summary 
      Package Description
      com.lambdaschool.usermodel
      com.lambdaschool.usermodel.views -
      Contains the interfaces used for custom queries
      -
      -
      • -
    +
    @@ -173,30 +135,13 @@

    All Packages

  • Help
    • -
    - -
    - - -
    -
    +
    + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/SeedData.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/SeedData.html similarity index 62% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/SeedData.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/SeedData.html index ce94963..492e6b0 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/SeedData.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/SeedData.html @@ -2,46 +2,38 @@ - + SeedData - + + + - + - - + + - - + + - - -
    +
    + - +
    +
    Package com.lambdaschool.usermodel
    -

    Class SeedData

    +

    Class SeedData

    -
      -
    • java.lang.Object
      • -
    • -
        -
      • com.lambdaschool.usermodel.SeedData
        • -
      -
      • -
    -
    -
      -
    • +
      java.lang.Object +
      com.lambdaschool.usermodel.SeedData
      +
      +
      All Implemented Interfaces:
      org.springframework.boot.CommandLineRunner
      @@ -144,48 +105,53 @@

      Class SeedData

      CoomandLineRunner: Spring Boot automatically runs the run method once and only once after the application context has been loaded.

    - - -
    -
    + +
      -
    • -
      -
        -
      • +
      • +
        -

        Constructor Summary

        - +

        Constructor Summary

        +
        +
        + + + +
        Constructors 
        Constructor Description
        SeedData()  
        -
        • -
      +
    + -
    -
      -
    • +
    • +
      -

      Method Summary

      - - +

      Method Summary

      +
      +
      +
      +
      All Methods Instance Methods Concrete Methods 
      + - + + + +
      Modifier and Type Method Description
      void run​(java.lang.String[] args) @@ -193,58 +159,50 @@

      Method Summary

      First a set of known data is seeded into our database.
      -
    +
    +

    Methods inherited from class java.lang.Object

    -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait - - - + + +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    - -
    + +
      -
    • -
      -
        -
      • - - -

        Constructor Detail

        - +
      • +
        -
          +

          Constructor Details

          +
          • -

            SeedData

            -
            public SeedData()
            -
            • -
          +
          +

          SeedData

          +
          public SeedData()
          +
        +
        • -
        -
          -
        • - - -

          Method Detail

          - +
        • +
          -
            +

            Method Details

            +
            • -

              run

              -
              @Transactional
-public void run​(java.lang.String[] args)
-         throws java.lang.Exception
              +
              +

              run

              +
              @Transactional +public void run​(java.lang.String[] args) + throws java.lang.Exception
              Generates test, seed data for our application First a set of known data is seeded into our database. Second a random set of data using Java Faker is seeded into our database. @@ -258,17 +216,16 @@

              run

              Throws:
              java.lang.Exception
              -
              • -
            +
      +
    - - +
    + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/UserModelApplication.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/UserModelApplication.html similarity index 58% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/UserModelApplication.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/UserModelApplication.html index 2bbb4c7..c98a84c 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/UserModelApplication.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/UserModelApplication.html @@ -2,46 +2,38 @@ - + UserModelApplication - + + + - + - - + + - - + + - - -
    +
    + - +
    +
    Package com.lambdaschool.usermodel
    -

    Class UserModelApplication

    +

    Class UserModelApplication

    -
      -
    • java.lang.Object
      • -
    • -
        -
      • com.lambdaschool.usermodel.UserModelApplication
        • -
      -
      • -
    -
    -
      -
    • +
      java.lang.Object +
      com.lambdaschool.usermodel.UserModelApplication
      +
      +
      @EnableJpaAuditing
 @SpringBootApplication
 public class UserModelApplication
 extends java.lang.Object
      Main class to start the application.
      -
      • -
    -
    -
    + +
      -
    • -
      -
        -
      • +
      • +
        -

        Constructor Summary

        - +

        Constructor Summary

        +
        +
        + + + +
        Constructors 
        Constructor Description
        UserModelApplication()  
        -
        • -
      +
    + -
    -
      -
    • +
    • +
      -

      Method Summary

      - - +

      Method Summary

      +
      +
      +
      +
      All Methods Static Methods Concrete Methods 
      + - + + + +
      Modifier and Type Method Description
      static void main​(java.lang.String[] args)
      Main method to start the application.
      -
    +
    +

    Methods inherited from class java.lang.Object

    -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait - - - + + +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    -
    -
    + +
      -
    • -
      -
        -
      • - - -

        Constructor Detail

        - +
      • +
        -
          +

          Constructor Details

          +
          • -

            UserModelApplication

            -
            public UserModelApplication()
            -
            • -
          +
          +

          UserModelApplication

          +
          public UserModelApplication()
          +
        +
        • -
        -
          -
        • - - -

          Method Detail

          - +
        • +
          -
            +

            Method Details

            +
            • -

              main

              -
              public static void main​(java.lang.String[] args)
              +
              +

              main

              +
              public static void main​(java.lang.String[] args)
              Main method to start the application.
              Parameters:
              args - Not used in this application.
              -
              • -
            +
      +
    - - +
    + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/config/H2ServerConfiguration.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/config/H2ServerConfiguration.html similarity index 61% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/config/H2ServerConfiguration.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/config/H2ServerConfiguration.html index 9dcd92a..c39b444 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/config/H2ServerConfiguration.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/config/H2ServerConfiguration.html @@ -2,46 +2,38 @@ - + H2ServerConfiguration - + + + - + - - + + - - + + - - -
    +
    + - +
    +
    Package com.lambdaschool.usermodel.config
    -

    Class H2ServerConfiguration

    +

    Class H2ServerConfiguration

    -
      -
    • java.lang.Object
      • -
    • -
        -
      • com.lambdaschool.usermodel.config.H2ServerConfiguration
        • -
      -
      • -
    -
    -
      -
    • +
      java.lang.Object +
      com.lambdaschool.usermodel.config.H2ServerConfiguration
      +
      +
      @Configuration
 public class H2ServerConfiguration
@@ -138,114 +99,111 @@ 
      Class H2ServerConfiguratio
  
      
  Adapted from https://techdev.io/en/developer-blog/querying-the-embedded-h2-database-of-a-spring-boot-application
  necessary for using the database tool built into intellij
    - - -
    -
    + +
      -
    • -
      -
        -
      • +
      • +
        -

        Constructor Summary

        - +

        Constructor Summary

        +
        +
        + + + +
        Constructors 
        Constructor Description
        H2ServerConfiguration()  
        -
        • -
      +
    + -
    -
      -
    • +
    • +
      -

      Method Summary

      - - +

      Method Summary

      +
      +
      +
      +
      All Methods Instance Methods Concrete Methods 
      + - + + + - + +
      Modifier and Type Method Description
      org.h2.tools.Server h2TcpServer()
      TCP connection to connect with SQL clients to the embedded h2 database.
      org.h2.tools.Server h2WebServer()
      Web console for the embedded h2 database.
      -
    +
    +

    Methods inherited from class java.lang.Object

    -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait - - - + + +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    - -
    + +
      -
    • -
      -
        -
      • - - -

        Constructor Detail

        - +
      • +
        -
          +

          Constructor Details

          +
          • -

            H2ServerConfiguration

            -
            public H2ServerConfiguration()
            -
            • -
          +
          +

          H2ServerConfiguration

          +
          public H2ServerConfiguration()
          +
        +
        • -
        -
          -
        • - - -

          Method Detail

          - +
        • +
          +

          Method Details

          • -

            h2TcpServer

            -
            @Bean
+
            
+
            h2TcpServer
            
+
            @Bean
 @ConditionalOnExpression("${h2.tcp.enabled:true}")
-public org.h2.tools.Server h2TcpServer()
-                                throws java.sql.SQLException
            +public org.h2.tools.Server h2TcpServer() + throws java.sql.SQLException
    TCP connection to connect with SQL clients to the embedded h2 database.

    Connect to "jdbc:h2:tcp://localhost:9092/mem:testdb", username "sa", password empty.

    @@ -255,18 +213,15 @@

    h2TcpServer

    Throws:
    java.sql.SQLException - If the server cannot be created.
    + - - - - -
    • -

      h2WebServer

      -
      @Bean
+
      
+
      h2WebServer
      
+
      @Bean
 @ConditionalOnExpression("${h2.web.enabled:true}")
-public org.h2.tools.Server h2WebServer()
-                                throws java.sql.SQLException
      +public org.h2.tools.Server h2WebServer() + throws java.sql.SQLException
      Web console for the embedded h2 database.

      Go to http://localhost:8082 and connect to the database "jdbc:h2:mem:testdb", username "sa", password empty.

      @@ -276,17 +231,16 @@

      h2WebServer

      Throws:
      java.sql.SQLException - If the server cannot be created.
      -
      • -
    + + - - +
    + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/config/Swagger2Config.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/config/Swagger2Config.html similarity index 58% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/config/Swagger2Config.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/config/Swagger2Config.html index 3b12fb6..88928cc 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/config/Swagger2Config.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/config/Swagger2Config.html @@ -2,46 +2,38 @@ - + Swagger2Config - + + + - + - - + + - - + + - - -
    +
    + - +
    +
    Package com.lambdaschool.usermodel.config
    -

    Class Swagger2Config

    +

    Class Swagger2Config

    -
      -
    • java.lang.Object
      • -
    • -
        -
      • com.lambdaschool.usermodel.config.Swagger2Config
        • -
      -
      • -
    -
    -
      -
    • +
      java.lang.Object +
      com.lambdaschool.usermodel.config.Swagger2Config
      +
      +
      @Configuration
 @EnableSwagger2
+@Import(springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration.class)
 public class Swagger2Config
 extends java.lang.Object
      Configures the default Swagger Documentation
      -
      • -
    -
    -
    + +
      -
    • -
      -
        -
      • +
      • +
        -

        Constructor Summary

        - +

        Constructor Summary

        +
        +
        + + + +
        Constructors 
        Constructor Description
        Swagger2Config()  
        -
        • -
      +
    + -
    -
      -
    • +
    • +
      -

      Method Summary

      - - +

      Method Summary

      +
      +
      +
      +
      All Methods Instance Methods Concrete Methods 
      + - + + + +
      Modifier and Type Method Description
      springfox.documentation.spring.web.plugins.Docket api()
      Configures what to document using Swagger
      -
    +
    +

    Methods inherited from class java.lang.Object

    -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait - - - + + +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    -
    -
    + +
      -
    • -
      -
        -
      • - - -

        Constructor Detail

        - +
      • +
        -
          +

          Constructor Details

          +
          • -

            Swagger2Config

            -
            public Swagger2Config()
            -
            • -
          +
          +

          Swagger2Config

          +
          public Swagger2Config()
          +
        +
        • -
        -
          -
        • - - -

          Method Detail

          - +
        • +
          -
            +

            Method Details

            +
            • -

              api

              -
              @Bean
-public springfox.documentation.spring.web.plugins.Docket api()
              +
              +

              api

              +
              @Bean +public springfox.documentation.spring.web.plugins.Docket api()
              Configures what to document using Swagger
              Returns:
              A Docket which is the primary interface for Swagger configuration
              -
              • -
            +
      +
    - - +
    + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/config/package-summary.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/config/package-summary.html similarity index 59% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/config/package-summary.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/config/package-summary.html index 0c8464b..49fd40b 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/config/package-summary.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/config/package-summary.html @@ -2,40 +2,32 @@ - + com.lambdaschool.usermodel.config - + + + - + - - + + - - + + - - -
    +
    + +

    Package com.lambdaschool.usermodel.config

    -
    +
    Contains all the classes related to configurations. @@ -104,14 +72,18 @@

    Package com.lambdaschool.usermodel.config Also see:
    application.properties.

    +
    • - +
      +
      + + @@ -127,8 +99,10 @@

      Package com.lambdaschool.usermodel.config

      Class Summary 
      Class Description
      H2ServerConfiguration
      +
    +
    @@ -151,30 +125,13 @@

    Package com.lambdaschool.usermodel.config
  • Help

    • -
    - -
    - - -
    -
    + + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/config/package-tree.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/config/package-tree.html similarity index 58% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/config/package-tree.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/config/package-tree.html index cf4af57..ecabec9 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/config/package-tree.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/config/package-tree.html @@ -2,40 +2,32 @@ - + com.lambdaschool.usermodel.config Class Hierarchy - + + + - + - - + + - - + + - - -
    +
    + +

    Hierarchy For Package com.lambdaschool.usermodel.config

    @@ -100,7 +68,7 @@

    Hierarchy For Package com.lambdaschool.usermodel.config

    -
    +

    Class Hierarchy

    • java.lang.Object @@ -133,30 +101,13 @@

      Class Hierarchy

    • Help
    -
    - -
    - - -
    -
    + +
    +
    diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/controllers/RolesController.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/controllers/RolesController.html similarity index 54% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/controllers/RolesController.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/controllers/RolesController.html index 557c7ba..7dd00fa 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/controllers/RolesController.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/controllers/RolesController.html @@ -2,46 +2,38 @@ - + RolesController - + + + - + - - + + - - + + - - -
    +
    + - +
    +
    Package com.lambdaschool.usermodel.controllers
    -

    Class RolesController

    +

    Class RolesController

    -
      -
    • java.lang.Object
      • -
    • -
        -
      • com.lambdaschool.usermodel.controllers.RolesController
        • -
      -
      • -
    -
    -
      -
    • +
      java.lang.Object +
      com.lambdaschool.usermodel.controllers.RolesController
      +
      +
      @RestController
 @RequestMapping("/roles")
@@ -141,48 +102,53 @@ 
      Class RolesController
      
  we cannot update a role
  working with the "non-owner" object in a many to many relationship is messy
  we will be fixing that!
    - - -
    -
    + +
      -
    • -
      -
        -
      • +
      • +
        -

        Constructor Summary

        - +

        Constructor Summary

        +
        +
        + + + +
        Constructors 
        Constructor Description
        RolesController()  
        -
        • -
      +
    + -
    -
    +
    +

    Methods inherited from class java.lang.Object

    -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait - - - + + +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    - -
    + +
      -
    • -
      -
        -
      • - - -

        Constructor Detail

        - +
      • +
        -
          +

          Constructor Details

          +
          • -

            RolesController

            -
            public RolesController()
            -
            • -
          +
          +

          RolesController

          +
          public RolesController()
          +
        +
        • -
        -
          -
        • - - -

          Method Detail

          - +
        • +
          +

          Method Details

          • -

            listRoles

            -
            @GetMapping(value="/roles",
+
            
+
            listRoles
            
+
            @GetMapping(value="/roles",
             produces="application/json")
-public org.springframework.http.ResponseEntity<?> listRoles()
            +public org.springframework.http.ResponseEntity<?> listRoles()
    List of all roles
    Example: http://localhost:2019/roles/roles
    @@ -299,18 +241,15 @@

    listRoles

    See Also:
    RoleService.findAll()
    + - - - - -
    • -

      getRoleById

      -
      @GetMapping(value="/role/{roleId}",
+
      
+
      getRoleById
      
+
      @GetMapping(value="/role/{roleId}",
             produces="application/json")
-public org.springframework.http.ResponseEntity<?> getRoleById​(@PathVariable
-                                                              java.lang.Long roleId)
      +public org.springframework.http.ResponseEntity<?> getRoleById​(@PathVariable +java.lang.Long roleId)
      The Role referenced by the given primary key
      Example: http://localhost:2019/roles/role/3
      @@ -321,18 +260,15 @@

      getRoleById

      See Also:
      RoleService.findRoleById(long)
      +
      • -
    - - - -
    • -

      getRoleByName

      -
      @GetMapping(value="/role/name/{roleName}",
+
      
+
      getRoleByName
      
+
      @GetMapping(value="/role/name/{roleName}",
             produces="application/json")
-public org.springframework.http.ResponseEntity<?> getRoleByName​(@PathVariable
-                                                                java.lang.String roleName)
      +public org.springframework.http.ResponseEntity<?> getRoleByName​(@PathVariable +java.lang.String roleName)
      The Role with the given name
      Example: http://localhost:2019/roles/role/name/data
      @@ -343,18 +279,15 @@

      getRoleByName

      See Also:
      RoleService.findByName(String)
      +
      • -
    - - - -
    • -

      addNewRole

      -
      @PostMapping(value="/role",
+
      
+
      addNewRole
      
+
      @PostMapping(value="/role",
              consumes="application/json")
-public org.springframework.http.ResponseEntity<?> addNewRole​(@Valid @RequestBody
-                                                             @Valid Role newRole)
      +public org.springframework.http.ResponseEntity<?> addNewRole​(@Valid @RequestBody +@Valid Role newRole)
      Given a complete Role object, create a new Role record
      Example: http://localhost:2019/roles/role
      @@ -365,39 +298,17 @@

      addNewRole

      See Also:
      RoleService.save(Role)
      +
      • -
    - - - -
      -
    • -

      deleteRoleById

      -
      @DeleteMapping("/role/{id}")
-public org.springframework.http.ResponseEntity<?> deleteRoleById​(@PathVariable
-                                                                 long id)
      -
      Deletes the role from the database. This also deletes all user role combinations associated with this role -
      Example: http://localhost:2019/roles/role/3
      -
      -
      Parameters:
      -
      id - The primary key (long) of the role you wish to delete
      -
      Returns:
      -
      Status of OK
      -
      -
      • -
    - - - -
    • -

      putUpdateRole

      -
      @PutMapping(value="/role/{roleid}",
+
      
+
      putUpdateRole
      
+
      @PutMapping(value="/role/{roleid}",
             consumes="application/json")
-public org.springframework.http.ResponseEntity<?> putUpdateRole​(@PathVariable
-                                                                long roleid,
-                                                                @Valid @RequestBody
-                                                                @Valid Role newRole)
      +public org.springframework.http.ResponseEntity<?> putUpdateRole​(@PathVariable +long roleid, +@Valid @RequestBody +@Valid Role newRole)
      The process allows you to update a role name only!
      Example: http://localhost:2019/roles/role/3
      @@ -407,40 +318,16 @@

      putUpdateRole

      Returns:
      Status of OK
      -
      • -
    - - - -
      -
    • -

      patchUpdateRole

      -
      @PatchMapping(value="/role/{roleid}",
-              consumes="application/json")
-public org.springframework.http.ResponseEntity<?> patchUpdateRole​(@PathVariable
-                                                                  long roleid,
-                                                                  @Valid @RequestBody
-                                                                  @Valid Role newRole)
      -
      The process allows you to update a role name only! -
      Example: http://localhost:2019/roles/role/3
      -
      -
      Parameters:
      -
      roleid - The primary key (long) of the role you wish to update
      -
      newRole - The new name (String) for the role
      -
      Returns:
      -
      Status of OK
      -
      -
      • -
    + + - - +
    + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/controllers/UserController.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/controllers/UserController.html similarity index 55% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/controllers/UserController.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/controllers/UserController.html index fe388c5..133c1bb 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/controllers/UserController.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/controllers/UserController.html @@ -2,46 +2,38 @@ - + UserController - + + + - + - - + + - - + + - - -
    +
    + - +
    +
    Package com.lambdaschool.usermodel.controllers
    -

    Class UserController

    +

    Class UserController

    -
      -
    • java.lang.Object
      • -
    • -
        -
      • com.lambdaschool.usermodel.controllers.UserController
        • -
      -
      • -
    -
    -
      -
    • +
      java.lang.Object +
      com.lambdaschool.usermodel.controllers.UserController
      +
      +
      @RestController
 @RequestMapping("/users")
 public class UserController
 extends java.lang.Object
      The entry point for clients to access user data
      -
      • -
    -
    -
    + +
      -
    • -
      -
        -
      • +
      • +
        -

        Constructor Summary

        - +

        Constructor Summary

        +
        +
        + + + +
        Constructors 
        Constructor Description
        UserController()  
        -
        • -
      +
    + -
    -
    +
    +

    Methods inherited from class java.lang.Object

    -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait - - - + + +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    -
    -
    + +
      -
    • -
      -
        -
      • - - -

        Constructor Detail

        - +
      • +
        -
          +

          Constructor Details

          +
          • -

            UserController

            -
            public UserController()
            -
            • -
          +
          +

          UserController

          +
          public UserController()
          +
        +
        • -
        -
          -
        • - - -

          Method Detail

          - +
        • +
          +

          Method Details

          • -

            listAllUsers

            -
            @GetMapping(value="/users",
+
            
+
            listAllUsers
            
+
            @GetMapping(value="/users",
             produces="application/json")
-public org.springframework.http.ResponseEntity<?> listAllUsers()
            +public org.springframework.http.ResponseEntity<?> listAllUsers()
    Returns a list of all users
    Example: http://localhost:2019/users/users
    @@ -328,18 +261,15 @@

    listAllUsers

    See Also:
    UserService.findAll()
    + - - - - -
    • -

      getUserById

      -
      @GetMapping(value="/user/{userId}",
+
      
+
      getUserById
      
+
      @GetMapping(value="/user/{userId}",
             produces="application/json")
-public org.springframework.http.ResponseEntity<?> getUserById​(@PathVariable
-                                                              java.lang.Long userId)
      +public org.springframework.http.ResponseEntity<?> getUserById​(@PathVariable +java.lang.Long userId)
      Returns a single user based off a user id number
      Example: http://localhost:2019/users/user/7
      @@ -350,18 +280,15 @@

      getUserById

      See Also:
      UserService.findUserById(long)
      +
      • -
    - - - -
    • -

      getUserByName

      -
      @GetMapping(value="/user/name/{userName}",
+
      
+
      getUserByName
      
+
      @GetMapping(value="/user/name/{userName}",
             produces="application/json")
-public org.springframework.http.ResponseEntity<?> getUserByName​(@PathVariable
-                                                                java.lang.String userName)
      +public org.springframework.http.ResponseEntity<?> getUserByName​(@PathVariable +java.lang.String userName)
      Return a user object based on a given username
      Example: http://localhost:2019/users/user/name/cinnamon
      @@ -372,18 +299,15 @@

      getUserByName

      See Also:
      UserService.findByName(String)
      +
      • -
    - - - -
    • -

      getUserLikeName

      -
      @GetMapping(value="/user/name/like/{userName}",
+
      
+
      getUserLikeName
      
+
      @GetMapping(value="/user/name/like/{userName}",
             produces="application/json")
-public org.springframework.http.ResponseEntity<?> getUserLikeName​(@PathVariable
-                                                                  java.lang.String userName)
      +public org.springframework.http.ResponseEntity<?> getUserLikeName​(@PathVariable +java.lang.String userName)
      Returns a list of users whose username contains the given substring
      Example: http://localhost:2019/users/user/name/like/da
      @@ -394,19 +318,16 @@

      getUserLikeName

      See Also:
      UserService.findByNameContaining(String)
      +
      • -
    - - - -
    • -

      addNewUser

      -
      @PostMapping(value="/user",
+
      
+
      addNewUser
      
+
      @PostMapping(value="/user",
              consumes="application/json")
-public org.springframework.http.ResponseEntity<?> addNewUser​(@Valid @RequestBody
-                                                             @Valid User newuser)
-                                                      throws java.net.URISyntaxException
      +public org.springframework.http.ResponseEntity<?> addNewUser​(@Valid @RequestBody +@Valid User newuser) + throws java.net.URISyntaxException
      Given a complete User Object, create a new User record and accompanying useremail records and user role records.
      Example: http://localhost:2019/users/user
      @@ -421,20 +342,17 @@

      addNewUser

      See Also:
      UserService.save(User)
      +
      • -
    - - - -
    • -

      updateFullUser

      -
      @PutMapping(value="/user/{userid}",
+
      
+
      updateFullUser
      
+
      @PutMapping(value="/user/{userid}",
             consumes="application/json")
-public org.springframework.http.ResponseEntity<?> updateFullUser​(@Valid @RequestBody
-                                                                 @Valid User updateUser,
-                                                                 @PathVariable
-                                                                 long userid)
      +public org.springframework.http.ResponseEntity<?> updateFullUser​(@Valid @RequestBody +@Valid User updateUser, +@PathVariable +long userid)
      Given a complete User Object Given the user id, primary key, is in the User table, replace the User record and Useremail records. @@ -450,20 +368,17 @@

      updateFullUser

      See Also:
      UserService.save(User)
      +
      • -
    - - - -
    • -

      updateUser

      -
      @PatchMapping(value="/user/{id}",
+
      
+
      updateUser
      
+
      @PatchMapping(value="/user/{id}",
               consumes="application/json")
-public org.springframework.http.ResponseEntity<?> updateUser​(@RequestBody
-                                                             User updateUser,
-                                                             @PathVariable
-                                                             long id)
      +public org.springframework.http.ResponseEntity<?> updateUser​(@RequestBody +User updateUser, +@PathVariable +long id)
      Updates the user record associated with the given id with the provided data. Only the provided fields are affected. Roles are handled through different endpoints If an email list is given, it replaces the original emai list. @@ -477,17 +392,14 @@

      updateUser

      See Also:
      UserService.update(User, long)
      +
      • -
    - - - -
    • -

      deleteUserById

      -
      @DeleteMapping("/user/{id}")
-public org.springframework.http.ResponseEntity<?> deleteUserById​(@PathVariable
-                                                                 long id)
      +
      +

      deleteUserById

      +
      @DeleteMapping("/user/{id}") +public org.springframework.http.ResponseEntity<?> deleteUserById​(@PathVariable +long id)
      Deletes a given user along with associated emails and roles
      Example: http://localhost:2019/users/user/14
      @@ -496,78 +408,16 @@

      deleteUserById

      Returns:
      Status of OK
      -
      • -
    - - - -
      -
    • -

      getNumUserEmails

      -
      @GetMapping(value="/user/email/count",
-            produces="application/json")
-public org.springframework.http.ResponseEntity<?> getNumUserEmails()
      -
      Find all users and the number of emails associated with them. Does not include primary email in the report -
      Example: http://localhost:2019/users/user/email/count
      -
      -
      Returns:
      -
      JSON list of all users with the number of emails associated with them.
      -
      -
      • -
    - - - -
      -
    • -

      deleteUserRoleByIds

      -
      @DeleteMapping("/user/{userid}/role/{roleid}")
-public org.springframework.http.ResponseEntity<?> deleteUserRoleByIds​(@PathVariable
-                                                                      long userid,
-                                                                      @PathVariable
-                                                                      long roleid)
      -
      Deletes the given user, user role combination -
      Example: http://localhost:2019/users/user/7/role/2
      -
      -
      Parameters:
      -
      userid - the user id of the user user role combination
      -
      roleid - the role id of the user user role combination
      -
      Returns:
      -
      Status OK
      -
      -
      • -
    - - - -
      -
    • -

      postUserRoleByIds

      -
      @PostMapping("/user/{userid}/role/{roleid}")
-public org.springframework.http.ResponseEntity<?> postUserRoleByIds​(@PathVariable
-                                                                    long userid,
-                                                                    @PathVariable
-                                                                    long roleid)
      -
      Adds the given user, user role combination -
      Example: http://localhost:2019/users/user/7/role/2
      -
      -
      Parameters:
      -
      userid - the user id of the user user role combination
      -
      roleid - the role id of the user user role combination
      -
      Returns:
      -
      Status OK
      -
      -
      • -
    + + - - +
    + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/controllers/UseremailController.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/controllers/UseremailController.html similarity index 57% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/controllers/UseremailController.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/controllers/UseremailController.html index c57dc86..be3f703 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/controllers/UseremailController.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/controllers/UseremailController.html @@ -2,46 +2,38 @@ - + UseremailController - + + + - + - - + + - - + + - - -
    +
    + - +
    +
    Package com.lambdaschool.usermodel.controllers
    -

    Class UseremailController

    +

    Class UseremailController

    -
      -
    • java.lang.Object
      • -
    • -
        -
      • com.lambdaschool.usermodel.controllers.UseremailController
        • -
      -
      • -
    -
    -
      -
    • +
      java.lang.Object +
      com.lambdaschool.usermodel.controllers.UseremailController
      +
      +
      @RestController
 @RequestMapping("/useremails")
 public class UseremailController
 extends java.lang.Object
      The entry point for client to access user, email combinations
      -
      • -
    -
    -
    + +
      -
    • -
      -
        -
      • +
      • +
        -

        Constructor Summary

        - +

        Constructor Summary

        +
        +
        + + + +
        Constructors 
        Constructor Description
        UseremailController()  
        -
        • -
      +
    + -
    -
    +
    +

    Methods inherited from class java.lang.Object

    -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait - - - + + +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    -
    -
    + +
      -
    • -
      -
        -
      • - - -

        Constructor Detail

        - +
      • +
        -
          +

          Constructor Details

          +
          • -

            UseremailController

            -
            public UseremailController()
            -
            • -
          +
          +

          UseremailController

          +
          public UseremailController()
          +
        +
        • -
        -
          -
        • - - -

          Method Detail

          - +
        • +
          +

          Method Details

          • -

            listAllUseremails

            -
            @GetMapping(value="/useremails",
+
            
+
            listAllUseremails
            
+
            @GetMapping(value="/useremails",
             produces="application/json")
-public org.springframework.http.ResponseEntity<?> listAllUseremails()
            +public org.springframework.http.ResponseEntity<?> listAllUseremails()
    List of all users emails
    Example: http://localhost:2019/useremails/useremails
    Returns:
    JSON list of all users emails
    + - - - - -
    • -

      getUserEmailById

      -
      @GetMapping(value="/useremail/{useremailId}",
+
      
+
      getUserEmailById
      
+
      @GetMapping(value="/useremail/{useremailId}",
             produces="application/json")
-public org.springframework.http.ResponseEntity<?> getUserEmailById​(@PathVariable
-                                                                   java.lang.Long useremailId)
      +public org.springframework.http.ResponseEntity<?> getUserEmailById​(@PathVariable +java.lang.Long useremailId)
      Return the user email combination referenced by the given primary key
      Example: http://localhost:2019/useremails/useremail/8
      @@ -303,17 +251,14 @@

      getUserEmailById

      Returns:
      JSON object of the user email combination you seek with a status of OK
      +
      • -
    - - - -
    • -

      deleteUserEmailById

      -
      @DeleteMapping("/useremail/{useremailid}")
-public org.springframework.http.ResponseEntity<?> deleteUserEmailById​(@PathVariable
-                                                                      long useremailid)
      +
      +

      deleteUserEmailById

      +
      @DeleteMapping("/useremail/{useremailid}") +public org.springframework.http.ResponseEntity<?> deleteUserEmailById​(@PathVariable +long useremailid)
      Removes the given user email combination
      Example: http://localhost:2019/useremails/useremail/8
      @@ -322,19 +267,16 @@

      deleteUserEmailById

      Returns:
      Status of OK
      +
      • -
    - - - -
    • -

      updateUserEmail

      -
      @PutMapping("/useremail/{useremailid}/email/{emailaddress}")
-public org.springframework.http.ResponseEntity<?> updateUserEmail​(@PathVariable
-                                                                  long useremailid,
-                                                                  @PathVariable
-                                                                  java.lang.String emailaddress)
      +
      +

      updateUserEmail

      +
      @PutMapping("/useremail/{useremailid}/email/{emailaddress}") +public org.springframework.http.ResponseEntity<?> updateUserEmail​(@PathVariable +long useremailid, +@PathVariable +java.lang.String emailaddress)
      Change the email associated with the given user email combination
      Example: http://localhost:2019/useremails/useremail/9/email/favbun@hops.local
      @@ -344,20 +286,17 @@

      updateUserEmail

      Returns:
      Status of OK
      +
      • -
    - - - -
    • -

      addNewUserEmail

      -
      @PostMapping("/user/{userid}/email/{emailaddress}")
-public org.springframework.http.ResponseEntity<?> addNewUserEmail​(@PathVariable
-                                                                  long userid,
-                                                                  @PathVariable
-                                                                  java.lang.String emailaddress)
-                                                           throws java.net.URISyntaxException
      +
      +

      addNewUserEmail

      +
      @PostMapping("/user/{userid}/email/{emailaddress}") +public org.springframework.http.ResponseEntity<?> addNewUserEmail​(@PathVariable +long userid, +@PathVariable +java.lang.String emailaddress) + throws java.net.URISyntaxException
      Adds a new user email combination
      Parameters:
      @@ -370,37 +309,16 @@

      addNewUserEmail

      See Also:
      UseremailService.save(long, String)
      -
      • -
    - - - -
      -
    • -

      findUseremailByUserName

      -
      @GetMapping(value="/username/{userName}",
-            produces="application/json")
-public org.springframework.http.ResponseEntity<?> findUseremailByUserName​(@PathVariable
-                                                                          java.lang.String userName)
      -
      Finds the emails associated with the given user. Does not include primary email! -
      Example: http://localhost:2019/useremails/username/cinnamon
      -
      -
      Parameters:
      -
      userName - The username (String) of the user email combinations you seek.
      -
      Returns:
      -
      JSON list of the user email combinations associated with the given user
      -
      -
      • -
    + + - - +
    + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/controllers/package-summary.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/controllers/package-summary.html similarity index 61% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/controllers/package-summary.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/controllers/package-summary.html index 7838e34..561ac39 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/controllers/package-summary.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/controllers/package-summary.html @@ -2,40 +2,32 @@ - + com.lambdaschool.usermodel.controllers - + + + - + - - + + - - + + - - -
    +
    + +

    Package com.lambdaschool.usermodel.controllers

    -
    +
    Contains the access points, end points, that can be used by clients.
    +
    • - +
      +
      + + @@ -130,8 +102,10 @@

      Package com.lambdaschool.usermodel.contro

      Class Summary 
      Class Description
      RolesController
      +
    +
    @@ -154,30 +128,13 @@

    Package com.lambdaschool.usermodel.contro
  • Help

    • -
    - -
    - - -
    -
    + + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/controllers/package-tree.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/controllers/package-tree.html similarity index 60% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/controllers/package-tree.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/controllers/package-tree.html index 5c8adec..95f832d 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/controllers/package-tree.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/controllers/package-tree.html @@ -2,40 +2,32 @@ - + com.lambdaschool.usermodel.controllers Class Hierarchy - + + + - + - - + + - - + + - - -
    +
    + +

    Hierarchy For Package com.lambdaschool.usermodel.controllers

    @@ -100,7 +68,7 @@

    Hierarchy For Package com.lambdaschool.usermodel.controllers

    -
    +

    Class Hierarchy

    • java.lang.Object @@ -134,30 +102,13 @@

      Class Hierarchy

    • Help
    -
    - -
    - - -
    -
    + +
    +
    diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/models/Role.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/Role.html similarity index 61% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/models/Role.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/Role.html index 396b4d5..34ea08a 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/models/Role.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/Role.html @@ -2,46 +2,38 @@ - + Role - + + + - + - - + + - - + + - - -
    +
    + - +
    +
    Package com.lambdaschool.usermodel.models
    -

    Class Role

    +

    Class Role

    -
      -
    • java.lang.Object
      • -
    • -
        -
      • com.lambdaschool.usermodel.models.Role
        • -
      -
      • -
    -
    -
      -
    • +
      java.lang.Object +
      com.lambdaschool.usermodel.models.Role
      +
      +
      @Entity
 public class Role
 extends java.lang.Object
      The entity allowing interaction with the roles table.
      -
      • -
    -
    -
    + +
      -
    • -
      -
        -
      • +
      • +
        -

        Field Summary

        - +

        Field Summary

        +
        +
        + + + @@ -183,23 +144,27 @@

        Field Summary

        Date field containing the data and time when the row was last modified
        +
        Fields 
        Modifier and Type Field Description
        protected java.lang.String createdBy
        -
        • -
      +
    + -
    -
      -
    • +
    • +
      -

      Constructor Summary

      - +

      Constructor Summary

      +
      +
      + + + +
      Constructors 
      Constructor Description
      Role() @@ -212,271 +177,237 @@

      Constructor Summary

      Given the name, create a new role object.
      -
      • -
    +
    + -
    -
      -
    • +
    • +
      -

      Method Summary

      - - +

      Method Summary

      +
      +
      +
      +
      All Methods Instance Methods Concrete Methods 
      + - + + + - + - - + + - + - + - + - + +
      Modifier and Type Method Description
      java.lang.String getName()
      Getter for role name
      long getRoleid()
      Getter for role id
      java.util.List<UserRoles>
      java.util.Set<UserRoles> getUsers()
      Getter for user role combinations
      void setName​(java.lang.String name)
      Setter for role name
      void setRoleid​(long roleid)
      Setter for role id, used for seeding data
      voidsetUsers​(java.util.List<UserRoles> users)setUsers​(java.util.Set<UserRoles> users)
      Setter for user role combinations
      -
    +
    +

    Methods inherited from class java.lang.Object

    -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait - - - + + +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    - -
    + +
      -
    • -
      -
        -
      • - - -

        Field Detail

        - +
      • +
        +

        Field Details

        • -

          createdBy

          -
          protected java.lang.String createdBy
          +
          +

          createdBy

          +
          protected java.lang.String createdBy
          String field containing the username of who created this row
          +
          • -
        - - - -
        • -

          createdDate

          -
          protected java.util.Date createdDate
          +
          +

          createdDate

          +
          protected java.util.Date createdDate
          Date field containing the date and time when the row was created

          Temporal(TIMESTAMP) - Sets the precision of the date being saved. In this case Date and Time

          +
          • -
        - - - -
        • -

          lastModifiedBy

          -
          protected java.lang.String lastModifiedBy
          +
          +

          lastModifiedBy

          +
          protected java.lang.String lastModifiedBy
          String field containing the username of who last modified this row
          +
          • -
        - - - -
        • -

          lastModifiedDate

          -
          protected java.util.Date lastModifiedDate
          +
          +

          lastModifiedDate

          +
          protected java.util.Date lastModifiedDate
          Date field containing the data and time when the row was last modified

          Temporal(TIMESTAMP) - Sets the precision of the date being saved. In this case Date and Time

          -
          • -
        +
      +
      • -
      -
        -
      • - - -

        Constructor Detail

        - +
      • +
        +

        Constructor Details

        • -

          Role

          -
          public Role()
          +
          +

          Role

          +
          public Role()
          Default Constructor used primarily by the JPA.
          +
          • -
        - - - -
        • -

          Role

          -
          public Role​(java.lang.String name)
          +
          +

          Role

          +
          public Role​(java.lang.String name)
          Given the name, create a new role object. User gets added later
          Parameters:
          name - the name of the role in uppercase
          -
          • -
        +
      + -
      -
        -
      • - - -

        Method Detail

        - +
      • +
        +

        Method Details

        • -

          getRoleid

          -
          public long getRoleid()
          +
          +

          getRoleid

          +
          public long getRoleid()
          Getter for role id
          Returns:
          the role id, primary key, (long) of this role
          +
          • -
        - - - -
        • -

          setRoleid

          -
          public void setRoleid​(long roleid)
          +
          +

          setRoleid

          +
          public void setRoleid​(long roleid)
          Setter for role id, used for seeding data
          Parameters:
          roleid - the new role id, primary key, (long) for this role
          +
          • -
        - - - -
        • -

          getName

          -
          public java.lang.String getName()
          +
          +

          getName

          +
          public java.lang.String getName()
          Getter for role name
          Returns:
          role name (String) in uppercase
          +
          • -
        - - - -
        • -

          setName

          -
          public void setName​(java.lang.String name)
          +
          +

          setName

          +
          public void setName​(java.lang.String name)
          Setter for role name
          Parameters:
          name - the new role name (String) for this role, in uppercase
          +
          • -
        - - - -
        • -

          getUsers

          -
          public java.util.List<UserRoles> getUsers()
          +
          +

          getUsers

          +
          public java.util.Set<UserRoles> getUsers()
          Getter for user role combinations
          Returns:
          A list of user role combinations associated with this role
          +
          • -
        - - - -
        • -

          setUsers

          -
          public void setUsers​(java.util.List<UserRoles> users)
          +
          +

          setUsers

          +
          public void setUsers​(java.util.Set<UserRoles> users)
          Setter for user role combinations
          Parameters:
          users - Change the list of user role combinations associated with this role to this one
          -
          • -
        +
    +
    - - +
    + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/models/User.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/User.html similarity index 60% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/models/User.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/User.html index f958679..0733ccb 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/models/User.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/User.html @@ -2,46 +2,38 @@ - + User - + + + - + - - + + - - + + - - -
    +
    + - +
    +
    Package com.lambdaschool.usermodel.models
    -

    Class User

    +

    Class User

    -
      -
    • java.lang.Object
      • -
    • -
        -
      • com.lambdaschool.usermodel.models.User
        • -
      -
      • -
    -
    -
      -
    • +
      java.lang.Object +
      com.lambdaschool.usermodel.models.User
      +
      +
      @Entity
 public class User
 extends java.lang.Object
      The entity allowing interaction with the users table
      -
      • -
    -
    -
    + +
      -
    • -
      -
        -
      • +
      • +
        -

        Field Summary

        - +

        Field Summary

        +
        +
        + + + @@ -183,23 +144,27 @@

        Field Summary

        Date field containing the data and time when the row was last modified
        +
        Fields 
        Modifier and Type Field Description
        protected java.lang.String createdBy
        -
        • -
      +
    + -
    -
      -
    • +
    • +
      -

      Constructor Summary

      - +

      Constructor Summary

      +
      +
      + + + - + +
      Constructors 
      Constructor Description
      User() @@ -207,221 +172,197 @@

      Constructor Summary
      User​(java.lang.String username, - java.lang.String password, - java.lang.String primaryemail, - java.util.List<UserRoles> userRoles)User​(java.lang.String username, +java.lang.String password, +java.lang.String primaryemail)
      Given the params, create a new user object
      -
      • -
    +
    + -
    -
    +
    +

    Methods inherited from class java.lang.Object

    -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait - - - + + +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    - -
    + +
      -
    • -
      -
        -
      • - - -

        Field Detail

        - +
      • +
        +

        Field Details

        • -

          createdBy

          -
          protected java.lang.String createdBy
          +
          +

          createdBy

          +
          protected java.lang.String createdBy
          String field containing the username of who created this row
          +
          • -
        - - - -
        • -

          createdDate

          -
          protected java.util.Date createdDate
          +
          +

          createdDate

          +
          protected java.util.Date createdDate
          Date field containing the date and time when the row was created

          Temporal(TIMESTAMP) - Sets the precision of the date being saved. In this case Date and Time

          +
          • -
        - - - -
        • -

          lastModifiedBy

          -
          protected java.lang.String lastModifiedBy
          +
          +

          lastModifiedBy

          +
          protected java.lang.String lastModifiedBy
          String field containing the username of who last modified this row
          +
          • -
        - - - -
        • -

          lastModifiedDate

          -
          protected java.util.Date lastModifiedDate
          +
          +

          lastModifiedDate

          +
          protected java.util.Date lastModifiedDate
          Date field containing the data and time when the row was last modified

          Temporal(TIMESTAMP) - Sets the precision of the date being saved. In this case Date and Time

          -
          • -
        +
      +
      • -
      -
        -
      • - - -

        Constructor Detail

        - +
      • +
        +

        Constructor Details

        • -

          User

          -
          public User()
          +
          +

          User

          +
          public User()
          Default constructor used primarily by the JPA.
          +
          • -
        - - - -
        • -

          User

          -
          public User​(java.lang.String username,
-            java.lang.String password,
-            java.lang.String primaryemail,
-            java.util.List<UserRoles> userRoles)
          +
          +

          User

          +
          public User​(java.lang.String username, +java.lang.String password, +java.lang.String primaryemail)
          Given the params, create a new user object

          userid is autogenerated

          @@ -430,211 +371,159 @@

          User

          username - The username (String) of the user
          password - The password (String) of the user
          primaryemail - The primary email (String) of the user
          -
          userRoles - The list of roles (userroles) assigned to this user
          -
          • -
        +
      + -
      -
        -
      • - - -

        Method Detail

        - +
      • +
        +

        Method Details

        • -

          getUserid

          -
          public long getUserid()
          +
          +

          getUserid

          +
          public long getUserid()
          Getter for userid
          Returns:
          the userid (long) of the user
          +
          • -
        - - - -
        • -

          setUserid

          -
          public void setUserid​(long userid)
          +
          +

          setUserid

          +
          public void setUserid​(long userid)
          Setter for userid. Used primary for seeding data
          Parameters:
          userid - the new userid (long) of the user
          +
          • -
        - - - -
        • -

          getUsername

          -
          public java.lang.String getUsername()
          +
          +

          getUsername

          +
          public java.lang.String getUsername()
          Getter for username
          Returns:
          the username (String) lowercase
          +
          • -
        - - - -
        • -

          setUsername

          -
          public void setUsername​(java.lang.String username)
          +
          +

          setUsername

          +
          public void setUsername​(java.lang.String username)
          setter for username
          Parameters:
          username - the new username (String) converted to lowercase
          +
          • -
        - - - -
        • -

          getPrimaryemail

          -
          public java.lang.String getPrimaryemail()
          +
          +

          getPrimaryemail

          +
          public java.lang.String getPrimaryemail()
          getter for primary email
          Returns:
          the primary email (String) for the user converted to lowercase
          +
          • -
        - - - -
        • -

          setPrimaryemail

          -
          public void setPrimaryemail​(java.lang.String primaryemail)
          +
          +

          setPrimaryemail

          +
          public void setPrimaryemail​(java.lang.String primaryemail)
          setter for primary email
          Parameters:
          primaryemail - the new primary email (String) for the user converted to lowercase
          +
          • -
        - - - -
        • -

          getPassword

          -
          public java.lang.String getPassword()
          +
          +

          getPassword

          +
          public java.lang.String getPassword()
          Getter for the password
          Returns:
          the password (String) of the user
          +
          • -
        - - - -
        • -

          setPassword

          -
          public void setPassword​(java.lang.String password)
          +
          +

          setPassword

          +
          public void setPassword​(java.lang.String password)
          Setter for password
          Parameters:
          password - the new password (String) for the user
          +
          • -
        - - - -
        • -

          getUseremails

          -
          public java.util.List<Useremail> getUseremails()
          +
          +

          getUseremails

          +
          public java.util.List<Useremail> getUseremails()
          Getter for the list of useremails for this user
          Returns:
          the list of useremails (List(Useremail)) for this user
          +
          • -
        - - - -
        • -

          setUseremails

          -
          public void setUseremails​(java.util.List<Useremail> useremails)
          +
          +

          setUseremails

          +
          public void setUseremails​(java.util.List<Useremail> useremails)
          Setter for list of useremails for this user
          Parameters:
          useremails - the new list of useremails (List(Useremail)) for this user
          +
          • -
        - - - -
        • -

          getRoles

          -
          public java.util.List<UserRoles> getRoles()
          +
          +

          getRoles

          +
          public java.util.Set<UserRoles> getRoles()
          Getter for user role combinations
          Returns:
          A list of user role combinations associated with this user
          +
          • -
        - - - -
        • -

          setRoles

          -
          public void setRoles​(java.util.List<UserRoles> roles)
          +
          +

          setRoles

          +
          public void setRoles​(java.util.Set<UserRoles> roles)
          Setter for user role combinations
          Parameters:
          roles - Change the list of user role combinations associated with this user to this one
          -
          • -
        - - - -
          -
        • -

          addRole

          -
          public void addRole​(Role role)
          -
          Add one role to this user
          -
          -
          Parameters:
          -
          role - the new role (Role) to add
          -
          -
          • -
        +
    +
    - - +
    + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/models/UserRoles.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/UserRoles.html similarity index 63% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/models/UserRoles.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/UserRoles.html index 2dbdbc0..7d2a10b 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/models/UserRoles.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/UserRoles.html @@ -2,46 +2,38 @@ - + UserRoles - + + + - + - - + + - - + + - - -
    +
    + - +
    +
    Package com.lambdaschool.usermodel.models
    -

    Class UserRoles

    +

    Class UserRoles

    -
      -
    • java.lang.Object
      • -
    • -
        -
      • com.lambdaschool.usermodel.models.UserRoles
        • -
      -
      • -
    -
    -
      -
    • +
      java.lang.Object +
      com.lambdaschool.usermodel.models.UserRoles
      +
      +
      All Implemented Interfaces:
      java.io.Serializable
      @@ -151,26 +112,26 @@

      Class UserRoles

      See Also:
      Serialized Form
      -
      • -
    -
    -
    + +
      -
    • -
      -
        -
      • +
      • +
        -

        Field Summary

        - +

        Field Summary

        +
        +
        + + + @@ -199,23 +160,27 @@

        Field Summary

        Date field containing the data and time when the row was last modified
        +
        Fields 
        Modifier and Type Field Description
        protected java.lang.String createdBy
        -
        • -
      +
    + -
    -
      -
    • +
    • +
      -

      Constructor Summary

      - +

      Constructor Summary

      +
      +
      + + + +Role role) +
      Constructors 
      Constructor Description
      UserRoles() @@ -224,272 +189,238 @@

      Constructor Summary

      UserRoles​(User user, - Role role)
      Given the params, create a new user role combination object
      -
      • -
    +
    + -
    -
    +
    +

    Methods inherited from class java.lang.Object

    -clone, finalize, getClass, notify, notifyAll, toString, wait, wait, wait - - - + + +clone, finalize, getClass, notify, notifyAll, toString, wait, wait, wait
    - -
    + +
      -
    • -
      -
        -
      • - - -

        Field Detail

        - +
      • +
        +

        Field Details

        • -

          createdBy

          -
          protected java.lang.String createdBy
          +
          +

          createdBy

          +
          protected java.lang.String createdBy
          String field containing the username of who created this row
          +
          • -
        - - - -
        • -

          createdDate

          -
          protected java.util.Date createdDate
          +
          +

          createdDate

          +
          protected java.util.Date createdDate
          Date field containing the date and time when the row was created

          Temporal(TIMESTAMP) - Sets the precision of the date being saved. In this case Date and Time

          +
          • -
        - - - -
        • -

          lastModifiedBy

          -
          protected java.lang.String lastModifiedBy
          +
          +

          lastModifiedBy

          +
          protected java.lang.String lastModifiedBy
          String field containing the username of who last modified this row
          +
          • -
        - - - -
        • -

          lastModifiedDate

          -
          protected java.util.Date lastModifiedDate
          +
          +

          lastModifiedDate

          +
          protected java.util.Date lastModifiedDate
          Date field containing the data and time when the row was last modified

          Temporal(TIMESTAMP) - Sets the precision of the date being saved. In this case Date and Time

          -
          • -
        +
      +
      • -
      -
        -
      • - - -

        Constructor Detail

        - +
      • +
        +

        Constructor Details

        • -

          UserRoles

          -
          public UserRoles()
          +
          +

          UserRoles

          +
          public UserRoles()
          Default constructor used primarily by the JPA.
          +
          • -
        - - - -
        • -

          UserRoles

          -
          public UserRoles​(User user,
-                 Role role)
          +
          +

          UserRoles

          +
          public UserRoles​(User user, +Role role)
          Given the params, create a new user role combination object
          Parameters:
          user - The user object of this relationship
          role - The role object of this relationship
          -
          • -
        +
      + -
      -
        -
      • - - -

        Method Detail

        - +
      • +
        +

        Method Details

        • -

          getUser

          -
          public User getUser()
          +
          +

          getUser

          +
          public User getUser()
          The getter for User
          Returns:
          the complete user object associated with user role combination
          +
          • -
        - - - -
        • -

          setUser

          -
          public void setUser​(User user)
          +
          +

          setUser

          +
          public void setUser​(User user)
          Setter for user
          Parameters:
          user - change the user object associated with this user role combination to this one.
          +
          • -
        - - - -
        • -

          getRole

          -
          public Role getRole()
          +
          +

          getRole

          +
          public Role getRole()
          Getter for role
          Returns:
          the complete role object associated with this user role combination
          +
          • -
        - - - -
        • -

          setRole

          -
          public void setRole​(Role role)
          +
          +

          setRole

          +
          public void setRole​(Role role)
          Setter for role
          Parameters:
          role - change role object associated with this user role combination to this one.
          +
          • -
        - - - -
        • -

          equals

          -
          public boolean equals​(java.lang.Object o)
          +
          +

          equals

          +
          public boolean equals​(java.lang.Object o)
          Overrides:
          equals in class java.lang.Object
          +
          • -
        - - - -
        • -

          hashCode

          -
          public int hashCode()
          +
          +

          hashCode

          +
          public int hashCode()
          Overrides:
          hashCode in class java.lang.Object
          -
          • -
        +
    +
    - - +
    + + diff --git a/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/UserRolesId.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/UserRolesId.html new file mode 100644 index 0000000..b9ccfd3 --- /dev/null +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/UserRolesId.html @@ -0,0 +1,351 @@ + + + + + +UserRolesId + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    +
    Package com.lambdaschool.usermodel.models
    +

    Class UserRolesId

    +
    +
    +
    java.lang.Object +
    com.lambdaschool.usermodel.models.UserRolesId
    +
    +
    +
    +
    All Implemented Interfaces:
    +
    java.io.Serializable
    +
    +
    +
    @Embeddable
+public class UserRolesId
+extends java.lang.Object
+implements java.io.Serializable
    +
    Class to represent the complex primary key for UserRoles
    +
    +
    See Also:
    +
    Serialized Form
    +
    +
    +
    +
      + +
    • +
      + + +

      Constructor Summary

      +
      + + + + + + + + + + + + + + +
      Constructors 
      ConstructorDescription
      UserRolesId() +
      The default constructor required by JPA
      +
      +
      +
      +
      • + +
    • +
      + + +

      Method Summary

      +
      +
      +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      Modifier and TypeMethodDescription
      booleanequals​(java.lang.Object o) 
      longgetRole() +
      Getter for the role id
      +
      longgetUser() +
      Getter for the user id
      +
      inthashCode() 
      voidsetRole​(long role) +
      The setter for the role id
      +
      voidsetUser​(long user) +
      Setter for the user id
      +
      +
      +
      +
      +

      Methods inherited from class java.lang.Object

      + + +clone, finalize, getClass, notify, notifyAll, toString, wait, wait, wait
      +
      +
      • +
    +
    +
    +
      + +
    • +
      + + +

      Constructor Details

      +
        +
      • +
        +

        UserRolesId

        +
        public UserRolesId()
        +
        The default constructor required by JPA
        +
        +
        • +
      +
      +
      • + +
    • +
      + + +

      Method Details

      +
        +
      • +
        +

        getUser

        +
        public long getUser()
        +
        Getter for the user id
        +
        +
        Returns:
        +
        long the user id
        +
        +
        +
        • +
      • +
        +

        setUser

        +
        public void setUser​(long user)
        +
        Setter for the user id
        +
        +
        Parameters:
        +
        user - the new user id for this object
        +
        +
        +
        • +
      • +
        +

        getRole

        +
        public long getRole()
        +
        Getter for the role id
        +
        +
        Returns:
        +
        long the role id
        +
        +
        +
        • +
      • +
        +

        setRole

        +
        public void setRole​(long role)
        +
        The setter for the role id
        +
        +
        Parameters:
        +
        role - the new role id for this object
        +
        +
        +
        • +
      • +
        +

        equals

        +
        public boolean equals​(java.lang.Object o)
        +
        +
        Overrides:
        +
        equals in class java.lang.Object
        +
        +
        +
        • +
      • +
        +

        hashCode

        +
        public int hashCode()
        +
        +
        Overrides:
        +
        hashCode in class java.lang.Object
        +
        +
        +
        • +
      +
      +
      • +
    +
    +
    + +
    + +
    +
    + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/models/Useremail.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/Useremail.html similarity index 63% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/models/Useremail.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/Useremail.html index 32f7393..5f9a338 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/models/Useremail.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/Useremail.html @@ -2,46 +2,38 @@ - + Useremail - + + + - + - - + + - - + + - - -
    +
    + - +
    +
    Package com.lambdaschool.usermodel.models
    -

    Class Useremail

    +

    Class Useremail

    -
      -
    • java.lang.Object
      • -
    • -
        -
      • com.lambdaschool.usermodel.models.Useremail
        • -
      -
      • -
    -
    -
      -
    • +
      java.lang.Object +
      com.lambdaschool.usermodel.models.Useremail
      +
      +
      @Entity
 public class Useremail
@@ -137,26 +98,26 @@ 
      Class Useremail
      
 
      The entity allowing interaction with the useremails table
  
      
  requires each combination of user and useremail to be unique. The same email cannot be assigned to the same user more than once.
      
-
      • -
    -
    -
    + +
      -
    • -
      -
        -
      • +
      • +
        -

        Field Summary

        - +

        Field Summary

        +
        +
        + + + @@ -185,23 +146,27 @@

        Field Summary

        Date field containing the data and time when the row was last modified
        +
        Fields 
        Modifier and Type Field Description
        protected java.lang.String createdBy
        -
        • -
      +
    + -
    -
      -
    • +
    • +
      -

      Constructor Summary

      - +

      Constructor Summary

      +
      +
      + + + +java.lang.String useremail) +
      Constructors 
      Constructor Description
      Useremail() @@ -210,278 +175,244 @@

      Constructor Summary

      Useremail​(User user, - java.lang.String useremail)
      Given the parameters, create a new useremail object
      -
      • -
    +
    + -
    -
    +
    +

    Methods inherited from class java.lang.Object

    -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait - - - + + +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    - -
    + +
      -
    • -
      -
        -
      • - - -

        Field Detail

        - +
      • +
        +

        Field Details

        • -

          createdBy

          -
          protected java.lang.String createdBy
          +
          +

          createdBy

          +
          protected java.lang.String createdBy
          String field containing the username of who created this row
          +
          • -
        - - - -
        • -

          createdDate

          -
          protected java.util.Date createdDate
          +
          +

          createdDate

          +
          protected java.util.Date createdDate
          Date field containing the date and time when the row was created

          Temporal(TIMESTAMP) - Sets the precision of the date being saved. In this case Date and Time

          +
          • -
        - - - -
        • -

          lastModifiedBy

          -
          protected java.lang.String lastModifiedBy
          +
          +

          lastModifiedBy

          +
          protected java.lang.String lastModifiedBy
          String field containing the username of who last modified this row
          +
          • -
        - - - -
        • -

          lastModifiedDate

          -
          protected java.util.Date lastModifiedDate
          +
          +

          lastModifiedDate

          +
          protected java.util.Date lastModifiedDate
          Date field containing the data and time when the row was last modified

          Temporal(TIMESTAMP) - Sets the precision of the date being saved. In this case Date and Time

          -
          • -
        +
      +
      • -
      -
        -
      • - - -

        Constructor Detail

        - +
      • +
        +

        Constructor Details

        • -

          Useremail

          -
          public Useremail()
          +
          +

          Useremail

          +
          public Useremail()
          The default controller is required by JPA
          +
          • -
        - - - -
        • -

          Useremail

          -
          public Useremail​(User user,
-                 java.lang.String useremail)
          +
          +

          Useremail

          +
          public Useremail​(User user, +java.lang.String useremail)
          Given the parameters, create a new useremail object
          Parameters:
          user - the user (User) assigned to the email
          useremail - useremail (String) for the given user
          -
          • -
        +
      + -
      -
        -
      • - - -

        Method Detail

        - +
      • +
        +

        Method Details

        • -

          getUseremailid

          -
          public long getUseremailid()
          +
          +

          getUseremailid

          +
          public long getUseremailid()
          Getter for useremailid
          Returns:
          the primary key (long) of this useremail object
          +
          • -
        - - - -
        • -

          setUseremailid

          -
          public void setUseremailid​(long useremailid)
          +
          +

          setUseremailid

          +
          public void setUseremailid​(long useremailid)
          Setter for useremailid. Used for seeding data
          Parameters:
          useremailid - the new primary key (long) of this useremail object
          +
          • -
        - - - -
        • -

          getUseremail

          -
          public java.lang.String getUseremail()
          +
          +

          getUseremail

          +
          public java.lang.String getUseremail()
          Getter for useremail
          Returns:
          the email (String) associated with this useremail object in lowercase
          +
          • -
        - - - -
        • -

          setUseremail

          -
          public void setUseremail​(java.lang.String useremail)
          +
          +

          setUseremail

          +
          public void setUseremail​(java.lang.String useremail)
          Setter for useremail
          Parameters:
          useremail - the email (String) to replace the one currently assigned to this useremail object, in lowercase
          +
          • -
        - - - -
        • -

          getUser

          -
          public User getUser()
          +
          +

          getUser

          +
          public User getUser()
          Getter for user
          Returns:
          the user object associated with this useremail.
          +
          • -
        - - - -
        • -

          setUser

          -
          public void setUser​(User user)
          +
          +

          setUser

          +
          public void setUser​(User user)
          Setter for user
          Parameters:
          user - the user object to replace the one currently assigned to this useremail object
          -
          • -
        +
    +
    - - +
    + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/models/package-summary.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/package-summary.html similarity index 63% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/models/package-summary.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/package-summary.html index ece770f..86a9ec5 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/models/package-summary.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/package-summary.html @@ -2,40 +2,32 @@ - + com.lambdaschool.usermodel.models - + + + - + - - + + - - + + - - -
    +
    + +

    Package com.lambdaschool.usermodel.models

    -
    +
    contains the layouts of all data used in the application. This included persistent data that is saved to a database, and non-persistent data used only during application execution.
    +
    • - +
      +
      + + @@ -135,10 +107,18 @@

      Package com.lambdaschool.usermodel.models
      The entity allowing interaction with the userroles table.

      + + + +
      Class Summary 
      Class Description
      Role
      UserRolesId +
      Class to represent the complex primary key for UserRoles
      +
      +
    +
    @@ -161,30 +141,13 @@

    Package com.lambdaschool.usermodel.models
  • Help

    • -
    - -
    - - -
    -
    + + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/models/package-tree.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/package-tree.html similarity index 60% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/models/package-tree.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/package-tree.html index 5b77b17..2b048e7 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/models/package-tree.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/models/package-tree.html @@ -2,40 +2,32 @@ - + com.lambdaschool.usermodel.models Class Hierarchy - + + + - + - - + + - - + + - - -
    +
    + +

    Hierarchy For Package com.lambdaschool.usermodel.models

    @@ -100,7 +68,7 @@

    Hierarchy For Package com.lambdaschool.usermodel.models

    -
    +

    Class Hierarchy

    • java.lang.Object @@ -109,6 +77,7 @@

      Class Hierarchy

    • com.lambdaschool.usermodel.models.User
    • com.lambdaschool.usermodel.models.Useremail
    • com.lambdaschool.usermodel.models.UserRoles (implements java.io.Serializable)
      • +
    • com.lambdaschool.usermodel.models.UserRolesId (implements java.io.Serializable)
    @@ -135,30 +104,13 @@

    Class Hierarchy

  • Help
    • -
    - -
    - - -
    -
    + +
    +
    diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/package-summary.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/package-summary.html similarity index 59% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/package-summary.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/package-summary.html index 81da88d..5b78193 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/package-summary.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/package-summary.html @@ -2,40 +2,32 @@ - + com.lambdaschool.usermodel - + + + - + - - + + - - + + - - -
    +
    + +

    Package com.lambdaschool.usermodel

    -
    +
    Main package for this application. All other packages will be sub packages of this package. Contains the starting method for the method and any classes pertain to the overall application.
    +
    • - +
      +
      + + @@ -123,16 +95,33 @@

      Package com.lambdaschool.usermodel

      Main class to start the application.
      + +
      Class Summary 
      Class Description
      SeedData
      +
    + +
  • +
    + + + + + + + + + - +
    Exception Summary 
    ExceptionDescription
    UserModelApplicationTestsUserModelApplication
    Starting class for testing
    +
    • +
    @@ -155,30 +144,13 @@

    Package com.lambdaschool.usermodel

  • Help
    • -
    - -
    - - -
    -
    + + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/package-tree.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/package-tree.html similarity index 56% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/package-tree.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/package-tree.html index 5248a22..5b4f304 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/package-tree.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/package-tree.html @@ -2,40 +2,32 @@ - + com.lambdaschool.usermodel Class Hierarchy - + + + - + - - + + - - + + - - -
    +
    + +

    Hierarchy For Package com.lambdaschool.usermodel

    @@ -100,14 +68,13 @@

    Hierarchy For Package com.lambdaschool.usermodel

    -
    +

    Class Hierarchy

    @@ -134,30 +101,13 @@

    Class Hierarchy

  • Help
    • -
    - -
    - - -
    -
    + +
    +
    diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/repository/RoleRepository.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/repository/RoleRepository.html similarity index 62% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/repository/RoleRepository.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/repository/RoleRepository.html index 5a6856b..88236e6 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/repository/RoleRepository.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/repository/RoleRepository.html @@ -2,46 +2,38 @@ - + RoleRepository - + + + - + - - + + - - + + - - -
    +
    + - +
    +
    Package com.lambdaschool.usermodel.repository
    -

    Interface RoleRepository

    +

    Interface RoleRepository

    -
    -
      -
    • +
      All Superinterfaces:
      org.springframework.data.repository.CrudRepository<Role,​java.lang.Long>, org.springframework.data.repository.Repository<Role,​java.lang.Long>
      @@ -130,73 +96,69 @@

      Interface RoleRepository

      public interface RoleRepository
 extends org.springframework.data.repository.CrudRepository<Role,​java.lang.Long>
      The CRUD Repository connecting Role to the rest of the application
      -
      • -
    -
    -
    + +
      -
    • -
      -
        -
      • +
      • +
        -

        Method Summary

        - - +

        Method Summary

        +
        +
        +
        +
        All Methods Instance Methods Abstract Methods 
        + - + + + - + +long roleid, +java.lang.String name) +
        Modifier and Type Method Description
        Role findByNameIgnoreCase​(java.lang.String name)
        JPA Query to find a role by name case insensitive search
        void updateRoleName​(java.lang.String uname, - long roleid, - java.lang.String name)
        Updates the name of the role based on the given role id.
        -
    +
    +

    Methods inherited from interface org.springframework.data.repository.CrudRepository

    -count, delete, deleteAll, deleteAll, deleteById, existsById, findAll, findAllById, findById, save, saveAll - - - + + +count, delete, deleteAll, deleteAll, deleteById, existsById, findAll, findAllById, findById, save, saveAll
    -
    -
    + +
      -
    • -
      -
        -
      • - - -

        Method Detail

        - +
      • +
        +

        Method Details

        • -

          findByNameIgnoreCase

          -
          Role findByNameIgnoreCase​(java.lang.String name)
          +
          +

          findByNameIgnoreCase

          +
          Role findByNameIgnoreCase​(java.lang.String name)
          JPA Query to find a role by name case insensitive search
          Parameters:
          @@ -204,21 +166,18 @@

          findByNameIgnoreCase

          Returns:
          the first role matching the given name using a case insensitive search
          +
          • -
        - - - -
        • -

          updateRoleName

          -
          @Transactional
+
          
+
          updateRoleName
          
+
          @Transactional
 @Modifying
 @Query(value="UPDATE roles SET name = :name, last_modified_by = :uname, last_modified_date = CURRENT_TIMESTAMP WHERE roleid = :roleid",
        nativeQuery=true)
-void updateRoleName​(java.lang.String uname,
-                    long roleid,
-                    java.lang.String name)
          +void updateRoleName​(java.lang.String uname, +long roleid, +java.lang.String name)
    Updates the name of the role based on the given role id.
    Parameters:
    @@ -226,17 +185,16 @@

    updateRoleName

    roleid - The primary key (long) of the role to change
    name - The new name (String) of the role
    - - + +
    - - +
    + + diff --git a/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/repository/UserRepository.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/repository/UserRepository.html new file mode 100644 index 0000000..ff10d7d --- /dev/null +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/repository/UserRepository.html @@ -0,0 +1,236 @@ + + + + + +UserRepository + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    +
    Package com.lambdaschool.usermodel.repository
    +

    Interface UserRepository

    +
    +
    +
    +
    +
    All Superinterfaces:
    +
    org.springframework.data.repository.CrudRepository<User,​java.lang.Long>, org.springframework.data.repository.Repository<User,​java.lang.Long>
    +
    +
    +
    public interface UserRepository
+extends org.springframework.data.repository.CrudRepository<User,​java.lang.Long>
    +
    The CRUD repository connecting User to the rest of the application
    +
    +
    +
      + +
    • +
      + + +

      Method Summary

      +
      +
      +
      + + + + + + + + + + + + + + + + + + + + +
      Modifier and TypeMethodDescription
      UserfindByUsername​(java.lang.String username) +
      Find a user based off over username
      +
      java.util.List<User>findByUsernameContainingIgnoreCase​(java.lang.String name) +
      Find all users whose name contains a given substring ignoring case
      +
      +
      +
      +
      +

      Methods inherited from interface org.springframework.data.repository.CrudRepository

      + + +count, delete, deleteAll, deleteAll, deleteById, existsById, findAll, findAllById, findById, save, saveAll
      +
      +
      • +
    +
    +
    +
      + +
    • +
      + + +

      Method Details

      +
        +
      • +
        +

        findByUsername

        +
        User findByUsername​(java.lang.String username)
        +
        Find a user based off over username
        +
        +
        Parameters:
        +
        username - the name (String) of user you seek
        +
        Returns:
        +
        the first user object with the name you seek
        +
        +
        +
        • +
      • +
        +

        findByUsernameContainingIgnoreCase

        +
        java.util.List<User> findByUsernameContainingIgnoreCase​(java.lang.String name)
        +
        Find all users whose name contains a given substring ignoring case
        +
        +
        Parameters:
        +
        name - the substring of the names (String) you seek
        +
        Returns:
        +
        List of users whose name contain the given substring ignoring case
        +
        +
        +
        • +
      +
      +
      • +
    +
    +
    + +
    + +
    +
    + + diff --git a/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/repository/UseremailRepository.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/repository/UseremailRepository.html new file mode 100644 index 0000000..bba6181 --- /dev/null +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/repository/UseremailRepository.html @@ -0,0 +1,160 @@ + + + + + +UseremailRepository + + + + + + + + + + + + + + + + +
    + +
    +
    + +
    +
    Package com.lambdaschool.usermodel.repository
    +

    Interface UseremailRepository

    +
    +
    +
    +
    +
    All Superinterfaces:
    +
    org.springframework.data.repository.CrudRepository<Useremail,​java.lang.Long>, org.springframework.data.repository.Repository<Useremail,​java.lang.Long>
    +
    +
    +
    public interface UseremailRepository
+extends org.springframework.data.repository.CrudRepository<Useremail,​java.lang.Long>
    +
    The CRUD Repository connecting Useremail to the rest of the application
    +
    +
    +
      + +
    • +
      + + +

      Method Summary

      +
      +

      Methods inherited from interface org.springframework.data.repository.CrudRepository

      + + +count, delete, deleteAll, deleteAll, deleteById, existsById, findAll, findAllById, findById, save, saveAll
      +
      +
      • +
    +
    +
    + +
    + +
    +
    + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/repository/package-summary.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/repository/package-summary.html similarity index 62% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/repository/package-summary.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/repository/package-summary.html index 323adca..81886c9 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/repository/package-summary.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/repository/package-summary.html @@ -2,40 +2,32 @@ - + com.lambdaschool.usermodel.repository - + + + - + - - + + - - + + - - -
    +
    + +

    Package com.lambdaschool.usermodel.repository

    -
    +
    Contains the links between the database and the application. Typically contains one class for each persistent, database, model.
    +
    • - +
      +
      + + @@ -131,8 +103,10 @@

      Package com.lambdaschool.usermodel.reposi

      Interface Summary 
      Interface Description
      RoleRepository
      +
    +
    @@ -155,30 +129,13 @@

    Package com.lambdaschool.usermodel.reposi
  • Help

    • -
    - -
    - - -
    -
    + + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/repository/package-tree.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/repository/package-tree.html similarity index 61% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/repository/package-tree.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/repository/package-tree.html index 6e5c04f..011568a 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/repository/package-tree.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/repository/package-tree.html @@ -2,40 +2,32 @@ - + com.lambdaschool.usermodel.repository Class Hierarchy - + + + - + - - + + - - + + - - -
    +
    + +

    Hierarchy For Package com.lambdaschool.usermodel.repository

    @@ -100,7 +68,7 @@

    Hierarchy For Package com.lambdaschool.usermodel.repository

    -
    +

    Interface Hierarchy

    • org.springframework.data.repository.Repository<T,​ID> @@ -138,30 +106,13 @@

      Interface Hierarchy

    • Help
    -
    - -
    - - -
    -
    + +
    +
    diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/services/RoleService.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/RoleService.html similarity index 61% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/services/RoleService.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/RoleService.html index 449564f..57d164a 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/services/RoleService.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/RoleService.html @@ -2,46 +2,38 @@ - + RoleService - + + + - + - - + + - - + + - - -
    +
    + - +
    +
    Package com.lambdaschool.usermodel.services
    -

    Interface RoleService

    +

    Interface RoleService

    -
    -
      -
    • +
      All Known Implementing Classes:
      RoleServiceImpl
      public interface RoleService
      -
      The service that works with the Role Model.
      -
      • -
    -
    -
    +
    The service that works with the Role Model. +

    + Note: no method update Role name

    + +
      -
    • -
      -
        -
      • +
      • +
        -

        Method Summary

        - - +

        Method Summary

        +
        +
        +
        +
        All Methods Instance Methods Abstract Methods 
        + - + + + - + - + - + - + - + - + +Role role) +
        Modifier and Type Method Description
        voiddelete​(long id)deleteAll() -
        Deletes a given role and associated user role combinations
        +
        Deletes all record and their associated records from the database
        java.util.List<Role> findAll()
        Returns a list of all Role objects
        Role findByName​(java.lang.String name)
        Find the first Role object matching the given name
        Role findRoleById​(long id)
        Return the first Role matching the given primary key
        Role save​(Role role)
        Given a complete Role object, saved that Role object in the database.
        Role update​(long id, - Role role)
        Updates the name of the given role
        -
        • -
      +
    +
    -
    -
    + +
      -
    • -
      -
        -
      • - - -

        Method Detail

        - +
      • +
        +

        Method Details

        • -

          findAll

          -
          java.util.List<Role> findAll()
          +
          +

          findAll

          +
          java.util.List<Role> findAll()
          Returns a list of all Role objects
          Returns:
          list of all Role object
          +
          • -
        - - - -
        • -

          findRoleById

          -
          Role findRoleById​(long id)
          +
          +

          findRoleById

          +
          Role findRoleById​(long id)
          Return the first Role matching the given primary key
          Parameters:
          @@ -237,15 +200,12 @@

          findRoleById

          Returns:
          The Role object you seek
          +
          • -
        - - - -
        • -

          save

          -
          Role save​(Role role)
          +
          +

          save

          +
          Role save​(Role role)
          Given a complete Role object, saved that Role object in the database. If a primary key is provided, the record is completely replaced If no primary key is provided, one is automatically generated and the record is added to the database. @@ -257,15 +217,12 @@

          save

          Returns:
          the saved role object including any automatically generated fields
          +
          • -
        - - - -
        • -

          findByName

          -
          Role findByName​(java.lang.String name)
          +
          +

          findByName

          +
          Role findByName​(java.lang.String name)
          Find the first Role object matching the given name
          Parameters:
          @@ -273,30 +230,20 @@

          findByName

          Returns:
          The Role object matching the given name
          +
          • -
        - - - -
        • -

          delete

          -
          void delete​(long id)
          -
          Deletes a given role and associated user role combinations
          -
          -
          Parameters:
          -
          id - The role id of the role to delete
          -
          +
          +

          deleteAll

          +
          void deleteAll()
          +
          Deletes all record and their associated records from the database
          +
          • -
        - - - -
        • -

          update

          -
          Role update​(long id,
-            Role role)
          +
          +

          update

          +
          Role update​(long id, +Role role)
          Updates the name of the given role
          Parameters:
          @@ -305,17 +252,16 @@

          update

          Returns:
          The complete role with the new name
          -
          • -
        +
    +
    -
    - +
    + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/services/RoleServiceImpl.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/RoleServiceImpl.html similarity index 65% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/services/RoleServiceImpl.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/RoleServiceImpl.html index 93a4aab..4fda34b 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/services/RoleServiceImpl.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/RoleServiceImpl.html @@ -2,46 +2,38 @@ - + RoleServiceImpl - + + + - + - - + + - - + + - - -
    +
    + - +
    +
    Package com.lambdaschool.usermodel.services
    -

    Class RoleServiceImpl

    +

    Class RoleServiceImpl

    -
      -
    • java.lang.Object
      • -
    • -
        -
      • com.lambdaschool.usermodel.services.RoleServiceImpl
        • -
      -
      • -
    -
    -
      -
    • +
      java.lang.Object +
      com.lambdaschool.usermodel.services.RoleServiceImpl
      +
      +
      All Implemented Interfaces:
      RoleService
      @@ -141,140 +102,137 @@

      Class RoleServiceImpl

      extends java.lang.Object implements RoleService
      Implements the RoleService Interface
      -
      • -
    -
    -
    + +
      -
    • -
      -
        -
      • +
      • +
        -

        Constructor Summary

        - +

        Constructor Summary

        +
        +
        + + + +
        Constructors 
        Constructor Description
        RoleServiceImpl()  
        -
        • -
      +
    + -
    -
      -
    • +
    • +
      -

      Method Summary

      - - +

      Method Summary

      +
      +
      +
      +
      All Methods Instance Methods Concrete Methods 
      + - + + + - + - + - + - + - + - + +Role role) +
      Modifier and Type Method Description
      voiddelete​(long id)deleteAll() -
      Deletes a given role and associated user role combinations
      +
      Deletes all record and their associated records from the database
      java.util.List<Role> findAll()
      Returns a list of all Role objects
      Role findByName​(java.lang.String name)
      Find the first Role object matching the given name
      Role findRoleById​(long id)
      Return the first Role matching the given primary key
      Role save​(Role role)
      Given a complete Role object, saved that Role object in the database.
      Role update​(long id, - Role role)
      Updates the name of the given role
      -
    +
    +

    Methods inherited from class java.lang.Object

    -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait - - - + + +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    -
    -
    + +
      -
    • -
      -
        -
      • - - -

        Constructor Detail

        - +
      • +
        -
          +

          Constructor Details

          +
          • -

            RoleServiceImpl

            -
            public RoleServiceImpl()
            -
            • -
          +
          +

          RoleServiceImpl

          +
          public RoleServiceImpl()
          +
        +
        • -
        -
          -
        • - - -

          Method Detail

          - +
        • +
          +

          Method Details

          • -

            findAll

            -
            public java.util.List<Role> findAll()
            +
            +

            findAll

            +
            public java.util.List<Role> findAll()
            Description copied from interface: RoleService
            Returns a list of all Role objects
            @@ -283,15 +241,12 @@

            findAll

            Returns:
            list of all Role object
            +
            • -
          - - - -
          • -

            findRoleById

            -
            public Role findRoleById​(long id)
            +
            +

            findRoleById

            +
            public Role findRoleById​(long id)
            Description copied from interface: RoleService
            Return the first Role matching the given primary key
            @@ -302,15 +257,12 @@

            findRoleById

            Returns:
            The Role object you seek
            +
            • -
          - - - -
          • -

            findByName

            -
            public Role findByName​(java.lang.String name)
            +
            +

            findByName

            +
            public Role findByName​(java.lang.String name)
            Description copied from interface: RoleService
            Find the first Role object matching the given name
            @@ -321,16 +273,13 @@

            findByName

            Returns:
            The Role object matching the given name
            +
            • -
          - - - -
          • -

            save

            -
            @Transactional
-public Role save​(Role role)
            +
            +

            save

            +
            @Transactional +public Role save​(Role role)
            Description copied from interface: RoleService
            Given a complete Role object, saved that Role object in the database. If a primary key is provided, the record is completely replaced @@ -345,35 +294,27 @@

            save

            Returns:
            the saved role object including any automatically generated fields
            +
            • -
          - - - -
          • -

            delete

            -
            @Transactional
-public void delete​(long id)
            -
            Description copied from interface: RoleService
            -
            Deletes a given role and associated user role combinations
            +
            +

            deleteAll

            +
            @Transactional +public void deleteAll()
            +
            Description copied from interface: RoleService
            +
            Deletes all record and their associated records from the database
            Specified by:
            -
            delete in interface RoleService
            -
            Parameters:
            -
            id - The role id of the role to delete
            +
            deleteAll in interface RoleService
            +
            • -
          - - - -
          • -

            update

            -
            @Transactional
-public Role update​(long id,
-                   Role role)
            +
            +

            update

            +
            @Transactional +public Role update​(long id, +Role role)
            Description copied from interface: RoleService
            Updates the name of the given role
            @@ -385,17 +326,16 @@

            update

            Returns:
            The complete role with the new name
            -
            • -
          +
      +
    - - +
    + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/services/UserAuditing.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/UserAuditing.html similarity index 60% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/services/UserAuditing.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/UserAuditing.html index 31bdf6c..1b03397 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/services/UserAuditing.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/UserAuditing.html @@ -2,46 +2,38 @@ - + UserAuditing - + + + - + - - + + - - + + - - -
    +
    + - +
    +
    Package com.lambdaschool.usermodel.services
    -

    Class UserAuditing

    +

    Class UserAuditing

    -
      -
    • java.lang.Object
      • -
    • -
        -
      • com.lambdaschool.usermodel.services.UserAuditing
        • -
      -
      • -
    -
    -
      -
    • +
      java.lang.Object +
      com.lambdaschool.usermodel.services.UserAuditing
      +
      +
      All Implemented Interfaces:
      org.springframework.data.domain.AuditorAware<java.lang.String>
      @@ -141,104 +102,101 @@

      Class UserAuditing

      implements org.springframework.data.domain.AuditorAware<java.lang.String>
      Spring Boot needs to know what username to use for the auditing fields CreatedBy and ModifiedBy For now, a default name will be used
      -
      • -
    -
    -
    + +
      -
    • -
      -
        -
      • +
      • +
        -

        Constructor Summary

        - +

        Constructor Summary

        +
        +
        + + + +
        Constructors 
        Constructor Description
        UserAuditing()  
        -
        • -
      +
    + -
    -
    +
    +

    Methods inherited from class java.lang.Object

    -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait - - - + + +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    -
    -
    + +
      -
    • -
      -
        -
      • - - -

        Constructor Detail

        - +
      • +
        -
          +

          Constructor Details

          +
          • -

            UserAuditing

            -
            public UserAuditing()
            -
            • -
          +
          +

          UserAuditing

          +
          public UserAuditing()
          +
        +
        • -
        -
          -
        • - - -

          Method Detail

          - +
        • +
          -
            +

            Method Details

            +
            • -

              getCurrentAuditor

              -
              public java.util.Optional<java.lang.String> getCurrentAuditor()
              +
              +

              getCurrentAuditor

              +
              public java.util.Optional<java.lang.String> getCurrentAuditor()
              The current user
              Specified by:
              @@ -246,17 +204,16 @@

              getCurrentAuditor

              Returns:
              Optional(String) of current user
              -
              • -
            +
      +
    - - +
    + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/services/UserService.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/UserService.html similarity index 56% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/services/UserService.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/UserService.html index 7161d68..31310e7 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/services/UserService.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/UserService.html @@ -2,46 +2,38 @@ - + UserService - + + + - + - - + + - - + + - - -
    +
    + - +
    +
    Package com.lambdaschool.usermodel.services
    -

    Interface UserService

    +

    Interface UserService

    -
    -
      -
    • +
      All Known Implementing Classes:
      UserServiceImpl
      @@ -133,137 +99,116 @@

      Interface UserService

      Note: Emails are added through the add user process Roles are added through the add user process No way to delete an assigned role
    - - -
    -
    + +
      -
    • -
      -
        -
      • +
      • +
        -

        Method Summary

        - - +

        Method Summary

        +
        +
        +
        +
        All Methods Instance Methods Abstract Methods 
        + - - - - - - + + + - + - + - + - + - + - + - - - - - - + - + +long id) +
        Modifier and Type Method Description
        voidaddUserRole​(long userid, - long roleid) -
        Adds a given user role combination
        -
        void delete​(long id)
        Deletes the user record and its useremail items from the database based off of the provided primary key
        voiddeleteUserRole​(long userid, - long roleid)deleteAll() -
        Deletes a given user role combination
        +
        Deletes all record and their associated records from the database
        java.util.List<User> findAll()
        Returns a list of all the Users
        User findByName​(java.lang.String name)
        Returns the user with the given name
        java.util.List<User> findByNameContaining​(java.lang.String username)
        A list of all users whose username contains the given substring
        User findUserById​(long id)
        Returns the user with the given primary key.
        java.util.List<UserNameCountEmails>getCountUserEmails() -
        List containing usernames and the number of emails they have - not counting the primary email
        -
        User save​(User user)
        Given a complete user object, saves that user object in the database.
        User update​(User user, - long id)
        Updates the provided fields in the user record referenced by the primary key.
        -
        • -
      +
    +
    -
    -
    + +
      -
    • -
      -
        -
      • - - -

        Method Detail

        - +
      • +
        +

        Method Details

        • -

          findAll

          -
          java.util.List<User> findAll()
          +
          +

          findAll

          +
          java.util.List<User> findAll()
          Returns a list of all the Users
          Returns:
          List of Users. If no users, empty list.
          +
          • -
        - - - -
        • -

          findByNameContaining

          -
          java.util.List<User> findByNameContaining​(java.lang.String username)
          +
          +

          findByNameContaining

          +
          java.util.List<User> findByNameContaining​(java.lang.String username)
          A list of all users whose username contains the given substring
          Parameters:
          @@ -271,15 +216,12 @@

          findByNameContaining

          Returns:
          List of users whose username contains the given substring
          +
          • -
        - - - -
        • -

          findUserById

          -
          User findUserById​(long id)
          +
          +

          findUserById

          +
          User findUserById​(long id)
          Returns the user with the given primary key.
          Parameters:
          @@ -287,15 +229,12 @@

          findUserById

          Returns:
          The given User or throws an exception if not found.
          +
          • -
        - - - -
        • -

          findByName

          -
          User findByName​(java.lang.String name)
          +
          +

          findByName

          +
          User findByName​(java.lang.String name)
          Returns the user with the given name
          Parameters:
          @@ -303,29 +242,23 @@

          findByName

          Returns:
          The User with the given name or throws an exception if not found.
          +
          • -
        - - - -
        • -

          delete

          -
          void delete​(long id)
          +
          +

          delete

          +
          void delete​(long id)
          Deletes the user record and its useremail items from the database based off of the provided primary key
          Parameters:
          id - id The primary key (long) of the user you seek.
          +
          • -
        - - - -
        • -

          save

          -
          User save​(User user)
          +
          +

          save

          +
          User save​(User user)
          Given a complete user object, saves that user object in the database. If a primary key is provided, the record is completely replaced If no primary key is provided, one is automatically generated and the record is added to the database.
          @@ -335,16 +268,13 @@

          save

          Returns:
          the saved user object including any automatically generated fields
          +
          • -
        - - - -
        • -

          update

          -
          User update​(User user,
-            long id)
          +
          +

          update

          +
          User update​(User user, +long id)
          Updates the provided fields in the user record referenced by the primary key.

          Regarding Role and Useremail items, this process only allows adding those. Deleting and editing those lists @@ -356,63 +286,23 @@

          update

          Returns:
          the complete user object that got updated
          +
          • -
        - - - -
          -
        • -

          deleteUserRole

          -
          void deleteUserRole​(long userid,
-                    long roleid)
          -
          Deletes a given user role combination
          -
          -
          Parameters:
          -
          userid - The user id of the user part of this user role combination
          -
          roleid - The role id of the role part of this user role combination
          -
          -
          • -
        - - - -
          -
        • -

          addUserRole

          -
          void addUserRole​(long userid,
-                 long roleid)
          -
          Adds a given user role combination
          -
          -
          Parameters:
          -
          userid - The user id of the user part of this user role combination
          -
          roleid - The role id of the role part of this user role combination
          -
          -
          • -
        - - - -
        • -

          getCountUserEmails

          -
          java.util.List<UserNameCountEmails> getCountUserEmails()
          -
          List containing usernames and the number of emails they have - not counting the primary email
          -
          -
          Returns:
          -
          List (element type is the interface UserNameCountEmails) containing usernames and the number of emails they have - not counting the primary email
          -
          -
          • -
        +
        +

        deleteAll

        +
        void deleteAll()
        +
        Deletes all record and their associated records from the database
        +
    +
    - - +
    + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/services/UserServiceImpl.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/UserServiceImpl.html similarity index 59% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/services/UserServiceImpl.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/UserServiceImpl.html index 7d9fc30..cacdbdf 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/services/UserServiceImpl.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/UserServiceImpl.html @@ -2,46 +2,38 @@ - + UserServiceImpl - + + + - + - - + + - - + + - - -
    +
    + - +
    +
    Package com.lambdaschool.usermodel.services
    -

    Class UserServiceImpl

    +

    Class UserServiceImpl

    -
      -
    • java.lang.Object
      • -
    • -
        -
      • com.lambdaschool.usermodel.services.UserServiceImpl
        • -
      -
      • -
    -
    -
      -
    • +
      java.lang.Object +
      com.lambdaschool.usermodel.services.UserServiceImpl
      +
      +
      All Implemented Interfaces:
      UserService
      @@ -140,172 +101,153 @@

      Class UserServiceImpl

      public class UserServiceImpl extends java.lang.Object implements UserService -
      Implements the Userservice Interface
      -
      • -
    -
    -
    +
    Implements UserService Interface
    + +
      -
    • -
      -
        -
      • +
      • +
        -

        Constructor Summary

        - +

        Constructor Summary

        +
        +
        + + + +
        Constructors 
        Constructor Description
        UserServiceImpl()  
        -
        • -
      +
    + -
    -
      -
    • +
    • +
      -

      Method Summary

      - - +

      Method Summary

      +
      +
      +
      +
      All Methods Instance Methods Concrete Methods 
      + - - - - - - + + + - + - + - + - + - + - + - - - - - - + - + +long id) +
      Modifier and Type Method Description
      voidaddUserRole​(long userid, - long roleid) -
      Adds a given user role combination
      -
      void delete​(long id)
      Deletes the user record and its useremail items from the database based off of the provided primary key
      voiddeleteUserRole​(long userid, - long roleid)deleteAll() -
      Deletes a given user role combination
      +
      Deletes all record and their associated records from the database
      java.util.List<User> findAll()
      Returns a list of all the Users
      User findByName​(java.lang.String name)
      Returns the user with the given name
      java.util.List<User> findByNameContaining​(java.lang.String username)
      A list of all users whose username contains the given substring
      User findUserById​(long id)
      Returns the user with the given primary key.
      java.util.List<UserNameCountEmails>getCountUserEmails() -
      List containing usernames and the number of emails they have - not counting the primary email
      -
      User save​(User user)
      Given a complete user object, saves that user object in the database.
      User update​(User user, - long id)
      Updates the provided fields in the user record referenced by the primary key.
      -
    +
    +

    Methods inherited from class java.lang.Object

    -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait - - - + + +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    -
    -
    + +
      -
    • -
      -
        -
      • - - -

        Constructor Detail

        - +
      • +
        -
          +

          Constructor Details

          +
          • -

            UserServiceImpl

            -
            public UserServiceImpl()
            -
            • -
          +
          +

          UserServiceImpl

          +
          public UserServiceImpl()
          +
        +
        • -
        -
          -
        • - - -

          Method Detail

          - +
        • +
          +

          Method Details

          • -

            findUserById

            -
            public User findUserById​(long id)
-                  throws javax.persistence.EntityNotFoundException
            +
            +

            findUserById

            +
            public User findUserById​(long id) + throws javax.persistence.EntityNotFoundException
            Description copied from interface: UserService
            Returns the user with the given primary key.
            @@ -318,15 +260,12 @@

            findUserById

            Throws:
            javax.persistence.EntityNotFoundException
            +
            • -
          - - - -
          • -

            findByNameContaining

            -
            public java.util.List<User> findByNameContaining​(java.lang.String username)
            +
            +

            findByNameContaining

            +
            public java.util.List<User> findByNameContaining​(java.lang.String username)
            Description copied from interface: UserService
            A list of all users whose username contains the given substring
            @@ -337,15 +276,12 @@

            findByNameContaining

            Returns:
            List of users whose username contains the given substring
            +
            • -
          - - - -
          • -

            findAll

            -
            public java.util.List<User> findAll()
            +
            +

            findAll

            +
            public java.util.List<User> findAll()
            Description copied from interface: UserService
            Returns a list of all the Users
            @@ -354,16 +290,13 @@

            findAll

            Returns:
            List of Users. If no users, empty list.
            +
            • -
          - - - -
          • -

            delete

            -
            @Transactional
-public void delete​(long id)
            +
            +

            delete

            +
            @Transactional +public void delete​(long id)
            Description copied from interface: UserService
            Deletes the user record and its useremail items from the database based off of the provided primary key
            @@ -372,15 +305,12 @@

            delete

            Parameters:
            id - id The primary key (long) of the user you seek.
            +
            • -
          - - - -
          • -

            findByName

            -
            public User findByName​(java.lang.String name)
            +
            +

            findByName

            +
            public User findByName​(java.lang.String name)
            Description copied from interface: UserService
            Returns the user with the given name
            @@ -391,16 +321,13 @@

            findByName

            Returns:
            The User with the given name or throws an exception if not found.
            +
            • -
          - - - -
          • -

            save

            -
            @Transactional
-public User save​(User user)
            +
            +

            save

            +
            @Transactional +public User save​(User user)
            Description copied from interface: UserService
            Given a complete user object, saves that user object in the database. If a primary key is provided, the record is completely replaced @@ -413,17 +340,14 @@

            save

            Returns:
            the saved user object including any automatically generated fields
            +
            • -
          - - - -
          • -

            update

            -
            @Transactional
-public User update​(User user,
-                   long id)
            +
            +

            update

            +
            @Transactional +public User update​(User user, +long id)
            Description copied from interface: UserService
            Updates the provided fields in the user record referenced by the primary key.

            @@ -438,74 +362,29 @@

            update

            Returns:
            the complete user object that got updated
            +
            • -
          - - - -
            -
          • -

            getCountUserEmails

            -
            public java.util.List<UserNameCountEmails> getCountUserEmails()
            -
            Description copied from interface: UserService
            -
            List containing usernames and the number of emails they have - not counting the primary email
            -
            -
            Specified by:
            -
            getCountUserEmails in interface UserService
            -
            Returns:
            -
            List (element type is the interface UserNameCountEmails) containing usernames and the number of emails they have - not counting the primary email
            -
            -
            • -
          - - - -
            -
          • -

            deleteUserRole

            -
            @Transactional
-public void deleteUserRole​(long userid,
-                           long roleid)
            -
            Description copied from interface: UserService
            -
            Deletes a given user role combination
            -
            -
            Specified by:
            -
            deleteUserRole in interface UserService
            -
            Parameters:
            -
            userid - The user id of the user part of this user role combination
            -
            roleid - The role id of the role part of this user role combination
            -
            -
            • -
          - - - -
          • -

            addUserRole

            -
            @Transactional
-public void addUserRole​(long userid,
-                        long roleid)
            -
            Description copied from interface: UserService
            -
            Adds a given user role combination
            +
            +

            deleteAll

            +
            @Transactional +public void deleteAll()
            +
            Description copied from interface: UserService
            +
            Deletes all record and their associated records from the database
            Specified by:
            -
            addUserRole in interface UserService
            -
            Parameters:
            -
            userid - The user id of the user part of this user role combination
            -
            roleid - The role id of the role part of this user role combination
            +
            deleteAll in interface UserService
            -
            • -
          +
      +
    - - +
    + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/services/UseremailService.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/UseremailService.html similarity index 58% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/services/UseremailService.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/UseremailService.html index 5fe7298..3e4b454 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/services/UseremailService.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/UseremailService.html @@ -2,46 +2,38 @@ - + UseremailService - + + + - + - - + + - - + + - - -
    +
    + - +
    +
    Package com.lambdaschool.usermodel.services
    -

    Interface UseremailService

    +

    Interface UseremailService

    -
    -
      -
    • +
      All Known Implementing Classes:
      UseremailServiceImpl
      @@ -131,108 +97,96 @@

      Interface UseremailService<
      The Service that works with the Useremail Model

      Note: Emails are added through the add user process

      -

      • -
    -
    -
    + +
      -
    • -
      -
        -
      • +
      • +
        -

        Method Summary

        - - +

        Method Summary

        +
        +
        +
        +
        All Methods Instance Methods Abstract Methods 
        + - + + + - + - - - - - - + - + +java.lang.String emailaddress) - + +java.lang.String emailaddress) +
        Modifier and Type Method Description
        void delete​(long id)
        Remove the user email combination referenced by the given id
        java.util.List<Useremail> findAll()
        Returns a list of all users and their emails
        java.util.List<Useremail>findByUserName​(java.lang.String username) -
        Return a list of user email combinations based on the given username
        -
        Useremail findUseremailById​(long id)
        Returns the user email combination associated with the given id
        Useremail save​(long userid, - java.lang.String emailaddress)
        Add a new User Email combination
        Useremail update​(long useremailid, - java.lang.String emailaddress)
        Replaces the email of the user email combination you seek
        -
        • -
      +
    +
    -
    -
    + +
      -
    • -
      -
        -
      • - - -

        Method Detail

        - +
      • +
        +

        Method Details

        • -

          findAll

          -
          java.util.List<Useremail> findAll()
          +
          +

          findAll

          +
          java.util.List<Useremail> findAll()
          Returns a list of all users and their emails
          Returns:
          List of users and their emails
          +
          • -
        - - - -
        • -

          findUseremailById

          -
          Useremail findUseremailById​(long id)
          +
          +

          findUseremailById

          +
          Useremail findUseremailById​(long id)
          Returns the user email combination associated with the given id
          Parameters:
          @@ -240,30 +194,24 @@

          findUseremailById

          Returns:
          The user email combination (Useremail) you seek
          +
          • -
        - - - -
        • -

          delete

          -
          void delete​(long id)
          +
          +

          delete

          +
          void delete​(long id)
          Remove the user email combination referenced by the given id
          Parameters:
          id - The primary key (long) of the user email combination you seek
          +
          • -
        - - - -
        • -

          update

          -
          Useremail update​(long useremailid,
-                 java.lang.String emailaddress)
          +
          +

          update

          +
          Useremail update​(long useremailid, +java.lang.String emailaddress)
          Replaces the email of the user email combination you seek
          Parameters:
          @@ -272,16 +220,13 @@

          update

          Returns:
          The Useremail object that you updated including the new email address
          +
          • -
        - - - -
        • -

          save

          -
          Useremail save​(long userid,
-               java.lang.String emailaddress)
          +
          +

          save

          +
          Useremail save​(long userid, +java.lang.String emailaddress)
          Add a new User Email combination
          Parameters:
          @@ -290,33 +235,16 @@

          save

          Returns:
          the new user email combination
          -
          • -
        - - - -
          -
        • -

          findByUserName

          -
          java.util.List<Useremail> findByUserName​(java.lang.String username)
          -
          Return a list of user email combinations based on the given username
          -
          -
          Parameters:
          -
          username - The username of the user email combinations you seek
          -
          Returns:
          -
          A list of user email combinations based on the given username
          -
          -
          • -
        +
    +
    -
    - +
    + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/services/UseremailServiceImpl.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/UseremailServiceImpl.html similarity index 61% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/services/UseremailServiceImpl.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/UseremailServiceImpl.html index 904d781..8f15410 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/services/UseremailServiceImpl.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/UseremailServiceImpl.html @@ -2,46 +2,38 @@ - + UseremailServiceImpl - + + + - + - - + + - - + + - - -
    +
    + - +
    +
    Package com.lambdaschool.usermodel.services
    -

    Class UseremailServiceImpl

    +

    Class UseremailServiceImpl

    -
      -
    • java.lang.Object
      • -
    • -
        -
      • com.lambdaschool.usermodel.services.UseremailServiceImpl
        • -
      -
      • -
    -
    -
      -
    • +
      java.lang.Object +
      com.lambdaschool.usermodel.services.UseremailServiceImpl
      +
      +
      All Implemented Interfaces:
      UseremailService
      @@ -141,141 +102,131 @@

      Class UseremailServiceImpl< extends java.lang.Object implements UseremailService
      Implements the UseremailService Interface
      -

      • -
    -
    -
    + +
      -
    • -
      -
        -
      • +
      • +
        -

        Constructor Summary

        - +

        Constructor Summary

        +
        +
        + + + +
        Constructors 
        Constructor Description
        UseremailServiceImpl()  
        -
        • -
      +
    + -
    -
      -
    • +
    • +
      -

      Method Summary

      - - +

      Method Summary

      +
      +
      +
      +
      All Methods Instance Methods Concrete Methods 
      + - + + + - + - - - - - - + - + +java.lang.String emailaddress) - + +java.lang.String emailaddress) +
      Modifier and Type Method Description
      void delete​(long id)
      Remove the user email combination referenced by the given id
      java.util.List<Useremail> findAll()
      Returns a list of all users and their emails
      java.util.List<Useremail>findByUserName​(java.lang.String username) -
      Return a list of user email combinations based on the given username
      -
      Useremail findUseremailById​(long id)
      Returns the user email combination associated with the given id
      Useremail save​(long userid, - java.lang.String emailaddress)
      Add a new User Email combination
      Useremail update​(long useremailid, - java.lang.String emailaddress)
      Replaces the email of the user email combination you seek
      -
    +
    +

    Methods inherited from class java.lang.Object

    -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait - - - + + +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    -
    -
    + +
      -
    • -
      -
        -
      • - - -

        Constructor Detail

        - +
      • +
        -
          +

          Constructor Details

          +
          • -

            UseremailServiceImpl

            -
            public UseremailServiceImpl()
            -
            • -
          +
          +

          UseremailServiceImpl

          +
          public UseremailServiceImpl()
          +
        +
        • -
        -
          -
        • - - -

          Method Detail

          - +
        • +
          +

          Method Details

          • -

            findAll

            -
            public java.util.List<Useremail> findAll()
            +
            +

            findAll

            +
            public java.util.List<Useremail> findAll()
            Description copied from interface: UseremailService
            Returns a list of all users and their emails
            @@ -284,15 +235,12 @@

            findAll

            Returns:
            List of users and their emails
            +
            • -
          - - - -
          • -

            findUseremailById

            -
            public Useremail findUseremailById​(long id)
            +
            +

            findUseremailById

            +
            public Useremail findUseremailById​(long id)
            Description copied from interface: UseremailService
            Returns the user email combination associated with the given id
            @@ -303,16 +251,13 @@

            findUseremailById

            Returns:
            The user email combination (Useremail) you seek
            +
            • -
          - - - -
          • -

            delete

            -
            @Transactional
-public void delete​(long id)
            +
            +

            delete

            +
            @Transactional +public void delete​(long id)
            Description copied from interface: UseremailService
            Remove the user email combination referenced by the given id
            @@ -321,17 +266,14 @@

            delete

            Parameters:
            id - The primary key (long) of the user email combination you seek
            +
            • -
          - - - -
          • -

            update

            -
            @Transactional
-public Useremail update​(long useremailid,
-                        java.lang.String emailaddress)
            +
            +

            update

            +
            @Transactional +public Useremail update​(long useremailid, +java.lang.String emailaddress)
            Description copied from interface: UseremailService
            Replaces the email of the user email combination you seek
            @@ -343,17 +285,14 @@

            update

            Returns:
            The Useremail object that you updated including the new email address
            +
            • -
          - - - -
          • -

            save

            -
            @Transactional
-public Useremail save​(long userid,
-                      java.lang.String emailaddress)
            +
            +

            save

            +
            @Transactional +public Useremail save​(long userid, +java.lang.String emailaddress)
            Description copied from interface: UseremailService
            Add a new User Email combination
            @@ -365,36 +304,16 @@

            save

            Returns:
            the new user email combination
            -
            • -
          - - - -
            -
          • -

            findByUserName

            -
            public java.util.List<Useremail> findByUserName​(java.lang.String username)
            -
            Description copied from interface: UseremailService
            -
            Return a list of user email combinations based on the given username
            -
            -
            Specified by:
            -
            findByUserName in interface UseremailService
            -
            Parameters:
            -
            username - The username of the user email combinations you seek
            -
            Returns:
            -
            A list of user email combinations based on the given username
            -
            -
            • -
          +
      +
    - - +
    + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/services/package-summary.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/package-summary.html similarity index 68% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/services/package-summary.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/package-summary.html index ff29e7b..7f73376 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/services/package-summary.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/package-summary.html @@ -2,40 +2,32 @@ - + com.lambdaschool.usermodel.services - + + + - + - - + + - - + + - - -
    +
    + +

    Package com.lambdaschool.usermodel.services

    -
    +
    Contains the services that are used to retrieve and manipulate data in the application. Contains the contract stating what each client can do with the data in the application. The majority of the work of the application resides in this package.
    +
    • - +
      +
      + + @@ -132,14 +104,18 @@

      Package com.lambdaschool.usermodel.servic

      Interface Summary 
      Interface Description
      RoleService
      +
  • - +
    +
    + + @@ -163,13 +139,15 @@

    Package com.lambdaschool.usermodel.servic

    Class Summary 
    Class Description
    RoleServiceImpl
    UserServiceImpl -
    Implements the Userservice Interface
    +
    Implements UserService Interface
    +
    • +
    @@ -192,30 +170,13 @@

    Package com.lambdaschool.usermodel.servic
  • Help
    • -
    - -
    - - -
    -
    +

    + + diff --git a/usermodel-initial/javadocs/com/lambdaschool/usermodel/services/package-tree.html b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/package-tree.html similarity index 67% rename from usermodel-initial/javadocs/com/lambdaschool/usermodel/services/package-tree.html rename to usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/package-tree.html index fd5b8ae..2e387a8 100644 --- a/usermodel-initial/javadocs/com/lambdaschool/usermodel/services/package-tree.html +++ b/usermodel-exceptions-initial/javadocs/com/lambdaschool/usermodel/services/package-tree.html @@ -2,40 +2,32 @@ - + com.lambdaschool.usermodel.services Class Hierarchy - + + + - + - - + + - - + + - - -
    +
    + +

    Hierarchy For Package com.lambdaschool.usermodel.services

    @@ -100,7 +68,7 @@

    Hierarchy For Package com.lambdaschool.usermodel.services

    -
    +

    Class Hierarchy

    • java.lang.Object @@ -113,7 +81,7 @@

      Class Hierarchy

    -
    +

    Interface Hierarchy

    • com.lambdaschool.usermodel.services.RoleService
      • @@ -143,30 +111,13 @@

      Interface Hierarchy

    • Help
    -
    - -
    - - -
    -
    + +
    +
    diff --git a/usermodel-initial/javadocs/constant-values.html b/usermodel-exceptions-initial/javadocs/constant-values.html similarity index 52% rename from usermodel-initial/javadocs/constant-values.html rename to usermodel-exceptions-initial/javadocs/constant-values.html index 6a8df19..605c71d 100644 --- a/usermodel-initial/javadocs/constant-values.html +++ b/usermodel-exceptions-initial/javadocs/constant-values.html @@ -2,40 +2,32 @@ - + Constant Field Values - + + + - + - - + + - - + + - - -
    +
    + +

    Constant Field Values

    -
    +

    Contents

    @@ -119,30 +87,13 @@

    Contents

  • Help
    • -
    - -
    - - -
    -
    + +
    + diff --git a/usermodel-initial/javadocs/deprecated-list.html b/usermodel-exceptions-initial/javadocs/deprecated-list.html similarity index 51% rename from usermodel-initial/javadocs/deprecated-list.html rename to usermodel-exceptions-initial/javadocs/deprecated-list.html index cef3246..5ac19e2 100644 --- a/usermodel-initial/javadocs/deprecated-list.html +++ b/usermodel-exceptions-initial/javadocs/deprecated-list.html @@ -2,40 +2,32 @@ - + Deprecated List - + + + - + - - + + - - + + - - -
    +
    + +

    Deprecated API

    @@ -117,30 +85,13 @@

    Contents

  • Help
    • -
    - -
    - - -
    -
    + +
    +
    diff --git a/usermodel-initial/javadocs/element-list b/usermodel-exceptions-initial/javadocs/element-list similarity index 86% rename from usermodel-initial/javadocs/element-list rename to usermodel-exceptions-initial/javadocs/element-list index c8bcbc7..48795ef 100644 --- a/usermodel-initial/javadocs/element-list +++ b/usermodel-exceptions-initial/javadocs/element-list @@ -4,4 +4,3 @@ com.lambdaschool.usermodel.controllers com.lambdaschool.usermodel.models com.lambdaschool.usermodel.repository com.lambdaschool.usermodel.services -com.lambdaschool.usermodel.views diff --git a/usermodel-initial/javadocs/help-doc.html b/usermodel-exceptions-initial/javadocs/help-doc.html similarity index 69% rename from usermodel-initial/javadocs/help-doc.html rename to usermodel-exceptions-initial/javadocs/help-doc.html index 9f64ecc..0430bac 100644 --- a/usermodel-initial/javadocs/help-doc.html +++ b/usermodel-exceptions-initial/javadocs/help-doc.html @@ -2,40 +2,32 @@ - + API Help - + + + - + - - + + - - + + - - -
    +
    + +

    How This API Document Is Organized

    @@ -99,13 +67,13 @@

    How This API Document Is Organized

    • -
      +

      Overview

      The Overview page is the front page of this API document and provides a list of all packages with a summary for each. This page can also contain an overall description of the set of packages.

    • -
      +

      Package

      Each package has a page that contains a list of its classes and interfaces, with a summary for each. These pages may contain six categories:

        @@ -119,7 +87,7 @@

        Package

    • -
      +

      Class or Interface

      Each class, interface, nested class and nested interface has its own separate page. Each of these pages has three sections consisting of a class/interface description, summary tables, and detailed member descriptions:

        @@ -140,16 +108,16 @@

        Class or Interface


        -
      • Field Detail
        • -
      • Property Detail
        • -
      • Constructor Detail
        • -
      • Method Detail
        • +
      • Field Details
        • +
      • Property Details
        • +
      • Constructor Details
        • +
      • Method Details

      Each summary entry contains the first sentence from the detailed description for that item. The summary entries are alphabetical, while the detailed descriptions are in the order they appear in the source code. This preserves the logical groupings established by the programmer.

    • -
      +

      Annotation Type

      Each annotation type has its own separate page with the following sections:

        @@ -157,24 +125,24 @@

        Annotation Type

      • Annotation Type Description
      • Required Element Summary
      • Optional Element Summary
        • -
      • Element Detail
        • +
      • Element Details
    • -
      +

      Enum

      Each enum has its own separate page with the following sections:

      • Enum Declaration
      • Enum Description
      • Enum Constant Summary
        • -
      • Enum Constant Detail
        • +
      • Enum Constant Details
    • -
      +

      Tree (Class Hierarchy)

      There is a Class Hierarchy page for all packages, plus a hierarchy for each package. Each hierarchy page contains a list of classes and a list of interfaces. Classes are organized by inheritance structure starting with java.lang.Object. Interfaces do not inherit from java.lang.Object.

        @@ -184,39 +152,39 @@

        Tree (Class Hierarchy)

    • -
      +

      Deprecated API

      The Deprecated API page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.

    • -
      +

      Index

      The Index contains an alphabetic index of all classes, interfaces, constructors, methods, and fields, as well as lists of all packages and all classes.

    • -
      -

      All Classes

      -

      The All Classes link shows all classes and interfaces except non-static nested types.

      -
      -
      • -
    • -
      +

      Serialized Form

      Each serializable or externalizable class has a description of its serialization fields and methods. This information is of interest to re-implementors, not to developers using the API. While there is no link in the navigation bar, you can get to this information by going to any serialized class and clicking "Serialized Form" in the "See also" section of the class description.

    • -
      +

      Constant Field Values

      The Constant Field Values page lists the static final fields and their values.

    • -
      +

      Search

      -

      You can search for definitions of modules, packages, types, fields, methods and other terms defined in the API, using some or all of the name. "Camel-case" abbreviations are supported: for example, "InpStr" will find "InputStream" and "InputStreamReader".

      +

      You can search for definitions of modules, packages, types, fields, methods, system properties and other terms defined in the API, using some or all of the name, optionally using "camel-case" abbreviations. For example:

      +
        +
      • j.l.obj will match "java.lang.Object"
        • +
      • InpStr will match "java.io.InputStream"
        • +
      • HM.cK will match "java.util.HashMap.containsKey(Object)"
        • +
      +

      Refer to the Javadoc Search Specification for a full description of search features.

    @@ -243,30 +211,13 @@

    Search

  • Help
    • -
    - -
    - - -
    -
    + +
    +
    diff --git a/usermodel-initial/javadocs/index-files/index-1.html b/usermodel-exceptions-initial/javadocs/index-files/index-1.html similarity index 53% rename from usermodel-initial/javadocs/index-files/index-1.html rename to usermodel-exceptions-initial/javadocs/index-files/index-1.html index c183895..e56ac84 100644 --- a/usermodel-initial/javadocs/index-files/index-1.html +++ b/usermodel-exceptions-initial/javadocs/index-files/index-1.html @@ -2,40 +2,32 @@ - + A-Index - + + + - + - - + + - - + + - - -
    +
    + +
    -
    A C D E F G H I J L M P R S U 
    All Classes All Packages +
    +

    Index

    +
    +
    A C D E F G H L M P R S U 
    All Classes|All Packages

    A

    @@ -111,22 +82,12 @@

    A

    Adds a new user email combination
    -
    addRole(Role) - Method in class com.lambdaschool.usermodel.models.User
    -
    -
    Add one role to this user
    -
    -
    addUserRole(long, long) - Method in interface com.lambdaschool.usermodel.services.UserService
    -
    -
    Adds a given user role combination
    -
    -
    addUserRole(long, long) - Method in class com.lambdaschool.usermodel.services.UserServiceImpl
    -
     
    api() - Method in class com.lambdaschool.usermodel.config.Swagger2Config
    Configures what to document using Swagger
    -A C D E F G H I J L M P R S U 
    All Classes All Packages
    +A C D E F G H L M P R S U 
    All Classes|All Packages
    -
    - -
    - - -
    -
    + +
    +
    diff --git a/usermodel-exceptions-initial/javadocs/index-files/index-10.html b/usermodel-exceptions-initial/javadocs/index-files/index-10.html new file mode 100644 index 0000000..5380ac7 --- /dev/null +++ b/usermodel-exceptions-initial/javadocs/index-files/index-10.html @@ -0,0 +1,108 @@ + + + + + +P-Index + + + + + + + + + + + + + + + + +
    + +
    +
    +
    +

    Index

    +
    +
    A C D E F G H L M P R S U 
    All Classes|All Packages + + +

    P

    +
    +
    putUpdateRole(long, Role) - Method in class com.lambdaschool.usermodel.controllers.RolesController
    +
    +
    The process allows you to update a role name only! +
    Example: http://localhost:2019/roles/role/3
    +
    +
    +A C D E F G H L M P R S U 
    All Classes|All Packages
    +
    + +
    +
    + + diff --git a/usermodel-initial/javadocs/index-files/index-13.html b/usermodel-exceptions-initial/javadocs/index-files/index-11.html similarity index 69% rename from usermodel-initial/javadocs/index-files/index-13.html rename to usermodel-exceptions-initial/javadocs/index-files/index-11.html index 3cf65fd..dd1d0cf 100644 --- a/usermodel-initial/javadocs/index-files/index-13.html +++ b/usermodel-exceptions-initial/javadocs/index-files/index-11.html @@ -2,40 +2,32 @@ - + R-Index - + + + - + - - + + - - + + - - -
    +
    + +
    -
    A C D E F G H I J L M P R S U 
    All Classes All Packages +
    +

    Index

    +
    +
    A C D E F G H L M P R S U 
    All Classes|All Packages

    R

    @@ -135,7 +106,7 @@

    R

    First a set of known data is seeded into our database.
    -A C D E F G H I J L M P R S U 
    All Classes All Packages
    +A C D E F G H L M P R S U 
    All Classes|All Packages
    -
    - -
    - - -
    -
    + + + diff --git a/usermodel-initial/javadocs/index-files/index-14.html b/usermodel-exceptions-initial/javadocs/index-files/index-12.html similarity index 77% rename from usermodel-initial/javadocs/index-files/index-14.html rename to usermodel-exceptions-initial/javadocs/index-files/index-12.html index 505105a..df100f0 100644 --- a/usermodel-initial/javadocs/index-files/index-14.html +++ b/usermodel-exceptions-initial/javadocs/index-files/index-12.html @@ -2,40 +2,32 @@ - + S-Index - + + + - + - - + + - - + + - - -
    +
    + +
    -
    A C D E F G H I J L M P R S U 
    All Classes All Packages +
    +

    Index

    +
    +
    A C D E F G H L M P R S U 
    All Classes|All Packages

    S

    @@ -133,6 +104,10 @@

    S

    setter for primary email
    +
    setRole(long) - Method in class com.lambdaschool.usermodel.models.UserRolesId
    +
    +
    The setter for the role id
    +
    setRole(Role) - Method in class com.lambdaschool.usermodel.models.UserRoles
    Setter for role
    @@ -141,10 +116,14 @@

    S

    Setter for role id, used for seeding data
    -
    setRoles(List<UserRoles>) - Method in class com.lambdaschool.usermodel.models.User
    +
    setRoles(Set<UserRoles>) - Method in class com.lambdaschool.usermodel.models.User
    Setter for user role combinations
    +
    setUser(long) - Method in class com.lambdaschool.usermodel.models.UserRolesId
    +
    +
    Setter for the user id
    +
    setUser(User) - Method in class com.lambdaschool.usermodel.models.Useremail
    Setter for user
    @@ -173,7 +152,7 @@

    S

    setter for username
    -
    setUsers(List<UserRoles>) - Method in class com.lambdaschool.usermodel.models.Role
    +
    setUsers(Set<UserRoles>) - Method in class com.lambdaschool.usermodel.models.Role
    Setter for user role combinations
    @@ -184,7 +163,7 @@

    S

    Swagger2Config() - Constructor for class com.lambdaschool.usermodel.config.Swagger2Config
     
    -A C D E F G H I J L M P R S U 
    All Classes All Packages
    +A C D E F G H L M P R S U 
    All Classes|All Packages
    -
    - -
    - - -
    -
    + +
    + diff --git a/usermodel-initial/javadocs/index-files/index-15.html b/usermodel-exceptions-initial/javadocs/index-files/index-13.html similarity index 79% rename from usermodel-initial/javadocs/index-files/index-15.html rename to usermodel-exceptions-initial/javadocs/index-files/index-13.html index a0f7a17..3dbb262 100644 --- a/usermodel-initial/javadocs/index-files/index-15.html +++ b/usermodel-exceptions-initial/javadocs/index-files/index-13.html @@ -2,40 +2,32 @@ - + U-Index - + + + - + - - + + - - + + - - -
    +
    + +
    -
    A C D E F G H I J L M P R S U 
    All Classes All Packages +
    +

    Index

    +
    +
    A C D E F G H L M P R S U 
    All Classes|All Packages

    U

    @@ -142,7 +113,7 @@

    U

    Default constructor used primarily by the JPA.
    -
    User(String, String, String, List<UserRoles>) - Constructor for class com.lambdaschool.usermodel.models.User
    +
    User(String, String, String) - Constructor for class com.lambdaschool.usermodel.models.User
    Given the params, create a new user object
    @@ -197,16 +168,6 @@

    U

    UserModelApplication() - Constructor for class com.lambdaschool.usermodel.UserModelApplication
     
    -
    UserModelApplicationTests - Class in com.lambdaschool.usermodel
    -
    -
    Starting class for testing
    -
    -
    UserModelApplicationTests() - Constructor for class com.lambdaschool.usermodel.UserModelApplicationTests
    -
     
    -
    UserNameCountEmails - Interface in com.lambdaschool.usermodel.views
    -
    -
    Used to format the JSON output for a custom query that gathers information on username and the count of how many emails they have
    -
    UserRepository - Interface in com.lambdaschool.usermodel.repository
    The CRUD repository connecting User to the rest of the application
    @@ -223,18 +184,26 @@

    U

    Given the params, create a new user role combination object
    +
    UserRolesId - Class in com.lambdaschool.usermodel.models
    +
    +
    Class to represent the complex primary key for UserRoles
    +
    +
    UserRolesId() - Constructor for class com.lambdaschool.usermodel.models.UserRolesId
    +
    +
    The default constructor required by JPA
    +
    UserService - Interface in com.lambdaschool.usermodel.services
    The Service that works with User Model.
    UserServiceImpl - Class in com.lambdaschool.usermodel.services
    -
    Implements the Userservice Interface
    +
    Implements UserService Interface
    UserServiceImpl() - Constructor for class com.lambdaschool.usermodel.services.UserServiceImpl
     
    -A C D E F G H I J L M P R S U 
    All Classes All Packages
    +A C D E F G H L M P R S U 
    All Classes|All Packages
    -
    - -
    - - -
    -
    + +
    + diff --git a/usermodel-initial/javadocs/index-files/index-2.html b/usermodel-exceptions-initial/javadocs/index-files/index-2.html similarity index 51% rename from usermodel-initial/javadocs/index-files/index-2.html rename to usermodel-exceptions-initial/javadocs/index-files/index-2.html index d214e3c..996a7db 100644 --- a/usermodel-initial/javadocs/index-files/index-2.html +++ b/usermodel-exceptions-initial/javadocs/index-files/index-2.html @@ -2,40 +2,32 @@ - + C-Index - + + + - + - - + + - - + + - - -
    +
    + +
    -
    A C D E F G H I J L M P R S U 
    All Classes All Packages +
    +

    Index

    +
    +
    A C D E F G H L M P R S U 
    All Classes|All Packages

    C

    -
    checkUserRolesCombo(long, long) - Method in interface com.lambdaschool.usermodel.repository.UserRepository
    -
    -
    Counts the number of user role combinations for the given userid and roleid.
    -
    com.lambdaschool.usermodel - package com.lambdaschool.usermodel
    Main package for this application.
    @@ -125,14 +92,8 @@

    C

    Contains the services that are used to retrieve and manipulate data in the application.
    -
    com.lambdaschool.usermodel.views - package com.lambdaschool.usermodel.views
    -
    -
    Contains the interfaces used for custom queries
    -
    -
    contextLoads() - Method in class com.lambdaschool.usermodel.UserModelApplicationTests
    -
     
    -A C D E F G H I J L M P R S U 
    All Classes All Packages
    +A C D E F G H L M P R S U 
    All Classes|All Packages
    -
    - -
    - - -
    -
    + +
    + diff --git a/usermodel-initial/javadocs/index-files/index-3.html b/usermodel-exceptions-initial/javadocs/index-files/index-3.html similarity index 50% rename from usermodel-initial/javadocs/index-files/index-3.html rename to usermodel-exceptions-initial/javadocs/index-files/index-3.html index c2c181e..93353c9 100644 --- a/usermodel-initial/javadocs/index-files/index-3.html +++ b/usermodel-exceptions-initial/javadocs/index-files/index-3.html @@ -2,40 +2,32 @@ - + D-Index - + + + - + - - + + - - + + - - -
    +
    + +
    -
    A C D E F G H I J L M P R S U 
    All Classes All Packages +
    +

    Index

    +
    +
    A C D E F G H L M P R S U 
    All Classes|All Packages

    D

    -
    delete(long) - Method in interface com.lambdaschool.usermodel.services.RoleService
    -
    -
    Deletes a given role and associated user role combinations
    -
    -
    delete(long) - Method in class com.lambdaschool.usermodel.services.RoleServiceImpl
    -
     
    delete(long) - Method in interface com.lambdaschool.usermodel.services.UseremailService
    Remove the user email combination referenced by the given id
    @@ -115,10 +80,18 @@

    D

    delete(long) - Method in class com.lambdaschool.usermodel.services.UserServiceImpl
     
    -
    deleteRoleById(long) - Method in class com.lambdaschool.usermodel.controllers.RolesController
    +
    deleteAll() - Method in interface com.lambdaschool.usermodel.services.RoleService
    -
    Deletes the role from the database.
    +
    Deletes all record and their associated records from the database
    +
    deleteAll() - Method in class com.lambdaschool.usermodel.services.RoleServiceImpl
    +
     
    +
    deleteAll() - Method in interface com.lambdaschool.usermodel.services.UserService
    +
    +
    Deletes all record and their associated records from the database
    +
    +
    deleteAll() - Method in class com.lambdaschool.usermodel.services.UserServiceImpl
    +
     
    deleteUserById(long) - Method in class com.lambdaschool.usermodel.controllers.UserController
    Deletes a given user along with associated emails and roles @@ -129,23 +102,8 @@

    D

    Removes the given user email combination
    Example: http://localhost:2019/useremails/useremail/8
    -
    deleteUserRole(long, long) - Method in interface com.lambdaschool.usermodel.services.UserService
    -
    -
    Deletes a given user role combination
    -
    -
    deleteUserRole(long, long) - Method in class com.lambdaschool.usermodel.services.UserServiceImpl
    -
     
    -
    deleteUserRoleByIds(long, long) - Method in class com.lambdaschool.usermodel.controllers.UserController
    -
    -
    Deletes the given user, user role combination -
    Example: http://localhost:2019/users/user/7/role/2
    -
    -
    deleteUserRoles(long, long) - Method in interface com.lambdaschool.usermodel.repository.UserRepository
    -
    -
    Deletes the given user, role combination
    -
    -A C D E F G H I J L M P R S U 
    All Classes All Packages
    +A C D E F G H L M P R S U 
    All Classes|All Packages
    -
    - -
    - - -
    -
    + +
    + diff --git a/usermodel-initial/javadocs/index-files/index-4.html b/usermodel-exceptions-initial/javadocs/index-files/index-4.html similarity index 51% rename from usermodel-initial/javadocs/index-files/index-4.html rename to usermodel-exceptions-initial/javadocs/index-files/index-4.html index 514d7ef..e18a5a2 100644 --- a/usermodel-initial/javadocs/index-files/index-4.html +++ b/usermodel-exceptions-initial/javadocs/index-files/index-4.html @@ -2,40 +2,32 @@ - + E-Index - + + + - + - - + + - - + + - - -
    +
    + +
    -
    A C D E F G H I J L M P R S U 
    All Classes All Packages +
    +

    Index

    +
    +
    A C D E F G H L M P R S U 
    All Classes|All Packages

    E

    equals(Object) - Method in class com.lambdaschool.usermodel.models.UserRoles
     
    +
    equals(Object) - Method in class com.lambdaschool.usermodel.models.UserRolesId
    +
     
    -A C D E F G H I J L M P R S U 
    All Classes All Packages
    +A C D E F G H L M P R S U 
    All Classes|All Packages
    -
    - -
    - - -
    -
    + +
    + diff --git a/usermodel-initial/javadocs/index-files/index-5.html b/usermodel-exceptions-initial/javadocs/index-files/index-5.html similarity index 70% rename from usermodel-initial/javadocs/index-files/index-5.html rename to usermodel-exceptions-initial/javadocs/index-files/index-5.html index 4c0e6f4..011ddce 100644 --- a/usermodel-initial/javadocs/index-files/index-5.html +++ b/usermodel-exceptions-initial/javadocs/index-files/index-5.html @@ -2,40 +2,32 @@ - + F-Index - + + + - + - - + + - - + + - - -
    +
    + +
    -
    A C D E F G H I J L M P R S U 
    All Classes All Packages +
    +

    Index

    +
    +
    A C D E F G H L M P R S U 
    All Classes|All Packages

    F

    @@ -115,10 +86,6 @@

    F

    findAll() - Method in class com.lambdaschool.usermodel.services.UserServiceImpl
     
    -
    findAllByUser_Username(String) - Method in interface com.lambdaschool.usermodel.repository.UseremailRepository
    -
    -
    Return a list of user email combinations based on the given username
    -
    findByName(String) - Method in interface com.lambdaschool.usermodel.services.RoleService
    Find the first Role object matching the given name
    @@ -145,12 +112,6 @@

    F

    Find a user based off over username
    -
    findByUserName(String) - Method in interface com.lambdaschool.usermodel.services.UseremailService
    -
    -
    Return a list of user email combinations based on the given username
    -
    -
    findByUserName(String) - Method in class com.lambdaschool.usermodel.services.UseremailServiceImpl
    -
     
    findByUsernameContainingIgnoreCase(String) - Method in interface com.lambdaschool.usermodel.repository.UserRepository
    Find all users whose name contains a given substring ignoring case
    @@ -173,12 +134,8 @@

    F

    findUseremailById(long) - Method in class com.lambdaschool.usermodel.services.UseremailServiceImpl
     
    -
    findUseremailByUserName(String) - Method in class com.lambdaschool.usermodel.controllers.UseremailController
    -
    -
    Finds the emails associated with the given user.
    -
    -A C D E F G H I J L M P R S U 
    All Classes All Packages
    +A C D E F G H L M P R S U 
    All Classes|All Packages
    -
    - -
    - - -
    -
    + +
    + diff --git a/usermodel-initial/javadocs/index-files/index-6.html b/usermodel-exceptions-initial/javadocs/index-files/index-6.html similarity index 67% rename from usermodel-initial/javadocs/index-files/index-6.html rename to usermodel-exceptions-initial/javadocs/index-files/index-6.html index c936fde..ef3a28f 100644 --- a/usermodel-initial/javadocs/index-files/index-6.html +++ b/usermodel-exceptions-initial/javadocs/index-files/index-6.html @@ -2,40 +2,32 @@ - + G-Index - + + + - + - - + + - - + + - - -
    +
    + +
    -
    A C D E F G H I J L M P R S U 
    All Classes All Packages +
    +

    Index

    +
    +
    A C D E F G H L M P R S U 
    All Classes|All Packages

    G

    -
    getCount() - Method in interface com.lambdaschool.usermodel.views.JustTheCount
    -
    -
    The result of the count
    -
    -
    getCountemails() - Method in interface com.lambdaschool.usermodel.views.UserNameCountEmails
    -
    -
    The count of the emails.
    -
    -
    getCountUserEmails() - Method in interface com.lambdaschool.usermodel.repository.UserRepository
    -
    -
    Custom Query finding the users and the count of their emails.
    -
    -
    getCountUserEmails() - Method in interface com.lambdaschool.usermodel.services.UserService
    -
    -
    List containing usernames and the number of emails they have - not counting the primary email
    -
    -
    getCountUserEmails() - Method in class com.lambdaschool.usermodel.services.UserServiceImpl
    -
     
    getCurrentAuditor() - Method in class com.lambdaschool.usermodel.services.UserAuditing
    The current user
    @@ -123,10 +76,6 @@

    G

    Getter for role name
    -
    getNumUserEmails() - Method in class com.lambdaschool.usermodel.controllers.UserController
    -
    -
    Find all users and the number of emails associated with them.
    -
    getPassword() - Method in class com.lambdaschool.usermodel.models.User
    Getter for the password
    @@ -139,6 +88,10 @@

    G

    Getter for role
    +
    getRole() - Method in class com.lambdaschool.usermodel.models.UserRolesId
    +
    +
    Getter for the role id
    +
    getRoleById(Long) - Method in class com.lambdaschool.usermodel.controllers.RolesController
    The Role referenced by the given primary key @@ -165,6 +118,10 @@

    G

    The getter for User
    +
    getUser() - Method in class com.lambdaschool.usermodel.models.UserRolesId
    +
    +
    Getter for the user id
    +
    getUserById(Long) - Method in class com.lambdaschool.usermodel.controllers.UserController
    Returns a single user based off a user id number @@ -205,16 +162,12 @@

    G

    Getter for username
    -
    getUsernamerpt() - Method in interface com.lambdaschool.usermodel.views.UserNameCountEmails
    -
    -
    The name of the user.
    -
    getUsers() - Method in class com.lambdaschool.usermodel.models.Role
    Getter for user role combinations
    -A C D E F G H I J L M P R S U 
    All Classes All Packages
    +A C D E F G H L M P R S U 
    All Classes|All Packages
    -
    - -
    - - -
    -
    + +
    + diff --git a/usermodel-initial/javadocs/index-files/index-7.html b/usermodel-exceptions-initial/javadocs/index-files/index-7.html similarity index 61% rename from usermodel-initial/javadocs/index-files/index-7.html rename to usermodel-exceptions-initial/javadocs/index-files/index-7.html index 019f74b..3e702b8 100644 --- a/usermodel-initial/javadocs/index-files/index-7.html +++ b/usermodel-exceptions-initial/javadocs/index-files/index-7.html @@ -2,40 +2,32 @@ - + H-Index - + + + - + - - + + - - + + - - -
    +
    + +
    -
    A C D E F G H I J L M P R S U 
    All Classes All Packages +
    +

    Index

    +
    +
    A C D E F G H L M P R S U 
    All Classes|All Packages

    H

    @@ -113,8 +84,10 @@

    H

    hashCode() - Method in class com.lambdaschool.usermodel.models.UserRoles
     
    +
    hashCode() - Method in class com.lambdaschool.usermodel.models.UserRolesId
    +
     
    -A C D E F G H I J L M P R S U 
    All Classes All Packages
    +A C D E F G H L M P R S U 
    All Classes|All Packages
    -
    - -
    - - -
    -
    + +
    + diff --git a/usermodel-initial/javadocs/index-files/index-10.html b/usermodel-exceptions-initial/javadocs/index-files/index-8.html similarity index 59% rename from usermodel-initial/javadocs/index-files/index-10.html rename to usermodel-exceptions-initial/javadocs/index-files/index-8.html index 7982a9e..1103efe 100644 --- a/usermodel-initial/javadocs/index-files/index-10.html +++ b/usermodel-exceptions-initial/javadocs/index-files/index-8.html @@ -2,40 +2,32 @@ - + L-Index - + + + - + - - + + - - + + - - -
    +
    + +
    -
    A C D E F G H I J L M P R S U 
    All Classes All Packages +
    +

    Index

    +
    +
    A C D E F G H L M P R S U 
    All Classes|All Packages

    L

    @@ -113,7 +84,7 @@

    L


    Example: http://localhost:2019/roles/roles
    -A C D E F G H I J L M P R S U 
    All Classes All Packages
    +A C D E F G H L M P R S U 
    All Classes|All Packages
    -
    - -
    - - -
    -
    + + + diff --git a/usermodel-initial/javadocs/index-files/index-11.html b/usermodel-exceptions-initial/javadocs/index-files/index-9.html similarity index 51% rename from usermodel-initial/javadocs/index-files/index-11.html rename to usermodel-exceptions-initial/javadocs/index-files/index-9.html index b145a51..1f54e0b 100644 --- a/usermodel-initial/javadocs/index-files/index-11.html +++ b/usermodel-exceptions-initial/javadocs/index-files/index-9.html @@ -2,40 +2,32 @@ - + M-Index - + + + - + - - + + - - + + - - -
    +
    + +
    -
    A C D E F G H I J L M P R S U 
    All Classes All Packages +
    +

    Index

    +
    +
    A C D E F G H L M P R S U 
    All Classes|All Packages

    M

    @@ -102,7 +73,7 @@

    M

    Main method to start the application.
    -A C D E F G H I J L M P R S U 
    All Classes All Packages
    +A C D E F G H L M P R S U 
    All Classes|All Packages
    -
    - -
    - - -
    -
    + +
    + diff --git a/usermodel-initial/javadocs/index.html b/usermodel-exceptions-initial/javadocs/index.html similarity index 63% rename from usermodel-initial/javadocs/index.html rename to usermodel-exceptions-initial/javadocs/index.html index 245b142..698519a 100644 --- a/usermodel-initial/javadocs/index.html +++ b/usermodel-exceptions-initial/javadocs/index.html @@ -2,40 +2,32 @@ - + Overview - + + + - + - - + + - - + + - - -
    +
    + +
    - +
    +
    + + @@ -136,15 +107,10 @@
    Contains the services that are used to retrieve and manipulate data in the application.
    - - - -
    Packages 
    Package Description
    com.lambdaschool.usermodel
    com.lambdaschool.usermodel.views -
    Contains the interfaces used for custom queries
    -
    +
    -
    - -
    - - -
    -
    + + + diff --git a/usermodel-initial/javadocs/jquery/external/jquery/jquery.js b/usermodel-exceptions-initial/javadocs/jquery/external/jquery/jquery.js similarity index 100% rename from usermodel-initial/javadocs/jquery/external/jquery/jquery.js rename to usermodel-exceptions-initial/javadocs/jquery/external/jquery/jquery.js diff --git a/usermodel-initial/javadocs/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png b/usermodel-exceptions-initial/javadocs/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from usermodel-initial/javadocs/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png rename to usermodel-exceptions-initial/javadocs/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/usermodel-initial/javadocs/jquery/images/ui-bg_glass_65_dadada_1x400.png b/usermodel-exceptions-initial/javadocs/jquery/images/ui-bg_glass_65_dadada_1x400.png similarity index 100% rename from usermodel-initial/javadocs/jquery/images/ui-bg_glass_65_dadada_1x400.png rename to usermodel-exceptions-initial/javadocs/jquery/images/ui-bg_glass_65_dadada_1x400.png diff --git a/usermodel-initial/javadocs/jquery/images/ui-bg_glass_75_dadada_1x400.png b/usermodel-exceptions-initial/javadocs/jquery/images/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from usermodel-initial/javadocs/jquery/images/ui-bg_glass_75_dadada_1x400.png rename to usermodel-exceptions-initial/javadocs/jquery/images/ui-bg_glass_75_dadada_1x400.png diff --git a/usermodel-initial/javadocs/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png b/usermodel-exceptions-initial/javadocs/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from usermodel-initial/javadocs/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png rename to usermodel-exceptions-initial/javadocs/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/usermodel-initial/javadocs/jquery/images/ui-bg_glass_95_fef1ec_1x400.png b/usermodel-exceptions-initial/javadocs/jquery/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from usermodel-initial/javadocs/jquery/images/ui-bg_glass_95_fef1ec_1x400.png rename to usermodel-exceptions-initial/javadocs/jquery/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/usermodel-initial/javadocs/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/usermodel-exceptions-initial/javadocs/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png similarity index 100% rename from usermodel-initial/javadocs/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png rename to usermodel-exceptions-initial/javadocs/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png diff --git a/usermodel-initial/javadocs/jquery/images/ui-icons_222222_256x240.png b/usermodel-exceptions-initial/javadocs/jquery/images/ui-icons_222222_256x240.png similarity index 100% rename from usermodel-initial/javadocs/jquery/images/ui-icons_222222_256x240.png rename to usermodel-exceptions-initial/javadocs/jquery/images/ui-icons_222222_256x240.png diff --git a/usermodel-initial/javadocs/jquery/images/ui-icons_2e83ff_256x240.png b/usermodel-exceptions-initial/javadocs/jquery/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from usermodel-initial/javadocs/jquery/images/ui-icons_2e83ff_256x240.png rename to usermodel-exceptions-initial/javadocs/jquery/images/ui-icons_2e83ff_256x240.png diff --git a/usermodel-initial/javadocs/jquery/images/ui-icons_454545_256x240.png b/usermodel-exceptions-initial/javadocs/jquery/images/ui-icons_454545_256x240.png similarity index 100% rename from usermodel-initial/javadocs/jquery/images/ui-icons_454545_256x240.png rename to usermodel-exceptions-initial/javadocs/jquery/images/ui-icons_454545_256x240.png diff --git a/usermodel-initial/javadocs/jquery/images/ui-icons_888888_256x240.png b/usermodel-exceptions-initial/javadocs/jquery/images/ui-icons_888888_256x240.png similarity index 100% rename from usermodel-initial/javadocs/jquery/images/ui-icons_888888_256x240.png rename to usermodel-exceptions-initial/javadocs/jquery/images/ui-icons_888888_256x240.png diff --git a/usermodel-initial/javadocs/jquery/images/ui-icons_cd0a0a_256x240.png b/usermodel-exceptions-initial/javadocs/jquery/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from usermodel-initial/javadocs/jquery/images/ui-icons_cd0a0a_256x240.png rename to usermodel-exceptions-initial/javadocs/jquery/images/ui-icons_cd0a0a_256x240.png diff --git a/usermodel-initial/javadocs/jquery/jquery-3.4.1.js b/usermodel-exceptions-initial/javadocs/jquery/jquery-3.4.1.js similarity index 100% rename from usermodel-initial/javadocs/jquery/jquery-3.4.1.js rename to usermodel-exceptions-initial/javadocs/jquery/jquery-3.4.1.js diff --git a/usermodel-initial/javadocs/jquery/jquery-ui.css b/usermodel-exceptions-initial/javadocs/jquery/jquery-ui.css similarity index 100% rename from usermodel-initial/javadocs/jquery/jquery-ui.css rename to usermodel-exceptions-initial/javadocs/jquery/jquery-ui.css diff --git a/usermodel-initial/javadocs/jquery/jquery-ui.js b/usermodel-exceptions-initial/javadocs/jquery/jquery-ui.js similarity index 100% rename from usermodel-initial/javadocs/jquery/jquery-ui.js rename to usermodel-exceptions-initial/javadocs/jquery/jquery-ui.js diff --git a/usermodel-initial/javadocs/jquery/jquery-ui.min.css b/usermodel-exceptions-initial/javadocs/jquery/jquery-ui.min.css similarity index 100% rename from usermodel-initial/javadocs/jquery/jquery-ui.min.css rename to usermodel-exceptions-initial/javadocs/jquery/jquery-ui.min.css diff --git a/usermodel-initial/javadocs/jquery/jquery-ui.min.js b/usermodel-exceptions-initial/javadocs/jquery/jquery-ui.min.js similarity index 100% rename from usermodel-initial/javadocs/jquery/jquery-ui.min.js rename to usermodel-exceptions-initial/javadocs/jquery/jquery-ui.min.js diff --git a/usermodel-initial/javadocs/jquery/jquery-ui.structure.css b/usermodel-exceptions-initial/javadocs/jquery/jquery-ui.structure.css similarity index 100% rename from usermodel-initial/javadocs/jquery/jquery-ui.structure.css rename to usermodel-exceptions-initial/javadocs/jquery/jquery-ui.structure.css diff --git a/usermodel-initial/javadocs/jquery/jquery-ui.structure.min.css b/usermodel-exceptions-initial/javadocs/jquery/jquery-ui.structure.min.css similarity index 100% rename from usermodel-initial/javadocs/jquery/jquery-ui.structure.min.css rename to usermodel-exceptions-initial/javadocs/jquery/jquery-ui.structure.min.css diff --git a/usermodel-initial/javadocs/jquery/jszip-utils/dist/jszip-utils-ie.js b/usermodel-exceptions-initial/javadocs/jquery/jszip-utils/dist/jszip-utils-ie.js similarity index 100% rename from usermodel-initial/javadocs/jquery/jszip-utils/dist/jszip-utils-ie.js rename to usermodel-exceptions-initial/javadocs/jquery/jszip-utils/dist/jszip-utils-ie.js diff --git a/usermodel-initial/javadocs/jquery/jszip-utils/dist/jszip-utils-ie.min.js b/usermodel-exceptions-initial/javadocs/jquery/jszip-utils/dist/jszip-utils-ie.min.js similarity index 100% rename from usermodel-initial/javadocs/jquery/jszip-utils/dist/jszip-utils-ie.min.js rename to usermodel-exceptions-initial/javadocs/jquery/jszip-utils/dist/jszip-utils-ie.min.js diff --git a/usermodel-initial/javadocs/jquery/jszip-utils/dist/jszip-utils.js b/usermodel-exceptions-initial/javadocs/jquery/jszip-utils/dist/jszip-utils.js similarity index 100% rename from usermodel-initial/javadocs/jquery/jszip-utils/dist/jszip-utils.js rename to usermodel-exceptions-initial/javadocs/jquery/jszip-utils/dist/jszip-utils.js diff --git a/usermodel-initial/javadocs/jquery/jszip-utils/dist/jszip-utils.min.js b/usermodel-exceptions-initial/javadocs/jquery/jszip-utils/dist/jszip-utils.min.js similarity index 100% rename from usermodel-initial/javadocs/jquery/jszip-utils/dist/jszip-utils.min.js rename to usermodel-exceptions-initial/javadocs/jquery/jszip-utils/dist/jszip-utils.min.js diff --git a/usermodel-initial/javadocs/jquery/jszip/dist/jszip.js b/usermodel-exceptions-initial/javadocs/jquery/jszip/dist/jszip.js similarity index 100% rename from usermodel-initial/javadocs/jquery/jszip/dist/jszip.js rename to usermodel-exceptions-initial/javadocs/jquery/jszip/dist/jszip.js diff --git a/usermodel-initial/javadocs/jquery/jszip/dist/jszip.min.js b/usermodel-exceptions-initial/javadocs/jquery/jszip/dist/jszip.min.js similarity index 100% rename from usermodel-initial/javadocs/jquery/jszip/dist/jszip.min.js rename to usermodel-exceptions-initial/javadocs/jquery/jszip/dist/jszip.min.js diff --git a/usermodel-exceptions-initial/javadocs/member-search-index.js b/usermodel-exceptions-initial/javadocs/member-search-index.js new file mode 100644 index 0000000..ed38a7f --- /dev/null +++ b/usermodel-exceptions-initial/javadocs/member-search-index.js @@ -0,0 +1 @@ +memberSearchIndex = [{"p":"com.lambdaschool.usermodel.controllers","c":"RolesController","l":"addNewRole(Role)","url":"addNewRole(com.lambdaschool.usermodel.models.Role)"},{"p":"com.lambdaschool.usermodel.controllers","c":"UserController","l":"addNewUser(User)","url":"addNewUser(com.lambdaschool.usermodel.models.User)"},{"p":"com.lambdaschool.usermodel.controllers","c":"UseremailController","l":"addNewUserEmail(long, String)","url":"addNewUserEmail(long,java.lang.String)"},{"p":"com.lambdaschool.usermodel.config","c":"Swagger2Config","l":"api()"},{"p":"com.lambdaschool.usermodel.services","c":"UserService","l":"delete(long)"},{"p":"com.lambdaschool.usermodel.services","c":"UserServiceImpl","l":"delete(long)"},{"p":"com.lambdaschool.usermodel.services","c":"UseremailService","l":"delete(long)"},{"p":"com.lambdaschool.usermodel.services","c":"UseremailServiceImpl","l":"delete(long)"},{"p":"com.lambdaschool.usermodel.services","c":"RoleService","l":"deleteAll()"},{"p":"com.lambdaschool.usermodel.services","c":"RoleServiceImpl","l":"deleteAll()"},{"p":"com.lambdaschool.usermodel.services","c":"UserService","l":"deleteAll()"},{"p":"com.lambdaschool.usermodel.services","c":"UserServiceImpl","l":"deleteAll()"},{"p":"com.lambdaschool.usermodel.controllers","c":"UserController","l":"deleteUserById(long)"},{"p":"com.lambdaschool.usermodel.controllers","c":"UseremailController","l":"deleteUserEmailById(long)"},{"p":"com.lambdaschool.usermodel.models","c":"UserRoles","l":"equals(Object)","url":"equals(java.lang.Object)"},{"p":"com.lambdaschool.usermodel.models","c":"UserRolesId","l":"equals(Object)","url":"equals(java.lang.Object)"},{"p":"com.lambdaschool.usermodel.services","c":"RoleService","l":"findAll()"},{"p":"com.lambdaschool.usermodel.services","c":"RoleServiceImpl","l":"findAll()"},{"p":"com.lambdaschool.usermodel.services","c":"UserService","l":"findAll()"},{"p":"com.lambdaschool.usermodel.services","c":"UserServiceImpl","l":"findAll()"},{"p":"com.lambdaschool.usermodel.services","c":"UseremailService","l":"findAll()"},{"p":"com.lambdaschool.usermodel.services","c":"UseremailServiceImpl","l":"findAll()"},{"p":"com.lambdaschool.usermodel.services","c":"RoleService","l":"findByName(String)","url":"findByName(java.lang.String)"},{"p":"com.lambdaschool.usermodel.services","c":"RoleServiceImpl","l":"findByName(String)","url":"findByName(java.lang.String)"},{"p":"com.lambdaschool.usermodel.services","c":"UserService","l":"findByName(String)","url":"findByName(java.lang.String)"},{"p":"com.lambdaschool.usermodel.services","c":"UserServiceImpl","l":"findByName(String)","url":"findByName(java.lang.String)"},{"p":"com.lambdaschool.usermodel.services","c":"UserService","l":"findByNameContaining(String)","url":"findByNameContaining(java.lang.String)"},{"p":"com.lambdaschool.usermodel.services","c":"UserServiceImpl","l":"findByNameContaining(String)","url":"findByNameContaining(java.lang.String)"},{"p":"com.lambdaschool.usermodel.repository","c":"RoleRepository","l":"findByNameIgnoreCase(String)","url":"findByNameIgnoreCase(java.lang.String)"},{"p":"com.lambdaschool.usermodel.repository","c":"UserRepository","l":"findByUsername(String)","url":"findByUsername(java.lang.String)"},{"p":"com.lambdaschool.usermodel.repository","c":"UserRepository","l":"findByUsernameContainingIgnoreCase(String)","url":"findByUsernameContainingIgnoreCase(java.lang.String)"},{"p":"com.lambdaschool.usermodel.services","c":"RoleService","l":"findRoleById(long)"},{"p":"com.lambdaschool.usermodel.services","c":"RoleServiceImpl","l":"findRoleById(long)"},{"p":"com.lambdaschool.usermodel.services","c":"UserService","l":"findUserById(long)"},{"p":"com.lambdaschool.usermodel.services","c":"UserServiceImpl","l":"findUserById(long)"},{"p":"com.lambdaschool.usermodel.services","c":"UseremailService","l":"findUseremailById(long)"},{"p":"com.lambdaschool.usermodel.services","c":"UseremailServiceImpl","l":"findUseremailById(long)"},{"p":"com.lambdaschool.usermodel.services","c":"UserAuditing","l":"getCurrentAuditor()"},{"p":"com.lambdaschool.usermodel.models","c":"Role","l":"getName()"},{"p":"com.lambdaschool.usermodel.models","c":"User","l":"getPassword()"},{"p":"com.lambdaschool.usermodel.models","c":"User","l":"getPrimaryemail()"},{"p":"com.lambdaschool.usermodel.models","c":"UserRoles","l":"getRole()"},{"p":"com.lambdaschool.usermodel.models","c":"UserRolesId","l":"getRole()"},{"p":"com.lambdaschool.usermodel.controllers","c":"RolesController","l":"getRoleById(Long)","url":"getRoleById(java.lang.Long)"},{"p":"com.lambdaschool.usermodel.controllers","c":"RolesController","l":"getRoleByName(String)","url":"getRoleByName(java.lang.String)"},{"p":"com.lambdaschool.usermodel.models","c":"Role","l":"getRoleid()"},{"p":"com.lambdaschool.usermodel.models","c":"User","l":"getRoles()"},{"p":"com.lambdaschool.usermodel.models","c":"UserRoles","l":"getUser()"},{"p":"com.lambdaschool.usermodel.models","c":"UserRolesId","l":"getUser()"},{"p":"com.lambdaschool.usermodel.models","c":"Useremail","l":"getUser()"},{"p":"com.lambdaschool.usermodel.controllers","c":"UserController","l":"getUserById(Long)","url":"getUserById(java.lang.Long)"},{"p":"com.lambdaschool.usermodel.controllers","c":"UserController","l":"getUserByName(String)","url":"getUserByName(java.lang.String)"},{"p":"com.lambdaschool.usermodel.models","c":"Useremail","l":"getUseremail()"},{"p":"com.lambdaschool.usermodel.controllers","c":"UseremailController","l":"getUserEmailById(Long)","url":"getUserEmailById(java.lang.Long)"},{"p":"com.lambdaschool.usermodel.models","c":"Useremail","l":"getUseremailid()"},{"p":"com.lambdaschool.usermodel.models","c":"User","l":"getUseremails()"},{"p":"com.lambdaschool.usermodel.models","c":"User","l":"getUserid()"},{"p":"com.lambdaschool.usermodel.controllers","c":"UserController","l":"getUserLikeName(String)","url":"getUserLikeName(java.lang.String)"},{"p":"com.lambdaschool.usermodel.models","c":"User","l":"getUsername()"},{"p":"com.lambdaschool.usermodel.models","c":"Role","l":"getUsers()"},{"p":"com.lambdaschool.usermodel.config","c":"H2ServerConfiguration","l":"H2ServerConfiguration()","url":"%3Cinit%3E()"},{"p":"com.lambdaschool.usermodel.config","c":"H2ServerConfiguration","l":"h2TcpServer()"},{"p":"com.lambdaschool.usermodel.config","c":"H2ServerConfiguration","l":"h2WebServer()"},{"p":"com.lambdaschool.usermodel.models","c":"UserRoles","l":"hashCode()"},{"p":"com.lambdaschool.usermodel.models","c":"UserRolesId","l":"hashCode()"},{"p":"com.lambdaschool.usermodel.controllers","c":"UseremailController","l":"listAllUseremails()"},{"p":"com.lambdaschool.usermodel.controllers","c":"UserController","l":"listAllUsers()"},{"p":"com.lambdaschool.usermodel.controllers","c":"RolesController","l":"listRoles()"},{"p":"com.lambdaschool.usermodel","c":"UserModelApplication","l":"main(String[])","url":"main(java.lang.String[])"},{"p":"com.lambdaschool.usermodel.controllers","c":"RolesController","l":"putUpdateRole(long, Role)","url":"putUpdateRole(long,com.lambdaschool.usermodel.models.Role)"},{"p":"com.lambdaschool.usermodel.models","c":"Role","l":"Role()","url":"%3Cinit%3E()"},{"p":"com.lambdaschool.usermodel.models","c":"Role","l":"Role(String)","url":"%3Cinit%3E(java.lang.String)"},{"p":"com.lambdaschool.usermodel.controllers","c":"RolesController","l":"RolesController()","url":"%3Cinit%3E()"},{"p":"com.lambdaschool.usermodel.services","c":"RoleServiceImpl","l":"RoleServiceImpl()","url":"%3Cinit%3E()"},{"p":"com.lambdaschool.usermodel","c":"SeedData","l":"run(String[])","url":"run(java.lang.String[])"},{"p":"com.lambdaschool.usermodel.services","c":"UseremailService","l":"save(long, String)","url":"save(long,java.lang.String)"},{"p":"com.lambdaschool.usermodel.services","c":"UseremailServiceImpl","l":"save(long, String)","url":"save(long,java.lang.String)"},{"p":"com.lambdaschool.usermodel.services","c":"RoleService","l":"save(Role)","url":"save(com.lambdaschool.usermodel.models.Role)"},{"p":"com.lambdaschool.usermodel.services","c":"RoleServiceImpl","l":"save(Role)","url":"save(com.lambdaschool.usermodel.models.Role)"},{"p":"com.lambdaschool.usermodel.services","c":"UserService","l":"save(User)","url":"save(com.lambdaschool.usermodel.models.User)"},{"p":"com.lambdaschool.usermodel.services","c":"UserServiceImpl","l":"save(User)","url":"save(com.lambdaschool.usermodel.models.User)"},{"p":"com.lambdaschool.usermodel","c":"SeedData","l":"SeedData()","url":"%3Cinit%3E()"},{"p":"com.lambdaschool.usermodel.models","c":"Role","l":"setName(String)","url":"setName(java.lang.String)"},{"p":"com.lambdaschool.usermodel.models","c":"User","l":"setPassword(String)","url":"setPassword(java.lang.String)"},{"p":"com.lambdaschool.usermodel.models","c":"User","l":"setPrimaryemail(String)","url":"setPrimaryemail(java.lang.String)"},{"p":"com.lambdaschool.usermodel.models","c":"UserRolesId","l":"setRole(long)"},{"p":"com.lambdaschool.usermodel.models","c":"UserRoles","l":"setRole(Role)","url":"setRole(com.lambdaschool.usermodel.models.Role)"},{"p":"com.lambdaschool.usermodel.models","c":"Role","l":"setRoleid(long)"},{"p":"com.lambdaschool.usermodel.models","c":"User","l":"setRoles(Set)","url":"setRoles(java.util.Set)"},{"p":"com.lambdaschool.usermodel.models","c":"UserRolesId","l":"setUser(long)"},{"p":"com.lambdaschool.usermodel.models","c":"UserRoles","l":"setUser(User)","url":"setUser(com.lambdaschool.usermodel.models.User)"},{"p":"com.lambdaschool.usermodel.models","c":"Useremail","l":"setUser(User)","url":"setUser(com.lambdaschool.usermodel.models.User)"},{"p":"com.lambdaschool.usermodel.models","c":"Useremail","l":"setUseremail(String)","url":"setUseremail(java.lang.String)"},{"p":"com.lambdaschool.usermodel.models","c":"Useremail","l":"setUseremailid(long)"},{"p":"com.lambdaschool.usermodel.models","c":"User","l":"setUseremails(List)","url":"setUseremails(java.util.List)"},{"p":"com.lambdaschool.usermodel.models","c":"User","l":"setUserid(long)"},{"p":"com.lambdaschool.usermodel.models","c":"User","l":"setUsername(String)","url":"setUsername(java.lang.String)"},{"p":"com.lambdaschool.usermodel.models","c":"Role","l":"setUsers(Set)","url":"setUsers(java.util.Set)"},{"p":"com.lambdaschool.usermodel.config","c":"Swagger2Config","l":"Swagger2Config()","url":"%3Cinit%3E()"},{"p":"com.lambdaschool.usermodel.services","c":"RoleService","l":"update(long, Role)","url":"update(long,com.lambdaschool.usermodel.models.Role)"},{"p":"com.lambdaschool.usermodel.services","c":"RoleServiceImpl","l":"update(long, Role)","url":"update(long,com.lambdaschool.usermodel.models.Role)"},{"p":"com.lambdaschool.usermodel.services","c":"UseremailService","l":"update(long, String)","url":"update(long,java.lang.String)"},{"p":"com.lambdaschool.usermodel.services","c":"UseremailServiceImpl","l":"update(long, String)","url":"update(long,java.lang.String)"},{"p":"com.lambdaschool.usermodel.services","c":"UserService","l":"update(User, long)","url":"update(com.lambdaschool.usermodel.models.User,long)"},{"p":"com.lambdaschool.usermodel.services","c":"UserServiceImpl","l":"update(User, long)","url":"update(com.lambdaschool.usermodel.models.User,long)"},{"p":"com.lambdaschool.usermodel.controllers","c":"UserController","l":"updateFullUser(User, long)","url":"updateFullUser(com.lambdaschool.usermodel.models.User,long)"},{"p":"com.lambdaschool.usermodel.repository","c":"RoleRepository","l":"updateRoleName(String, long, String)","url":"updateRoleName(java.lang.String,long,java.lang.String)"},{"p":"com.lambdaschool.usermodel.controllers","c":"UserController","l":"updateUser(User, long)","url":"updateUser(com.lambdaschool.usermodel.models.User,long)"},{"p":"com.lambdaschool.usermodel.controllers","c":"UseremailController","l":"updateUserEmail(long, String)","url":"updateUserEmail(long,java.lang.String)"},{"p":"com.lambdaschool.usermodel.models","c":"User","l":"User()","url":"%3Cinit%3E()"},{"p":"com.lambdaschool.usermodel.models","c":"User","l":"User(String, String, String)","url":"%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String)"},{"p":"com.lambdaschool.usermodel.services","c":"UserAuditing","l":"UserAuditing()","url":"%3Cinit%3E()"},{"p":"com.lambdaschool.usermodel.controllers","c":"UserController","l":"UserController()","url":"%3Cinit%3E()"},{"p":"com.lambdaschool.usermodel.models","c":"Useremail","l":"Useremail()","url":"%3Cinit%3E()"},{"p":"com.lambdaschool.usermodel.models","c":"Useremail","l":"Useremail(User, String)","url":"%3Cinit%3E(com.lambdaschool.usermodel.models.User,java.lang.String)"},{"p":"com.lambdaschool.usermodel.controllers","c":"UseremailController","l":"UseremailController()","url":"%3Cinit%3E()"},{"p":"com.lambdaschool.usermodel.services","c":"UseremailServiceImpl","l":"UseremailServiceImpl()","url":"%3Cinit%3E()"},{"p":"com.lambdaschool.usermodel","c":"UserModelApplication","l":"UserModelApplication()","url":"%3Cinit%3E()"},{"p":"com.lambdaschool.usermodel.models","c":"UserRoles","l":"UserRoles()","url":"%3Cinit%3E()"},{"p":"com.lambdaschool.usermodel.models","c":"UserRoles","l":"UserRoles(User, Role)","url":"%3Cinit%3E(com.lambdaschool.usermodel.models.User,com.lambdaschool.usermodel.models.Role)"},{"p":"com.lambdaschool.usermodel.models","c":"UserRolesId","l":"UserRolesId()","url":"%3Cinit%3E()"},{"p":"com.lambdaschool.usermodel.services","c":"UserServiceImpl","l":"UserServiceImpl()","url":"%3Cinit%3E()"}] \ No newline at end of file diff --git a/usermodel-exceptions-initial/javadocs/member-search-index.zip b/usermodel-exceptions-initial/javadocs/member-search-index.zip new file mode 100644 index 0000000000000000000000000000000000000000..00d6d161e92c15bb84840ce918e67500f15d4e42 GIT binary patch literal 1417 zcmZ{kX*|>k7{~vvaTJCzktw@k++-YoqH#2i7{?GfLOBMp#$8B^@L6Ph#uX`9G{WR+ zG{b0Cxh;lBj$vmc3CUth5^cTO_Qigm7tinad7jr_99BS31`rVu0g5OealjAAeajK} zhyZ+yb}ZgMCNNa{G9d_`pc57wNf_~Vapvek4>W6~T~*z$6B(k4#d(*DO~B`s=${oF z0%vuN2Hy#0)a>ufPvv7b#<=%N?}+`Q7A|{R$Vo&&J;U9qN`H{XokHFmKQx zu=M>apm4<`&s83FLmlC06K?hiR4E-fgesBNv9^p#znDqTGBb;cw$aRi=x-G|Zrgr! zIz7i+WXd;XglU=8``PtIH*MLnSY4(v1(2!6%oK-Lq57x1CNOK~(jeH>+v{GC|w*Q;R?@OpE4x-Ii`_G3$5NaXp(1b!v&DEAawKpvJg%7_V`) zHtHY;*W7NR)DvD}@I*lMI%@5T0x-(8?SDb87Mq;poQUGqfGEFN@^cOwcQ4rhp|`0K z^u-jDLFz=CEyjD-975{AdQylCmi1UgZ*^{}ST%5K!xt(!Bas1lTY>DhJj0(D#$BN@ z5Ut&dt5UUfPbADj{0;|l*;UUXIy>5LzRvE-QZh=Y6qgS`LpHNtDF^$@PZ*IZ8O*U( z#y64is368l%&lsW}oIArnm~Xw z#DU_4uG}hvTqU9KNzzd7DRjm5XAq6WvV(9AI3m zjNK>zD4yquyEl(+Q*Pk}c|#4%;Yu-AZWbY<;f<^K+)jMqgty22<2B21n8vgFBkG!( zx#`Yo)?)X9LAF?(Dt?~8Jj~*i$!1Z+>iy5hN+}Hg+MSovVXgn z%(lmpyBHj){9wP?mUj>?nOIQwagdKye5`dY$oo!jK=W7{V)B9>*v(YvYxD9#O(vuz zIx}slR+IvXs9;*v=7PB*EQjP_%u-WHO4QZ<0D@SI-V!Daw5B7Ug4R{;z80?SD?F==-(y=~h|2=A z!k;!PQg3(piACep3q4fVdhI>LeShD-$_T5!*4?CWG#)<+Kj5W!mRPE(s4COtt`5z> zrj1IwJC>$b2OCn^TLkCy^j>JF?R?4%8BUUEV6xE-)n2H!KU(b`aQm4}tNHMCydlRx z3TsrB;`7UKp`=RkA-*^mwd;L$z(M@#rQ;6LT6lLq-dYubl^{zfJ2MbJMeTcZVtw91 z!CxG)CKpH)eWnn3MBImOGD?}_R(`FFzqLj^@|@+kMJMtIch88tJ*>4mOMBQv=vs*P zDSSFU%+{5SL4OgzVTDB|N{6hM1pxqS001~FAHNLnuP%SQeb?oG`9FE$utJdUpM2lO L=G)d5`riHl5V4G) literal 0 HcmV?d00001 diff --git a/usermodel-initial/javadocs/overview-summary.html b/usermodel-exceptions-initial/javadocs/overview-summary.html similarity index 70% rename from usermodel-initial/javadocs/overview-summary.html rename to usermodel-exceptions-initial/javadocs/overview-summary.html index 18f9d60..c6e0e82 100644 --- a/usermodel-initial/javadocs/overview-summary.html +++ b/usermodel-exceptions-initial/javadocs/overview-summary.html @@ -2,17 +2,20 @@ - + Generated Documentation (Untitled) + + + + + - - - +