Project

General

Profile

« Previous | Next » 

Revision 32c018db

Added by Andreas Müller almost 6 years ago

ref #7392 remove cascade from relationships and adapt tests (up to service layer)

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonRelationship.java
22 22
import javax.xml.bind.annotation.XmlType;
23 23

  
24 24
import org.apache.log4j.Logger;
25
import org.hibernate.annotations.Cascade;
26
import org.hibernate.annotations.CascadeType;
27 25
import org.hibernate.envers.Audited;
28 26
import org.hibernate.search.annotations.Indexed;
29 27
import org.hibernate.search.annotations.IndexedEmbedded;
......
63 61
    @XmlIDREF
64 62
    @XmlSchemaType(name = "IDREF")
65 63
    @ManyToOne(fetch=FetchType.EAGER)
66
    @Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE})
64
//    @Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE})
67 65
    @IndexedEmbedded(includeEmbeddedObjectId=true, depth=1)
68 66
    private Taxon relatedFrom;
69 67

  
......
71 69
    @XmlIDREF
72 70
    @XmlSchemaType(name = "IDREF")
73 71
    @ManyToOne(fetch=FetchType.EAGER)
74
    @Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE})
72
//  @Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE})
75 73
    @IndexedEmbedded(includeEmbeddedObjectId=true, depth=1)
76 74
    private Taxon relatedTo;
77 75

  

Also available in: Unified diff