diff --git a/build.gradle.kts b/build.gradle.kts index ccbe7f91..a985cba8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,14 +7,12 @@ plugins { val ktVer = "2.1.10" java - kotlin("plugin.lombok") version ktVer kotlin("jvm") version ktVer kotlin("plugin.spring") version ktVer kotlin("plugin.jpa") version ktVer kotlin("plugin.serialization") version ktVer kotlin("plugin.allopen") version ktVer kotlin("kapt") version ktVer - id("io.freefair.lombok") version "8.6" id("org.springframework.boot") version "3.2.3" id("com.github.ben-manes.versions") version "0.51.0" id("org.hibernate.orm") version "6.4.4.Final" diff --git a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserData.kt b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserData.kt index dcfc2bf7..c488a709 100644 --- a/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserData.kt +++ b/src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3UserData.kt @@ -15,7 +15,6 @@ import icu.samnyan.aqua.sega.general.model.Card import icu.samnyan.aqua.sega.util.AccessCodeSerializer import jakarta.persistence.* import kotlinx.io.IOException -import lombok.NoArgsConstructor import java.time.LocalDateTime import java.time.format.DateTimeFormatter @@ -33,7 +32,6 @@ class FlexibleDateTimeDeserializer : JsonDeserializer() { @Entity(name = "ChusanUserData") @Table(name = "chusan_user_data") -@NoArgsConstructor class Chu3UserData : BaseEntity(), IUserData { @JsonSerialize(using = AccessCodeSerializer::class) @JsonProperty(value = "accessCode", access = JsonProperty.Access.READ_ONLY) diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt index 4bb37550..19cdbdb3 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/handler/UpsertUserAllHandler.kt @@ -13,14 +13,12 @@ import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserDetail import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserGeneralData import icu.samnyan.aqua.sega.maimai2.model.userdata.Mai2UserRate import icu.samnyan.aqua.sega.util.BasicMapper -import lombok.AllArgsConstructor import org.slf4j.LoggerFactory import org.springframework.stereotype.Component /** * @author samnyan (privateamusement@protonmail.com) */ -@AllArgsConstructor @Component("Maimai2UpsertUserAllHandler") class UpsertUserAllHandler( val mapper: BasicMapper, diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/GameDataEntities.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/GameDataEntities.kt index d2db3efe..ea990114 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/GameDataEntities.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/GameDataEntities.kt @@ -5,9 +5,8 @@ import icu.samnyan.aqua.net.games.BaseEntity import jakarta.persistence.Column import jakarta.persistence.Entity import jakarta.persistence.Table -import lombok.Data -@Data @Entity +@Entity @Table(name = "maimai2_game_event") class Mai2GameEvent : BaseEntity() { @JsonIgnore(false) @@ -22,7 +21,7 @@ class Mai2GameEvent : BaseEntity() { var disableArea = "" } -@Data @Entity +@Entity @Table(name = "maimai2_game_charge") class Mai2GameCharge : BaseEntity() { @Column(unique = true) @@ -33,7 +32,7 @@ class Mai2GameCharge : BaseEntity() { val endDate: String? = null } -@Data @Entity +@Entity @Table(name = "maimai2_game_selling_card") class Mai2GameSellingCard : BaseEntity() { var cardId = 0L diff --git a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserEntities.kt b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserEntities.kt index a2cb52b3..4d39264c 100644 --- a/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserEntities.kt +++ b/src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserEntities.kt @@ -16,9 +16,6 @@ import icu.samnyan.aqua.net.games.IGenericUserMusic import icu.samnyan.aqua.net.games.IUserEntity import icu.samnyan.aqua.sega.general.IntegerListConverter import jakarta.persistence.* -import lombok.AllArgsConstructor -import lombok.Data -import lombok.NoArgsConstructor import java.time.LocalDate import java.time.LocalDateTime import java.time.format.DateTimeFormatter @@ -33,7 +30,7 @@ open class Mai2UserEntity : BaseEntity(), IUserEntity { @Table(name = "maimai2_user_npc_encount") -@Data @Entity +@Entity class Mai2MapEncountNpc : Mai2UserEntity() { var npcId = 0 @@ -46,7 +43,7 @@ class Mai2MapEncountNpc : Mai2UserEntity() { } @Table(name = "maimai2_user_activity") -@Data @Entity +@Entity class Mai2UserAct : Mai2UserEntity() { var kind = 0 @@ -61,7 +58,7 @@ class Mai2UserAct : Mai2UserEntity() { } @Table(name = "maimai2_user_card") -@Data @Entity +@Entity class Mai2UserCard : Mai2UserEntity() { var cardId: Int = 0 var cardTypeId: Int = 0 @@ -72,7 +69,7 @@ class Mai2UserCard : Mai2UserEntity() { } @Table(name = "maimai2_user_character") -@Data @Entity +@Entity class Mai2UserCharacter : Mai2UserEntity() { var characterId = 0 @@ -101,7 +98,7 @@ class Mai2UserCharacter : Mai2UserEntity() { } @Table(name = "maimai2_user_charge", uniqueConstraints = [UniqueConstraint(columnNames = ["user_id", "charge_id"])]) -@Data @Entity +@Entity class Mai2UserCharge : Mai2UserEntity() { @Column(name = "charge_id") var chargeId = 0 @@ -111,7 +108,7 @@ class Mai2UserCharge : Mai2UserEntity() { } @Table(name = "maimai2_user_course") -@Data @Entity +@Entity class Mai2UserCourse : Mai2UserEntity() { var courseId = 0 var isLastClear = false @@ -128,7 +125,7 @@ class Mai2UserCourse : Mai2UserEntity() { } @Table(name = "maimai2_user_extend") -@Data @Entity +@Entity class Mai2UserExtend : Mai2UserEntity() { var selectMusicId = 0 var selectDifficultyId = 0 @@ -153,7 +150,7 @@ class Mai2UserExtend : Mai2UserEntity() { } @Table(name = "maimai2_user_favorite") -@Data @Entity +@Entity class Mai2UserFavorite : Mai2UserEntity() { @JsonProperty("userId") var favUserId: Long = 0 @@ -164,7 +161,7 @@ class Mai2UserFavorite : Mai2UserEntity() { } @Table(name = "maimai2_user_friend_season_ranking") -@Data @Entity +@Entity class Mai2UserFriendSeasonRanking : Mai2UserEntity() { var seasonId = 0 var point = 0 @@ -181,7 +178,7 @@ class Mai2UserFriendSeasonRanking : Mai2UserEntity() { * @author samnyan (privateamusement@protonmail.com) */ @Table(name = "maimai2_user_general_data") -@Data @Entity +@Entity class Mai2UserGeneralData : Mai2UserEntity() { var propertyKey = "" @@ -189,9 +186,6 @@ class Mai2UserGeneralData : Mai2UserEntity() { var propertyValue = "" } -@Data -@AllArgsConstructor -@NoArgsConstructor class Mai2UserGhost { var name: String = "" var iconId = 0 @@ -215,7 +209,7 @@ class Mai2UserGhost { } @Table(name = "maimai2_user_item") -@Data @Entity +@Entity class Mai2UserItem : Mai2UserEntity() { var itemKind = 0 var itemId = 0 @@ -243,7 +237,7 @@ enum class Mai2ItemKind(val id: Int) { } @Table(name = "maimai2_user_login_bonus") -@Data @Entity +@Entity class Mai2UserLoginBonus : Mai2UserEntity() { var bonusId = 0 var point = 0 @@ -252,7 +246,7 @@ class Mai2UserLoginBonus : Mai2UserEntity() { } @Table(name = "maimai2_user_map") -@Data @Entity +@Entity class Mai2UserMap : Mai2UserEntity() { var mapId = 0 var distance = 0 @@ -262,7 +256,7 @@ class Mai2UserMap : Mai2UserEntity() { } @Table(name = "maimai2_user_music_detail") -@Data @Entity +@Entity class Mai2UserMusicDetail : Mai2UserEntity(), IGenericUserMusic { override var musicId = 0 @@ -277,7 +271,7 @@ class Mai2UserMusicDetail : Mai2UserEntity(), IGenericUserMusic { } @Table(name = "maimai2_user_option") -@Data @Entity +@Entity class Mai2UserOption : Mai2UserEntity() { var optionKind = 0 var noteSpeed = 0 @@ -330,7 +324,7 @@ class Mai2UserOption : Mai2UserEntity() { } @Table(name = "maimai2_user_playlog") -@Data @Entity +@Entity class Mai2UserPlaylog : Mai2UserEntity(), IGenericGamePlaylog { var orderId = 0 var playlogId: Long = 0 @@ -464,7 +458,7 @@ fun main(args: Array) { } @Table(name = "maimai2_user_print_detail") -@Data @Entity +@Entity class Mai2UserPrintDetail : Mai2UserEntity() { var orderId: Long = 0 var printNumber = 0 @@ -500,7 +494,7 @@ data class Mai2UserRate( ) @Table(name = "maimai2_user_udemae") -@Data @Entity +@Entity class Mai2UserUdemae : Mai2UserEntity() { var rate = 0 var maxRate = 0 @@ -521,7 +515,7 @@ class Mai2UserUdemae : Mai2UserEntity() { } @Table(name = "maimai2_user_kaleidx") -@Data @Entity +@Entity class Mai2UserKaleidx : Mai2UserEntity() { var gateId = 1 var isGateFound = true @@ -545,7 +539,7 @@ class Mai2UserKaleidx : Mai2UserEntity() { } @Table(name = "maimai2_user_intimate") -@Data @Entity +@Entity class Mai2UserIntimate : Mai2UserEntity() { var partnerId = 1; var intimateLevel = 0;