From 1a6778b4c6fef2435300e9ec4a3bfd3711d566e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Tue, 26 Sep 2017 14:05:45 +0300 Subject: [PATCH] Removed IBasicUnitOfWork --- src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll | Bin 15872 -> 15872 bytes src/Volo.Abp/Volo/Abp/Uow/ChildUnitOfWork.cs | 37 ++++++++---------- src/Volo.Abp/Volo/Abp/Uow/IBasicUnitOfWork.cs | 26 ------------ src/Volo.Abp/Volo/Abp/Uow/IUnitOfWork.cs | 29 ++++++++++++-- .../Volo/Abp/Uow/IUnitOfWorkManager.cs | 4 +- src/Volo.Abp/Volo/Abp/Uow/UnitOfWork.cs | 10 +++++ .../Volo/Abp/Uow/UnitOfWorkFailedEventArgs.cs | 6 +-- .../Volo/Abp/Uow/UnitOfWorkManager.cs | 9 ++--- .../Abp/Uow/UnitOfWorkManagerExtensions.cs | 2 +- 9 files changed, 61 insertions(+), 62 deletions(-) delete mode 100644 src/Volo.Abp/Volo/Abp/Uow/IBasicUnitOfWork.cs diff --git a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll index 484411d11ecce57e134ddd62f903e5a95be1a7ff..8d7194d4e637278377ed7c43e9664c6fd503388f 100644 GIT binary patch delta 1834 zcmYL~Yitx%6vzMP&h9*RcV@TS2lQcq7Ft?bp$fIMB~Yngg9uGQsi`ppMC$_tE2i>T z8nn{XAj|jwDbgAV0V|0tA3!vwq$xB-!Xrd0fdU$_NJIpaEvWI_Ta5GJx95G%%$&Qk zVeN*sTQ+&(&fOi+cQU9ny7x)C>JsI8%WHrVx4O8%t)*O=;Wkl((p?gX_KC3oVfYHf z#)x@(VPz1=u4!0Rzx=sZrQ=i@5ZBnYum;C7fe_oWXD_U(Pla99`M_KKWJYvhx-I|p5DSH5{Fgm#L0J?o)toO?bJM})p zhf(|@a?tMV_F!81liMo~u7H4oadq}DvL%dHNi-#5uWSJUz9e>Q#< zI&Ld1I`Wv?63CnVvvZ9M6lKe-ZtI2qAhtHd=)o6s^V1&|otW)M2S`ee|`TE^@J1;0}Bw(hp$r>GYy0RrB zW1OsUnM&L~JAKA6Ymt_M{2XcHIL=DJgG$>7A3kEAJmEn;)PxuLFcLbQ{~55|`A&*k z?gS|ARyh+R8;wxNgDa*CIj%_tYy&Uz?Q~hh1IY%dOds-?ArvW2Rjg2~VkYy6kltFw z#ftTcD-|0Rn-n{kY1qru(Hl`e{V3rb?#Cf*G=`KVfx4_5tYn7J!7N0JvIkJ?nS}td zoO#S;Mjevaz8qat;WQva$-R{9c@L-Q8~ronQQZ82pWTnzC1$%A#2`%z{)L-#%`m8l zBGPS%pNtWdAbi1mrsI@Ro;YaFrYb7-)X-Rrcb3v*?58zULC<(}OcnPtQ+X^MwbbBi zqSLscwNjOM-`qmm@wc;$Dnys{F_o*VMisdocg2^~#PU&!DoefC6)}3L5_`DxW9t4Y zF_rhGQJipoQ$yUQ!z#1@ow^|k@QLmhO+v=xiO=njIIXf;M4OW@qN1NBiLt1sVzB^w ztZGq*UNS@g2k2Rr2W-FS5C@$ITQ-@^%t70`hQ1J;vBuC6O12_dWcH*7A!Z_(fkR4~TQkk1miaa(YF@}9 zoyEKzS8AHl!e%j@-aph4+-s_6%7;yx{|MT=ylQRgALxiU<9vddBJq7F{{i7TAjUSI!8$%zUB#~dB! zM3NKcLGpJVNJoVsOB2bX>lae~)|TUr2*{VR%aqiEk^{;+$Jon_&mrmK^YF_GyYybe zhirZkx#)5ZaO7#@JG}rCI;{>Wz%4%Z2*Os8T80!w;^iXVn4MOdTj5X3n(N%rzkqsd>&04=G!JymapJXhu{t!B<-3$KwnuL|55f+Z&-9tNi zoO?BaZlxuV?JHsJ_Fe5CqfFD_87m`WsGus%gPr4~);>Dn&JJYUGs!!uTefrpiru(sLrG!s+r`nv2ztj$!~>!TA~%feix z$!>#z$L?EcT;lz5_`bx~c`j8a;{I%TfWg2=w>JL@*v`9WDDj7ODC*66e|lx-w3 zC&(HXXtLX5XG}S1&DBy-kSlE*$62X(NNF43!w&Yz8$Nf@GQ*2ReQ|x4>V;@sTGO9k#U^4IU8645ZU{G1Yl(2HKj2S{Fvk04%J%CcrbOey+ z)G=Q&=3xZem*6-}cUB@($w?aN*@`~;QvVeBG-UqBXZN#qp1DU1V1T9u|HgH?W*AgL zQR%kCfH8`~A{Z=SrZ^RpFOJ$ZR7<6v1{#kdXCY0*ep*Y_^sGlmxwxO1#$)Mdq848p z_2HVfnQFxja|>;U2yUZlk+43XN|n{3BDdp?_>9_E{+eRS(kwoT8cCXlkGb>{>ibPY zIqyx2=yR^BA#T!96AA!G8zAv+}cRMsZZ=@f{VI77u^JesLg%t5y` zTk!7z86to~^gPSI*nZI|jyh4cylu8KuiD=#e83r@@t0V zMfcC}Ioj)tsJXCs{;!fFZO-z{>4_98JSh4XhF*AK5 diff --git a/src/Volo.Abp/Volo/Abp/Uow/ChildUnitOfWork.cs b/src/Volo.Abp/Volo/Abp/Uow/ChildUnitOfWork.cs index 3c054bbd5d..b476bc5996 100644 --- a/src/Volo.Abp/Volo/Abp/Uow/ChildUnitOfWork.cs +++ b/src/Volo.Abp/Volo/Abp/Uow/ChildUnitOfWork.cs @@ -13,27 +13,9 @@ namespace Volo.Abp.Uow public IUnitOfWork Outer => _parent.Outer; - public bool IsReserved - { - get => _parent.IsReserved; - set => _parent.IsReserved = value; - } - - public string ReservationName - { - get => _parent.ReservationName; - set => _parent.ReservationName = value; - } - - public void SetOuter(IUnitOfWork outer) - { - _parent.SetOuter(outer); - } + public bool IsReserved => _parent.IsReserved; - public void Initialize(UnitOfWorkOptions options) - { - _parent.Initialize(options); - } + public string ReservationName => _parent.ReservationName; public event EventHandler Completed; public event EventHandler Failed; @@ -54,6 +36,21 @@ namespace Volo.Abp.Uow _parent.Disposed += (sender, args) => { Disposed.InvokeSafely(sender, args); }; } + public void SetOuter(IUnitOfWork outer) + { + _parent.SetOuter(outer); + } + + public void Initialize(UnitOfWorkOptions options) + { + _parent.Initialize(options); + } + + public void Reserve(string reservationName) + { + _parent.Reserve(reservationName); + } + public void SaveChanges() { _parent.SaveChanges(); diff --git a/src/Volo.Abp/Volo/Abp/Uow/IBasicUnitOfWork.cs b/src/Volo.Abp/Volo/Abp/Uow/IBasicUnitOfWork.cs deleted file mode 100644 index 11d26a7640..0000000000 --- a/src/Volo.Abp/Volo/Abp/Uow/IBasicUnitOfWork.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System; -using System.Threading; -using System.Threading.Tasks; - -namespace Volo.Abp.Uow -{ - //TODO: Find a better naming :( - public interface IBasicUnitOfWork : IDisposable - { - Guid Id { get; } - - event EventHandler Completed; - - event EventHandler Failed; - - event EventHandler Disposed; - - void SaveChanges(); - - Task SaveChangesAsync(CancellationToken cancellationToken = default(CancellationToken)); - - void Complete(); - - Task CompleteAsync(CancellationToken cancellationToken = default(CancellationToken)); - } -} \ No newline at end of file diff --git a/src/Volo.Abp/Volo/Abp/Uow/IUnitOfWork.cs b/src/Volo.Abp/Volo/Abp/Uow/IUnitOfWork.cs index acee44e91d..f3436023c9 100644 --- a/src/Volo.Abp/Volo/Abp/Uow/IUnitOfWork.cs +++ b/src/Volo.Abp/Volo/Abp/Uow/IUnitOfWork.cs @@ -1,19 +1,40 @@ -using JetBrains.Annotations; +using System; +using System.Threading; +using System.Threading.Tasks; +using JetBrains.Annotations; namespace Volo.Abp.Uow { - public interface IUnitOfWork : IBasicUnitOfWork, IDatabaseApiContainer, ITransactionApiContainer + public interface IUnitOfWork : IDatabaseApiContainer, ITransactionApiContainer, IDisposable { + Guid Id { get; } + + event EventHandler Completed; + + event EventHandler Failed; + + event EventHandler Disposed; + IUnitOfWorkOptions Options { get; } IUnitOfWork Outer { get; } - bool IsReserved { get; set; } + bool IsReserved { get; } - string ReservationName { get; set; } + string ReservationName { get; } void SetOuter([CanBeNull] IUnitOfWork outer); void Initialize([NotNull] UnitOfWorkOptions options); + + void Reserve([NotNull] string reservationName); + + void SaveChanges(); + + Task SaveChangesAsync(CancellationToken cancellationToken = default(CancellationToken)); + + void Complete(); + + Task CompleteAsync(CancellationToken cancellationToken = default(CancellationToken)); } } diff --git a/src/Volo.Abp/Volo/Abp/Uow/IUnitOfWorkManager.cs b/src/Volo.Abp/Volo/Abp/Uow/IUnitOfWorkManager.cs index d1f8c534fb..264390fbbe 100644 --- a/src/Volo.Abp/Volo/Abp/Uow/IUnitOfWorkManager.cs +++ b/src/Volo.Abp/Volo/Abp/Uow/IUnitOfWorkManager.cs @@ -8,10 +8,10 @@ namespace Volo.Abp.Uow IUnitOfWork Current { get; } [NotNull] - IBasicUnitOfWork Begin([NotNull] UnitOfWorkOptions options, bool requiresNew = false); + IUnitOfWork Begin([NotNull] UnitOfWorkOptions options, bool requiresNew = false); [NotNull] - IBasicUnitOfWork Reserve([NotNull] string reservationName, bool requiresNew = false); + IUnitOfWork Reserve([NotNull] string reservationName, bool requiresNew = false); void BeginReserved([NotNull] string reservationName, [NotNull] UnitOfWorkOptions options); diff --git a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWork.cs b/src/Volo.Abp/Volo/Abp/Uow/UnitOfWork.cs index d6441ab01f..b481bd5da4 100644 --- a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWork.cs +++ b/src/Volo.Abp/Volo/Abp/Uow/UnitOfWork.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; +using JetBrains.Annotations; using Microsoft.Extensions.Options; using Volo.Abp.DependencyInjection; @@ -52,6 +53,15 @@ namespace Volo.Abp.Uow } Options = _defaultOptions.Normalize(options.Clone()); + IsReserved = false; + } + + public void Reserve(string reservationName) + { + Check.NotNull(reservationName, nameof(reservationName)); + + ReservationName = reservationName; + IsReserved = true; } public void SetOuter(IUnitOfWork outer) diff --git a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkFailedEventArgs.cs b/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkFailedEventArgs.cs index 870f125f4f..e17dfa4bc0 100644 --- a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkFailedEventArgs.cs +++ b/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkFailedEventArgs.cs @@ -9,12 +9,12 @@ namespace Volo.Abp.Uow public class UnitOfWorkFailedEventArgs : EventArgs { /// - /// Exception that caused failure. This is set only if an error occured during . - /// Can be null if there is no exception, but is not called. + /// Exception that caused failure. This is set only if an error occured during . + /// Can be null if there is no exception, but is not called. /// Can be null if another exception occurred during the UOW. /// [CanBeNull] - public Exception Exception { get; private set; } + public Exception Exception { get; } /// /// Creates a new object. diff --git a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkManager.cs b/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkManager.cs index 077481ffa1..447a6c182e 100644 --- a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkManager.cs +++ b/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkManager.cs @@ -19,7 +19,7 @@ namespace Volo.Abp.Uow _ambientUnitOfWork = ambientUnitOfWork; } - public IBasicUnitOfWork Begin(UnitOfWorkOptions options, bool requiresNew = false) + public IUnitOfWork Begin(UnitOfWorkOptions options, bool requiresNew = false) { Check.NotNull(options, nameof(options)); @@ -34,7 +34,7 @@ namespace Volo.Abp.Uow return unitOfWork; } - public IBasicUnitOfWork Reserve(string reservationName, bool requiresNew = false) + public IUnitOfWork Reserve(string reservationName, bool requiresNew = false) { Check.NotNull(reservationName, nameof(reservationName)); @@ -46,9 +46,7 @@ namespace Volo.Abp.Uow } var unitOfWork = CreateNewUnitOfWork(); - - unitOfWork.IsReserved = true; - unitOfWork.ReservationName = reservationName; + unitOfWork.Reserve(reservationName); return unitOfWork; } @@ -78,7 +76,6 @@ namespace Volo.Abp.Uow return false; } - uow.IsReserved = false; uow.Initialize(options); return true; diff --git a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs b/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs index 3a9f949017..c9f888f275 100644 --- a/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs +++ b/src/Volo.Abp/Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs @@ -5,7 +5,7 @@ namespace Volo.Abp.Uow public static class UnitOfWorkManagerExtensions { [NotNull] - public static IBasicUnitOfWork Begin([NotNull] this IUnitOfWorkManager unitOfWorkManager, bool requiresNew = false) + public static IUnitOfWork Begin([NotNull] this IUnitOfWorkManager unitOfWorkManager, bool requiresNew = false) { Check.NotNull(unitOfWorkManager, nameof(unitOfWorkManager));