From fd5f5ffcb130c3a4eaff42612ce769444ad0de75 Mon Sep 17 00:00:00 2001 From: DOOMED2WIN Date: Fri, 12 Jul 2024 08:41:15 +0200 Subject: [PATCH 1/3] added migration changes --- pom.xml | 38 +++++---- src/main/java/app/milo/server/App.java | 2 +- .../server/base/address/base/AddressApi.java | 2 - .../base/address/base/AddressEntity.java | 10 +-- .../base/address/base/AddressService.java | 3 - .../base/address/suburb/SuburbEntity.java | 10 +-- .../item/AdminFooterItemEntity.java | 14 ++-- .../AdminFooterItemTranslatableEntity.java | 6 +- .../parent/AdminFooterParentEntity.java | 8 +- .../AdminFooterParentTranslatableEntity.java | 6 +- .../base/analytics/rating/RatableEntity.java | 10 +-- .../components/menuItem/MenuItemEntity.java | 10 +-- .../MenuItemTranslatableEntity.java | 6 +- .../page/attribute/PageAttributeEntity.java | 12 +-- .../PageAttributeTranslatableEntity.java | 4 +- .../PageAttributeReferenceEntity.java | 10 +-- .../PageAttributeTypeEntity.java | 20 ++--- .../cms/components/page/base/PageEntity.java | 10 +-- .../page/base/visitors/PageVisitorEntity.java | 4 +- .../page/embedding/PageEmbeddingEntity.java | 14 ++-- .../PageEmbeddingTypeEntity.java | 20 ++--- .../PageEmbeddingTypeTranslatableEntity.java | 6 +- .../cms/components/plugin/PluginEntity.java | 8 +- .../PluginTranslatableEntity.java | 4 +- .../cms/components/theme/ThemeEntity.java | 10 +-- .../themeVariable/ThemeVariableEntity.java | 12 +-- .../configuration/ConfigurationEntity.java | 10 +-- .../server/base/contact/ContactEntity.java | 4 +- .../milo/server/base/db/SuburbMigration.java | 1 - .../base/milestone/MilestoneEntity.java | 10 +-- .../element/MilestoneElementEntity.java | 10 +-- .../MilestoneElementTranslatableEntity.java | 6 +- .../milestone/media/MilestoneMediaEntity.java | 8 +- .../MilestoneTranslatableEntity.java | 6 +- .../server/base/report/base/ReportEntity.java | 14 ++-- .../report/base/media/ReportMediaEntity.java | 12 +-- .../ReportTranslatableEntity.java | 6 +- .../base/report/type/ReportTypeEntity.java | 8 +- .../ReportTypeTranslatableEntity.java | 6 +- .../server/base/thirdparty/app/AppEntity.java | 12 +-- .../appPlatform/AppPlatformEntity.java | 6 +- .../socialMedia/SocialMediaEntity.java | 6 +- .../userContext/base/UserContextEntity.java | 36 ++++----- .../base/media/UserContextMediaEntity.java | 10 +-- .../UserContextTranslatableEntity.java | 4 +- .../base/userContext/friend/FriendEntity.java | 12 +-- .../app/milo/server/core/base/BaseEntity.java | 8 +- .../milo/server/core/base/DataService.java | 8 +- .../milo/server/core/base/GraphBuilder.java | 12 +-- .../config/MultiReadHttpServletRequest.java | 8 +- .../server/core/config/RequestFilter.java | 12 +-- .../core/context/GraphQlContextAdapter.java | 2 +- .../errorMessage/ErrorMessageEntity.java | 8 +- .../core/i18n/TranslationPreprocessor.java | 4 +- .../i18n/components/label/LabelEntity.java | 10 +-- .../LabelTranslatablesEntity.java | 6 +- .../components/language/LanguageEntity.java | 6 +- .../i18n/entities/TranslatableEntity.java | 8 +- .../core/i18n/translation/LocaleService.java | 2 +- .../i18n/translation/TranslationService.java | 2 +- .../core/location/LocationController.java | 2 - .../attribution/MediaAttributionEntity.java | 4 +- .../server/core/media/base/MediaEntity.java | 12 +-- .../core/media/image/ImageListener.java | 8 +- .../server/core/media/image/ImageService.java | 2 - .../server/core/messaging/MailService.java | 4 +- .../messaging/channels/ChannelEntity.java | 6 +- .../definitions/MessageDefinitionEntity.java | 24 +++--- .../MessageDefinitionTranslatableEntity.java | 10 +-- .../base/NotificationEntity.java | 14 ++-- .../NotificationTranslatableEntity.java | 10 +-- .../templates/MessageTemplateEntity.java | 10 +-- .../MessageTemplateTranslatableEntity.java | 10 +-- .../push/subscription/SubscriptionEntity.java | 12 +-- .../core/repository/BaseRepositoryQuery.java | 2 +- .../repository/CollectionRepositoryQuery.java | 2 +- .../repository/CustomRepositoryFactory.java | 2 +- .../CustomRepositoryFactoryBean.java | 2 +- .../QueryableReadRepositoryImpl.java | 12 +-- .../core/security/ApplicationSecurity.java | 79 ++++++++++--------- .../PrivilegeApplicationEntity.java | 14 ++-- ...rivilegeApplicationTranslatableEntity.java | 8 +- .../components/role/base/RoleEntity.java | 22 +++--- .../translation/RoleTranslatableEntity.java | 12 +-- .../role/privilege/RolePrivilegeEntity.java | 20 ++--- .../RolePrivilegeTranslatableEntity.java | 12 +-- .../security/components/user/UserEntity.java | 24 +++--- .../emailVerification/VerificationEntity.java | 12 +-- .../passwordReset/PasswordResetEntity.java | 12 +-- .../userDeletion/base/UserDeletionEntity.java | 20 ++--- .../UserDeletionTranslatableEntity.java | 6 +- .../type/UserDeletionTypeEntity.java | 8 +- .../UserDeletionTypeTranslatableEntity.java | 6 +- .../filter/JwtAuthorizationFilter.java | 8 +- .../services/AuthenticationService.java | 2 +- .../server/core/utils/PersistenceUtils.java | 14 ++-- .../server/core/visit/VisitInterceptor.java | 2 +- .../core/visit/visitable/VisitableEntity.java | 10 +-- .../visit/visitable/VisitableService.java | 4 +- .../core/visit/visitor/VisitorEntity.java | 6 +- .../components/base/ArticleEntity.java | 24 +++--- .../ArticleTranslatableEntity.java | 6 +- .../base/visitors/ArticleVisitorEntity.java | 4 +- .../category/ArticleCategoryEntity.java | 10 +-- .../ArticleCategoryTranslatableEntity.java | 8 +- .../comment/ArticleCommentEntity.java | 14 ++-- .../ArticleCommentTranslatableEntity.java | 6 +- .../components/media/ArticleMediaEntity.java | 12 +-- .../ArticlePublicAuthorEntity.java | 10 +-- .../rating/ArticleRatingEntity.java | 6 +- .../features/contest/base/ContestEntity.java | 14 ++-- .../base/media/ContestMediaEntity.java | 12 +-- .../ContestTranslatableEntity.java | 6 +- .../contest/comment/ContestCommentEntity.java | 12 +-- .../ContestCommentTranslatableEntity.java | 6 +- .../ContestParticipationEntity.java | 12 +-- .../ContestParticipationMediaEntity.java | 12 +-- ...ontestParticipationTranslatableEntity.java | 4 +- .../contest/type/ContestTypeEntity.java | 12 ++- .../ContestTypeTranslatableEntity.java | 9 ++- .../contest/vote/ContestVoteEntity.java | 12 +-- .../deal/components/base/DealEntity.java | 22 +++--- .../base/media/DealMediaEntity.java | 12 +-- .../translations/DealTranslatableEntity.java | 6 +- .../base/visitors/DealVisitorEntity.java | 4 +- .../category/DealCategoryEntity.java | 10 +-- .../DealCategoryTranslatableEntity.java | 6 +- .../event/attendee/EventAttendeeEntity.java | 10 +-- .../EventAttendeeConfigurationEntity.java | 8 +- .../features/event/base/EventEntity.java | 24 +++--- .../translations/EventTranslatableEntity.java | 6 +- .../base/visitors/EventVisitorEntity.java | 4 +- .../event/category/EventCategoryEntity.java | 10 +-- .../EventCategoryTranslatableEntity.java | 6 +- .../event/comment/EventCommentEntity.java | 12 +-- .../EventCommentTranslatableEntity.java | 6 +- .../event/media/EventMediaEntity.java | 10 +-- .../event/rating/EventRatingEntity.java | 6 +- .../event/schedule/EventScheduleEntity.java | 10 +-- .../targetGroup/EventTargetGroupEntity.java | 8 +- .../EventTargetGroupTranslatableEntity.java | 6 +- .../formTemplate/UserFormTemplateEntity.java | 14 ++-- .../UserFormTemplateTranslatableEntity.java | 6 +- .../form/template/FormTemplateEntity.java | 8 +- .../FormTemplateTranslatableEntity.java | 6 +- .../templateType/FormTemplateTypeEntity.java | 8 +- .../FormTemplateTypeTranslatableEntity.java | 6 +- .../infoMedia/base/InfoMediaEntity.java | 10 +-- .../category/InfoMediaCategoryEntity.java | 8 +- .../InfoMediaCategoryTranslatableEntity.java | 6 +- .../choice/NavigatorChoiceEntity.java | 12 +-- .../NavigatorChoiceTranslatableEntity.java | 6 +- .../navigator/page/NavigatorPageEntity.java | 10 +-- .../NavigatorPageTranslatableEntity.java | 6 +- .../resultLink/NavigatorResultLinkEntity.java | 10 +-- ...NavigatorResultLinkTranslatableEntity.java | 4 +- .../organisation/base/OrganisationEntity.java | 22 +++--- .../OrganisationTranslatableEntity.java | 4 +- .../visitors/OrganisationVisitorEntity.java | 4 +- .../comment/OrganisationCommentEntity.java | 10 +-- ...OrganisationCommentTranslatableEntity.java | 6 +- .../OrganisationConfigurationEntity.java | 10 +-- .../media/OrganisationMediaEntity.java | 10 +-- .../member/OrganisationMemberEntity.java | 12 +-- .../rating/OrganisationRatingEntity.java | 6 +- .../survey/answer/SurveyAnswerEntity.java | 22 +++--- .../SurveyAnswerTranslatableEntity.java | 6 +- .../assignment/SurveyAssignmentEntity.java | 10 +-- .../features/survey/base/SurveyEntity.java | 14 ++-- .../survey/base/media/SurveyMediaEntity.java | 14 ++-- .../SurveyTranslatableEntity.java | 6 +- .../base/visitors/SurveyVisitorEntity.java | 4 +- .../survey/question/SurveyQuestionEntity.java | 14 ++-- .../SurveyQuestionTranslatableEntity.java | 6 +- .../SurveyQuestionOptionEntity.java | 14 ++-- ...urveyQuestionOptionTranslatableEntity.java | 6 +- .../SurveyQuestionTypeEntity.java | 10 +-- .../survey/result/SurveyResultEntity.java | 12 +-- .../SurveyResultTranslatableEntity.java | 6 +- .../survey/state/SurveyStateEntity.java | 10 +-- .../0168.change_column_type_contests.yaml | 6 +- .../database/masters/development-master.yaml | 2 - .../database/masters/production-master.yaml | 2 - .../DataServiceGetByExampleTest.java | 2 +- .../dataService/DataServiceReadAllTest.java | 2 +- .../base/dataService/DataServiceSaveTest.java | 2 +- .../graphbuilder/GraphBuilderCreateTest.java | 6 +- .../config/GraphQlContextAdapterTest.java | 2 +- .../MultiReadHttpServletRequestTest.java | 6 +- .../units/core/messaging/MailServiceTest.java | 8 +- .../core/setup/entities/base/QTestEntity.java | 2 +- .../core/setup/entities/base/TestEntity.java | 16 ++-- .../entities/child/QTestChildEntity.java | 2 +- .../setup/entities/child/TestChildEntity.java | 12 +-- .../listChild/QTestListChildEntity.java | 2 +- .../listChild/TestListChildEntity.java | 12 +-- .../core/setup/services/ImageReader.java | 1 - .../core/setup/services/TestMailService.java | 4 +- .../utils/date/setup/DateUtilTestEntity.java | 2 +- .../PersistenceUtilsMappedByTest.java | 4 +- .../setup/PersistenceEqualityEntity.java | 12 +-- .../setup/PersistenceValidityEntity.java | 8 +- .../ReflectionUtilsGetAnnotationTest.java | 2 +- ...ReflectionUtilsGetAnnotationValueTest.java | 2 +- ...ectionUtilsGetFieldWithAnnotationTest.java | 2 +- .../setup/ReflectionTestEntity.java | 6 +- 206 files changed, 930 insertions(+), 943 deletions(-) diff --git a/pom.xml b/pom.xml index 41410f09..75f61e69 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.18 + 3.3.1 @@ -35,12 +35,12 @@ 1.1.3 11.4.6 - 8.1.0 - 0.0.7 + 9.2.0 + 1.0.1 v1-rev20230701-2.0.0 4.2 0.8.7 - 2.1.0 + 2.1.3 4.0.0 17 3.29.2-GA @@ -49,7 +49,8 @@ 1.0.10 0.10.2 3.0.4 - 3.5 + 3.10.1 + 5.1.0 @@ -99,15 +100,19 @@ openhtmltopdf-pdfbox ${openhtmltopdf.version} - - com.querydsl - querydsl-apt - provided - - - com.querydsl - querydsl-jpa - + + com.querydsl + querydsl-apt + ${querydsl.version} + jakarta + provided + + + com.querydsl + querydsl-jpa + ${querydsl.version} + jakarta + com.twelvemonkeys.imageio imageio-core @@ -127,6 +132,7 @@ com.twelvemonkeys.servlet servlet ${twelvemonkeys.imageio} + jakarta io.leangen.graphql @@ -234,7 +240,7 @@ It will throw an error because of different XML bind usages. See: - https://stackoverflow.com/questions/52502189/java-11-package-javax-xml-bind-does-not-exist + https://stackoverflow.com/questions/52502189/java-11-package-jakarta-xml-bind-does-not-exist --> jakarta.activation @@ -327,7 +333,7 @@ 2.6.0 - javax.validation + jakarta.validation validation-api 2.0.1.Final diff --git a/src/main/java/app/milo/server/App.java b/src/main/java/app/milo/server/App.java index 275a364a..7d238769 100644 --- a/src/main/java/app/milo/server/App.java +++ b/src/main/java/app/milo/server/App.java @@ -6,7 +6,7 @@ import java.util.Optional; import java.util.TimeZone; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; diff --git a/src/main/java/app/milo/server/base/address/base/AddressApi.java b/src/main/java/app/milo/server/base/address/base/AddressApi.java index eefc3b04..498c98bb 100644 --- a/src/main/java/app/milo/server/base/address/base/AddressApi.java +++ b/src/main/java/app/milo/server/base/address/base/AddressApi.java @@ -2,9 +2,7 @@ import java.util.List; import java.util.Optional; - import javax.naming.ServiceUnavailableException; - import org.springframework.stereotype.Component; import app.milo.server.base.address.authorization.permissions.AddressAdminPermission; import app.milo.server.core.base.CrudApi; diff --git a/src/main/java/app/milo/server/base/address/base/AddressEntity.java b/src/main/java/app/milo/server/base/address/base/AddressEntity.java index 3c4673b7..9ad1c889 100644 --- a/src/main/java/app/milo/server/base/address/base/AddressEntity.java +++ b/src/main/java/app/milo/server/base/address/base/AddressEntity.java @@ -1,10 +1,10 @@ package app.milo.server.base.address.base; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import app.milo.server.base.address.suburb.SuburbEntity; import app.milo.server.core.base.BaseEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/base/address/base/AddressService.java b/src/main/java/app/milo/server/base/address/base/AddressService.java index faf59906..f6498f06 100644 --- a/src/main/java/app/milo/server/base/address/base/AddressService.java +++ b/src/main/java/app/milo/server/base/address/base/AddressService.java @@ -1,11 +1,8 @@ package app.milo.server.base.address.base; import java.util.Optional; - import javax.naming.ServiceUnavailableException; - import org.springframework.stereotype.Service; - import com.fasterxml.jackson.databind.JsonNode; import app.milo.server.base.address.suburb.SuburbService; import app.milo.server.core.base.DataService; diff --git a/src/main/java/app/milo/server/base/address/suburb/SuburbEntity.java b/src/main/java/app/milo/server/base/address/suburb/SuburbEntity.java index cb0b0c84..52cc1b82 100644 --- a/src/main/java/app/milo/server/base/address/suburb/SuburbEntity.java +++ b/src/main/java/app/milo/server/base/address/suburb/SuburbEntity.java @@ -2,11 +2,11 @@ import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.base.address.base.AddressEntity; import app.milo.server.core.base.BaseEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/base/adminFooter/item/AdminFooterItemEntity.java b/src/main/java/app/milo/server/base/adminFooter/item/AdminFooterItemEntity.java index ac2e1123..722804cd 100644 --- a/src/main/java/app/milo/server/base/adminFooter/item/AdminFooterItemEntity.java +++ b/src/main/java/app/milo/server/base/adminFooter/item/AdminFooterItemEntity.java @@ -2,13 +2,13 @@ import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.base.adminFooter.item.translations.AdminFooterItemTranslatableEntity; import app.milo.server.base.adminFooter.parent.AdminFooterParentEntity; import app.milo.server.core.base.BaseEntity; diff --git a/src/main/java/app/milo/server/base/adminFooter/item/translations/AdminFooterItemTranslatableEntity.java b/src/main/java/app/milo/server/base/adminFooter/item/translations/AdminFooterItemTranslatableEntity.java index 12a74098..73505a54 100644 --- a/src/main/java/app/milo/server/base/adminFooter/item/translations/AdminFooterItemTranslatableEntity.java +++ b/src/main/java/app/milo/server/base/adminFooter/item/translations/AdminFooterItemTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.base.adminFooter.item.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.base.adminFooter.item.AdminFooterItemEntity; import app.milo.server.core.i18n.entities.TranslatableEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/base/adminFooter/parent/AdminFooterParentEntity.java b/src/main/java/app/milo/server/base/adminFooter/parent/AdminFooterParentEntity.java index 26d82d8c..479880aa 100644 --- a/src/main/java/app/milo/server/base/adminFooter/parent/AdminFooterParentEntity.java +++ b/src/main/java/app/milo/server/base/adminFooter/parent/AdminFooterParentEntity.java @@ -1,10 +1,10 @@ package app.milo.server.base.adminFooter.parent; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.base.adminFooter.item.AdminFooterItemEntity; import app.milo.server.base.adminFooter.parent.translations.AdminFooterParentTranslatableEntity; import app.milo.server.core.base.BaseEntity; diff --git a/src/main/java/app/milo/server/base/adminFooter/parent/translations/AdminFooterParentTranslatableEntity.java b/src/main/java/app/milo/server/base/adminFooter/parent/translations/AdminFooterParentTranslatableEntity.java index 62848c76..3fe7be67 100644 --- a/src/main/java/app/milo/server/base/adminFooter/parent/translations/AdminFooterParentTranslatableEntity.java +++ b/src/main/java/app/milo/server/base/adminFooter/parent/translations/AdminFooterParentTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.base.adminFooter.parent.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.base.adminFooter.parent.AdminFooterParentEntity; import app.milo.server.core.i18n.entities.TranslatableEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/base/analytics/rating/RatableEntity.java b/src/main/java/app/milo/server/base/analytics/rating/RatableEntity.java index 3838d196..c1756221 100644 --- a/src/main/java/app/milo/server/base/analytics/rating/RatableEntity.java +++ b/src/main/java/app/milo/server/base/analytics/rating/RatableEntity.java @@ -1,10 +1,10 @@ package app.milo.server.base.analytics.rating; -import javax.persistence.Column; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; import app.milo.server.base.userContext.base.UserContextEntity; import app.milo.server.core.base.BaseEntity; import lombok.Getter; diff --git a/src/main/java/app/milo/server/base/cms/components/menuItem/MenuItemEntity.java b/src/main/java/app/milo/server/base/cms/components/menuItem/MenuItemEntity.java index 2c39ef20..e713e902 100644 --- a/src/main/java/app/milo/server/base/cms/components/menuItem/MenuItemEntity.java +++ b/src/main/java/app/milo/server/base/cms/components/menuItem/MenuItemEntity.java @@ -1,11 +1,11 @@ package app.milo.server.base.cms.components.menuItem; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.base.cms.components.menuItem.translations.MenuItemTranslatableEntity; import app.milo.server.base.cms.components.page.base.PageEntity; import app.milo.server.base.cms.components.plugin.PluginEntity; diff --git a/src/main/java/app/milo/server/base/cms/components/menuItem/translations/MenuItemTranslatableEntity.java b/src/main/java/app/milo/server/base/cms/components/menuItem/translations/MenuItemTranslatableEntity.java index fbf68da0..a8f41ae6 100644 --- a/src/main/java/app/milo/server/base/cms/components/menuItem/translations/MenuItemTranslatableEntity.java +++ b/src/main/java/app/milo/server/base/cms/components/menuItem/translations/MenuItemTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.base.cms.components.menuItem.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.base.cms.components.menuItem.MenuItemEntity; import app.milo.server.core.i18n.entities.TranslatableEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/base/cms/components/page/attribute/PageAttributeEntity.java b/src/main/java/app/milo/server/base/cms/components/page/attribute/PageAttributeEntity.java index 5ddf6d60..1ea988da 100644 --- a/src/main/java/app/milo/server/base/cms/components/page/attribute/PageAttributeEntity.java +++ b/src/main/java/app/milo/server/base/cms/components/page/attribute/PageAttributeEntity.java @@ -1,12 +1,12 @@ package app.milo.server.base.cms.components.page.attribute; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.base.cms.components.page.attribute.translations.PageAttributeTranslatableEntity; import app.milo.server.base.cms.components.page.attributeReference.PageAttributeReferenceEntity; import app.milo.server.base.cms.components.page.attributeType.PageAttributeTypeEntity; diff --git a/src/main/java/app/milo/server/base/cms/components/page/attribute/translations/PageAttributeTranslatableEntity.java b/src/main/java/app/milo/server/base/cms/components/page/attribute/translations/PageAttributeTranslatableEntity.java index d27184b9..3c4ea2ea 100644 --- a/src/main/java/app/milo/server/base/cms/components/page/attribute/translations/PageAttributeTranslatableEntity.java +++ b/src/main/java/app/milo/server/base/cms/components/page/attribute/translations/PageAttributeTranslatableEntity.java @@ -1,7 +1,7 @@ package app.milo.server.base.cms.components.page.attribute.translations; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.base.cms.components.page.attribute.PageAttributeEntity; import app.milo.server.core.i18n.entities.TranslatableEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/base/cms/components/page/attributeReference/PageAttributeReferenceEntity.java b/src/main/java/app/milo/server/base/cms/components/page/attributeReference/PageAttributeReferenceEntity.java index e95e5adb..5f4961a6 100644 --- a/src/main/java/app/milo/server/base/cms/components/page/attributeReference/PageAttributeReferenceEntity.java +++ b/src/main/java/app/milo/server/base/cms/components/page/attributeReference/PageAttributeReferenceEntity.java @@ -1,10 +1,10 @@ package app.milo.server.base.cms.components.page.attributeReference; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import app.milo.server.base.cms.components.page.attribute.PageAttributeEntity; import app.milo.server.base.cms.components.plugin.PluginEntity; import app.milo.server.core.base.BaseEntity; diff --git a/src/main/java/app/milo/server/base/cms/components/page/attributeType/PageAttributeTypeEntity.java b/src/main/java/app/milo/server/base/cms/components/page/attributeType/PageAttributeTypeEntity.java index 2fc742a0..0377842d 100644 --- a/src/main/java/app/milo/server/base/cms/components/page/attributeType/PageAttributeTypeEntity.java +++ b/src/main/java/app/milo/server/base/cms/components/page/attributeType/PageAttributeTypeEntity.java @@ -3,15 +3,15 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; @@ -46,7 +46,7 @@ public class PageAttributeTypeEntity extends BaseEntity { joinColumns = @JoinColumn(name = "attribute_type_id"), inverseJoinColumns = @JoinColumn(name = "embedding_type_id"), uniqueConstraints = {@UniqueConstraint(columnNames = {"attribute_type_id", "embedding_type_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List embeddingTypes = new ArrayList<>(); } diff --git a/src/main/java/app/milo/server/base/cms/components/page/base/PageEntity.java b/src/main/java/app/milo/server/base/cms/components/page/base/PageEntity.java index 16d1432d..7be8a8f2 100644 --- a/src/main/java/app/milo/server/base/cms/components/page/base/PageEntity.java +++ b/src/main/java/app/milo/server/base/cms/components/page/base/PageEntity.java @@ -1,11 +1,11 @@ package app.milo.server.base.cms.components.page.base; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import app.milo.server.base.cms.components.menuItem.MenuItemEntity; import app.milo.server.base.cms.components.page.base.visitors.PageVisitorEntity; diff --git a/src/main/java/app/milo/server/base/cms/components/page/base/visitors/PageVisitorEntity.java b/src/main/java/app/milo/server/base/cms/components/page/base/visitors/PageVisitorEntity.java index 07b70892..b82c87f9 100644 --- a/src/main/java/app/milo/server/base/cms/components/page/base/visitors/PageVisitorEntity.java +++ b/src/main/java/app/milo/server/base/cms/components/page/base/visitors/PageVisitorEntity.java @@ -1,7 +1,7 @@ package app.milo.server.base.cms.components.page.base.visitors; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.base.cms.components.page.base.PageEntity; import app.milo.server.core.visit.visitable.VisitableEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/base/cms/components/page/embedding/PageEmbeddingEntity.java b/src/main/java/app/milo/server/base/cms/components/page/embedding/PageEmbeddingEntity.java index d3955306..1f360dad 100644 --- a/src/main/java/app/milo/server/base/cms/components/page/embedding/PageEmbeddingEntity.java +++ b/src/main/java/app/milo/server/base/cms/components/page/embedding/PageEmbeddingEntity.java @@ -1,13 +1,13 @@ package app.milo.server.base.cms.components.page.embedding; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.base.cms.components.page.attribute.PageAttributeEntity; import app.milo.server.base.cms.components.page.base.PageEntity; import app.milo.server.base.cms.components.page.embeddingType.PageEmbeddingTypeEntity; diff --git a/src/main/java/app/milo/server/base/cms/components/page/embeddingType/PageEmbeddingTypeEntity.java b/src/main/java/app/milo/server/base/cms/components/page/embeddingType/PageEmbeddingTypeEntity.java index f1608432..c0ea06b8 100644 --- a/src/main/java/app/milo/server/base/cms/components/page/embeddingType/PageEmbeddingTypeEntity.java +++ b/src/main/java/app/milo/server/base/cms/components/page/embeddingType/PageEmbeddingTypeEntity.java @@ -3,15 +3,15 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; @@ -57,7 +57,7 @@ public class PageEmbeddingTypeEntity extends BaseEntity { joinColumns = @JoinColumn(name = "embedding_type_id"), inverseJoinColumns = @JoinColumn(name = "attribute_type_id"), uniqueConstraints = {@UniqueConstraint(columnNames = {"embedding_type_id", "attribute_type_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List attributes = new ArrayList<>(); } diff --git a/src/main/java/app/milo/server/base/cms/components/page/embeddingType/translations/PageEmbeddingTypeTranslatableEntity.java b/src/main/java/app/milo/server/base/cms/components/page/embeddingType/translations/PageEmbeddingTypeTranslatableEntity.java index 7bae4c72..89fcdadb 100644 --- a/src/main/java/app/milo/server/base/cms/components/page/embeddingType/translations/PageEmbeddingTypeTranslatableEntity.java +++ b/src/main/java/app/milo/server/base/cms/components/page/embeddingType/translations/PageEmbeddingTypeTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.base.cms.components.page.embeddingType.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.base.cms.components.page.embeddingType.PageEmbeddingTypeEntity; import app.milo.server.core.i18n.entities.TranslatableEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/base/cms/components/plugin/PluginEntity.java b/src/main/java/app/milo/server/base/cms/components/plugin/PluginEntity.java index 0c5a4c11..fee06755 100644 --- a/src/main/java/app/milo/server/base/cms/components/plugin/PluginEntity.java +++ b/src/main/java/app/milo/server/base/cms/components/plugin/PluginEntity.java @@ -1,10 +1,10 @@ package app.milo.server.base.cms.components.plugin; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.base.cms.components.menuItem.MenuItemEntity; import app.milo.server.base.cms.components.plugin.translations.PluginTranslatableEntity; import app.milo.server.core.base.BaseEntity; diff --git a/src/main/java/app/milo/server/base/cms/components/plugin/translations/PluginTranslatableEntity.java b/src/main/java/app/milo/server/base/cms/components/plugin/translations/PluginTranslatableEntity.java index 0991cd7b..04cb9468 100644 --- a/src/main/java/app/milo/server/base/cms/components/plugin/translations/PluginTranslatableEntity.java +++ b/src/main/java/app/milo/server/base/cms/components/plugin/translations/PluginTranslatableEntity.java @@ -1,7 +1,7 @@ package app.milo.server.base.cms.components.plugin.translations; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.base.cms.components.plugin.PluginEntity; import app.milo.server.core.i18n.entities.TranslatableEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/base/cms/components/theme/ThemeEntity.java b/src/main/java/app/milo/server/base/cms/components/theme/ThemeEntity.java index e46b0e8a..04b82658 100644 --- a/src/main/java/app/milo/server/base/cms/components/theme/ThemeEntity.java +++ b/src/main/java/app/milo/server/base/cms/components/theme/ThemeEntity.java @@ -1,11 +1,11 @@ package app.milo.server.base.cms.components.theme; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.base.cms.components.themeVariable.ThemeVariableEntity; import app.milo.server.core.base.BaseEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/base/cms/components/themeVariable/ThemeVariableEntity.java b/src/main/java/app/milo/server/base/cms/components/themeVariable/ThemeVariableEntity.java index cd78389a..e6ace7ae 100644 --- a/src/main/java/app/milo/server/base/cms/components/themeVariable/ThemeVariableEntity.java +++ b/src/main/java/app/milo/server/base/cms/components/themeVariable/ThemeVariableEntity.java @@ -1,11 +1,11 @@ package app.milo.server.base.cms.components.themeVariable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import app.milo.server.base.cms.components.theme.ThemeEntity; import app.milo.server.core.base.BaseEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/base/configuration/ConfigurationEntity.java b/src/main/java/app/milo/server/base/configuration/ConfigurationEntity.java index 1cec8e0c..d88d6ed5 100644 --- a/src/main/java/app/milo/server/base/configuration/ConfigurationEntity.java +++ b/src/main/java/app/milo/server/base/configuration/ConfigurationEntity.java @@ -1,10 +1,10 @@ package app.milo.server.base.configuration; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.media.base.MediaEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/base/contact/ContactEntity.java b/src/main/java/app/milo/server/base/contact/ContactEntity.java index a377eb38..9f3e9377 100644 --- a/src/main/java/app/milo/server/base/contact/ContactEntity.java +++ b/src/main/java/app/milo/server/base/contact/ContactEntity.java @@ -1,7 +1,7 @@ package app.milo.server.base.contact; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/app/milo/server/base/db/SuburbMigration.java b/src/main/java/app/milo/server/base/db/SuburbMigration.java index 71257de5..ef8387b9 100644 --- a/src/main/java/app/milo/server/base/db/SuburbMigration.java +++ b/src/main/java/app/milo/server/base/db/SuburbMigration.java @@ -3,7 +3,6 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.sql.SQLException; - import javax.naming.ServiceUnavailableException; import app.milo.server.base.address.base.AddressEntity; import app.milo.server.base.address.suburb.SuburbEntity; diff --git a/src/main/java/app/milo/server/base/milestone/MilestoneEntity.java b/src/main/java/app/milo/server/base/milestone/MilestoneEntity.java index 8279ab93..a04b7f88 100644 --- a/src/main/java/app/milo/server/base/milestone/MilestoneEntity.java +++ b/src/main/java/app/milo/server/base/milestone/MilestoneEntity.java @@ -2,11 +2,11 @@ import java.time.OffsetDateTime; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import app.milo.server.base.milestone.element.MilestoneElementEntity; import app.milo.server.base.milestone.media.MilestoneMediaEntity; diff --git a/src/main/java/app/milo/server/base/milestone/element/MilestoneElementEntity.java b/src/main/java/app/milo/server/base/milestone/element/MilestoneElementEntity.java index 06fdc373..7ba6d454 100644 --- a/src/main/java/app/milo/server/base/milestone/element/MilestoneElementEntity.java +++ b/src/main/java/app/milo/server/base/milestone/element/MilestoneElementEntity.java @@ -1,11 +1,11 @@ package app.milo.server.base.milestone.element; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import app.milo.server.base.milestone.MilestoneEntity; import app.milo.server.base.milestone.element.translations.MilestoneElementTranslatableEntity; diff --git a/src/main/java/app/milo/server/base/milestone/element/translations/MilestoneElementTranslatableEntity.java b/src/main/java/app/milo/server/base/milestone/element/translations/MilestoneElementTranslatableEntity.java index 80f43731..dc11f20d 100644 --- a/src/main/java/app/milo/server/base/milestone/element/translations/MilestoneElementTranslatableEntity.java +++ b/src/main/java/app/milo/server/base/milestone/element/translations/MilestoneElementTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.base.milestone.element.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.base.milestone.element.MilestoneElementEntity; import app.milo.server.core.i18n.entities.TranslatableEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/base/milestone/media/MilestoneMediaEntity.java b/src/main/java/app/milo/server/base/milestone/media/MilestoneMediaEntity.java index a7a7ab7e..4105b08f 100644 --- a/src/main/java/app/milo/server/base/milestone/media/MilestoneMediaEntity.java +++ b/src/main/java/app/milo/server/base/milestone/media/MilestoneMediaEntity.java @@ -1,9 +1,9 @@ package app.milo.server.base.milestone.media; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import app.milo.server.base.milestone.MilestoneEntity; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.media.base.MediaEntity; diff --git a/src/main/java/app/milo/server/base/milestone/translations/MilestoneTranslatableEntity.java b/src/main/java/app/milo/server/base/milestone/translations/MilestoneTranslatableEntity.java index f6e74f63..4a136523 100644 --- a/src/main/java/app/milo/server/base/milestone/translations/MilestoneTranslatableEntity.java +++ b/src/main/java/app/milo/server/base/milestone/translations/MilestoneTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.base.milestone.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.base.milestone.MilestoneEntity; import app.milo.server.core.i18n.entities.TranslatableEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/base/report/base/ReportEntity.java b/src/main/java/app/milo/server/base/report/base/ReportEntity.java index 8dd49b51..157908ea 100644 --- a/src/main/java/app/milo/server/base/report/base/ReportEntity.java +++ b/src/main/java/app/milo/server/base/report/base/ReportEntity.java @@ -1,13 +1,13 @@ package app.milo.server.base.report.base; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import org.hibernate.annotations.GenericGenerator; import app.milo.server.base.report.base.media.ReportMediaEntity; import app.milo.server.base.report.base.translations.ReportTranslatableEntity; diff --git a/src/main/java/app/milo/server/base/report/base/media/ReportMediaEntity.java b/src/main/java/app/milo/server/base/report/base/media/ReportMediaEntity.java index 85fd293d..3cebf0be 100644 --- a/src/main/java/app/milo/server/base/report/base/media/ReportMediaEntity.java +++ b/src/main/java/app/milo/server/base/report/base/media/ReportMediaEntity.java @@ -1,11 +1,11 @@ package app.milo.server.base.report.base.media; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import app.milo.server.base.report.base.ReportEntity; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.media.base.MediaEntity; diff --git a/src/main/java/app/milo/server/base/report/base/translations/ReportTranslatableEntity.java b/src/main/java/app/milo/server/base/report/base/translations/ReportTranslatableEntity.java index dd30623b..20a4aab4 100644 --- a/src/main/java/app/milo/server/base/report/base/translations/ReportTranslatableEntity.java +++ b/src/main/java/app/milo/server/base/report/base/translations/ReportTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.base.report.base.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.base.report.base.ReportEntity; import app.milo.server.core.i18n.entities.TranslatableEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/base/report/type/ReportTypeEntity.java b/src/main/java/app/milo/server/base/report/type/ReportTypeEntity.java index c588ca33..b3260165 100644 --- a/src/main/java/app/milo/server/base/report/type/ReportTypeEntity.java +++ b/src/main/java/app/milo/server/base/report/type/ReportTypeEntity.java @@ -1,10 +1,10 @@ package app.milo.server.base.report.type; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import app.milo.server.base.report.base.ReportEntity; import app.milo.server.base.report.type.translations.ReportTypeTranslatableEntity; diff --git a/src/main/java/app/milo/server/base/report/type/translations/ReportTypeTranslatableEntity.java b/src/main/java/app/milo/server/base/report/type/translations/ReportTypeTranslatableEntity.java index 8c98f9b4..95297db5 100644 --- a/src/main/java/app/milo/server/base/report/type/translations/ReportTypeTranslatableEntity.java +++ b/src/main/java/app/milo/server/base/report/type/translations/ReportTypeTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.base.report.type.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.base.report.type.ReportTypeEntity; import app.milo.server.core.i18n.entities.TranslatableEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/base/thirdparty/app/AppEntity.java b/src/main/java/app/milo/server/base/thirdparty/app/AppEntity.java index 3d177873..9f2292ae 100644 --- a/src/main/java/app/milo/server/base/thirdparty/app/AppEntity.java +++ b/src/main/java/app/milo/server/base/thirdparty/app/AppEntity.java @@ -1,11 +1,11 @@ package app.milo.server.base.thirdparty.app; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import app.milo.server.base.thirdparty.appPlatform.AppPlatformEntity; import app.milo.server.core.base.BaseEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/base/thirdparty/appPlatform/AppPlatformEntity.java b/src/main/java/app/milo/server/base/thirdparty/appPlatform/AppPlatformEntity.java index 308e9371..fa2891ae 100644 --- a/src/main/java/app/milo/server/base/thirdparty/appPlatform/AppPlatformEntity.java +++ b/src/main/java/app/milo/server/base/thirdparty/appPlatform/AppPlatformEntity.java @@ -1,8 +1,8 @@ package app.milo.server.base.thirdparty.appPlatform; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/app/milo/server/base/thirdparty/socialMedia/SocialMediaEntity.java b/src/main/java/app/milo/server/base/thirdparty/socialMedia/SocialMediaEntity.java index 17339433..355bbd7e 100644 --- a/src/main/java/app/milo/server/base/thirdparty/socialMedia/SocialMediaEntity.java +++ b/src/main/java/app/milo/server/base/thirdparty/socialMedia/SocialMediaEntity.java @@ -1,8 +1,8 @@ package app.milo.server.base.thirdparty.socialMedia; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/app/milo/server/base/userContext/base/UserContextEntity.java b/src/main/java/app/milo/server/base/userContext/base/UserContextEntity.java index 2ce7efff..c2f15993 100644 --- a/src/main/java/app/milo/server/base/userContext/base/UserContextEntity.java +++ b/src/main/java/app/milo/server/base/userContext/base/UserContextEntity.java @@ -3,17 +3,17 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.Type; import app.milo.server.base.address.base.AddressEntity; @@ -125,49 +125,49 @@ public class UserContextEntity extends BaseEntity { @JoinTable(name = "user_context_contacts", joinColumns = @JoinColumn(name = "user_context_id"), inverseJoinColumns = @JoinColumn(name = "contact_id"), uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "contact_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List contacts = new ArrayList<>(); @ManyToMany(fetch = FetchType.LAZY) @JoinTable(name = "favorite_articles", joinColumns = @JoinColumn(name = "user_context_id"), inverseJoinColumns = @JoinColumn(name = "article_id"), uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "article_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List favoriteArticles = new ArrayList<>(); @ManyToMany(fetch = FetchType.LAZY) @JoinTable(name = "favorite_authors", joinColumns = @JoinColumn(name = "user_context_id"), inverseJoinColumns = @JoinColumn(name = "author_id"), uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "author_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List favoriteAuthors = new ArrayList<>(); @ManyToMany(fetch = FetchType.LAZY) @JoinTable(name = "favorite_authors", joinColumns = @JoinColumn(name = "author_id"), inverseJoinColumns = @JoinColumn(name = "user_context_id"), uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "author_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List favoritingUsers = new ArrayList<>(); @ManyToMany(fetch = FetchType.LAZY) @JoinTable(name = "favorite_events", joinColumns = @JoinColumn(name = "user_context_id"), inverseJoinColumns = @JoinColumn(name = "event_id"), uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "event_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List favoriteEvents = new ArrayList<>(); @ManyToMany(fetch = FetchType.LAZY) @JoinTable(name = "favorite_deals", joinColumns = @JoinColumn(name = "user_context_id"), inverseJoinColumns = @JoinColumn(name = "deal_id"), uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "deal_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List favoriteDeals = new ArrayList<>(); @ManyToMany(fetch = FetchType.LAZY) @JoinTable(name = "favorite_organisations", joinColumns = @JoinColumn(name = "user_context_id"), inverseJoinColumns = @JoinColumn(name = "organisation_id"), uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "organisation_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List favoriteOrganisations = new ArrayList<>(); } diff --git a/src/main/java/app/milo/server/base/userContext/base/media/UserContextMediaEntity.java b/src/main/java/app/milo/server/base/userContext/base/media/UserContextMediaEntity.java index 614a9599..f3e1f063 100644 --- a/src/main/java/app/milo/server/base/userContext/base/media/UserContextMediaEntity.java +++ b/src/main/java/app/milo/server/base/userContext/base/media/UserContextMediaEntity.java @@ -1,10 +1,10 @@ package app.milo.server.base.userContext.base.media; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import app.milo.server.base.userContext.base.UserContextEntity; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.media.base.MediaEntity; diff --git a/src/main/java/app/milo/server/base/userContext/base/translations/UserContextTranslatableEntity.java b/src/main/java/app/milo/server/base/userContext/base/translations/UserContextTranslatableEntity.java index dfe7e0f1..aee6608d 100644 --- a/src/main/java/app/milo/server/base/userContext/base/translations/UserContextTranslatableEntity.java +++ b/src/main/java/app/milo/server/base/userContext/base/translations/UserContextTranslatableEntity.java @@ -1,7 +1,7 @@ package app.milo.server.base.userContext.base.translations; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.base.userContext.base.UserContextEntity; import app.milo.server.core.i18n.entities.TranslatableEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/base/userContext/friend/FriendEntity.java b/src/main/java/app/milo/server/base/userContext/friend/FriendEntity.java index 926fd17a..4179c532 100644 --- a/src/main/java/app/milo/server/base/userContext/friend/FriendEntity.java +++ b/src/main/java/app/milo/server/base/userContext/friend/FriendEntity.java @@ -1,11 +1,11 @@ package app.milo.server.base.userContext.friend; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import app.milo.server.base.userContext.base.UserContextEntity; import app.milo.server.core.base.BaseEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/core/base/BaseEntity.java b/src/main/java/app/milo/server/core/base/BaseEntity.java index 53a31f98..4dd9c9e0 100644 --- a/src/main/java/app/milo/server/core/base/BaseEntity.java +++ b/src/main/java/app/milo/server/core/base/BaseEntity.java @@ -5,10 +5,10 @@ import java.time.OffsetDateTime; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.EntityListeners; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; diff --git a/src/main/java/app/milo/server/core/base/DataService.java b/src/main/java/app/milo/server/core/base/DataService.java index 3d3e7e3f..6fb3a110 100644 --- a/src/main/java/app/milo/server/core/base/DataService.java +++ b/src/main/java/app/milo/server/core/base/DataService.java @@ -12,10 +12,10 @@ import java.util.UUID; import java.util.stream.Collectors; -import javax.persistence.EntityGraph; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.hibernate.Hibernate; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/app/milo/server/core/base/GraphBuilder.java b/src/main/java/app/milo/server/core/base/GraphBuilder.java index 09636348..3d34800b 100644 --- a/src/main/java/app/milo/server/core/base/GraphBuilder.java +++ b/src/main/java/app/milo/server/core/base/GraphBuilder.java @@ -5,12 +5,12 @@ import java.util.List; import java.util.Optional; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.PersistenceContext; -import javax.persistence.Transient; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Transient; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.graph.EntityGraphs; diff --git a/src/main/java/app/milo/server/core/config/MultiReadHttpServletRequest.java b/src/main/java/app/milo/server/core/config/MultiReadHttpServletRequest.java index a4d0a307..a05be643 100644 --- a/src/main/java/app/milo/server/core/config/MultiReadHttpServletRequest.java +++ b/src/main/java/app/milo/server/core/config/MultiReadHttpServletRequest.java @@ -6,10 +6,10 @@ import java.io.IOException; import java.io.InputStreamReader; -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import org.apache.tomcat.util.http.fileupload.IOUtils; diff --git a/src/main/java/app/milo/server/core/config/RequestFilter.java b/src/main/java/app/milo/server/core/config/RequestFilter.java index 50f6623a..161fdf67 100644 --- a/src/main/java/app/milo/server/core/config/RequestFilter.java +++ b/src/main/java/app/milo/server/core/config/RequestFilter.java @@ -2,12 +2,12 @@ import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; diff --git a/src/main/java/app/milo/server/core/context/GraphQlContextAdapter.java b/src/main/java/app/milo/server/core/context/GraphQlContextAdapter.java index 27cc2588..437e82a3 100644 --- a/src/main/java/app/milo/server/core/context/GraphQlContextAdapter.java +++ b/src/main/java/app/milo/server/core/context/GraphQlContextAdapter.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/app/milo/server/core/error/errorMessage/ErrorMessageEntity.java b/src/main/java/app/milo/server/core/error/errorMessage/ErrorMessageEntity.java index d01ca6a0..8973ab2b 100644 --- a/src/main/java/app/milo/server/core/error/errorMessage/ErrorMessageEntity.java +++ b/src/main/java/app/milo/server/core/error/errorMessage/ErrorMessageEntity.java @@ -1,9 +1,9 @@ package app.milo.server.core.error.errorMessage; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.i18n.components.language.LanguageEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/core/i18n/TranslationPreprocessor.java b/src/main/java/app/milo/server/core/i18n/TranslationPreprocessor.java index 081a5f59..edcf26e2 100644 --- a/src/main/java/app/milo/server/core/i18n/TranslationPreprocessor.java +++ b/src/main/java/app/milo/server/core/i18n/TranslationPreprocessor.java @@ -2,8 +2,8 @@ import java.io.IOException; -import javax.persistence.Entity; -import javax.persistence.Transient; +import jakarta.persistence.Entity; +import jakarta.persistence.Transient; import org.reflections.Reflections; import org.reflections.util.ClasspathHelper; diff --git a/src/main/java/app/milo/server/core/i18n/components/label/LabelEntity.java b/src/main/java/app/milo/server/core/i18n/components/label/LabelEntity.java index eb56c634..1d0dce6d 100644 --- a/src/main/java/app/milo/server/core/i18n/components/label/LabelEntity.java +++ b/src/main/java/app/milo/server/core/i18n/components/label/LabelEntity.java @@ -1,11 +1,11 @@ package app.milo.server.core.i18n.components.label; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.i18n.annotations.Translatable; import app.milo.server.core.i18n.components.label.translations.LabelTranslatablesEntity; diff --git a/src/main/java/app/milo/server/core/i18n/components/label/translations/LabelTranslatablesEntity.java b/src/main/java/app/milo/server/core/i18n/components/label/translations/LabelTranslatablesEntity.java index 3269babb..830e906e 100644 --- a/src/main/java/app/milo/server/core/i18n/components/label/translations/LabelTranslatablesEntity.java +++ b/src/main/java/app/milo/server/core/i18n/components/label/translations/LabelTranslatablesEntity.java @@ -1,8 +1,8 @@ package app.milo.server.core.i18n.components.label.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.components.label.LabelEntity; import app.milo.server.core.i18n.entities.TranslatableEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/core/i18n/components/language/LanguageEntity.java b/src/main/java/app/milo/server/core/i18n/components/language/LanguageEntity.java index 6e18dede..b51e3f7a 100644 --- a/src/main/java/app/milo/server/core/i18n/components/language/LanguageEntity.java +++ b/src/main/java/app/milo/server/core/i18n/components/language/LanguageEntity.java @@ -1,8 +1,8 @@ package app.milo.server.core.i18n.components.language; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/app/milo/server/core/i18n/entities/TranslatableEntity.java b/src/main/java/app/milo/server/core/i18n/entities/TranslatableEntity.java index 87ab0f4a..210833c2 100644 --- a/src/main/java/app/milo/server/core/i18n/entities/TranslatableEntity.java +++ b/src/main/java/app/milo/server/core/i18n/entities/TranslatableEntity.java @@ -1,9 +1,9 @@ package app.milo.server.core.i18n.entities; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; import com.fasterxml.jackson.annotation.JsonIgnore; import app.milo.server.core.base.BaseEntity; diff --git a/src/main/java/app/milo/server/core/i18n/translation/LocaleService.java b/src/main/java/app/milo/server/core/i18n/translation/LocaleService.java index 33eecf30..550c7bff 100644 --- a/src/main/java/app/milo/server/core/i18n/translation/LocaleService.java +++ b/src/main/java/app/milo/server/core/i18n/translation/LocaleService.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; diff --git a/src/main/java/app/milo/server/core/i18n/translation/TranslationService.java b/src/main/java/app/milo/server/core/i18n/translation/TranslationService.java index e3cc5bac..ba094d2f 100644 --- a/src/main/java/app/milo/server/core/i18n/translation/TranslationService.java +++ b/src/main/java/app/milo/server/core/i18n/translation/TranslationService.java @@ -6,7 +6,7 @@ import java.util.Optional; import java.util.UUID; import java.util.concurrent.CompletableFuture; -import javax.transaction.Transactional; +import jakarta.transaction.Transactional; import org.hibernate.Hibernate; import org.jsoup.Jsoup; import org.jsoup.nodes.Element; diff --git a/src/main/java/app/milo/server/core/location/LocationController.java b/src/main/java/app/milo/server/core/location/LocationController.java index 154188ae..f6854bc7 100644 --- a/src/main/java/app/milo/server/core/location/LocationController.java +++ b/src/main/java/app/milo/server/core/location/LocationController.java @@ -1,9 +1,7 @@ package app.milo.server.core.location; import static org.springframework.http.ResponseEntity.ok; - import javax.naming.ServiceUnavailableException; - import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/app/milo/server/core/media/attribution/MediaAttributionEntity.java b/src/main/java/app/milo/server/core/media/attribution/MediaAttributionEntity.java index bceceda9..d04bd950 100644 --- a/src/main/java/app/milo/server/core/media/attribution/MediaAttributionEntity.java +++ b/src/main/java/app/milo/server/core/media/attribution/MediaAttributionEntity.java @@ -1,9 +1,9 @@ package app.milo.server.core.media.attribution; import java.io.Serial; -import javax.persistence.Entity; -import javax.persistence.Table; import app.milo.server.core.base.BaseEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/app/milo/server/core/media/base/MediaEntity.java b/src/main/java/app/milo/server/core/media/base/MediaEntity.java index d7fba6f8..c65f32b7 100644 --- a/src/main/java/app/milo/server/core/media/base/MediaEntity.java +++ b/src/main/java/app/milo/server/core/media/base/MediaEntity.java @@ -1,12 +1,12 @@ package app.milo.server.core.media.base; import java.io.Serial; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.context.ApplicationContextAdapter; import app.milo.server.core.media.attribution.MediaAttributionEntity; diff --git a/src/main/java/app/milo/server/core/media/image/ImageListener.java b/src/main/java/app/milo/server/core/media/image/ImageListener.java index 228bd247..e1039a1e 100644 --- a/src/main/java/app/milo/server/core/media/image/ImageListener.java +++ b/src/main/java/app/milo/server/core/media/image/ImageListener.java @@ -1,13 +1,11 @@ package app.milo.server.core.media.image; -import javax.annotation.ManagedBean; -import javax.servlet.ServletContext; - +import javax.inject.Named; import org.springframework.boot.web.servlet.ServletContextInitializer; - import com.twelvemonkeys.servlet.image.IIOProviderContextListener; +import jakarta.servlet.ServletContext; -@ManagedBean +@Named public class ImageListener implements ServletContextInitializer { @Override diff --git a/src/main/java/app/milo/server/core/media/image/ImageService.java b/src/main/java/app/milo/server/core/media/image/ImageService.java index 2017c063..c1ffed13 100644 --- a/src/main/java/app/milo/server/core/media/image/ImageService.java +++ b/src/main/java/app/milo/server/core/media/image/ImageService.java @@ -5,9 +5,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.net.URL; - import javax.imageio.ImageIO; - import org.imgscalr.Scalr; import org.imgscalr.Scalr.Method; import org.springframework.stereotype.Service; diff --git a/src/main/java/app/milo/server/core/messaging/MailService.java b/src/main/java/app/milo/server/core/messaging/MailService.java index 077bf317..b8562294 100644 --- a/src/main/java/app/milo/server/core/messaging/MailService.java +++ b/src/main/java/app/milo/server/core/messaging/MailService.java @@ -3,8 +3,8 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.CompletableFuture; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.scheduling.annotation.Async; diff --git a/src/main/java/app/milo/server/core/messaging/channels/ChannelEntity.java b/src/main/java/app/milo/server/core/messaging/channels/ChannelEntity.java index ce09e146..8bd0ce9f 100644 --- a/src/main/java/app/milo/server/core/messaging/channels/ChannelEntity.java +++ b/src/main/java/app/milo/server/core/messaging/channels/ChannelEntity.java @@ -1,8 +1,8 @@ package app.milo.server.core.messaging.channels; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/app/milo/server/core/messaging/definitions/MessageDefinitionEntity.java b/src/main/java/app/milo/server/core/messaging/definitions/MessageDefinitionEntity.java index d2349a04..767dfbae 100644 --- a/src/main/java/app/milo/server/core/messaging/definitions/MessageDefinitionEntity.java +++ b/src/main/java/app/milo/server/core/messaging/definitions/MessageDefinitionEntity.java @@ -2,16 +2,16 @@ import java.util.List; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.Type; import app.milo.server.core.base.BaseEntity; @@ -48,7 +48,7 @@ public class MessageDefinitionEntity extends BaseEntity { inverseJoinColumns = @JoinColumn(name = "channel_id"), uniqueConstraints = { @UniqueConstraint(columnNames = {"message_definition_id", "channel_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List channels; @ManyToMany(fetch = FetchType.LAZY) @@ -57,6 +57,6 @@ public class MessageDefinitionEntity extends BaseEntity { inverseJoinColumns = @JoinColumn(name = "user_id"), uniqueConstraints = { @UniqueConstraint(columnNames = {"message_definition_id", "user_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List users; } diff --git a/src/main/java/app/milo/server/core/messaging/definitions/translations/MessageDefinitionTranslatableEntity.java b/src/main/java/app/milo/server/core/messaging/definitions/translations/MessageDefinitionTranslatableEntity.java index e2abe810..74dc3724 100644 --- a/src/main/java/app/milo/server/core/messaging/definitions/translations/MessageDefinitionTranslatableEntity.java +++ b/src/main/java/app/milo/server/core/messaging/definitions/translations/MessageDefinitionTranslatableEntity.java @@ -1,10 +1,10 @@ package app.milo.server.core.messaging.definitions.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import app.milo.server.core.i18n.components.language.LanguageEntity; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.core.messaging.definitions.MessageDefinitionEntity; diff --git a/src/main/java/app/milo/server/core/messaging/notifications/base/NotificationEntity.java b/src/main/java/app/milo/server/core/messaging/notifications/base/NotificationEntity.java index ea267d37..394fb0f2 100644 --- a/src/main/java/app/milo/server/core/messaging/notifications/base/NotificationEntity.java +++ b/src/main/java/app/milo/server/core/messaging/notifications/base/NotificationEntity.java @@ -1,13 +1,13 @@ package app.milo.server.core.messaging.notifications.base; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.messaging.notifications.translations.NotificationTranslatableEntity; import app.milo.server.core.security.components.user.UserEntity; diff --git a/src/main/java/app/milo/server/core/messaging/notifications/translations/NotificationTranslatableEntity.java b/src/main/java/app/milo/server/core/messaging/notifications/translations/NotificationTranslatableEntity.java index 95c6b9bb..e6bd7d34 100644 --- a/src/main/java/app/milo/server/core/messaging/notifications/translations/NotificationTranslatableEntity.java +++ b/src/main/java/app/milo/server/core/messaging/notifications/translations/NotificationTranslatableEntity.java @@ -1,10 +1,10 @@ package app.milo.server.core.messaging.notifications.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import app.milo.server.core.i18n.components.language.LanguageEntity; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.core.messaging.notifications.base.NotificationEntity; diff --git a/src/main/java/app/milo/server/core/messaging/templates/MessageTemplateEntity.java b/src/main/java/app/milo/server/core/messaging/templates/MessageTemplateEntity.java index 04052591..7d869950 100644 --- a/src/main/java/app/milo/server/core/messaging/templates/MessageTemplateEntity.java +++ b/src/main/java/app/milo/server/core/messaging/templates/MessageTemplateEntity.java @@ -1,11 +1,11 @@ package app.milo.server.core.messaging.templates; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.messaging.definitions.MessageDefinitionEntity; import app.milo.server.core.messaging.templates.translations.MessageTemplateTranslatableEntity; diff --git a/src/main/java/app/milo/server/core/messaging/templates/translations/MessageTemplateTranslatableEntity.java b/src/main/java/app/milo/server/core/messaging/templates/translations/MessageTemplateTranslatableEntity.java index 9940b069..6a56729f 100644 --- a/src/main/java/app/milo/server/core/messaging/templates/translations/MessageTemplateTranslatableEntity.java +++ b/src/main/java/app/milo/server/core/messaging/templates/translations/MessageTemplateTranslatableEntity.java @@ -1,10 +1,10 @@ package app.milo.server.core.messaging.templates.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import app.milo.server.core.i18n.components.language.LanguageEntity; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.core.messaging.templates.MessageTemplateEntity; diff --git a/src/main/java/app/milo/server/core/push/subscription/SubscriptionEntity.java b/src/main/java/app/milo/server/core/push/subscription/SubscriptionEntity.java index eeb495c6..1ce4e577 100644 --- a/src/main/java/app/milo/server/core/push/subscription/SubscriptionEntity.java +++ b/src/main/java/app/milo/server/core/push/subscription/SubscriptionEntity.java @@ -1,12 +1,12 @@ package app.milo.server.core.push.subscription; import java.io.Serial; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.security.components.user.UserEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/core/repository/BaseRepositoryQuery.java b/src/main/java/app/milo/server/core/repository/BaseRepositoryQuery.java index be38dc92..9c859bc1 100644 --- a/src/main/java/app/milo/server/core/repository/BaseRepositoryQuery.java +++ b/src/main/java/app/milo/server/core/repository/BaseRepositoryQuery.java @@ -1,6 +1,6 @@ package app.milo.server.core.repository; -import javax.persistence.EntityGraph; +import jakarta.persistence.EntityGraph; import com.querydsl.core.BooleanBuilder; import com.querydsl.core.types.Predicate; diff --git a/src/main/java/app/milo/server/core/repository/CollectionRepositoryQuery.java b/src/main/java/app/milo/server/core/repository/CollectionRepositoryQuery.java index b4b5fb21..fe7220f8 100644 --- a/src/main/java/app/milo/server/core/repository/CollectionRepositoryQuery.java +++ b/src/main/java/app/milo/server/core/repository/CollectionRepositoryQuery.java @@ -1,6 +1,6 @@ package app.milo.server.core.repository; -import javax.persistence.EntityGraph; +import jakarta.persistence.EntityGraph; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; diff --git a/src/main/java/app/milo/server/core/repository/CustomRepositoryFactory.java b/src/main/java/app/milo/server/core/repository/CustomRepositoryFactory.java index fd930890..fcb93e36 100644 --- a/src/main/java/app/milo/server/core/repository/CustomRepositoryFactory.java +++ b/src/main/java/app/milo/server/core/repository/CustomRepositoryFactory.java @@ -1,6 +1,6 @@ package app.milo.server.core.repository; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.springframework.data.jpa.repository.support.JpaRepositoryFactory; import org.springframework.data.repository.core.RepositoryMetadata; diff --git a/src/main/java/app/milo/server/core/repository/CustomRepositoryFactoryBean.java b/src/main/java/app/milo/server/core/repository/CustomRepositoryFactoryBean.java index 45bf37ab..003311c4 100644 --- a/src/main/java/app/milo/server/core/repository/CustomRepositoryFactoryBean.java +++ b/src/main/java/app/milo/server/core/repository/CustomRepositoryFactoryBean.java @@ -1,6 +1,6 @@ package app.milo.server.core.repository; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean; import org.springframework.data.repository.Repository; diff --git a/src/main/java/app/milo/server/core/repository/QueryableReadRepositoryImpl.java b/src/main/java/app/milo/server/core/repository/QueryableReadRepositoryImpl.java index 569f1306..89a40f00 100644 --- a/src/main/java/app/milo/server/core/repository/QueryableReadRepositoryImpl.java +++ b/src/main/java/app/milo/server/core/repository/QueryableReadRepositoryImpl.java @@ -3,8 +3,8 @@ import java.util.List; import java.util.Optional; -import javax.persistence.EntityGraph; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityGraph; +import jakarta.persistence.EntityManager; import org.hibernate.annotations.QueryHints; import org.hibernate.graph.GraphSemantic; @@ -89,9 +89,6 @@ public Page findAll(Predicate predicate, Pageable pageable, EntityGraph gr .distinct() .select(path)); - ((AbstractJPAQuery) query).setHint(QueryHints.PASS_DISTINCT_THROUGH, false); - ((AbstractJPAQuery) countQuery).setHint(QueryHints.PASS_DISTINCT_THROUGH, false); - if (graph != null) { ((AbstractJPAQuery) query).setHint(GraphSemantic.FETCH.getJpaHintName(), graph); } @@ -107,7 +104,6 @@ private List fetchIds( Pageable pageable, StringPath id) { var idQuery = createQuery(predicate).select(id).distinct(); - ((AbstractJPAQuery) idQuery).setHint(QueryHints.PASS_DISTINCT_THROUGH, false); return querydsl.applyPagination(pageable, idQuery).fetch(); } @@ -131,15 +127,13 @@ public List findAll(Predicate predicate, Sort sort, Integer limit, EntityGrap .select(idPath.get()) .distinct() .limit(limit); - - ((AbstractJPAQuery) idQuery).setHint(QueryHints.PASS_DISTINCT_THROUGH, false); + query = (JPQLQuery) createQuery(idPath.get().in(idQuery)); } else { query.limit(limit); } } - ((AbstractJPAQuery) query).setHint(QueryHints.PASS_DISTINCT_THROUGH, false); if (graph != null) { ((AbstractJPAQuery) query).setHint(GraphSemantic.FETCH.getJpaHintName(), graph); } diff --git a/src/main/java/app/milo/server/core/security/ApplicationSecurity.java b/src/main/java/app/milo/server/core/security/ApplicationSecurity.java index 30d8c2ac..ce895167 100644 --- a/src/main/java/app/milo/server/core/security/ApplicationSecurity.java +++ b/src/main/java/app/milo/server/core/security/ApplicationSecurity.java @@ -4,16 +4,18 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.authentication.ProviderManager; +import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.authentication.dao.DaoAuthenticationProvider; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.config.core.GrantedAuthorityDefaults; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; @@ -21,47 +23,64 @@ import app.milo.server.core.security.services.AuthenticationService; @Configuration -@EnableGlobalMethodSecurity(prePostEnabled = true) -public class ApplicationSecurity extends WebSecurityConfigurerAdapter { +@EnableWebSecurity +@EnableMethodSecurity +public class ApplicationSecurity { private final AuthenticationService authService; - - private final BCryptPasswordEncoder bcryptPasswordEncoder; + private final BCryptPasswordEncoder encoder; + private final UserDetailsService userDetailsService; public ApplicationSecurity( AuthenticationService authService, BCryptPasswordEncoder encoder, UserDetailsService userDetailsService) { + this.authService = authService; - this.bcryptPasswordEncoder = encoder; this.userDetailsService = userDetailsService; + this.encoder = encoder; } - - @Override - protected void configure(AuthenticationManagerBuilder auth) throws Exception { - auth.userDetailsService(this.userDetailsService).passwordEncoder(bcryptPasswordEncoder); + + @Bean + public AuthenticationProvider authenticationProvider() { + DaoAuthenticationProvider authProvider = new DaoAuthenticationProvider(); + authProvider.setUserDetailsService(userDetailsService); + authProvider.setPasswordEncoder(encoder); + return authProvider; + } + + @Bean + public GrantedAuthorityDefaults grantedAuthorityDefaults() { + return new GrantedAuthorityDefaults(""); } - @Override - protected void configure(HttpSecurity http) throws Exception { + @Bean + protected SecurityFilterChain filterChain(HttpSecurity http) throws Exception { http - .cors().and() - .csrf().disable() - .headers().frameOptions().sameOrigin() - .and() + .csrf(AbstractHttpConfigurer::disable) + .cors(corsCustomizer -> corsCustomizer.configurationSource(corsConfigurationSource())) .addFilter(jwtAuthorizationFilter()) - .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS); + .headers(headers -> headers.frameOptions(frameOptionsConfig -> frameOptionsConfig.sameOrigin())) + .sessionManagement(sessionManagementCustomizer -> sessionManagementCustomizer + .sessionCreationPolicy(SessionCreationPolicy.STATELESS)); + return http.build(); } @Bean - public GrantedAuthorityDefaults grantedAuthorityDefaults() { - return new GrantedAuthorityDefaults(""); + public AuthenticationManager authenticationManager(AuthenticationConfiguration config) + throws Exception { + return config.getAuthenticationManager(); + } + + @Bean + public JwtAuthorizationFilter jwtAuthorizationFilter() throws Exception { + return new JwtAuthorizationFilter(authService); } + - @Bean - @Profile(value = { "development", "local", "test" }) + @Profile(value = { "development", "local", "test" }) public CorsConfigurationSource corsConfigurationSource() { CorsConfiguration config = new CorsConfiguration(); @@ -74,16 +93,4 @@ public CorsConfigurationSource corsConfigurationSource() { source.registerCorsConfiguration("/**", config); return source; } - - public JwtAuthorizationFilter jwtAuthorizationFilter() throws Exception { - return new JwtAuthorizationFilter(authService); - } - - @Bean - public AuthenticationManager getAuthManager() { - var provider = new DaoAuthenticationProvider(); - provider.setUserDetailsService(userDetailsService); - provider.setPasswordEncoder(bcryptPasswordEncoder); - return new ProviderManager(provider); - } } diff --git a/src/main/java/app/milo/server/core/security/components/role/application/PrivilegeApplicationEntity.java b/src/main/java/app/milo/server/core/security/components/role/application/PrivilegeApplicationEntity.java index 23338e70..eb61a2df 100644 --- a/src/main/java/app/milo/server/core/security/components/role/application/PrivilegeApplicationEntity.java +++ b/src/main/java/app/milo/server/core/security/components/role/application/PrivilegeApplicationEntity.java @@ -1,13 +1,13 @@ package app.milo.server.core.security.components.role.application; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.i18n.annotations.Translatable; import app.milo.server.core.security.components.role.application.translation.PrivilegeApplicationTranslatableEntity; diff --git a/src/main/java/app/milo/server/core/security/components/role/application/translation/PrivilegeApplicationTranslatableEntity.java b/src/main/java/app/milo/server/core/security/components/role/application/translation/PrivilegeApplicationTranslatableEntity.java index 359004b5..0bd92e29 100644 --- a/src/main/java/app/milo/server/core/security/components/role/application/translation/PrivilegeApplicationTranslatableEntity.java +++ b/src/main/java/app/milo/server/core/security/components/role/application/translation/PrivilegeApplicationTranslatableEntity.java @@ -1,9 +1,9 @@ package app.milo.server.core.security.components.role.application.translation; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import app.milo.server.core.i18n.components.language.LanguageEntity; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.core.security.components.role.application.PrivilegeApplicationEntity; diff --git a/src/main/java/app/milo/server/core/security/components/role/base/RoleEntity.java b/src/main/java/app/milo/server/core/security/components/role/base/RoleEntity.java index 42d741b0..5254309e 100644 --- a/src/main/java/app/milo/server/core/security/components/role/base/RoleEntity.java +++ b/src/main/java/app/milo/server/core/security/components/role/base/RoleEntity.java @@ -3,15 +3,15 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.Type; import app.milo.server.core.base.BaseEntity; @@ -45,13 +45,13 @@ public class RoleEntity extends BaseEntity { @JoinTable(name = "user_roles", joinColumns = @JoinColumn(name = "role_id"), inverseJoinColumns = @JoinColumn(name = "user_id"), uniqueConstraints = {@UniqueConstraint(columnNames = {"user_id", "role_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List users = new ArrayList<>(); @ManyToMany(fetch = FetchType.LAZY) @JoinTable(name = "role_role_privileges", joinColumns = @JoinColumn(name = "role_id"), inverseJoinColumns = @JoinColumn(name = "role_privilege_id"), uniqueConstraints = {@UniqueConstraint(columnNames = {"role_id", "role_privilege_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List privileges = new ArrayList<>(); } diff --git a/src/main/java/app/milo/server/core/security/components/role/base/translation/RoleTranslatableEntity.java b/src/main/java/app/milo/server/core/security/components/role/base/translation/RoleTranslatableEntity.java index 4404e56d..cf8fdf3e 100644 --- a/src/main/java/app/milo/server/core/security/components/role/base/translation/RoleTranslatableEntity.java +++ b/src/main/java/app/milo/server/core/security/components/role/base/translation/RoleTranslatableEntity.java @@ -1,11 +1,11 @@ package app.milo.server.core.security.components.role.base.translation; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import app.milo.server.core.i18n.components.language.LanguageEntity; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.core.security.components.role.base.RoleEntity; diff --git a/src/main/java/app/milo/server/core/security/components/role/privilege/RolePrivilegeEntity.java b/src/main/java/app/milo/server/core/security/components/role/privilege/RolePrivilegeEntity.java index 47c4bf39..dd5fa9b6 100644 --- a/src/main/java/app/milo/server/core/security/components/role/privilege/RolePrivilegeEntity.java +++ b/src/main/java/app/milo/server/core/security/components/role/privilege/RolePrivilegeEntity.java @@ -3,15 +3,15 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.Type; import app.milo.server.core.base.BaseEntity; @@ -54,7 +54,7 @@ public class RolePrivilegeEntity extends BaseEntity { @JoinTable(name = "role_role_privileges", joinColumns = @JoinColumn(name = "role_privilege_id"), inverseJoinColumns = @JoinColumn(name = "role_id"), uniqueConstraints = {@UniqueConstraint(columnNames = {"role_id", "role_privilege_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List roles = new ArrayList<>(); } diff --git a/src/main/java/app/milo/server/core/security/components/role/privilege/translation/RolePrivilegeTranslatableEntity.java b/src/main/java/app/milo/server/core/security/components/role/privilege/translation/RolePrivilegeTranslatableEntity.java index 879d642f..ab3904c0 100644 --- a/src/main/java/app/milo/server/core/security/components/role/privilege/translation/RolePrivilegeTranslatableEntity.java +++ b/src/main/java/app/milo/server/core/security/components/role/privilege/translation/RolePrivilegeTranslatableEntity.java @@ -1,11 +1,11 @@ package app.milo.server.core.security.components.role.privilege.translation; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import app.milo.server.core.i18n.components.language.LanguageEntity; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.core.security.components.role.privilege.RolePrivilegeEntity; diff --git a/src/main/java/app/milo/server/core/security/components/user/UserEntity.java b/src/main/java/app/milo/server/core/security/components/user/UserEntity.java index 1f282256..c7a94775 100644 --- a/src/main/java/app/milo/server/core/security/components/user/UserEntity.java +++ b/src/main/java/app/milo/server/core/security/components/user/UserEntity.java @@ -4,17 +4,17 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; @@ -75,7 +75,7 @@ public class UserEntity extends BaseEntity { @JoinTable(name = "user_roles", joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "role_id"), uniqueConstraints = {@UniqueConstraint(columnNames = {"user_id", "role_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List roles = new ArrayList<>(); @OneToMany(fetch = FetchType.LAZY, mappedBy = "user") diff --git a/src/main/java/app/milo/server/core/security/components/user/emailVerification/VerificationEntity.java b/src/main/java/app/milo/server/core/security/components/user/emailVerification/VerificationEntity.java index 1b148364..62a985b3 100644 --- a/src/main/java/app/milo/server/core/security/components/user/emailVerification/VerificationEntity.java +++ b/src/main/java/app/milo/server/core/security/components/user/emailVerification/VerificationEntity.java @@ -1,11 +1,11 @@ package app.milo.server.core.security.components.user.emailVerification; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.security.components.user.UserEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/core/security/components/user/passwordReset/PasswordResetEntity.java b/src/main/java/app/milo/server/core/security/components/user/passwordReset/PasswordResetEntity.java index fd593637..8f48d5f5 100644 --- a/src/main/java/app/milo/server/core/security/components/user/passwordReset/PasswordResetEntity.java +++ b/src/main/java/app/milo/server/core/security/components/user/passwordReset/PasswordResetEntity.java @@ -1,11 +1,11 @@ package app.milo.server.core.security.components.user.passwordReset; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.security.components.user.UserEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/core/security/components/userDeletion/base/UserDeletionEntity.java b/src/main/java/app/milo/server/core/security/components/userDeletion/base/UserDeletionEntity.java index 41f9da94..9fc2e63c 100644 --- a/src/main/java/app/milo/server/core/security/components/userDeletion/base/UserDeletionEntity.java +++ b/src/main/java/app/milo/server/core/security/components/userDeletion/base/UserDeletionEntity.java @@ -3,15 +3,15 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; @@ -46,7 +46,7 @@ public class UserDeletionEntity extends BaseEntity { @JoinTable(name = "user_deletion_user_deletion_types", joinColumns = @JoinColumn(name = "user_deletion_id"), inverseJoinColumns = @JoinColumn(name = "user_deletion_type_id"), uniqueConstraints = {@UniqueConstraint(columnNames = {"user_deletion_id", "user_deletion_type_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List types = new ArrayList<>(); } diff --git a/src/main/java/app/milo/server/core/security/components/userDeletion/base/translations/UserDeletionTranslatableEntity.java b/src/main/java/app/milo/server/core/security/components/userDeletion/base/translations/UserDeletionTranslatableEntity.java index 1cb85d56..cdfa2d3d 100644 --- a/src/main/java/app/milo/server/core/security/components/userDeletion/base/translations/UserDeletionTranslatableEntity.java +++ b/src/main/java/app/milo/server/core/security/components/userDeletion/base/translations/UserDeletionTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.core.security.components.userDeletion.base.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.core.security.components.userDeletion.base.UserDeletionEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/core/security/components/userDeletion/type/UserDeletionTypeEntity.java b/src/main/java/app/milo/server/core/security/components/userDeletion/type/UserDeletionTypeEntity.java index d652b5bf..c127a032 100644 --- a/src/main/java/app/milo/server/core/security/components/userDeletion/type/UserDeletionTypeEntity.java +++ b/src/main/java/app/milo/server/core/security/components/userDeletion/type/UserDeletionTypeEntity.java @@ -1,10 +1,10 @@ package app.milo.server.core.security.components.userDeletion.type; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.i18n.annotations.Translatable; diff --git a/src/main/java/app/milo/server/core/security/components/userDeletion/type/translations/UserDeletionTypeTranslatableEntity.java b/src/main/java/app/milo/server/core/security/components/userDeletion/type/translations/UserDeletionTypeTranslatableEntity.java index 72016e23..22fe8b64 100644 --- a/src/main/java/app/milo/server/core/security/components/userDeletion/type/translations/UserDeletionTypeTranslatableEntity.java +++ b/src/main/java/app/milo/server/core/security/components/userDeletion/type/translations/UserDeletionTypeTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.core.security.components.userDeletion.type.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.core.security.components.userDeletion.type.UserDeletionTypeEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/core/security/filter/JwtAuthorizationFilter.java b/src/main/java/app/milo/server/core/security/filter/JwtAuthorizationFilter.java index fe87d717..98def3cc 100644 --- a/src/main/java/app/milo/server/core/security/filter/JwtAuthorizationFilter.java +++ b/src/main/java/app/milo/server/core/security/filter/JwtAuthorizationFilter.java @@ -2,10 +2,10 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.authentication.www.BasicAuthenticationFilter; diff --git a/src/main/java/app/milo/server/core/security/services/AuthenticationService.java b/src/main/java/app/milo/server/core/security/services/AuthenticationService.java index 7ab600c1..7bf35ded 100644 --- a/src/main/java/app/milo/server/core/security/services/AuthenticationService.java +++ b/src/main/java/app/milo/server/core/security/services/AuthenticationService.java @@ -3,7 +3,7 @@ import java.util.Collections; import java.util.Optional; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.context.annotation.Lazy; import org.springframework.security.authentication.AuthenticationManager; diff --git a/src/main/java/app/milo/server/core/utils/PersistenceUtils.java b/src/main/java/app/milo/server/core/utils/PersistenceUtils.java index 32fa0335..0fe0ce04 100644 --- a/src/main/java/app/milo/server/core/utils/PersistenceUtils.java +++ b/src/main/java/app/milo/server/core/utils/PersistenceUtils.java @@ -8,13 +8,13 @@ import java.util.List; import java.util.Optional; -import javax.persistence.Column; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.persistence.UniqueConstraint; import org.hibernate.Hibernate; import app.milo.server.core.base.BaseEntity; diff --git a/src/main/java/app/milo/server/core/visit/VisitInterceptor.java b/src/main/java/app/milo/server/core/visit/VisitInterceptor.java index db29e668..e5ecbf6e 100644 --- a/src/main/java/app/milo/server/core/visit/VisitInterceptor.java +++ b/src/main/java/app/milo/server/core/visit/VisitInterceptor.java @@ -2,7 +2,7 @@ import java.util.Optional; import java.util.concurrent.CompletableFuture; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; diff --git a/src/main/java/app/milo/server/core/visit/visitable/VisitableEntity.java b/src/main/java/app/milo/server/core/visit/visitable/VisitableEntity.java index 9c69fdd9..2c6e9e89 100644 --- a/src/main/java/app/milo/server/core/visit/visitable/VisitableEntity.java +++ b/src/main/java/app/milo/server/core/visit/visitable/VisitableEntity.java @@ -1,10 +1,10 @@ package app.milo.server.core.visit.visitable; -import javax.persistence.Column; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.Column; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MappedSuperclass; import com.fasterxml.jackson.annotation.JsonIgnore; import app.milo.server.core.base.BaseEntity; diff --git a/src/main/java/app/milo/server/core/visit/visitable/VisitableService.java b/src/main/java/app/milo/server/core/visit/visitable/VisitableService.java index fba597db..c7bf9881 100644 --- a/src/main/java/app/milo/server/core/visit/visitable/VisitableService.java +++ b/src/main/java/app/milo/server/core/visit/visitable/VisitableService.java @@ -3,10 +3,7 @@ import java.time.OffsetDateTime; import java.util.List; import java.util.UUID; - import javax.naming.ServiceUnavailableException; -import javax.servlet.http.HttpServletRequest; - import org.hibernate.Hibernate; import org.springframework.core.env.Environment; import org.springframework.stereotype.Service; @@ -18,6 +15,7 @@ import app.milo.server.core.visit.VisitHelper; import app.milo.server.core.visit.visitor.VisitorEntity; import app.milo.server.core.visit.visitor.VisitorService; +import jakarta.servlet.http.HttpServletRequest; //TODO: Figure out how to unify DataService approach with the current save and repository approach @Service diff --git a/src/main/java/app/milo/server/core/visit/visitor/VisitorEntity.java b/src/main/java/app/milo/server/core/visit/visitor/VisitorEntity.java index 517923f9..8855b361 100644 --- a/src/main/java/app/milo/server/core/visit/visitor/VisitorEntity.java +++ b/src/main/java/app/milo/server/core/visit/visitor/VisitorEntity.java @@ -1,8 +1,8 @@ package app.milo.server.core.visit.visitor; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/app/milo/server/features/article/components/base/ArticleEntity.java b/src/main/java/app/milo/server/features/article/components/base/ArticleEntity.java index f03cd2c2..2d4c6d01 100644 --- a/src/main/java/app/milo/server/features/article/components/base/ArticleEntity.java +++ b/src/main/java/app/milo/server/features/article/components/base/ArticleEntity.java @@ -3,17 +3,17 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; @@ -101,7 +101,7 @@ public class ArticleEntity extends BaseEntity { @JoinTable(name = "favorite_articles", joinColumns = @JoinColumn(name = "article_id"), inverseJoinColumns = @JoinColumn(name = "user_context_id"), uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "article_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List favoritingUsers = new ArrayList<>(); } diff --git a/src/main/java/app/milo/server/features/article/components/base/translations/ArticleTranslatableEntity.java b/src/main/java/app/milo/server/features/article/components/base/translations/ArticleTranslatableEntity.java index aa848ef4..50af84dc 100644 --- a/src/main/java/app/milo/server/features/article/components/base/translations/ArticleTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/article/components/base/translations/ArticleTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.article.components.base.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.article.components.base.ArticleEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/article/components/base/visitors/ArticleVisitorEntity.java b/src/main/java/app/milo/server/features/article/components/base/visitors/ArticleVisitorEntity.java index 655e4b86..ad8e0732 100644 --- a/src/main/java/app/milo/server/features/article/components/base/visitors/ArticleVisitorEntity.java +++ b/src/main/java/app/milo/server/features/article/components/base/visitors/ArticleVisitorEntity.java @@ -1,7 +1,7 @@ package app.milo.server.features.article.components.base.visitors; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.visit.visitable.VisitableEntity; import app.milo.server.features.article.components.base.ArticleEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/article/components/category/ArticleCategoryEntity.java b/src/main/java/app/milo/server/features/article/components/category/ArticleCategoryEntity.java index b19f88ec..6430b30a 100644 --- a/src/main/java/app/milo/server/features/article/components/category/ArticleCategoryEntity.java +++ b/src/main/java/app/milo/server/features/article/components/category/ArticleCategoryEntity.java @@ -1,11 +1,11 @@ package app.milo.server.features.article.components.category; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.i18n.annotations.Translatable; import app.milo.server.features.article.components.base.ArticleEntity; diff --git a/src/main/java/app/milo/server/features/article/components/category/translations/ArticleCategoryTranslatableEntity.java b/src/main/java/app/milo/server/features/article/components/category/translations/ArticleCategoryTranslatableEntity.java index 8a029a3b..d107ee71 100644 --- a/src/main/java/app/milo/server/features/article/components/category/translations/ArticleCategoryTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/article/components/category/translations/ArticleCategoryTranslatableEntity.java @@ -1,9 +1,9 @@ package app.milo.server.features.article.components.category.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.article.components.category.ArticleCategoryEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/article/components/comment/ArticleCommentEntity.java b/src/main/java/app/milo/server/features/article/components/comment/ArticleCommentEntity.java index 0ddcd741..5c198f70 100644 --- a/src/main/java/app/milo/server/features/article/components/comment/ArticleCommentEntity.java +++ b/src/main/java/app/milo/server/features/article/components/comment/ArticleCommentEntity.java @@ -1,13 +1,13 @@ package app.milo.server.features.article.components.comment; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.GenericGenerator; import app.milo.server.base.userContext.base.UserContextEntity; import app.milo.server.core.base.BaseEntity; diff --git a/src/main/java/app/milo/server/features/article/components/comment/translations/ArticleCommentTranslatableEntity.java b/src/main/java/app/milo/server/features/article/components/comment/translations/ArticleCommentTranslatableEntity.java index e19ce446..b7348fad 100644 --- a/src/main/java/app/milo/server/features/article/components/comment/translations/ArticleCommentTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/article/components/comment/translations/ArticleCommentTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.article.components.comment.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.article.components.comment.ArticleCommentEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/article/components/media/ArticleMediaEntity.java b/src/main/java/app/milo/server/features/article/components/media/ArticleMediaEntity.java index ec896173..438337bf 100644 --- a/src/main/java/app/milo/server/features/article/components/media/ArticleMediaEntity.java +++ b/src/main/java/app/milo/server/features/article/components/media/ArticleMediaEntity.java @@ -1,11 +1,11 @@ package app.milo.server.features.article.components.media; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.media.base.MediaEntity; import app.milo.server.features.article.components.base.ArticleEntity; diff --git a/src/main/java/app/milo/server/features/article/components/publicAuthor/ArticlePublicAuthorEntity.java b/src/main/java/app/milo/server/features/article/components/publicAuthor/ArticlePublicAuthorEntity.java index 5eca6cba..34fc61d9 100644 --- a/src/main/java/app/milo/server/features/article/components/publicAuthor/ArticlePublicAuthorEntity.java +++ b/src/main/java/app/milo/server/features/article/components/publicAuthor/ArticlePublicAuthorEntity.java @@ -1,11 +1,11 @@ package app.milo.server.features.article.components.publicAuthor; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import app.milo.server.core.base.BaseEntity; import app.milo.server.features.article.components.base.ArticleEntity; diff --git a/src/main/java/app/milo/server/features/article/components/rating/ArticleRatingEntity.java b/src/main/java/app/milo/server/features/article/components/rating/ArticleRatingEntity.java index c0e1b7a6..af8a2bc2 100644 --- a/src/main/java/app/milo/server/features/article/components/rating/ArticleRatingEntity.java +++ b/src/main/java/app/milo/server/features/article/components/rating/ArticleRatingEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.article.components.rating; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import app.milo.server.base.analytics.rating.RatableEntity; import app.milo.server.features.article.components.base.ArticleEntity; import lombok.Getter; diff --git a/src/main/java/app/milo/server/features/contest/base/ContestEntity.java b/src/main/java/app/milo/server/features/contest/base/ContestEntity.java index d3796eb8..a3db5eed 100644 --- a/src/main/java/app/milo/server/features/contest/base/ContestEntity.java +++ b/src/main/java/app/milo/server/features/contest/base/ContestEntity.java @@ -2,13 +2,13 @@ import java.time.OffsetDateTime; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.base.contact.ContactEntity; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.i18n.annotations.Translatable; diff --git a/src/main/java/app/milo/server/features/contest/base/media/ContestMediaEntity.java b/src/main/java/app/milo/server/features/contest/base/media/ContestMediaEntity.java index 6e1c67fa..de42ad3f 100644 --- a/src/main/java/app/milo/server/features/contest/base/media/ContestMediaEntity.java +++ b/src/main/java/app/milo/server/features/contest/base/media/ContestMediaEntity.java @@ -1,11 +1,11 @@ package app.milo.server.features.contest.base.media; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.media.base.MediaEntity; import app.milo.server.features.contest.base.ContestEntity; diff --git a/src/main/java/app/milo/server/features/contest/base/translations/ContestTranslatableEntity.java b/src/main/java/app/milo/server/features/contest/base/translations/ContestTranslatableEntity.java index 21a23616..37b53ae5 100644 --- a/src/main/java/app/milo/server/features/contest/base/translations/ContestTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/contest/base/translations/ContestTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.contest.base.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.contest.base.ContestEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/contest/comment/ContestCommentEntity.java b/src/main/java/app/milo/server/features/contest/comment/ContestCommentEntity.java index aa8aa2b9..77e55ada 100644 --- a/src/main/java/app/milo/server/features/contest/comment/ContestCommentEntity.java +++ b/src/main/java/app/milo/server/features/contest/comment/ContestCommentEntity.java @@ -1,12 +1,12 @@ package app.milo.server.features.contest.comment; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import app.milo.server.base.userContext.base.UserContextEntity; import app.milo.server.core.base.BaseEntity; diff --git a/src/main/java/app/milo/server/features/contest/comment/translations/ContestCommentTranslatableEntity.java b/src/main/java/app/milo/server/features/contest/comment/translations/ContestCommentTranslatableEntity.java index 00ff7042..1ec3c966 100644 --- a/src/main/java/app/milo/server/features/contest/comment/translations/ContestCommentTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/contest/comment/translations/ContestCommentTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.contest.comment.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.contest.comment.ContestCommentEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/contest/participation/ContestParticipationEntity.java b/src/main/java/app/milo/server/features/contest/participation/ContestParticipationEntity.java index b4f4726a..67250361 100644 --- a/src/main/java/app/milo/server/features/contest/participation/ContestParticipationEntity.java +++ b/src/main/java/app/milo/server/features/contest/participation/ContestParticipationEntity.java @@ -3,12 +3,12 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.Formula; import org.hibernate.annotations.GenericGenerator; import app.milo.server.base.userContext.base.UserContextEntity; diff --git a/src/main/java/app/milo/server/features/contest/participation/media/ContestParticipationMediaEntity.java b/src/main/java/app/milo/server/features/contest/participation/media/ContestParticipationMediaEntity.java index 6f31c403..ace51be0 100644 --- a/src/main/java/app/milo/server/features/contest/participation/media/ContestParticipationMediaEntity.java +++ b/src/main/java/app/milo/server/features/contest/participation/media/ContestParticipationMediaEntity.java @@ -1,11 +1,11 @@ package app.milo.server.features.contest.participation.media; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.media.base.MediaEntity; import app.milo.server.features.contest.participation.ContestParticipationEntity; diff --git a/src/main/java/app/milo/server/features/contest/participation/translations/ContestParticipationTranslatableEntity.java b/src/main/java/app/milo/server/features/contest/participation/translations/ContestParticipationTranslatableEntity.java index 23b4145e..8e177b01 100644 --- a/src/main/java/app/milo/server/features/contest/participation/translations/ContestParticipationTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/contest/participation/translations/ContestParticipationTranslatableEntity.java @@ -1,7 +1,7 @@ package app.milo.server.features.contest.participation.translations; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.contest.participation.ContestParticipationEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/contest/type/ContestTypeEntity.java b/src/main/java/app/milo/server/features/contest/type/ContestTypeEntity.java index 6a4240d0..27075b81 100644 --- a/src/main/java/app/milo/server/features/contest/type/ContestTypeEntity.java +++ b/src/main/java/app/milo/server/features/contest/type/ContestTypeEntity.java @@ -1,16 +1,15 @@ package app.milo.server.features.contest.type; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import org.hibernate.annotations.GenericGenerator; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.i18n.annotations.Translatable; import app.milo.server.features.contest.base.ContestEntity; import app.milo.server.features.contest.type.translations.ContestTypeTranslatableEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; @@ -23,7 +22,6 @@ @AllArgsConstructor @Entity @Table(name = "contest_types") -@GenericGenerator(name = "UUID", strategy = "org.hibernate.id.UUIDGenerator") public class ContestTypeEntity extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/src/main/java/app/milo/server/features/contest/type/translations/ContestTypeTranslatableEntity.java b/src/main/java/app/milo/server/features/contest/type/translations/ContestTypeTranslatableEntity.java index a917502d..28bef903 100644 --- a/src/main/java/app/milo/server/features/contest/type/translations/ContestTypeTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/contest/type/translations/ContestTypeTranslatableEntity.java @@ -1,9 +1,10 @@ package app.milo.server.features.contest.type.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; +import app.milo.server.features.contest.type.ContestTypeEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Data; @@ -16,7 +17,7 @@ @AllArgsConstructor @Entity @Table(name = "contest_type_translatables") -public class ContestTypeTranslatableEntity extends TranslatableEntity { +public class ContestTypeTranslatableEntity extends TranslatableEntity { private static final long serialVersionUID = 1L; diff --git a/src/main/java/app/milo/server/features/contest/vote/ContestVoteEntity.java b/src/main/java/app/milo/server/features/contest/vote/ContestVoteEntity.java index 6375301b..0beeedc8 100644 --- a/src/main/java/app/milo/server/features/contest/vote/ContestVoteEntity.java +++ b/src/main/java/app/milo/server/features/contest/vote/ContestVoteEntity.java @@ -1,11 +1,11 @@ package app.milo.server.features.contest.vote; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.GenericGenerator; import app.milo.server.base.userContext.base.UserContextEntity; import app.milo.server.core.base.BaseEntity; diff --git a/src/main/java/app/milo/server/features/deal/components/base/DealEntity.java b/src/main/java/app/milo/server/features/deal/components/base/DealEntity.java index 86735c1d..afbc740b 100644 --- a/src/main/java/app/milo/server/features/deal/components/base/DealEntity.java +++ b/src/main/java/app/milo/server/features/deal/components/base/DealEntity.java @@ -3,16 +3,16 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; @@ -98,6 +98,6 @@ public class DealEntity extends BaseEntity { @JoinTable(name = "favorite_deals", joinColumns = @JoinColumn(name = "deal_id"), inverseJoinColumns = @JoinColumn(name = "user_context_id"), uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "deal_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List favoritingUsers = new ArrayList<>(); } diff --git a/src/main/java/app/milo/server/features/deal/components/base/media/DealMediaEntity.java b/src/main/java/app/milo/server/features/deal/components/base/media/DealMediaEntity.java index 14258079..cb718b71 100644 --- a/src/main/java/app/milo/server/features/deal/components/base/media/DealMediaEntity.java +++ b/src/main/java/app/milo/server/features/deal/components/base/media/DealMediaEntity.java @@ -1,11 +1,11 @@ package app.milo.server.features.deal.components.base.media; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.media.base.MediaEntity; import app.milo.server.features.deal.components.base.DealEntity; diff --git a/src/main/java/app/milo/server/features/deal/components/base/translations/DealTranslatableEntity.java b/src/main/java/app/milo/server/features/deal/components/base/translations/DealTranslatableEntity.java index 3a7e6003..373190e4 100644 --- a/src/main/java/app/milo/server/features/deal/components/base/translations/DealTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/deal/components/base/translations/DealTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.deal.components.base.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.deal.components.base.DealEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/deal/components/base/visitors/DealVisitorEntity.java b/src/main/java/app/milo/server/features/deal/components/base/visitors/DealVisitorEntity.java index d87323f0..17eeea04 100644 --- a/src/main/java/app/milo/server/features/deal/components/base/visitors/DealVisitorEntity.java +++ b/src/main/java/app/milo/server/features/deal/components/base/visitors/DealVisitorEntity.java @@ -1,7 +1,7 @@ package app.milo.server.features.deal.components.base.visitors; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.visit.visitable.VisitableEntity; import app.milo.server.features.deal.components.base.DealEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/deal/components/category/DealCategoryEntity.java b/src/main/java/app/milo/server/features/deal/components/category/DealCategoryEntity.java index 8cc07c00..1886157f 100644 --- a/src/main/java/app/milo/server/features/deal/components/category/DealCategoryEntity.java +++ b/src/main/java/app/milo/server/features/deal/components/category/DealCategoryEntity.java @@ -1,11 +1,11 @@ package app.milo.server.features.deal.components.category; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.i18n.annotations.Translatable; import app.milo.server.features.deal.components.base.DealEntity; diff --git a/src/main/java/app/milo/server/features/deal/components/category/translations/DealCategoryTranslatableEntity.java b/src/main/java/app/milo/server/features/deal/components/category/translations/DealCategoryTranslatableEntity.java index b04664d6..ab286940 100644 --- a/src/main/java/app/milo/server/features/deal/components/category/translations/DealCategoryTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/deal/components/category/translations/DealCategoryTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.deal.components.category.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.deal.components.category.DealCategoryEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/event/attendee/EventAttendeeEntity.java b/src/main/java/app/milo/server/features/event/attendee/EventAttendeeEntity.java index d0535e20..8c2166bb 100644 --- a/src/main/java/app/milo/server/features/event/attendee/EventAttendeeEntity.java +++ b/src/main/java/app/milo/server/features/event/attendee/EventAttendeeEntity.java @@ -1,10 +1,10 @@ package app.milo.server.features.event.attendee; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import app.milo.server.base.userContext.base.UserContextEntity; import app.milo.server.core.base.BaseEntity; import app.milo.server.features.event.attendeeConfiguration.EventAttendeeConfigurationEntity; diff --git a/src/main/java/app/milo/server/features/event/attendeeConfiguration/EventAttendeeConfigurationEntity.java b/src/main/java/app/milo/server/features/event/attendeeConfiguration/EventAttendeeConfigurationEntity.java index 0633612e..b64ac8de 100644 --- a/src/main/java/app/milo/server/features/event/attendeeConfiguration/EventAttendeeConfigurationEntity.java +++ b/src/main/java/app/milo/server/features/event/attendeeConfiguration/EventAttendeeConfigurationEntity.java @@ -1,10 +1,10 @@ package app.milo.server.features.event.attendeeConfiguration; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.features.event.attendee.EventAttendeeEntity; import app.milo.server.features.event.base.EventEntity; diff --git a/src/main/java/app/milo/server/features/event/base/EventEntity.java b/src/main/java/app/milo/server/features/event/base/EventEntity.java index e210fe28..b12f90ec 100644 --- a/src/main/java/app/milo/server/features/event/base/EventEntity.java +++ b/src/main/java/app/milo/server/features/event/base/EventEntity.java @@ -3,16 +3,16 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; @@ -115,13 +115,13 @@ public class EventEntity extends BaseEntity { @JoinTable(name = "event_event_target_groups", joinColumns = @JoinColumn(name = "event_id"), inverseJoinColumns = @JoinColumn(name = "target_group_id"), uniqueConstraints = {@UniqueConstraint(columnNames = {"event_id", "target_group_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List targetGroups = new ArrayList<>(); @ManyToMany(fetch = FetchType.LAZY) @JoinTable(name = "favorite_events", joinColumns = @JoinColumn(name = "event_id"), inverseJoinColumns = @JoinColumn(name = "user_context_id"), uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "event_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List favoritingUsers = new ArrayList<>(); } diff --git a/src/main/java/app/milo/server/features/event/base/translations/EventTranslatableEntity.java b/src/main/java/app/milo/server/features/event/base/translations/EventTranslatableEntity.java index e74d4dfa..9ef14c0a 100644 --- a/src/main/java/app/milo/server/features/event/base/translations/EventTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/event/base/translations/EventTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.event.base.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.event.base.EventEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/event/base/visitors/EventVisitorEntity.java b/src/main/java/app/milo/server/features/event/base/visitors/EventVisitorEntity.java index f98c85c4..20fbed7d 100644 --- a/src/main/java/app/milo/server/features/event/base/visitors/EventVisitorEntity.java +++ b/src/main/java/app/milo/server/features/event/base/visitors/EventVisitorEntity.java @@ -1,7 +1,7 @@ package app.milo.server.features.event.base.visitors; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.visit.visitable.VisitableEntity; import app.milo.server.features.event.base.EventEntity; import lombok.Getter; diff --git a/src/main/java/app/milo/server/features/event/category/EventCategoryEntity.java b/src/main/java/app/milo/server/features/event/category/EventCategoryEntity.java index 6b598cf9..8be4496d 100644 --- a/src/main/java/app/milo/server/features/event/category/EventCategoryEntity.java +++ b/src/main/java/app/milo/server/features/event/category/EventCategoryEntity.java @@ -1,11 +1,11 @@ package app.milo.server.features.event.category; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.i18n.annotations.Translatable; import app.milo.server.features.event.base.EventEntity; diff --git a/src/main/java/app/milo/server/features/event/category/translations/EventCategoryTranslatableEntity.java b/src/main/java/app/milo/server/features/event/category/translations/EventCategoryTranslatableEntity.java index 9256ef6a..727e788e 100644 --- a/src/main/java/app/milo/server/features/event/category/translations/EventCategoryTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/event/category/translations/EventCategoryTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.event.category.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.event.category.EventCategoryEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/event/comment/EventCommentEntity.java b/src/main/java/app/milo/server/features/event/comment/EventCommentEntity.java index 89ad3235..a765a573 100644 --- a/src/main/java/app/milo/server/features/event/comment/EventCommentEntity.java +++ b/src/main/java/app/milo/server/features/event/comment/EventCommentEntity.java @@ -1,12 +1,12 @@ package app.milo.server.features.event.comment; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import app.milo.server.base.userContext.base.UserContextEntity; import app.milo.server.core.base.BaseEntity; diff --git a/src/main/java/app/milo/server/features/event/comment/translations/EventCommentTranslatableEntity.java b/src/main/java/app/milo/server/features/event/comment/translations/EventCommentTranslatableEntity.java index 1dbbb2dc..d30a6742 100644 --- a/src/main/java/app/milo/server/features/event/comment/translations/EventCommentTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/event/comment/translations/EventCommentTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.event.comment.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.event.comment.EventCommentEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/event/media/EventMediaEntity.java b/src/main/java/app/milo/server/features/event/media/EventMediaEntity.java index a8d8e306..6b07912c 100644 --- a/src/main/java/app/milo/server/features/event/media/EventMediaEntity.java +++ b/src/main/java/app/milo/server/features/event/media/EventMediaEntity.java @@ -1,10 +1,10 @@ package app.milo.server.features.event.media; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.media.base.MediaEntity; import app.milo.server.features.event.base.EventEntity; diff --git a/src/main/java/app/milo/server/features/event/rating/EventRatingEntity.java b/src/main/java/app/milo/server/features/event/rating/EventRatingEntity.java index 3a90b3a5..44458275 100644 --- a/src/main/java/app/milo/server/features/event/rating/EventRatingEntity.java +++ b/src/main/java/app/milo/server/features/event/rating/EventRatingEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.event.rating; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import app.milo.server.base.analytics.rating.RatableEntity; import app.milo.server.features.event.base.EventEntity; import lombok.Getter; diff --git a/src/main/java/app/milo/server/features/event/schedule/EventScheduleEntity.java b/src/main/java/app/milo/server/features/event/schedule/EventScheduleEntity.java index 7f2bef65..80204a15 100644 --- a/src/main/java/app/milo/server/features/event/schedule/EventScheduleEntity.java +++ b/src/main/java/app/milo/server/features/event/schedule/EventScheduleEntity.java @@ -1,11 +1,11 @@ package app.milo.server.features.event.schedule; import java.time.OffsetDateTime; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import com.querydsl.core.annotations.QueryInit; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.config.DefaultSort; diff --git a/src/main/java/app/milo/server/features/event/targetGroup/EventTargetGroupEntity.java b/src/main/java/app/milo/server/features/event/targetGroup/EventTargetGroupEntity.java index 4d777bc2..eb7337ea 100644 --- a/src/main/java/app/milo/server/features/event/targetGroup/EventTargetGroupEntity.java +++ b/src/main/java/app/milo/server/features/event/targetGroup/EventTargetGroupEntity.java @@ -1,10 +1,10 @@ package app.milo.server.features.event.targetGroup; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.i18n.annotations.Translatable; import app.milo.server.features.event.targetGroup.translations.EventTargetGroupTranslatableEntity; diff --git a/src/main/java/app/milo/server/features/event/targetGroup/translations/EventTargetGroupTranslatableEntity.java b/src/main/java/app/milo/server/features/event/targetGroup/translations/EventTargetGroupTranslatableEntity.java index 98929405..0c683794 100644 --- a/src/main/java/app/milo/server/features/event/targetGroup/translations/EventTargetGroupTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/event/targetGroup/translations/EventTargetGroupTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.event.targetGroup.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.event.targetGroup.EventTargetGroupEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/form/formTemplate/UserFormTemplateEntity.java b/src/main/java/app/milo/server/features/form/formTemplate/UserFormTemplateEntity.java index f832bbf3..5dfc90c3 100644 --- a/src/main/java/app/milo/server/features/form/formTemplate/UserFormTemplateEntity.java +++ b/src/main/java/app/milo/server/features/form/formTemplate/UserFormTemplateEntity.java @@ -1,13 +1,13 @@ package app.milo.server.features.form.formTemplate; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.base.userContext.base.UserContextEntity; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.i18n.annotations.Translatable; diff --git a/src/main/java/app/milo/server/features/form/formTemplate/translations/UserFormTemplateTranslatableEntity.java b/src/main/java/app/milo/server/features/form/formTemplate/translations/UserFormTemplateTranslatableEntity.java index a6161d01..919a65d6 100644 --- a/src/main/java/app/milo/server/features/form/formTemplate/translations/UserFormTemplateTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/form/formTemplate/translations/UserFormTemplateTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.form.formTemplate.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.form.formTemplate.UserFormTemplateEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/form/template/FormTemplateEntity.java b/src/main/java/app/milo/server/features/form/template/FormTemplateEntity.java index 15ff1293..f670b1ad 100644 --- a/src/main/java/app/milo/server/features/form/template/FormTemplateEntity.java +++ b/src/main/java/app/milo/server/features/form/template/FormTemplateEntity.java @@ -1,10 +1,10 @@ package app.milo.server.features.form.template; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.i18n.annotations.Translatable; import app.milo.server.features.form.template.translations.FormTemplateTranslatableEntity; diff --git a/src/main/java/app/milo/server/features/form/template/translations/FormTemplateTranslatableEntity.java b/src/main/java/app/milo/server/features/form/template/translations/FormTemplateTranslatableEntity.java index 4247f7ee..2b8c5729 100644 --- a/src/main/java/app/milo/server/features/form/template/translations/FormTemplateTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/form/template/translations/FormTemplateTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.form.template.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.form.template.FormTemplateEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/form/templateType/FormTemplateTypeEntity.java b/src/main/java/app/milo/server/features/form/templateType/FormTemplateTypeEntity.java index dd0a4382..7c83d58d 100644 --- a/src/main/java/app/milo/server/features/form/templateType/FormTemplateTypeEntity.java +++ b/src/main/java/app/milo/server/features/form/templateType/FormTemplateTypeEntity.java @@ -1,10 +1,10 @@ package app.milo.server.features.form.templateType; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.i18n.annotations.Translatable; diff --git a/src/main/java/app/milo/server/features/form/templateType/translations/FormTemplateTypeTranslatableEntity.java b/src/main/java/app/milo/server/features/form/templateType/translations/FormTemplateTypeTranslatableEntity.java index 815ed406..e3ff4eb2 100644 --- a/src/main/java/app/milo/server/features/form/templateType/translations/FormTemplateTypeTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/form/templateType/translations/FormTemplateTypeTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.form.templateType.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.form.templateType.FormTemplateTypeEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/infoMedia/base/InfoMediaEntity.java b/src/main/java/app/milo/server/features/infoMedia/base/InfoMediaEntity.java index 6ff3e921..bcc8862d 100644 --- a/src/main/java/app/milo/server/features/infoMedia/base/InfoMediaEntity.java +++ b/src/main/java/app/milo/server/features/infoMedia/base/InfoMediaEntity.java @@ -1,10 +1,10 @@ package app.milo.server.features.infoMedia.base; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.media.base.MediaEntity; diff --git a/src/main/java/app/milo/server/features/infoMedia/category/InfoMediaCategoryEntity.java b/src/main/java/app/milo/server/features/infoMedia/category/InfoMediaCategoryEntity.java index 184d9df8..81139445 100644 --- a/src/main/java/app/milo/server/features/infoMedia/category/InfoMediaCategoryEntity.java +++ b/src/main/java/app/milo/server/features/infoMedia/category/InfoMediaCategoryEntity.java @@ -1,10 +1,10 @@ package app.milo.server.features.infoMedia.category; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.i18n.annotations.Translatable; import app.milo.server.features.infoMedia.base.InfoMediaEntity; diff --git a/src/main/java/app/milo/server/features/infoMedia/category/translations/InfoMediaCategoryTranslatableEntity.java b/src/main/java/app/milo/server/features/infoMedia/category/translations/InfoMediaCategoryTranslatableEntity.java index ee7ef26a..4e378471 100644 --- a/src/main/java/app/milo/server/features/infoMedia/category/translations/InfoMediaCategoryTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/infoMedia/category/translations/InfoMediaCategoryTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.infoMedia.category.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.infoMedia.category.InfoMediaCategoryEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/navigator/choice/NavigatorChoiceEntity.java b/src/main/java/app/milo/server/features/navigator/choice/NavigatorChoiceEntity.java index 26b72f5d..239d5862 100644 --- a/src/main/java/app/milo/server/features/navigator/choice/NavigatorChoiceEntity.java +++ b/src/main/java/app/milo/server/features/navigator/choice/NavigatorChoiceEntity.java @@ -1,12 +1,12 @@ package app.milo.server.features.navigator.choice; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.i18n.annotations.Translatable; import app.milo.server.core.seo.annotations.SlugSource; diff --git a/src/main/java/app/milo/server/features/navigator/choice/translations/NavigatorChoiceTranslatableEntity.java b/src/main/java/app/milo/server/features/navigator/choice/translations/NavigatorChoiceTranslatableEntity.java index cb6e0684..76c6eb09 100644 --- a/src/main/java/app/milo/server/features/navigator/choice/translations/NavigatorChoiceTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/navigator/choice/translations/NavigatorChoiceTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.navigator.choice.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.navigator.choice.NavigatorChoiceEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/navigator/page/NavigatorPageEntity.java b/src/main/java/app/milo/server/features/navigator/page/NavigatorPageEntity.java index 88055082..6bd3e6d8 100644 --- a/src/main/java/app/milo/server/features/navigator/page/NavigatorPageEntity.java +++ b/src/main/java/app/milo/server/features/navigator/page/NavigatorPageEntity.java @@ -1,11 +1,11 @@ package app.milo.server.features.navigator.page; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.i18n.annotations.Translatable; import app.milo.server.core.seo.annotations.SlugSource; diff --git a/src/main/java/app/milo/server/features/navigator/page/translations/NavigatorPageTranslatableEntity.java b/src/main/java/app/milo/server/features/navigator/page/translations/NavigatorPageTranslatableEntity.java index d0afdd7c..9e952c9c 100644 --- a/src/main/java/app/milo/server/features/navigator/page/translations/NavigatorPageTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/navigator/page/translations/NavigatorPageTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.navigator.page.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.navigator.choice.NavigatorChoiceEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/navigator/resultLink/NavigatorResultLinkEntity.java b/src/main/java/app/milo/server/features/navigator/resultLink/NavigatorResultLinkEntity.java index 1d46c8d5..3d04bfe0 100644 --- a/src/main/java/app/milo/server/features/navigator/resultLink/NavigatorResultLinkEntity.java +++ b/src/main/java/app/milo/server/features/navigator/resultLink/NavigatorResultLinkEntity.java @@ -1,11 +1,11 @@ package app.milo.server.features.navigator.resultLink; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.i18n.annotations.Translatable; import app.milo.server.features.navigator.page.NavigatorPageEntity; diff --git a/src/main/java/app/milo/server/features/navigator/resultLink/translations/NavigatorResultLinkTranslatableEntity.java b/src/main/java/app/milo/server/features/navigator/resultLink/translations/NavigatorResultLinkTranslatableEntity.java index 45b2355e..afb372c5 100644 --- a/src/main/java/app/milo/server/features/navigator/resultLink/translations/NavigatorResultLinkTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/navigator/resultLink/translations/NavigatorResultLinkTranslatableEntity.java @@ -1,7 +1,7 @@ package app.milo.server.features.navigator.resultLink.translations; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.navigator.resultLink.NavigatorResultLinkEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/organisation/base/OrganisationEntity.java b/src/main/java/app/milo/server/features/organisation/base/OrganisationEntity.java index 1816932d..4ad83541 100644 --- a/src/main/java/app/milo/server/features/organisation/base/OrganisationEntity.java +++ b/src/main/java/app/milo/server/features/organisation/base/OrganisationEntity.java @@ -3,16 +3,16 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; @@ -102,7 +102,7 @@ public class OrganisationEntity extends BaseEntity { @JoinTable(name = "favorite_organisations", joinColumns = @JoinColumn(name = "organisation_id"), inverseJoinColumns = @JoinColumn(name = "user_context_id"), uniqueConstraints = {@UniqueConstraint(columnNames = {"user_context_id", "organisation_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List favoritingUsers = new ArrayList<>(); } diff --git a/src/main/java/app/milo/server/features/organisation/base/translations/OrganisationTranslatableEntity.java b/src/main/java/app/milo/server/features/organisation/base/translations/OrganisationTranslatableEntity.java index 9b431f64..bcb482e9 100644 --- a/src/main/java/app/milo/server/features/organisation/base/translations/OrganisationTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/organisation/base/translations/OrganisationTranslatableEntity.java @@ -1,7 +1,7 @@ package app.milo.server.features.organisation.base.translations; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.organisation.base.OrganisationEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/organisation/base/visitors/OrganisationVisitorEntity.java b/src/main/java/app/milo/server/features/organisation/base/visitors/OrganisationVisitorEntity.java index f881fe6e..eae6d3fc 100644 --- a/src/main/java/app/milo/server/features/organisation/base/visitors/OrganisationVisitorEntity.java +++ b/src/main/java/app/milo/server/features/organisation/base/visitors/OrganisationVisitorEntity.java @@ -1,7 +1,7 @@ package app.milo.server.features.organisation.base.visitors; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.visit.visitable.VisitableEntity; import app.milo.server.features.organisation.base.OrganisationEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/organisation/comment/OrganisationCommentEntity.java b/src/main/java/app/milo/server/features/organisation/comment/OrganisationCommentEntity.java index 50d889de..d019a475 100644 --- a/src/main/java/app/milo/server/features/organisation/comment/OrganisationCommentEntity.java +++ b/src/main/java/app/milo/server/features/organisation/comment/OrganisationCommentEntity.java @@ -1,11 +1,11 @@ package app.milo.server.features.organisation.comment; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.base.userContext.base.UserContextEntity; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.i18n.annotations.Translatable; diff --git a/src/main/java/app/milo/server/features/organisation/comment/translations/OrganisationCommentTranslatableEntity.java b/src/main/java/app/milo/server/features/organisation/comment/translations/OrganisationCommentTranslatableEntity.java index 38f9a61c..0f4ea9b4 100644 --- a/src/main/java/app/milo/server/features/organisation/comment/translations/OrganisationCommentTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/organisation/comment/translations/OrganisationCommentTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.organisation.comment.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.organisation.comment.OrganisationCommentEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/organisation/configuration/OrganisationConfigurationEntity.java b/src/main/java/app/milo/server/features/organisation/configuration/OrganisationConfigurationEntity.java index 54c2acc3..5288d57f 100644 --- a/src/main/java/app/milo/server/features/organisation/configuration/OrganisationConfigurationEntity.java +++ b/src/main/java/app/milo/server/features/organisation/configuration/OrganisationConfigurationEntity.java @@ -1,10 +1,10 @@ package app.milo.server.features.organisation.configuration; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.security.components.role.base.RoleEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/organisation/media/OrganisationMediaEntity.java b/src/main/java/app/milo/server/features/organisation/media/OrganisationMediaEntity.java index c2565ab6..755bf31a 100644 --- a/src/main/java/app/milo/server/features/organisation/media/OrganisationMediaEntity.java +++ b/src/main/java/app/milo/server/features/organisation/media/OrganisationMediaEntity.java @@ -1,10 +1,10 @@ package app.milo.server.features.organisation.media; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.media.base.MediaEntity; import app.milo.server.features.organisation.base.OrganisationEntity; diff --git a/src/main/java/app/milo/server/features/organisation/member/OrganisationMemberEntity.java b/src/main/java/app/milo/server/features/organisation/member/OrganisationMemberEntity.java index 67a407c9..e4a4a85b 100644 --- a/src/main/java/app/milo/server/features/organisation/member/OrganisationMemberEntity.java +++ b/src/main/java/app/milo/server/features/organisation/member/OrganisationMemberEntity.java @@ -1,11 +1,11 @@ package app.milo.server.features.organisation.member; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import app.milo.server.base.userContext.base.UserContextEntity; import app.milo.server.core.base.BaseEntity; diff --git a/src/main/java/app/milo/server/features/organisation/rating/OrganisationRatingEntity.java b/src/main/java/app/milo/server/features/organisation/rating/OrganisationRatingEntity.java index 4d8dd102..0f3dc056 100644 --- a/src/main/java/app/milo/server/features/organisation/rating/OrganisationRatingEntity.java +++ b/src/main/java/app/milo/server/features/organisation/rating/OrganisationRatingEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.organisation.rating; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import app.milo.server.base.analytics.rating.RatableEntity; import app.milo.server.features.organisation.base.OrganisationEntity; import lombok.Getter; diff --git a/src/main/java/app/milo/server/features/survey/answer/SurveyAnswerEntity.java b/src/main/java/app/milo/server/features/survey/answer/SurveyAnswerEntity.java index e3e5276b..41037ad2 100644 --- a/src/main/java/app/milo/server/features/survey/answer/SurveyAnswerEntity.java +++ b/src/main/java/app/milo/server/features/survey/answer/SurveyAnswerEntity.java @@ -3,16 +3,16 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import org.hibernate.annotations.CollectionId; import org.hibernate.annotations.GenericGenerator; import org.hibernate.annotations.Type; @@ -54,7 +54,7 @@ public class SurveyAnswerEntity extends BaseEntity { @JoinTable(name = "answer_question_options", joinColumns = @JoinColumn(name = "answer_id"), inverseJoinColumns = @JoinColumn(name = "question_option_id"), uniqueConstraints = {@UniqueConstraint(columnNames = {"answer_id", "question_option_id"})}) - @CollectionId(column = @Column(name = "id"), type = @Type(type = "uuid-char"), generator = "UUID") + private List selectedOptions = new ArrayList<>(); @OneToMany(mappedBy = "parent", fetch = FetchType.LAZY) diff --git a/src/main/java/app/milo/server/features/survey/answer/translations/SurveyAnswerTranslatableEntity.java b/src/main/java/app/milo/server/features/survey/answer/translations/SurveyAnswerTranslatableEntity.java index a960d8d9..fc5f493d 100644 --- a/src/main/java/app/milo/server/features/survey/answer/translations/SurveyAnswerTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/survey/answer/translations/SurveyAnswerTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.survey.answer.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.survey.answer.SurveyAnswerEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/survey/assignment/SurveyAssignmentEntity.java b/src/main/java/app/milo/server/features/survey/assignment/SurveyAssignmentEntity.java index 5eac1a19..6c361a01 100644 --- a/src/main/java/app/milo/server/features/survey/assignment/SurveyAssignmentEntity.java +++ b/src/main/java/app/milo/server/features/survey/assignment/SurveyAssignmentEntity.java @@ -1,10 +1,10 @@ package app.milo.server.features.survey.assignment; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import app.milo.server.base.userContext.base.UserContextEntity; import app.milo.server.core.base.BaseEntity; import app.milo.server.features.survey.base.SurveyEntity; diff --git a/src/main/java/app/milo/server/features/survey/base/SurveyEntity.java b/src/main/java/app/milo/server/features/survey/base/SurveyEntity.java index e9a42f7f..f1f7d74b 100644 --- a/src/main/java/app/milo/server/features/survey/base/SurveyEntity.java +++ b/src/main/java/app/milo/server/features/survey/base/SurveyEntity.java @@ -2,13 +2,13 @@ import java.time.OffsetDateTime; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import app.milo.server.base.contact.ContactEntity; import app.milo.server.core.base.BaseEntity; diff --git a/src/main/java/app/milo/server/features/survey/base/media/SurveyMediaEntity.java b/src/main/java/app/milo/server/features/survey/base/media/SurveyMediaEntity.java index 24c6c7bb..2564bbee 100644 --- a/src/main/java/app/milo/server/features/survey/base/media/SurveyMediaEntity.java +++ b/src/main/java/app/milo/server/features/survey/base/media/SurveyMediaEntity.java @@ -1,12 +1,12 @@ package app.milo.server.features.survey.base.media; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.media.base.MediaEntity; import app.milo.server.features.survey.base.SurveyEntity; diff --git a/src/main/java/app/milo/server/features/survey/base/translations/SurveyTranslatableEntity.java b/src/main/java/app/milo/server/features/survey/base/translations/SurveyTranslatableEntity.java index 0d6061f7..0ee7df1d 100644 --- a/src/main/java/app/milo/server/features/survey/base/translations/SurveyTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/survey/base/translations/SurveyTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.survey.base.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.survey.base.SurveyEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/survey/base/visitors/SurveyVisitorEntity.java b/src/main/java/app/milo/server/features/survey/base/visitors/SurveyVisitorEntity.java index c7f6396f..faecec52 100644 --- a/src/main/java/app/milo/server/features/survey/base/visitors/SurveyVisitorEntity.java +++ b/src/main/java/app/milo/server/features/survey/base/visitors/SurveyVisitorEntity.java @@ -1,7 +1,7 @@ package app.milo.server.features.survey.base.visitors; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.visit.visitable.VisitableEntity; import app.milo.server.features.survey.base.SurveyEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/survey/question/SurveyQuestionEntity.java b/src/main/java/app/milo/server/features/survey/question/SurveyQuestionEntity.java index 01a044a6..e65ff4f3 100644 --- a/src/main/java/app/milo/server/features/survey/question/SurveyQuestionEntity.java +++ b/src/main/java/app/milo/server/features/survey/question/SurveyQuestionEntity.java @@ -1,13 +1,13 @@ package app.milo.server.features.survey.question; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import app.milo.server.core.base.BaseEntity; import app.milo.server.features.survey.answer.SurveyAnswerEntity; diff --git a/src/main/java/app/milo/server/features/survey/question/translations/SurveyQuestionTranslatableEntity.java b/src/main/java/app/milo/server/features/survey/question/translations/SurveyQuestionTranslatableEntity.java index 1ee1dd00..e4001016 100644 --- a/src/main/java/app/milo/server/features/survey/question/translations/SurveyQuestionTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/survey/question/translations/SurveyQuestionTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.survey.question.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.survey.question.SurveyQuestionEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/survey/questionOption/SurveyQuestionOptionEntity.java b/src/main/java/app/milo/server/features/survey/questionOption/SurveyQuestionOptionEntity.java index 2b4e7f88..6bd76025 100644 --- a/src/main/java/app/milo/server/features/survey/questionOption/SurveyQuestionOptionEntity.java +++ b/src/main/java/app/milo/server/features/survey/questionOption/SurveyQuestionOptionEntity.java @@ -1,13 +1,13 @@ package app.milo.server.features.survey.questionOption; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.i18n.annotations.Translatable; diff --git a/src/main/java/app/milo/server/features/survey/questionOption/translations/SurveyQuestionOptionTranslatableEntity.java b/src/main/java/app/milo/server/features/survey/questionOption/translations/SurveyQuestionOptionTranslatableEntity.java index 0c1ca255..8d7089c0 100644 --- a/src/main/java/app/milo/server/features/survey/questionOption/translations/SurveyQuestionOptionTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/survey/questionOption/translations/SurveyQuestionOptionTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.survey.questionOption.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.survey.questionOption.SurveyQuestionOptionEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/survey/questionType/SurveyQuestionTypeEntity.java b/src/main/java/app/milo/server/features/survey/questionType/SurveyQuestionTypeEntity.java index 4ea74575..801109d7 100644 --- a/src/main/java/app/milo/server/features/survey/questionType/SurveyQuestionTypeEntity.java +++ b/src/main/java/app/milo/server/features/survey/questionType/SurveyQuestionTypeEntity.java @@ -1,11 +1,11 @@ package app.milo.server.features.survey.questionType; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import app.milo.server.core.base.BaseEntity; import app.milo.server.features.survey.question.SurveyQuestionEntity; diff --git a/src/main/java/app/milo/server/features/survey/result/SurveyResultEntity.java b/src/main/java/app/milo/server/features/survey/result/SurveyResultEntity.java index a4d0b00b..89f7735c 100644 --- a/src/main/java/app/milo/server/features/survey/result/SurveyResultEntity.java +++ b/src/main/java/app/milo/server/features/survey/result/SurveyResultEntity.java @@ -1,12 +1,12 @@ package app.milo.server.features.survey.result; import java.util.Set; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import app.milo.server.base.userContext.base.UserContextEntity; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.i18n.annotations.Translatable; diff --git a/src/main/java/app/milo/server/features/survey/result/translations/SurveyResultTranslatableEntity.java b/src/main/java/app/milo/server/features/survey/result/translations/SurveyResultTranslatableEntity.java index 48c0e6d9..60092af9 100644 --- a/src/main/java/app/milo/server/features/survey/result/translations/SurveyResultTranslatableEntity.java +++ b/src/main/java/app/milo/server/features/survey/result/translations/SurveyResultTranslatableEntity.java @@ -1,8 +1,8 @@ package app.milo.server.features.survey.result.translations; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import app.milo.server.core.i18n.entities.TranslatableEntity; import app.milo.server.features.survey.result.SurveyResultEntity; import lombok.AccessLevel; diff --git a/src/main/java/app/milo/server/features/survey/state/SurveyStateEntity.java b/src/main/java/app/milo/server/features/survey/state/SurveyStateEntity.java index a3733149..f95d9a52 100644 --- a/src/main/java/app/milo/server/features/survey/state/SurveyStateEntity.java +++ b/src/main/java/app/milo/server/features/survey/state/SurveyStateEntity.java @@ -1,11 +1,11 @@ package app.milo.server.features.survey.state; import java.util.Set; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import org.hibernate.annotations.GenericGenerator; import app.milo.server.core.base.BaseEntity; import app.milo.server.features.survey.base.SurveyEntity; diff --git a/src/main/resources/database/changes/0168.change_column_type_contests.yaml b/src/main/resources/database/changes/0168.change_column_type_contests.yaml index df0f253a..6df04998 100644 --- a/src/main/resources/database/changes/0168.change_column_type_contests.yaml +++ b/src/main/resources/database/changes/0168.change_column_type_contests.yaml @@ -1,16 +1,16 @@ databaseChangeLog: - logicalFilePath: path_independent - changeSet: - id: 0167.change_column_type_contests.1 + id: 0168.change_column_type_contests.1 author: codeschluss changes: - modifyDataType: columnName: text_submission newDataType: longtext tableName: contest_participation_translatables - + - changeSet: - id: 0167.change_column_type_contests.2 + id: 0168.change_column_type_contests.2 author: codeschluss changes: - modifyDataType: diff --git a/src/main/resources/database/masters/development-master.yaml b/src/main/resources/database/masters/development-master.yaml index d65011c6..6dfef675 100644 --- a/src/main/resources/database/masters/development-master.yaml +++ b/src/main/resources/database/masters/development-master.yaml @@ -306,8 +306,6 @@ databaseChangeLog: file: database/changes/0168.change_column_type_contests.yaml - include: file: database/changes/0169.modify_type_short_description.yaml - - include: - file: database/changes/0168.change_column_type_contests.yaml - include: file: database/changes/0170.create_table_navigator_pages.yaml - include: diff --git a/src/main/resources/database/masters/production-master.yaml b/src/main/resources/database/masters/production-master.yaml index d200e81e..d967ba14 100644 --- a/src/main/resources/database/masters/production-master.yaml +++ b/src/main/resources/database/masters/production-master.yaml @@ -306,8 +306,6 @@ databaseChangeLog: file: database/changes/0168.change_column_type_contests.yaml - include: file: database/changes/0169.modify_type_short_description.yaml - - include: - file: database/changes/0168.change_column_type_contests.yaml - include: file: database/changes/0170.create_table_navigator_pages.yaml - include: diff --git a/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceGetByExampleTest.java b/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceGetByExampleTest.java index c53db66f..62ac9e9e 100644 --- a/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceGetByExampleTest.java +++ b/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceGetByExampleTest.java @@ -15,7 +15,7 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceReadAllTest.java b/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceReadAllTest.java index a843bf51..cfe765b9 100644 --- a/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceReadAllTest.java +++ b/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceReadAllTest.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceSaveTest.java b/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceSaveTest.java index 1dd9687e..b205ca88 100644 --- a/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceSaveTest.java +++ b/src/test/java/app/milo/server/test/units/core/base/dataService/DataServiceSaveTest.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/app/milo/server/test/units/core/base/graphbuilder/GraphBuilderCreateTest.java b/src/test/java/app/milo/server/test/units/core/base/graphbuilder/GraphBuilderCreateTest.java index 0c7e9950..b8fc50c8 100644 --- a/src/test/java/app/milo/server/test/units/core/base/graphbuilder/GraphBuilderCreateTest.java +++ b/src/test/java/app/milo/server/test/units/core/base/graphbuilder/GraphBuilderCreateTest.java @@ -8,9 +8,9 @@ import java.io.IOException; import java.io.StringReader; -import javax.persistence.AttributeNode; -import javax.persistence.EntityManager; -import javax.servlet.http.HttpServletRequest; +import jakarta.persistence.AttributeNode; +import jakarta.persistence.EntityManager; +import jakarta.servlet.http.HttpServletRequest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/app/milo/server/test/units/core/config/GraphQlContextAdapterTest.java b/src/test/java/app/milo/server/test/units/core/config/GraphQlContextAdapterTest.java index 7691d515..8661b31c 100644 --- a/src/test/java/app/milo/server/test/units/core/config/GraphQlContextAdapterTest.java +++ b/src/test/java/app/milo/server/test/units/core/config/GraphQlContextAdapterTest.java @@ -8,7 +8,7 @@ import java.io.IOException; import java.io.StringReader; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.junit.jupiter.api.Test; diff --git a/src/test/java/app/milo/server/test/units/core/config/MultiReadHttpServletRequestTest.java b/src/test/java/app/milo/server/test/units/core/config/MultiReadHttpServletRequestTest.java index 4c8a18f3..3fafdd69 100644 --- a/src/test/java/app/milo/server/test/units/core/config/MultiReadHttpServletRequestTest.java +++ b/src/test/java/app/milo/server/test/units/core/config/MultiReadHttpServletRequestTest.java @@ -8,9 +8,9 @@ import java.io.IOException; import java.io.StringReader; -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/app/milo/server/test/units/core/messaging/MailServiceTest.java b/src/test/java/app/milo/server/test/units/core/messaging/MailServiceTest.java index 6ecbe543..40db6bd9 100644 --- a/src/test/java/app/milo/server/test/units/core/messaging/MailServiceTest.java +++ b/src/test/java/app/milo/server/test/units/core/messaging/MailServiceTest.java @@ -7,10 +7,10 @@ import java.io.IOException; import java.util.Map; -import javax.mail.Message; -import javax.mail.MessagingException; -import javax.mail.internet.InternetAddress; -import javax.mail.internet.MimeMessage; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeMessage; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/app/milo/server/test/units/core/setup/entities/base/QTestEntity.java b/src/test/java/app/milo/server/test/units/core/setup/entities/base/QTestEntity.java index fe9d749a..e29e8fe3 100644 --- a/src/test/java/app/milo/server/test/units/core/setup/entities/base/QTestEntity.java +++ b/src/test/java/app/milo/server/test/units/core/setup/entities/base/QTestEntity.java @@ -2,7 +2,7 @@ import static com.querydsl.core.types.PathMetadataFactory.forVariable; -import javax.annotation.Generated; +import jakarta.annotation.Generated; import com.querydsl.core.types.Path; import com.querydsl.core.types.PathMetadata; diff --git a/src/test/java/app/milo/server/test/units/core/setup/entities/base/TestEntity.java b/src/test/java/app/milo/server/test/units/core/setup/entities/base/TestEntity.java index 5d3c9f28..fcb2b79f 100644 --- a/src/test/java/app/milo/server/test/units/core/setup/entities/base/TestEntity.java +++ b/src/test/java/app/milo/server/test/units/core/setup/entities/base/TestEntity.java @@ -2,14 +2,14 @@ import java.util.List; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.config.DefaultSort; import app.milo.server.test.units.core.setup.entities.child.TestChildEntity; diff --git a/src/test/java/app/milo/server/test/units/core/setup/entities/child/QTestChildEntity.java b/src/test/java/app/milo/server/test/units/core/setup/entities/child/QTestChildEntity.java index 8b760ce1..e8274729 100644 --- a/src/test/java/app/milo/server/test/units/core/setup/entities/child/QTestChildEntity.java +++ b/src/test/java/app/milo/server/test/units/core/setup/entities/child/QTestChildEntity.java @@ -2,7 +2,7 @@ import static com.querydsl.core.types.PathMetadataFactory.forVariable; -import javax.annotation.Generated; +import jakarta.annotation.Generated; import com.querydsl.core.types.Path; import com.querydsl.core.types.PathMetadata; diff --git a/src/test/java/app/milo/server/test/units/core/setup/entities/child/TestChildEntity.java b/src/test/java/app/milo/server/test/units/core/setup/entities/child/TestChildEntity.java index 1a1184fe..381d90a1 100644 --- a/src/test/java/app/milo/server/test/units/core/setup/entities/child/TestChildEntity.java +++ b/src/test/java/app/milo/server/test/units/core/setup/entities/child/TestChildEntity.java @@ -1,11 +1,11 @@ package app.milo.server.test.units.core.setup.entities.child; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.config.DefaultSort; import app.milo.server.test.units.core.setup.entities.base.TestEntity; diff --git a/src/test/java/app/milo/server/test/units/core/setup/entities/listChild/QTestListChildEntity.java b/src/test/java/app/milo/server/test/units/core/setup/entities/listChild/QTestListChildEntity.java index e369ce94..d5956c72 100644 --- a/src/test/java/app/milo/server/test/units/core/setup/entities/listChild/QTestListChildEntity.java +++ b/src/test/java/app/milo/server/test/units/core/setup/entities/listChild/QTestListChildEntity.java @@ -2,7 +2,7 @@ import static com.querydsl.core.types.PathMetadataFactory.forVariable; -import javax.annotation.Generated; +import jakarta.annotation.Generated; import com.querydsl.core.types.Path; import com.querydsl.core.types.PathMetadata; diff --git a/src/test/java/app/milo/server/test/units/core/setup/entities/listChild/TestListChildEntity.java b/src/test/java/app/milo/server/test/units/core/setup/entities/listChild/TestListChildEntity.java index 3e67ad58..1c668b5b 100644 --- a/src/test/java/app/milo/server/test/units/core/setup/entities/listChild/TestListChildEntity.java +++ b/src/test/java/app/milo/server/test/units/core/setup/entities/listChild/TestListChildEntity.java @@ -1,11 +1,11 @@ package app.milo.server.test.units.core.setup.entities.listChild; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.config.DefaultSort; import app.milo.server.test.units.core.setup.entities.base.TestEntity; diff --git a/src/test/java/app/milo/server/test/units/core/setup/services/ImageReader.java b/src/test/java/app/milo/server/test/units/core/setup/services/ImageReader.java index 03260a0a..b137c320 100644 --- a/src/test/java/app/milo/server/test/units/core/setup/services/ImageReader.java +++ b/src/test/java/app/milo/server/test/units/core/setup/services/ImageReader.java @@ -4,7 +4,6 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; - import javax.imageio.ImageIO; public class ImageReader { diff --git a/src/test/java/app/milo/server/test/units/core/setup/services/TestMailService.java b/src/test/java/app/milo/server/test/units/core/setup/services/TestMailService.java index f13ee345..c97e2ae0 100644 --- a/src/test/java/app/milo/server/test/units/core/setup/services/TestMailService.java +++ b/src/test/java/app/milo/server/test/units/core/setup/services/TestMailService.java @@ -5,8 +5,8 @@ import java.util.Properties; -import javax.mail.Session; -import javax.mail.internet.MimeMessage; +import jakarta.mail.Session; +import jakarta.mail.internet.MimeMessage; import org.springframework.mail.javamail.JavaMailSender; import app.milo.server.core.config.GeneralConfiguration; diff --git a/src/test/java/app/milo/server/test/units/core/utils/date/setup/DateUtilTestEntity.java b/src/test/java/app/milo/server/test/units/core/utils/date/setup/DateUtilTestEntity.java index 588da647..9f4ee243 100644 --- a/src/test/java/app/milo/server/test/units/core/utils/date/setup/DateUtilTestEntity.java +++ b/src/test/java/app/milo/server/test/units/core/utils/date/setup/DateUtilTestEntity.java @@ -1,6 +1,6 @@ package app.milo.server.test.units.core.utils.date.setup; -import javax.persistence.Table; +import jakarta.persistence.Table; import app.milo.server.core.base.BaseEntity; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/test/java/app/milo/server/test/units/core/utils/persistence/PersistenceUtilsMappedByTest.java b/src/test/java/app/milo/server/test/units/core/utils/persistence/PersistenceUtilsMappedByTest.java index 4fa84e7e..b9b04d10 100644 --- a/src/test/java/app/milo/server/test/units/core/utils/persistence/PersistenceUtilsMappedByTest.java +++ b/src/test/java/app/milo/server/test/units/core/utils/persistence/PersistenceUtilsMappedByTest.java @@ -5,8 +5,8 @@ import java.util.ArrayList; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; import org.junit.jupiter.api.Test; import app.milo.server.core.utils.PersistenceUtils; diff --git a/src/test/java/app/milo/server/test/units/core/utils/persistence/setup/PersistenceEqualityEntity.java b/src/test/java/app/milo/server/test/units/core/utils/persistence/setup/PersistenceEqualityEntity.java index a049667f..26bc5efc 100644 --- a/src/test/java/app/milo/server/test/units/core/utils/persistence/setup/PersistenceEqualityEntity.java +++ b/src/test/java/app/milo/server/test/units/core/utils/persistence/setup/PersistenceEqualityEntity.java @@ -1,11 +1,11 @@ package app.milo.server.test.units.core.utils.persistence.setup; -import javax.persistence.Column; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Column; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.config.SetNullOnRemoval; import lombok.AccessLevel; diff --git a/src/test/java/app/milo/server/test/units/core/utils/persistence/setup/PersistenceValidityEntity.java b/src/test/java/app/milo/server/test/units/core/utils/persistence/setup/PersistenceValidityEntity.java index 291e688e..e5017aff 100644 --- a/src/test/java/app/milo/server/test/units/core/utils/persistence/setup/PersistenceValidityEntity.java +++ b/src/test/java/app/milo/server/test/units/core/utils/persistence/setup/PersistenceValidityEntity.java @@ -1,9 +1,9 @@ package app.milo.server.test.units.core.utils.persistence.setup; -import javax.persistence.Column; -import javax.persistence.JoinColumn; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.Column; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import app.milo.server.core.base.BaseEntity; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetAnnotationTest.java b/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetAnnotationTest.java index af90600e..976a1d9e 100644 --- a/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetAnnotationTest.java +++ b/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetAnnotationTest.java @@ -5,7 +5,7 @@ import java.util.ArrayList; -import javax.persistence.Transient; +import jakarta.persistence.Transient; import org.junit.jupiter.api.Test; import app.milo.server.core.utils.ReflectionUtils; diff --git a/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetAnnotationValueTest.java b/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetAnnotationValueTest.java index 747682a6..2bb47c04 100644 --- a/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetAnnotationValueTest.java +++ b/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetAnnotationValueTest.java @@ -5,7 +5,7 @@ import java.util.ArrayList; -import javax.persistence.OneToMany; +import jakarta.persistence.OneToMany; import org.junit.jupiter.api.Test; import app.milo.server.core.utils.ReflectionUtils; diff --git a/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetFieldWithAnnotationTest.java b/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetFieldWithAnnotationTest.java index 7961d381..e6f64675 100644 --- a/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetFieldWithAnnotationTest.java +++ b/src/test/java/app/milo/server/test/units/core/utils/reflection/ReflectionUtilsGetFieldWithAnnotationTest.java @@ -6,7 +6,7 @@ import java.lang.reflect.Field; import java.util.ArrayList; -import javax.persistence.OneToMany; +import jakarta.persistence.OneToMany; import org.assertj.core.api.Condition; import org.junit.jupiter.api.Test; diff --git a/src/test/java/app/milo/server/test/units/core/utils/reflection/setup/ReflectionTestEntity.java b/src/test/java/app/milo/server/test/units/core/utils/reflection/setup/ReflectionTestEntity.java index 18e26d8c..97e025ca 100644 --- a/src/test/java/app/milo/server/test/units/core/utils/reflection/setup/ReflectionTestEntity.java +++ b/src/test/java/app/milo/server/test/units/core/utils/reflection/setup/ReflectionTestEntity.java @@ -1,8 +1,8 @@ package app.milo.server.test.units.core.utils.reflection.setup; -import javax.persistence.OneToMany; -import javax.persistence.Table; -import javax.persistence.Transient; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; import app.milo.server.core.base.BaseEntity; import app.milo.server.core.config.DefaultSort; import lombok.AccessLevel; From 74a724c2e794ef6e76a58eb572ce8718b3f88f8c Mon Sep 17 00:00:00 2001 From: DOOMED2WIN Date: Fri, 12 Jul 2024 15:21:27 +0200 Subject: [PATCH 2/3] chore:(upgr-sprg-bt-3): Changed Security and deprecated func --- pom.xml | 7 +-- src/main/java/app/milo/server/App.java | 27 +++++------ .../PageAttributeTypeEntity.java | 11 ++--- .../cms/components/page/base/PageEntity.java | 1 - .../userContext/base/UserContextEntity.java | 30 ++++-------- .../core/error/CustomExceptionHandler.java | 44 +++++++++++++++++ .../error/ExceptionResolverInterceptor.java | 48 ------------------- .../errorMessage/ErrorMessageService.java | 36 +++++++------- .../QueryableReadRepositoryImpl.java | 30 +++++------- .../features/event/base/EventEntity.java | 24 ++++------ .../NavigatorPageTranslatableEntity.java | 7 ++- src/main/resources/application.properties | 4 ++ 12 files changed, 117 insertions(+), 152 deletions(-) create mode 100644 src/main/java/app/milo/server/core/error/CustomExceptionHandler.java delete mode 100644 src/main/java/app/milo/server/core/error/ExceptionResolverInterceptor.java diff --git a/pom.xml b/pom.xml index 75f61e69..92c0a972 100644 --- a/pom.xml +++ b/pom.xml @@ -40,8 +40,6 @@ v1-rev20230701-2.0.0 4.2 0.8.7 - 2.1.3 - 4.0.0 17 3.29.2-GA 1.15.4 @@ -162,7 +160,7 @@ org.liquibase liquibase-core -