From ea038ec70c341f3382b9b76d55cee696d83f57cb Mon Sep 17 00:00:00 2001 From: Thomas Peetz Date: Wed, 12 Aug 2026 19:05:06 +0200 Subject: [PATCH] refactor package layout --- .../kontor/comics/views/ArtistViewTest.java | 4 +- .../kontor/comics/views/ArtistformTest.java | 3 +- .../kontor/comics/views/ComicViewTest.java | 4 +- .../comics/views/ComicWorkViewTest.java | 4 +- .../kontor/comics/views/IssueViewTest.java | 4 +- .../comics/views/PublisherViewTest.java | 4 +- .../kontor/comics/views/StoryArcViewTest.java | 4 +- .../comics/views/TradePaperbackViewTest.java | 4 +- .../kontor/comics/views/VolumeViewTest.java | 4 +- .../kontor/comics/views/WorktypeViewTest.java | 4 +- .../views => views/tysc}/CardSetViewTest.java | 6 +- .../views => views/tysc}/CardViewTest.java | 6 +- .../tysc}/FieldPositionViewTest.java | 6 +- .../views => views/tysc}/PlayerViewTest.java | 6 +- .../views => views/tysc}/RoosterViewTest.java | 6 +- .../views => views/tysc}/SportViewTest.java | 6 +- .../views => views/tysc}/TeamViewTest.java | 6 +- .../views => views/tysc}/VendorViewTest.java | 6 +- .../bookshelf/SetupModuleBookshelf.java | 44 ----- .../kontor/comics/SetupModuleComics.java | 60 ------- .../{admin => constants}/AdminConstants.java | 17 +- .../BookshelfConstants.java | 10 +- .../{comics => constants}/ComicConstants.java | 22 +-- .../{media => constants}/MediaConstants.java | 11 +- .../{tysc => constants}/TyscConstants.java | 18 +- .../data => data/admin}/Assignment.java | 4 +- .../data => data/admin}/Permission.java | 6 +- .../{admin/data => data/admin}/Profile.java | 6 +- .../{admin/data => data/admin}/Token.java | 5 +- .../data => data/bookshelf}/Article.java | 4 +- .../bookshelf}/ArticleAuthor.java | 4 +- .../data => data/bookshelf}/Author.java | 4 +- .../data => data/bookshelf}/Book.java | 4 +- .../data => data/bookshelf}/BookAuthor.java | 4 +- .../bookshelf}/BookshelfPublisher.java | 4 +- .../{comics/data => data/comics}/Artist.java | 4 +- .../{comics/data => data/comics}/Comic.java | 4 +- .../data => data/comics}/ComicWork.java | 4 +- .../{comics/data => data/comics}/Issue.java | 4 +- .../data => data/comics}/IssueWork.java | 4 +- .../data => data/comics}/Publisher.java | 5 +- .../data => data/comics}/StoryArc.java | 5 +- .../data => data/comics}/TradePaperback.java | 4 +- .../{comics/data => data/comics}/Volume.java | 4 +- .../data => data/comics}/Worktype.java | 4 +- .../data => data/common}/AbstractEntity.java | 2 +- .../common}/AbstractLinkEntity.java | 2 +- .../data => data/mailclient}/Mail.java | 5 +- .../data => data/mailclient}/MailAccount.java | 4 +- .../data => data/media}/MediaActor.java | 5 +- .../data => data/media}/MediaActorFile.java | 6 +- .../data => data/media}/MediaArticle.java | 5 +- .../{media/data => data/media}/MediaFile.java | 5 +- .../data => data/media}/MediaVideo.java | 4 +- .../kontor/{tysc/data => data/tysc}/Card.java | 4 +- .../{tysc/data => data/tysc}/CardSet.java | 4 +- .../data => data/tysc}/FieldPosition.java | 4 +- .../{tysc/data => data/tysc}/Player.java | 4 +- .../{tysc/data => data/tysc}/Rooster.java | 4 +- .../{tysc/data => data/tysc}/Sport.java | 4 +- .../kontor/{tysc/data => data/tysc}/Team.java | 4 +- .../{tysc/data => data/tysc}/Vendor.java | 4 +- .../integration/routes/AddLinkFromQueue.java | 28 ---- .../integration/routes/QueueMediaLinkAdd.java | 7 +- .../integration/routes/QueueMediaLoFiAdd.java | 3 +- .../routes/QueueMediaVideoAdd.java | 3 +- .../integration/routes/ReadQueueRoute.java | 16 -- .../services/AddLinkProcessor.java | 5 +- .../{admin => properties}/MailProperties.java | 2 +- .../admin}/AssignmentRepository.java | 7 +- .../admin}/MailAccountRepository.java | 5 +- .../admin}/PermissionRepository.java | 5 +- .../admin}/ProfileRepository.java | 5 +- .../bookshelf}/ArticleAuthorRepository.java | 6 +- .../bookshelf}/ArticleRepository.java | 4 +- .../bookshelf}/AuthorRepository.java | 4 +- .../bookshelf}/BookAuthorRepository.java | 6 +- .../bookshelf}/BookRepository.java | 4 +- .../BookshelfPublisherRepository.java | 4 +- .../comics}/ArtistRepository.java | 5 +- .../comics}/ComicRepository.java | 6 +- .../comics}/ComicWorkRepository.java | 8 +- .../comics}/IssueRepository.java | 6 +- .../comics}/IssueWorkRepository.java | 8 +- .../comics}/PublisherRepository.java | 5 +- .../comics}/StoryArcRepository.java | 6 +- .../comics}/TradePaperbackRepository.java | 6 +- .../comics}/VolumeRepository.java | 6 +- .../comics}/WorktypeRepository.java | 5 +- .../media}/MediaActorFileRepository.java | 4 +- .../media}/MediaActorRepository.java | 4 +- .../media}/MediaArticleRepository.java | 4 +- .../media}/MediaFileRepository.java | 4 +- .../media}/MediaVideoRepository.java | 4 +- .../tysc}/CardRepository.java | 11 +- .../tysc}/CardSetRepository.java | 7 +- .../tysc}/FieldPositionRepository.java | 7 +- .../tysc}/PlayerRepository.java | 5 +- .../tysc}/RoosterRepository.java | 11 +- .../tysc}/SportRepository.java | 5 +- .../tysc}/TeamRepository.java | 5 +- .../tysc}/VendorRepository.java | 5 +- .../kontor/security/SecurityConfig.java | 4 +- .../kontor/security/SecurityService.java | 2 +- .../{admin => }/services/AdminService.java | 11 +- .../services/BookshelfService.java | 14 +- .../{tysc => }/services/CardService.java | 14 +- .../{comics => }/services/ComicService.java | 29 +++- .../services/DataManagementService.java | 3 +- .../services/KontorUserDetailsService.java | 34 ++-- .../{admin => }/services/MailService.java | 6 +- .../services/MediaArticleService.java | 6 +- .../services/MediaFileService.java | 16 +- .../services/MediaVideoService.java | 6 +- .../{tysc => }/services/SportService.java | 22 +-- .../{admin => setup}/SetupModuleAdmin.java | 19 ++- .../kontor/setup/SetupModuleBookshelf.java | 23 +++ .../kontor/setup/SetupModuleComics.java | 23 +++ .../{media => setup}/SetupModuleMedia.java | 5 +- .../thpeetz/kontor/setup/SetupModuleTysc.java | 25 +++ .../thpeetz/kontor/tysc/SetupModuleTysc.java | 65 -------- .../{data => }/views/DataManagementView.java | 7 +- .../{mailclient => }/views/EmailView.java | 12 +- .../kontor/{data => }/views/ImportArea.java | 5 +- .../kontor/{data => }/views/UploadArea.java | 2 +- .../views => views/admin}/AdminLayout.java | 8 +- .../views => views/admin}/AssignmentForm.java | 8 +- .../views => views/admin}/AssignmentView.java | 10 +- .../views => views/admin}/LoginView.java | 2 +- .../views => views/admin}/PermissionForm.java | 5 +- .../views => views/admin}/PermissionView.java | 10 +- .../views => views/admin}/ProfileForm.java | 7 +- .../views => views/admin}/ProfileView.java | 11 +- .../admin}/UserProfileView.java | 9 +- .../bookshelf}/ArticleForm.java | 7 +- .../bookshelf}/ArticleView.java | 11 +- .../views => views/bookshelf}/AuthorForm.java | 7 +- .../views => views/bookshelf}/AuthorView.java | 12 +- .../views => views/bookshelf}/BookForm.java | 7 +- .../views => views/bookshelf}/BookView.java | 10 +- .../bookshelf}/BookshelfLayout.java | 8 +- .../bookshelf}/BookshelfPublisherView.java | 10 +- .../bookshelf}/PublisherForm.java | 4 +- .../views => views/comics}/ArtistForm.java | 6 +- .../views => views/comics}/ArtistView.java | 8 +- .../views => views/comics}/ComicForm.java | 8 +- .../views => views/comics}/ComicLayout.java | 8 +- .../views => views/comics}/ComicView.java | 17 +- .../views => views/comics}/ComicWorkForm.java | 10 +- .../views => views/comics}/ComicWorkView.java | 10 +- .../views => views/comics}/IssueForm.java | 13 +- .../views => views/comics}/IssueView.java | 19 ++- .../views => views/comics}/IssueWorkForm.java | 12 +- .../views => views/comics}/IssueWorkView.java | 12 +- .../views => views/comics}/PublisherForm.java | 4 +- .../views => views/comics}/PublisherView.java | 12 +- .../views => views/comics}/StoryArcForm.java | 6 +- .../views => views/comics}/StoryArcView.java | 12 +- .../comics}/TradePaperBackForm.java | 6 +- .../comics}/TradePaperbackView.java | 10 +- .../views => views/comics}/VolumeForm.java | 7 +- .../views => views/comics}/VolumeView.java | 12 +- .../views => views/comics}/WorktypeForm.java | 6 +- .../views => views/comics}/WorktypeView.java | 10 +- .../views => views/common}/AvatarMenuBar.java | 8 +- .../common}/ColumnToggleContextMenu.java | 2 +- .../common}/ComicIssueField.java | 7 +- .../views => views/common}/FilterOption.java | 2 +- .../common}/KontorLayoutUtil.java | 12 +- .../views => views/common}/MainLayout.java | 18 +- .../views => views/common}/MainView.java | 2 +- .../views => views/common}/SearchFilter.java | 2 +- .../common}/SearchFilterField.java | 2 +- .../common}/SeparateMainLayout.java | 4 +- .../views => views/common}/StatusIcon.java | 2 +- .../common}/YearMonthField.java | 2 +- .../media}/MediaActorFileForm.java | 9 +- .../media}/MediaActorFileView.java | 11 +- .../views => views/media}/MediaActorForm.java | 7 +- .../views => views/media}/MediaActorView.java | 13 +- .../media}/MediaArticleForm.java | 5 +- .../media}/MediaArticleView.java | 18 +- .../views => views/media}/MediaFileForm.java | 7 +- .../views => views/media}/MediaFileView.java | 11 +- .../views => views/media}/MediaVideoForm.java | 5 +- .../views => views/media}/MediaVideoView.java | 17 +- .../{tysc/views => views/tysc}/CardForm.java | 8 +- .../views => views/tysc}/CardSetForm.java | 4 +- .../views => views/tysc}/CardSetView.java | 15 +- .../{tysc/views => views/tysc}/CardView.java | 15 +- .../views => views/tysc}/PlayerForm.java | 6 +- .../views => views/tysc}/PlayerView.java | 10 +- .../views => views/tysc}/PositionForm.java | 6 +- .../views => views/tysc}/PositionView.java | 11 +- .../views => views/tysc}/RoosterForm.java | 10 +- .../views => views/tysc}/RoosterView.java | 10 +- .../{tysc/views => views/tysc}/SportForm.java | 4 +- .../{tysc/views => views/tysc}/SportView.java | 10 +- .../{tysc/views => views/tysc}/TeamForm.java | 6 +- .../{tysc/views => views/tysc}/TeamView.java | 10 +- .../views => views/tysc}/TyscLayout.java | 8 +- .../views => views/tysc}/VendorForm.java | 6 +- .../views => views/tysc}/VendorView.java | 10 +- .../ComicConstantsTest.java | 2 +- .../TestBookshelfConstants.java} | 4 +- .../TestComicConstants.java} | 14 +- .../TestMediaConstants.java} | 4 +- .../TestTyscConstants.java} | 4 +- .../bookshelf}/ArticleAuthorTest.java | 22 ++- .../data => data/bookshelf}/ArticleTest.java | 12 +- .../data => data/bookshelf}/AuthorTest.java | 16 +- .../bookshelf}/BookAuthorTest.java | 29 ++-- .../data => data/bookshelf}/BookTest.java | 23 +-- .../bookshelf}/BookshelfPublisherTest.java | 13 +- .../data => data/comics}/ArtistTest.java | 10 +- .../data => data/comics}/ComicTest.java | 18 +- .../data => data/comics}/ComicWorkTest.java | 4 +- .../data => data/comics}/IssueTest.java | 18 +- .../data => data/comics}/PublisherTest.java | 16 +- .../data => data/comics}/StoryArcTest.java | 18 +- .../comics}/TradePaperbackTest.java | 18 +- .../data => data/comics}/VolumeTest.java | 23 ++- .../data => data/comics}/WorktypeTest.java | 24 +-- .../data => data/media}/MediaArticleTest.java | 6 +- .../data => data/media}/MediaFileTest.java | 4 +- .../{tysc/data => data/tysc}/CardSetTest.java | 8 +- .../{tysc/data => data/tysc}/CardTest.java | 8 +- .../data => data/tysc}/FieldPositionTest.java | 8 +- .../{tysc/data => data/tysc}/PlayerTest.java | 8 +- .../{tysc/data => data/tysc}/RoosterTest.java | 8 +- .../{tysc/data => data/tysc}/SportTest.java | 8 +- .../{tysc/data => data/tysc}/TeamTest.java | 10 +- .../{tysc/data => data/tysc}/VendorTest.java | 10 +- .../kontor/media/data/MediaVideoTest.java | 40 ----- .../ArticleAuthorRepositoryTest.java | 34 ++-- .../bookshelf}/ArticleRepositoryTest.java | 20 ++- .../bookshelf}/AuthorRepositoryTest.java | 18 +- .../bookshelf}/BookAuthorRepositoryTest.java | 37 +++-- .../bookshelf}/BookRepositoryTest.java | 39 +++-- .../BookshelfPublisherRepositoryTest.java | 31 ++-- .../comics}/ArtistRepositoryTest.java | 5 +- .../comics}/ComicRepositoryTest.java | 6 +- .../comics}/ComicWorkRepositoryTest.java | 9 +- .../comics}/IssueRepositoryTest.java | 15 +- .../comics}/PublisherRepositoryTest.java | 26 +-- .../comics}/StoryArcRepositoryTest.java | 13 +- .../comics}/TradePaperbackRepositoryTest.java | 29 ++-- .../comics}/VolumeRepositoryTest.java | 26 ++- .../comics}/WorktypeRepositoryTest.java | 5 +- .../tysc}/CardRepositoryTest.java | 11 +- .../tysc}/CardSetRepositoryTest.java | 14 +- .../tysc}/FieldPositionRepositoryTest.java | 26 +-- .../tysc}/PlayerRepositoryTest.java | 5 +- .../tysc}/RoosterRepositoryTest.java | 11 +- .../tysc}/SportRepositoryTest.java | 16 +- .../tysc}/TeamRepositoryTest.java | 14 +- .../tysc}/VendorRepositoryTest.java | 14 +- .../services/BookshelfServiceTest.java | 41 ++--- .../{tysc => }/services/CardServiceTest.java | 50 +++--- .../services/ComicServiceTest.java | 154 +++++++++--------- .../services/MediaArticleServiceTest.java | 10 +- .../services/MediaFileServiceTest.java | 13 +- .../services/MediaVideoServiceTest.java | 11 +- .../{tysc => }/services/SportServiceTest.java | 92 +++++------ 264 files changed, 1458 insertions(+), 1446 deletions(-) rename kontor-spring/src/integrationTest/java/de/thpeetz/kontor/{tysc/views => views/tysc}/CardSetViewTest.java (87%) rename kontor-spring/src/integrationTest/java/de/thpeetz/kontor/{tysc/views => views/tysc}/CardViewTest.java (87%) rename kontor-spring/src/integrationTest/java/de/thpeetz/kontor/{tysc/views => views/tysc}/FieldPositionViewTest.java (87%) rename kontor-spring/src/integrationTest/java/de/thpeetz/kontor/{tysc/views => views/tysc}/PlayerViewTest.java (88%) rename kontor-spring/src/integrationTest/java/de/thpeetz/kontor/{tysc/views => views/tysc}/RoosterViewTest.java (87%) rename kontor-spring/src/integrationTest/java/de/thpeetz/kontor/{tysc/views => views/tysc}/SportViewTest.java (87%) rename kontor-spring/src/integrationTest/java/de/thpeetz/kontor/{tysc/views => views/tysc}/TeamViewTest.java (87%) rename kontor-spring/src/integrationTest/java/de/thpeetz/kontor/{tysc/views => views/tysc}/VendorViewTest.java (87%) delete mode 100644 kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/SetupModuleBookshelf.java delete mode 100644 kontor-spring/src/main/java/de/thpeetz/kontor/comics/SetupModuleComics.java rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin => constants}/AdminConstants.java (83%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf => constants}/BookshelfConstants.java (87%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics => constants}/ComicConstants.java (86%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media => constants}/MediaConstants.java (86%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc => constants}/TyscConstants.java (87%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin/data => data/admin}/Assignment.java (89%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin/data => data/admin}/Permission.java (86%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin/data => data/admin}/Profile.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin/data => data/admin}/Token.java (89%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf/data => data/bookshelf}/Article.java (86%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf/data => data/bookshelf}/ArticleAuthor.java (88%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf/data => data/bookshelf}/Author.java (92%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf/data => data/bookshelf}/Book.java (91%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf/data => data/bookshelf}/BookAuthor.java (88%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf/data => data/bookshelf}/BookshelfPublisher.java (89%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/data => data/comics}/Artist.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/data => data/comics}/Comic.java (96%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/data => data/comics}/ComicWork.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/data => data/comics}/Issue.java (96%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/data => data/comics}/IssueWork.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/data => data/comics}/Publisher.java (94%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/data => data/comics}/StoryArc.java (92%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/data => data/comics}/TradePaperback.java (87%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/data => data/comics}/Volume.java (94%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/data => data/comics}/Worktype.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{common/data => data/common}/AbstractEntity.java (96%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{common/data => data/common}/AbstractLinkEntity.java (96%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{mailclient/data => data/mailclient}/Mail.java (78%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{mailclient/data => data/mailclient}/MailAccount.java (82%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media/data => data/media}/MediaActor.java (88%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media/data => data/media}/MediaActorFile.java (80%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media/data => data/media}/MediaArticle.java (82%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media/data => data/media}/MediaFile.java (89%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media/data => data/media}/MediaVideo.java (88%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/data => data/tysc}/Card.java (94%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/data => data/tysc}/CardSet.java (92%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/data => data/tysc}/FieldPosition.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/data => data/tysc}/Player.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/data => data/tysc}/Rooster.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/data => data/tysc}/Sport.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/data => data/tysc}/Team.java (92%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/data => data/tysc}/Vendor.java (91%) delete mode 100644 kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/AddLinkFromQueue.java delete mode 100644 kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/ReadQueueRoute.java rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin => properties}/MailProperties.java (97%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin/repository => repository/admin}/AssignmentRepository.java (60%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin/repository => repository/admin}/MailAccountRepository.java (60%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin/repository => repository/admin}/PermissionRepository.java (87%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin/repository => repository/admin}/ProfileRepository.java (85%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf/data => repository/bookshelf}/ArticleAuthorRepository.java (58%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf/data => repository/bookshelf}/ArticleRepository.java (83%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf/data => repository/bookshelf}/AuthorRepository.java (86%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf/data => repository/bookshelf}/BookAuthorRepository.java (57%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf/data => repository/bookshelf}/BookRepository.java (87%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf/data => repository/bookshelf}/BookshelfPublisherRepository.java (85%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/repository => repository/comics}/ArtistRepository.java (85%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/repository => repository/comics}/ComicRepository.java (92%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/repository => repository/comics}/ComicWorkRepository.java (69%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/repository => repository/comics}/IssueRepository.java (81%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/repository => repository/comics}/IssueWorkRepository.java (66%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/repository => repository/comics}/PublisherRepository.java (85%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/repository => repository/comics}/StoryArcRepository.java (80%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/repository => repository/comics}/TradePaperbackRepository.java (85%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/repository => repository/comics}/VolumeRepository.java (65%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/repository => repository/comics}/WorktypeRepository.java (85%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media/repository => repository/media}/MediaActorFileRepository.java (62%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media/repository => repository/media}/MediaActorRepository.java (86%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media/repository => repository/media}/MediaArticleRepository.java (85%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media/repository => repository/media}/MediaFileRepository.java (92%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media/repository => repository/media}/MediaVideoRepository.java (85%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/repository => repository/tysc}/CardRepository.java (75%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/repository => repository/tysc}/CardSetRepository.java (81%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/repository => repository/tysc}/FieldPositionRepository.java (84%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/repository => repository/tysc}/PlayerRepository.java (87%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/repository => repository/tysc}/RoosterRepository.java (64%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/repository => repository/tysc}/SportRepository.java (86%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/repository => repository/tysc}/TeamRepository.java (90%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/repository => repository/tysc}/VendorRepository.java (85%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin => }/services/AdminService.java (90%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf => }/services/BookshelfService.java (85%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc => }/services/CardService.java (88%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics => }/services/ComicService.java (91%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{data => }/services/DataManagementService.java (89%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin => }/services/KontorUserDetailsService.java (82%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin => }/services/MailService.java (74%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media => }/services/MediaArticleService.java (89%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media => }/services/MediaFileService.java (92%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media => }/services/MediaVideoService.java (87%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc => }/services/SportService.java (91%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin => setup}/SetupModuleAdmin.java (90%) create mode 100644 kontor-spring/src/main/java/de/thpeetz/kontor/setup/SetupModuleBookshelf.java create mode 100644 kontor-spring/src/main/java/de/thpeetz/kontor/setup/SetupModuleComics.java rename kontor-spring/src/main/java/de/thpeetz/kontor/{media => setup}/SetupModuleMedia.java (85%) create mode 100644 kontor-spring/src/main/java/de/thpeetz/kontor/setup/SetupModuleTysc.java delete mode 100644 kontor-spring/src/main/java/de/thpeetz/kontor/tysc/SetupModuleTysc.java rename kontor-spring/src/main/java/de/thpeetz/kontor/{data => }/views/DataManagementView.java (90%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{mailclient => }/views/EmailView.java (97%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{data => }/views/ImportArea.java (97%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{data => }/views/UploadArea.java (97%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin/views => views/admin}/AdminLayout.java (86%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin/views => views/admin}/AssignmentForm.java (95%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin/views => views/admin}/AssignmentView.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin/views => views/admin}/LoginView.java (97%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin/views => views/admin}/PermissionForm.java (97%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin/views => views/admin}/PermissionView.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin/views => views/admin}/ProfileForm.java (97%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin/views => views/admin}/ProfileView.java (94%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{admin/views => views/admin}/UserProfileView.java (92%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf/views => views/bookshelf}/ArticleForm.java (96%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf/views => views/bookshelf}/ArticleView.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf/views => views/bookshelf}/AuthorForm.java (96%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf/views => views/bookshelf}/AuthorView.java (92%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf/views => views/bookshelf}/BookForm.java (96%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf/views => views/bookshelf}/BookView.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf/views => views/bookshelf}/BookshelfLayout.java (86%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf/views => views/bookshelf}/BookshelfPublisherView.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{bookshelf/views => views/bookshelf}/PublisherForm.java (97%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/views => views/comics}/ArtistForm.java (96%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/views => views/comics}/ArtistView.java (95%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/views => views/comics}/ComicForm.java (96%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/views => views/comics}/ComicLayout.java (88%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/views => views/comics}/ComicView.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/views => views/comics}/ComicWorkForm.java (94%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/views => views/comics}/ComicWorkView.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/views => views/comics}/IssueForm.java (94%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/views => views/comics}/IssueView.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/views => views/comics}/IssueWorkForm.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/views => views/comics}/IssueWorkView.java (92%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/views => views/comics}/PublisherForm.java (97%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/views => views/comics}/PublisherView.java (94%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/views => views/comics}/StoryArcForm.java (96%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/views => views/comics}/StoryArcView.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/views => views/comics}/TradePaperBackForm.java (96%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/views => views/comics}/TradePaperbackView.java (94%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/views => views/comics}/VolumeForm.java (95%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/views => views/comics}/VolumeView.java (92%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/views => views/comics}/WorktypeForm.java (96%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{comics/views => views/comics}/WorktypeView.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{common/views => views/common}/AvatarMenuBar.java (88%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{common/views => views/common}/ColumnToggleContextMenu.java (96%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{common/views => views/common}/ComicIssueField.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{common/views => views/common}/FilterOption.java (89%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{common/views => views/common}/KontorLayoutUtil.java (92%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{common/views => views/common}/MainLayout.java (89%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{common/views => views/common}/MainView.java (92%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{common/views => views/common}/SearchFilter.java (94%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{common/views => views/common}/SearchFilterField.java (98%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{common/views => views/common}/SeparateMainLayout.java (89%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{common/views => views/common}/StatusIcon.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{common/views => views/common}/YearMonthField.java (97%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media/views => views/media}/MediaActorFileForm.java (95%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media/views => views/media}/MediaActorFileView.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media/views => views/media}/MediaActorForm.java (96%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media/views => views/media}/MediaActorView.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media/views => views/media}/MediaArticleForm.java (97%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media/views => views/media}/MediaArticleView.java (90%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media/views => views/media}/MediaFileForm.java (96%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media/views => views/media}/MediaFileView.java (94%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media/views => views/media}/MediaVideoForm.java (97%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{media/views => views/media}/MediaVideoView.java (92%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/views => views/tysc}/CardForm.java (95%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/views => views/tysc}/CardSetForm.java (97%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/views => views/tysc}/CardSetView.java (94%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/views => views/tysc}/CardView.java (94%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/views => views/tysc}/PlayerForm.java (96%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/views => views/tysc}/PlayerView.java (94%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/views => views/tysc}/PositionForm.java (96%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/views => views/tysc}/PositionView.java (94%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/views => views/tysc}/RoosterForm.java (94%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/views => views/tysc}/RoosterView.java (93%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/views => views/tysc}/SportForm.java (97%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/views => views/tysc}/SportView.java (94%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/views => views/tysc}/TeamForm.java (96%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/views => views/tysc}/TeamView.java (94%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/views => views/tysc}/TyscLayout.java (88%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/views => views/tysc}/VendorForm.java (96%) rename kontor-spring/src/main/java/de/thpeetz/kontor/{tysc/views => views/tysc}/VendorView.java (94%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{comics => constants}/ComicConstantsTest.java (89%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{bookshelf/TestConstants.java => constants/TestBookshelfConstants.java} (91%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{comics/TestConstants.java => constants/TestComicConstants.java} (89%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{media/TestConstants.java => constants/TestMediaConstants.java} (50%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{tysc/TestConstants.java => constants/TestTyscConstants.java} (96%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{bookshelf/data => data/bookshelf}/ArticleAuthorTest.java (72%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{bookshelf/data => data/bookshelf}/ArticleTest.java (74%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{bookshelf/data => data/bookshelf}/AuthorTest.java (66%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{bookshelf/data => data/bookshelf}/BookAuthorTest.java (68%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{bookshelf/data => data/bookshelf}/BookTest.java (63%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{bookshelf/data => data/bookshelf}/BookshelfPublisherTest.java (70%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{comics/data => data/comics}/ArtistTest.java (84%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{comics/data => data/comics}/ComicTest.java (76%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{comics/data => data/comics}/ComicWorkTest.java (84%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{comics/data => data/comics}/IssueTest.java (71%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{comics/data => data/comics}/PublisherTest.java (70%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{comics/data => data/comics}/StoryArcTest.java (70%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{comics/data => data/comics}/TradePaperbackTest.java (71%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{comics/data => data/comics}/VolumeTest.java (67%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{comics/data => data/comics}/WorktypeTest.java (73%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{media/data => data/media}/MediaArticleTest.java (84%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{media/data => data/media}/MediaFileTest.java (91%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{tysc/data => data/tysc}/CardSetTest.java (60%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{tysc/data => data/tysc}/CardTest.java (60%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{tysc/data => data/tysc}/FieldPositionTest.java (83%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{tysc/data => data/tysc}/PlayerTest.java (87%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{tysc/data => data/tysc}/RoosterTest.java (85%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{tysc/data => data/tysc}/SportTest.java (84%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{tysc/data => data/tysc}/TeamTest.java (83%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{tysc/data => data/tysc}/VendorTest.java (80%) delete mode 100644 kontor-spring/src/test/java/de/thpeetz/kontor/media/data/MediaVideoTest.java rename kontor-spring/src/test/java/de/thpeetz/kontor/{bookshelf/data => repository/bookshelf}/ArticleAuthorRepositoryTest.java (56%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{bookshelf/data => repository/bookshelf}/ArticleRepositoryTest.java (59%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{bookshelf/data => repository/bookshelf}/AuthorRepositoryTest.java (72%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{bookshelf/data => repository/bookshelf}/BookAuthorRepositoryTest.java (62%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{bookshelf/data => repository/bookshelf}/BookRepositoryTest.java (50%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{bookshelf/data => repository/bookshelf}/BookshelfPublisherRepositoryTest.java (57%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{comics/repository => repository/comics}/ArtistRepositoryTest.java (95%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{comics/repository => repository/comics}/ComicRepositoryTest.java (92%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{comics/repository => repository/comics}/ComicWorkRepositoryTest.java (91%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{comics/repository => repository/comics}/IssueRepositoryTest.java (67%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{comics/repository => repository/comics}/PublisherRepositoryTest.java (65%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{comics/repository => repository/comics}/StoryArcRepositoryTest.java (72%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{comics/repository => repository/comics}/TradePaperbackRepositoryTest.java (54%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{comics/repository => repository/comics}/VolumeRepositoryTest.java (62%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{comics/repository => repository/comics}/WorktypeRepositoryTest.java (92%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{tysc/repository => repository/tysc}/CardRepositoryTest.java (82%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{tysc/repository => repository/tysc}/CardSetRepositoryTest.java (72%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{tysc/repository => repository/tysc}/FieldPositionRepositoryTest.java (59%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{tysc/repository => repository/tysc}/PlayerRepositoryTest.java (91%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{tysc/repository => repository/tysc}/RoosterRepositoryTest.java (80%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{tysc/repository => repository/tysc}/SportRepositoryTest.java (58%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{tysc/repository => repository/tysc}/TeamRepositoryTest.java (61%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{tysc/repository => repository/tysc}/VendorRepositoryTest.java (67%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{bookshelf => }/services/BookshelfServiceTest.java (56%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{tysc => }/services/CardServiceTest.java (61%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{comics => }/services/ComicServiceTest.java (54%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{media => }/services/MediaArticleServiceTest.java (86%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{media => }/services/MediaFileServiceTest.java (83%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{media => }/services/MediaVideoServiceTest.java (84%) rename kontor-spring/src/test/java/de/thpeetz/kontor/{tysc => }/services/SportServiceTest.java (52%) diff --git a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/ArtistViewTest.java b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/ArtistViewTest.java index e2eec07..b9874b1 100644 --- a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/ArtistViewTest.java +++ b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/ArtistViewTest.java @@ -11,7 +11,9 @@ import org.springframework.boot.test.context.SpringBootTest; import com.vaadin.flow.component.grid.Grid; -import de.thpeetz.kontor.comics.data.Artist; +import de.thpeetz.kontor.data.comics.Artist; +import de.thpeetz.kontor.views.comics.ArtistForm; +import de.thpeetz.kontor.views.comics.ArtistView; @SpringBootTest class ArtistViewTest { diff --git a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/ArtistformTest.java b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/ArtistformTest.java index a6aea11..395f16a 100644 --- a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/ArtistformTest.java +++ b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/ArtistformTest.java @@ -8,7 +8,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import de.thpeetz.kontor.comics.data.Artist; +import de.thpeetz.kontor.data.comics.Artist; +import de.thpeetz.kontor.views.comics.ArtistForm; @SpringBootTest class ArtistformTest { diff --git a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/ComicViewTest.java b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/ComicViewTest.java index 084d64e..e31f9b7 100644 --- a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/ComicViewTest.java +++ b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/ComicViewTest.java @@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest; import com.vaadin.flow.component.grid.Grid; -import de.thpeetz.kontor.comics.data.Comic; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.views.comics.ComicForm; +import de.thpeetz.kontor.views.comics.ComicView; @SpringBootTest public class ComicViewTest { diff --git a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/ComicWorkViewTest.java b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/ComicWorkViewTest.java index 0d3113e..891963f 100644 --- a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/ComicWorkViewTest.java +++ b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/ComicWorkViewTest.java @@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest; import com.vaadin.flow.component.grid.Grid; -import de.thpeetz.kontor.comics.data.ComicWork; +import de.thpeetz.kontor.data.comics.ComicWork; +import de.thpeetz.kontor.views.comics.ComicWorkForm; +import de.thpeetz.kontor.views.comics.ComicWorkView; @SpringBootTest class ComicWorkViewTest { diff --git a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/IssueViewTest.java b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/IssueViewTest.java index 089f8f5..baaa465 100644 --- a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/IssueViewTest.java +++ b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/IssueViewTest.java @@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest; import com.vaadin.flow.component.grid.Grid; -import de.thpeetz.kontor.comics.data.Issue; +import de.thpeetz.kontor.data.comics.Issue; +import de.thpeetz.kontor.views.comics.IssueForm; +import de.thpeetz.kontor.views.comics.IssueView; @SpringBootTest public class IssueViewTest { diff --git a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/PublisherViewTest.java b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/PublisherViewTest.java index b3bab80..174221a 100644 --- a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/PublisherViewTest.java +++ b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/PublisherViewTest.java @@ -11,7 +11,9 @@ import org.springframework.boot.test.context.SpringBootTest; import com.vaadin.flow.component.grid.Grid; -import de.thpeetz.kontor.comics.data.Publisher; +import de.thpeetz.kontor.data.comics.Publisher; +import de.thpeetz.kontor.views.comics.PublisherForm; +import de.thpeetz.kontor.views.comics.PublisherView; @SpringBootTest class PublisherViewTest { diff --git a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/StoryArcViewTest.java b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/StoryArcViewTest.java index 56f9c34..2375f43 100644 --- a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/StoryArcViewTest.java +++ b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/StoryArcViewTest.java @@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest; import com.vaadin.flow.component.grid.Grid; -import de.thpeetz.kontor.comics.data.StoryArc; +import de.thpeetz.kontor.data.comics.StoryArc; +import de.thpeetz.kontor.views.comics.StoryArcForm; +import de.thpeetz.kontor.views.comics.StoryArcView; @SpringBootTest class StoryArcViewTest { diff --git a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/TradePaperbackViewTest.java b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/TradePaperbackViewTest.java index e6b67c7..4652018 100644 --- a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/TradePaperbackViewTest.java +++ b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/TradePaperbackViewTest.java @@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest; import com.vaadin.flow.component.grid.Grid; -import de.thpeetz.kontor.comics.data.TradePaperback; +import de.thpeetz.kontor.data.comics.TradePaperback; +import de.thpeetz.kontor.views.comics.TradePaperBackForm; +import de.thpeetz.kontor.views.comics.TradePaperbackView; @SpringBootTest class TradePaperbackViewTest { diff --git a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/VolumeViewTest.java b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/VolumeViewTest.java index 15e8d15..eaf0d73 100644 --- a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/VolumeViewTest.java +++ b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/VolumeViewTest.java @@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest; import com.vaadin.flow.component.grid.Grid; -import de.thpeetz.kontor.comics.data.Volume; +import de.thpeetz.kontor.data.comics.Volume; +import de.thpeetz.kontor.views.comics.VolumeForm; +import de.thpeetz.kontor.views.comics.VolumeView; @SpringBootTest class VolumeViewTest { diff --git a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/WorktypeViewTest.java b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/WorktypeViewTest.java index 2f15672..05bf459 100644 --- a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/WorktypeViewTest.java +++ b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/comics/views/WorktypeViewTest.java @@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest; import com.vaadin.flow.component.grid.Grid; -import de.thpeetz.kontor.comics.data.Worktype; +import de.thpeetz.kontor.data.comics.Worktype; +import de.thpeetz.kontor.views.comics.WorktypeForm; +import de.thpeetz.kontor.views.comics.WorktypeView; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/CardSetViewTest.java b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/CardSetViewTest.java similarity index 87% rename from kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/CardSetViewTest.java rename to kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/CardSetViewTest.java index 40d3fbb..980c236 100644 --- a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/CardSetViewTest.java +++ b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/CardSetViewTest.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest; import com.vaadin.flow.component.grid.Grid; -import de.thpeetz.kontor.tysc.data.CardSet; +import de.thpeetz.kontor.data.tysc.CardSet; +import de.thpeetz.kontor.views.tysc.CardSetForm; +import de.thpeetz.kontor.views.tysc.CardSetView; @SpringBootTest class CardSetViewTest { diff --git a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/CardViewTest.java b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/CardViewTest.java similarity index 87% rename from kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/CardViewTest.java rename to kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/CardViewTest.java index 0a5a3ed..d2a70ee 100644 --- a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/CardViewTest.java +++ b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/CardViewTest.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest; import com.vaadin.flow.component.grid.Grid; -import de.thpeetz.kontor.tysc.data.Card; +import de.thpeetz.kontor.data.tysc.Card; +import de.thpeetz.kontor.views.tysc.CardForm; +import de.thpeetz.kontor.views.tysc.CardView; @SpringBootTest class CardViewTest { diff --git a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/FieldPositionViewTest.java b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/FieldPositionViewTest.java similarity index 87% rename from kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/FieldPositionViewTest.java rename to kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/FieldPositionViewTest.java index 737b74d..845044e 100644 --- a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/FieldPositionViewTest.java +++ b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/FieldPositionViewTest.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest; import com.vaadin.flow.component.grid.Grid; -import de.thpeetz.kontor.tysc.data.FieldPosition; +import de.thpeetz.kontor.data.tysc.FieldPosition; +import de.thpeetz.kontor.views.tysc.PositionForm; +import de.thpeetz.kontor.views.tysc.PositionView; @SpringBootTest class FieldPositionViewTest { diff --git a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/PlayerViewTest.java b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/PlayerViewTest.java similarity index 88% rename from kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/PlayerViewTest.java rename to kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/PlayerViewTest.java index 5e7d640..d93da8d 100644 --- a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/PlayerViewTest.java +++ b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/PlayerViewTest.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest; import com.vaadin.flow.component.grid.Grid; -import de.thpeetz.kontor.tysc.data.Player; +import de.thpeetz.kontor.data.tysc.Player; +import de.thpeetz.kontor.views.tysc.PlayerForm; +import de.thpeetz.kontor.views.tysc.PlayerView; @SpringBootTest class PlayerViewTest { diff --git a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/RoosterViewTest.java b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/RoosterViewTest.java similarity index 87% rename from kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/RoosterViewTest.java rename to kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/RoosterViewTest.java index d04f306..c900305 100644 --- a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/RoosterViewTest.java +++ b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/RoosterViewTest.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest; import com.vaadin.flow.component.grid.Grid; -import de.thpeetz.kontor.tysc.data.Rooster; +import de.thpeetz.kontor.data.tysc.Rooster; +import de.thpeetz.kontor.views.tysc.RoosterForm; +import de.thpeetz.kontor.views.tysc.RoosterView; @SpringBootTest class RoosterViewTest { diff --git a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/SportViewTest.java b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/SportViewTest.java similarity index 87% rename from kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/SportViewTest.java rename to kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/SportViewTest.java index ca86d0a..ec83ff3 100644 --- a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/SportViewTest.java +++ b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/SportViewTest.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest; import com.vaadin.flow.component.grid.Grid; -import de.thpeetz.kontor.tysc.data.Sport; +import de.thpeetz.kontor.data.tysc.Sport; +import de.thpeetz.kontor.views.tysc.SportForm; +import de.thpeetz.kontor.views.tysc.SportView; @SpringBootTest class SportViewTest { diff --git a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/TeamViewTest.java b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/TeamViewTest.java similarity index 87% rename from kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/TeamViewTest.java rename to kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/TeamViewTest.java index da0ea19..9e99a27 100644 --- a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/TeamViewTest.java +++ b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/TeamViewTest.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest; import com.vaadin.flow.component.grid.Grid; -import de.thpeetz.kontor.tysc.data.Team; +import de.thpeetz.kontor.data.tysc.Team; +import de.thpeetz.kontor.views.tysc.TeamForm; +import de.thpeetz.kontor.views.tysc.TeamView; @SpringBootTest class TeamViewTest { diff --git a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/VendorViewTest.java b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/VendorViewTest.java similarity index 87% rename from kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/VendorViewTest.java rename to kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/VendorViewTest.java index ef80d22..9e99cee 100644 --- a/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/tysc/views/VendorViewTest.java +++ b/kontor-spring/src/integrationTest/java/de/thpeetz/kontor/views/tysc/VendorViewTest.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -13,7 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest; import com.vaadin.flow.component.grid.Grid; -import de.thpeetz.kontor.tysc.data.Vendor; +import de.thpeetz.kontor.data.tysc.Vendor; +import de.thpeetz.kontor.views.tysc.VendorForm; +import de.thpeetz.kontor.views.tysc.VendorView; @SpringBootTest class VendorViewTest { diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/SetupModuleBookshelf.java b/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/SetupModuleBookshelf.java deleted file mode 100644 index c874300..0000000 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/SetupModuleBookshelf.java +++ /dev/null @@ -1,44 +0,0 @@ -package de.thpeetz.kontor.bookshelf; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.context.event.ContextRefreshedEvent; -import org.springframework.stereotype.Component; - -import de.thpeetz.kontor.bookshelf.data.ArticleAuthorRepository; -import de.thpeetz.kontor.bookshelf.data.AuthorRepository; -import de.thpeetz.kontor.bookshelf.data.BookAuthorRepository; -import de.thpeetz.kontor.bookshelf.data.BookRepository; -import de.thpeetz.kontor.bookshelf.data.BookshelfPublisherRepository; -import lombok.extern.slf4j.Slf4j; - -@Slf4j -@Component -public class SetupModuleBookshelf implements ApplicationListener { - - boolean alreadySetup = false; - - @Autowired - private BookshelfPublisherRepository publisherRepository; - - @Autowired - private AuthorRepository authorRepository; - - @Autowired - private ArticleAuthorRepository articleAuthorRepository; - - @Autowired - private BookRepository bookRepository; - - @Autowired - private BookAuthorRepository bookAuthorRepository; - - @Override - public void onApplicationEvent(ContextRefreshedEvent event) { - if (alreadySetup) { - log.info("SetupModuleBookshelf already executed, skipping"); - return; - } - log.info("Set up Bookshelf data"); - } -} diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/SetupModuleComics.java b/kontor-spring/src/main/java/de/thpeetz/kontor/comics/SetupModuleComics.java deleted file mode 100644 index 16d716e..0000000 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/SetupModuleComics.java +++ /dev/null @@ -1,60 +0,0 @@ -package de.thpeetz.kontor.comics; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.context.event.ContextRefreshedEvent; -import org.springframework.stereotype.Component; - -import de.thpeetz.kontor.comics.repository.ArtistRepository; -import de.thpeetz.kontor.comics.repository.ComicRepository; -import de.thpeetz.kontor.comics.repository.ComicWorkRepository; -import de.thpeetz.kontor.comics.repository.IssueRepository; -import de.thpeetz.kontor.comics.repository.PublisherRepository; -import de.thpeetz.kontor.comics.repository.StoryArcRepository; -import de.thpeetz.kontor.comics.repository.TradePaperbackRepository; -import de.thpeetz.kontor.comics.repository.VolumeRepository; -import de.thpeetz.kontor.comics.repository.WorktypeRepository; -import lombok.extern.slf4j.Slf4j; - -@Slf4j -@Component -public class SetupModuleComics implements ApplicationListener { - - boolean alreadySetup = false; - - @Autowired - private PublisherRepository publisherRepository; - - @Autowired - private ArtistRepository artistRepository; - - @Autowired - private WorktypeRepository worktypeRepository; - - @Autowired - private ComicRepository comicRepository; - - @Autowired - private ComicWorkRepository comicWorkRepository; - - @Autowired - private StoryArcRepository storyArcRepository; - - @Autowired - private TradePaperbackRepository tradePaperbackRepository; - - @Autowired - private IssueRepository issueRepository; - - @Autowired - private VolumeRepository volumeRepository; - - @Override - public void onApplicationEvent(ContextRefreshedEvent event) { - if (alreadySetup) { - log.info("SetupModuleComics already executed, skipping"); - return; - } - log.info("Set up Comics data"); - } -} diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/AdminConstants.java b/kontor-spring/src/main/java/de/thpeetz/kontor/constants/AdminConstants.java similarity index 83% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/AdminConstants.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/constants/AdminConstants.java index 5beefb1..2882fb2 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/AdminConstants.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/constants/AdminConstants.java @@ -1,16 +1,15 @@ -package de.thpeetz.kontor.admin; +package de.thpeetz.kontor.constants; import com.vaadin.flow.component.icon.VaadinIcon; import com.vaadin.flow.component.sidenav.SideNavItem; import com.vaadin.flow.router.RouterLink; -import de.thpeetz.kontor.admin.views.AssignmentView; -import de.thpeetz.kontor.admin.views.PermissionView; -import de.thpeetz.kontor.admin.views.ProfileView; -import de.thpeetz.kontor.comics.ComicConstants; -import de.thpeetz.kontor.comics.views.ComicWorkView; -import de.thpeetz.kontor.comics.views.IssueWorkView; -import de.thpeetz.kontor.media.MediaConstants; -import de.thpeetz.kontor.media.views.MediaActorFileView; + +import de.thpeetz.kontor.views.admin.AssignmentView; +import de.thpeetz.kontor.views.admin.PermissionView; +import de.thpeetz.kontor.views.admin.ProfileView; +import de.thpeetz.kontor.views.comics.ComicWorkView; +import de.thpeetz.kontor.views.comics.IssueWorkView; +import de.thpeetz.kontor.views.media.MediaActorFileView; public class AdminConstants { diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/BookshelfConstants.java b/kontor-spring/src/main/java/de/thpeetz/kontor/constants/BookshelfConstants.java similarity index 87% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/BookshelfConstants.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/constants/BookshelfConstants.java index 63a1acd..aacb136 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/BookshelfConstants.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/constants/BookshelfConstants.java @@ -1,13 +1,13 @@ -package de.thpeetz.kontor.bookshelf; +package de.thpeetz.kontor.constants; import com.vaadin.flow.component.icon.VaadinIcon; import com.vaadin.flow.component.sidenav.SideNavItem; import com.vaadin.flow.router.RouterLink; -import de.thpeetz.kontor.bookshelf.views.ArticleView; -import de.thpeetz.kontor.bookshelf.views.AuthorView; -import de.thpeetz.kontor.bookshelf.views.BookView; -import de.thpeetz.kontor.bookshelf.views.BookshelfPublisherView; +import de.thpeetz.kontor.views.bookshelf.ArticleView; +import de.thpeetz.kontor.views.bookshelf.AuthorView; +import de.thpeetz.kontor.views.bookshelf.BookView; +import de.thpeetz.kontor.views.bookshelf.BookshelfPublisherView; public class BookshelfConstants { diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/ComicConstants.java b/kontor-spring/src/main/java/de/thpeetz/kontor/constants/ComicConstants.java similarity index 86% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/ComicConstants.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/constants/ComicConstants.java index 2c6c559..15a5150 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/ComicConstants.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/constants/ComicConstants.java @@ -1,20 +1,20 @@ -package de.thpeetz.kontor.comics; +package de.thpeetz.kontor.constants; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.icon.VaadinIcon; import com.vaadin.flow.component.sidenav.SideNavItem; import com.vaadin.flow.router.RouterLink; -import de.thpeetz.kontor.comics.views.ArtistView; -import de.thpeetz.kontor.comics.views.ComicView; -import de.thpeetz.kontor.comics.views.ComicWorkView; -import de.thpeetz.kontor.comics.views.IssueView; -import de.thpeetz.kontor.comics.views.IssueWorkView; -import de.thpeetz.kontor.comics.views.PublisherView; -import de.thpeetz.kontor.comics.views.StoryArcView; -import de.thpeetz.kontor.comics.views.TradePaperbackView; -import de.thpeetz.kontor.comics.views.VolumeView; -import de.thpeetz.kontor.comics.views.WorktypeView; +import de.thpeetz.kontor.views.comics.ArtistView; +import de.thpeetz.kontor.views.comics.ComicView; +import de.thpeetz.kontor.views.comics.ComicWorkView; +import de.thpeetz.kontor.views.comics.IssueView; +import de.thpeetz.kontor.views.comics.IssueWorkView; +import de.thpeetz.kontor.views.comics.PublisherView; +import de.thpeetz.kontor.views.comics.StoryArcView; +import de.thpeetz.kontor.views.comics.TradePaperbackView; +import de.thpeetz.kontor.views.comics.VolumeView; +import de.thpeetz.kontor.views.comics.WorktypeView; /** * The {@code ComicConstants} class contains constant values related to comics. diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/MediaConstants.java b/kontor-spring/src/main/java/de/thpeetz/kontor/constants/MediaConstants.java similarity index 86% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/MediaConstants.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/constants/MediaConstants.java index 76fc9bc..27e5625 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/MediaConstants.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/constants/MediaConstants.java @@ -1,11 +1,12 @@ -package de.thpeetz.kontor.media; +package de.thpeetz.kontor.constants; import com.vaadin.flow.component.icon.VaadinIcon; import com.vaadin.flow.component.sidenav.SideNavItem; -import de.thpeetz.kontor.media.views.MediaActorView; -import de.thpeetz.kontor.media.views.MediaArticleView; -import de.thpeetz.kontor.media.views.MediaFileView; -import de.thpeetz.kontor.media.views.MediaVideoView; + +import de.thpeetz.kontor.views.media.MediaActorView; +import de.thpeetz.kontor.views.media.MediaArticleView; +import de.thpeetz.kontor.views.media.MediaFileView; +import de.thpeetz.kontor.views.media.MediaVideoView; import java.util.ArrayList; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/TyscConstants.java b/kontor-spring/src/main/java/de/thpeetz/kontor/constants/TyscConstants.java similarity index 87% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/TyscConstants.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/constants/TyscConstants.java index cc41c93..42ec5bb 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/TyscConstants.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/constants/TyscConstants.java @@ -1,17 +1,17 @@ -package de.thpeetz.kontor.tysc; +package de.thpeetz.kontor.constants; import com.vaadin.flow.component.icon.VaadinIcon; import com.vaadin.flow.component.sidenav.SideNavItem; import com.vaadin.flow.router.RouterLink; -import de.thpeetz.kontor.tysc.views.CardSetView; -import de.thpeetz.kontor.tysc.views.CardView; -import de.thpeetz.kontor.tysc.views.PlayerView; -import de.thpeetz.kontor.tysc.views.PositionView; -import de.thpeetz.kontor.tysc.views.RoosterView; -import de.thpeetz.kontor.tysc.views.SportView; -import de.thpeetz.kontor.tysc.views.TeamView; -import de.thpeetz.kontor.tysc.views.VendorView; +import de.thpeetz.kontor.views.tysc.CardSetView; +import de.thpeetz.kontor.views.tysc.CardView; +import de.thpeetz.kontor.views.tysc.PlayerView; +import de.thpeetz.kontor.views.tysc.PositionView; +import de.thpeetz.kontor.views.tysc.RoosterView; +import de.thpeetz.kontor.views.tysc.SportView; +import de.thpeetz.kontor.views.tysc.TeamView; +import de.thpeetz.kontor.views.tysc.VendorView; /** * The {@code TyscConstants} class contains constant values related to tysc. diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/data/Assignment.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/admin/Assignment.java similarity index 89% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/data/Assignment.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/admin/Assignment.java index 0f1f3ab..1951028 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/data/Assignment.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/admin/Assignment.java @@ -1,6 +1,6 @@ -package de.thpeetz.kontor.admin.data; +package de.thpeetz.kontor.data.admin; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.persistence.Entity; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/data/Permission.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/admin/Permission.java similarity index 86% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/data/Permission.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/admin/Permission.java index d5d27a0..3c77b10 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/data/Permission.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/admin/Permission.java @@ -1,6 +1,5 @@ -package de.thpeetz.kontor.admin.data; +package de.thpeetz.kontor.data.admin; -import de.thpeetz.kontor.common.data.AbstractEntity; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.OneToMany; @@ -11,6 +10,9 @@ import lombok.ToString; import lombok.extern.slf4j.Slf4j; import javax.annotation.Nullable; + +import de.thpeetz.kontor.data.common.AbstractEntity; + import java.util.List; @Slf4j diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/data/Profile.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/admin/Profile.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/data/Profile.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/admin/Profile.java index 8773fb5..00f88fb 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/data/Profile.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/admin/Profile.java @@ -1,6 +1,5 @@ -package de.thpeetz.kontor.admin.data; +package de.thpeetz.kontor.data.admin; -import de.thpeetz.kontor.common.data.AbstractEntity; import jakarta.persistence.*; import jakarta.validation.constraints.NotEmpty; import lombok.Getter; @@ -9,6 +8,9 @@ import lombok.ToString; import lombok.extern.slf4j.Slf4j; import javax.annotation.Nullable; + +import de.thpeetz.kontor.data.common.AbstractEntity; + import java.util.LinkedList; import java.util.List; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/data/Token.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/admin/Token.java similarity index 89% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/data/Token.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/admin/Token.java index afd4167..6fa77cc 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/data/Token.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/admin/Token.java @@ -1,6 +1,5 @@ -package de.thpeetz.kontor.admin.data; +package de.thpeetz.kontor.data.admin; -import de.thpeetz.kontor.common.data.AbstractEntity; import jakarta.persistence.Entity; import jakarta.persistence.Index; import jakarta.persistence.JoinColumn; @@ -14,6 +13,8 @@ import lombok.ToString; import lombok.extern.slf4j.Slf4j; import java.util.Date; +import de.thpeetz.kontor.data.common.AbstractEntity; + @Slf4j @Getter @Setter diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/Article.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/Article.java similarity index 86% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/Article.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/Article.java index 3ee6a16..ed37e68 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/Article.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/Article.java @@ -1,9 +1,9 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.data.bookshelf; import java.util.LinkedList; import java.util.List; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.annotation.Nullable; import jakarta.persistence.*; import jakarta.validation.constraints.NotEmpty; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/ArticleAuthor.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/ArticleAuthor.java similarity index 88% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/ArticleAuthor.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/ArticleAuthor.java index c2b3851..df9118e 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/ArticleAuthor.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/ArticleAuthor.java @@ -1,6 +1,6 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.data.bookshelf; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.persistence.Entity; import jakarta.persistence.Index; import jakarta.persistence.JoinColumn; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/Author.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/Author.java similarity index 92% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/Author.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/Author.java index 42d83e0..caf4e1e 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/Author.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/Author.java @@ -1,9 +1,9 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.data.bookshelf; import java.util.LinkedList; import java.util.List; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.annotation.Nullable; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/Book.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/Book.java similarity index 91% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/Book.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/Book.java index e0f6782..469125c 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/Book.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/Book.java @@ -1,11 +1,11 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.data.bookshelf; import java.util.LinkedList; import java.util.List; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.annotation.Nullable; import jakarta.persistence.*; import jakarta.validation.constraints.NotEmpty; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/BookAuthor.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/BookAuthor.java similarity index 88% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/BookAuthor.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/BookAuthor.java index 86a0e10..1ce09e9 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/BookAuthor.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/BookAuthor.java @@ -1,6 +1,6 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.data.bookshelf; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.persistence.Entity; import jakarta.persistence.Index; import jakarta.persistence.JoinColumn; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/BookshelfPublisher.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/BookshelfPublisher.java similarity index 89% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/BookshelfPublisher.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/BookshelfPublisher.java index da97d7a..fddede6 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/BookshelfPublisher.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/bookshelf/BookshelfPublisher.java @@ -1,9 +1,9 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.data.bookshelf; import java.util.LinkedList; import java.util.List; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.annotation.Nullable; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/Artist.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Artist.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/Artist.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Artist.java index 8e14329..932257e 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/Artist.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Artist.java @@ -1,9 +1,9 @@ -package de.thpeetz.kontor.comics.data; +package de.thpeetz.kontor.data.comics; import java.util.LinkedList; import java.util.List; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import io.micrometer.common.lang.Nullable; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/Comic.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Comic.java similarity index 96% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/Comic.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Comic.java index d20ea37..28bc7b7 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/Comic.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Comic.java @@ -1,11 +1,11 @@ -package de.thpeetz.kontor.comics.data; +package de.thpeetz.kontor.data.comics; import java.util.LinkedList; import java.util.List; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.annotation.Nullable; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/ComicWork.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/ComicWork.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/ComicWork.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/ComicWork.java index 840f93c..b8ddfb7 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/ComicWork.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/ComicWork.java @@ -1,6 +1,6 @@ -package de.thpeetz.kontor.comics.data; +package de.thpeetz.kontor.data.comics; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.persistence.Entity; import jakarta.persistence.Index; import jakarta.persistence.JoinColumn; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/Issue.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Issue.java similarity index 96% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/Issue.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Issue.java index 9d97320..baa7718 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/Issue.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Issue.java @@ -1,8 +1,8 @@ -package de.thpeetz.kontor.comics.data; +package de.thpeetz.kontor.data.comics; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import de.thpeetz.kontor.common.data.*; +import de.thpeetz.kontor.data.common.AbstractEntity; import io.hypersistence.utils.hibernate.type.basic.YearMonthDateType; import jakarta.annotation.Nullable; import jakarta.persistence.*; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/IssueWork.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/IssueWork.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/IssueWork.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/IssueWork.java index b9d545c..1cec635 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/IssueWork.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/IssueWork.java @@ -1,6 +1,6 @@ -package de.thpeetz.kontor.comics.data; +package de.thpeetz.kontor.data.comics; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.persistence.Entity; import jakarta.persistence.Index; import jakarta.persistence.JoinColumn; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/Publisher.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Publisher.java similarity index 94% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/Publisher.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Publisher.java index cd27a43..1a21731 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/Publisher.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Publisher.java @@ -1,11 +1,12 @@ -package de.thpeetz.kontor.comics.data; +package de.thpeetz.kontor.data.comics; import java.util.LinkedList; import java.util.List; import com.fasterxml.jackson.annotation.JsonBackReference; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import de.thpeetz.kontor.common.data.AbstractEntity; + +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.annotation.Nullable; import jakarta.persistence.CascadeType; import jakarta.persistence.Entity; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/StoryArc.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/StoryArc.java similarity index 92% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/StoryArc.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/StoryArc.java index 11d328c..565a267 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/StoryArc.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/StoryArc.java @@ -1,8 +1,9 @@ -package de.thpeetz.kontor.comics.data; +package de.thpeetz.kontor.data.comics; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.annotation.Nullable; -import de.thpeetz.kontor.common.data.AbstractEntity; import jakarta.persistence.CascadeType; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/TradePaperback.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/TradePaperback.java similarity index 87% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/TradePaperback.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/TradePaperback.java index 07ee8d3..14f3e67 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/TradePaperback.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/TradePaperback.java @@ -1,6 +1,6 @@ -package de.thpeetz.kontor.comics.data; +package de.thpeetz.kontor.data.comics; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.persistence.Entity; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/Volume.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Volume.java similarity index 94% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/Volume.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Volume.java index 60c3821..fae65aa 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/Volume.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Volume.java @@ -1,11 +1,11 @@ -package de.thpeetz.kontor.comics.data; +package de.thpeetz.kontor.data.comics; import java.util.LinkedList; import java.util.List; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.annotation.*; import jakarta.persistence.CascadeType; import jakarta.persistence.Entity; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/Worktype.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Worktype.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/Worktype.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Worktype.java index 0416641..56e3356 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/Worktype.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/comics/Worktype.java @@ -1,9 +1,9 @@ -package de.thpeetz.kontor.comics.data; +package de.thpeetz.kontor.data.comics; import java.util.LinkedList; import java.util.List; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import io.micrometer.common.lang.Nullable; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/common/data/AbstractEntity.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/common/AbstractEntity.java similarity index 96% rename from kontor-spring/src/main/java/de/thpeetz/kontor/common/data/AbstractEntity.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/common/AbstractEntity.java index 182dd45..5c01a78 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/common/data/AbstractEntity.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/common/AbstractEntity.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.common.data; +package de.thpeetz.kontor.data.common; import jakarta.persistence.*; import lombok.EqualsAndHashCode; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/common/data/AbstractLinkEntity.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/common/AbstractLinkEntity.java similarity index 96% rename from kontor-spring/src/main/java/de/thpeetz/kontor/common/data/AbstractLinkEntity.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/common/AbstractLinkEntity.java index 7dfdf50..e54eb59 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/common/data/AbstractLinkEntity.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/common/AbstractLinkEntity.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.common.data; +package de.thpeetz.kontor.data.common; import jakarta.annotation.Nullable; import jakarta.persistence.*; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/mailclient/data/Mail.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/mailclient/Mail.java similarity index 78% rename from kontor-spring/src/main/java/de/thpeetz/kontor/mailclient/data/Mail.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/mailclient/Mail.java index f3b80a8..6da591f 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/mailclient/data/Mail.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/mailclient/Mail.java @@ -1,12 +1,13 @@ -package de.thpeetz.kontor.mailclient.data; +package de.thpeetz.kontor.data.mailclient; -import de.thpeetz.kontor.common.data.AbstractEntity; import jakarta.persistence.Entity; import lombok.Data; import lombok.EqualsAndHashCode; import java.util.Date; +import de.thpeetz.kontor.data.common.AbstractEntity; + @Data @EqualsAndHashCode(callSuper=false) @Entity diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/mailclient/data/MailAccount.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/mailclient/MailAccount.java similarity index 82% rename from kontor-spring/src/main/java/de/thpeetz/kontor/mailclient/data/MailAccount.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/mailclient/MailAccount.java index 840d8da..82ef1a5 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/mailclient/data/MailAccount.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/mailclient/MailAccount.java @@ -1,6 +1,6 @@ -package de.thpeetz.kontor.mailclient.data; +package de.thpeetz.kontor.data.mailclient; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.persistence.Entity; import jakarta.validation.constraints.NotEmpty; import lombok.Getter; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/data/MediaActor.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/media/MediaActor.java similarity index 88% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/data/MediaActor.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/media/MediaActor.java index e448080..afad2e3 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/data/MediaActor.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/media/MediaActor.java @@ -1,6 +1,5 @@ -package de.thpeetz.kontor.media.data; +package de.thpeetz.kontor.data.media; -import de.thpeetz.kontor.common.data.AbstractEntity; import jakarta.annotation.Nullable; import jakarta.persistence.*; import jakarta.validation.constraints.NotEmpty; @@ -12,6 +11,8 @@ import lombok.extern.slf4j.Slf4j; import java.util.LinkedList; import java.util.List; +import de.thpeetz.kontor.data.common.AbstractEntity; + @Getter @Setter @EqualsAndHashCode(callSuper = false) diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/data/MediaActorFile.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/media/MediaActorFile.java similarity index 80% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/data/MediaActorFile.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/media/MediaActorFile.java index 0e24cd7..de187e6 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/data/MediaActorFile.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/media/MediaActorFile.java @@ -1,8 +1,6 @@ -package de.thpeetz.kontor.media.data; +package de.thpeetz.kontor.data.media; -import de.thpeetz.kontor.comics.data.Artist; -import de.thpeetz.kontor.comics.data.Comic; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; import lombok.EqualsAndHashCode; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/data/MediaArticle.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/media/MediaArticle.java similarity index 82% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/data/MediaArticle.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/media/MediaArticle.java index c664a3a..7538393 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/data/MediaArticle.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/media/MediaArticle.java @@ -1,10 +1,9 @@ -package de.thpeetz.kontor.media.data; +package de.thpeetz.kontor.data.media; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.annotation.Nullable; import jakarta.persistence.Entity; import jakarta.persistence.Index; -import jakarta.persistence.OneToOne; import jakarta.persistence.Table; import jakarta.persistence.UniqueConstraint; import jakarta.validation.constraints.NotEmpty; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/data/MediaFile.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/media/MediaFile.java similarity index 89% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/data/MediaFile.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/media/MediaFile.java index 2193690..951830d 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/data/MediaFile.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/media/MediaFile.java @@ -1,6 +1,5 @@ -package de.thpeetz.kontor.media.data; +package de.thpeetz.kontor.data.media; -import de.thpeetz.kontor.common.data.AbstractEntity; import jakarta.annotation.Nullable; import jakarta.persistence.*; import lombok.EqualsAndHashCode; @@ -11,6 +10,8 @@ import lombok.extern.slf4j.Slf4j; import java.util.LinkedList; import java.util.List; +import de.thpeetz.kontor.data.common.AbstractEntity; + @Slf4j @Getter @Setter diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/data/MediaVideo.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/media/MediaVideo.java similarity index 88% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/data/MediaVideo.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/media/MediaVideo.java index d093eb1..987c5a9 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/data/MediaVideo.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/media/MediaVideo.java @@ -1,6 +1,6 @@ -package de.thpeetz.kontor.media.data; +package de.thpeetz.kontor.data.media; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.annotation.Nullable; import jakarta.persistence.Entity; import jakarta.persistence.Table; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/Card.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Card.java similarity index 94% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/Card.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Card.java index 8fa3486..48e80d8 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/Card.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Card.java @@ -1,8 +1,8 @@ -package de.thpeetz.kontor.tysc.data; +package de.thpeetz.kontor.data.tysc; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.persistence.Entity; import jakarta.persistence.Index; import jakarta.persistence.JoinColumn; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/CardSet.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/CardSet.java similarity index 92% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/CardSet.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/CardSet.java index 8bd700d..48bc5db 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/CardSet.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/CardSet.java @@ -1,8 +1,8 @@ -package de.thpeetz.kontor.tysc.data; +package de.thpeetz.kontor.data.tysc; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.persistence.Entity; import jakarta.persistence.Index; import jakarta.persistence.JoinColumn; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/FieldPosition.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/FieldPosition.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/FieldPosition.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/FieldPosition.java index a806e70..851d933 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/FieldPosition.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/FieldPosition.java @@ -1,10 +1,10 @@ -package de.thpeetz.kontor.tysc.data; +package de.thpeetz.kontor.data.tysc; import java.util.List; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.annotation.Nullable; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/Player.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Player.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/Player.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Player.java index 6517959..b7210b9 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/Player.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Player.java @@ -1,8 +1,8 @@ -package de.thpeetz.kontor.tysc.data; +package de.thpeetz.kontor.data.tysc; import java.util.List; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.annotation.Nullable; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/Rooster.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Rooster.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/Rooster.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Rooster.java index b0d3a3a..210aa13 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/Rooster.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Rooster.java @@ -1,6 +1,6 @@ -package de.thpeetz.kontor.tysc.data; +package de.thpeetz.kontor.data.tysc; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.persistence.Entity; import jakarta.persistence.Index; import jakarta.persistence.JoinColumn; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/Sport.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Sport.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/Sport.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Sport.java index 72635e1..bdceaf4 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/Sport.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Sport.java @@ -1,9 +1,9 @@ -package de.thpeetz.kontor.tysc.data; +package de.thpeetz.kontor.data.tysc; import java.util.LinkedList; import java.util.List; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.annotation.Nullable; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/Team.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Team.java similarity index 92% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/Team.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Team.java index 353da78..b7c0708 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/Team.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Team.java @@ -1,10 +1,10 @@ -package de.thpeetz.kontor.tysc.data; +package de.thpeetz.kontor.data.tysc; import java.util.List; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.annotation.Nullable; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/Vendor.java b/kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Vendor.java similarity index 91% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/Vendor.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Vendor.java index a7a9305..c78a577 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/data/Vendor.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/data/tysc/Vendor.java @@ -1,8 +1,8 @@ -package de.thpeetz.kontor.tysc.data; +package de.thpeetz.kontor.data.tysc; import java.util.List; -import de.thpeetz.kontor.common.data.AbstractEntity; +import de.thpeetz.kontor.data.common.AbstractEntity; import jakarta.annotation.Nullable; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/AddLinkFromQueue.java b/kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/AddLinkFromQueue.java deleted file mode 100644 index 15af258..0000000 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/AddLinkFromQueue.java +++ /dev/null @@ -1,28 +0,0 @@ -package de.thpeetz.kontor.integration.routes; - -import de.thpeetz.kontor.integration.services.AddLinkProcessor; -import de.thpeetz.kontor.media.services.MediaFileService; -import org.apache.camel.builder.RouteBuilder; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -@Component -public class AddLinkFromQueue extends RouteBuilder { - - @Autowired - private final MediaFileService mediaFileService; - - @Autowired - public AddLinkFromQueue(MediaFileService mediaFileService) { - this.mediaFileService = mediaFileService; - } - - @Override - public void configure() throws Exception { - from("jms:queue:add_link_file") - .routeId("read-queue-add-link_file") - .log("${body}") - .process(new AddLinkProcessor(mediaFileService)) - .to("jms:queue:update_title"); - } -} diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/QueueMediaLinkAdd.java b/kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/QueueMediaLinkAdd.java index 7ec886a..8ae4d0e 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/QueueMediaLinkAdd.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/QueueMediaLinkAdd.java @@ -1,9 +1,11 @@ package de.thpeetz.kontor.integration.routes; -import de.thpeetz.kontor.media.services.MediaFileService; import org.apache.camel.builder.RouteBuilder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import de.thpeetz.kontor.integration.services.AddLinkProcessor; +import de.thpeetz.kontor.services.MediaFileService; + @Component public class QueueMediaLinkAdd extends RouteBuilder { @@ -20,6 +22,9 @@ public class QueueMediaLinkAdd extends RouteBuilder { from("jms:queue:media.link.add") .routeId("read-queue-media-link-add") .log("${body}") + .trace(true) + .process(new AddLinkProcessor(mediaFileService)) + .to("jms:queue:media.link.update_title") .to("jms:queue:media.link.add.processed"); } } diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/QueueMediaLoFiAdd.java b/kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/QueueMediaLoFiAdd.java index 3ea86ac..ec2b31a 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/QueueMediaLoFiAdd.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/QueueMediaLoFiAdd.java @@ -1,10 +1,11 @@ package de.thpeetz.kontor.integration.routes; import org.apache.camel.builder.RouteBuilder; -import de.thpeetz.kontor.media.services.MediaFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import de.thpeetz.kontor.services.MediaFileService; + @Component public class QueueMediaLoFiAdd extends RouteBuilder { diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/QueueMediaVideoAdd.java b/kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/QueueMediaVideoAdd.java index 8e104d7..a369d73 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/QueueMediaVideoAdd.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/QueueMediaVideoAdd.java @@ -1,10 +1,11 @@ package de.thpeetz.kontor.integration.routes; import org.apache.camel.builder.RouteBuilder; -import de.thpeetz.kontor.media.services.MediaFileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import de.thpeetz.kontor.services.MediaFileService; + @Component public class QueueMediaVideoAdd extends RouteBuilder { diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/ReadQueueRoute.java b/kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/ReadQueueRoute.java deleted file mode 100644 index 115fef1..0000000 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/integration/routes/ReadQueueRoute.java +++ /dev/null @@ -1,16 +0,0 @@ -package de.thpeetz.kontor.integration.routes; - -import org.apache.camel.builder.RouteBuilder; -import org.springframework.stereotype.Component; - -@Component -public class ReadQueueRoute extends RouteBuilder { - - @Override - public void configure() throws Exception { - from("jms:queue:KontorMediaFile") - .routeId("add-link-from-queue") - .trace(true) - .log(">>> ${body}"); - } -} diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/integration/services/AddLinkProcessor.java b/kontor-spring/src/main/java/de/thpeetz/kontor/integration/services/AddLinkProcessor.java index 6f326a4..81677d2 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/integration/services/AddLinkProcessor.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/integration/services/AddLinkProcessor.java @@ -2,8 +2,9 @@ package de.thpeetz.kontor.integration.services; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import de.thpeetz.kontor.media.data.MediaFile; -import de.thpeetz.kontor.media.services.MediaFileService; + +import de.thpeetz.kontor.data.media.MediaFile; +import de.thpeetz.kontor.services.MediaFileService; import lombok.extern.slf4j.Slf4j; import org.apache.camel.Exchange; import org.apache.camel.Processor; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/MailProperties.java b/kontor-spring/src/main/java/de/thpeetz/kontor/properties/MailProperties.java similarity index 97% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/MailProperties.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/properties/MailProperties.java index 9e8a6b4..ba6dc46 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/MailProperties.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/properties/MailProperties.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.admin; +package de.thpeetz.kontor.properties; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/repository/AssignmentRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/admin/AssignmentRepository.java similarity index 60% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/repository/AssignmentRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/admin/AssignmentRepository.java index eb20059..ae0d8d0 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/repository/AssignmentRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/admin/AssignmentRepository.java @@ -1,6 +1,9 @@ -package de.thpeetz.kontor.admin.repository; +package de.thpeetz.kontor.repository.admin; + +import de.thpeetz.kontor.data.admin.Assignment; +import de.thpeetz.kontor.data.admin.Permission; +import de.thpeetz.kontor.data.admin.Profile; -import de.thpeetz.kontor.admin.data.*; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/repository/MailAccountRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/admin/MailAccountRepository.java similarity index 60% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/repository/MailAccountRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/admin/MailAccountRepository.java index 1cd3885..cd17de2 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/repository/MailAccountRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/admin/MailAccountRepository.java @@ -1,8 +1,9 @@ -package de.thpeetz.kontor.admin.repository; +package de.thpeetz.kontor.repository.admin; -import de.thpeetz.kontor.mailclient.data.MailAccount; import org.springframework.data.jpa.repository.JpaRepository; +import de.thpeetz.kontor.data.mailclient.MailAccount; + public interface MailAccountRepository extends JpaRepository { } diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/repository/PermissionRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/admin/PermissionRepository.java similarity index 87% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/repository/PermissionRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/admin/PermissionRepository.java index 9e6e863..a9d660e 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/repository/PermissionRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/admin/PermissionRepository.java @@ -1,10 +1,11 @@ -package de.thpeetz.kontor.admin.repository; +package de.thpeetz.kontor.repository.admin; -import de.thpeetz.kontor.admin.data.Permission; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.thpeetz.kontor.data.admin.Permission; + import java.util.List; public interface PermissionRepository extends JpaRepository { diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/repository/ProfileRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/admin/ProfileRepository.java similarity index 85% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/repository/ProfileRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/admin/ProfileRepository.java index 1238abb..a4d1769 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/repository/ProfileRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/admin/ProfileRepository.java @@ -1,10 +1,11 @@ -package de.thpeetz.kontor.admin.repository; +package de.thpeetz.kontor.repository.admin; -import de.thpeetz.kontor.admin.data.Profile; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.thpeetz.kontor.data.admin.Profile; + import java.util.List; public interface ProfileRepository extends JpaRepository { diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/ArticleAuthorRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/ArticleAuthorRepository.java similarity index 58% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/ArticleAuthorRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/ArticleAuthorRepository.java index d7933de..5bb4b05 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/ArticleAuthorRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/ArticleAuthorRepository.java @@ -1,9 +1,13 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.repository.bookshelf; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; +import de.thpeetz.kontor.data.bookshelf.Article; +import de.thpeetz.kontor.data.bookshelf.ArticleAuthor; +import de.thpeetz.kontor.data.bookshelf.Author; + public interface ArticleAuthorRepository extends JpaRepository { List findByAuthor(Author author); diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/ArticleRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/ArticleRepository.java similarity index 83% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/ArticleRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/ArticleRepository.java index c6b2602..42561d2 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/ArticleRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/ArticleRepository.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.repository.bookshelf; import java.util.List; @@ -6,6 +6,8 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.thpeetz.kontor.data.bookshelf.Article; + public interface ArticleRepository extends JpaRepository { @Query("select a from Article a " + diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/AuthorRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/AuthorRepository.java similarity index 86% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/AuthorRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/AuthorRepository.java index 3e87334..01471a5 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/AuthorRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/AuthorRepository.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.repository.bookshelf; import java.util.List; @@ -6,6 +6,8 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.thpeetz.kontor.data.bookshelf.Author; + public interface AuthorRepository extends JpaRepository { @Query("select a from Author a " + diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/BookAuthorRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/BookAuthorRepository.java similarity index 57% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/BookAuthorRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/BookAuthorRepository.java index a0cf650..a62294f 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/BookAuthorRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/BookAuthorRepository.java @@ -1,9 +1,13 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.repository.bookshelf; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; +import de.thpeetz.kontor.data.bookshelf.Author; +import de.thpeetz.kontor.data.bookshelf.Book; +import de.thpeetz.kontor.data.bookshelf.BookAuthor; + public interface BookAuthorRepository extends JpaRepository { List findByAuthor(Author author); diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/BookRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/BookRepository.java similarity index 87% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/BookRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/BookRepository.java index e6ee013..1f0192e 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/BookRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/BookRepository.java @@ -1,9 +1,11 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.repository.bookshelf; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.thpeetz.kontor.data.bookshelf.Book; + import java.util.List; public interface BookRepository extends JpaRepository { diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/BookshelfPublisherRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/BookshelfPublisherRepository.java similarity index 85% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/BookshelfPublisherRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/BookshelfPublisherRepository.java index b50ba84..afd4710 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/data/BookshelfPublisherRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/bookshelf/BookshelfPublisherRepository.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.repository.bookshelf; import java.util.List; @@ -6,6 +6,8 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.thpeetz.kontor.data.bookshelf.BookshelfPublisher; + public interface BookshelfPublisherRepository extends JpaRepository { @Query("select p from BookshelfPublisher p " + diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/ArtistRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/ArtistRepository.java similarity index 85% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/ArtistRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/ArtistRepository.java index feff0c0..53b6273 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/ArtistRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/ArtistRepository.java @@ -1,8 +1,9 @@ -package de.thpeetz.kontor.comics.repository; +package de.thpeetz.kontor.repository.comics; import java.util.List; -import de.thpeetz.kontor.comics.data.*; +import de.thpeetz.kontor.data.comics.Artist; + import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/ComicRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/ComicRepository.java similarity index 92% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/ComicRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/ComicRepository.java index 2da13e1..98d7dbc 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/ComicRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/ComicRepository.java @@ -1,8 +1,10 @@ -package de.thpeetz.kontor.comics.repository; +package de.thpeetz.kontor.repository.comics; import java.util.List; -import de.thpeetz.kontor.comics.data.*; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.Publisher; + import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/ComicWorkRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/ComicWorkRepository.java similarity index 69% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/ComicWorkRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/ComicWorkRepository.java index 9eba50e..4028fea 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/ComicWorkRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/ComicWorkRepository.java @@ -1,8 +1,12 @@ -package de.thpeetz.kontor.comics.repository; +package de.thpeetz.kontor.repository.comics; import java.util.List; -import de.thpeetz.kontor.comics.data.*; +import de.thpeetz.kontor.data.comics.Artist; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.ComicWork; +import de.thpeetz.kontor.data.comics.Worktype; + import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/IssueRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/IssueRepository.java similarity index 81% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/IssueRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/IssueRepository.java index 9719304..28cd4d1 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/IssueRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/IssueRepository.java @@ -1,8 +1,10 @@ -package de.thpeetz.kontor.comics.repository; +package de.thpeetz.kontor.repository.comics; import java.util.List; -import de.thpeetz.kontor.comics.data.*; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.Issue; + import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/IssueWorkRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/IssueWorkRepository.java similarity index 66% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/IssueWorkRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/IssueWorkRepository.java index a2e0347..425fda7 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/IssueWorkRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/IssueWorkRepository.java @@ -1,6 +1,10 @@ -package de.thpeetz.kontor.comics.repository; +package de.thpeetz.kontor.repository.comics; + +import de.thpeetz.kontor.data.comics.Artist; +import de.thpeetz.kontor.data.comics.Issue; +import de.thpeetz.kontor.data.comics.IssueWork; +import de.thpeetz.kontor.data.comics.Worktype; -import de.thpeetz.kontor.comics.data.*; import org.springframework.data.jpa.repository.*; import java.util.*; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/PublisherRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/PublisherRepository.java similarity index 85% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/PublisherRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/PublisherRepository.java index 076b32e..38b5cc7 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/PublisherRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/PublisherRepository.java @@ -1,8 +1,9 @@ -package de.thpeetz.kontor.comics.repository; +package de.thpeetz.kontor.repository.comics; import java.util.List; -import de.thpeetz.kontor.comics.data.*; +import de.thpeetz.kontor.data.comics.Publisher; + import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/StoryArcRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/StoryArcRepository.java similarity index 80% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/StoryArcRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/StoryArcRepository.java index 23326fb..fe32c13 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/StoryArcRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/StoryArcRepository.java @@ -1,8 +1,10 @@ -package de.thpeetz.kontor.comics.repository; +package de.thpeetz.kontor.repository.comics; import java.util.List; -import de.thpeetz.kontor.comics.data.*; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.StoryArc; + import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/TradePaperbackRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/TradePaperbackRepository.java similarity index 85% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/TradePaperbackRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/TradePaperbackRepository.java index d8c5787..95b8e41 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/TradePaperbackRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/TradePaperbackRepository.java @@ -1,8 +1,10 @@ -package de.thpeetz.kontor.comics.repository; +package de.thpeetz.kontor.repository.comics; import java.util.List; -import de.thpeetz.kontor.comics.data.*; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.TradePaperback; + import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/VolumeRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/VolumeRepository.java similarity index 65% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/VolumeRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/VolumeRepository.java index cf98406..8297134 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/VolumeRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/VolumeRepository.java @@ -1,8 +1,10 @@ -package de.thpeetz.kontor.comics.repository; +package de.thpeetz.kontor.repository.comics; import java.util.List; -import de.thpeetz.kontor.comics.data.*; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.Volume; + import org.springframework.data.jpa.repository.JpaRepository; public interface VolumeRepository extends JpaRepository { diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/WorktypeRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/WorktypeRepository.java similarity index 85% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/WorktypeRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/WorktypeRepository.java index 12755c9..dff8e52 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/repository/WorktypeRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/comics/WorktypeRepository.java @@ -1,8 +1,9 @@ -package de.thpeetz.kontor.comics.repository; +package de.thpeetz.kontor.repository.comics; import java.util.List; -import de.thpeetz.kontor.comics.data.*; +import de.thpeetz.kontor.data.comics.Worktype; + import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/repository/MediaActorFileRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/media/MediaActorFileRepository.java similarity index 62% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/repository/MediaActorFileRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/media/MediaActorFileRepository.java index e680b32..9538774 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/repository/MediaActorFileRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/media/MediaActorFileRepository.java @@ -1,8 +1,8 @@ -package de.thpeetz.kontor.media.repository; +package de.thpeetz.kontor.repository.media; import org.springframework.data.jpa.repository.JpaRepository; -import de.thpeetz.kontor.media.data.MediaActorFile; +import de.thpeetz.kontor.data.media.MediaActorFile; public interface MediaActorFileRepository extends JpaRepository { } diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/repository/MediaActorRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/media/MediaActorRepository.java similarity index 86% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/repository/MediaActorRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/media/MediaActorRepository.java index 1cd5ff0..9ed6a06 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/repository/MediaActorRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/media/MediaActorRepository.java @@ -1,10 +1,10 @@ -package de.thpeetz.kontor.media.repository; +package de.thpeetz.kontor.repository.media; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import de.thpeetz.kontor.media.data.MediaActor; +import de.thpeetz.kontor.data.media.MediaActor; import java.util.List; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/repository/MediaArticleRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/media/MediaArticleRepository.java similarity index 85% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/repository/MediaArticleRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/media/MediaArticleRepository.java index 6486097..c1d92d7 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/repository/MediaArticleRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/media/MediaArticleRepository.java @@ -1,10 +1,10 @@ -package de.thpeetz.kontor.media.repository; +package de.thpeetz.kontor.repository.media; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import de.thpeetz.kontor.media.data.MediaArticle; +import de.thpeetz.kontor.data.media.MediaArticle; import java.util.List; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/repository/MediaFileRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/media/MediaFileRepository.java similarity index 92% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/repository/MediaFileRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/media/MediaFileRepository.java index ac8274d..252e3d9 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/repository/MediaFileRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/media/MediaFileRepository.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.media.repository; +package de.thpeetz.kontor.repository.media; import java.util.List; @@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import de.thpeetz.kontor.media.data.MediaFile; +import de.thpeetz.kontor.data.media.MediaFile; public interface MediaFileRepository extends JpaRepository { @Query("select m from MediaFile m " + diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/repository/MediaVideoRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/media/MediaVideoRepository.java similarity index 85% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/repository/MediaVideoRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/media/MediaVideoRepository.java index 25c72e8..1b87c7d 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/repository/MediaVideoRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/media/MediaVideoRepository.java @@ -1,10 +1,10 @@ -package de.thpeetz.kontor.media.repository; +package de.thpeetz.kontor.repository.media; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -import de.thpeetz.kontor.media.data.MediaVideo; +import de.thpeetz.kontor.data.media.MediaVideo; import java.util.List; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/CardRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/CardRepository.java similarity index 75% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/CardRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/CardRepository.java index 09cfc08..3735e41 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/CardRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/CardRepository.java @@ -1,14 +1,15 @@ -package de.thpeetz.kontor.tysc.repository; +package de.thpeetz.kontor.repository.tysc; -import de.thpeetz.kontor.tysc.data.Card; -import de.thpeetz.kontor.tysc.data.CardSet; -import de.thpeetz.kontor.tysc.data.Rooster; -import de.thpeetz.kontor.tysc.data.Vendor; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.thpeetz.kontor.data.tysc.Card; +import de.thpeetz.kontor.data.tysc.CardSet; +import de.thpeetz.kontor.data.tysc.Rooster; +import de.thpeetz.kontor.data.tysc.Vendor; + public interface CardRepository extends JpaRepository { @Query("SELECT c FROM Card c WHERE c.vendor = ?1 AND c.cardSet = ?2 and c.rooster = ?3 and c.cardNumber = ?4 and c.year = ?5") diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/CardSetRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/CardSetRepository.java similarity index 81% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/CardSetRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/CardSetRepository.java index 3bf2901..f8b063b 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/CardSetRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/CardSetRepository.java @@ -1,13 +1,14 @@ -package de.thpeetz.kontor.tysc.repository; +package de.thpeetz.kontor.repository.tysc; import java.util.List; -import de.thpeetz.kontor.tysc.data.CardSet; -import de.thpeetz.kontor.tysc.data.Vendor; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.thpeetz.kontor.data.tysc.CardSet; +import de.thpeetz.kontor.data.tysc.Vendor; + public interface CardSetRepository extends JpaRepository { List findByName(String name); diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/FieldPositionRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/FieldPositionRepository.java similarity index 84% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/FieldPositionRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/FieldPositionRepository.java index b018173..e152b9d 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/FieldPositionRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/FieldPositionRepository.java @@ -1,13 +1,14 @@ -package de.thpeetz.kontor.tysc.repository; +package de.thpeetz.kontor.repository.tysc; import java.util.List; -import de.thpeetz.kontor.tysc.data.FieldPosition; -import de.thpeetz.kontor.tysc.data.Sport; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.thpeetz.kontor.data.tysc.FieldPosition; +import de.thpeetz.kontor.data.tysc.Sport; + public interface FieldPositionRepository extends JpaRepository { @Query("select p from FieldPosition p " + diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/PlayerRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/PlayerRepository.java similarity index 87% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/PlayerRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/PlayerRepository.java index 2f978f2..1f41c44 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/PlayerRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/PlayerRepository.java @@ -1,12 +1,13 @@ -package de.thpeetz.kontor.tysc.repository; +package de.thpeetz.kontor.repository.tysc; import java.util.List; -import de.thpeetz.kontor.tysc.data.Player; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.thpeetz.kontor.data.tysc.Player; + public interface PlayerRepository extends JpaRepository { @Query("select p from Player p " + diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/RoosterRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/RoosterRepository.java similarity index 64% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/RoosterRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/RoosterRepository.java index b707d6e..2bbf4c0 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/RoosterRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/RoosterRepository.java @@ -1,12 +1,13 @@ -package de.thpeetz.kontor.tysc.repository; +package de.thpeetz.kontor.repository.tysc; -import de.thpeetz.kontor.tysc.data.FieldPosition; -import de.thpeetz.kontor.tysc.data.Player; -import de.thpeetz.kontor.tysc.data.Rooster; -import de.thpeetz.kontor.tysc.data.Team; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import de.thpeetz.kontor.data.tysc.FieldPosition; +import de.thpeetz.kontor.data.tysc.Player; +import de.thpeetz.kontor.data.tysc.Rooster; +import de.thpeetz.kontor.data.tysc.Team; + public interface RoosterRepository extends JpaRepository{ @Query("SELECT r FROM Rooster r WHERE r.player = ?1 AND r.team = ?2 AND r.position = ?3 AND r.year = ?4") diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/SportRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/SportRepository.java similarity index 86% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/SportRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/SportRepository.java index 3860a68..8c32c46 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/SportRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/SportRepository.java @@ -1,12 +1,13 @@ -package de.thpeetz.kontor.tysc.repository; +package de.thpeetz.kontor.repository.tysc; import java.util.List; -import de.thpeetz.kontor.tysc.data.Sport; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.thpeetz.kontor.data.tysc.Sport; + public interface SportRepository extends JpaRepository { @Query("select s from Sport s " + "where lower(s.name) like lower(concat('%', :searchTerm, '%')) ") diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/TeamRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/TeamRepository.java similarity index 90% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/TeamRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/TeamRepository.java index c0aeae8..d9f68a1 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/TeamRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/TeamRepository.java @@ -1,12 +1,13 @@ -package de.thpeetz.kontor.tysc.repository; +package de.thpeetz.kontor.repository.tysc; import java.util.List; -import de.thpeetz.kontor.tysc.data.Team; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.thpeetz.kontor.data.tysc.Team; + /** * The repository interface for managing teams. */ diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/VendorRepository.java b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/VendorRepository.java similarity index 85% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/VendorRepository.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/VendorRepository.java index 3195c3c..d7a6b00 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/repository/VendorRepository.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/repository/tysc/VendorRepository.java @@ -1,12 +1,13 @@ -package de.thpeetz.kontor.tysc.repository; +package de.thpeetz.kontor.repository.tysc; import java.util.List; -import de.thpeetz.kontor.tysc.data.Vendor; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import de.thpeetz.kontor.data.tysc.Vendor; + public interface VendorRepository extends JpaRepository { @Query("select v from Vendor v where lower(v.name) like lower(concat('%', :searchTerm, '%')) ") diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/security/SecurityConfig.java b/kontor-spring/src/main/java/de/thpeetz/kontor/security/SecurityConfig.java index 0bb55a2..120ac5c 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/security/SecurityConfig.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/security/SecurityConfig.java @@ -2,8 +2,8 @@ package de.thpeetz.kontor.security; import com.vaadin.flow.spring.security.VaadinWebSecurity; -import de.thpeetz.kontor.admin.services.KontorUserDetailsService; -import de.thpeetz.kontor.admin.views.LoginView; +import de.thpeetz.kontor.services.KontorUserDetailsService; +import de.thpeetz.kontor.views.admin.LoginView; import java.util.Base64; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/security/SecurityService.java b/kontor-spring/src/main/java/de/thpeetz/kontor/security/SecurityService.java index 4d17d31..2e5e8fb 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/security/SecurityService.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/security/SecurityService.java @@ -13,7 +13,7 @@ import com.vaadin.flow.server.VaadinServletRequest; import com.vaadin.flow.server.VaadinServletResponse; import com.vaadin.flow.spring.security.AuthenticationContext; -import de.thpeetz.kontor.admin.services.KontorUserDetailsService; +import de.thpeetz.kontor.services.KontorUserDetailsService; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/services/AdminService.java b/kontor-spring/src/main/java/de/thpeetz/kontor/services/AdminService.java similarity index 90% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/services/AdminService.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/services/AdminService.java index 0bffa05..dda25e6 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/services/AdminService.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/services/AdminService.java @@ -1,10 +1,15 @@ -package de.thpeetz.kontor.admin.services; +package de.thpeetz.kontor.services; import java.util.Collection; import java.util.List; -import de.thpeetz.kontor.admin.data.*; -import de.thpeetz.kontor.admin.repository.*; +import de.thpeetz.kontor.data.admin.Assignment; +import de.thpeetz.kontor.data.admin.Permission; +import de.thpeetz.kontor.data.admin.Profile; +import de.thpeetz.kontor.repository.admin.AssignmentRepository; +import de.thpeetz.kontor.repository.admin.PermissionRepository; +import de.thpeetz.kontor.repository.admin.ProfileRepository; + import org.springframework.stereotype.Service; import lombok.extern.slf4j.Slf4j; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/services/BookshelfService.java b/kontor-spring/src/main/java/de/thpeetz/kontor/services/BookshelfService.java similarity index 85% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/services/BookshelfService.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/services/BookshelfService.java index b6322d1..9c1c676 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/services/BookshelfService.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/services/BookshelfService.java @@ -1,8 +1,18 @@ -package de.thpeetz.kontor.bookshelf.services; +package de.thpeetz.kontor.services; import java.util.List; -import de.thpeetz.kontor.bookshelf.data.*; +import de.thpeetz.kontor.data.bookshelf.Article; +import de.thpeetz.kontor.data.bookshelf.Author; +import de.thpeetz.kontor.data.bookshelf.Book; +import de.thpeetz.kontor.data.bookshelf.BookshelfPublisher; +import de.thpeetz.kontor.repository.bookshelf.ArticleAuthorRepository; +import de.thpeetz.kontor.repository.bookshelf.ArticleRepository; +import de.thpeetz.kontor.repository.bookshelf.AuthorRepository; +import de.thpeetz.kontor.repository.bookshelf.BookAuthorRepository; +import de.thpeetz.kontor.repository.bookshelf.BookRepository; +import de.thpeetz.kontor.repository.bookshelf.BookshelfPublisherRepository; + import org.springframework.stereotype.Service; import lombok.extern.slf4j.Slf4j; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/services/CardService.java b/kontor-spring/src/main/java/de/thpeetz/kontor/services/CardService.java similarity index 88% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/services/CardService.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/services/CardService.java index f91f55f..5f7f048 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/services/CardService.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/services/CardService.java @@ -1,15 +1,15 @@ -package de.thpeetz.kontor.tysc.services; +package de.thpeetz.kontor.services; import java.util.List; -import de.thpeetz.kontor.tysc.repository.CardRepository; -import de.thpeetz.kontor.tysc.repository.CardSetRepository; -import de.thpeetz.kontor.tysc.repository.VendorRepository; import org.springframework.stereotype.Service; -import de.thpeetz.kontor.tysc.data.Card; -import de.thpeetz.kontor.tysc.data.CardSet; -import de.thpeetz.kontor.tysc.data.Vendor; +import de.thpeetz.kontor.data.tysc.Card; +import de.thpeetz.kontor.data.tysc.CardSet; +import de.thpeetz.kontor.data.tysc.Vendor; +import de.thpeetz.kontor.repository.tysc.CardRepository; +import de.thpeetz.kontor.repository.tysc.CardSetRepository; +import de.thpeetz.kontor.repository.tysc.VendorRepository; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/services/ComicService.java b/kontor-spring/src/main/java/de/thpeetz/kontor/services/ComicService.java similarity index 91% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/services/ComicService.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/services/ComicService.java index b3e5fc1..3f4252e 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/services/ComicService.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/services/ComicService.java @@ -1,11 +1,30 @@ -package de.thpeetz.kontor.comics.services; +package de.thpeetz.kontor.services; import java.util.List; -import de.thpeetz.kontor.comics.data.*; -import de.thpeetz.kontor.comics.repository.*; -import de.thpeetz.kontor.common.views.FilterOption; -import de.thpeetz.kontor.common.views.SearchFilter; +import de.thpeetz.kontor.data.comics.Artist; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.ComicWork; +import de.thpeetz.kontor.data.comics.Issue; +import de.thpeetz.kontor.data.comics.IssueWork; +import de.thpeetz.kontor.data.comics.Publisher; +import de.thpeetz.kontor.data.comics.StoryArc; +import de.thpeetz.kontor.data.comics.TradePaperback; +import de.thpeetz.kontor.data.comics.Volume; +import de.thpeetz.kontor.data.comics.Worktype; +import de.thpeetz.kontor.repository.comics.ArtistRepository; +import de.thpeetz.kontor.repository.comics.ComicRepository; +import de.thpeetz.kontor.repository.comics.ComicWorkRepository; +import de.thpeetz.kontor.repository.comics.IssueRepository; +import de.thpeetz.kontor.repository.comics.IssueWorkRepository; +import de.thpeetz.kontor.repository.comics.PublisherRepository; +import de.thpeetz.kontor.repository.comics.StoryArcRepository; +import de.thpeetz.kontor.repository.comics.TradePaperbackRepository; +import de.thpeetz.kontor.repository.comics.VolumeRepository; +import de.thpeetz.kontor.repository.comics.WorktypeRepository; +import de.thpeetz.kontor.views.common.FilterOption; +import de.thpeetz.kontor.views.common.SearchFilter; + import org.springframework.stereotype.Service; import lombok.extern.slf4j.Slf4j; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/data/services/DataManagementService.java b/kontor-spring/src/main/java/de/thpeetz/kontor/services/DataManagementService.java similarity index 89% rename from kontor-spring/src/main/java/de/thpeetz/kontor/data/services/DataManagementService.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/services/DataManagementService.java index e9df180..f8e519b 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/data/services/DataManagementService.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/services/DataManagementService.java @@ -1,6 +1,5 @@ -package de.thpeetz.kontor.data.services; +package de.thpeetz.kontor.services; -import de.thpeetz.kontor.tysc.services.SportService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/services/KontorUserDetailsService.java b/kontor-spring/src/main/java/de/thpeetz/kontor/services/KontorUserDetailsService.java similarity index 82% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/services/KontorUserDetailsService.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/services/KontorUserDetailsService.java index 21f76ac..b4d04bb 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/services/KontorUserDetailsService.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/services/KontorUserDetailsService.java @@ -1,11 +1,11 @@ -package de.thpeetz.kontor.admin.services; +package de.thpeetz.kontor.services; -import de.thpeetz.kontor.admin.data.Assignment; -import de.thpeetz.kontor.admin.data.Profile; -import de.thpeetz.kontor.admin.data.Permission; -import de.thpeetz.kontor.admin.repository.AssignmentRepository; -import de.thpeetz.kontor.admin.repository.ProfileRepository; -import de.thpeetz.kontor.admin.repository.PermissionRepository; +import de.thpeetz.kontor.data.admin.Assignment; +import de.thpeetz.kontor.data.admin.Permission; +import de.thpeetz.kontor.data.admin.Profile; +import de.thpeetz.kontor.repository.admin.AssignmentRepository; +import de.thpeetz.kontor.repository.admin.PermissionRepository; +import de.thpeetz.kontor.repository.admin.ProfileRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.GrantedAuthority; @@ -62,15 +62,17 @@ public class KontorUserDetailsService implements UserDetailsService { profile = profileRepository.save(profile); List copy = permissions.stream().collect(Collectors.toList()); List assignments = profile.getAssignments(); - assignments.forEach(assignment -> { - if (permissions.contains(assignment.getPermission())) { - log.info("Permission {} already assigned", assignment.getPermission()); - copy.remove(assignment.getPermission()); - } else { - log.info("Permission {} has to be removed", assignment.getPermission()); - assignmentRepository.delete(assignment); - } - }); + if (assignments != null) { + assignments.forEach(assignment -> { + if (permissions.contains(assignment.getPermission())) { + log.info("Permission {} already assigned", assignment.getPermission()); + copy.remove(assignment.getPermission()); + } else { + log.info("Permission {} has to be removed", assignment.getPermission()); + assignmentRepository.delete(assignment); + } + }); + } log.info("remaining roles: {}", copy); for (Permission permission : copy) { Assignment assignment = new Assignment(); diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/services/MailService.java b/kontor-spring/src/main/java/de/thpeetz/kontor/services/MailService.java similarity index 74% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/services/MailService.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/services/MailService.java index d817197..1b77d82 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/services/MailService.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/services/MailService.java @@ -1,7 +1,7 @@ -package de.thpeetz.kontor.admin.services; +package de.thpeetz.kontor.services; -import de.thpeetz.kontor.mailclient.data.MailAccount; -import de.thpeetz.kontor.admin.repository.MailAccountRepository; +import de.thpeetz.kontor.data.mailclient.MailAccount; +import de.thpeetz.kontor.repository.admin.MailAccountRepository; import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/services/MediaArticleService.java b/kontor-spring/src/main/java/de/thpeetz/kontor/services/MediaArticleService.java similarity index 89% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/services/MediaArticleService.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/services/MediaArticleService.java index 5f6b994..ba51a6c 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/services/MediaArticleService.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/services/MediaArticleService.java @@ -1,7 +1,7 @@ -package de.thpeetz.kontor.media.services; +package de.thpeetz.kontor.services; -import de.thpeetz.kontor.media.data.MediaArticle; -import de.thpeetz.kontor.media.repository.MediaArticleRepository; +import de.thpeetz.kontor.data.media.MediaArticle; +import de.thpeetz.kontor.repository.media.MediaArticleRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/services/MediaFileService.java b/kontor-spring/src/main/java/de/thpeetz/kontor/services/MediaFileService.java similarity index 92% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/services/MediaFileService.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/services/MediaFileService.java index 4766da7..d976ff8 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/services/MediaFileService.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/services/MediaFileService.java @@ -1,12 +1,12 @@ -package de.thpeetz.kontor.media.services; +package de.thpeetz.kontor.services; -import de.thpeetz.kontor.common.views.SearchFilter; -import de.thpeetz.kontor.media.data.MediaActor; -import de.thpeetz.kontor.media.data.MediaActorFile; -import de.thpeetz.kontor.media.data.MediaFile; -import de.thpeetz.kontor.media.repository.MediaActorFileRepository; -import de.thpeetz.kontor.media.repository.MediaActorRepository; -import de.thpeetz.kontor.media.repository.MediaFileRepository; +import de.thpeetz.kontor.data.media.MediaActor; +import de.thpeetz.kontor.data.media.MediaActorFile; +import de.thpeetz.kontor.data.media.MediaFile; +import de.thpeetz.kontor.repository.media.MediaActorFileRepository; +import de.thpeetz.kontor.repository.media.MediaActorRepository; +import de.thpeetz.kontor.repository.media.MediaFileRepository; +import de.thpeetz.kontor.views.common.SearchFilter; import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/services/MediaVideoService.java b/kontor-spring/src/main/java/de/thpeetz/kontor/services/MediaVideoService.java similarity index 87% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/services/MediaVideoService.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/services/MediaVideoService.java index aaff14a..727410e 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/services/MediaVideoService.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/services/MediaVideoService.java @@ -1,7 +1,7 @@ -package de.thpeetz.kontor.media.services; +package de.thpeetz.kontor.services; -import de.thpeetz.kontor.media.data.MediaVideo; -import de.thpeetz.kontor.media.repository.MediaVideoRepository; +import de.thpeetz.kontor.data.media.MediaVideo; +import de.thpeetz.kontor.repository.media.MediaVideoRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/services/SportService.java b/kontor-spring/src/main/java/de/thpeetz/kontor/services/SportService.java similarity index 91% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/services/SportService.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/services/SportService.java index 1fc7ff4..37c4885 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/services/SportService.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/services/SportService.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.services; +package de.thpeetz.kontor.services; import java.util.List; import java.util.Map; @@ -8,16 +8,16 @@ import java.util.concurrent.atomic.AtomicReference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import de.thpeetz.kontor.tysc.data.FieldPosition; -import de.thpeetz.kontor.tysc.data.Player; -import de.thpeetz.kontor.tysc.data.Rooster; -import de.thpeetz.kontor.tysc.data.Sport; -import de.thpeetz.kontor.tysc.data.Team; -import de.thpeetz.kontor.tysc.repository.FieldPositionRepository; -import de.thpeetz.kontor.tysc.repository.PlayerRepository; -import de.thpeetz.kontor.tysc.repository.RoosterRepository; -import de.thpeetz.kontor.tysc.repository.SportRepository; -import de.thpeetz.kontor.tysc.repository.TeamRepository; +import de.thpeetz.kontor.data.tysc.FieldPosition; +import de.thpeetz.kontor.data.tysc.Player; +import de.thpeetz.kontor.data.tysc.Rooster; +import de.thpeetz.kontor.data.tysc.Sport; +import de.thpeetz.kontor.data.tysc.Team; +import de.thpeetz.kontor.repository.tysc.FieldPositionRepository; +import de.thpeetz.kontor.repository.tysc.PlayerRepository; +import de.thpeetz.kontor.repository.tysc.RoosterRepository; +import de.thpeetz.kontor.repository.tysc.SportRepository; +import de.thpeetz.kontor.repository.tysc.TeamRepository; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/SetupModuleAdmin.java b/kontor-spring/src/main/java/de/thpeetz/kontor/setup/SetupModuleAdmin.java similarity index 90% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/SetupModuleAdmin.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/setup/SetupModuleAdmin.java index 47ffacf..af20df8 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/SetupModuleAdmin.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/setup/SetupModuleAdmin.java @@ -1,13 +1,14 @@ -package de.thpeetz.kontor.admin; +package de.thpeetz.kontor.setup; -import de.thpeetz.kontor.admin.data.Permission; -import de.thpeetz.kontor.admin.data.Profile; -import de.thpeetz.kontor.admin.data.Assignment; -import de.thpeetz.kontor.admin.repository.AssignmentRepository; -import de.thpeetz.kontor.admin.repository.ProfileRepository; -import de.thpeetz.kontor.admin.repository.MailAccountRepository; -import de.thpeetz.kontor.admin.services.AdminService; -import de.thpeetz.kontor.mailclient.data.MailAccount; +import de.thpeetz.kontor.data.admin.Assignment; +import de.thpeetz.kontor.data.admin.Permission; +import de.thpeetz.kontor.data.admin.Profile; +import de.thpeetz.kontor.data.mailclient.MailAccount; +import de.thpeetz.kontor.properties.MailProperties; +import de.thpeetz.kontor.repository.admin.AssignmentRepository; +import de.thpeetz.kontor.repository.admin.MailAccountRepository; +import de.thpeetz.kontor.repository.admin.ProfileRepository; +import de.thpeetz.kontor.services.AdminService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/setup/SetupModuleBookshelf.java b/kontor-spring/src/main/java/de/thpeetz/kontor/setup/SetupModuleBookshelf.java new file mode 100644 index 0000000..028fed4 --- /dev/null +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/setup/SetupModuleBookshelf.java @@ -0,0 +1,23 @@ +package de.thpeetz.kontor.setup; + +import org.springframework.context.ApplicationListener; +import org.springframework.context.event.ContextRefreshedEvent; +import org.springframework.stereotype.Component; + +import lombok.extern.slf4j.Slf4j; + +@Slf4j +@Component +public class SetupModuleBookshelf implements ApplicationListener { + + boolean alreadySetup = false; + + @Override + public void onApplicationEvent(ContextRefreshedEvent event) { + if (alreadySetup) { + log.info("SetupModuleBookshelf already executed, skipping"); + return; + } + log.info("Set up Bookshelf data"); + } +} diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/setup/SetupModuleComics.java b/kontor-spring/src/main/java/de/thpeetz/kontor/setup/SetupModuleComics.java new file mode 100644 index 0000000..33fc5af --- /dev/null +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/setup/SetupModuleComics.java @@ -0,0 +1,23 @@ +package de.thpeetz.kontor.setup; + +import org.springframework.context.ApplicationListener; +import org.springframework.context.event.ContextRefreshedEvent; +import org.springframework.stereotype.Component; + +import lombok.extern.slf4j.Slf4j; + +@Slf4j +@Component +public class SetupModuleComics implements ApplicationListener { + + boolean alreadySetup = false; + + @Override + public void onApplicationEvent(ContextRefreshedEvent event) { + if (alreadySetup) { + log.info("SetupModuleComics already executed, skipping"); + return; + } + log.info("Set up Comics data"); + } +} diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/SetupModuleMedia.java b/kontor-spring/src/main/java/de/thpeetz/kontor/setup/SetupModuleMedia.java similarity index 85% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/SetupModuleMedia.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/setup/SetupModuleMedia.java index f6bb939..5cd835e 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/SetupModuleMedia.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/setup/SetupModuleMedia.java @@ -1,11 +1,12 @@ -package de.thpeetz.kontor.media; +package de.thpeetz.kontor.setup; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.stereotype.Component; -import de.thpeetz.kontor.admin.services.AdminService; +import de.thpeetz.kontor.constants.MediaConstants; +import de.thpeetz.kontor.services.AdminService; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/setup/SetupModuleTysc.java b/kontor-spring/src/main/java/de/thpeetz/kontor/setup/SetupModuleTysc.java new file mode 100644 index 0000000..66c6936 --- /dev/null +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/setup/SetupModuleTysc.java @@ -0,0 +1,25 @@ +package de.thpeetz.kontor.setup; + + +import org.springframework.context.ApplicationListener; +import org.springframework.context.event.ContextRefreshedEvent; +import org.springframework.stereotype.Component; + +import lombok.extern.slf4j.Slf4j; + +@Slf4j +@Component +public class SetupModuleTysc implements ApplicationListener { + + boolean alreadySetup = false; + + @Override + public void onApplicationEvent(ContextRefreshedEvent event) { + if (alreadySetup) { + log.info("SetupDataLoader(TYSC) already executed, skipping"); + return; + } + log.info("Setp up TYSC data"); + alreadySetup = true; + } +} diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/SetupModuleTysc.java b/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/SetupModuleTysc.java deleted file mode 100644 index e80ad67..0000000 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/SetupModuleTysc.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.thpeetz.kontor.tysc; - -import de.thpeetz.kontor.tysc.data.Card; -import de.thpeetz.kontor.tysc.data.CardSet; -import de.thpeetz.kontor.tysc.data.Player; -import de.thpeetz.kontor.tysc.data.Rooster; -import de.thpeetz.kontor.tysc.data.Sport; -import de.thpeetz.kontor.tysc.data.Team; -import de.thpeetz.kontor.tysc.data.Vendor; -import de.thpeetz.kontor.tysc.repository.CardRepository; -import de.thpeetz.kontor.tysc.repository.CardSetRepository; -import de.thpeetz.kontor.tysc.repository.FieldPositionRepository; -import de.thpeetz.kontor.tysc.repository.PlayerRepository; -import de.thpeetz.kontor.tysc.repository.RoosterRepository; -import de.thpeetz.kontor.tysc.repository.SportRepository; -import de.thpeetz.kontor.tysc.repository.TeamRepository; -import de.thpeetz.kontor.tysc.repository.VendorRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationListener; -import org.springframework.context.event.ContextRefreshedEvent; -import org.springframework.stereotype.Component; - -import de.thpeetz.kontor.tysc.data.FieldPosition; -import lombok.extern.slf4j.Slf4j; - -@Slf4j -@Component -public class SetupModuleTysc implements ApplicationListener { - - boolean alreadySetup = false; - - @Autowired - private SportRepository sportRepository; - - @Autowired - private TeamRepository teamRepository; - - @Autowired - private VendorRepository vendorRepository; - - @Autowired - private FieldPositionRepository fieldPositionRepository; - - @Autowired - private PlayerRepository playerRepository; - - @Autowired - private CardSetRepository cardSetRepository; - - @Autowired - private RoosterRepository roosterRepository; - - @Autowired - private CardRepository cardRepository; - - @Override - public void onApplicationEvent(ContextRefreshedEvent event) { - if (alreadySetup) { - log.info("SetupDataLoader(TYSC) already executed, skipping"); - return; - } - log.info("Setp up TYSC data"); - alreadySetup = true; - } -} diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/data/views/DataManagementView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/DataManagementView.java similarity index 90% rename from kontor-spring/src/main/java/de/thpeetz/kontor/data/views/DataManagementView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/DataManagementView.java index 43e0675..12a98d7 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/data/views/DataManagementView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/DataManagementView.java @@ -1,12 +1,13 @@ -package de.thpeetz.kontor.data.views; +package de.thpeetz.kontor.views; import com.vaadin.flow.component.checkbox.Checkbox; import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.common.views.MainLayout; -import de.thpeetz.kontor.data.services.DataManagementService; + +import de.thpeetz.kontor.services.DataManagementService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.PermitAll; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Scope; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/mailclient/views/EmailView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/EmailView.java similarity index 97% rename from kontor-spring/src/main/java/de/thpeetz/kontor/mailclient/views/EmailView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/EmailView.java index 4235dd1..6b5ac1b 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/mailclient/views/EmailView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/EmailView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.mailclient.views; +package de.thpeetz.kontor.views; import java.time.LocalDateTime; import java.time.ZoneOffset; @@ -34,9 +34,9 @@ import com.vaadin.flow.router.RouteAlias; import com.vaadin.flow.server.auth.AnonymousAllowed; import com.vaadin.flow.theme.lumo.LumoUtility.Gap; -import de.thpeetz.kontor.mailclient.data.MailAccount; -import de.thpeetz.kontor.admin.services.MailService; -import de.thpeetz.kontor.common.views.MainLayout; +import de.thpeetz.kontor.data.mailclient.MailAccount; +import de.thpeetz.kontor.services.MailService; +import de.thpeetz.kontor.views.common.MainLayout; import lombok.extern.slf4j.Slf4j; @Slf4j @@ -83,12 +83,12 @@ public class EmailView extends Composite { imapFolder.open(Folder.READ_ONLY); Message[] messages = imapFolder.getMessages(); log.info("Folder {} opened", folder.getFullName()); - int messageCount = folder.getMessageCount(); + //TODO int messageCount = folder.getMessageCount(); log.info("{} messages found", messages.length); for (Message message : messages) { log.info("Message {}: {}, {}, {}", message.getMessageNumber(), message.getSubject(), message.getReceivedDate(), message.getSentDate()); //log.info("Message: {}", message.getAllRecipients()); - Address[] addresses; + //TODO Address[] addresses; printAddress(message.getRecipients(Message.RecipientType.TO)); printAddress(message.getRecipients(Message.RecipientType.CC)); printAddress(message.getRecipients(Message.RecipientType.BCC)); diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/data/views/ImportArea.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/ImportArea.java similarity index 97% rename from kontor-spring/src/main/java/de/thpeetz/kontor/data/views/ImportArea.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/ImportArea.java index 831f6a3..94aa935 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/data/views/ImportArea.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/ImportArea.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.data.views; +package de.thpeetz.kontor.views; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -7,7 +7,8 @@ import com.vaadin.flow.component.checkbox.Checkbox; import com.vaadin.flow.component.html.H4; import com.vaadin.flow.component.html.Paragraph; import com.vaadin.flow.component.orderedlayout.VerticalLayout; -import de.thpeetz.kontor.data.services.DataManagementService; + +import de.thpeetz.kontor.services.DataManagementService; import lombok.extern.slf4j.Slf4j; import org.json.simple.parser.ParseException; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/data/views/UploadArea.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/UploadArea.java similarity index 97% rename from kontor-spring/src/main/java/de/thpeetz/kontor/data/views/UploadArea.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/UploadArea.java index f82efda..618a23d 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/data/views/UploadArea.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/UploadArea.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.data.views; +package de.thpeetz.kontor.views; import com.vaadin.flow.component.html.Span; import com.vaadin.flow.component.orderedlayout.VerticalLayout; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/AdminLayout.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/AdminLayout.java similarity index 86% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/AdminLayout.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/AdminLayout.java index 3e7a870..ea09da9 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/AdminLayout.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/AdminLayout.java @@ -1,13 +1,13 @@ -package de.thpeetz.kontor.admin.views; +package de.thpeetz.kontor.views.admin; import com.vaadin.flow.component.applayout.AppLayout; import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.theme.lumo.LumoUtility; -import de.thpeetz.kontor.admin.AdminConstants; -import de.thpeetz.kontor.admin.services.AdminService; -import de.thpeetz.kontor.common.views.KontorLayoutUtil; +import de.thpeetz.kontor.constants.AdminConstants; import de.thpeetz.kontor.security.SecurityService; +import de.thpeetz.kontor.services.AdminService; +import de.thpeetz.kontor.views.common.KontorLayoutUtil; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/AssignmentForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/AssignmentForm.java similarity index 95% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/AssignmentForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/AssignmentForm.java index 3dcd115..0c719f8 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/AssignmentForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/AssignmentForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.admin.views; +package de.thpeetz.kontor.views.admin; import java.util.List; @@ -13,9 +13,9 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.admin.data.Assignment; -import de.thpeetz.kontor.admin.data.Permission; -import de.thpeetz.kontor.admin.data.Profile; +import de.thpeetz.kontor.data.admin.Assignment; +import de.thpeetz.kontor.data.admin.Permission; +import de.thpeetz.kontor.data.admin.Profile; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/AssignmentView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/AssignmentView.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/AssignmentView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/AssignmentView.java index bc4e547..b81fc34 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/AssignmentView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/AssignmentView.java @@ -1,6 +1,5 @@ -package de.thpeetz.kontor.admin.views; +package de.thpeetz.kontor.views.admin; -import de.thpeetz.kontor.admin.data.Assignment; import org.springframework.context.annotation.Scope; import com.vaadin.flow.component.Component; @@ -13,9 +12,10 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.admin.AdminConstants; -import de.thpeetz.kontor.admin.services.AdminService; -import de.thpeetz.kontor.common.views.MainLayout; +import de.thpeetz.kontor.constants.AdminConstants; +import de.thpeetz.kontor.data.admin.Assignment; +import de.thpeetz.kontor.services.AdminService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.RolesAllowed; import lombok.extern.slf4j.Slf4j; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/LoginView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/LoginView.java similarity index 97% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/LoginView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/LoginView.java index 286bc03..07f6650 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/LoginView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/LoginView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.admin.views; +package de.thpeetz.kontor.views.admin; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/PermissionForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/PermissionForm.java similarity index 97% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/PermissionForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/PermissionForm.java index 521c992..c2fccb6 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/PermissionForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/PermissionForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.admin.views; +package de.thpeetz.kontor.views.admin; import com.vaadin.flow.component.ComponentEvent; import com.vaadin.flow.component.ComponentEventListener; @@ -10,7 +10,8 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.admin.data.Permission; + +import de.thpeetz.kontor.data.admin.Permission; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/PermissionView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/PermissionView.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/PermissionView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/PermissionView.java index f23881d..c7f1505 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/PermissionView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/PermissionView.java @@ -1,6 +1,5 @@ -package de.thpeetz.kontor.admin.views; +package de.thpeetz.kontor.views.admin; -import de.thpeetz.kontor.admin.data.Permission; import org.springframework.context.annotation.Scope; import com.vaadin.flow.component.Component; @@ -14,9 +13,10 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.admin.AdminConstants; -import de.thpeetz.kontor.admin.services.AdminService; -import de.thpeetz.kontor.common.views.MainLayout; +import de.thpeetz.kontor.constants.AdminConstants; +import de.thpeetz.kontor.data.admin.Permission; +import de.thpeetz.kontor.services.AdminService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.RolesAllowed; import lombok.extern.slf4j.Slf4j; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/ProfileForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/ProfileForm.java similarity index 97% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/ProfileForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/ProfileForm.java index cb3166c..5053683 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/ProfileForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/ProfileForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.admin.views; +package de.thpeetz.kontor.views.admin; import com.vaadin.flow.component.ComponentEvent; import com.vaadin.flow.component.ComponentEventListener; @@ -15,8 +15,9 @@ import com.vaadin.flow.component.textfield.PasswordField; import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.admin.data.Permission; -import de.thpeetz.kontor.admin.data.Profile; + +import de.thpeetz.kontor.data.admin.Permission; +import de.thpeetz.kontor.data.admin.Profile; import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/ProfileView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/ProfileView.java similarity index 94% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/ProfileView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/ProfileView.java index 16bc6b0..117f5dc 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/ProfileView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/ProfileView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.admin.views; +package de.thpeetz.kontor.views.admin; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.button.Button; @@ -10,10 +10,11 @@ import com.vaadin.flow.data.value.ValueChangeMode; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.admin.data.Permission; -import de.thpeetz.kontor.admin.data.Profile; -import de.thpeetz.kontor.admin.services.KontorUserDetailsService; -import de.thpeetz.kontor.common.views.MainLayout; + +import de.thpeetz.kontor.data.admin.Permission; +import de.thpeetz.kontor.data.admin.Profile; +import de.thpeetz.kontor.services.KontorUserDetailsService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.RolesAllowed; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/UserProfileView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/UserProfileView.java similarity index 92% rename from kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/UserProfileView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/UserProfileView.java index ef00bf2..81811a6 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/admin/views/UserProfileView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/admin/UserProfileView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.admin.views; +package de.thpeetz.kontor.views.admin; import com.vaadin.flow.component.Key; import com.vaadin.flow.component.button.Button; @@ -10,10 +10,11 @@ import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; -import de.thpeetz.kontor.admin.data.Profile; -import de.thpeetz.kontor.admin.services.AdminService; -import de.thpeetz.kontor.common.views.MainLayout; + +import de.thpeetz.kontor.data.admin.Profile; import de.thpeetz.kontor.security.SecurityService; +import de.thpeetz.kontor.services.AdminService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.PermitAll; import lombok.extern.slf4j.Slf4j; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/ArticleForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/ArticleForm.java similarity index 96% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/ArticleForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/ArticleForm.java index cf3d9f4..54f80e3 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/ArticleForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/ArticleForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.bookshelf.views; +package de.thpeetz.kontor.views.bookshelf; import com.vaadin.flow.component.ComponentEvent; import com.vaadin.flow.component.ComponentEventListener; @@ -11,8 +11,9 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.bookshelf.data.Article; -import de.thpeetz.kontor.bookshelf.data.Author; + +import de.thpeetz.kontor.data.bookshelf.Article; +import de.thpeetz.kontor.data.bookshelf.Author; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/ArticleView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/ArticleView.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/ArticleView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/ArticleView.java index fe813d2..e378a48 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/ArticleView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/ArticleView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.bookshelf.views; +package de.thpeetz.kontor.views.bookshelf; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.button.Button; @@ -10,10 +10,11 @@ import com.vaadin.flow.data.value.ValueChangeMode; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.bookshelf.BookshelfConstants; -import de.thpeetz.kontor.bookshelf.data.Article; -import de.thpeetz.kontor.bookshelf.services.BookshelfService; -import de.thpeetz.kontor.common.views.MainLayout; + +import de.thpeetz.kontor.constants.BookshelfConstants; +import de.thpeetz.kontor.data.bookshelf.Article; +import de.thpeetz.kontor.services.BookshelfService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.PermitAll; import lombok.Getter; import org.springframework.context.annotation.Scope; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/AuthorForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/AuthorForm.java similarity index 96% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/AuthorForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/AuthorForm.java index 29349ec..4d170c7 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/AuthorForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/AuthorForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.bookshelf.views; +package de.thpeetz.kontor.views.bookshelf; import com.vaadin.flow.component.ComponentEvent; import com.vaadin.flow.component.ComponentEventListener; @@ -11,8 +11,9 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.bookshelf.data.Author; -import de.thpeetz.kontor.bookshelf.data.Book; + +import de.thpeetz.kontor.data.bookshelf.Author; +import de.thpeetz.kontor.data.bookshelf.Book; import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/AuthorView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/AuthorView.java similarity index 92% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/AuthorView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/AuthorView.java index 17897b0..1a66294 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/AuthorView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/AuthorView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.bookshelf.views; +package de.thpeetz.kontor.views.bookshelf; import java.util.stream.Collectors; @@ -15,11 +15,11 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.bookshelf.BookshelfConstants; -import de.thpeetz.kontor.bookshelf.data.Author; -import de.thpeetz.kontor.bookshelf.data.BookAuthor; -import de.thpeetz.kontor.bookshelf.services.BookshelfService; -import de.thpeetz.kontor.common.views.MainLayout; +import de.thpeetz.kontor.constants.BookshelfConstants; +import de.thpeetz.kontor.data.bookshelf.Author; +import de.thpeetz.kontor.data.bookshelf.BookAuthor; +import de.thpeetz.kontor.services.BookshelfService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.PermitAll; @SpringComponent diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/BookForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/BookForm.java similarity index 96% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/BookForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/BookForm.java index 61da274..5988958 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/BookForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/BookForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.bookshelf.views; +package de.thpeetz.kontor.views.bookshelf; import com.vaadin.flow.component.ComponentEvent; import com.vaadin.flow.component.ComponentEventListener; @@ -12,8 +12,9 @@ import com.vaadin.flow.component.textfield.IntegerField; import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.bookshelf.data.Book; -import de.thpeetz.kontor.bookshelf.data.BookshelfPublisher; + +import de.thpeetz.kontor.data.bookshelf.Book; +import de.thpeetz.kontor.data.bookshelf.BookshelfPublisher; import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/BookView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/BookView.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/BookView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/BookView.java index 9e04dc6..f0275e7 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/BookView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/BookView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.bookshelf.views; +package de.thpeetz.kontor.views.bookshelf; import org.springframework.context.annotation.Scope; @@ -13,10 +13,10 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.bookshelf.BookshelfConstants; -import de.thpeetz.kontor.bookshelf.data.Book; -import de.thpeetz.kontor.bookshelf.services.BookshelfService; -import de.thpeetz.kontor.common.views.MainLayout; +import de.thpeetz.kontor.constants.BookshelfConstants; +import de.thpeetz.kontor.data.bookshelf.Book; +import de.thpeetz.kontor.services.BookshelfService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.PermitAll; import lombok.Getter; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/BookshelfLayout.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/BookshelfLayout.java similarity index 86% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/BookshelfLayout.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/BookshelfLayout.java index 8a340c2..8d4466b 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/BookshelfLayout.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/BookshelfLayout.java @@ -1,13 +1,13 @@ -package de.thpeetz.kontor.bookshelf.views; +package de.thpeetz.kontor.views.bookshelf; import com.vaadin.flow.component.applayout.AppLayout; import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.theme.lumo.LumoUtility; -import de.thpeetz.kontor.admin.services.AdminService; -import de.thpeetz.kontor.bookshelf.BookshelfConstants; -import de.thpeetz.kontor.common.views.KontorLayoutUtil; +import de.thpeetz.kontor.constants.BookshelfConstants; import de.thpeetz.kontor.security.SecurityService; +import de.thpeetz.kontor.services.AdminService; +import de.thpeetz.kontor.views.common.KontorLayoutUtil; public class BookshelfLayout extends AppLayout { diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/BookshelfPublisherView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/BookshelfPublisherView.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/BookshelfPublisherView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/BookshelfPublisherView.java index c904909..1e4bf19 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/BookshelfPublisherView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/BookshelfPublisherView.java @@ -1,6 +1,5 @@ -package de.thpeetz.kontor.bookshelf.views; +package de.thpeetz.kontor.views.bookshelf; -import de.thpeetz.kontor.common.views.MainLayout; import org.springframework.context.annotation.Scope; import com.vaadin.flow.component.Component; @@ -14,9 +13,10 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.bookshelf.BookshelfConstants; -import de.thpeetz.kontor.bookshelf.data.BookshelfPublisher; -import de.thpeetz.kontor.bookshelf.services.BookshelfService; +import de.thpeetz.kontor.constants.BookshelfConstants; +import de.thpeetz.kontor.data.bookshelf.BookshelfPublisher; +import de.thpeetz.kontor.services.BookshelfService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.PermitAll; @SpringComponent diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/PublisherForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/PublisherForm.java similarity index 97% rename from kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/PublisherForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/PublisherForm.java index 7b48122..7f23ca0 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/bookshelf/views/PublisherForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/bookshelf/PublisherForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.bookshelf.views; +package de.thpeetz.kontor.views.bookshelf; import com.vaadin.flow.component.ComponentEvent; import com.vaadin.flow.component.ComponentEventListener; @@ -11,7 +11,7 @@ import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.bookshelf.data.BookshelfPublisher; +import de.thpeetz.kontor.data.bookshelf.BookshelfPublisher; public class PublisherForm extends FormLayout { private TextField name = new TextField("Name"); diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/ArtistForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/ArtistForm.java similarity index 96% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/ArtistForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/ArtistForm.java index 5eb1e0d..9a4285f 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/ArtistForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/ArtistForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.comics.views; +package de.thpeetz.kontor.views.comics; import java.util.List; @@ -14,8 +14,8 @@ import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.comics.data.Artist; -import de.thpeetz.kontor.comics.data.ComicWork; +import de.thpeetz.kontor.data.comics.Artist; +import de.thpeetz.kontor.data.comics.ComicWork; import lombok.*; import lombok.extern.slf4j.Slf4j; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/ArtistView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/ArtistView.java similarity index 95% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/ArtistView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/ArtistView.java index 1a6b2a5..d5c2c4e 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/ArtistView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/ArtistView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.comics.views; +package de.thpeetz.kontor.views.comics; import lombok.Getter; import org.springframework.context.annotation.Scope; @@ -14,9 +14,9 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.comics.data.Artist; -import de.thpeetz.kontor.comics.services.ComicService; -import de.thpeetz.kontor.common.views.MainLayout; +import de.thpeetz.kontor.data.comics.Artist; +import de.thpeetz.kontor.services.ComicService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.PermitAll; @SpringComponent diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/ComicForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/ComicForm.java similarity index 96% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/ComicForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/ComicForm.java index 56aa1b2..ca79a91 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/ComicForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/ComicForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.comics.views; +package de.thpeetz.kontor.views.comics; import java.util.List; @@ -20,9 +20,9 @@ import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.comics.data.Comic; -import de.thpeetz.kontor.comics.data.ComicWork; -import de.thpeetz.kontor.comics.data.Publisher; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.ComicWork; +import de.thpeetz.kontor.data.comics.Publisher; public class ComicForm extends FormLayout { diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/ComicLayout.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/ComicLayout.java similarity index 88% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/ComicLayout.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/ComicLayout.java index cffdbdb..4bccc2e 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/ComicLayout.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/ComicLayout.java @@ -1,13 +1,13 @@ -package de.thpeetz.kontor.comics.views; +package de.thpeetz.kontor.views.comics; import com.vaadin.flow.component.applayout.AppLayout; import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.theme.lumo.LumoUtility; -import de.thpeetz.kontor.admin.services.AdminService; -import de.thpeetz.kontor.comics.ComicConstants; -import de.thpeetz.kontor.common.views.KontorLayoutUtil; +import de.thpeetz.kontor.constants.ComicConstants; import de.thpeetz.kontor.security.SecurityService; +import de.thpeetz.kontor.services.AdminService; +import de.thpeetz.kontor.views.common.KontorLayoutUtil; import lombok.extern.slf4j.Slf4j; /** diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/ComicView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/ComicView.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/ComicView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/ComicView.java index 7437193..b8669f5 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/ComicView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/ComicView.java @@ -1,9 +1,10 @@ -package de.thpeetz.kontor.comics.views; +package de.thpeetz.kontor.views.comics; + +import de.thpeetz.kontor.views.common.ColumnToggleContextMenu; +import de.thpeetz.kontor.views.common.MainLayout; +import de.thpeetz.kontor.views.common.SearchFilterField; +import de.thpeetz.kontor.views.common.StatusIcon; -import de.thpeetz.kontor.common.views.ColumnToggleContextMenu; -import de.thpeetz.kontor.common.views.MainLayout; -import de.thpeetz.kontor.common.views.SearchFilterField; -import de.thpeetz.kontor.common.views.StatusIcon; import org.springframework.context.annotation.Scope; import com.vaadin.flow.component.Component; @@ -16,9 +17,9 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.comics.ComicConstants; -import de.thpeetz.kontor.comics.data.Comic; -import de.thpeetz.kontor.comics.services.ComicService; +import de.thpeetz.kontor.constants.ComicConstants; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.services.ComicService; import jakarta.annotation.security.PermitAll; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/ComicWorkForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/ComicWorkForm.java similarity index 94% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/ComicWorkForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/ComicWorkForm.java index 698a37e..490e5b9 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/ComicWorkForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/ComicWorkForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.comics.views; +package de.thpeetz.kontor.views.comics; import java.util.List; @@ -13,10 +13,10 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.comics.data.Artist; -import de.thpeetz.kontor.comics.data.Comic; -import de.thpeetz.kontor.comics.data.ComicWork; -import de.thpeetz.kontor.comics.data.Worktype; +import de.thpeetz.kontor.data.comics.Artist; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.ComicWork; +import de.thpeetz.kontor.data.comics.Worktype; public class ComicWorkForm extends FormLayout { ComboBox comic = new ComboBox<>("Comic"); diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/ComicWorkView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/ComicWorkView.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/ComicWorkView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/ComicWorkView.java index 449a76c..ac3d494 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/ComicWorkView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/ComicWorkView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.comics.views; +package de.thpeetz.kontor.views.comics; import org.springframework.context.annotation.Scope; @@ -11,10 +11,10 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.comics.ComicConstants; -import de.thpeetz.kontor.comics.data.ComicWork; -import de.thpeetz.kontor.comics.services.ComicService; -import de.thpeetz.kontor.common.views.MainLayout; +import de.thpeetz.kontor.constants.ComicConstants; +import de.thpeetz.kontor.data.comics.ComicWork; +import de.thpeetz.kontor.services.ComicService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.PermitAll; @SpringComponent diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/IssueForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/IssueForm.java similarity index 94% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/IssueForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/IssueForm.java index 2f59921..01838a1 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/IssueForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/IssueForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.comics.views; +package de.thpeetz.kontor.views.comics; import java.util.List; @@ -16,11 +16,12 @@ import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.comics.data.Comic; -import de.thpeetz.kontor.comics.data.Issue; -import de.thpeetz.kontor.comics.data.IssueWork; -import de.thpeetz.kontor.comics.data.Volume; -import de.thpeetz.kontor.common.views.YearMonthField; + +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.Issue; +import de.thpeetz.kontor.data.comics.IssueWork; +import de.thpeetz.kontor.data.comics.Volume; +import de.thpeetz.kontor.views.common.YearMonthField; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/IssueView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/IssueView.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/IssueView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/IssueView.java index bd441b0..307b5ec 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/IssueView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/IssueView.java @@ -1,10 +1,9 @@ -package de.thpeetz.kontor.comics.views; +package de.thpeetz.kontor.views.comics; import com.vaadin.flow.component.button.ButtonVariant; import com.vaadin.flow.component.grid.GridSortOrder; import com.vaadin.flow.data.provider.SortDirection; -import de.thpeetz.kontor.common.views.ColumnToggleContextMenu; -import de.thpeetz.kontor.common.views.StatusIcon; + import org.springframework.context.annotation.Scope; import com.vaadin.flow.component.Component; @@ -17,11 +16,15 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.comics.ComicConstants; -import de.thpeetz.kontor.comics.data.Comic; -import de.thpeetz.kontor.comics.data.Issue; -import de.thpeetz.kontor.comics.services.ComicService; -import de.thpeetz.kontor.common.views.MainLayout; +import de.thpeetz.kontor.constants.ComicConstants; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.Issue; +import de.thpeetz.kontor.services.ComicService; +import de.thpeetz.kontor.views.comics.IssueForm.DeleteEvent; +import de.thpeetz.kontor.views.comics.IssueForm.SaveEvent; +import de.thpeetz.kontor.views.common.ColumnToggleContextMenu; +import de.thpeetz.kontor.views.common.MainLayout; +import de.thpeetz.kontor.views.common.StatusIcon; import jakarta.annotation.security.PermitAll; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/IssueWorkForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/IssueWorkForm.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/IssueWorkForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/IssueWorkForm.java index 597d3e0..077dab5 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/IssueWorkForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/IssueWorkForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.comics.views; +package de.thpeetz.kontor.views.comics; import java.util.List; @@ -13,11 +13,11 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.comics.data.Artist; -import de.thpeetz.kontor.comics.data.Comic; -import de.thpeetz.kontor.comics.data.IssueWork; -import de.thpeetz.kontor.comics.data.Worktype; -import de.thpeetz.kontor.common.views.ComicIssueField; +import de.thpeetz.kontor.data.comics.Artist; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.IssueWork; +import de.thpeetz.kontor.data.comics.Worktype; +import de.thpeetz.kontor.views.common.ComicIssueField; public class IssueWorkForm extends FormLayout { ComicIssueField issue = new ComicIssueField("Issue"); diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/IssueWorkView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/IssueWorkView.java similarity index 92% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/IssueWorkView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/IssueWorkView.java index 3bc267d..ecd9a1e 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/IssueWorkView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/IssueWorkView.java @@ -1,7 +1,5 @@ -package de.thpeetz.kontor.comics.views; +package de.thpeetz.kontor.views.comics; -import de.thpeetz.kontor.comics.data.Issue; -import de.thpeetz.kontor.comics.data.IssueWork; import lombok.Getter; import org.springframework.context.annotation.Scope; @@ -14,9 +12,11 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.comics.ComicConstants; -import de.thpeetz.kontor.comics.services.ComicService; -import de.thpeetz.kontor.common.views.MainLayout; +import de.thpeetz.kontor.constants.ComicConstants; +import de.thpeetz.kontor.data.comics.Issue; +import de.thpeetz.kontor.data.comics.IssueWork; +import de.thpeetz.kontor.services.ComicService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.PermitAll; @SpringComponent diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/PublisherForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/PublisherForm.java similarity index 97% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/PublisherForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/PublisherForm.java index 6b1c866..8c13e56 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/PublisherForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/PublisherForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.comics.views; +package de.thpeetz.kontor.views.comics; import com.vaadin.flow.component.ComponentEvent; import com.vaadin.flow.component.ComponentEventListener; @@ -12,7 +12,7 @@ import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.comics.data.Publisher; +import de.thpeetz.kontor.data.comics.Publisher; import lombok.*; import java.util.*; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/PublisherView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/PublisherView.java similarity index 94% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/PublisherView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/PublisherView.java index cf1eae8..10ad849 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/PublisherView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/PublisherView.java @@ -1,8 +1,10 @@ -package de.thpeetz.kontor.comics.views; +package de.thpeetz.kontor.views.comics; import com.vaadin.flow.component.button.*; -import de.thpeetz.kontor.comics.data.*; -import de.thpeetz.kontor.common.views.*; +import de.thpeetz.kontor.constants.ComicConstants; +import de.thpeetz.kontor.views.common.ColumnToggleContextMenu; +import de.thpeetz.kontor.views.common.MainLayout; +import de.thpeetz.kontor.views.common.StatusIcon; import lombok.*; import org.springframework.context.annotation.Scope; @@ -16,8 +18,8 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.comics.ComicConstants; -import de.thpeetz.kontor.comics.services.ComicService; +import de.thpeetz.kontor.data.comics.Publisher; +import de.thpeetz.kontor.services.ComicService; import jakarta.annotation.security.PermitAll; @SpringComponent diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/StoryArcForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/StoryArcForm.java similarity index 96% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/StoryArcForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/StoryArcForm.java index 786a792..4774c14 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/StoryArcForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/StoryArcForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.comics.views; +package de.thpeetz.kontor.views.comics; import com.vaadin.flow.component.ComponentEvent; import com.vaadin.flow.component.ComponentEventListener; @@ -12,8 +12,8 @@ import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.comics.data.Comic; -import de.thpeetz.kontor.comics.data.StoryArc; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.StoryArc; import java.util.List; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/StoryArcView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/StoryArcView.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/StoryArcView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/StoryArcView.java index 6044383..a12a230 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/StoryArcView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/StoryArcView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.comics.views; +package de.thpeetz.kontor.views.comics; import org.springframework.context.annotation.Scope; @@ -12,11 +12,11 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.comics.ComicConstants; -import de.thpeetz.kontor.comics.data.Comic; -import de.thpeetz.kontor.comics.data.StoryArc; -import de.thpeetz.kontor.comics.services.ComicService; -import de.thpeetz.kontor.common.views.MainLayout; +import de.thpeetz.kontor.constants.ComicConstants; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.StoryArc; +import de.thpeetz.kontor.services.ComicService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.PermitAll; import lombok.extern.slf4j.Slf4j; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/TradePaperBackForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/TradePaperBackForm.java similarity index 96% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/TradePaperBackForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/TradePaperBackForm.java index 8a1b477..de87865 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/TradePaperBackForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/TradePaperBackForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.comics.views; +package de.thpeetz.kontor.views.comics; import java.util.List; @@ -14,8 +14,8 @@ import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.comics.data.Comic; -import de.thpeetz.kontor.comics.data.TradePaperback; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.TradePaperback; public class TradePaperBackForm extends FormLayout { TextField name = new TextField("Name"); diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/TradePaperbackView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/TradePaperbackView.java similarity index 94% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/TradePaperbackView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/TradePaperbackView.java index 0215234..5862e63 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/TradePaperbackView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/TradePaperbackView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.comics.views; +package de.thpeetz.kontor.views.comics; import org.springframework.context.annotation.Scope; @@ -13,10 +13,10 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.comics.ComicConstants; -import de.thpeetz.kontor.comics.data.TradePaperback; -import de.thpeetz.kontor.comics.services.ComicService; -import de.thpeetz.kontor.common.views.MainLayout; +import de.thpeetz.kontor.constants.ComicConstants; +import de.thpeetz.kontor.data.comics.TradePaperback; +import de.thpeetz.kontor.services.ComicService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.PermitAll; @SpringComponent diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/VolumeForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/VolumeForm.java similarity index 95% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/VolumeForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/VolumeForm.java index 9b333a9..06dcf80 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/VolumeForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/VolumeForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.comics.views; +package de.thpeetz.kontor.views.comics; import java.util.List; @@ -14,9 +14,8 @@ import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.comics.data.Comic; -import de.thpeetz.kontor.comics.data.StoryArc; -import de.thpeetz.kontor.comics.data.Volume; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.Volume; public class VolumeForm extends FormLayout { diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/VolumeView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/VolumeView.java similarity index 92% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/VolumeView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/VolumeView.java index 47a2201..0edfc77 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/VolumeView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/VolumeView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.comics.views; +package de.thpeetz.kontor.views.comics; import org.springframework.context.annotation.Scope; @@ -12,11 +12,11 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.comics.ComicConstants; -import de.thpeetz.kontor.comics.data.Comic; -import de.thpeetz.kontor.comics.data.Volume; -import de.thpeetz.kontor.comics.services.ComicService; -import de.thpeetz.kontor.common.views.MainLayout; +import de.thpeetz.kontor.constants.ComicConstants; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.Volume; +import de.thpeetz.kontor.services.ComicService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.PermitAll; import lombok.extern.slf4j.Slf4j; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/WorktypeForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/WorktypeForm.java similarity index 96% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/WorktypeForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/WorktypeForm.java index 0965229..48f50ad 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/WorktypeForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/WorktypeForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.comics.views; +package de.thpeetz.kontor.views.comics; import java.util.List; @@ -17,8 +17,8 @@ import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.comics.data.ComicWork; -import de.thpeetz.kontor.comics.data.Worktype; +import de.thpeetz.kontor.data.comics.ComicWork; +import de.thpeetz.kontor.data.comics.Worktype; public class WorktypeForm extends FormLayout { diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/WorktypeView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/WorktypeView.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/WorktypeView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/WorktypeView.java index b744e09..5b9afd0 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/comics/views/WorktypeView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/comics/WorktypeView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.comics.views; +package de.thpeetz.kontor.views.comics; import lombok.*; import org.springframework.context.annotation.Scope; @@ -14,10 +14,10 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.comics.ComicConstants; -import de.thpeetz.kontor.comics.data.Worktype; -import de.thpeetz.kontor.comics.services.ComicService; -import de.thpeetz.kontor.common.views.MainLayout; +import de.thpeetz.kontor.constants.ComicConstants; +import de.thpeetz.kontor.data.comics.Worktype; +import de.thpeetz.kontor.services.ComicService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.PermitAll; @SpringComponent diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/AvatarMenuBar.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/AvatarMenuBar.java similarity index 88% rename from kontor-spring/src/main/java/de/thpeetz/kontor/common/views/AvatarMenuBar.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/common/AvatarMenuBar.java index 39459ef..9e55e02 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/AvatarMenuBar.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/AvatarMenuBar.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.common.views; +package de.thpeetz.kontor.views.common; import com.vaadin.flow.component.avatar.Avatar; import com.vaadin.flow.component.contextmenu.MenuItem; @@ -8,12 +8,10 @@ import com.vaadin.flow.component.menubar.MenuBar; import com.vaadin.flow.component.menubar.MenuBarVariant; import com.vaadin.flow.router.Route; -import com.vaadin.flow.router.Router; -import de.thpeetz.kontor.admin.services.AdminService; -import de.thpeetz.kontor.admin.views.UserProfileView; import de.thpeetz.kontor.security.SecurityService; +import de.thpeetz.kontor.services.AdminService; +import de.thpeetz.kontor.views.admin.UserProfileView; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; @Slf4j @Route("avatar-menu-bar") diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/ColumnToggleContextMenu.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/ColumnToggleContextMenu.java similarity index 96% rename from kontor-spring/src/main/java/de/thpeetz/kontor/common/views/ColumnToggleContextMenu.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/common/ColumnToggleContextMenu.java index f2bd74e..c5d4f25 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/ColumnToggleContextMenu.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/ColumnToggleContextMenu.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.common.views; +package de.thpeetz.kontor.views.common; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.contextmenu.ContextMenu; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/ComicIssueField.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/ComicIssueField.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/common/views/ComicIssueField.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/common/ComicIssueField.java index 36ec905..20964a6 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/ComicIssueField.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/ComicIssueField.java @@ -1,12 +1,11 @@ -package de.thpeetz.kontor.common.views; +package de.thpeetz.kontor.views.common; import com.vaadin.flow.component.Unit; import com.vaadin.flow.component.customfield.CustomField; import com.vaadin.flow.component.select.Select; import lombok.extern.slf4j.Slf4j; - -import de.thpeetz.kontor.comics.data.Comic; -import de.thpeetz.kontor.comics.data.Issue; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.Issue; import java.util.List; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/FilterOption.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/FilterOption.java similarity index 89% rename from kontor-spring/src/main/java/de/thpeetz/kontor/common/views/FilterOption.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/common/FilterOption.java index 757d4ed..e6037de 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/FilterOption.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/FilterOption.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.common.views; +package de.thpeetz.kontor.views.common; import lombok.Getter; import lombok.Setter; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/KontorLayoutUtil.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/KontorLayoutUtil.java similarity index 92% rename from kontor-spring/src/main/java/de/thpeetz/kontor/common/views/KontorLayoutUtil.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/common/KontorLayoutUtil.java index 3a07cbb..668f22c 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/KontorLayoutUtil.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/KontorLayoutUtil.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.common.views; +package de.thpeetz.kontor.views.common; import com.vaadin.flow.component.applayout.AppLayout; import com.vaadin.flow.component.applayout.AppLayout.Section; @@ -13,12 +13,12 @@ import com.vaadin.flow.component.sidenav.SideNav; import com.vaadin.flow.router.RouterLink; import com.vaadin.flow.theme.lumo.LumoUtility; -import de.thpeetz.kontor.admin.AdminConstants; -import de.thpeetz.kontor.admin.services.AdminService; -import de.thpeetz.kontor.bookshelf.BookshelfConstants; -import de.thpeetz.kontor.comics.ComicConstants; +import de.thpeetz.kontor.constants.AdminConstants; +import de.thpeetz.kontor.constants.BookshelfConstants; +import de.thpeetz.kontor.constants.ComicConstants; +import de.thpeetz.kontor.constants.TyscConstants; import de.thpeetz.kontor.security.SecurityService; -import de.thpeetz.kontor.tysc.TyscConstants; +import de.thpeetz.kontor.services.AdminService; import lombok.*; import lombok.extern.slf4j.Slf4j; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/MainLayout.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/MainLayout.java similarity index 89% rename from kontor-spring/src/main/java/de/thpeetz/kontor/common/views/MainLayout.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/common/MainLayout.java index 95d60cc..f33beff 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/MainLayout.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/MainLayout.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.common.views; +package de.thpeetz.kontor.views.common; import com.vaadin.flow.component.applayout.AppLayout; import com.vaadin.flow.component.applayout.DrawerToggle; @@ -14,15 +14,15 @@ import com.vaadin.flow.component.sidenav.SideNavItem; import com.vaadin.flow.router.RouterLink; import com.vaadin.flow.theme.lumo.LumoUtility; -import de.thpeetz.kontor.admin.AdminConstants; -import de.thpeetz.kontor.admin.services.AdminService; -import de.thpeetz.kontor.bookshelf.BookshelfConstants; -import de.thpeetz.kontor.comics.ComicConstants; -import de.thpeetz.kontor.data.views.DataManagementView; -import de.thpeetz.kontor.mailclient.views.EmailView; -import de.thpeetz.kontor.media.MediaConstants; +import de.thpeetz.kontor.constants.AdminConstants; +import de.thpeetz.kontor.constants.BookshelfConstants; +import de.thpeetz.kontor.constants.ComicConstants; +import de.thpeetz.kontor.constants.MediaConstants; +import de.thpeetz.kontor.constants.TyscConstants; import de.thpeetz.kontor.security.SecurityService; -import de.thpeetz.kontor.tysc.TyscConstants; +import de.thpeetz.kontor.services.AdminService; +import de.thpeetz.kontor.views.DataManagementView; +import de.thpeetz.kontor.views.EmailView; import lombok.extern.slf4j.Slf4j; import java.util.ArrayList; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/MainView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/MainView.java similarity index 92% rename from kontor-spring/src/main/java/de/thpeetz/kontor/common/views/MainView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/common/MainView.java index 08edac9..ac60ec3 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/MainView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/MainView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.common.views; +package de.thpeetz.kontor.views.common; import org.springframework.context.annotation.Scope; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/SearchFilter.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/SearchFilter.java similarity index 94% rename from kontor-spring/src/main/java/de/thpeetz/kontor/common/views/SearchFilter.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/common/SearchFilter.java index 7eb97e5..cce626d 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/SearchFilter.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/SearchFilter.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.common.views; +package de.thpeetz.kontor.views.common; import java.util.HashMap; import java.util.LinkedList; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/SearchFilterField.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/SearchFilterField.java similarity index 98% rename from kontor-spring/src/main/java/de/thpeetz/kontor/common/views/SearchFilterField.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/common/SearchFilterField.java index 2d37df0..6e4c1a8 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/SearchFilterField.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/SearchFilterField.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.common.views; +package de.thpeetz.kontor.views.common; import java.util.LinkedList; import java.util.List; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/SeparateMainLayout.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/SeparateMainLayout.java similarity index 89% rename from kontor-spring/src/main/java/de/thpeetz/kontor/common/views/SeparateMainLayout.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/common/SeparateMainLayout.java index 3ea163f..47601a5 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/SeparateMainLayout.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/SeparateMainLayout.java @@ -1,11 +1,11 @@ -package de.thpeetz.kontor.common.views; +package de.thpeetz.kontor.views.common; import com.vaadin.flow.component.applayout.AppLayout; import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.theme.lumo.LumoUtility; -import de.thpeetz.kontor.admin.services.AdminService; import de.thpeetz.kontor.security.SecurityService; +import de.thpeetz.kontor.services.AdminService; public class SeparateMainLayout extends AppLayout { diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/StatusIcon.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/StatusIcon.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/common/views/StatusIcon.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/common/StatusIcon.java index 4e058c6..a2c03ae 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/StatusIcon.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/StatusIcon.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.common.views; +package de.thpeetz.kontor.views.common; import com.vaadin.flow.component.icon.Icon; import com.vaadin.flow.component.icon.VaadinIcon; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/YearMonthField.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/YearMonthField.java similarity index 97% rename from kontor-spring/src/main/java/de/thpeetz/kontor/common/views/YearMonthField.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/common/YearMonthField.java index edc228a..8a377e6 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/common/views/YearMonthField.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/common/YearMonthField.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.common.views; +package de.thpeetz.kontor.views.common; import com.vaadin.flow.component.Unit; import com.vaadin.flow.component.customfield.CustomField; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaActorFileForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaActorFileForm.java similarity index 95% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaActorFileForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaActorFileForm.java index ac3acb1..18ed2eb 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaActorFileForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaActorFileForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.media.views; +package de.thpeetz.kontor.views.media; import com.vaadin.flow.component.ComponentEvent; import com.vaadin.flow.component.ComponentEventListener; @@ -10,9 +10,10 @@ import com.vaadin.flow.component.formlayout.FormLayout; import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.media.data.MediaActor; -import de.thpeetz.kontor.media.data.MediaActorFile; -import de.thpeetz.kontor.media.data.MediaFile; + +import de.thpeetz.kontor.data.media.MediaActor; +import de.thpeetz.kontor.data.media.MediaActorFile; +import de.thpeetz.kontor.data.media.MediaFile; import lombok.Getter; import java.util.List; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaActorFileView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaActorFileView.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaActorFileView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaActorFileView.java index f1462b6..486ed4e 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaActorFileView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaActorFileView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.media.views; +package de.thpeetz.kontor.views.media; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.button.Button; @@ -8,10 +8,11 @@ import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.common.views.MainLayout; -import de.thpeetz.kontor.media.MediaConstants; -import de.thpeetz.kontor.media.data.MediaActorFile; -import de.thpeetz.kontor.media.services.MediaFileService; + +import de.thpeetz.kontor.constants.MediaConstants; +import de.thpeetz.kontor.data.media.MediaActorFile; +import de.thpeetz.kontor.services.MediaFileService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.PermitAll; import lombok.Getter; import org.springframework.context.annotation.Scope; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaActorForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaActorForm.java similarity index 96% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaActorForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaActorForm.java index b9a7dbd..a26839e 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaActorForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaActorForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.media.views; +package de.thpeetz.kontor.views.media; import com.vaadin.flow.component.ComponentEvent; import com.vaadin.flow.component.ComponentEventListener; @@ -11,8 +11,9 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.media.data.MediaActor; -import de.thpeetz.kontor.media.data.MediaActorFile; + +import de.thpeetz.kontor.data.media.MediaActor; +import de.thpeetz.kontor.data.media.MediaActorFile; import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaActorView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaActorView.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaActorView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaActorView.java index f864dee..bd6b4e1 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaActorView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaActorView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.media.views; +package de.thpeetz.kontor.views.media; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.button.Button; @@ -12,12 +12,11 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.common.views.ColumnToggleContextMenu; -import de.thpeetz.kontor.common.views.MainLayout; -import de.thpeetz.kontor.media.MediaConstants; -import de.thpeetz.kontor.media.data.MediaActor; -import de.thpeetz.kontor.media.data.MediaFile; -import de.thpeetz.kontor.media.services.MediaFileService; +import de.thpeetz.kontor.constants.MediaConstants; +import de.thpeetz.kontor.data.media.MediaActor; +import de.thpeetz.kontor.services.MediaFileService; +import de.thpeetz.kontor.views.common.ColumnToggleContextMenu; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.PermitAll; import lombok.Getter; import org.springframework.context.annotation.Scope; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaArticleForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaArticleForm.java similarity index 97% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaArticleForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaArticleForm.java index d658e4e..361f2a6 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaArticleForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaArticleForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.media.views; +package de.thpeetz.kontor.views.media; import com.vaadin.flow.component.ComponentEvent; import com.vaadin.flow.component.ComponentEventListener; @@ -11,7 +11,8 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.media.data.MediaArticle; + +import de.thpeetz.kontor.data.media.MediaArticle; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaArticleView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaArticleView.java similarity index 90% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaArticleView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaArticleView.java index 7728890..cdc3f22 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaArticleView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaArticleView.java @@ -1,11 +1,8 @@ -package de.thpeetz.kontor.media.views; +package de.thpeetz.kontor.views.media; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.button.Button; import com.vaadin.flow.component.button.ButtonVariant; -import com.vaadin.flow.component.contextmenu.ContextMenu; -import com.vaadin.flow.component.contextmenu.MenuItem; -import com.vaadin.flow.component.formlayout.FormLayout; import com.vaadin.flow.component.grid.Grid; import com.vaadin.flow.component.icon.Icon; import com.vaadin.flow.component.icon.VaadinIcon; @@ -16,12 +13,13 @@ import com.vaadin.flow.data.value.ValueChangeMode; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.common.views.MainLayout; -import de.thpeetz.kontor.common.views.ColumnToggleContextMenu; -import de.thpeetz.kontor.common.views.StatusIcon; -import de.thpeetz.kontor.media.MediaConstants; -import de.thpeetz.kontor.media.data.MediaArticle; -import de.thpeetz.kontor.media.services.MediaArticleService; + +import de.thpeetz.kontor.constants.MediaConstants; +import de.thpeetz.kontor.data.media.MediaArticle; +import de.thpeetz.kontor.services.MediaArticleService; +import de.thpeetz.kontor.views.common.ColumnToggleContextMenu; +import de.thpeetz.kontor.views.common.MainLayout; +import de.thpeetz.kontor.views.common.StatusIcon; import jakarta.annotation.security.PermitAll; import lombok.Getter; import org.springframework.context.annotation.Scope; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaFileForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaFileForm.java similarity index 96% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaFileForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaFileForm.java index 4b4b469..5a8aa9f 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaFileForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaFileForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.media.views; +package de.thpeetz.kontor.views.media; import com.vaadin.flow.component.ComponentEvent; import com.vaadin.flow.component.ComponentEventListener; @@ -12,8 +12,9 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.media.data.MediaActorFile; -import de.thpeetz.kontor.media.data.MediaFile; + +import de.thpeetz.kontor.data.media.MediaActorFile; +import de.thpeetz.kontor.data.media.MediaFile; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaFileView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaFileView.java similarity index 94% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaFileView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaFileView.java index 54bc040..9ca59df 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaFileView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaFileView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.media.views; +package de.thpeetz.kontor.views.media; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.button.Button; @@ -9,9 +9,12 @@ import com.vaadin.flow.component.orderedlayout.VerticalLayout; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.common.views.*; -import de.thpeetz.kontor.media.data.MediaFile; -import de.thpeetz.kontor.media.services.MediaFileService; +import de.thpeetz.kontor.data.media.MediaFile; +import de.thpeetz.kontor.services.MediaFileService; +import de.thpeetz.kontor.views.common.ColumnToggleContextMenu; +import de.thpeetz.kontor.views.common.MainLayout; +import de.thpeetz.kontor.views.common.SearchFilterField; +import de.thpeetz.kontor.views.common.StatusIcon; import jakarta.annotation.security.RolesAllowed; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaVideoForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaVideoForm.java similarity index 97% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaVideoForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaVideoForm.java index dbc8d47..869f883 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaVideoForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaVideoForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.media.views; +package de.thpeetz.kontor.views.media; import com.vaadin.flow.component.ComponentEvent; import com.vaadin.flow.component.ComponentEventListener; @@ -11,7 +11,8 @@ import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.media.data.MediaVideo; + +import de.thpeetz.kontor.data.media.MediaVideo; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaVideoView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaVideoView.java similarity index 92% rename from kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaVideoView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaVideoView.java index 37f5554..5f08840 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/media/views/MediaVideoView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/media/MediaVideoView.java @@ -1,10 +1,8 @@ -package de.thpeetz.kontor.media.views; +package de.thpeetz.kontor.views.media; import com.vaadin.flow.component.Component; import com.vaadin.flow.component.button.Button; import com.vaadin.flow.component.button.ButtonVariant; -import com.vaadin.flow.component.contextmenu.ContextMenu; -import com.vaadin.flow.component.contextmenu.MenuItem; import com.vaadin.flow.component.grid.Grid; import com.vaadin.flow.component.icon.Icon; import com.vaadin.flow.component.icon.VaadinIcon; @@ -15,12 +13,13 @@ import com.vaadin.flow.data.value.ValueChangeMode; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.common.views.MainLayout; -import de.thpeetz.kontor.common.views.ColumnToggleContextMenu; -import de.thpeetz.kontor.common.views.StatusIcon; -import de.thpeetz.kontor.media.MediaConstants; -import de.thpeetz.kontor.media.data.MediaVideo; -import de.thpeetz.kontor.media.services.MediaVideoService; + +import de.thpeetz.kontor.constants.MediaConstants; +import de.thpeetz.kontor.data.media.MediaVideo; +import de.thpeetz.kontor.services.MediaVideoService; +import de.thpeetz.kontor.views.common.ColumnToggleContextMenu; +import de.thpeetz.kontor.views.common.MainLayout; +import de.thpeetz.kontor.views.common.StatusIcon; import jakarta.annotation.security.PermitAll; import lombok.Getter; import org.springframework.context.annotation.Scope; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/CardForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/CardForm.java similarity index 95% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/CardForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/CardForm.java index 0b23ff6..de1d760 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/CardForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/CardForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import java.util.List; @@ -14,9 +14,9 @@ import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.tysc.data.Card; -import de.thpeetz.kontor.tysc.data.Rooster; -import de.thpeetz.kontor.tysc.data.Vendor; +import de.thpeetz.kontor.data.tysc.Card; +import de.thpeetz.kontor.data.tysc.Rooster; +import de.thpeetz.kontor.data.tysc.Vendor; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/CardSetForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/CardSetForm.java similarity index 97% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/CardSetForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/CardSetForm.java index d0e7e89..f5921cc 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/CardSetForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/CardSetForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import com.vaadin.flow.component.ComponentEvent; import com.vaadin.flow.component.ComponentEventListener; @@ -11,7 +11,7 @@ import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.tysc.data.CardSet; +import de.thpeetz.kontor.data.tysc.CardSet; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/CardSetView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/CardSetView.java similarity index 94% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/CardSetView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/CardSetView.java index 071e66d..1202234 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/CardSetView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/CardSetView.java @@ -1,8 +1,6 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import com.vaadin.flow.component.button.*; -import de.thpeetz.kontor.comics.data.*; -import de.thpeetz.kontor.common.views.*; import lombok.*; import org.springframework.context.annotation.Scope; @@ -16,13 +14,14 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.tysc.TyscConstants; -import de.thpeetz.kontor.tysc.data.CardSet; -import de.thpeetz.kontor.tysc.services.CardService; +import de.thpeetz.kontor.constants.TyscConstants; +import de.thpeetz.kontor.data.tysc.CardSet; +import de.thpeetz.kontor.services.CardService; +import de.thpeetz.kontor.views.common.ColumnToggleContextMenu; +import de.thpeetz.kontor.views.common.MainLayout; +import de.thpeetz.kontor.views.common.StatusIcon; import jakarta.annotation.security.PermitAll; -import java.util.*; - @SpringComponent @Scope("prototype") @PermitAll diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/CardView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/CardView.java similarity index 94% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/CardView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/CardView.java index 7fd530c..c350721 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/CardView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/CardView.java @@ -1,7 +1,5 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; -import de.thpeetz.kontor.comics.data.Comic; -import de.thpeetz.kontor.common.views.StatusIcon; import org.springframework.context.annotation.Scope; import com.vaadin.flow.component.Component; @@ -16,11 +14,12 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.common.views.ColumnToggleContextMenu; -import de.thpeetz.kontor.common.views.MainLayout; -import de.thpeetz.kontor.tysc.TyscConstants; -import de.thpeetz.kontor.tysc.data.Card; -import de.thpeetz.kontor.tysc.services.CardService; +import de.thpeetz.kontor.constants.TyscConstants; +import de.thpeetz.kontor.data.tysc.Card; +import de.thpeetz.kontor.services.CardService; +import de.thpeetz.kontor.views.common.ColumnToggleContextMenu; +import de.thpeetz.kontor.views.common.MainLayout; +import de.thpeetz.kontor.views.common.StatusIcon; import jakarta.annotation.security.PermitAll; import lombok.Getter; diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/PlayerForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/PlayerForm.java similarity index 96% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/PlayerForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/PlayerForm.java index 9730103..f39518d 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/PlayerForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/PlayerForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import java.util.List; @@ -14,8 +14,8 @@ import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.tysc.data.Player; -import de.thpeetz.kontor.tysc.data.Rooster; +import de.thpeetz.kontor.data.tysc.Player; +import de.thpeetz.kontor.data.tysc.Rooster; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/PlayerView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/PlayerView.java similarity index 94% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/PlayerView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/PlayerView.java index 56d9588..3c4fe0d 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/PlayerView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/PlayerView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import org.springframework.context.annotation.Scope; @@ -13,10 +13,10 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.common.views.MainLayout; -import de.thpeetz.kontor.tysc.TyscConstants; -import de.thpeetz.kontor.tysc.data.Player; -import de.thpeetz.kontor.tysc.services.SportService; +import de.thpeetz.kontor.constants.TyscConstants; +import de.thpeetz.kontor.data.tysc.Player; +import de.thpeetz.kontor.services.SportService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.PermitAll; @SpringComponent diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/PositionForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/PositionForm.java similarity index 96% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/PositionForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/PositionForm.java index f5b49bb..6fcc05c 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/PositionForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/PositionForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import java.util.List; @@ -14,8 +14,8 @@ import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.tysc.data.FieldPosition; -import de.thpeetz.kontor.tysc.data.Rooster; +import de.thpeetz.kontor.data.tysc.FieldPosition; +import de.thpeetz.kontor.data.tysc.Rooster; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/PositionView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/PositionView.java similarity index 94% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/PositionView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/PositionView.java index ad71bf0..a871723 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/PositionView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/PositionView.java @@ -1,6 +1,9 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; + +import de.thpeetz.kontor.constants.TyscConstants; +import de.thpeetz.kontor.data.tysc.FieldPosition; +import de.thpeetz.kontor.services.SportService; -import de.thpeetz.kontor.tysc.data.FieldPosition; import org.springframework.context.annotation.Scope; import com.vaadin.flow.component.Component; @@ -14,9 +17,7 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.common.views.MainLayout; -import de.thpeetz.kontor.tysc.TyscConstants; -import de.thpeetz.kontor.tysc.services.SportService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.PermitAll; @SpringComponent diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/RoosterForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/RoosterForm.java similarity index 94% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/RoosterForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/RoosterForm.java index 5f9d259..6b94eae 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/RoosterForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/RoosterForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import java.util.List; @@ -14,10 +14,10 @@ import com.vaadin.flow.component.textfield.IntegerField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.tysc.data.FieldPosition; -import de.thpeetz.kontor.tysc.data.Player; -import de.thpeetz.kontor.tysc.data.Rooster; -import de.thpeetz.kontor.tysc.data.Team; +import de.thpeetz.kontor.data.tysc.FieldPosition; +import de.thpeetz.kontor.data.tysc.Player; +import de.thpeetz.kontor.data.tysc.Rooster; +import de.thpeetz.kontor.data.tysc.Team; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/RoosterView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/RoosterView.java similarity index 93% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/RoosterView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/RoosterView.java index 92da6eb..fc59be6 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/RoosterView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/RoosterView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import org.springframework.context.annotation.Scope; @@ -11,10 +11,10 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.common.views.MainLayout; -import de.thpeetz.kontor.tysc.TyscConstants; -import de.thpeetz.kontor.tysc.data.Rooster; -import de.thpeetz.kontor.tysc.services.SportService; +import de.thpeetz.kontor.constants.TyscConstants; +import de.thpeetz.kontor.data.tysc.Rooster; +import de.thpeetz.kontor.services.SportService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.PermitAll; @SpringComponent diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/SportForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/SportForm.java similarity index 97% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/SportForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/SportForm.java index 30582e1..20d98f4 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/SportForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/SportForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import com.vaadin.flow.component.ComponentEvent; import com.vaadin.flow.component.ComponentEventListener; @@ -11,7 +11,7 @@ import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.tysc.data.Sport; +import de.thpeetz.kontor.data.tysc.Sport; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/SportView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/SportView.java similarity index 94% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/SportView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/SportView.java index c6008c3..67faaa9 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/SportView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/SportView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import org.springframework.context.annotation.Scope; @@ -13,10 +13,10 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.common.views.MainLayout; -import de.thpeetz.kontor.tysc.TyscConstants; -import de.thpeetz.kontor.tysc.data.Sport; -import de.thpeetz.kontor.tysc.services.SportService; +import de.thpeetz.kontor.constants.TyscConstants; +import de.thpeetz.kontor.data.tysc.Sport; +import de.thpeetz.kontor.services.SportService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.PermitAll; @SpringComponent diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/TeamForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/TeamForm.java similarity index 96% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/TeamForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/TeamForm.java index 63cb56b..8cc3bcb 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/TeamForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/TeamForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import java.util.List; @@ -14,8 +14,8 @@ import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.tysc.data.Rooster; -import de.thpeetz.kontor.tysc.data.Team; +import de.thpeetz.kontor.data.tysc.Rooster; +import de.thpeetz.kontor.data.tysc.Team; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/TeamView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/TeamView.java similarity index 94% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/TeamView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/TeamView.java index 1e48f98..2012798 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/TeamView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/TeamView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import org.springframework.context.annotation.Scope; @@ -13,10 +13,10 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.common.views.MainLayout; -import de.thpeetz.kontor.tysc.TyscConstants; -import de.thpeetz.kontor.tysc.data.Team; -import de.thpeetz.kontor.tysc.services.SportService; +import de.thpeetz.kontor.constants.TyscConstants; +import de.thpeetz.kontor.data.tysc.Team; +import de.thpeetz.kontor.services.SportService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.PermitAll; @SpringComponent diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/TyscLayout.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/TyscLayout.java similarity index 88% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/TyscLayout.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/TyscLayout.java index 66fb09b..5febbf7 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/TyscLayout.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/TyscLayout.java @@ -1,13 +1,13 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import com.vaadin.flow.component.applayout.AppLayout; import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.theme.lumo.LumoUtility; -import de.thpeetz.kontor.admin.services.AdminService; -import de.thpeetz.kontor.common.views.KontorLayoutUtil; +import de.thpeetz.kontor.constants.TyscConstants; import de.thpeetz.kontor.security.SecurityService; -import de.thpeetz.kontor.tysc.TyscConstants; +import de.thpeetz.kontor.services.AdminService; +import de.thpeetz.kontor.views.common.KontorLayoutUtil; import lombok.extern.slf4j.Slf4j; /** diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/VendorForm.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/VendorForm.java similarity index 96% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/VendorForm.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/VendorForm.java index 254b1ff..8527da2 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/VendorForm.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/VendorForm.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import java.util.List; @@ -14,8 +14,8 @@ import com.vaadin.flow.component.textfield.TextField; import com.vaadin.flow.data.binder.BeanValidationBinder; import com.vaadin.flow.data.binder.Binder; -import de.thpeetz.kontor.tysc.data.Vendor; -import de.thpeetz.kontor.tysc.data.CardSet; +import de.thpeetz.kontor.data.tysc.CardSet; +import de.thpeetz.kontor.data.tysc.Vendor; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/VendorView.java b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/VendorView.java similarity index 94% rename from kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/VendorView.java rename to kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/VendorView.java index 08b5d32..6dd8821 100644 --- a/kontor-spring/src/main/java/de/thpeetz/kontor/tysc/views/VendorView.java +++ b/kontor-spring/src/main/java/de/thpeetz/kontor/views/tysc/VendorView.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.views; +package de.thpeetz.kontor.views.tysc; import org.springframework.context.annotation.Scope; @@ -13,10 +13,10 @@ import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; -import de.thpeetz.kontor.common.views.MainLayout; -import de.thpeetz.kontor.tysc.TyscConstants; -import de.thpeetz.kontor.tysc.data.Vendor; -import de.thpeetz.kontor.tysc.services.CardService; +import de.thpeetz.kontor.constants.TyscConstants; +import de.thpeetz.kontor.data.tysc.Vendor; +import de.thpeetz.kontor.services.CardService; +import de.thpeetz.kontor.views.common.MainLayout; import jakarta.annotation.security.PermitAll; @SpringComponent diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/ComicConstantsTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/constants/ComicConstantsTest.java similarity index 89% rename from kontor-spring/src/test/java/de/thpeetz/kontor/comics/ComicConstantsTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/constants/ComicConstantsTest.java index b1e50ce..8e96abe 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/ComicConstantsTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/constants/ComicConstantsTest.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.comics; +package de.thpeetz.kontor.constants; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/TestConstants.java b/kontor-spring/src/test/java/de/thpeetz/kontor/constants/TestBookshelfConstants.java similarity index 91% rename from kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/TestConstants.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/constants/TestBookshelfConstants.java index bb9d04d..ecbc333 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/TestConstants.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/constants/TestBookshelfConstants.java @@ -1,6 +1,6 @@ -package de.thpeetz.kontor.bookshelf; +package de.thpeetz.kontor.constants; -public class TestConstants { +public class TestBookshelfConstants { public static final Integer ARTICLEAUTHOR_COUNT = 0; public static final Integer ARTICLE_COUNT = 0; diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/TestConstants.java b/kontor-spring/src/test/java/de/thpeetz/kontor/constants/TestComicConstants.java similarity index 89% rename from kontor-spring/src/test/java/de/thpeetz/kontor/comics/TestConstants.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/constants/TestComicConstants.java index b77f55d..9348d32 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/TestConstants.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/constants/TestComicConstants.java @@ -1,12 +1,12 @@ -package de.thpeetz.kontor.comics; +package de.thpeetz.kontor.constants; -import de.thpeetz.kontor.comics.data.Artist; -import de.thpeetz.kontor.comics.data.Comic; -import de.thpeetz.kontor.comics.data.Publisher; -import de.thpeetz.kontor.comics.data.Worktype; -import de.thpeetz.kontor.comics.services.ComicService; +import de.thpeetz.kontor.data.comics.Artist; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.Publisher; +import de.thpeetz.kontor.data.comics.Worktype; +import de.thpeetz.kontor.services.ComicService; -public class TestConstants { +public class TestComicConstants { public static final String ARTIST_NAME = "Lastname, Firstname"; public static final String COMIC_TITLE = "TestComic"; public static final String WORKTYPE_INKER = "Inker"; diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/media/TestConstants.java b/kontor-spring/src/test/java/de/thpeetz/kontor/constants/TestMediaConstants.java similarity index 50% rename from kontor-spring/src/test/java/de/thpeetz/kontor/media/TestConstants.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/constants/TestMediaConstants.java index 32ee883..a8d432e 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/media/TestConstants.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/constants/TestMediaConstants.java @@ -1,5 +1,5 @@ -package de.thpeetz.kontor.media; +package de.thpeetz.kontor.constants; -public class TestConstants { +public class TestMediaConstants { public static final String URL = "https://example.com/link.mp4"; } diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/TestConstants.java b/kontor-spring/src/test/java/de/thpeetz/kontor/constants/TestTyscConstants.java similarity index 96% rename from kontor-spring/src/test/java/de/thpeetz/kontor/tysc/TestConstants.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/constants/TestTyscConstants.java index a05c1dd..7477274 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/TestConstants.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/constants/TestTyscConstants.java @@ -1,6 +1,6 @@ -package de.thpeetz.kontor.tysc; +package de.thpeetz.kontor.constants; -public class TestConstants { +public class TestTyscConstants { public static final Integer CARD_COUNT = 10; public static final Integer CARD_CARDNUMBER = 999; diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/ArticleAuthorTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/ArticleAuthorTest.java similarity index 72% rename from kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/ArticleAuthorTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/ArticleAuthorTest.java index bd14fd3..532e9b6 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/ArticleAuthorTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/ArticleAuthorTest.java @@ -1,6 +1,10 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.data.bookshelf; + +import de.thpeetz.kontor.constants.TestBookshelfConstants; +import de.thpeetz.kontor.repository.bookshelf.ArticleAuthorRepository; +import de.thpeetz.kontor.repository.bookshelf.ArticleRepository; +import de.thpeetz.kontor.repository.bookshelf.AuthorRepository; -import de.thpeetz.kontor.bookshelf.TestConstants; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; @@ -31,7 +35,7 @@ class ArticleAuthorTest { @Test @Order(1) void checkInitialLoad() { - assertEquals(TestConstants.ARTICLEAUTHOR_COUNT, articleAuthorRepository.findAll().size()); + assertEquals(TestBookshelfConstants.ARTICLEAUTHOR_COUNT, articleAuthorRepository.findAll().size()); } @Test @@ -47,11 +51,11 @@ class ArticleAuthorTest { @Order(3) void exceptionThrownWhenSavingIdenticalEntry() { Author author = new Author(); - author.setFirstName(TestConstants.AUTHOR_FIRSTNAME); - author.setLastName(TestConstants.AUTHOR_LASTNAME); + author.setFirstName(TestBookshelfConstants.AUTHOR_FIRSTNAME); + author.setLastName(TestBookshelfConstants.AUTHOR_LASTNAME); Author savedAuthor = authorRepository.save(author); Article article = new Article(); - article.setTitle(TestConstants.ARTICLE_TITLE); + article.setTitle(TestBookshelfConstants.ARTICLE_TITLE); Article savedArticle = articleRepository.save(article); ArticleAuthor articleAuthor = new ArticleAuthor(); articleAuthor.setArticle(article); @@ -64,14 +68,14 @@ class ArticleAuthorTest { articleAuthorRepository.save(articleAuthor1); }); articleAuthorRepository.delete(savedArticleAuthor); - assertEquals(TestConstants.ARTICLEAUTHOR_COUNT, articleAuthorRepository.findAll().size()); + assertEquals(TestBookshelfConstants.ARTICLEAUTHOR_COUNT, articleAuthorRepository.findAll().size()); savedAuthor.getArticleAuthors().remove(savedArticleAuthor); authorRepository.save(savedAuthor); authorRepository.delete(savedAuthor); - assertEquals(TestConstants.AUTHOR_COUNT, authorRepository.findAll().size()); + assertEquals(TestBookshelfConstants.AUTHOR_COUNT, authorRepository.findAll().size()); savedArticle.getAuthors().remove(savedArticleAuthor); articleRepository.save(savedArticle); articleRepository.delete(savedArticle); - assertEquals(TestConstants.ARTICLE_COUNT, articleRepository.findAll().size()); + assertEquals(TestBookshelfConstants.ARTICLE_COUNT, articleRepository.findAll().size()); } } diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/ArticleTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/ArticleTest.java similarity index 74% rename from kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/ArticleTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/ArticleTest.java index 2179dfe..a449052 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/ArticleTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/ArticleTest.java @@ -1,6 +1,8 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.data.bookshelf; + +import de.thpeetz.kontor.constants.TestBookshelfConstants; +import de.thpeetz.kontor.repository.bookshelf.ArticleRepository; -import de.thpeetz.kontor.bookshelf.TestConstants; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -18,7 +20,7 @@ class ArticleTest { @Test void checkInitialLoad() { - assertEquals(TestConstants.BOOK_COUNT, articleRepository.findAll().size()); + assertEquals(TestBookshelfConstants.BOOK_COUNT, articleRepository.findAll().size()); } @Test @@ -32,7 +34,7 @@ class ArticleTest { @Test void exceptionThrownWhenSavingIdenticalTitle() { Article article = new Article(); - article.setTitle(TestConstants.ARTICLE_TITLE); + article.setTitle(TestBookshelfConstants.ARTICLE_TITLE); Article savedArticle = articleRepository.save(article); Article article1 = new Article(); article1.setTitle(article.getTitle()); @@ -40,6 +42,6 @@ class ArticleTest { articleRepository.save(article1); }); articleRepository.delete(savedArticle); - assertEquals(TestConstants.ARTICLE_COUNT, articleRepository.findAll().size()); + assertEquals(TestBookshelfConstants.ARTICLE_COUNT, articleRepository.findAll().size()); } } \ No newline at end of file diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/AuthorTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/AuthorTest.java similarity index 66% rename from kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/AuthorTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/AuthorTest.java index 149c263..f5653d9 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/AuthorTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/AuthorTest.java @@ -1,6 +1,8 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.data.bookshelf; + +import de.thpeetz.kontor.constants.TestBookshelfConstants; +import de.thpeetz.kontor.repository.bookshelf.AuthorRepository; -import de.thpeetz.kontor.bookshelf.TestConstants; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -25,12 +27,12 @@ class AuthorTest { @Test void throwExceptionWhenPlayerSavedWithExistingName() { - assertEquals(TestConstants.AUTHOR_COUNT, authorRepository.findAll().size()); + assertEquals(TestBookshelfConstants.AUTHOR_COUNT, authorRepository.findAll().size()); Author existingAuthor = new Author(); - existingAuthor.setFirstName(TestConstants.AUTHOR_FIRSTNAME); - existingAuthor.setLastName(TestConstants.AUTHOR_LASTNAME); + existingAuthor.setFirstName(TestBookshelfConstants.AUTHOR_FIRSTNAME); + existingAuthor.setLastName(TestBookshelfConstants.AUTHOR_LASTNAME); existingAuthor = authorRepository.save(existingAuthor); - assertEquals(TestConstants.AUTHOR_COUNT+1, authorRepository.findAll().size()); + assertEquals(TestBookshelfConstants.AUTHOR_COUNT+1, authorRepository.findAll().size()); Author author = new Author(); author.setFirstName(existingAuthor.getFirstName()); author.setLastName(existingAuthor.getLastName()); @@ -39,6 +41,6 @@ class AuthorTest { }); assertNotNull(existingAuthor); authorRepository.delete(existingAuthor); - assertEquals(TestConstants.AUTHOR_COUNT, authorRepository.findAll().size()); + assertEquals(TestBookshelfConstants.AUTHOR_COUNT, authorRepository.findAll().size()); } } diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookAuthorTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/BookAuthorTest.java similarity index 68% rename from kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookAuthorTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/BookAuthorTest.java index dc79341..e3e1a93 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookAuthorTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/BookAuthorTest.java @@ -1,6 +1,11 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.data.bookshelf; + +import de.thpeetz.kontor.constants.TestBookshelfConstants; +import de.thpeetz.kontor.repository.bookshelf.AuthorRepository; +import de.thpeetz.kontor.repository.bookshelf.BookAuthorRepository; +import de.thpeetz.kontor.repository.bookshelf.BookRepository; +import de.thpeetz.kontor.repository.bookshelf.BookshelfPublisherRepository; -import de.thpeetz.kontor.bookshelf.TestConstants; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +34,7 @@ class BookAuthorTest { @Test void checkInitialLoad() { - assertEquals(TestConstants.BOOKAUTHOR_COUNT, bookAuthorRepository.findAll().size()); + assertEquals(TestBookshelfConstants.BOOKAUTHOR_COUNT, bookAuthorRepository.findAll().size()); } @Test @@ -43,15 +48,15 @@ class BookAuthorTest { @Test void exceptionThrownWhenSavingIdenticalEntry() { Author author = new Author(); - author.setFirstName(TestConstants.AUTHOR_FIRSTNAME); - author.setLastName(TestConstants.AUTHOR_LASTNAME); + author.setFirstName(TestBookshelfConstants.AUTHOR_FIRSTNAME); + author.setLastName(TestBookshelfConstants.AUTHOR_LASTNAME); Author savedAuthor = authorRepository.save(author); BookshelfPublisher publisher = new BookshelfPublisher(); - publisher.setName(TestConstants.PUBLISHER_NAME); + publisher.setName(TestBookshelfConstants.PUBLISHER_NAME); BookshelfPublisher savedPublisher = bookshelfPublisherRepository.save(publisher); Book book = new Book(); - book.setTitle(TestConstants.BOOK_TITLE); - book.setIsbn(TestConstants.BOOK_ISBN); + book.setTitle(TestBookshelfConstants.BOOK_TITLE); + book.setIsbn(TestBookshelfConstants.BOOK_ISBN); book.setPublisher(publisher); Book savedBook = bookRepository.save(book); BookAuthor bookAuthor = new BookAuthor(); @@ -71,12 +76,12 @@ class BookAuthorTest { savedPublisher.getBooks().remove(savedBook); bookshelfPublisherRepository.save(savedPublisher); authorRepository.delete(savedAuthor); - assertEquals(TestConstants.AUTHOR_COUNT, authorRepository.findAll().size()); + assertEquals(TestBookshelfConstants.AUTHOR_COUNT, authorRepository.findAll().size()); bookRepository.delete(savedBook); - assertEquals(TestConstants.ARTICLE_COUNT, bookRepository.findAll().size()); + assertEquals(TestBookshelfConstants.ARTICLE_COUNT, bookRepository.findAll().size()); bookshelfPublisherRepository.delete(savedPublisher); - assertEquals(TestConstants.PUBLISHER_COUNT, bookshelfPublisherRepository.findAll().size()); + assertEquals(TestBookshelfConstants.PUBLISHER_COUNT, bookshelfPublisherRepository.findAll().size()); bookAuthorRepository.delete(savedBookAuthor); - assertEquals(TestConstants.ARTICLEAUTHOR_COUNT, bookAuthorRepository.findAll().size()); + assertEquals(TestBookshelfConstants.ARTICLEAUTHOR_COUNT, bookAuthorRepository.findAll().size()); } } diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/BookTest.java similarity index 63% rename from kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/BookTest.java index 0ac3324..fba9bee 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/BookTest.java @@ -1,11 +1,12 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.data.bookshelf; + +import de.thpeetz.kontor.constants.TestBookshelfConstants; +import de.thpeetz.kontor.repository.bookshelf.BookRepository; +import de.thpeetz.kontor.repository.bookshelf.BookshelfPublisherRepository; -import de.thpeetz.kontor.bookshelf.TestConstants; -import de.thpeetz.kontor.comics.data.Publisher; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.orm.jpa.JpaSystemException; import org.springframework.transaction.TransactionSystemException; import static org.junit.jupiter.api.Assertions.*; @@ -21,7 +22,7 @@ class BookTest { @Test void checkInitialLoad() { - assertEquals(TestConstants.BOOK_COUNT, bookRepository.findAll().size()); + assertEquals(TestBookshelfConstants.BOOK_COUNT, bookRepository.findAll().size()); } @Test @@ -35,13 +36,13 @@ class BookTest { @Test void exceptionThrownWhenSavingIdenticalISBN() { BookshelfPublisher publisher = new BookshelfPublisher(); - publisher.setName(TestConstants.PUBLISHER_NAME); + publisher.setName(TestBookshelfConstants.PUBLISHER_NAME); BookshelfPublisher savedPublisher = bookshelfPublisherRepository.save(publisher); Book book = new Book(); - book.setTitle(TestConstants.BOOK_TITLE); - book.setIsbn(TestConstants.BOOK_ISBN); + book.setTitle(TestBookshelfConstants.BOOK_TITLE); + book.setIsbn(TestBookshelfConstants.BOOK_ISBN); book.setPublisher(savedPublisher); - Book savedBook = bookRepository.save(book); + //TODO Book savedBook = bookRepository.save(book); Book book1 = new Book(); book1.setTitle(book.getTitle()); book1.setIsbn(book.getIsbn()); @@ -49,8 +50,8 @@ class BookTest { bookRepository.save(book1); }); bookRepository.delete(book); - assertEquals(TestConstants.BOOK_COUNT, bookRepository.findAll().size()); + assertEquals(TestBookshelfConstants.BOOK_COUNT, bookRepository.findAll().size()); bookshelfPublisherRepository.delete(savedPublisher); - assertEquals(TestConstants.PUBLISHER_COUNT, bookshelfPublisherRepository.findAll().size()); + assertEquals(TestBookshelfConstants.PUBLISHER_COUNT, bookshelfPublisherRepository.findAll().size()); } } diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookshelfPublisherTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/BookshelfPublisherTest.java similarity index 70% rename from kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookshelfPublisherTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/BookshelfPublisherTest.java index 7a73ae1..61568da 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookshelfPublisherTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/bookshelf/BookshelfPublisherTest.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.data.bookshelf; import static org.junit.jupiter.api.Assertions.*; @@ -8,7 +8,8 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.transaction.TransactionSystemException; -import de.thpeetz.kontor.bookshelf.TestConstants; +import de.thpeetz.kontor.constants.TestBookshelfConstants; +import de.thpeetz.kontor.repository.bookshelf.BookshelfPublisherRepository; @SpringBootTest class BookshelfPublisherTest { @@ -18,7 +19,7 @@ class BookshelfPublisherTest { @Test void checkInitialDataLoad() { - assertEquals(TestConstants.PUBLISHER_COUNT, publisherRepository.findAll().size()); + assertEquals(TestBookshelfConstants.PUBLISHER_COUNT, publisherRepository.findAll().size()); } @Test @@ -32,14 +33,14 @@ class BookshelfPublisherTest { @Test void savePublisherWithIdenticalName() { BookshelfPublisher publisher1 = new BookshelfPublisher(); - publisher1.setName(TestConstants.PUBLISHER_NAME); + publisher1.setName(TestBookshelfConstants.PUBLISHER_NAME); publisherRepository.save(publisher1); BookshelfPublisher publisher2 = new BookshelfPublisher(); - publisher2.setName(TestConstants.PUBLISHER_NAME); + publisher2.setName(TestBookshelfConstants.PUBLISHER_NAME); assertThrows(DataIntegrityViolationException.class, () -> { publisherRepository.save(publisher2); }); publisherRepository.delete(publisher1); - assertEquals(TestConstants.PUBLISHER_COUNT, publisherRepository.findAll().size()); + assertEquals(TestBookshelfConstants.PUBLISHER_COUNT, publisherRepository.findAll().size()); } } diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ArtistTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/ArtistTest.java similarity index 84% rename from kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ArtistTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/ArtistTest.java index f12c679..68c27f4 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ArtistTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/ArtistTest.java @@ -1,18 +1,18 @@ -package de.thpeetz.kontor.comics.data; +package de.thpeetz.kontor.data.comics; import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import de.thpeetz.kontor.comics.repository.*; +import de.thpeetz.kontor.constants.TestComicConstants; +import de.thpeetz.kontor.repository.comics.ArtistRepository; + import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.transaction.TransactionSystemException; -import de.thpeetz.kontor.comics.TestConstants; - @SpringBootTest class ArtistTest { @@ -22,7 +22,7 @@ class ArtistTest { @Test void checkInitialDataLoad() { List artists = artistRepository.findAll(); - assertEquals(TestConstants.ARTIST_COUNT, artists.size()); + assertEquals(TestComicConstants.ARTIST_COUNT, artists.size()); } @Test diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ComicTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/ComicTest.java similarity index 76% rename from kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ComicTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/ComicTest.java index cfc78ca..34af697 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ComicTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/ComicTest.java @@ -1,10 +1,9 @@ -package de.thpeetz.kontor.comics.data; +package de.thpeetz.kontor.data.comics; import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import de.thpeetz.kontor.comics.repository.*; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; @@ -14,8 +13,9 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.transaction.TransactionSystemException; -import de.thpeetz.kontor.comics.TestConstants; -import de.thpeetz.kontor.comics.services.ComicService; +import de.thpeetz.kontor.constants.TestComicConstants; +import de.thpeetz.kontor.repository.comics.ComicRepository; +import de.thpeetz.kontor.services.ComicService; @SpringBootTest @TestMethodOrder(OrderAnnotation.class) @@ -31,14 +31,14 @@ class ComicTest { @Order(1) void checkInitialDataLoad() { List comics = comicRepository.findAll(); - assertEquals(TestConstants.COMIC_COUNT, comics.size()); + assertEquals(TestComicConstants.COMIC_COUNT, comics.size()); } @Test @Order(2) void exceptionThrownWhenSavingComicWithoutPublisher() { Comic comic = new Comic(); - comic.setTitle(TestConstants.COMIC_TITLE); + comic.setTitle(TestComicConstants.COMIC_TITLE); assertThrows(TransactionSystemException.class, () -> { comicRepository.save(comic); }); @@ -48,7 +48,7 @@ class ComicTest { @Order(3) void exceptionThrownWhenSavingComicWithEmptyTitle() { Comic comic = new Comic(); - Publisher publisher = TestConstants.getPublisherForComicTests(comicService); + Publisher publisher = TestComicConstants.getPublisherForComicTests(comicService); comic.setPublisher(publisher); assertNull(comic.getTitle()); assertThrows(TransactionSystemException.class, () -> { @@ -64,9 +64,9 @@ class ComicTest { @Test @Order(4) void exceptionThrownWhenSavingComicWithSameNameFromDifferentPublishers() { - Publisher publisher = TestConstants.getPublisherForComicTests(comicService); + Publisher publisher = TestComicConstants.getPublisherForComicTests(comicService); Comic comic = new Comic(); - comic.setTitle(TestConstants.SOJOURN_TPB_COMIC_TITLE); + comic.setTitle(TestComicConstants.SOJOURN_TPB_COMIC_TITLE); comic.setPublisher(publisher); assertThrows(DataIntegrityViolationException.class, () -> { comicRepository.save(comic); diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ComicWorkTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/ComicWorkTest.java similarity index 84% rename from kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ComicWorkTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/ComicWorkTest.java index ac2eac2..4d080ae 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/ComicWorkTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/ComicWorkTest.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.comics.data; +package de.thpeetz.kontor.data.comics; import static org.junit.jupiter.api.Assertions.*; @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import de.thpeetz.kontor.comics.services.ComicService; +import de.thpeetz.kontor.services.ComicService; @SpringBootTest public class ComicWorkTest { diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/IssueTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/IssueTest.java similarity index 71% rename from kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/IssueTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/IssueTest.java index e600084..43b1ff9 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/IssueTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/IssueTest.java @@ -1,17 +1,17 @@ -package de.thpeetz.kontor.comics.data; +package de.thpeetz.kontor.data.comics; import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import de.thpeetz.kontor.comics.repository.*; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.transaction.TransactionSystemException; -import de.thpeetz.kontor.comics.TestConstants; -import de.thpeetz.kontor.comics.services.ComicService; +import de.thpeetz.kontor.constants.TestComicConstants; +import de.thpeetz.kontor.repository.comics.IssueRepository; +import de.thpeetz.kontor.services.ComicService; @SpringBootTest class IssueTest { @@ -25,12 +25,12 @@ class IssueTest { @Test void checkInitialDataLoad() { List issues = comicService.findAllIssues(); - assertEquals(TestConstants.ISSUE_COUNT, issues.size()); + assertEquals(TestComicConstants.ISSUE_COUNT, issues.size()); } @Test void exceptionThrownWhenSavingIssueWithEmptyNumber() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); + Comic comic = TestComicConstants.getComicWithoutReferences(comicService); assertNotNull(comic); Issue issue = new Issue(); issue.setComic(comic); @@ -42,7 +42,7 @@ class IssueTest { @Test void exceptionThrownWhenSavingStoryArcWithoutComic() { Issue issue = new Issue(); - issue.setIssueNumber(TestConstants.ISSUE_ISSUENUMBER); + issue.setIssueNumber(TestComicConstants.ISSUE_ISSUENUMBER); assertThrows(TransactionSystemException.class, () -> { issueRepository.save(issue); }); @@ -50,11 +50,11 @@ class IssueTest { @Test void saveStoryArc() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); + Comic comic = TestComicConstants.getComicWithoutReferences(comicService); assertEquals(0, comic.getStoryArcs().size()); Issue issue = new Issue(); issue.setComic(comic); - issue.setIssueNumber(TestConstants.ISSUE_ISSUENUMBER); + issue.setIssueNumber(TestComicConstants.ISSUE_ISSUENUMBER); Issue savedInstance = issueRepository.save(issue); assertNotNull(savedInstance); comicService.deleteIssue(savedInstance); diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/PublisherTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/PublisherTest.java similarity index 70% rename from kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/PublisherTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/PublisherTest.java index 028ef5a..28249f3 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/PublisherTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/PublisherTest.java @@ -1,16 +1,16 @@ -package de.thpeetz.kontor.comics.data; +package de.thpeetz.kontor.data.comics; import static org.junit.jupiter.api.Assertions.*; -import de.thpeetz.kontor.comics.repository.*; +import de.thpeetz.kontor.constants.TestComicConstants; +import de.thpeetz.kontor.repository.comics.PublisherRepository; + import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.transaction.TransactionSystemException; -import de.thpeetz.kontor.comics.TestConstants; - @SpringBootTest class PublisherTest { @@ -19,7 +19,7 @@ class PublisherTest { @Test void checkInitialDataLoad() { - assertEquals(TestConstants.PUBLISHER_COUNT, publisherRepository.findAll().size()); + assertEquals(TestComicConstants.PUBLISHER_COUNT, publisherRepository.findAll().size()); } @Test @@ -33,14 +33,14 @@ class PublisherTest { @Test void savePublisherWithIdenticalName() { Publisher publisher1 = new Publisher(); - publisher1.setName(TestConstants.PUBLISHER_NAME); + publisher1.setName(TestComicConstants.PUBLISHER_NAME); publisherRepository.save(publisher1); Publisher publisher2 = new Publisher(); - publisher2.setName(TestConstants.PUBLISHER_NAME); + publisher2.setName(TestComicConstants.PUBLISHER_NAME); assertThrows(DataIntegrityViolationException.class, () -> { publisherRepository.save(publisher2); }); publisherRepository.delete(publisher1); - assertEquals(TestConstants.PUBLISHER_COUNT, publisherRepository.findAll().size()); + assertEquals(TestComicConstants.PUBLISHER_COUNT, publisherRepository.findAll().size()); } } diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/StoryArcTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/StoryArcTest.java similarity index 70% rename from kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/StoryArcTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/StoryArcTest.java index 1e0b598..545b21b 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/StoryArcTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/StoryArcTest.java @@ -1,15 +1,15 @@ -package de.thpeetz.kontor.comics.data; +package de.thpeetz.kontor.data.comics; import static org.junit.jupiter.api.Assertions.*; -import de.thpeetz.kontor.comics.repository.*; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.transaction.TransactionSystemException; -import de.thpeetz.kontor.comics.TestConstants; -import de.thpeetz.kontor.comics.services.ComicService; +import de.thpeetz.kontor.constants.TestComicConstants; +import de.thpeetz.kontor.repository.comics.StoryArcRepository; +import de.thpeetz.kontor.services.ComicService; @SpringBootTest class StoryArcTest { @@ -22,12 +22,12 @@ class StoryArcTest { @Test void checkInitialLoad() { - assertEquals(TestConstants.STORYARC_COUNT, storyArcRepository.findAll().size()); + assertEquals(TestComicConstants.STORYARC_COUNT, storyArcRepository.findAll().size()); } @Test void exceptionThrownWhenSavingStoryArcWithEmptyName() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); + Comic comic = TestComicConstants.getComicWithoutReferences(comicService); assertNotNull(comic); StoryArc storyArc = new StoryArc(); storyArc.setComic(comic); @@ -39,7 +39,7 @@ class StoryArcTest { @Test void exceptionThrownWhenSavingStoryArcWithoutComic() { StoryArc storyArc = new StoryArc(); - storyArc.setName(TestConstants.STORYARC_NAME); + storyArc.setName(TestComicConstants.STORYARC_NAME); assertThrows(TransactionSystemException.class, () -> { storyArcRepository.save(storyArc); }); @@ -47,10 +47,10 @@ class StoryArcTest { @Test void saveStoryArc() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); + Comic comic = TestComicConstants.getComicWithoutReferences(comicService); assertEquals(0, comic.getStoryArcs().size()); StoryArc storyArc = new StoryArc(); - storyArc.setName(TestConstants.STORYARC_NAME); + storyArc.setName(TestComicConstants.STORYARC_NAME); storyArc.setComic(comic); StoryArc savedInstance = storyArcRepository.save(storyArc); assertNotNull(savedInstance); diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/TradePaperbackTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/TradePaperbackTest.java similarity index 71% rename from kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/TradePaperbackTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/TradePaperbackTest.java index 0c0a11f..fdb469c 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/TradePaperbackTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/TradePaperbackTest.java @@ -1,15 +1,15 @@ -package de.thpeetz.kontor.comics.data; +package de.thpeetz.kontor.data.comics; import static org.junit.jupiter.api.Assertions.*; -import de.thpeetz.kontor.comics.repository.*; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.transaction.TransactionSystemException; -import de.thpeetz.kontor.comics.TestConstants; -import de.thpeetz.kontor.comics.services.ComicService; +import de.thpeetz.kontor.constants.TestComicConstants; +import de.thpeetz.kontor.repository.comics.TradePaperbackRepository; +import de.thpeetz.kontor.services.ComicService; @SpringBootTest class TradePaperbackTest { @@ -22,12 +22,12 @@ class TradePaperbackTest { @Test void checkInitialDataLoad() { - assertEquals(TestConstants.TRADEPAPERBACK_COUNT, tradePaperbackRepository.findAll().size()); + assertEquals(TestComicConstants.TRADEPAPERBACK_COUNT, tradePaperbackRepository.findAll().size()); } @Test void exceptionThrownWhenSavingTradePaperbackWithEmptyName() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); + Comic comic = TestComicConstants.getComicWithoutReferences(comicService); assertNotNull(comic); TradePaperback tradePaperback = new TradePaperback(); tradePaperback.setComic(comic); @@ -39,7 +39,7 @@ class TradePaperbackTest { @Test void exceptionThrownWhenSavingTradePaperbackWithoutComic() { TradePaperback tradePaperback = new TradePaperback(); - tradePaperback.setName(TestConstants.TRADEPAPERBACK_NAME); + tradePaperback.setName(TestComicConstants.TRADEPAPERBACK_NAME); assertThrows(TransactionSystemException.class, () -> { tradePaperbackRepository.save(tradePaperback); }); @@ -47,10 +47,10 @@ class TradePaperbackTest { @Test void saveTradePaperback() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); + Comic comic = TestComicConstants.getComicWithoutReferences(comicService); assertEquals(0, comic.getTradePaperbacks().size()); TradePaperback tradePaperback = new TradePaperback(); - tradePaperback.setName(TestConstants.TRADEPAPERBACK_NAME); + tradePaperback.setName(TestComicConstants.TRADEPAPERBACK_NAME); tradePaperback.setComic(comic); TradePaperback savedInstance = tradePaperbackRepository.save(tradePaperback); assertNotNull(savedInstance); diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/VolumeTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/VolumeTest.java similarity index 67% rename from kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/VolumeTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/VolumeTest.java index 399d094..b0413b6 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/VolumeTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/VolumeTest.java @@ -1,15 +1,15 @@ -package de.thpeetz.kontor.comics.data; +package de.thpeetz.kontor.data.comics; import static org.junit.jupiter.api.Assertions.*; -import de.thpeetz.kontor.comics.repository.*; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.transaction.TransactionSystemException; -import de.thpeetz.kontor.comics.TestConstants; -import de.thpeetz.kontor.comics.services.ComicService; +import de.thpeetz.kontor.constants.TestComicConstants; +import de.thpeetz.kontor.repository.comics.VolumeRepository; +import de.thpeetz.kontor.services.ComicService; @SpringBootTest class VolumeTest { @@ -17,20 +17,17 @@ class VolumeTest { @Autowired private VolumeRepository volumeRepository; - @Autowired - private ComicRepository comicRepository; - @Autowired private ComicService comicService; @Test void checkInitialDataLoad() { - assertEquals(TestConstants.VOLUME_COUNT, volumeRepository.count()); + assertEquals(TestComicConstants.VOLUME_COUNT, volumeRepository.count()); } @Test void exceptionThrownWhenSavingVolumeWithEmptyName() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); + Comic comic = TestComicConstants.getComicWithoutReferences(comicService); Volume volume = new Volume(); volume.setComic(comic); assertThrows(TransactionSystemException.class, () -> { @@ -41,7 +38,7 @@ class VolumeTest { @Test void exceptionThrownWhenSavingVolumeWithoutComic() { Volume volume = new Volume(); - volume.setName(TestConstants.VOLUME_NAME); + volume.setName(TestComicConstants.VOLUME_NAME); assertThrows(TransactionSystemException.class, () -> { volumeRepository.save(volume); }); @@ -49,15 +46,15 @@ class VolumeTest { @Test void saveVolume() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); + Comic comic = TestComicConstants.getComicWithoutReferences(comicService); assertEquals(0, comic.getVolumes().size()); Volume volume = new Volume(); - volume.setName(TestConstants.VOLUME_NAME); + volume.setName(TestComicConstants.VOLUME_NAME); volume.setComic(comic); Volume savedInstance = volumeRepository.save(volume); assertNotNull(savedInstance); comicService.deleteVolume(savedInstance); assertEquals(0, comic.getVolumes().size()); - assertEquals(TestConstants.VOLUME_COUNT, volumeRepository.count()); + assertEquals(TestComicConstants.VOLUME_COUNT, volumeRepository.count()); } } diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/WorktypeTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/WorktypeTest.java similarity index 73% rename from kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/WorktypeTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/WorktypeTest.java index 050bde9..f3c2d02 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/data/WorktypeTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/comics/WorktypeTest.java @@ -1,10 +1,12 @@ -package de.thpeetz.kontor.comics.data; +package de.thpeetz.kontor.data.comics; import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import de.thpeetz.kontor.comics.repository.*; +import de.thpeetz.kontor.constants.TestComicConstants; +import de.thpeetz.kontor.repository.comics.WorktypeRepository; + import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; @@ -14,8 +16,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.transaction.TransactionSystemException; -import de.thpeetz.kontor.comics.TestConstants; - @SpringBootTest @TestMethodOrder(OrderAnnotation.class) class WorktypeTest { @@ -33,9 +33,9 @@ class WorktypeTest { @Test @Order(2) void findWorktypeByName() { - Worktype found = worktypeRepository.findByName(TestConstants.WORKTYPE_INKER); + Worktype found = worktypeRepository.findByName(TestComicConstants.WORKTYPE_INKER); assertNotNull(found); - assertEquals(TestConstants.WORKTYPE_INKER, found.getName()); + assertEquals(TestComicConstants.WORKTYPE_INKER, found.getName()); Worktype notFound = worktypeRepository.findByName("er"); assertNull(notFound); } @@ -53,10 +53,10 @@ class WorktypeTest { @Order(4) void saveWorktypeWithIdenticalName() { Worktype worktype1 = new Worktype(); - worktype1.setName(TestConstants.WORKTYPE_NAME); + worktype1.setName(TestComicConstants.WORKTYPE_NAME); worktypeRepository.save(worktype1); Worktype worktype2 = new Worktype(); - worktype2.setName(TestConstants.WORKTYPE_NAME); + worktype2.setName(TestComicConstants.WORKTYPE_NAME); assertThrows(DataIntegrityViolationException.class, () -> { worktypeRepository.save(worktype2); }); @@ -67,17 +67,17 @@ class WorktypeTest { @Order(5) void saveWorktype() { Worktype worktype = new Worktype(); - worktype.setName(TestConstants.WORKTYPE_NAME); + worktype.setName(TestComicConstants.WORKTYPE_NAME); worktypeRepository.save(worktype); - assertEquals(TestConstants.WORKTYPE_COUNT + 1, worktypeRepository.count()); + assertEquals(TestComicConstants.WORKTYPE_COUNT + 1, worktypeRepository.count()); } @Test @Order(6) void deleteWorktype() { - Worktype worktype = worktypeRepository.findByName(TestConstants.WORKTYPE_NAME); + Worktype worktype = worktypeRepository.findByName(TestComicConstants.WORKTYPE_NAME); assertNotNull(worktype); worktypeRepository.delete(worktype); - assertEquals(TestConstants.WORKTYPE_COUNT, worktypeRepository.count()); + assertEquals(TestComicConstants.WORKTYPE_COUNT, worktypeRepository.count()); } } diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/media/data/MediaArticleTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/media/MediaArticleTest.java similarity index 84% rename from kontor-spring/src/test/java/de/thpeetz/kontor/media/data/MediaArticleTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/media/MediaArticleTest.java index 365968f..7f80de4 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/media/data/MediaArticleTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/media/MediaArticleTest.java @@ -1,11 +1,11 @@ -package de.thpeetz.kontor.media.data; +package de.thpeetz.kontor.data.media; -import de.thpeetz.kontor.media.repository.MediaArticleRepository; -import de.thpeetz.kontor.media.services.MediaArticleService; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import de.thpeetz.kontor.repository.media.MediaArticleRepository; + import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/media/data/MediaFileTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/media/MediaFileTest.java similarity index 91% rename from kontor-spring/src/test/java/de/thpeetz/kontor/media/data/MediaFileTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/media/MediaFileTest.java index e1055ac..02d7a28 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/media/data/MediaFileTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/media/MediaFileTest.java @@ -1,10 +1,10 @@ -package de.thpeetz.kontor.media.data; +package de.thpeetz.kontor.data.media; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import de.thpeetz.kontor.media.repository.MediaFileRepository; +import de.thpeetz.kontor.repository.media.MediaFileRepository; import java.util.List; diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/CardSetTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/CardSetTest.java similarity index 60% rename from kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/CardSetTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/CardSetTest.java index a5699d6..a28e478 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/CardSetTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/CardSetTest.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.data; +package de.thpeetz.kontor.data.tysc; import static org.junit.jupiter.api.Assertions.*; @@ -6,8 +6,8 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import de.thpeetz.kontor.tysc.TestConstants; -import de.thpeetz.kontor.tysc.services.CardService; +import de.thpeetz.kontor.constants.TestTyscConstants; +import de.thpeetz.kontor.services.CardService; @SpringBootTest class CardSetTest { @@ -17,6 +17,6 @@ class CardSetTest { @Test void checkInitialDataLoad() { - assertEquals(TestConstants.CARDSET_COUNT, cardService.findAllCardSets(null).size()); + assertEquals(TestTyscConstants.CARDSET_COUNT, cardService.findAllCardSets(null).size()); } } diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/CardTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/CardTest.java similarity index 60% rename from kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/CardTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/CardTest.java index 0d71d8d..990bfa8 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/CardTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/CardTest.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.data; +package de.thpeetz.kontor.data.tysc; import static org.junit.jupiter.api.Assertions.*; @@ -6,8 +6,8 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import de.thpeetz.kontor.tysc.TestConstants; -import de.thpeetz.kontor.tysc.services.CardService; +import de.thpeetz.kontor.constants.TestTyscConstants; +import de.thpeetz.kontor.services.CardService; @SpringBootTest class CardTest { @@ -17,6 +17,6 @@ class CardTest { @Test void checkInitialDataLoad() { - assertEquals(TestConstants.CARD_COUNT, cardService.findAllCards(null).size()); + assertEquals(TestTyscConstants.CARD_COUNT, cardService.findAllCards(null).size()); } } diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/FieldPositionTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/FieldPositionTest.java similarity index 83% rename from kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/FieldPositionTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/FieldPositionTest.java index 0853371..342aa67 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/FieldPositionTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/FieldPositionTest.java @@ -1,14 +1,14 @@ -package de.thpeetz.kontor.tysc.data; +package de.thpeetz.kontor.data.tysc; import static org.junit.jupiter.api.Assertions.*; -import de.thpeetz.kontor.tysc.repository.FieldPositionRepository; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.transaction.TransactionSystemException; -import de.thpeetz.kontor.tysc.TestConstants; +import de.thpeetz.kontor.constants.TestTyscConstants; +import de.thpeetz.kontor.repository.tysc.FieldPositionRepository; @SpringBootTest class FieldPositionTest { @@ -18,7 +18,7 @@ class FieldPositionTest { @Test void checkInitialDataLoad() { - assertEquals(Integer.toUnsignedLong(TestConstants.POSITION_COUNT), fieldPositionRepository.count()); + assertEquals(Integer.toUnsignedLong(TestTyscConstants.POSITION_COUNT), fieldPositionRepository.count()); } @Test diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/PlayerTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/PlayerTest.java similarity index 87% rename from kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/PlayerTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/PlayerTest.java index 4941f6f..4935d30 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/PlayerTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/PlayerTest.java @@ -1,10 +1,9 @@ -package de.thpeetz.kontor.tysc.data; +package de.thpeetz.kontor.data.tysc; import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import de.thpeetz.kontor.tysc.repository.PlayerRepository; import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; @@ -14,7 +13,8 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.transaction.TransactionSystemException; -import de.thpeetz.kontor.tysc.TestConstants; +import de.thpeetz.kontor.constants.TestTyscConstants; +import de.thpeetz.kontor.repository.tysc.PlayerRepository; @SpringBootTest @TestMethodOrder(OrderAnnotation.class) @@ -27,7 +27,7 @@ class PlayerTest { @Order(1) void checkInitialDataLoad() { List players = playerRepository.findAll(); - assertEquals(TestConstants.PLAYER_COUNT, players.size()); + assertEquals(TestTyscConstants.PLAYER_COUNT, players.size()); } @Test diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/RoosterTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/RoosterTest.java similarity index 85% rename from kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/RoosterTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/RoosterTest.java index c0e2e6c..36cffa1 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/RoosterTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/RoosterTest.java @@ -1,16 +1,16 @@ -package de.thpeetz.kontor.tysc.data; +package de.thpeetz.kontor.data.tysc; import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import de.thpeetz.kontor.tysc.repository.RoosterRepository; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.dao.DataIntegrityViolationException; -import de.thpeetz.kontor.tysc.TestConstants; +import de.thpeetz.kontor.constants.TestTyscConstants; +import de.thpeetz.kontor.repository.tysc.RoosterRepository; @SpringBootTest class RoosterTest { @@ -21,7 +21,7 @@ class RoosterTest { @Test void checkInitialDataLoad() { List roosters = roosterRepository.findAll(); - assertEquals(TestConstants.ROOSTER_COUNT, roosters.size()); + assertEquals(TestTyscConstants.ROOSTER_COUNT, roosters.size()); } @Test diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/SportTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/SportTest.java similarity index 84% rename from kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/SportTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/SportTest.java index c045d12..4a6e837 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/SportTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/SportTest.java @@ -1,17 +1,17 @@ -package de.thpeetz.kontor.tysc.data; +package de.thpeetz.kontor.data.tysc; import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import de.thpeetz.kontor.tysc.repository.SportRepository; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.transaction.TransactionSystemException; -import de.thpeetz.kontor.tysc.TestConstants; +import de.thpeetz.kontor.constants.TestTyscConstants; +import de.thpeetz.kontor.repository.tysc.SportRepository; @SpringBootTest class SportTest { @@ -22,7 +22,7 @@ class SportTest { @Test void checkInitialDataLoad() { List sports = sportRepository.findAll(); - assertEquals(TestConstants.SPORT_COUNT, sports.size()); + assertEquals(TestTyscConstants.SPORT_COUNT, sports.size()); } @Test diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/TeamTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/TeamTest.java similarity index 83% rename from kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/TeamTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/TeamTest.java index d183b48..87ac54c 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/TeamTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/TeamTest.java @@ -1,16 +1,16 @@ -package de.thpeetz.kontor.tysc.data; +package de.thpeetz.kontor.data.tysc; import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import de.thpeetz.kontor.tysc.repository.TeamRepository; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.transaction.TransactionSystemException; -import de.thpeetz.kontor.tysc.TestConstants; +import de.thpeetz.kontor.constants.TestTyscConstants; +import de.thpeetz.kontor.repository.tysc.TeamRepository; @SpringBootTest class TeamTest { @@ -21,7 +21,7 @@ class TeamTest { @Test void checkInitialDataLoad() { List teams = teamRepository.findAll(); - assertEquals(TestConstants.TEAM_COUNT, teams.size()); + assertEquals(TestTyscConstants.TEAM_COUNT, teams.size()); } @Test @@ -35,7 +35,7 @@ class TeamTest { @Test void throwExceptionWhenTeamSavedWithoutSport() { Team team = new Team(); - team.setName(TestConstants.TEAM_NAME); + team.setName(TestTyscConstants.TEAM_NAME); assertThrows(TransactionSystemException.class, () -> { teamRepository.save(team); }); diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/VendorTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/VendorTest.java similarity index 80% rename from kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/VendorTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/VendorTest.java index ea63c11..002a680 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/data/VendorTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/data/tysc/VendorTest.java @@ -1,18 +1,18 @@ -package de.thpeetz.kontor.tysc.data; +package de.thpeetz.kontor.data.tysc; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.List; -import de.thpeetz.kontor.tysc.repository.VendorRepository; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.dao.DataIntegrityViolationException; import org.springframework.transaction.TransactionSystemException; -import de.thpeetz.kontor.tysc.TestConstants; +import de.thpeetz.kontor.constants.TestTyscConstants; +import de.thpeetz.kontor.repository.tysc.VendorRepository; @SpringBootTest class VendorTest { @@ -23,7 +23,7 @@ class VendorTest { @Test void checkInitialDataLoad() { List vendors = vendorRepository.findAll(); - assertEquals(TestConstants.VENDOR_COUNT, vendors.size()); + assertEquals(TestTyscConstants.VENDOR_COUNT, vendors.size()); } @Test @@ -37,7 +37,7 @@ class VendorTest { @Test void exceptionThrownWhenSavingSportWithExistingName() { Vendor vendor = new Vendor(); - vendor.setName(TestConstants.TOPPS_NAME); + vendor.setName(TestTyscConstants.TOPPS_NAME); assertThrows(DataIntegrityViolationException.class, () -> { vendorRepository.save(vendor); }); diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/media/data/MediaVideoTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/media/data/MediaVideoTest.java deleted file mode 100644 index 73809d8..0000000 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/media/data/MediaVideoTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package de.thpeetz.kontor.media.data; - -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import de.thpeetz.kontor.media.repository.MediaVideoRepository; - -import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.api.Assertions.assertFalse; - -@SpringBootTest -public class MediaVideoTest { - - @Autowired - private MediaVideoRepository mediaVideoRepository; - - @Test - @Order(1) - void checkInitialLoad() { - assertTrue(mediaVideoRepository.findAll().isEmpty()); - } - - @Test - @Order(2) - void checkDefaultValues() { - MediaVideo mediaVideo = new MediaVideo(); - assertNull(mediaVideo.getUrl()); - assertNull(mediaVideo.getTitle()); - assertNull(mediaVideo.getFileName()); - assertNull(mediaVideo.getPath()); - assertNull(mediaVideo.getCloudLink()); - assertNull(mediaVideo.getCreatedDate()); - assertNull(mediaVideo.getLastModifiedDate()); - assertNull(mediaVideo.getId()); - assertFalse(mediaVideo.isReview()); - assertFalse(mediaVideo.isShouldDownload()); - } -} diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/ArticleAuthorRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/ArticleAuthorRepositoryTest.java similarity index 56% rename from kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/ArticleAuthorRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/ArticleAuthorRepositoryTest.java index b54b976..e768aad 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/ArticleAuthorRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/ArticleAuthorRepositoryTest.java @@ -1,6 +1,10 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.repository.bookshelf; + +import de.thpeetz.kontor.constants.TestBookshelfConstants; +import de.thpeetz.kontor.data.bookshelf.Article; +import de.thpeetz.kontor.data.bookshelf.ArticleAuthor; +import de.thpeetz.kontor.data.bookshelf.Author; -import de.thpeetz.kontor.bookshelf.TestConstants; import org.junit.jupiter.api.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -25,31 +29,31 @@ class ArticleAuthorRepositoryTest { @Order(1) void saveArticleAuthor() { Author author = new Author(); - author.setFirstName(TestConstants.AUTHOR_FIRSTNAME); - author.setLastName(TestConstants.AUTHOR_LASTNAME); - Author savedAuthor = authorRepository.save(author); - assertEquals(TestConstants.AUTHOR_COUNT+1, authorRepository.findAll().size()); + author.setFirstName(TestBookshelfConstants.AUTHOR_FIRSTNAME); + author.setLastName(TestBookshelfConstants.AUTHOR_LASTNAME); + //TODO Author savedAuthor = authorRepository.save(author); + assertEquals(TestBookshelfConstants.AUTHOR_COUNT+1, authorRepository.findAll().size()); Article article = new Article(); - article.setTitle(TestConstants.ARTICLE_TITLE); - Article savedArticle = articleRepository.save(article); + article.setTitle(TestBookshelfConstants.ARTICLE_TITLE); + //TODO Article savedArticle = articleRepository.save(article); ArticleAuthor articleAuthor = new ArticleAuthor(); articleAuthor.setArticle(article); articleAuthor.setAuthor(author); - ArticleAuthor savedArticleAuthor = articleAuthorRepository.save(articleAuthor); - assertEquals(TestConstants.ARTICLEAUTHOR_COUNT+1, articleAuthorRepository.findAll().size()); + //TODO ArticleAuthor savedArticleAuthor = articleAuthorRepository.save(articleAuthor); + assertEquals(TestBookshelfConstants.ARTICLEAUTHOR_COUNT+1, articleAuthorRepository.findAll().size()); } @Test @Order(2) void testFindByArticle() { - Article article = articleRepository.findByTitle(TestConstants.ARTICLE_TITLE).get(0); + Article article = articleRepository.findByTitle(TestBookshelfConstants.ARTICLE_TITLE).get(0); assertEquals(1, articleAuthorRepository.findByArticle(article).size()); } @Test @Order(3) void testFindByAuthor() { - Author author = authorRepository.findByFirstNameAndLastName(TestConstants.AUTHOR_FIRSTNAME, TestConstants.AUTHOR_LASTNAME); + Author author = authorRepository.findByFirstNameAndLastName(TestBookshelfConstants.AUTHOR_FIRSTNAME, TestBookshelfConstants.AUTHOR_LASTNAME); assertEquals(1, articleAuthorRepository.findByAuthor(author).size()); } @@ -65,10 +69,10 @@ class ArticleAuthorRepositoryTest { article.getAuthors().remove(articleAuthor); article = articleRepository.save(article); articleAuthorRepository.delete(articleAuthor); - assertEquals(TestConstants.ARTICLEAUTHOR_COUNT, articleAuthorRepository.findAll().size()); + assertEquals(TestBookshelfConstants.ARTICLEAUTHOR_COUNT, articleAuthorRepository.findAll().size()); authorRepository.delete(author); - assertEquals(TestConstants.AUTHOR_COUNT, authorRepository.findAll().size()); + assertEquals(TestBookshelfConstants.AUTHOR_COUNT, authorRepository.findAll().size()); articleRepository.delete(article); - assertEquals(TestConstants.ARTICLE_COUNT, articleRepository.findAll().size()); + assertEquals(TestBookshelfConstants.ARTICLE_COUNT, articleRepository.findAll().size()); } } diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/ArticleRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/ArticleRepositoryTest.java similarity index 59% rename from kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/ArticleRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/ArticleRepositoryTest.java index 7d74119..62614f3 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/ArticleRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/ArticleRepositoryTest.java @@ -1,6 +1,8 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.repository.bookshelf; + +import de.thpeetz.kontor.constants.TestBookshelfConstants; +import de.thpeetz.kontor.data.bookshelf.Article; -import de.thpeetz.kontor.bookshelf.TestConstants; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; @@ -22,30 +24,30 @@ class ArticleRepositoryTest { @Test @Order(1) void checkInitialLoad() { - assertEquals(TestConstants.ARTICLE_COUNT, articleRepository.findAll().size()); + assertEquals(TestBookshelfConstants.ARTICLE_COUNT, articleRepository.findAll().size()); } @Test @Order(2) void saveArticle() { Article article = new Article(); - article.setTitle(TestConstants.ARTICLE_TITLE); + article.setTitle(TestBookshelfConstants.ARTICLE_TITLE); articleRepository.save(article); - assertEquals(TestConstants.ARTICLE_COUNT+1, articleRepository.findAll().size()); + assertEquals(TestBookshelfConstants.ARTICLE_COUNT+1, articleRepository.findAll().size()); } @Test @Order(3) void search() { - List
articles = articleRepository.search(TestConstants.ARTICLE_TITLE.substring(2,5)); + List
articles = articleRepository.search(TestBookshelfConstants.ARTICLE_TITLE.substring(2,5)); assertEquals(1, articles.size()); - assertEquals(0, articleRepository.search(TestConstants.BOOK_TITLE).size()); + assertEquals(0, articleRepository.search(TestBookshelfConstants.BOOK_TITLE).size()); } @Test @Order(4) void findByTitle() { - List
articles = articleRepository.search(TestConstants.ARTICLE_TITLE); + List
articles = articleRepository.search(TestBookshelfConstants.ARTICLE_TITLE); assertEquals(1, articles.size()); } @@ -56,6 +58,6 @@ class ArticleRepositoryTest { assertEquals(1, articles.size()); assertEquals(0, articles.get(0).getAuthors().size()); articleRepository.delete(articles.get(0)); - assertEquals(TestConstants.ARTICLE_COUNT, articleRepository.findAll().size()); + assertEquals(TestBookshelfConstants.ARTICLE_COUNT, articleRepository.findAll().size()); } } \ No newline at end of file diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/AuthorRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/AuthorRepositoryTest.java similarity index 72% rename from kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/AuthorRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/AuthorRepositoryTest.java index f984d11..fcb399b 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/AuthorRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/AuthorRepositoryTest.java @@ -1,6 +1,8 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.repository.bookshelf; + +import de.thpeetz.kontor.constants.TestBookshelfConstants; +import de.thpeetz.kontor.data.bookshelf.Author; -import de.thpeetz.kontor.bookshelf.TestConstants; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; @@ -25,17 +27,17 @@ class AuthorRepositoryTest { @Test @Order(1) void checkInitialLoad() { - assertEquals(TestConstants.AUTHOR_COUNT, authorRepository.findAll().size()); + assertEquals(TestBookshelfConstants.AUTHOR_COUNT, authorRepository.findAll().size()); } @Test @Order(2) void saveAutor() { Author author = new Author(); - author.setFirstName(TestConstants.AUTHOR_FIRSTNAME); - author.setLastName(TestConstants.AUTHOR_LASTNAME); + author.setFirstName(TestBookshelfConstants.AUTHOR_FIRSTNAME); + author.setLastName(TestBookshelfConstants.AUTHOR_LASTNAME); authorRepository.save(author); - assertEquals(TestConstants.AUTHOR_COUNT+1, authorRepository.findAll().size()); + assertEquals(TestBookshelfConstants.AUTHOR_COUNT+1, authorRepository.findAll().size()); } @Test @@ -61,9 +63,9 @@ class AuthorRepositoryTest { @Test @Order(5) void deleteAuthor() { - Author existingAuthor = authorRepository.findByFirstNameAndLastName(TestConstants.AUTHOR_FIRSTNAME, TestConstants.AUTHOR_LASTNAME); + Author existingAuthor = authorRepository.findByFirstNameAndLastName(TestBookshelfConstants.AUTHOR_FIRSTNAME, TestBookshelfConstants.AUTHOR_LASTNAME); assertNotNull(existingAuthor); authorRepository.delete(existingAuthor); - assertEquals(TestConstants.AUTHOR_COUNT, authorRepository.findAll().size()); + assertEquals(TestBookshelfConstants.AUTHOR_COUNT, authorRepository.findAll().size()); } } diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookAuthorRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/BookAuthorRepositoryTest.java similarity index 62% rename from kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookAuthorRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/BookAuthorRepositoryTest.java index 4df5fd9..0fb3a81 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookAuthorRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/BookAuthorRepositoryTest.java @@ -1,6 +1,11 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.repository.bookshelf; + +import de.thpeetz.kontor.constants.TestBookshelfConstants; +import de.thpeetz.kontor.data.bookshelf.Author; +import de.thpeetz.kontor.data.bookshelf.Book; +import de.thpeetz.kontor.data.bookshelf.BookAuthor; +import de.thpeetz.kontor.data.bookshelf.BookshelfPublisher; -import de.thpeetz.kontor.bookshelf.TestConstants; import org.junit.jupiter.api.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -30,25 +35,25 @@ class BookAuthorRepositoryTest { @Order(1) void saveBookAuthor() { Author author = new Author(); - author.setFirstName(TestConstants.AUTHOR_FIRSTNAME); - author.setLastName(TestConstants.AUTHOR_LASTNAME); + author.setFirstName(TestBookshelfConstants.AUTHOR_FIRSTNAME); + author.setLastName(TestBookshelfConstants.AUTHOR_LASTNAME); Author savedAuthor = authorRepository.save(author); - assertEquals(TestConstants.AUTHOR_COUNT+1, authorRepository.findAll().size()); + assertEquals(TestBookshelfConstants.AUTHOR_COUNT+1, authorRepository.findAll().size()); BookshelfPublisher publisher = new BookshelfPublisher(); - publisher.setName(TestConstants.PUBLISHER_NAME); + publisher.setName(TestBookshelfConstants.PUBLISHER_NAME); BookshelfPublisher savedPublisher = bookshelfPublisherRepository.save(publisher); - assertEquals(TestConstants.PUBLISHER_COUNT+1, bookshelfPublisherRepository.findAll().size()); + assertEquals(TestBookshelfConstants.PUBLISHER_COUNT+1, bookshelfPublisherRepository.findAll().size()); Book book = new Book(); - book.setTitle(TestConstants.ARTICLE_TITLE); - book.setIsbn(TestConstants.BOOK_ISBN); + book.setTitle(TestBookshelfConstants.ARTICLE_TITLE); + book.setIsbn(TestBookshelfConstants.BOOK_ISBN); book.setPublisher(savedPublisher); Book savedBook = bookRepository.save(book); - assertEquals(TestConstants.BOOK_COUNT+1, bookRepository.findAll().size()); + assertEquals(TestBookshelfConstants.BOOK_COUNT+1, bookRepository.findAll().size()); BookAuthor bookAuthor = new BookAuthor(); bookAuthor.setBook(savedBook); bookAuthor.setAuthor(savedAuthor); - BookAuthor savedBookAuthor = bookAuthorRepository.save(bookAuthor); - assertEquals(TestConstants.BOOKAUTHOR_COUNT+1, bookAuthorRepository.findAll().size()); + //TODO BookAuthor savedBookAuthor = bookAuthorRepository.save(bookAuthor); + assertEquals(TestBookshelfConstants.BOOKAUTHOR_COUNT+1, bookAuthorRepository.findAll().size()); } @Test @@ -83,12 +88,12 @@ class BookAuthorRepositoryTest { bookshelfPublisherRepository.save(publisher); book = bookRepository.save(book); bookshelfPublisherRepository.delete(publisher); - assertEquals(TestConstants.PUBLISHER_COUNT, bookshelfPublisherRepository.findAll().size()); + assertEquals(TestBookshelfConstants.PUBLISHER_COUNT, bookshelfPublisherRepository.findAll().size()); bookAuthorRepository.delete(bookAuthor); - assertEquals(TestConstants.BOOKAUTHOR_COUNT, bookAuthorRepository.findAll().size()); + assertEquals(TestBookshelfConstants.BOOKAUTHOR_COUNT, bookAuthorRepository.findAll().size()); authorRepository.delete(author); - assertEquals(TestConstants.AUTHOR_COUNT, authorRepository.findAll().size()); + assertEquals(TestBookshelfConstants.AUTHOR_COUNT, authorRepository.findAll().size()); bookRepository.delete(book); - assertEquals(TestConstants.BOOK_COUNT, bookRepository.findAll().size()); + assertEquals(TestBookshelfConstants.BOOK_COUNT, bookRepository.findAll().size()); } } diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/BookRepositoryTest.java similarity index 50% rename from kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/BookRepositoryTest.java index 969d465..3f10de2 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/BookRepositoryTest.java @@ -1,6 +1,9 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.repository.bookshelf; + +import de.thpeetz.kontor.constants.TestBookshelfConstants; +import de.thpeetz.kontor.data.bookshelf.Book; +import de.thpeetz.kontor.data.bookshelf.BookshelfPublisher; -import de.thpeetz.kontor.bookshelf.TestConstants; import org.junit.jupiter.api.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -23,65 +26,65 @@ class BookRepositoryTest { @Test @Order(1) void checkInitialLoad(){ - assertEquals(TestConstants.BOOK_COUNT, bookRepository.findAll().size()); + assertEquals(TestBookshelfConstants.BOOK_COUNT, bookRepository.findAll().size()); } @Test @Order(2) void saveBook() { BookshelfPublisher publisher = new BookshelfPublisher(); - publisher.setName(TestConstants.PUBLISHER_NAME); + publisher.setName(TestBookshelfConstants.PUBLISHER_NAME); bookshelfPublisherRepository.save(publisher); Book book = new Book(); - book.setTitle(TestConstants.BOOK_TITLE); - book.setIsbn(TestConstants.BOOK_ISBN); + book.setTitle(TestBookshelfConstants.BOOK_TITLE); + book.setIsbn(TestBookshelfConstants.BOOK_ISBN); book.setPublisher(publisher); bookRepository.save(book); - assertEquals(TestConstants.BOOK_COUNT+1, bookRepository.findAll().size()); + assertEquals(TestBookshelfConstants.BOOK_COUNT+1, bookRepository.findAll().size()); } @Test @Order(3) void search() { - List books = bookRepository.search(TestConstants.BOOK_TITLE.substring(2,5)); + List books = bookRepository.search(TestBookshelfConstants.BOOK_TITLE.substring(2,5)); assertEquals(1, books.size()); - assertEquals(1, bookRepository.search(TestConstants.BOOK_ISBN.substring(3,7)).size()); + assertEquals(1, bookRepository.search(TestBookshelfConstants.BOOK_ISBN.substring(3,7)).size()); assertEquals(0, bookRepository.search("Article").size()); } @Test @Order(4) void findByTitle() { - List books = bookRepository.findByTitle(TestConstants.BOOK_TITLE); + List books = bookRepository.findByTitle(TestBookshelfConstants.BOOK_TITLE); assertEquals(1, books.size()); - assertEquals(TestConstants.BOOK_ISBN, books.get(0).getIsbn()); + assertEquals(TestBookshelfConstants.BOOK_ISBN, books.get(0).getIsbn()); } @Test @Order(5) void findByTitleIgnoreCase() { - List books = bookRepository.findByTitleIgnoreCase(TestConstants.BOOK_TITLE.toLowerCase()); + List books = bookRepository.findByTitleIgnoreCase(TestBookshelfConstants.BOOK_TITLE.toLowerCase()); assertEquals(1, books.size()); - assertEquals(TestConstants.BOOK_ISBN, books.get(0).getIsbn()); + assertEquals(TestBookshelfConstants.BOOK_ISBN, books.get(0).getIsbn()); } @Test @Order(6) void findByIsbn() { - List books = bookRepository.findByIsbn(TestConstants.BOOK_ISBN); + List books = bookRepository.findByIsbn(TestBookshelfConstants.BOOK_ISBN); assertEquals(1, books.size()); - assertEquals(TestConstants.BOOK_TITLE, books.get(0).getTitle()); + assertEquals(TestBookshelfConstants.BOOK_TITLE, books.get(0).getTitle()); } @Test @Order(7) void deleteBook() { - List books = bookRepository.findByIsbn(TestConstants.BOOK_ISBN); + List books = bookRepository.findByIsbn(TestBookshelfConstants.BOOK_ISBN); Book book = books.get(0); BookshelfPublisher publisher = book.getPublisher(); bookshelfPublisherRepository.delete(publisher); bookRepository.delete(book); - assertEquals(TestConstants.BOOK_COUNT, bookRepository.findAll().size()); - assertEquals(TestConstants.PUBLISHER_COUNT, bookshelfPublisherRepository.findAll().size()); + assertEquals(TestBookshelfConstants.BOOK_COUNT, bookRepository.findAll().size()); + assertEquals(TestBookshelfConstants.PUBLISHER_COUNT, bookshelfPublisherRepository.findAll().size()); } } \ No newline at end of file diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookshelfPublisherRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/BookshelfPublisherRepositoryTest.java similarity index 57% rename from kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookshelfPublisherRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/BookshelfPublisherRepositoryTest.java index 98b60fa..882c16e 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/data/BookshelfPublisherRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/bookshelf/BookshelfPublisherRepositoryTest.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.bookshelf.data; +package de.thpeetz.kontor.repository.bookshelf; import static org.junit.jupiter.api.Assertions.*; @@ -11,7 +11,8 @@ import org.junit.jupiter.api.TestMethodOrder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import de.thpeetz.kontor.bookshelf.TestConstants; +import de.thpeetz.kontor.constants.TestBookshelfConstants; +import de.thpeetz.kontor.data.bookshelf.BookshelfPublisher; import lombok.extern.slf4j.Slf4j; @Slf4j @@ -25,48 +26,48 @@ class BookshelfPublisherRepositoryTest { @Test @Order(1) void checkInitialLoad() { - assertEquals(TestConstants.PUBLISHER_COUNT, publisherRepository.findAll().size()); + assertEquals(TestBookshelfConstants.PUBLISHER_COUNT, publisherRepository.findAll().size()); } @Test @Order(2) void savePublisher() { BookshelfPublisher publisher = new BookshelfPublisher(); - publisher.setName(TestConstants.PUBLISHER_NAME); + publisher.setName(TestBookshelfConstants.PUBLISHER_NAME); publisherRepository.save(publisher); - assertEquals(TestConstants.PUBLISHER_COUNT + 1, publisherRepository.findAll().size()); + assertEquals(TestBookshelfConstants.PUBLISHER_COUNT + 1, publisherRepository.findAll().size()); } @Test @Order(3) void findPublisherByName() { - assertEquals(TestConstants.PUBLISHER_COUNT + 1, publisherRepository.findAll().size()); + assertEquals(TestBookshelfConstants.PUBLISHER_COUNT + 1, publisherRepository.findAll().size()); log.info("Liste der Publisher: {}", publisherRepository.findAll()); - BookshelfPublisher publisher = publisherRepository.findByName(TestConstants.PUBLISHER_NAME); + BookshelfPublisher publisher = publisherRepository.findByName(TestBookshelfConstants.PUBLISHER_NAME); assertNotNull(publisher); - assertEquals(TestConstants.PUBLISHER_NAME, publisher.getName()); - BookshelfPublisher notFound = publisherRepository.findByName(TestConstants.PUBLISHER_SEARCH); + assertEquals(TestBookshelfConstants.PUBLISHER_NAME, publisher.getName()); + BookshelfPublisher notFound = publisherRepository.findByName(TestBookshelfConstants.PUBLISHER_SEARCH); assertNull(notFound); List publishers = publisherRepository - .findByNameIgnoreCase(TestConstants.PUBLISHER_NAME.toLowerCase()); + .findByNameIgnoreCase(TestBookshelfConstants.PUBLISHER_NAME.toLowerCase()); assertEquals(1, publishers.size()); - assertEquals(TestConstants.PUBLISHER_NAME, publishers.get(0).getName()); + assertEquals(TestBookshelfConstants.PUBLISHER_NAME, publishers.get(0).getName()); } @Test @Order(4) void searchPublisher() { - List publishers = publisherRepository.search(TestConstants.PUBLISHER_NAME.substring(2, 6)); + List publishers = publisherRepository.search(TestBookshelfConstants.PUBLISHER_NAME.substring(2, 6)); assertEquals(1, publishers.size()); - assertEquals(TestConstants.PUBLISHER_NAME, publishers.get(0).getName()); + assertEquals(TestBookshelfConstants.PUBLISHER_NAME, publishers.get(0).getName()); } @Test @Order(5) void deletePublisher() { - BookshelfPublisher publisher = publisherRepository.findByName(TestConstants.PUBLISHER_NAME); + BookshelfPublisher publisher = publisherRepository.findByName(TestBookshelfConstants.PUBLISHER_NAME); assertNotNull(publisher); publisherRepository.delete(publisher); - assertEquals(TestConstants.PUBLISHER_COUNT, publisherRepository.findAll().size()); + assertEquals(TestBookshelfConstants.PUBLISHER_COUNT, publisherRepository.findAll().size()); } } diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/ArtistRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/ArtistRepositoryTest.java similarity index 95% rename from kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/ArtistRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/ArtistRepositoryTest.java index 2a3f9e0..5cf46e5 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/ArtistRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/ArtistRepositoryTest.java @@ -1,10 +1,11 @@ -package de.thpeetz.kontor.comics.repository; +package de.thpeetz.kontor.repository.comics; import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import de.thpeetz.kontor.comics.data.*; +import de.thpeetz.kontor.data.comics.Artist; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/ComicRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/ComicRepositoryTest.java similarity index 92% rename from kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/ComicRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/ComicRepositoryTest.java index 9f54868..647e6f7 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/ComicRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/ComicRepositoryTest.java @@ -1,11 +1,13 @@ -package de.thpeetz.kontor.comics.repository; +package de.thpeetz.kontor.repository.comics; import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.stream.Collectors; -import de.thpeetz.kontor.comics.data.*; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.Publisher; + import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/ComicWorkRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/ComicWorkRepositoryTest.java similarity index 91% rename from kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/ComicWorkRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/ComicWorkRepositoryTest.java index a640057..3b01ee0 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/ComicWorkRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/ComicWorkRepositoryTest.java @@ -1,8 +1,7 @@ -package de.thpeetz.kontor.comics.repository; +package de.thpeetz.kontor.repository.comics; import static org.junit.jupiter.api.Assertions.*; -import de.thpeetz.kontor.comics.data.*; import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; @@ -10,7 +9,11 @@ import org.junit.jupiter.api.TestMethodOrder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import de.thpeetz.kontor.comics.services.ComicService; +import de.thpeetz.kontor.data.comics.Artist; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.ComicWork; +import de.thpeetz.kontor.data.comics.Worktype; +import de.thpeetz.kontor.services.ComicService; @SpringBootTest @TestMethodOrder(OrderAnnotation.class) diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/IssueRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/IssueRepositoryTest.java similarity index 67% rename from kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/IssueRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/IssueRepositoryTest.java index 8235b34..6e43525 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/IssueRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/IssueRepositoryTest.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.comics.repository; +package de.thpeetz.kontor.repository.comics; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -6,13 +6,14 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.List; -import de.thpeetz.kontor.comics.data.*; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import de.thpeetz.kontor.comics.TestConstants; -import de.thpeetz.kontor.comics.services.ComicService; +import de.thpeetz.kontor.constants.TestComicConstants; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.Issue; +import de.thpeetz.kontor.services.ComicService; @SpringBootTest class IssueRepositoryTest { @@ -25,14 +26,14 @@ class IssueRepositoryTest { @Test void testFindByComic() { - Comic comic = TestConstants.getComicWithIssues(comicService); + Comic comic = TestComicConstants.getComicWithIssues(comicService); List issues = issueRepository.findByComic(comic); - assertEquals(TestConstants.BATTLE_POPE_ISSUE_COUNT, issues.size()); + assertEquals(TestComicConstants.BATTLE_POPE_ISSUE_COUNT, issues.size()); } @Test void testFindByComicAndIssueNumber() { - Comic comic = TestConstants.getComicWithIssues(comicService); + Comic comic = TestComicConstants.getComicWithIssues(comicService); Issue issue = issueRepository.findByComicAndIssueNumber(comic, "12"); assertNotNull(issue); assertFalse(issue.getIsRead()); diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/PublisherRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/PublisherRepositoryTest.java similarity index 65% rename from kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/PublisherRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/PublisherRepositoryTest.java index 01dcc8e..84beb2c 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/PublisherRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/PublisherRepositoryTest.java @@ -1,10 +1,12 @@ -package de.thpeetz.kontor.comics.repository; +package de.thpeetz.kontor.repository.comics; import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import de.thpeetz.kontor.comics.data.*; +import de.thpeetz.kontor.constants.TestComicConstants; +import de.thpeetz.kontor.data.comics.Publisher; + import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; @@ -12,8 +14,6 @@ import org.junit.jupiter.api.TestMethodOrder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import de.thpeetz.kontor.comics.TestConstants; - @SpringBootTest @TestMethodOrder(OrderAnnotation.class) class PublisherRepositoryTest { @@ -24,30 +24,30 @@ class PublisherRepositoryTest { @Test @Order(1) void checkInitialLoad() { - assertEquals(TestConstants.PUBLISHER_COUNT, publisherRepository.findAll().size()); + assertEquals(TestComicConstants.PUBLISHER_COUNT, publisherRepository.findAll().size()); } @Test @Order(2) void savePublisher() { Publisher publisher = new Publisher(); - publisher.setName(TestConstants.PUBLISHER_NAME); + publisher.setName(TestComicConstants.PUBLISHER_NAME); publisherRepository.save(publisher); - assertEquals(TestConstants.PUBLISHER_COUNT + 1, publisherRepository.findAll().size()); + assertEquals(TestComicConstants.PUBLISHER_COUNT + 1, publisherRepository.findAll().size()); } @Test @Order(3) void findPublisherByName() { - Publisher publisher = publisherRepository.findByName(TestConstants.PUBLISHER_NAME); + Publisher publisher = publisherRepository.findByName(TestComicConstants.PUBLISHER_NAME); assertNotNull(publisher); - assertEquals(TestConstants.PUBLISHER_NAME, publisher.getName()); + assertEquals(TestComicConstants.PUBLISHER_NAME, publisher.getName()); Publisher notFound = publisherRepository.findByName("Cow"); assertNull(notFound); List publishers = publisherRepository - .findByNameIgnoreCase(TestConstants.PUBLISHER_NAME.toLowerCase()); + .findByNameIgnoreCase(TestComicConstants.PUBLISHER_NAME.toLowerCase()); assertEquals(1, publishers.size()); - assertEquals(TestConstants.PUBLISHER_NAME, publishers.get(0).getName()); + assertEquals(TestComicConstants.PUBLISHER_NAME, publishers.get(0).getName()); } @Test @@ -61,9 +61,9 @@ class PublisherRepositoryTest { @Test @Order(5) void deletePublisher() { - Publisher publisher = publisherRepository.findByName(TestConstants.PUBLISHER_NAME); + Publisher publisher = publisherRepository.findByName(TestComicConstants.PUBLISHER_NAME); assertNotNull(publisher); publisherRepository.delete(publisher); - assertEquals(TestConstants.PUBLISHER_COUNT, publisherRepository.findAll().size()); + assertEquals(TestComicConstants.PUBLISHER_COUNT, publisherRepository.findAll().size()); } } diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/StoryArcRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/StoryArcRepositoryTest.java similarity index 72% rename from kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/StoryArcRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/StoryArcRepositoryTest.java index 367faba..15c535c 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/StoryArcRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/StoryArcRepositoryTest.java @@ -1,16 +1,17 @@ -package de.thpeetz.kontor.comics.repository; +package de.thpeetz.kontor.repository.comics; import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import de.thpeetz.kontor.comics.data.*; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import de.thpeetz.kontor.comics.TestConstants; -import de.thpeetz.kontor.comics.services.ComicService; +import de.thpeetz.kontor.constants.TestComicConstants; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.StoryArc; +import de.thpeetz.kontor.services.ComicService; @SpringBootTest class StoryArcRepositoryTest { @@ -30,7 +31,7 @@ class StoryArcRepositoryTest { @Test void findByComic() { - Comic comic = TestConstants.getComicWithStoryArcs(comicService); + Comic comic = TestComicConstants.getComicWithStoryArcs(comicService); List storyArcs = storyArcRepository.findByComic(comic); assertNotNull(storyArcs); assertEquals(3, storyArcs.size()); @@ -38,7 +39,7 @@ class StoryArcRepositoryTest { @Test void findByNameAndComic() { - Comic comic = TestConstants.getComicWithStoryArcs(comicService); + Comic comic = TestComicConstants.getComicWithStoryArcs(comicService); StoryArc storyArc = storyArcRepository.findByNameAndComic("Higher Learning", comic); assertNotNull(storyArc); assertEquals("Emma Frost", storyArc.getComic().getTitle()); diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/TradePaperbackRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/TradePaperbackRepositoryTest.java similarity index 54% rename from kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/TradePaperbackRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/TradePaperbackRepositoryTest.java index 4f9dade..e0bf3e2 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/TradePaperbackRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/TradePaperbackRepositoryTest.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.comics.repository; +package de.thpeetz.kontor.repository.comics; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -6,13 +6,14 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; -import de.thpeetz.kontor.comics.data.*; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import de.thpeetz.kontor.comics.TestConstants; -import de.thpeetz.kontor.comics.services.ComicService; +import de.thpeetz.kontor.constants.TestComicConstants; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.TradePaperback; +import de.thpeetz.kontor.services.ComicService; @SpringBootTest class TradePaperbackRepositoryTest { @@ -32,29 +33,29 @@ class TradePaperbackRepositoryTest { @Test void testFindByComic() { - Comic comic = TestConstants.getComicWithTradePaperbacks(comicService); + Comic comic = TestComicConstants.getComicWithTradePaperbacks(comicService); List tradePaperbacks = tradePaperbackRepository.findByComic(comic); assertNotNull(tradePaperbacks); - assertEquals(TestConstants.SOJOURN_TPB_COUNT, tradePaperbacks.size()); + assertEquals(TestComicConstants.SOJOURN_TPB_COUNT, tradePaperbacks.size()); } @Test void testFindByNameAndComic() { - Comic comic = TestConstants.getComicWithTradePaperbacks(comicService); + Comic comic = TestComicConstants.getComicWithTradePaperbacks(comicService); List tradePaperbacks = tradePaperbackRepository - .findByNameAndComic(TestConstants.SOJOURN_TPB_NAME, comic); + .findByNameAndComic(TestComicConstants.SOJOURN_TPB_NAME, comic); assertNotNull(tradePaperbacks); assertTrue(tradePaperbacks.size() > 0); - assertEquals(TestConstants.SOJOURN_TPB_COMIC_TITLE, tradePaperbacks.get(0).getComic().getTitle()); + assertEquals(TestComicConstants.SOJOURN_TPB_COMIC_TITLE, tradePaperbacks.get(0).getComic().getTitle()); } @Test void testFindByFields() { - Comic comic = TestConstants.getComicWithTradePaperbacks(comicService); - TradePaperback tradePaperback = tradePaperbackRepository.findByFields(TestConstants.SOJOURN_TPB_NAME, - comic, TestConstants.SOJOURN_TPB_START, TestConstants.SOJOURN_TPB_END); + Comic comic = TestComicConstants.getComicWithTradePaperbacks(comicService); + TradePaperback tradePaperback = tradePaperbackRepository.findByFields(TestComicConstants.SOJOURN_TPB_NAME, + comic, TestComicConstants.SOJOURN_TPB_START, TestComicConstants.SOJOURN_TPB_END); assertNotNull(tradePaperback); - assertEquals(TestConstants.SOJOURN_TPB_COMIC_TITLE, tradePaperback.getComic().getTitle()); - assertEquals(TestConstants.SOJOURN_TPB_END, tradePaperback.getIssueEnd()); + assertEquals(TestComicConstants.SOJOURN_TPB_COMIC_TITLE, tradePaperback.getComic().getTitle()); + assertEquals(TestComicConstants.SOJOURN_TPB_END, tradePaperback.getIssueEnd()); } } diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/VolumeRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/VolumeRepositoryTest.java similarity index 62% rename from kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/VolumeRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/VolumeRepositoryTest.java index 33a699a..df87eb5 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/VolumeRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/VolumeRepositoryTest.java @@ -1,16 +1,17 @@ -package de.thpeetz.kontor.comics.repository; +package de.thpeetz.kontor.repository.comics; import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import de.thpeetz.kontor.comics.data.*; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import de.thpeetz.kontor.comics.TestConstants; -import de.thpeetz.kontor.comics.services.ComicService; +import de.thpeetz.kontor.constants.TestComicConstants; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.Volume; +import de.thpeetz.kontor.services.ComicService; @SpringBootTest class VolumeRepositoryTest { @@ -18,18 +19,15 @@ class VolumeRepositoryTest { @Autowired private VolumeRepository volumeRepository; - @Autowired - private ComicRepository comicRepository; - @Autowired private ComicService comicService; @Test void testFindByComic() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); + Comic comic = TestComicConstants.getComicWithoutReferences(comicService); assertEquals(0, comic.getVolumes().size()); Volume volume = new Volume(); - volume.setName(TestConstants.VOLUME_NAME); + volume.setName(TestComicConstants.VOLUME_NAME); volume.setComic(comic); Volume savedInstance = volumeRepository.save(volume); assertNotNull(savedInstance); @@ -39,24 +37,24 @@ class VolumeRepositoryTest { comicService.deleteVolume(found.get(0)); assertEquals(0, comic.getVolumes().size()); - assertEquals(TestConstants.VOLUME_COUNT, volumeRepository.count()); + assertEquals(TestComicConstants.VOLUME_COUNT, volumeRepository.count()); } @Test void testFindByName() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); + Comic comic = TestComicConstants.getComicWithoutReferences(comicService); assertEquals(0, comic.getVolumes().size()); Volume volume = new Volume(); - volume.setName(TestConstants.VOLUME_NAME); + volume.setName(TestComicConstants.VOLUME_NAME); volume.setComic(comic); Volume savedInstance = volumeRepository.save(volume); assertNotNull(savedInstance); - List found = volumeRepository.findByName(TestConstants.VOLUME_NAME); + List found = volumeRepository.findByName(TestComicConstants.VOLUME_NAME); assertEquals(1, found.size()); comicService.deleteVolume(found.get(0)); assertEquals(0, comic.getVolumes().size()); - assertEquals(TestConstants.VOLUME_COUNT, volumeRepository.count()); + assertEquals(TestComicConstants.VOLUME_COUNT, volumeRepository.count()); } } diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/WorktypeRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/WorktypeRepositoryTest.java similarity index 92% rename from kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/WorktypeRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/WorktypeRepositoryTest.java index d9b641e..c8c7917 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/repository/WorktypeRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/comics/WorktypeRepositoryTest.java @@ -1,11 +1,12 @@ -package de.thpeetz.kontor.comics.repository; +package de.thpeetz.kontor.repository.comics; import static org.junit.jupiter.api.Assertions.*; import java.util.List; import java.util.stream.Collectors; -import de.thpeetz.kontor.comics.data.*; +import de.thpeetz.kontor.data.comics.Worktype; + import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/CardRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/CardRepositoryTest.java similarity index 82% rename from kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/CardRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/CardRepositoryTest.java index 96f9f45..54efc87 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/CardRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/CardRepositoryTest.java @@ -1,14 +1,15 @@ -package de.thpeetz.kontor.tysc.repository; +package de.thpeetz.kontor.repository.tysc; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.List; -import de.thpeetz.kontor.tysc.data.Card; -import de.thpeetz.kontor.tysc.data.CardSet; -import de.thpeetz.kontor.tysc.data.Rooster; -import de.thpeetz.kontor.tysc.data.Vendor; +import de.thpeetz.kontor.data.tysc.Card; +import de.thpeetz.kontor.data.tysc.CardSet; +import de.thpeetz.kontor.data.tysc.Rooster; +import de.thpeetz.kontor.data.tysc.Vendor; + import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/CardSetRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/CardSetRepositoryTest.java similarity index 72% rename from kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/CardSetRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/CardSetRepositoryTest.java index 2790087..2efb67b 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/CardSetRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/CardSetRepositoryTest.java @@ -1,17 +1,17 @@ -package de.thpeetz.kontor.tysc.repository; +package de.thpeetz.kontor.repository.tysc; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.List; -import de.thpeetz.kontor.tysc.data.CardSet; -import de.thpeetz.kontor.tysc.data.Vendor; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import de.thpeetz.kontor.tysc.TestConstants; +import de.thpeetz.kontor.constants.TestTyscConstants; +import de.thpeetz.kontor.data.tysc.CardSet; +import de.thpeetz.kontor.data.tysc.Vendor; @SpringBootTest class CardSetRepositoryTest { @@ -24,15 +24,15 @@ class CardSetRepositoryTest { @Test void testFindByName() { - List cardSets = cardSetRepository.findByName(TestConstants.CARDSET_MYSTIQUE_NAME); + List cardSets = cardSetRepository.findByName(TestTyscConstants.CARDSET_MYSTIQUE_NAME); assertEquals(1, cardSets.size()); } @Test void testFindByNameAndVendor() { - Vendor fleer = vendorRepository.findByName(TestConstants.VENDOR_FLEER); + Vendor fleer = vendorRepository.findByName(TestTyscConstants.VENDOR_FLEER); assertNotNull(fleer); - CardSet cardSet = cardSetRepository.findByNameAndVendor(TestConstants.CARDSET_MYSTIQUE_NAME, fleer); + CardSet cardSet = cardSetRepository.findByNameAndVendor(TestTyscConstants.CARDSET_MYSTIQUE_NAME, fleer); assertNotNull(cardSet); } diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/FieldPositionRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/FieldPositionRepositoryTest.java similarity index 59% rename from kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/FieldPositionRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/FieldPositionRepositoryTest.java index 3c5e26e..c3757f8 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/FieldPositionRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/FieldPositionRepositoryTest.java @@ -1,17 +1,17 @@ -package de.thpeetz.kontor.tysc.repository; +package de.thpeetz.kontor.repository.tysc; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.List; -import de.thpeetz.kontor.tysc.data.FieldPosition; -import de.thpeetz.kontor.tysc.data.Sport; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import de.thpeetz.kontor.tysc.TestConstants; +import de.thpeetz.kontor.constants.TestTyscConstants; +import de.thpeetz.kontor.data.tysc.FieldPosition; +import de.thpeetz.kontor.data.tysc.Sport; @SpringBootTest class FieldPositionRepositoryTest { @@ -24,33 +24,33 @@ class FieldPositionRepositoryTest { @Test void testFindByShortName() { - FieldPosition position = fieldPositionRepository.findByShortName(TestConstants.QUARTERBACK_SHORTNAME); + FieldPosition position = fieldPositionRepository.findByShortName(TestTyscConstants.QUARTERBACK_SHORTNAME); assertNotNull(position); - assertEquals(TestConstants.QUARTERBACK_NAME, position.getName()); + assertEquals(TestTyscConstants.QUARTERBACK_NAME, position.getName()); } @Test void testFindByShortNameAndSport() { - Sport sport = sportRepository.findByName(TestConstants.FOOTBALL_NAME); - FieldPosition position = fieldPositionRepository.findByShortNameAndSport(TestConstants.QUARTERBACK_SHORTNAME, sport); + Sport sport = sportRepository.findByName(TestTyscConstants.FOOTBALL_NAME); + FieldPosition position = fieldPositionRepository.findByShortNameAndSport(TestTyscConstants.QUARTERBACK_SHORTNAME, sport); assertNotNull(position); - assertEquals(TestConstants.QUARTERBACK_NAME, position.getName()); + assertEquals(TestTyscConstants.QUARTERBACK_NAME, position.getName()); } @Test void testFindByShortNameIgnoreCase() { List positions = fieldPositionRepository - .findByShortNameIgnoreCase(TestConstants.QUARTERBACK_SHORTNAME.toLowerCase()); + .findByShortNameIgnoreCase(TestTyscConstants.QUARTERBACK_SHORTNAME.toLowerCase()); assertNotNull(positions); assertEquals(1, positions.size()); - assertEquals(TestConstants.QUARTERBACK_NAME, positions.get(0).getName()); + assertEquals(TestTyscConstants.QUARTERBACK_NAME, positions.get(0).getName()); } @Test void testFindBySport() { - Sport sport = sportRepository.findByName(TestConstants.FOOTBALL_NAME); + Sport sport = sportRepository.findByName(TestTyscConstants.FOOTBALL_NAME); List positions = fieldPositionRepository.findBySport(sport); - assertEquals(TestConstants.FOOTBALL_POSITION_COUNT, positions.size()); + assertEquals(TestTyscConstants.FOOTBALL_POSITION_COUNT, positions.size()); } @Test diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/PlayerRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/PlayerRepositoryTest.java similarity index 91% rename from kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/PlayerRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/PlayerRepositoryTest.java index 1f602c7..c15baf6 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/PlayerRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/PlayerRepositoryTest.java @@ -1,10 +1,11 @@ -package de.thpeetz.kontor.tysc.repository; +package de.thpeetz.kontor.repository.tysc; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import de.thpeetz.kontor.tysc.data.Player; +import de.thpeetz.kontor.data.tysc.Player; + import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/RoosterRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/RoosterRepositoryTest.java similarity index 80% rename from kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/RoosterRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/RoosterRepositoryTest.java index a310edb..631ebae 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/RoosterRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/RoosterRepositoryTest.java @@ -1,13 +1,14 @@ -package de.thpeetz.kontor.tysc.repository; +package de.thpeetz.kontor.repository.tysc; import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import de.thpeetz.kontor.tysc.data.FieldPosition; -import de.thpeetz.kontor.tysc.data.Player; -import de.thpeetz.kontor.tysc.data.Rooster; -import de.thpeetz.kontor.tysc.data.Team; +import de.thpeetz.kontor.data.tysc.FieldPosition; +import de.thpeetz.kontor.data.tysc.Player; +import de.thpeetz.kontor.data.tysc.Rooster; +import de.thpeetz.kontor.data.tysc.Team; + import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/SportRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/SportRepositoryTest.java similarity index 58% rename from kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/SportRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/SportRepositoryTest.java index d11fd07..e92ca93 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/SportRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/SportRepositoryTest.java @@ -1,16 +1,16 @@ -package de.thpeetz.kontor.tysc.repository; +package de.thpeetz.kontor.repository.tysc; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.List; -import de.thpeetz.kontor.tysc.data.Sport; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import de.thpeetz.kontor.tysc.TestConstants; +import de.thpeetz.kontor.constants.TestTyscConstants; +import de.thpeetz.kontor.data.tysc.Sport; @SpringBootTest class SportRepositoryTest { @@ -20,17 +20,17 @@ class SportRepositoryTest { @Test void testFindByName() { - Sport sport = sportRepository.findByName(TestConstants.FOOTBALL_NAME); + Sport sport = sportRepository.findByName(TestTyscConstants.FOOTBALL_NAME); assertNotNull(sport); - assertEquals(TestConstants.FOOTBALL_TEAM_COUNT, sport.getTeams().size()); - assertEquals(TestConstants.FOOTBALL_POSITION_COUNT, sport.getPositions().size()); + assertEquals(TestTyscConstants.FOOTBALL_TEAM_COUNT, sport.getTeams().size()); + assertEquals(TestTyscConstants.FOOTBALL_POSITION_COUNT, sport.getPositions().size()); } @Test void testFindByNameIgnoreCase() { - List sports = sportRepository.findByNameIgnoreCase(TestConstants.FOOTBALL_NAME.toLowerCase()); + List sports = sportRepository.findByNameIgnoreCase(TestTyscConstants.FOOTBALL_NAME.toLowerCase()); assertNotNull(sports); - assertEquals(TestConstants.FOOTBALL_TEAM_COUNT, sports.get(0).getTeams().size()); + assertEquals(TestTyscConstants.FOOTBALL_TEAM_COUNT, sports.get(0).getTeams().size()); } @Test diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/TeamRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/TeamRepositoryTest.java similarity index 61% rename from kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/TeamRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/TeamRepositoryTest.java index 83061a3..ec3232d 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/TeamRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/TeamRepositoryTest.java @@ -1,15 +1,15 @@ -package de.thpeetz.kontor.tysc.repository; +package de.thpeetz.kontor.repository.tysc; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; -import de.thpeetz.kontor.tysc.data.Team; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import de.thpeetz.kontor.tysc.TestConstants; +import de.thpeetz.kontor.constants.TestTyscConstants; +import de.thpeetz.kontor.data.tysc.Team; @SpringBootTest class TeamRepositoryTest { @@ -19,15 +19,15 @@ class TeamRepositoryTest { @Test void testFindByName() { - Team team = teamRepository.findByName(TestConstants.DOLPHINS_NAME); - assertEquals(TestConstants.DOLPHINS_SHORT, team.getShortName()); + Team team = teamRepository.findByName(TestTyscConstants.DOLPHINS_NAME); + assertEquals(TestTyscConstants.DOLPHINS_SHORT, team.getShortName()); } @Test void testFindByNameIgnoreCase() { - List teams = teamRepository.findByNameIgnoreCase(TestConstants.DOLPHINS_NAME.toLowerCase()); + List teams = teamRepository.findByNameIgnoreCase(TestTyscConstants.DOLPHINS_NAME.toLowerCase()); assertEquals(1, teams.size()); - assertEquals(TestConstants.DOLPHINS_SHORT, teams.get(0).getShortName()); + assertEquals(TestTyscConstants.DOLPHINS_SHORT, teams.get(0).getShortName()); } @Test diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/VendorRepositoryTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/VendorRepositoryTest.java similarity index 67% rename from kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/VendorRepositoryTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/VendorRepositoryTest.java index ef905c8..08276d5 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/repository/VendorRepositoryTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/repository/tysc/VendorRepositoryTest.java @@ -1,16 +1,16 @@ -package de.thpeetz.kontor.tysc.repository; +package de.thpeetz.kontor.repository.tysc; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import java.util.List; -import de.thpeetz.kontor.tysc.data.Vendor; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import de.thpeetz.kontor.tysc.TestConstants; +import de.thpeetz.kontor.constants.TestTyscConstants; +import de.thpeetz.kontor.data.tysc.Vendor; @SpringBootTest class VendorRepositoryTest { @@ -20,17 +20,17 @@ class VendorRepositoryTest { @Test void testFindByName() { - Vendor vendor = vendorRepository.findByName(TestConstants.TOPPS_NAME); + Vendor vendor = vendorRepository.findByName(TestTyscConstants.TOPPS_NAME); assertNotNull(vendor); - assertEquals(TestConstants.TOPPS_NAME, vendor.getName()); + assertEquals(TestTyscConstants.TOPPS_NAME, vendor.getName()); } @Test void testFindByNameIgnoreCase() { - List vendors = vendorRepository.findByNameIgnoreCase(TestConstants.TOPPS_NAME.toLowerCase()); + List vendors = vendorRepository.findByNameIgnoreCase(TestTyscConstants.TOPPS_NAME.toLowerCase()); assertNotNull(vendors); assertEquals(1, vendors.size()); - assertEquals(TestConstants.TOPPS_NAME, vendors.get(0).getName()); + assertEquals(TestTyscConstants.TOPPS_NAME, vendors.get(0).getName()); } @Test diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/services/BookshelfServiceTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/services/BookshelfServiceTest.java similarity index 56% rename from kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/services/BookshelfServiceTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/services/BookshelfServiceTest.java index b78a899..85d257b 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/bookshelf/services/BookshelfServiceTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/services/BookshelfServiceTest.java @@ -1,9 +1,10 @@ -package de.thpeetz.kontor.bookshelf.services; +package de.thpeetz.kontor.services; + +import de.thpeetz.kontor.constants.TestBookshelfConstants; +import de.thpeetz.kontor.data.bookshelf.Author; +import de.thpeetz.kontor.data.bookshelf.Book; +import de.thpeetz.kontor.data.bookshelf.BookshelfPublisher; -import de.thpeetz.kontor.bookshelf.TestConstants; -import de.thpeetz.kontor.bookshelf.data.Author; -import de.thpeetz.kontor.bookshelf.data.Book; -import de.thpeetz.kontor.bookshelf.data.BookshelfPublisher; import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; @@ -27,70 +28,70 @@ class BookshelfServiceTest { @Order(1) void testFindAllPublishers() { List publishers = bookshelfService.findAllPublishers(null); - assertEquals(TestConstants.PUBLISHER_COUNT, publishers.size()); + assertEquals(TestBookshelfConstants.PUBLISHER_COUNT, publishers.size()); } @Test @Order(2) void testSavePublisher() { BookshelfPublisher publisher = new BookshelfPublisher(); - publisher.setName(TestConstants.PUBLISHER_NAME); + publisher.setName(TestBookshelfConstants.PUBLISHER_NAME); bookshelfService.savePublisher(publisher); - assertEquals(TestConstants.PUBLISHER_COUNT + 1, bookshelfService.findAllPublishers(null).size()); + assertEquals(TestBookshelfConstants.PUBLISHER_COUNT + 1, bookshelfService.findAllPublishers(null).size()); } @Test @Order(3) void testFindPublisherByName() { - assertEquals(TestConstants.PUBLISHER_COUNT + 1, bookshelfService.findAllPublishers(null).size()); - BookshelfPublisher publisher = bookshelfService.findPublisherByName(TestConstants.PUBLISHER_NAME); + assertEquals(TestBookshelfConstants.PUBLISHER_COUNT + 1, bookshelfService.findAllPublishers(null).size()); + BookshelfPublisher publisher = bookshelfService.findPublisherByName(TestBookshelfConstants.PUBLISHER_NAME); assertNotNull(publisher); } @Test @Order(4) void testDeletePublisher() { - List publishers = bookshelfService.findAllPublishers(TestConstants.PUBLISHER_NAME); + List publishers = bookshelfService.findAllPublishers(TestBookshelfConstants.PUBLISHER_NAME); assertEquals(1, publishers.size()); bookshelfService.deletePublisher(publishers.get(0)); - assertEquals(TestConstants.PUBLISHER_COUNT, bookshelfService.findAllPublishers(null).size()); + assertEquals(TestBookshelfConstants.PUBLISHER_COUNT, bookshelfService.findAllPublishers(null).size()); } @Test @Order(5) void testFindAllAuthors() { - assertEquals(TestConstants.AUTHOR_COUNT, bookshelfService.findAllAuthors(null).size()); + assertEquals(TestBookshelfConstants.AUTHOR_COUNT, bookshelfService.findAllAuthors(null).size()); } @Test @Order(6) void testSaveAuthor() { Author author = new Author(); - author.setFirstName(TestConstants.AUTHOR_FIRSTNAME); - author.setLastName(TestConstants.AUTHOR_LASTNAME); + author.setFirstName(TestBookshelfConstants.AUTHOR_FIRSTNAME); + author.setLastName(TestBookshelfConstants.AUTHOR_LASTNAME); bookshelfService.saveAuthor(author); - assertEquals(TestConstants.AUTHOR_COUNT+1, bookshelfService.findAllAuthors(null).size()); + assertEquals(TestBookshelfConstants.AUTHOR_COUNT+1, bookshelfService.findAllAuthors(null).size()); } @Test @Order(7) void testDeleteAuthor() { - List authors = bookshelfService.findAllAuthors(TestConstants.AUTHOR_FIRSTNAME); + List authors = bookshelfService.findAllAuthors(TestBookshelfConstants.AUTHOR_FIRSTNAME); assertEquals(1, authors.size()); bookshelfService.deleteAuthor(authors.get(0)); - assertEquals(TestConstants.AUTHOR_COUNT, bookshelfService.findAllAuthors(null).size()); + assertEquals(TestBookshelfConstants.AUTHOR_COUNT, bookshelfService.findAllAuthors(null).size()); } @Test @Order(8) void findAllBooks() { - assertEquals(TestConstants.BOOK_COUNT, bookshelfService.findAllBooks(null).size()); + assertEquals(TestBookshelfConstants.BOOK_COUNT, bookshelfService.findAllBooks(null).size()); } @Test @Order(9) void saveBook() { - assertEquals(TestConstants.BOOK_COUNT, bookshelfService.findAllBooks(null).size()); + assertEquals(TestBookshelfConstants.BOOK_COUNT, bookshelfService.findAllBooks(null).size()); } @Test diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/services/CardServiceTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/services/CardServiceTest.java similarity index 61% rename from kontor-spring/src/test/java/de/thpeetz/kontor/tysc/services/CardServiceTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/services/CardServiceTest.java index e215217..e55ec8b 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/services/CardServiceTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/services/CardServiceTest.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.tysc.services; +package de.thpeetz.kontor.services; import static org.junit.jupiter.api.Assertions.*; @@ -11,11 +11,11 @@ import org.junit.jupiter.api.TestMethodOrder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import de.thpeetz.kontor.tysc.TestConstants; -import de.thpeetz.kontor.tysc.data.Card; -import de.thpeetz.kontor.tysc.data.CardSet; -import de.thpeetz.kontor.tysc.data.Rooster; -import de.thpeetz.kontor.tysc.data.Vendor; +import de.thpeetz.kontor.constants.TestTyscConstants; +import de.thpeetz.kontor.data.tysc.Card; +import de.thpeetz.kontor.data.tysc.CardSet; +import de.thpeetz.kontor.data.tysc.Rooster; +import de.thpeetz.kontor.data.tysc.Vendor; @SpringBootTest @TestMethodOrder(OrderAnnotation.class) @@ -30,7 +30,7 @@ class CardServiceTest { @Test @Order(1) void testFindAllVendors() { - assertEquals(TestConstants.VENDOR_COUNT, cardService.findAllVendors(null).size()); + assertEquals(TestTyscConstants.VENDOR_COUNT, cardService.findAllVendors(null).size()); assertEquals(2, cardService.findAllVendors("pp").size()); } @@ -38,89 +38,89 @@ class CardServiceTest { @Order(2) void testSaveVendor() { Vendor vendor = new Vendor(); - vendor.setName(TestConstants.VENDOR_NAME); + vendor.setName(TestTyscConstants.VENDOR_NAME); vendor = cardService.saveVendor(vendor); assertNotNull(vendor); - assertEquals(TestConstants.VENDOR_COUNT + 1, cardService.findAllVendors(null).size()); + assertEquals(TestTyscConstants.VENDOR_COUNT + 1, cardService.findAllVendors(null).size()); } @Test @Order(3) void testDeleteVendor() { - List vendors = cardService.findAllVendors(TestConstants.VENDOR_NAME); + List vendors = cardService.findAllVendors(TestTyscConstants.VENDOR_NAME); assertEquals(1, vendors.size()); Vendor vendor = vendors.get(0); cardService.deleteVendor(vendor); - assertEquals(TestConstants.VENDOR_COUNT, cardService.findAllVendors(null).size()); + assertEquals(TestTyscConstants.VENDOR_COUNT, cardService.findAllVendors(null).size()); } @Test @Order(4) void testFindAllCardSets() { - assertEquals(TestConstants.CARDSET_COUNT, cardService.findAllCardSets(null).size()); + assertEquals(TestTyscConstants.CARDSET_COUNT, cardService.findAllCardSets(null).size()); assertEquals(1, cardService.findAllCardSets("Ultra").size()); } @Test @Order(5) void testSaveCardSet() { - List vendors = cardService.findAllVendors(TestConstants.VENDOR_FLEER); + List vendors = cardService.findAllVendors(TestTyscConstants.VENDOR_FLEER); assertEquals(1, vendors.size()); Vendor vendor = vendors.get(0); CardSet cardSet = new CardSet(); - cardSet.setName(TestConstants.CARDSET_NAME); + cardSet.setName(TestTyscConstants.CARDSET_NAME); cardSet.setVendor(vendor); cardSet.setInsertSet(false); cardSet.setParallelSet(false); cardService.saveCardSet(cardSet); - assertEquals(TestConstants.CARDSET_COUNT + 1, cardService.findAllCardSets(null).size()); + assertEquals(TestTyscConstants.CARDSET_COUNT + 1, cardService.findAllCardSets(null).size()); } @Test @Order(6) void testDeleteCardSet() { - List cardSets = cardService.findAllCardSets(TestConstants.CARDSET_NAME); + List cardSets = cardService.findAllCardSets(TestTyscConstants.CARDSET_NAME); assertEquals(1, cardSets.size()); CardSet cardSet = cardSets.get(0); cardService.deleteCardSet(cardSet); - assertEquals(TestConstants.CARDSET_COUNT, cardService.findAllCardSets(null).size()); + assertEquals(TestTyscConstants.CARDSET_COUNT, cardService.findAllCardSets(null).size()); } @Test @Order(7) void testFindAllCards() { - assertEquals(TestConstants.CARD_COUNT, cardService.findAllCards(null).size()); + assertEquals(TestTyscConstants.CARD_COUNT, cardService.findAllCards(null).size()); assertEquals(1, cardService.findAllCards("112").size()); } @Test @Order(8) void testSaveCard() { - List vendors = cardService.findAllVendors(TestConstants.VENDOR_FLEER); + List vendors = cardService.findAllVendors(TestTyscConstants.VENDOR_FLEER); assertEquals(1, vendors.size()); Vendor vendor = vendors.get(0); - List cardSets = cardService.findAllCardSets(TestConstants.CARDSET_MYSTIQUE_NAME); + List cardSets = cardService.findAllCardSets(TestTyscConstants.CARDSET_MYSTIQUE_NAME); assertEquals(3, cardSets.size()); CardSet cardSet = cardSets.get(0); List roosters = sportService.findAllRoosters(); Rooster rooster = roosters.get(0); Card card = new Card(); - card.setCardNumber(TestConstants.CARD_CARDNUMBER); + card.setCardNumber(TestTyscConstants.CARD_CARDNUMBER); card.setCardSet(cardSet); card.setVendor(vendor); card.setRooster(rooster); - card.setYear(TestConstants.CARD_YEAR); + card.setYear(TestTyscConstants.CARD_YEAR); cardService.saveCard(card); - assertEquals(TestConstants.CARD_COUNT + 1, cardService.findAllCards(null).size()); + assertEquals(TestTyscConstants.CARD_COUNT + 1, cardService.findAllCards(null).size()); } @Test @Order(9) void testDeleteCard() { - List cards = cardService.findAllCards(TestConstants.CARD_CARDNUMBER.toString()); + List cards = cardService.findAllCards(TestTyscConstants.CARD_CARDNUMBER.toString()); assertEquals(1, cards.size()); Card card = cards.get(0); cardService.deleteCard(card); - assertEquals(TestConstants.CARD_COUNT, cardService.findAllCards(null).size()); + assertEquals(TestTyscConstants.CARD_COUNT, cardService.findAllCards(null).size()); } } diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/services/ComicServiceTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/services/ComicServiceTest.java similarity index 54% rename from kontor-spring/src/test/java/de/thpeetz/kontor/comics/services/ComicServiceTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/services/ComicServiceTest.java index d449298..8dcc2ae 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/comics/services/ComicServiceTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/services/ComicServiceTest.java @@ -1,4 +1,4 @@ -package de.thpeetz.kontor.comics.services; +package de.thpeetz.kontor.services; import static org.junit.jupiter.api.Assertions.*; @@ -8,34 +8,32 @@ import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import de.thpeetz.kontor.comics.TestConstants; -import de.thpeetz.kontor.comics.data.Artist; -import de.thpeetz.kontor.comics.data.Comic; -import de.thpeetz.kontor.comics.data.ComicWork; -import de.thpeetz.kontor.comics.data.Issue; -import de.thpeetz.kontor.comics.data.Publisher; -import de.thpeetz.kontor.comics.data.StoryArc; -import de.thpeetz.kontor.comics.data.TradePaperback; -import de.thpeetz.kontor.comics.data.Volume; -import de.thpeetz.kontor.comics.data.Worktype; +import de.thpeetz.kontor.constants.TestComicConstants; +import de.thpeetz.kontor.data.comics.Artist; +import de.thpeetz.kontor.data.comics.Comic; +import de.thpeetz.kontor.data.comics.ComicWork; +import de.thpeetz.kontor.data.comics.Issue; +import de.thpeetz.kontor.data.comics.Publisher; +import de.thpeetz.kontor.data.comics.StoryArc; +import de.thpeetz.kontor.data.comics.TradePaperback; +import de.thpeetz.kontor.data.comics.Volume; +import de.thpeetz.kontor.data.comics.Worktype; @SpringBootTest @TestMethodOrder(OrderAnnotation.class) class ComicServiceTest { - private static final Logger log = LoggerFactory.getLogger(ComicServiceTest.class); + //TODO private static final Logger log = LoggerFactory.getLogger(ComicServiceTest.class); @Autowired private ComicService comicService; @Test @Order(1) void testFindAllArtists() { - assertEquals(TestConstants.ARTIST_COUNT, comicService.findAllArtists(null).size()); + assertEquals(TestComicConstants.ARTIST_COUNT, comicService.findAllArtists(null).size()); assertEquals(1, comicService.findAllArtists("Turn").size()); } @@ -53,24 +51,24 @@ class ComicServiceTest { @Order(2) void testSaveArtist() { Artist artist = new Artist(); - artist.setName(TestConstants.ARTIST_NAME); + artist.setName(TestComicConstants.ARTIST_NAME); comicService.saveArtist(artist); - assertEquals(TestConstants.ARTIST_COUNT + 1, comicService.findAllArtists(null).size()); + assertEquals(TestComicConstants.ARTIST_COUNT + 1, comicService.findAllArtists(null).size()); } @Test @Order(3) void testDeleteArtist() { - List artists = comicService.findAllArtists(TestConstants.ARTIST_NAME); + List artists = comicService.findAllArtists(TestComicConstants.ARTIST_NAME); assertEquals(1, artists.size()); comicService.deleteArtist(artists.get(0)); - assertEquals(TestConstants.ARTIST_COUNT, comicService.findAllArtists(null).size()); + assertEquals(TestComicConstants.ARTIST_COUNT, comicService.findAllArtists(null).size()); } @Test @Order(4) void testFindAllPublishers() { - assertEquals(TestConstants.PUBLISHER_COUNT, comicService.findAllPublishers(null).size()); + assertEquals(TestComicConstants.PUBLISHER_COUNT, comicService.findAllPublishers(null).size()); assertEquals(1, comicService.findAllPublishers("Cow").size()); } @@ -80,32 +78,32 @@ class ComicServiceTest { Publisher publisher = comicService.findPublisherByName("Marvel"); assertNotNull(publisher); assertNotNull(publisher.getComics()); - assertEquals(TestConstants.MARVEL_COMIC_COUNT, publisher.getComics().size()); - assertNull(comicService.findPublisherByName(TestConstants.PUBLISHER_NAME)); + assertEquals(TestComicConstants.MARVEL_COMIC_COUNT, publisher.getComics().size()); + assertNull(comicService.findPublisherByName(TestComicConstants.PUBLISHER_NAME)); } @Test @Order(5) void testSavePublisher() { Publisher publisher = new Publisher(); - publisher.setName(TestConstants.PUBLISHER_NAME); + publisher.setName(TestComicConstants.PUBLISHER_NAME); comicService.savePublisher(publisher); - assertEquals(TestConstants.PUBLISHER_COUNT + 1, comicService.findAllPublishers(null).size()); + assertEquals(TestComicConstants.PUBLISHER_COUNT + 1, comicService.findAllPublishers(null).size()); } @Test @Order(6) void testDeletePublisher() { - List publishers = comicService.findAllPublishers(TestConstants.PUBLISHER_NAME); + List publishers = comicService.findAllPublishers(TestComicConstants.PUBLISHER_NAME); assertEquals(1, publishers.size()); comicService.deletePublisher(publishers.get(0)); - assertEquals(TestConstants.PUBLISHER_COUNT, comicService.findAllPublishers(null).size()); + assertEquals(TestComicConstants.PUBLISHER_COUNT, comicService.findAllPublishers(null).size()); } @Test @Order(7) void testFindAllWorktypes() { - assertEquals(TestConstants.WORKTYPE_COUNT, comicService.findAllWorktypes(null).size()); + assertEquals(TestComicConstants.WORKTYPE_COUNT, comicService.findAllWorktypes(null).size()); assertEquals(1, comicService.findAllWorktypes("ite").size()); } @@ -120,25 +118,25 @@ class ComicServiceTest { assertNotNull(worktype); assertNotNull(worktype.getComicWorks()); assertTrue(worktype.getComicWorks().isEmpty()); - assertNull(comicService.findWorktypeByName(TestConstants.WORKTYPE_NAME)); + assertNull(comicService.findWorktypeByName(TestComicConstants.WORKTYPE_NAME)); } @Test @Order(8) void testSaveWorktype() { Worktype worktype = new Worktype(); - worktype.setName(TestConstants.WORKTYPE_NAME); + worktype.setName(TestComicConstants.WORKTYPE_NAME); comicService.saveWorktype(worktype); - assertEquals(TestConstants.WORKTYPE_COUNT + 1, comicService.findAllWorktypes(null).size()); + assertEquals(TestComicConstants.WORKTYPE_COUNT + 1, comicService.findAllWorktypes(null).size()); } @Test @Order(9) void testDeleteWorktype() { - List worktypes = comicService.findAllWorktypes(TestConstants.WORKTYPE_NAME); + List worktypes = comicService.findAllWorktypes(TestComicConstants.WORKTYPE_NAME); assertEquals(1, worktypes.size()); comicService.deleteWorktype(worktypes.get(0)); - assertEquals(TestConstants.WORKTYPE_COUNT, comicService.findAllWorktypes(null).size()); + assertEquals(TestComicConstants.WORKTYPE_COUNT, comicService.findAllWorktypes(null).size()); } @Test @@ -154,38 +152,38 @@ class ComicServiceTest { void testSaveComic() { Publisher marvel = comicService.findAllPublishers("Marvel").get(0); Comic comic = new Comic(); - comic.setTitle(TestConstants.COMIC_TITLE); + comic.setTitle(TestComicConstants.COMIC_TITLE); comic.setPublisher(marvel); comicService.saveComic(comic); - assertEquals(TestConstants.COMIC_COUNT + 1, comicService.findAllComics(null).size()); + assertEquals(TestComicConstants.COMIC_COUNT + 1, comicService.findAllComics(null).size()); } @Test @Order(12) void testDeleteComic() { - assertEquals(TestConstants.COMIC_COUNT + 1, comicService.findAllComics(null).size()); - List comics = comicService.findAllComics(TestConstants.COMIC_TITLE); + assertEquals(TestComicConstants.COMIC_COUNT + 1, comicService.findAllComics(null).size()); + List comics = comicService.findAllComics(TestComicConstants.COMIC_TITLE); assertEquals(1, comics.size()); - Comic comic = comicService.findComicByTitle(TestConstants.COMIC_TITLE); + Comic comic = comicService.findComicByTitle(TestComicConstants.COMIC_TITLE); assertNotNull(comic); comicService.deleteComic(comic); Publisher marvel = comicService.findPublisherByName("Marvel"); assertNotNull(marvel.getComics()); - assertEquals(TestConstants.MARVEL_COMIC_COUNT, marvel.getComics().size()); - assertEquals(0, comicService.findAllComics(TestConstants.COMIC_TITLE).size()); - assertEquals(TestConstants.COMIC_COUNT, comicService.findAllComics(null).size()); + assertEquals(TestComicConstants.MARVEL_COMIC_COUNT, marvel.getComics().size()); + assertEquals(0, comicService.findAllComics(TestComicConstants.COMIC_TITLE).size()); + assertEquals(TestComicConstants.COMIC_COUNT, comicService.findAllComics(null).size()); } @Test @Order(13) void testFindAllIssues() { - assertEquals(TestConstants.ISSUE_COUNT, comicService.findAllIssues().size()); + assertEquals(TestComicConstants.ISSUE_COUNT, comicService.findAllIssues().size()); } @Test @Order(14) void testFindAllIssuesForComic() { - Comic comic = TestConstants.getComicWithIssues(comicService); + Comic comic = TestComicConstants.getComicWithIssues(comicService); List issues = comicService.findAllIssuesForComic(comic); assertEquals(12, issues.size()); } @@ -193,13 +191,13 @@ class ComicServiceTest { @Test @Order(15) void testSaveIssue() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); + Comic comic = TestComicConstants.getComicWithoutReferences(comicService); Issue issue = new Issue(); issue.setComic(comic); - issue.setIssueNumber(TestConstants.ISSUE_ISSUENUMBER); + issue.setIssueNumber(TestComicConstants.ISSUE_ISSUENUMBER); comicService.saveIssue(issue); - assertEquals(TestConstants.ISSUE_COUNT + 1, comicService.findAllIssues().size()); - comic = TestConstants.getComicWithoutReferences(comicService); + assertEquals(TestComicConstants.ISSUE_COUNT + 1, comicService.findAllIssues().size()); + comic = TestComicConstants.getComicWithoutReferences(comicService); assertNotNull(comic.getIssues()); assertEquals(1, comic.getIssues().size()); } @@ -207,96 +205,96 @@ class ComicServiceTest { @Test @Order(16) void testDeleteIssue() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); + Comic comic = TestComicConstants.getComicWithoutReferences(comicService); List issues = comicService.findAllIssuesForComic(comic); assertEquals(1, issues.size()); comicService.deleteIssue(issues.get(0)); - assertEquals(TestConstants.ISSUE_COUNT, comicService.findAllIssues().size()); + assertEquals(TestComicConstants.ISSUE_COUNT, comicService.findAllIssues().size()); } @Test @Order(17) void testFindAllTradePaperbacks() { - assertEquals(TestConstants.TRADEPAPERBACK_COUNT, comicService.findAllTradePaperbacks(null).size()); + assertEquals(TestComicConstants.TRADEPAPERBACK_COUNT, comicService.findAllTradePaperbacks(null).size()); assertEquals(7, comicService.findAllTradePaperbacks("of").size()); } @Test @Order(18) void testSaveTradePaperBack() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); + Comic comic = TestComicConstants.getComicWithoutReferences(comicService); TradePaperback tradePaperback = new TradePaperback(); tradePaperback.setComic(comic); - tradePaperback.setName(TestConstants.TRADEPAPERBACK_NAME); + tradePaperback.setName(TestComicConstants.TRADEPAPERBACK_NAME); comicService.saveTradePaperBack(tradePaperback); - assertEquals(TestConstants.TRADEPAPERBACK_COUNT + 1, comicService.findAllTradePaperbacks(null).size()); + assertEquals(TestComicConstants.TRADEPAPERBACK_COUNT + 1, comicService.findAllTradePaperbacks(null).size()); } @Test @Order(19) void testDeleteTradePaperBack() { - List tradePaperbacks = comicService.findAllTradePaperbacks(TestConstants.TRADEPAPERBACK_NAME); + List tradePaperbacks = comicService.findAllTradePaperbacks(TestComicConstants.TRADEPAPERBACK_NAME); assertEquals(1, tradePaperbacks.size()); comicService.deleteTradePaperBack(tradePaperbacks.get(0)); - assertEquals(TestConstants.TRADEPAPERBACK_COUNT, comicService.findAllTradePaperbacks(null).size()); + assertEquals(TestComicConstants.TRADEPAPERBACK_COUNT, comicService.findAllTradePaperbacks(null).size()); } @Test @Order(20) void testFindAllStoryArcs() { - assertEquals(TestConstants.STORYARC_COUNT, comicService.findAllStoryArcs().size()); + assertEquals(TestComicConstants.STORYARC_COUNT, comicService.findAllStoryArcs().size()); } @Test @Order(21) void testFindAllStoryArcsForComic() { - assertEquals(TestConstants.STORYARC_COUNT, comicService.findAllStoryArcsForComic(null).size()); - Comic comic = TestConstants.getComicWithStoryArcs(comicService); + assertEquals(TestComicConstants.STORYARC_COUNT, comicService.findAllStoryArcsForComic(null).size()); + Comic comic = TestComicConstants.getComicWithStoryArcs(comicService); assertEquals(3, comicService.findAllStoryArcsForComic(comic).size()); } @Test @Order(22) void testSaveStoryArc() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); + Comic comic = TestComicConstants.getComicWithoutReferences(comicService); StoryArc storyArc = new StoryArc(); - storyArc.setName(TestConstants.STORYARC_NAME); + storyArc.setName(TestComicConstants.STORYARC_NAME); storyArc.setComic(comic); comicService.saveStoryArc(storyArc); - assertEquals(TestConstants.STORYARC_COUNT + 1, comicService.findAllStoryArcs().size()); + assertEquals(TestComicConstants.STORYARC_COUNT + 1, comicService.findAllStoryArcs().size()); } @Test @Order(23) void testDeleteStoryArc() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); + Comic comic = TestComicConstants.getComicWithoutReferences(comicService); List storyArcs = comicService.findAllStoryArcsForComic(comic); assertEquals(1, storyArcs.size()); comicService.deleteStoryArc(storyArcs.get(0)); - assertEquals(TestConstants.STORYARC_COUNT, comicService.findAllStoryArcs().size()); + assertEquals(TestComicConstants.STORYARC_COUNT, comicService.findAllStoryArcs().size()); } @Test @Order(24) void testFindAllVolumes() { - assertEquals(TestConstants.VOLUME_COUNT, comicService.findAllVolumes().size()); + assertEquals(TestComicConstants.VOLUME_COUNT, comicService.findAllVolumes().size()); } @Test @Order(25) void testSaveVolume() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); + Comic comic = TestComicConstants.getComicWithoutReferences(comicService); Volume volume = new Volume(); - volume.setName(TestConstants.VOLUME_NAME); + volume.setName(TestComicConstants.VOLUME_NAME); volume.setComic(comic); comicService.saveVolume(volume); - assertEquals(TestConstants.VOLUME_COUNT + 1, comicService.findAllVolumes().size()); + assertEquals(TestComicConstants.VOLUME_COUNT + 1, comicService.findAllVolumes().size()); } @Test @Order(26) void testFindAllVolumesForComic() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); + Comic comic = TestComicConstants.getComicWithoutReferences(comicService); List volumes = comicService.findAllVolumesForComic(comic); assertEquals(1, volumes.size()); } @@ -304,38 +302,38 @@ class ComicServiceTest { @Test @Order(27) void testDeleteVolume() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); + Comic comic = TestComicConstants.getComicWithoutReferences(comicService); List volumes = comicService.findAllVolumesForComic(comic); comicService.deleteVolume(volumes.get(0)); - assertEquals(TestConstants.VOLUME_COUNT, comicService.findAllVolumes().size()); + assertEquals(TestComicConstants.VOLUME_COUNT, comicService.findAllVolumes().size()); } @Test @Order(28) void testFindAllComicWorks() { - assertEquals(TestConstants.COMICWORK_COUNT, comicService.findAllComicWorks().size()); + assertEquals(TestComicConstants.COMICWORK_COUNT, comicService.findAllComicWorks().size()); } @Test @Order(29) void testSaveComicWork() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); - Artist artist = TestConstants.getArtistWithoutReferences(comicService); - Worktype worktype = TestConstants.getWorktypeWithoutReferences(comicService); + Comic comic = TestComicConstants.getComicWithoutReferences(comicService); + Artist artist = TestComicConstants.getArtistWithoutReferences(comicService); + Worktype worktype = TestComicConstants.getWorktypeWithoutReferences(comicService); ComicWork comicWork = new ComicWork(); comicWork.setComic(comic); comicWork.setArtist(artist); comicWork.setWorkType(worktype); comicService.saveComicWork(comicWork); - assertEquals(TestConstants.COMICWORK_COUNT + 1, comicService.findAllComicWorks().size()); + assertEquals(TestComicConstants.COMICWORK_COUNT + 1, comicService.findAllComicWorks().size()); } @Test @Order(30) void testDeleteComicWork() { - Comic comic = TestConstants.getComicWithoutReferences(comicService); - Artist artist = TestConstants.getArtistWithoutReferences(comicService); - Worktype worktype = TestConstants.getWorktypeWithoutReferences(comicService); + Comic comic = TestComicConstants.getComicWithoutReferences(comicService); + Artist artist = TestComicConstants.getArtistWithoutReferences(comicService); + Worktype worktype = TestComicConstants.getWorktypeWithoutReferences(comicService); List comicWorks = comic.getComicWorks(); assertNotNull(comicWorks); assertNotNull(artist.getComicWorks()); @@ -345,6 +343,6 @@ class ComicServiceTest { assertEquals(1, worktype.getComicWorks().size()); ComicWork comicWork = comicWorks.get(0); comicService.deleteComicWork(comicWork); - assertEquals(TestConstants.COMICWORK_COUNT, comicService.findAllComicWorks().size()); + assertEquals(TestComicConstants.COMICWORK_COUNT, comicService.findAllComicWorks().size()); } } diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/media/services/MediaArticleServiceTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/services/MediaArticleServiceTest.java similarity index 86% rename from kontor-spring/src/test/java/de/thpeetz/kontor/media/services/MediaArticleServiceTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/services/MediaArticleServiceTest.java index 6178aa8..c3c8b90 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/media/services/MediaArticleServiceTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/services/MediaArticleServiceTest.java @@ -1,7 +1,7 @@ -package de.thpeetz.kontor.media.services; +package de.thpeetz.kontor.services; -import de.thpeetz.kontor.media.TestConstants; -import de.thpeetz.kontor.media.data.MediaArticle; +import de.thpeetz.kontor.constants.TestMediaConstants; +import de.thpeetz.kontor.data.media.MediaArticle; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; @@ -33,7 +33,7 @@ class MediaArticleServiceTest { void saveMediaArticle() { int mediaArticleCount = mediaArticleService.findAllMediaArticles(null).size(); MediaArticle mediaArticle = new MediaArticle(); - mediaArticle.setUrl(TestConstants.URL); + mediaArticle.setUrl(TestMediaConstants.URL); mediaArticleService.saveMediaArticle(mediaArticle); assertEquals(++mediaArticleCount, mediaArticleService.findAllMediaArticles(null).size()); } @@ -42,7 +42,7 @@ class MediaArticleServiceTest { @Order(3) void deleteMediaArticle() { int mediaArticleCount = mediaArticleService.findAllMediaArticles(null).size(); - List mediaArticleList = mediaArticleService.findAllMediaArticles(TestConstants.URL); + List mediaArticleList = mediaArticleService.findAllMediaArticles(TestMediaConstants.URL); assertEquals(1, mediaArticleService.findAllMediaArticles(null).size()); mediaArticleService.deleteMediaArticle(mediaArticleList.get(0)); assertEquals(--mediaArticleCount, mediaArticleService.findAllMediaArticles(null).size()); diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/media/services/MediaFileServiceTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/services/MediaFileServiceTest.java similarity index 83% rename from kontor-spring/src/test/java/de/thpeetz/kontor/media/services/MediaFileServiceTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/services/MediaFileServiceTest.java index e08193d..6ac9392 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/media/services/MediaFileServiceTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/services/MediaFileServiceTest.java @@ -1,8 +1,9 @@ -package de.thpeetz.kontor.media.services; +package de.thpeetz.kontor.services; + +import de.thpeetz.kontor.constants.TestMediaConstants; +import de.thpeetz.kontor.data.media.MediaFile; +import de.thpeetz.kontor.views.common.SearchFilter; -import de.thpeetz.kontor.common.views.SearchFilter; -import de.thpeetz.kontor.media.TestConstants; -import de.thpeetz.kontor.media.data.MediaFile; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; @@ -32,7 +33,7 @@ public class MediaFileServiceTest { void testSaveMediaFile() { int mediaFileCount = mediaFileService.findAllMediaFiles(null).size(); MediaFile mediaFile = new MediaFile(); - mediaFile.setUrl(TestConstants.URL); + mediaFile.setUrl(TestMediaConstants.URL); mediaFileService.saveMediaFile(mediaFile); assertEquals(mediaFileCount +1, mediaFileService.findAllMediaFiles(null).size()); } @@ -42,7 +43,7 @@ public class MediaFileServiceTest { void testDeleteMediaFile() { int mediaFileCount = mediaFileService.findAllMediaFiles(null).size(); SearchFilter searchFilter = new SearchFilter(); - searchFilter.setSearchTerm(TestConstants.URL); + searchFilter.setSearchTerm(TestMediaConstants.URL); List mediaFileList = mediaFileService.findAllMediaFiles(searchFilter); assertEquals(1, mediaFileList.size()); mediaFileService.deleteMediaFile(mediaFileList.get(0)); diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/media/services/MediaVideoServiceTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/services/MediaVideoServiceTest.java similarity index 84% rename from kontor-spring/src/test/java/de/thpeetz/kontor/media/services/MediaVideoServiceTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/services/MediaVideoServiceTest.java index 36a6fb1..aa73009 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/media/services/MediaVideoServiceTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/services/MediaVideoServiceTest.java @@ -1,8 +1,7 @@ -package de.thpeetz.kontor.media.services; +package de.thpeetz.kontor.services; -import de.thpeetz.kontor.media.TestConstants; -import de.thpeetz.kontor.media.data.MediaArticle; -import de.thpeetz.kontor.media.data.MediaVideo; +import de.thpeetz.kontor.constants.TestMediaConstants; +import de.thpeetz.kontor.data.media.MediaVideo; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Test; @@ -32,7 +31,7 @@ public class MediaVideoServiceTest { void saveMediaVideo() { int mediaVideoCount = mediaVideoService.findAllMediaVideos(null).size(); MediaVideo mediaVideo = new MediaVideo(); - mediaVideo.setUrl(TestConstants.URL); + mediaVideo.setUrl(TestMediaConstants.URL); mediaVideoService.saveMediaVideo(mediaVideo); assertEquals(++mediaVideoCount, mediaVideoService.findAllMediaVideos(null).size()); } @@ -40,7 +39,7 @@ public class MediaVideoServiceTest { @Test void deleteMediaVideo() { int mediaVideoCount = mediaVideoService.findAllMediaVideos(null).size(); - List mediaVideoList = mediaVideoService.findAllMediaVideos(TestConstants.URL); + List mediaVideoList = mediaVideoService.findAllMediaVideos(TestMediaConstants.URL); assertEquals(1, mediaVideoList.size()); mediaVideoService.deleteMediaVideo(mediaVideoList.get(0)); assertEquals(--mediaVideoCount, mediaVideoService.findAllMediaVideos(null).size()); diff --git a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/services/SportServiceTest.java b/kontor-spring/src/test/java/de/thpeetz/kontor/services/SportServiceTest.java similarity index 52% rename from kontor-spring/src/test/java/de/thpeetz/kontor/tysc/services/SportServiceTest.java rename to kontor-spring/src/test/java/de/thpeetz/kontor/services/SportServiceTest.java index 30b7ed6..c82415d 100644 --- a/kontor-spring/src/test/java/de/thpeetz/kontor/tysc/services/SportServiceTest.java +++ b/kontor-spring/src/test/java/de/thpeetz/kontor/services/SportServiceTest.java @@ -1,10 +1,9 @@ -package de.thpeetz.kontor.tysc.services; +package de.thpeetz.kontor.services; import static org.junit.jupiter.api.Assertions.*; import java.util.List; -import de.thpeetz.kontor.tysc.data.FieldPosition; import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; @@ -12,11 +11,12 @@ import org.junit.jupiter.api.TestMethodOrder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import de.thpeetz.kontor.tysc.TestConstants; -import de.thpeetz.kontor.tysc.data.Player; -import de.thpeetz.kontor.tysc.data.Rooster; -import de.thpeetz.kontor.tysc.data.Sport; -import de.thpeetz.kontor.tysc.data.Team; +import de.thpeetz.kontor.constants.TestTyscConstants; +import de.thpeetz.kontor.data.tysc.FieldPosition; +import de.thpeetz.kontor.data.tysc.Player; +import de.thpeetz.kontor.data.tysc.Rooster; +import de.thpeetz.kontor.data.tysc.Sport; +import de.thpeetz.kontor.data.tysc.Team; @SpringBootTest @TestMethodOrder(OrderAnnotation.class) @@ -30,7 +30,7 @@ class SportServiceTest { @Order(1) void testFindAllSports() { List sports = sportService.findAllSports(null); - assertEquals(TestConstants.SPORT_COUNT, sports.size()); + assertEquals(TestTyscConstants.SPORT_COUNT, sports.size()); assertEquals(3, sportService.findAllSports("ball").size()); } @@ -38,35 +38,35 @@ class SportServiceTest { @Order(2) void testSaveSport() { Sport sport = new Sport(); - sport.setName(TestConstants.SPORT_NAME); + sport.setName(TestTyscConstants.SPORT_NAME); sport = sportService.saveSport(sport); assertNotNull(sport); - assertEquals(TestConstants.SPORT_COUNT+1, sportService.findAllSports(null).size()); + assertEquals(TestTyscConstants.SPORT_COUNT+1, sportService.findAllSports(null).size()); } @Test @Order(3) void testDeleteSport() { - List sports = sportService.findAllSports(TestConstants.SPORT_NAME); + List sports = sportService.findAllSports(TestTyscConstants.SPORT_NAME); assertEquals(1, sports.size()); Sport sport = sports.get(0); sportService.deleteSport(sport); - assertEquals(TestConstants.SPORT_COUNT, sportService.findAllSports(null).size()); + assertEquals(TestTyscConstants.SPORT_COUNT, sportService.findAllSports(null).size()); } @Test @Order(4) void testFindAllPlayers() { - assertEquals(TestConstants.PLAYER_COUNT, sportService.findAllPlayers(null).size()); - assertEquals(TestConstants.PLAYER_CHRIS_COUNT, sportService.findAllPlayers(TestConstants.PLAYER_CHRIS_NAME).size()); + assertEquals(TestTyscConstants.PLAYER_COUNT, sportService.findAllPlayers(null).size()); + assertEquals(TestTyscConstants.PLAYER_CHRIS_COUNT, sportService.findAllPlayers(TestTyscConstants.PLAYER_CHRIS_NAME).size()); } @Test @Order(5) void testSavePlayer() { Player player = new Player(); - player.setFirstName(TestConstants.PLAYER_FIRSTNAME); - player.setLastName(TestConstants.PLAYER_LASTNAME); + player.setFirstName(TestTyscConstants.PLAYER_FIRSTNAME); + player.setLastName(TestTyscConstants.PLAYER_LASTNAME); player = sportService.savePlayer(player); assertNotNull(player); } @@ -74,87 +74,87 @@ class SportServiceTest { @Test @Order(6) void testDeletePlayer() { - List players = sportService.findAllPlayers(TestConstants.PLAYER_LASTNAME); + List players = sportService.findAllPlayers(TestTyscConstants.PLAYER_LASTNAME); assertEquals(1, players.size()); Player player = players.get(0); sportService.deletePlayer(player); - assertEquals(TestConstants.PLAYER_COUNT, sportService.findAllPlayers(null).size()); + assertEquals(TestTyscConstants.PLAYER_COUNT, sportService.findAllPlayers(null).size()); } @Test @Order(7) void testFindAllPositions() { - assertEquals(TestConstants.POSITION_COUNT, sportService.findAllPositions(null).size()); - assertEquals(TestConstants.POSITION_CENTER_COUNT, sportService.findAllPositions(TestConstants.POSITION_CENTER).size()); + assertEquals(TestTyscConstants.POSITION_COUNT, sportService.findAllPositions(null).size()); + assertEquals(TestTyscConstants.POSITION_CENTER_COUNT, sportService.findAllPositions(TestTyscConstants.POSITION_CENTER).size()); } @Test @Order(8) void testFindAllPositionsForSport() { - List sports = sportService.findAllSports(TestConstants.FOOTBALL_NAME); + List sports = sportService.findAllSports(TestTyscConstants.FOOTBALL_NAME); assertEquals(1, sports.size()); Sport football = sports.get(0); - assertEquals(TestConstants.FOOTBALL_POSITION_COUNT, sportService.findAllPositionsForSport(football).size()); + assertEquals(TestTyscConstants.FOOTBALL_POSITION_COUNT, sportService.findAllPositionsForSport(football).size()); } @Test @Order(9) void testSavePosition() { - List sports = sportService.findAllSports(TestConstants.FOOTBALL_NAME); + List sports = sportService.findAllSports(TestTyscConstants.FOOTBALL_NAME); Sport football = sports.get(0); FieldPosition position = new FieldPosition(); position.setSport(football); - position.setName(TestConstants.POSITION_NAME); - position.setShortName(TestConstants.POSITION_SHORTNAME); + position.setName(TestTyscConstants.POSITION_NAME); + position.setShortName(TestTyscConstants.POSITION_SHORTNAME); sportService.savePosition(position); - assertEquals(TestConstants.POSITION_COUNT+1, sportService.findAllPositions(null).size()); + assertEquals(TestTyscConstants.POSITION_COUNT+1, sportService.findAllPositions(null).size()); } @Test @Order(10) void testDeletePosition() { - List positions = sportService.findAllPositions(TestConstants.POSITION_NAME); + List positions = sportService.findAllPositions(TestTyscConstants.POSITION_NAME); assertEquals(1, positions.size()); FieldPosition position = positions.get(0); sportService.deletePosition(position); - assertEquals(TestConstants.POSITION_COUNT, sportService.findAllPositions(null).size()); + assertEquals(TestTyscConstants.POSITION_COUNT, sportService.findAllPositions(null).size()); } @Test @Order(11) void testFindAllTeams() { - assertEquals(TestConstants.TEAM_COUNT, sportService.findAllTeams(null).size()); + assertEquals(TestTyscConstants.TEAM_COUNT, sportService.findAllTeams(null).size()); assertEquals(1, sportService.findAllTeams("sharks").size()); } @Test @Order(12) void testSaveTeam() { - List sports = sportService.findAllSports(TestConstants.FOOTBALL_NAME); + List sports = sportService.findAllSports(TestTyscConstants.FOOTBALL_NAME); Sport football = sports.get(0); Team team = new Team(); team.setSport(football); - team.setName(TestConstants.TEAM_NAME); - team.setShortName(TestConstants.TEAM_SHORTNAME); + team.setName(TestTyscConstants.TEAM_NAME); + team.setShortName(TestTyscConstants.TEAM_SHORTNAME); sportService.saveTeam(team); - assertEquals(TestConstants.TEAM_COUNT+1, sportService.findAllTeams(null).size()); + assertEquals(TestTyscConstants.TEAM_COUNT+1, sportService.findAllTeams(null).size()); } @Test @Order(13) void testDeleteTeam() { - List teams = sportService.findAllTeams(TestConstants.TEAM_NAME); + List teams = sportService.findAllTeams(TestTyscConstants.TEAM_NAME); assertEquals(1, teams.size()); Team team = teams.get(0); sportService.deleteTeam(team); - assertEquals(TestConstants.TEAM_COUNT, sportService.findAllTeams(null).size()); + assertEquals(TestTyscConstants.TEAM_COUNT, sportService.findAllTeams(null).size()); } @Test @Order(14) void testFindAllRoosters() { - assertEquals(TestConstants.ROOSTER_COUNT, sportService.findAllRoosters().size()); + assertEquals(TestTyscConstants.ROOSTER_COUNT, sportService.findAllRoosters().size()); } @Test @@ -175,26 +175,26 @@ class SportServiceTest { @Order(16) void testSaveRooster() { Rooster rooster = new Rooster(); - Player player = sportService.findAllPlayers(TestConstants.PLAYER_CHRIS_NAME).get(0); + Player player = sportService.findAllPlayers(TestTyscConstants.PLAYER_CHRIS_NAME).get(0); rooster.setPlayer(player); - Team team = sportService.findAllTeams(TestConstants.DOLPHINS_NAME).get(0); + Team team = sportService.findAllTeams(TestTyscConstants.DOLPHINS_NAME).get(0); rooster.setTeam(team); - FieldPosition position = sportService.findAllPositions(TestConstants.QUARTERBACK_NAME).get(0); + FieldPosition position = sportService.findAllPositions(TestTyscConstants.QUARTERBACK_NAME).get(0); rooster.setPosition(position); - rooster.setYear(TestConstants.ROOSTER_YEAR); + rooster.setYear(TestTyscConstants.ROOSTER_YEAR); sportService.saveRooster(rooster); - assertEquals(TestConstants.ROOSTER_COUNT+1, sportService.findAllRoosters().size()); + assertEquals(TestTyscConstants.ROOSTER_COUNT+1, sportService.findAllRoosters().size()); } @Test @Order(17) void testDeleteRooster() { - Team team = sportService.findAllTeams(TestConstants.DOLPHINS_NAME).get(0); - Player player = sportService.findAllPlayers(TestConstants.PLAYER_CHRIS_NAME).get(0); - FieldPosition position = sportService.findAllPositions(TestConstants.QUARTERBACK_NAME).get(0); - Rooster rooster = sportService.findRoosterByFields(team, player, position, TestConstants.ROOSTER_YEAR); + Team team = sportService.findAllTeams(TestTyscConstants.DOLPHINS_NAME).get(0); + Player player = sportService.findAllPlayers(TestTyscConstants.PLAYER_CHRIS_NAME).get(0); + FieldPosition position = sportService.findAllPositions(TestTyscConstants.QUARTERBACK_NAME).get(0); + Rooster rooster = sportService.findRoosterByFields(team, player, position, TestTyscConstants.ROOSTER_YEAR); assertNotNull(rooster); sportService.deleteRooster(rooster); - assertEquals(TestConstants.ROOSTER_COUNT, sportService.findAllRoosters().size()); + assertEquals(TestTyscConstants.ROOSTER_COUNT, sportService.findAllRoosters().size()); } }