File tree Expand file tree Collapse file tree 2 files changed +12
-24
lines changed
src/main/java/org/woehlke/twitterwall/oodm/model Expand file tree Collapse file tree 2 files changed +12
-24
lines changed Original file line number Diff line number Diff line change @@ -301,29 +301,22 @@ public class User extends AbstractDomainObject<User> implements DomainObjectWith
301301 @ NotNull
302302 @ OneToMany (
303303 orphanRemoval = true ,
304- mappedBy ="listOwner" ,
305- fetch = FetchType .EAGER ,
306- cascade = CascadeType .ALL
304+ mappedBy ="listOwner" ,
305+ fetch = FetchType .EAGER
307306 )
308307 private Set <UserList > ownLists = new HashSet <>();
309308
310309 @ NotNull
311- @ JoinTable (
312- name = "userlist_subcriber"
313- )
314310 @ ManyToMany (
315- fetch = FetchType . EAGER ,
316- cascade = CascadeType . ALL
311+ mappedBy = "subscriber" ,
312+ fetch = FetchType . EAGER
317313 )
318314 private Set <UserList > userListSubcriptions = new HashSet <>();
319315
320316 @ NotNull
321- @ JoinTable (
322- name = "userlist_members"
323- )
324317 @ ManyToMany (
325- fetch = FetchType . EAGER ,
326- cascade = CascadeType . ALL
318+ mappedBy = "members" ,
319+ fetch = FetchType . EAGER
327320 )
328321 private Set <UserList > userListMemberships = new HashSet <>();
329322
Original file line number Diff line number Diff line change @@ -101,22 +101,17 @@ public String getListOwnersScreenName(){
101101 return myuriPath .split ("/" )[1 ];
102102 }
103103
104- @ ManyToOne (
105- fetch = FetchType .EAGER ,
106- cascade = { ALL }
107- )
108- @ JoinColumn (
109- name ="fk_user_owner"
110- )
104+ @ ManyToOne (fetch = FetchType .EAGER )
105+ @ JoinColumn (name ="fk_user" )
111106 private User listOwner ;
112107
113108
114109 @ JoinTable (
115110 name ="userlist_members"
116111 )
117112 @ ManyToMany (
118- cascade = { ALL },
119- fetch = EAGER
113+ cascade = { DETACH , REFRESH , REMOVE },
114+ fetch = LAZY
120115 )
121116 private Set <User > members = new LinkedHashSet <User >();
122117
@@ -125,8 +120,8 @@ public String getListOwnersScreenName(){
125120 name ="userlist_subcriber"
126121 )
127122 @ ManyToMany (
128- cascade = { ALL },
129- fetch = EAGER
123+ cascade = { DETACH , REFRESH , REMOVE },
124+ fetch = LAZY
130125 )
131126 private Set <User > subscriber = new LinkedHashSet <User >();
132127
You can’t perform that action at this time.
0 commit comments