Revert "WorkItem: 4707 non lazy initialization of teams, iterations a…

…nd products" This reverts commit e41f447.
betelgeuse · Mar 29, 2012 · f89afbf · f89afbf
1 parent 1dab056
commit f89afbf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/fi/hut/soberit/agilefant/model/Team.java b/src/fi/hut/soberit/agilefant/model/Team.java
@@ -5,7 +5,6 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
@@ -143,7 +142,7 @@ public void setUsers(Collection<User> users) {
      * 
      * return the products
      */
-    @ManyToMany(targetEntity = Product.class, fetch=FetchType.EAGER)
+    @ManyToMany(targetEntity = Product.class)
     @JoinTable(name = "team_product", joinColumns = { @JoinColumn(name = "Team_id") }, inverseJoinColumns = { @JoinColumn(name = "Product_id") })
     @BatchSize(size = 5)
     @JSON(include = false)
@@ -165,7 +164,7 @@ public void setProducts(Collection<Product> products) {
      * 
      * return the iterations
      */
-    @ManyToMany(targetEntity = Iteration.class, fetch=FetchType.EAGER)
+    @ManyToMany(targetEntity = Iteration.class)
     @JoinTable(name = "team_iteration", joinColumns = { @JoinColumn(name = "Team_id") }, inverseJoinColumns = { @JoinColumn(name = "Iteration_id") })
     @BatchSize(size = 5)
     @JSON(include = false)

diff --git a/src/fi/hut/soberit/agilefant/model/User.java b/src/fi/hut/soberit/agilefant/model/User.java
@@ -26,7 +26,6 @@
 import javax.xml.bind.annotation.XmlRootElement;
 
 import org.hibernate.annotations.BatchSize;
-import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.Type;
 import org.hibernate.envers.Audited;
 import org.hibernate.envers.NotAudited;
@@ -208,7 +207,7 @@ public void setInitials(String initials) {
      * 
      * @return the teams
      */
-    @ManyToMany(targetEntity = Team.class, fetch=FetchType.EAGER)
+    @ManyToMany(targetEntity = Team.class)
     @JoinTable(name = "team_user", joinColumns = { @JoinColumn(name = "User_id") }, inverseJoinColumns = { @JoinColumn(name = "Team_id") })
     @JSON(include = false)
     @NotAudited