From 2e736be5fa0c29a4c4dd6fb5ac8ece91d2055494 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Fri, 11 Mar 2016 22:02:02 +0100 Subject: [PATCH] Some cascade/fetch cleanups: - CascadeType.MERGE is basicly an UPDATE statement, it needs to be REFRESH (from database to local entity object) - Fetch strategy EAGER is default, no need to specify it - updated jar(s) --- lib/juser-core.jar | Bin 30095 -> 38686 bytes lib/juser-lib.jar | Bin 4180 -> 4887 bytes .../events/sharing/type/SharingType.java | 2 +- .../model/addressbook/UserAddressbook.java | 2 +- .../entry/UserAddressbookEntry.java | 6 +++--- .../addressbook/shared/AddressbookShare.java | 6 +++--- .../addressbook/status/AddressbokStatus.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/juser-core.jar b/lib/juser-core.jar index 22b1352719e70921cb178edbaf2f44438454ab4e..7dad4a093ec73a3f597125d3068b39e293fae567 100644 GIT binary patch delta 8904 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 Dx8YV` delta 3493 zcmZ`*c~DhV82{aSd5^^lB0kw3$YVf2AP_J`Q513%1B1YmUqT&M4VkItVvI|Ek zHI>LEmr%o+X>81?W^AU(wEROIO~!w;(it;rYP7NMoO`|S-rNUs-}%nB{eI`W=YHqx z>y_Jom;8(J6)!))2N>O2+2Nm{B+!t#Ukulx#PC=sS-h0ar)+^VNsN1>Tru`b6T}!H zPZ8rHdAb+P&^bLRe>AVHLt1HBZxI1UM9- znLDgl6OP#yXePhld9pB-htBg7!r6#SP59T5t_dllstog>|~j(FS*dEu$*x=b~H1*@B8AbKB~2TRrT8X3I%}F*HhZB1lC}cHy)_? z6V)n~p_<*u&MBzDHWlsI?u~~kUPq^jR%}(##?|||)Xk;$xb!}k8quVp87(RpcBt5i zE){#Zv=3b@sw~5Q9sW_V3%gZp#9_9$EI76VvsJu|G!>;-prV{lEBSNv zCiQ(=#w71_$jE~iTeLJd0t#Mmq7X%;kSg#ZiZO9MvdDo_b}qFw%z=a{6_|^87)#n` z>+ljLYaWD0#&lYJ7+EHeEJAg+`A^-5k?uB{z!sAGSa|V7i!_gEGqD&2JY^aAEvdj# zI4K{kfu>PBeK1X3ct||Fg0z)vhBIbYCvL zir2_4(JpvHL{*nBl-98G@eV~w*n+J*14X5ZIbcaVjmVRvkTFn%D}xGV(bGtH7u)pUY_R&uAi=>;RO$vS z_+=2b)mWJoW5i~Y_{U*_J<=WfmMJ!UR0g&zAgzfFNuOclDTBJk%lX#i3r~()8S!F9OfJ|f)59&o2)2IY`=d(v|m`=Eg~LbO{6=!42 zU$D&-b`L(#g9l2_cVCSAio=LWxCbU$HV z;2Ml4s*`{c>TYllAl^cJlh7^c`txD)VVm9X#E-#_-*p)b;q2WuyZRZ2XmOkWDe{T$`0GY;y=+8`|vhWs9y(6smiq z%2iofa~vDf9wSno&A)r|2RbGAlj)MO)n9k?X5H;!BL2&EyL>W`)DG4v`?EE}hqJKl zLBf=>-7Z^fhN*kRaMrAwy2(^Nf=uD;qU^__LhS59rxrD=!!DlxTe!CZ;LfTE8`+Lpjd8t|9^LiDU?4s zF5wU3jezyZek_GWi-0S;wmz&RXZ}og2{@QEC?J-t@6g_n%N^e(V0EhT%FmSfvYMS5 zr7a6rT`si%{7H5R=$)kp__FgmwW?g-X_re%40T}L5SHAfiZ_teWtYPi7!Xfphq4`A lTGSCTeX&%S`Zq^Lq&QbDsjDl>w^%t`H2te8P*crk{{wwyhrj>; diff --git a/lib/juser-lib.jar b/lib/juser-lib.jar index 985516ffe2939cd31bb9248be244e20ccb985be7..f637271c38803627467b683fb564c07db7c11532 100644 GIT binary patch delta 831 zcmcbjFkOu|z?+$ci-CcIfuVLs_C#I{<{BVnF`u~tNZpbLQ-3r-)MRx=BQPDqXdwdR zdoUmYZ6JH{M^;(s)ZE0(ocP3)l%mw)Vts_+AOof|+JOzY!RQF4WteQi2FcX@t*d8b zU;trXs6mpb2DyTabN44gokje(H?7)~fY z+8o2g%M9|$<{VabW?oRBoPHXuRKU!@P%ycH!M-5vIxV+@}~h zC%@v(Pz9PU3N~GgK^$tj1juwoCJ|i%#66;1FZs)d$mNycS@(kk<)J zZ{zh4#E6o~{Cs+{sKJPAJ}5>Q`J`Dc14A7Yb(3xRgcQ&XQ3JXS0t6V|Is$!=&u5~9 zu1E={h5@7~f(dM%k{+669_Y~w)3u~=21JW2o+xtUR|eaw@R6l#Jy1CaJHt!>(n}hf zSfKv6!>llQ9|zmy2!0;0f4pb=HO>br2Vqe1f`KKClh}d&(U`o3-x#bA9(Ta_vxTVw a(n}iWa83Tt@6N}^z{fBPXiYjFNEQHeV#E~y delta 443 zcmbQPc13|Vz?+$ci-CcIfx%-@)MJ7iuoyuejqBr-m@G^rL^V!*%1%V * @author Roland Haeder */ diff --git a/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java b/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java index b6e87dc..7ff7cba 100644 --- a/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java +++ b/src/org/mxchange/addressbook/model/addressbook/UserAddressbook.java @@ -109,7 +109,7 @@ public class UserAddressbook implements Addressbook, Comparable { * Connection to "users" table */ @JoinColumn (name = "addressbook_user_id", nullable = false) - @OneToOne (targetEntity = LoginUser.class, optional = false, cascade = CascadeType.MERGE) + @OneToOne (targetEntity = LoginUser.class, optional = false, cascade = CascadeType.REFRESH) private User addressbookUser; /** diff --git a/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java b/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java index c65aead..d5ad054 100644 --- a/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java +++ b/src/org/mxchange/addressbook/model/addressbook/entry/UserAddressbookEntry.java @@ -62,7 +62,7 @@ public class UserAddressbookEntry implements AddressbookEntry, Comparable * @author Roland Haeder */ -- 2.39.5