From aba98ef0c6d4367b94340c793c83a70036bbca9e Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Sat, 9 May 2020 16:21:48 +0200 Subject: [PATCH] fixed jpa annotations for one to many --- .../models/database/AExperienceRole.java | 3 +-- .../models/database/ModMailThread.java | 8 ++++---- .../core/command/models/database/AModule.java | 3 +-- .../core/models/database/AFeature.java | 3 +-- .../core/models/database/AServer.java | 20 +++++++++---------- .../abstracto/core/models/database/AUser.java | 3 ++- 6 files changed, 19 insertions(+), 21 deletions(-) diff --git a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-int/src/main/java/dev/sheldan/abstracto/experience/models/database/AExperienceRole.java b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-int/src/main/java/dev/sheldan/abstracto/experience/models/database/AExperienceRole.java index 86f4553f6..033c8019b 100644 --- a/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-int/src/main/java/dev/sheldan/abstracto/experience/models/database/AExperienceRole.java +++ b/abstracto-application/abstracto-modules/experience-tracking/experience-tracking-int/src/main/java/dev/sheldan/abstracto/experience/models/database/AExperienceRole.java @@ -59,9 +59,8 @@ public class AExperienceRole implements Serializable { /** * Current list of {@link dev.sheldan.abstracto.core.models.database.AUserInAServer} which were given this role. */ - @OneToMany(fetch = FetchType.LAZY) + @OneToMany(fetch = FetchType.LAZY, mappedBy = "currentExperienceRole") @Builder.Default - @JoinColumn(name = "experience_role_id") @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private List users = new ArrayList<>(); diff --git a/abstracto-application/abstracto-modules/modmail/modmail-int/src/main/java/dev/sheldan/abstracto/modmail/models/database/ModMailThread.java b/abstracto-application/abstracto-modules/modmail/modmail-int/src/main/java/dev/sheldan/abstracto/modmail/models/database/ModMailThread.java index 7cf7cd376..651345042 100644 --- a/abstracto-application/abstracto-modules/modmail/modmail-int/src/main/java/dev/sheldan/abstracto/modmail/models/database/ModMailThread.java +++ b/abstracto-application/abstracto-modules/modmail/modmail-int/src/main/java/dev/sheldan/abstracto/modmail/models/database/ModMailThread.java @@ -49,8 +49,8 @@ public class ModMailThread { @OneToMany( fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.MERGE}, - orphanRemoval = true) - @JoinColumn(name = "threadReference") + orphanRemoval = true, + mappedBy = "threadReference") @Builder.Default @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private List messages = new ArrayList<>(); @@ -58,8 +58,8 @@ public class ModMailThread { @OneToMany( fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.MERGE}, - orphanRemoval = true) - @JoinColumn(name = "modMailThread") + orphanRemoval = true, + mappedBy = "threadReference") @Builder.Default @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private List subscribers = new ArrayList<>(); diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/database/AModule.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/database/AModule.java index 8b3731ea2..a13fbf867 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/database/AModule.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/command/models/database/AModule.java @@ -31,9 +31,8 @@ public class AModule { @OneToMany( fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.MERGE}, - orphanRemoval = true) + orphanRemoval = true, mappedBy = "module") @Builder.Default - @JoinColumn(name = "module_id") @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private List commands = new ArrayList<>(); diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AFeature.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AFeature.java index 1aaf5ee73..f99b3e5c2 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AFeature.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AFeature.java @@ -30,8 +30,7 @@ public class AFeature implements SnowFlake { @Getter @Setter - @OneToMany - @JoinColumn(name = "feature_id") + @OneToMany(fetch = FetchType.LAZY, mappedBy = "module") @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private List commands; diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AServer.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AServer.java index d4c44dfac..e7c433a6e 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AServer.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AServer.java @@ -28,35 +28,35 @@ public class AServer implements SnowFlake, Serializable { @OneToMany( fetch = FetchType.LAZY, - orphanRemoval = true) + orphanRemoval = true, + mappedBy = "server") @Builder.Default - @JoinColumn(name = "role_server_id") @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private List roles = new ArrayList<>(); @OneToMany( fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.MERGE}, - orphanRemoval = true) + orphanRemoval = true, + mappedBy = "server") @Builder.Default - @JoinColumn(name = "server_id") @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private List channels = new ArrayList<>(); @OneToMany( fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.MERGE}, - orphanRemoval = true) + orphanRemoval = true, + mappedBy = "server") @Builder.Default - @JoinColumn(name = "group_server") @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private List channelGroups = new ArrayList<>(); @OneToMany( fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.MERGE}, - orphanRemoval = true) - @JoinColumn(name = "serverReference") + orphanRemoval = true, + mappedBy = "serverReference") @Builder.Default @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private List users = new ArrayList<>(); @@ -64,8 +64,8 @@ public class AServer implements SnowFlake, Serializable { @OneToMany( fetch = FetchType.LAZY, cascade = {CascadeType.PERSIST, CascadeType.MERGE}, - orphanRemoval = true) - @JoinColumn(name = "emote_server_id") + orphanRemoval = true, + mappedBy = "serverRef") @Builder.Default @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private List emotes = new ArrayList<>(); diff --git a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AUser.java b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AUser.java index 4afe4a0b7..f72ae2443 100644 --- a/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AUser.java +++ b/abstracto-application/core/core-interface/src/main/java/dev/sheldan/abstracto/core/models/database/AUser.java @@ -22,7 +22,8 @@ public class AUser { @OneToMany( fetch = FetchType.LAZY, - cascade = {CascadeType.PERSIST, CascadeType.MERGE}) + cascade = {CascadeType.PERSIST, CascadeType.MERGE}, + mappedBy = "serverReference") @org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.READ_WRITE) private List servers;