Added Cascade.MERGE for some, not all relationships where Cascade.SAVE_UPDATE exists...

[cdmlib.git] / cdmlib-model / src / main / java / eu / etaxonomy / cdm / model / agent / Team.java

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java
index 3169200f6c65ea7ae373d400beef70a94ffb7539..19e9728a702c202659b2e081f445732889e13331 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Team.java
@@ -13,6 +13,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.ManyToMany;
 import javax.persistence.Transient;
 import javax.xml.bind.annotation.XmlAccessType;
@@ -27,6 +28,10 @@ import javax.xml.bind.annotation.XmlType;
 import org.apache.log4j.Logger;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
+import org.hibernate.annotations.IndexColumn;
+import org.hibernate.envers.Audited;
+import org.hibernate.search.annotations.Indexed;
+import org.springframework.beans.factory.annotation.Configurable;
 
 import eu.etaxonomy.cdm.strategy.cache.agent.TeamDefaultCacheStrategy;
 
@@ -56,6 +61,9 @@ import eu.etaxonomy.cdm.strategy.cache.agent.TeamDefaultCacheStrategy;
 })
 @XmlRootElement
 @Entity
+@Indexed(index = "eu.etaxonomy.cdm.model.agent.AgentBase")
+@Audited
+@Configurable
 public class Team extends TeamOrPersonBase<Team> {
        private static final long serialVersionUID = 97640416905934622L;
        public static final Logger logger = Logger.getLogger(Team.class);
@@ -69,6 +77,9 @@ public class Team extends TeamOrPersonBase<Team> {
     @XmlElement(name = "TeamMember")
     @XmlIDREF
     @XmlSchemaType(name = "IDREF")
+    @IndexColumn(name="sortIndex", base = 0)
+       @ManyToMany(fetch = FetchType.LAZY)
+       @Cascade(CascadeType.SAVE_UPDATE)
        private List<Person> teamMembers = new ArrayList<Person>();
        
        
@@ -92,19 +103,9 @@ public class Team extends TeamOrPersonBase<Team> {
         * Returns the list of {@link Person members} belonging to <i>this</i> team. 
         * A person may be a member of several distinct teams. 
         */
-       @ManyToMany
-       //@IndexColumn(name="sortIndex", base = 0)
-       //@JoinColumn (name = "representation_id",  nullable=false)
-       @Cascade({CascadeType.SAVE_UPDATE})
        public List<Person> getTeamMembers(){
                return this.teamMembers;
        }
-       /** 
-        * @see     #getTeamMembers()
-        */
-       protected void setTeamMembers(List<Person> teamMembers){
-               this.teamMembers = teamMembers;
-       }
        
        /** 
         * Adds a new {@link Person person} to <i>this</i> team at the end of the members' list. 
@@ -159,10 +160,10 @@ public class Team extends TeamOrPersonBase<Team> {
         * 
         * @return  a string which identifies <i>this</i> team
         */
-       @Override
-       public String generateTitle() {
-               return cacheStrategy.getTitleCache(this);
-       }
+//     @Override
+//     public String generateTitle() {
+//             return cacheStrategy.getTitleCache(this);
+//     }
        
        
        /**
@@ -215,9 +216,4 @@ public class Team extends TeamOrPersonBase<Team> {
                this.nomenclaturalTitle = nomenclaturalTitle;
                this.protectedNomenclaturalTitleCache = protectedNomenclaturalTitleCache;
        }
-
-       
-       
-       
-
 }
\ No newline at end of file