Cascade for some associations

pull/1/head
Jens Pelzetter 2019-09-08 11:37:04 +02:00
parent 3c7b4b56d9
commit 5d653ee61b
15 changed files with 96 additions and 22 deletions

View File

@ -11,6 +11,7 @@ import org.scientificcms.publications.CollectedVolume;
import java.util.Objects; import java.util.Objects;
import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.OneToOne; import javax.persistence.OneToOne;
@ -29,7 +30,11 @@ public class CollectedVolumeAsset extends Asset {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@OneToOne @OneToOne(cascade = {CascadeType.DETACH,
CascadeType.MERGE,
CascadeType.PERSIST,
CascadeType.REFRESH
})
@JoinColumn(name = "COLLECTED_VOLUME_ID") @JoinColumn(name = "COLLECTED_VOLUME_ID")
private CollectedVolume collectedVolume; private CollectedVolume collectedVolume;

View File

@ -11,6 +11,7 @@ import org.scientificcms.publications.Journal;
import java.util.Objects; import java.util.Objects;
import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.OneToOne; import javax.persistence.OneToOne;
@ -30,7 +31,11 @@ public class JournalAsset extends Asset {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@OneToOne @OneToOne(cascade = {CascadeType.DETACH,
CascadeType.MERGE,
CascadeType.PERSIST,
CascadeType.REFRESH
})
@JoinColumn(name = "JOURNAL_ID") @JoinColumn(name = "JOURNAL_ID")
private Journal journal; private Journal journal;

View File

@ -11,6 +11,7 @@ import org.scientificcms.publications.Proceedings;
import java.util.Objects; import java.util.Objects;
import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.OneToOne; import javax.persistence.OneToOne;
@ -29,7 +30,11 @@ public class ProceedingsAsset extends Asset {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@OneToOne @OneToOne(cascade = {CascadeType.DETACH,
CascadeType.MERGE,
CascadeType.PERSIST,
CascadeType.REFRESH
})
@JoinColumn(name = "PROCEEDINGS_ID") @JoinColumn(name = "PROCEEDINGS_ID")
private Proceedings proceedings; private Proceedings proceedings;

View File

@ -11,6 +11,7 @@ import org.scientificcms.publications.Publisher;
import java.util.Objects; import java.util.Objects;
import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.OneToOne; import javax.persistence.OneToOne;
@ -31,7 +32,11 @@ public class PublisherAsset extends Asset {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@OneToOne @OneToOne(cascade = {CascadeType.DETACH,
CascadeType.MERGE,
CascadeType.PERSIST,
CascadeType.REFRESH
})
@JoinColumn(name = "PUBLISHER_ID") @JoinColumn(name = "PUBLISHER_ID")
private Publisher publisher; private Publisher publisher;

View File

@ -10,6 +10,7 @@ import org.scientificcms.publications.ArticleInCollectedVolume;
import java.util.Objects; import java.util.Objects;
import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.OneToOne; import javax.persistence.OneToOne;
@ -29,7 +30,11 @@ public class ArticleInCollectedVolumeItem
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@OneToOne @OneToOne(cascade = {CascadeType.DETACH,
CascadeType.MERGE,
CascadeType.PERSIST,
CascadeType.REFRESH
})
@JoinColumn(name = "ARTICLE_ID") @JoinColumn(name = "ARTICLE_ID")
private ArticleInCollectedVolume article; private ArticleInCollectedVolume article;

View File

@ -10,6 +10,7 @@ import org.scientificcms.publications.ArticleInJournal;
import java.util.Objects; import java.util.Objects;
import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.OneToOne; import javax.persistence.OneToOne;
@ -29,7 +30,11 @@ public class ArticleInJournalItem
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@OneToOne @OneToOne(cascade = {CascadeType.DETACH,
CascadeType.MERGE,
CascadeType.PERSIST,
CascadeType.REFRESH
})
@JoinColumn(name = "ARTICLE_ID") @JoinColumn(name = "ARTICLE_ID")
private ArticleInJournal article; private ArticleInJournal article;

View File

@ -11,6 +11,7 @@ import org.scientificcms.publications.PublicationWithPublisher;
import java.util.Objects; import java.util.Objects;
import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.OneToOne; import javax.persistence.OneToOne;
@ -30,7 +31,11 @@ public class CollectedVolumeItem
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@OneToOne @OneToOne(cascade = {CascadeType.DETACH,
CascadeType.MERGE,
CascadeType.PERSIST,
CascadeType.REFRESH
})
@JoinColumn(name = "COLLECTED_VOLUME_ID") @JoinColumn(name = "COLLECTED_VOLUME_ID")
private CollectedVolume collectedVolume; private CollectedVolume collectedVolume;

View File

@ -10,6 +10,7 @@ import org.scientificcms.publications.Expertise;
import java.util.Objects; import java.util.Objects;
import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.OneToOne; import javax.persistence.OneToOne;
@ -24,12 +25,16 @@ import static org.scientificcms.publications.SciPublicationsConstants.*;
@Entity @Entity
@Table(name = "EXPERTISE_ITEMS", schema = DB_SCHEMA) @Table(name = "EXPERTISE_ITEMS", schema = DB_SCHEMA)
@Audited @Audited
public class ExpertiseItem public class ExpertiseItem
extends AbstractPublicationItem<Expertise> { extends AbstractPublicationItem<Expertise> {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@OneToOne @OneToOne(cascade = {CascadeType.DETACH,
CascadeType.MERGE,
CascadeType.PERSIST,
CascadeType.REFRESH
})
@JoinColumn(name = "EXPERTISE_ID") @JoinColumn(name = "EXPERTISE_ID")
private Expertise expertise; private Expertise expertise;
@ -65,7 +70,7 @@ public class ExpertiseItem
return false; return false;
} }
final ExpertiseItem other final ExpertiseItem other
= (ExpertiseItem) obj; = (ExpertiseItem) obj;
if (!other.canEqual(this)) { if (!other.canEqual(this)) {
return false; return false;
} }

View File

@ -10,6 +10,7 @@ import org.scientificcms.publications.GreyLiterature;
import java.util.Objects; import java.util.Objects;
import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.OneToOne; import javax.persistence.OneToOne;
@ -29,7 +30,11 @@ public class GreyLiteratureItem
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@OneToOne @OneToOne(cascade = {CascadeType.DETACH,
CascadeType.MERGE,
CascadeType.PERSIST,
CascadeType.REFRESH
})
@JoinColumn(name = "GREY_LITERATURE_ID") @JoinColumn(name = "GREY_LITERATURE_ID")
private GreyLiterature greyLiterature; private GreyLiterature greyLiterature;

View File

@ -10,6 +10,7 @@ import org.scientificcms.publications.InProceedings;
import java.util.Objects; import java.util.Objects;
import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.OneToOne; import javax.persistence.OneToOne;
@ -29,7 +30,11 @@ public class InProceedingsItem
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@OneToOne @OneToOne(cascade = {CascadeType.DETACH,
CascadeType.MERGE,
CascadeType.PERSIST,
CascadeType.REFRESH
})
@JoinColumn(name = "INPROCEEDINGS_ID") @JoinColumn(name = "INPROCEEDINGS_ID")
private InProceedings inProcedings; private InProceedings inProcedings;

View File

@ -10,6 +10,7 @@ import org.scientificcms.publications.InternetArticle;
import java.util.Objects; import java.util.Objects;
import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.OneToOne; import javax.persistence.OneToOne;
@ -24,12 +25,16 @@ import static org.scientificcms.publications.SciPublicationsConstants.*;
@Entity @Entity
@Table(name = "INTERNET_ARTICLE_ITEMS", schema = DB_SCHEMA) @Table(name = "INTERNET_ARTICLE_ITEMS", schema = DB_SCHEMA)
@Audited @Audited
public class InternetArticleItem public class InternetArticleItem
extends AbstractPublicationItem<InternetArticle> { extends AbstractPublicationItem<InternetArticle> {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@OneToOne @OneToOne(cascade = {CascadeType.DETACH,
CascadeType.MERGE,
CascadeType.PERSIST,
CascadeType.REFRESH
})
@JoinColumn(name = "EXPERTISE_ID") @JoinColumn(name = "EXPERTISE_ID")
private InternetArticle expertise; private InternetArticle expertise;
@ -65,7 +70,7 @@ public class InternetArticleItem
return false; return false;
} }
final InternetArticleItem other final InternetArticleItem other
= (InternetArticleItem) obj; = (InternetArticleItem) obj;
if (!other.canEqual(this)) { if (!other.canEqual(this)) {
return false; return false;
} }

View File

@ -9,6 +9,7 @@ import org.scientificcms.publications.Monograph;
import java.util.Objects; import java.util.Objects;
import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.OneToOne; import javax.persistence.OneToOne;
@ -27,7 +28,11 @@ public class MonographItem
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@OneToOne @OneToOne(cascade = {CascadeType.DETACH,
CascadeType.MERGE,
CascadeType.PERSIST,
CascadeType.REFRESH
})
@JoinColumn(name = "MONOGRAPH_ID") @JoinColumn(name = "MONOGRAPH_ID")
private Monograph monograph; private Monograph monograph;

View File

@ -9,6 +9,7 @@ import org.scientificcms.publications.Proceedings;
import java.util.Objects; import java.util.Objects;
import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.OneToOne; import javax.persistence.OneToOne;
@ -27,7 +28,11 @@ public class ProceedingsItem
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@OneToOne @OneToOne(cascade = {CascadeType.DETACH,
CascadeType.MERGE,
CascadeType.PERSIST,
CascadeType.REFRESH
})
@JoinColumn(name = "PROCEEDINGS_ID") @JoinColumn(name = "PROCEEDINGS_ID")
private Proceedings article; private Proceedings article;

View File

@ -10,6 +10,7 @@ import org.scientificcms.publications.Talk;
import java.util.Objects; import java.util.Objects;
import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.OneToOne; import javax.persistence.OneToOne;
@ -24,12 +25,16 @@ import static org.scientificcms.publications.SciPublicationsConstants.*;
@Entity @Entity
@Table(name = "TALK_ITEMS", schema = DB_SCHEMA) @Table(name = "TALK_ITEMS", schema = DB_SCHEMA)
@Audited @Audited
public class TalkItem public class TalkItem
extends AbstractPublicationItem<Talk> { extends AbstractPublicationItem<Talk> {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@OneToOne @OneToOne(cascade = {CascadeType.DETACH,
CascadeType.MERGE,
CascadeType.PERSIST,
CascadeType.REFRESH
})
@JoinColumn(name = "TALK_ID") @JoinColumn(name = "TALK_ID")
private Talk talk; private Talk talk;
@ -65,7 +70,7 @@ public class TalkItem
return false; return false;
} }
final TalkItem other final TalkItem other
= (TalkItem) obj; = (TalkItem) obj;
if (!other.canEqual(this)) { if (!other.canEqual(this)) {
return false; return false;
} }

View File

@ -6,11 +6,11 @@
package org.scientificcms.publications.contenttypes; package org.scientificcms.publications.contenttypes;
import org.hibernate.envers.Audited; import org.hibernate.envers.Audited;
import org.scientificcms.publications.Expertise;
import org.scientificcms.publications.WorkingPaper; import org.scientificcms.publications.WorkingPaper;
import java.util.Objects; import java.util.Objects;
import javax.persistence.CascadeType;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.OneToOne; import javax.persistence.OneToOne;
@ -30,7 +30,11 @@ public class WorkingPaperItem
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@OneToOne @OneToOne(cascade = {CascadeType.DETACH,
CascadeType.MERGE,
CascadeType.PERSIST,
CascadeType.REFRESH
})
@JoinColumn(name = "EXPERTISE_ID") @JoinColumn(name = "EXPERTISE_ID")
private WorkingPaper workingPaper; private WorkingPaper workingPaper;