From 5d653ee61b22d9293cfe279554c7a27e16e36546 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sun, 8 Sep 2019 11:37:04 +0200 Subject: [PATCH] Cascade for some associations --- .../publications/assets/CollectedVolumeAsset.java | 7 ++++++- .../publications/assets/JournalAsset.java | 7 ++++++- .../publications/assets/ProceedingsAsset.java | 7 ++++++- .../publications/assets/PublisherAsset.java | 7 ++++++- .../contenttypes/ArticleInCollectedVolumeItem.java | 7 ++++++- .../contenttypes/ArticleInJournalItem.java | 7 ++++++- .../contenttypes/CollectedVolumeItem.java | 7 ++++++- .../publications/contenttypes/ExpertiseItem.java | 11 ++++++++--- .../publications/contenttypes/GreyLiteratureItem.java | 7 ++++++- .../publications/contenttypes/InProceedingsItem.java | 7 ++++++- .../contenttypes/InternetArticleItem.java | 11 ++++++++--- .../publications/contenttypes/MonographItem.java | 7 ++++++- .../publications/contenttypes/ProceedingsItem.java | 7 ++++++- .../publications/contenttypes/TalkItem.java | 11 ++++++++--- .../publications/contenttypes/WorkingPaperItem.java | 8 ++++++-- 15 files changed, 96 insertions(+), 22 deletions(-) diff --git a/sci-publications/src/main/java/org/scientificcms/publications/assets/CollectedVolumeAsset.java b/sci-publications/src/main/java/org/scientificcms/publications/assets/CollectedVolumeAsset.java index bc42d06..4e375e9 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/assets/CollectedVolumeAsset.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/assets/CollectedVolumeAsset.java @@ -11,6 +11,7 @@ import org.scientificcms.publications.CollectedVolume; import java.util.Objects; +import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; @@ -29,7 +30,11 @@ public class CollectedVolumeAsset extends Asset { private static final long serialVersionUID = 1L; - @OneToOne + @OneToOne(cascade = {CascadeType.DETACH, + CascadeType.MERGE, + CascadeType.PERSIST, + CascadeType.REFRESH + }) @JoinColumn(name = "COLLECTED_VOLUME_ID") private CollectedVolume collectedVolume; diff --git a/sci-publications/src/main/java/org/scientificcms/publications/assets/JournalAsset.java b/sci-publications/src/main/java/org/scientificcms/publications/assets/JournalAsset.java index 2c8235d..10f0b2a 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/assets/JournalAsset.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/assets/JournalAsset.java @@ -11,6 +11,7 @@ import org.scientificcms.publications.Journal; import java.util.Objects; +import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; @@ -30,7 +31,11 @@ public class JournalAsset extends Asset { private static final long serialVersionUID = 1L; - @OneToOne + @OneToOne(cascade = {CascadeType.DETACH, + CascadeType.MERGE, + CascadeType.PERSIST, + CascadeType.REFRESH + }) @JoinColumn(name = "JOURNAL_ID") private Journal journal; diff --git a/sci-publications/src/main/java/org/scientificcms/publications/assets/ProceedingsAsset.java b/sci-publications/src/main/java/org/scientificcms/publications/assets/ProceedingsAsset.java index 0414673..19ae191 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/assets/ProceedingsAsset.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/assets/ProceedingsAsset.java @@ -11,6 +11,7 @@ import org.scientificcms.publications.Proceedings; import java.util.Objects; +import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; @@ -29,7 +30,11 @@ public class ProceedingsAsset extends Asset { private static final long serialVersionUID = 1L; - @OneToOne + @OneToOne(cascade = {CascadeType.DETACH, + CascadeType.MERGE, + CascadeType.PERSIST, + CascadeType.REFRESH + }) @JoinColumn(name = "PROCEEDINGS_ID") private Proceedings proceedings; diff --git a/sci-publications/src/main/java/org/scientificcms/publications/assets/PublisherAsset.java b/sci-publications/src/main/java/org/scientificcms/publications/assets/PublisherAsset.java index 67f00e0..e288865 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/assets/PublisherAsset.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/assets/PublisherAsset.java @@ -11,6 +11,7 @@ import org.scientificcms.publications.Publisher; import java.util.Objects; +import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; @@ -31,7 +32,11 @@ public class PublisherAsset extends Asset { private static final long serialVersionUID = 1L; - @OneToOne + @OneToOne(cascade = {CascadeType.DETACH, + CascadeType.MERGE, + CascadeType.PERSIST, + CascadeType.REFRESH + }) @JoinColumn(name = "PUBLISHER_ID") private Publisher publisher; diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ArticleInCollectedVolumeItem.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ArticleInCollectedVolumeItem.java index 5892f7e..64c4328 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ArticleInCollectedVolumeItem.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ArticleInCollectedVolumeItem.java @@ -10,6 +10,7 @@ import org.scientificcms.publications.ArticleInCollectedVolume; import java.util.Objects; +import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; @@ -29,7 +30,11 @@ public class ArticleInCollectedVolumeItem private static final long serialVersionUID = 1L; - @OneToOne + @OneToOne(cascade = {CascadeType.DETACH, + CascadeType.MERGE, + CascadeType.PERSIST, + CascadeType.REFRESH + }) @JoinColumn(name = "ARTICLE_ID") private ArticleInCollectedVolume article; diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ArticleInJournalItem.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ArticleInJournalItem.java index f4416fb..b278b73 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ArticleInJournalItem.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ArticleInJournalItem.java @@ -10,6 +10,7 @@ import org.scientificcms.publications.ArticleInJournal; import java.util.Objects; +import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; @@ -29,7 +30,11 @@ public class ArticleInJournalItem private static final long serialVersionUID = 1L; - @OneToOne + @OneToOne(cascade = {CascadeType.DETACH, + CascadeType.MERGE, + CascadeType.PERSIST, + CascadeType.REFRESH + }) @JoinColumn(name = "ARTICLE_ID") private ArticleInJournal article; diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/CollectedVolumeItem.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/CollectedVolumeItem.java index 8edaa21..0e289cf 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/CollectedVolumeItem.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/CollectedVolumeItem.java @@ -11,6 +11,7 @@ import org.scientificcms.publications.PublicationWithPublisher; import java.util.Objects; +import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; @@ -30,7 +31,11 @@ public class CollectedVolumeItem private static final long serialVersionUID = 1L; - @OneToOne + @OneToOne(cascade = {CascadeType.DETACH, + CascadeType.MERGE, + CascadeType.PERSIST, + CascadeType.REFRESH + }) @JoinColumn(name = "COLLECTED_VOLUME_ID") private CollectedVolume collectedVolume; diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ExpertiseItem.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ExpertiseItem.java index 2b5b812..e2b8e32 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ExpertiseItem.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ExpertiseItem.java @@ -10,6 +10,7 @@ import org.scientificcms.publications.Expertise; import java.util.Objects; +import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; @@ -24,12 +25,16 @@ import static org.scientificcms.publications.SciPublicationsConstants.*; @Entity @Table(name = "EXPERTISE_ITEMS", schema = DB_SCHEMA) @Audited -public class ExpertiseItem +public class ExpertiseItem extends AbstractPublicationItem { private static final long serialVersionUID = 1L; - @OneToOne + @OneToOne(cascade = {CascadeType.DETACH, + CascadeType.MERGE, + CascadeType.PERSIST, + CascadeType.REFRESH + }) @JoinColumn(name = "EXPERTISE_ID") private Expertise expertise; @@ -65,7 +70,7 @@ public class ExpertiseItem return false; } final ExpertiseItem other - = (ExpertiseItem) obj; + = (ExpertiseItem) obj; if (!other.canEqual(this)) { return false; } diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/GreyLiteratureItem.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/GreyLiteratureItem.java index b7d6390..b8cec4c 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/GreyLiteratureItem.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/GreyLiteratureItem.java @@ -10,6 +10,7 @@ import org.scientificcms.publications.GreyLiterature; import java.util.Objects; +import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; @@ -29,7 +30,11 @@ public class GreyLiteratureItem private static final long serialVersionUID = 1L; - @OneToOne + @OneToOne(cascade = {CascadeType.DETACH, + CascadeType.MERGE, + CascadeType.PERSIST, + CascadeType.REFRESH + }) @JoinColumn(name = "GREY_LITERATURE_ID") private GreyLiterature greyLiterature; diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InProceedingsItem.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InProceedingsItem.java index 0cc99f9..b0b5815 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InProceedingsItem.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InProceedingsItem.java @@ -10,6 +10,7 @@ import org.scientificcms.publications.InProceedings; import java.util.Objects; +import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; @@ -29,7 +30,11 @@ public class InProceedingsItem private static final long serialVersionUID = 1L; - @OneToOne + @OneToOne(cascade = {CascadeType.DETACH, + CascadeType.MERGE, + CascadeType.PERSIST, + CascadeType.REFRESH + }) @JoinColumn(name = "INPROCEEDINGS_ID") private InProceedings inProcedings; diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InternetArticleItem.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InternetArticleItem.java index ad69bf9..becb01a 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InternetArticleItem.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/InternetArticleItem.java @@ -10,6 +10,7 @@ import org.scientificcms.publications.InternetArticle; import java.util.Objects; +import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; @@ -24,12 +25,16 @@ import static org.scientificcms.publications.SciPublicationsConstants.*; @Entity @Table(name = "INTERNET_ARTICLE_ITEMS", schema = DB_SCHEMA) @Audited -public class InternetArticleItem +public class InternetArticleItem extends AbstractPublicationItem { private static final long serialVersionUID = 1L; - @OneToOne + @OneToOne(cascade = {CascadeType.DETACH, + CascadeType.MERGE, + CascadeType.PERSIST, + CascadeType.REFRESH + }) @JoinColumn(name = "EXPERTISE_ID") private InternetArticle expertise; @@ -65,7 +70,7 @@ public class InternetArticleItem return false; } final InternetArticleItem other - = (InternetArticleItem) obj; + = (InternetArticleItem) obj; if (!other.canEqual(this)) { return false; } diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/MonographItem.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/MonographItem.java index a448699..e650095 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/MonographItem.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/MonographItem.java @@ -9,6 +9,7 @@ import org.scientificcms.publications.Monograph; import java.util.Objects; +import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; @@ -27,7 +28,11 @@ public class MonographItem private static final long serialVersionUID = 1L; - @OneToOne + @OneToOne(cascade = {CascadeType.DETACH, + CascadeType.MERGE, + CascadeType.PERSIST, + CascadeType.REFRESH + }) @JoinColumn(name = "MONOGRAPH_ID") private Monograph monograph; diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ProceedingsItem.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ProceedingsItem.java index 24ef07d..0be31bb 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ProceedingsItem.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/ProceedingsItem.java @@ -9,6 +9,7 @@ import org.scientificcms.publications.Proceedings; import java.util.Objects; +import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; @@ -27,7 +28,11 @@ public class ProceedingsItem private static final long serialVersionUID = 1L; - @OneToOne + @OneToOne(cascade = {CascadeType.DETACH, + CascadeType.MERGE, + CascadeType.PERSIST, + CascadeType.REFRESH + }) @JoinColumn(name = "PROCEEDINGS_ID") private Proceedings article; diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/TalkItem.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/TalkItem.java index 2674256..a8648af 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/TalkItem.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/TalkItem.java @@ -10,6 +10,7 @@ import org.scientificcms.publications.Talk; import java.util.Objects; +import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; @@ -24,12 +25,16 @@ import static org.scientificcms.publications.SciPublicationsConstants.*; @Entity @Table(name = "TALK_ITEMS", schema = DB_SCHEMA) @Audited -public class TalkItem +public class TalkItem extends AbstractPublicationItem { private static final long serialVersionUID = 1L; - @OneToOne + @OneToOne(cascade = {CascadeType.DETACH, + CascadeType.MERGE, + CascadeType.PERSIST, + CascadeType.REFRESH + }) @JoinColumn(name = "TALK_ID") private Talk talk; @@ -65,7 +70,7 @@ public class TalkItem return false; } final TalkItem other - = (TalkItem) obj; + = (TalkItem) obj; if (!other.canEqual(this)) { return false; } diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/WorkingPaperItem.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/WorkingPaperItem.java index 918a945..6be3a53 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/WorkingPaperItem.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/WorkingPaperItem.java @@ -6,11 +6,11 @@ package org.scientificcms.publications.contenttypes; import org.hibernate.envers.Audited; -import org.scientificcms.publications.Expertise; import org.scientificcms.publications.WorkingPaper; import java.util.Objects; +import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; @@ -30,7 +30,11 @@ public class WorkingPaperItem private static final long serialVersionUID = 1L; - @OneToOne + @OneToOne(cascade = {CascadeType.DETACH, + CascadeType.MERGE, + CascadeType.PERSIST, + CascadeType.REFRESH + }) @JoinColumn(name = "EXPERTISE_ID") private WorkingPaper workingPaper;