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
301
301
@ NotNull
302
302
@ OneToMany (
303
303
orphanRemoval = true ,
304
- mappedBy ="listOwner" ,
305
- fetch = FetchType .EAGER ,
306
- cascade = CascadeType .ALL
304
+ mappedBy ="listOwner" ,
305
+ fetch = FetchType .EAGER
307
306
)
308
307
private Set <UserList > ownLists = new HashSet <>();
309
308
310
309
@ NotNull
311
- @ JoinTable (
312
- name = "userlist_subcriber"
313
- )
314
310
@ ManyToMany (
315
- fetch = FetchType . EAGER ,
316
- cascade = CascadeType . ALL
311
+ mappedBy = "subscriber" ,
312
+ fetch = FetchType . EAGER
317
313
)
318
314
private Set <UserList > userListSubcriptions = new HashSet <>();
319
315
320
316
@ NotNull
321
- @ JoinTable (
322
- name = "userlist_members"
323
- )
324
317
@ ManyToMany (
325
- fetch = FetchType . EAGER ,
326
- cascade = CascadeType . ALL
318
+ mappedBy = "members" ,
319
+ fetch = FetchType . EAGER
327
320
)
328
321
private Set <UserList > userListMemberships = new HashSet <>();
329
322
Original file line number Diff line number Diff line change @@ -101,22 +101,17 @@ public String getListOwnersScreenName(){
101
101
return myuriPath .split ("/" )[1 ];
102
102
}
103
103
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" )
111
106
private User listOwner ;
112
107
113
108
114
109
@ JoinTable (
115
110
name ="userlist_members"
116
111
)
117
112
@ ManyToMany (
118
- cascade = { ALL },
119
- fetch = EAGER
113
+ cascade = { DETACH , REFRESH , REMOVE },
114
+ fetch = LAZY
120
115
)
121
116
private Set <User > members = new LinkedHashSet <User >();
122
117
@@ -125,8 +120,8 @@ public String getListOwnersScreenName(){
125
120
name ="userlist_subcriber"
126
121
)
127
122
@ ManyToMany (
128
- cascade = { ALL },
129
- fetch = EAGER
123
+ cascade = { DETACH , REFRESH , REMOVE },
124
+ fetch = LAZY
130
125
)
131
126
private Set <User > subscriber = new LinkedHashSet <User >();
132
127
You can’t perform that action at this time.
0 commit comments