diff --git a/Src/Solid-TradeService/0.CodeBase/App.config b/Src/Solid-TradeService/0.CodeBase/App.config index 8324aa6..d1428ad 100644 --- a/Src/Solid-TradeService/0.CodeBase/App.config +++ b/Src/Solid-TradeService/0.CodeBase/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Src/Solid-TradeService/0.CodeBase/TradeApp.csproj b/Src/Solid-TradeService/0.CodeBase/TradeApp.csproj index 8a3e992..e1afb1d 100644 --- a/Src/Solid-TradeService/0.CodeBase/TradeApp.csproj +++ b/Src/Solid-TradeService/0.CodeBase/TradeApp.csproj @@ -9,9 +9,10 @@ Properties TradeApp TradeApp - v4.6 + v4.5 512 true + AnyCPU @@ -22,6 +23,8 @@ DEBUG;TRACE prompt 4 + 5 + 8192 AnyCPU diff --git a/Src/Solid-TradeService/1.CQS_Maybe/App.config b/Src/Solid-TradeService/1.CQS_Maybe/App.config index 8324aa6..d1428ad 100644 --- a/Src/Solid-TradeService/1.CQS_Maybe/App.config +++ b/Src/Solid-TradeService/1.CQS_Maybe/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Src/Solid-TradeService/1.CQS_Maybe/DealService.cs b/Src/Solid-TradeService/1.CQS_Maybe/DealService.cs index 4f392aa..60bc0cb 100644 --- a/Src/Solid-TradeService/1.CQS_Maybe/DealService.cs +++ b/Src/Solid-TradeService/1.CQS_Maybe/DealService.cs @@ -15,7 +15,7 @@ public class DealService public DealService(string username) { if(username == null) - { throw new ArgumentNullException(nameof(username)); } + { throw new ArgumentNullException("username"); } if (!Directory.Exists(username)) { Directory.CreateDirectory(username); } @@ -24,8 +24,8 @@ public DealService(string username) _cache = ImmutableDictionary.Empty; } - public string Username { get; } - + public string Username { get; private set; } + public void Save(string id, Deal deal) { _logger.Info("Saving deal "+ deal.Id); diff --git a/Src/Solid-TradeService/1.CQS_Maybe/Maybe.cs b/Src/Solid-TradeService/1.CQS_Maybe/Maybe.cs index bc37dff..7eea997 100644 --- a/Src/Solid-TradeService/1.CQS_Maybe/Maybe.cs +++ b/Src/Solid-TradeService/1.CQS_Maybe/Maybe.cs @@ -16,7 +16,7 @@ public Maybe() public Maybe(T value) { - if (value == null) throw new ArgumentNullException(nameof(value)); + if (value == null) throw new ArgumentNullException("value"); _values = new[] {value}; } diff --git a/Src/Solid-TradeService/1.CQS_Maybe/TradeApp.csproj b/Src/Solid-TradeService/1.CQS_Maybe/TradeApp.csproj index b72fe5a..e845a90 100644 --- a/Src/Solid-TradeService/1.CQS_Maybe/TradeApp.csproj +++ b/Src/Solid-TradeService/1.CQS_Maybe/TradeApp.csproj @@ -9,19 +9,22 @@ Properties TradeApp TradeApp - v4.6 + v4.5 512 true + AnyCPU true - full + pdbonly false bin\Debug\ DEBUG;TRACE - prompt + queue 4 + 5 + 2048 AnyCPU diff --git a/Src/Solid-TradeService/2.SRP/App.config b/Src/Solid-TradeService/2.SRP/App.config index 8324aa6..d1428ad 100644 --- a/Src/Solid-TradeService/2.SRP/App.config +++ b/Src/Solid-TradeService/2.SRP/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Src/Solid-TradeService/2.SRP/DealService.cs b/Src/Solid-TradeService/2.SRP/DealService.cs index 195fcde..7fd7bcd 100644 --- a/Src/Solid-TradeService/2.SRP/DealService.cs +++ b/Src/Solid-TradeService/2.SRP/DealService.cs @@ -14,7 +14,7 @@ public class DealService public DealService(string username) { if(username == null) - { throw new ArgumentNullException(nameof(username)); } + { throw new ArgumentNullException("username"); } if (!Directory.Exists(username)) { Directory.CreateDirectory(username); } @@ -22,7 +22,7 @@ public DealService(string username) Username = username; } - public string Username { get; } + public string Username { get;private set; } public void Save(string id, Deal deal) { diff --git a/Src/Solid-TradeService/2.SRP/DealServiceLogger.cs b/Src/Solid-TradeService/2.SRP/DealServiceLogger.cs index 1be074d..29de26d 100644 --- a/Src/Solid-TradeService/2.SRP/DealServiceLogger.cs +++ b/Src/Solid-TradeService/2.SRP/DealServiceLogger.cs @@ -9,27 +9,27 @@ public class DealServiceLogger public void Saving(Deal deal) { - _logger.Info($"Saving deal {deal.Id}."); + _logger.Info(string.Format("Saving deal {0}.", deal.Id)); } public void Saved(Deal deal) { - _logger.Info($"Saved deal {deal.Id}."); + _logger.Info(string.Format(@"Saved deal {0}.", deal.Id)); } public void Loading(string id) { - _logger.Info($"Loading deal {id}."); + _logger.Info(string.Format("Loading deal {0}.", id)); } public void DidNotFind(string id) { - _logger.Info($"No deal {id} found."); + _logger.Info(string.Format("No deal {0} found.", id)); } public void Loaded(Deal deal) { - _logger.Info($"Returning deal {deal.Id}."); + _logger.Info(string.Format("Returning deal {0}.", deal.Id)); } } } \ No newline at end of file diff --git a/Src/Solid-TradeService/2.SRP/Maybe.cs b/Src/Solid-TradeService/2.SRP/Maybe.cs index bc37dff..7eea997 100644 --- a/Src/Solid-TradeService/2.SRP/Maybe.cs +++ b/Src/Solid-TradeService/2.SRP/Maybe.cs @@ -16,7 +16,7 @@ public Maybe() public Maybe(T value) { - if (value == null) throw new ArgumentNullException(nameof(value)); + if (value == null) throw new ArgumentNullException("value"); _values = new[] {value}; } diff --git a/Src/Solid-TradeService/2.SRP/Models/Deal.cs b/Src/Solid-TradeService/2.SRP/Models/Deal.cs index da47454..7a70266 100644 --- a/Src/Solid-TradeService/2.SRP/Models/Deal.cs +++ b/Src/Solid-TradeService/2.SRP/Models/Deal.cs @@ -12,15 +12,18 @@ private Deal(string id, double price, int quantity, string symbol, DateTime tim Symbol = symbol; } - public static Deal Empty => new Deal("Empty", 0, 0, "Unset", DateTime.MinValue); + public static Deal Empty + { + get { return new Deal("Empty", 0, 0, "Unset", DateTime.MinValue); } + } + + public string Id { get; set; } + public double Price { get; set; } + public DateTime Time { get; set; } + public int Quantity { get; set; } - public string Id { get; } - public double Price { get; } - public DateTime Time { get; } - public int Quantity { get; } + public string Symbol { get; set; } - public string Symbol { get; } - public OrderDirection Direction { get { @@ -42,7 +45,8 @@ public Deal With(string id = null, double? price = null, int? quantity = null, s public override string ToString() { - return $"OrderId: {Id} {Direction} order for {Quantity} unit{(Quantity == 1 ? "" : "s")} of {Symbol}"; + return string.Format("OrderId: {0} {1} order for {2} unit{3} of {4}", Id, Direction, Quantity, + Quantity == 1 ? "" : "s", Symbol); } } } \ No newline at end of file diff --git a/Src/Solid-TradeService/2.SRP/TradeApp.csproj b/Src/Solid-TradeService/2.SRP/TradeApp.csproj index 6b27092..be4e751 100644 --- a/Src/Solid-TradeService/2.SRP/TradeApp.csproj +++ b/Src/Solid-TradeService/2.SRP/TradeApp.csproj @@ -9,9 +9,10 @@ Properties TradeApp TradeApp - v4.6 + v4.5 512 true + AnyCPU @@ -22,6 +23,7 @@ DEBUG;TRACE prompt 4 + 5 AnyCPU diff --git a/Src/Solid-TradeService/3.OCP/App.config b/Src/Solid-TradeService/3.OCP/App.config index 8324aa6..d1428ad 100644 --- a/Src/Solid-TradeService/3.OCP/App.config +++ b/Src/Solid-TradeService/3.OCP/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Src/Solid-TradeService/3.OCP/DealService.cs b/Src/Solid-TradeService/3.OCP/DealService.cs index 59fea59..b246ec3 100644 --- a/Src/Solid-TradeService/3.OCP/DealService.cs +++ b/Src/Solid-TradeService/3.OCP/DealService.cs @@ -6,64 +6,59 @@ namespace TradeApp { public class DealService { - private readonly DealServiceLogger _dealServiceLogger; - private readonly DealCaching _dealCaching; - private readonly DealStorage _dealStorage; - private readonly DealSerializer _dealSerializer; - - public DealService(string username) + public DealService(string username) { if(username == null) - { throw new ArgumentNullException(nameof(username)); } + { throw new ArgumentNullException("username"); } if (!Directory.Exists(username)) { Directory.CreateDirectory(username); } Username = username; - _dealCaching = new DealCaching(); - _dealStorage = new DealStorage(); - _dealSerializer = new DealSerializer(); - _dealServiceLogger = new DealServiceLogger(); + DealCaching = new DealCaching(); + DealStorage = new DealStorage(); + DealSerializer = new DealSerializer(); + DealServiceLogger = new DealServiceLogger(); } - public virtual DealCaching DealCaching => _dealCaching; + public virtual DealCaching DealCaching { get; private set; } - public virtual DealStorage DealStorage => _dealStorage; + public virtual DealStorage DealStorage { get; private set; } - public virtual DealServiceLogger DealServiceLogger => _dealServiceLogger; + public virtual DealServiceLogger DealServiceLogger { get; private set; } - public virtual DealSerializer DealSerializer => _dealSerializer; + public virtual DealSerializer DealSerializer { get; private set; } - public string Username { get; } + public string Username { get; private set; } public void Save(string id, Deal deal) { - _dealServiceLogger.Saving(deal); - var file = _dealStorage.GetFileName(id,Username); - var serializedDeal = _dealSerializer.SerializeDeal(deal); - _dealStorage.WriteDeal(file.FullName,serializedDeal); - _dealCaching.AddOrUpdate(id, deal); - _dealServiceLogger.Saved(deal); + DealServiceLogger.Saving(deal); + var file = DealStorage.GetFileName(id,Username); + var serializedDeal = DealSerializer.SerializeDeal(deal); + DealStorage.WriteDeal(file.FullName,serializedDeal); + DealCaching.AddOrUpdate(id, deal); + DealServiceLogger.Saved(deal); } public Maybe Load(string id) { - _dealServiceLogger.Loading(id); - var file = _dealStorage.GetFileName(id,Username); + DealServiceLogger.Loading(id); + var file = DealStorage.GetFileName(id,Username); if (!file.Exists) { - _dealServiceLogger.DidNotFind(id); + DealServiceLogger.DidNotFind(id); return new Maybe(); } try { - var deal = _dealCaching.GetOrAdd(id, _ => - _dealSerializer.DeserializeDeal(_dealStorage.ReadDeal(file.FullName))); + var deal = DealCaching.GetOrAdd(id, _ => + DealSerializer.DeserializeDeal(DealStorage.ReadDeal(file.FullName))); - _dealServiceLogger.Loaded(deal); + DealServiceLogger.Loaded(deal); return new Maybe(deal); } catch (Exception) diff --git a/Src/Solid-TradeService/3.OCP/DealServiceLogger.cs b/Src/Solid-TradeService/3.OCP/DealServiceLogger.cs index ab0996e..1eb6123 100644 --- a/Src/Solid-TradeService/3.OCP/DealServiceLogger.cs +++ b/Src/Solid-TradeService/3.OCP/DealServiceLogger.cs @@ -1,3 +1,4 @@ +using System; using TradeApp.Logging; using TradeApp.Models; @@ -9,27 +10,27 @@ public class DealServiceLogger public virtual void Saving(Deal deal) { - _logger.Info($"Saving deal {deal.Id}."); + _logger.Info(String.Format("Saving deal {0}.", deal.Id)); } public virtual void Saved(Deal deal) { - _logger.Info($"Saved deal {deal.Id}."); + _logger.Info(String.Format("Saved deal {0}.", deal.Id)); } public virtual void Loading(string id) { - _logger.Info($"Loading deal {id}."); + _logger.Info(String.Format("Loading deal {0}.", id)); } public virtual void DidNotFind(string id) { - _logger.Info($"No deal {id} found."); + _logger.Info(String.Format("No deal {0} found.", id)); } public virtual void Loaded(Deal deal) { - _logger.Info($"Returning deal {deal.Id}."); + _logger.Info(String.Format("Returning deal {0}.", deal.Id)); } } } \ No newline at end of file diff --git a/Src/Solid-TradeService/3.OCP/Maybe.cs b/Src/Solid-TradeService/3.OCP/Maybe.cs index bc37dff..7eea997 100644 --- a/Src/Solid-TradeService/3.OCP/Maybe.cs +++ b/Src/Solid-TradeService/3.OCP/Maybe.cs @@ -16,7 +16,7 @@ public Maybe() public Maybe(T value) { - if (value == null) throw new ArgumentNullException(nameof(value)); + if (value == null) throw new ArgumentNullException("value"); _values = new[] {value}; } diff --git a/Src/Solid-TradeService/3.OCP/Models/Deal.cs b/Src/Solid-TradeService/3.OCP/Models/Deal.cs index da47454..5a28284 100644 --- a/Src/Solid-TradeService/3.OCP/Models/Deal.cs +++ b/Src/Solid-TradeService/3.OCP/Models/Deal.cs @@ -12,15 +12,17 @@ private Deal(string id, double price, int quantity, string symbol, DateTime tim Symbol = symbol; } - public static Deal Empty => new Deal("Empty", 0, 0, "Unset", DateTime.MinValue); + public static Deal Empty + { + get { return new Deal("Empty", 0, 0, "Unset", DateTime.MinValue); } + } - public string Id { get; } - public double Price { get; } - public DateTime Time { get; } - public int Quantity { get; } + public string Id { get;private set; } + public double Price { get; private set; } + public DateTime Time { get; private set; } + public int Quantity { get; private set; } + public string Symbol { get; private set; } - public string Symbol { get; } - public OrderDirection Direction { get { @@ -42,7 +44,8 @@ public Deal With(string id = null, double? price = null, int? quantity = null, s public override string ToString() { - return $"OrderId: {Id} {Direction} order for {Quantity} unit{(Quantity == 1 ? "" : "s")} of {Symbol}"; + return String.Format("OrderId: {0} {1} order for {2} unit{3} of {4}", Id, Direction, Quantity, + Quantity == 1 ? "" : "s", Symbol); } } } \ No newline at end of file diff --git a/Src/Solid-TradeService/3.OCP/TradeApp.csproj b/Src/Solid-TradeService/3.OCP/TradeApp.csproj index fd27d63..1bdaf60 100644 --- a/Src/Solid-TradeService/3.OCP/TradeApp.csproj +++ b/Src/Solid-TradeService/3.OCP/TradeApp.csproj @@ -9,9 +9,10 @@ Properties TradeApp TradeApp - v4.6 + v4.5 512 true + AnyCPU @@ -22,6 +23,7 @@ DEBUG;TRACE prompt 4 + 5 AnyCPU diff --git a/Src/Solid-TradeService/4.LSP/App.config b/Src/Solid-TradeService/4.LSP/App.config index 8324aa6..d1428ad 100644 --- a/Src/Solid-TradeService/4.LSP/App.config +++ b/Src/Solid-TradeService/4.LSP/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Src/Solid-TradeService/4.LSP/DealService.cs b/Src/Solid-TradeService/4.LSP/DealService.cs index 59fea59..e56979e 100644 --- a/Src/Solid-TradeService/4.LSP/DealService.cs +++ b/Src/Solid-TradeService/4.LSP/DealService.cs @@ -6,64 +6,57 @@ namespace TradeApp { public class DealService { - private readonly DealServiceLogger _dealServiceLogger; - private readonly DealCaching _dealCaching; - private readonly DealStorage _dealStorage; - private readonly DealSerializer _dealSerializer; - + public DealService(string username) { if(username == null) - { throw new ArgumentNullException(nameof(username)); } + { throw new ArgumentNullException("username"); } if (!Directory.Exists(username)) { Directory.CreateDirectory(username); } Username = username; - _dealCaching = new DealCaching(); - _dealStorage = new DealStorage(); - _dealSerializer = new DealSerializer(); - _dealServiceLogger = new DealServiceLogger(); + DealCaching = new DealCaching(); + DealStorage = new DealStorage(); + DealSerializer = new DealSerializer(); + DealServiceLogger = new DealServiceLogger(); } - public virtual DealCaching DealCaching => _dealCaching; - - public virtual DealStorage DealStorage => _dealStorage; - - public virtual DealServiceLogger DealServiceLogger => _dealServiceLogger; - - public virtual DealSerializer DealSerializer => _dealSerializer; + public virtual DealCaching DealCaching { get; private set; } + public virtual DealStorage DealStorage { get; private set; } + public virtual DealServiceLogger DealServiceLogger { get; private set; } + public virtual DealSerializer DealSerializer { get; private set; } - public string Username { get; } + public string Username { get;private set; } public void Save(string id, Deal deal) { - _dealServiceLogger.Saving(deal); - var file = _dealStorage.GetFileName(id,Username); - var serializedDeal = _dealSerializer.SerializeDeal(deal); - _dealStorage.WriteDeal(file.FullName,serializedDeal); - _dealCaching.AddOrUpdate(id, deal); - _dealServiceLogger.Saved(deal); + DealServiceLogger.Saving(deal); + var file = DealStorage.GetFileName(id,Username); + var serializedDeal = DealSerializer.SerializeDeal(deal); + DealStorage.WriteDeal(file.FullName,serializedDeal); + DealCaching.AddOrUpdate(id, deal); + DealServiceLogger.Saved(deal); } public Maybe Load(string id) { - _dealServiceLogger.Loading(id); - var file = _dealStorage.GetFileName(id,Username); + DealServiceLogger.Loading(id); + var file = DealStorage.GetFileName(id,Username); if (!file.Exists) { - _dealServiceLogger.DidNotFind(id); + DealServiceLogger.DidNotFind(id); return new Maybe(); } try { - var deal = _dealCaching.GetOrAdd(id, _ => - _dealSerializer.DeserializeDeal(_dealStorage.ReadDeal(file.FullName))); + var deal = DealCaching.GetOrAdd(id, _ => + DealSerializer.DeserializeDeal(DealStorage.ReadDeal(file.FullName))); - _dealServiceLogger.Loaded(deal); + DealServiceLogger.Loaded(deal); return new Maybe(deal); } catch (Exception) diff --git a/Src/Solid-TradeService/4.LSP/DealServiceLogger.cs b/Src/Solid-TradeService/4.LSP/DealServiceLogger.cs index ab0996e..d14f944 100644 --- a/Src/Solid-TradeService/4.LSP/DealServiceLogger.cs +++ b/Src/Solid-TradeService/4.LSP/DealServiceLogger.cs @@ -9,27 +9,27 @@ public class DealServiceLogger public virtual void Saving(Deal deal) { - _logger.Info($"Saving deal {deal.Id}."); + _logger.Info(string.Format("Saving deal {0}.", deal.Id)); } public virtual void Saved(Deal deal) { - _logger.Info($"Saved deal {deal.Id}."); + _logger.Info(string.Format("Saved deal {0}.", deal.Id)); } public virtual void Loading(string id) { - _logger.Info($"Loading deal {id}."); + _logger.Info(string.Format("Loading deal {0}.", id)); } public virtual void DidNotFind(string id) { - _logger.Info($"No deal {id} found."); + _logger.Info(string.Format("No deal {0} found.", id)); } public virtual void Loaded(Deal deal) { - _logger.Info($"Returning deal {deal.Id}."); + _logger.Info(string.Format("Returning deal {0}.", deal.Id)); } } } \ No newline at end of file diff --git a/Src/Solid-TradeService/4.LSP/Maybe.cs b/Src/Solid-TradeService/4.LSP/Maybe.cs index bc37dff..7eea997 100644 --- a/Src/Solid-TradeService/4.LSP/Maybe.cs +++ b/Src/Solid-TradeService/4.LSP/Maybe.cs @@ -16,7 +16,7 @@ public Maybe() public Maybe(T value) { - if (value == null) throw new ArgumentNullException(nameof(value)); + if (value == null) throw new ArgumentNullException("value"); _values = new[] {value}; } diff --git a/Src/Solid-TradeService/4.LSP/Models/Deal.cs b/Src/Solid-TradeService/4.LSP/Models/Deal.cs index da47454..e63e4e8 100644 --- a/Src/Solid-TradeService/4.LSP/Models/Deal.cs +++ b/Src/Solid-TradeService/4.LSP/Models/Deal.cs @@ -12,15 +12,18 @@ private Deal(string id, double price, int quantity, string symbol, DateTime tim Symbol = symbol; } - public static Deal Empty => new Deal("Empty", 0, 0, "Unset", DateTime.MinValue); + public static Deal Empty + { + get { return new Deal("Empty", 0, 0, "Unset", DateTime.MinValue); } + } + + public string Id { get; set; } + public double Price { get; set; } + public DateTime Time { get; set; } + public int Quantity { get; set; } - public string Id { get; } - public double Price { get; } - public DateTime Time { get; } - public int Quantity { get; } + public string Symbol { get; set; } - public string Symbol { get; } - public OrderDirection Direction { get { @@ -42,7 +45,8 @@ public Deal With(string id = null, double? price = null, int? quantity = null, s public override string ToString() { - return $"OrderId: {Id} {Direction} order for {Quantity} unit{(Quantity == 1 ? "" : "s")} of {Symbol}"; + return String.Format("OrderId: {0} {1} order for {2} unit{3} of {4}", Id, Direction, Quantity, + Quantity == 1 ? "" : "s", Symbol); } } } \ No newline at end of file diff --git a/Src/Solid-TradeService/4.LSP/TradeApp.csproj b/Src/Solid-TradeService/4.LSP/TradeApp.csproj index 0fc2ff1..3e12685 100644 --- a/Src/Solid-TradeService/4.LSP/TradeApp.csproj +++ b/Src/Solid-TradeService/4.LSP/TradeApp.csproj @@ -9,9 +9,10 @@ Properties TradeApp TradeApp - v4.6 + v4.5 512 true + AnyCPU @@ -22,6 +23,7 @@ DEBUG;TRACE prompt 4 + 5 AnyCPU diff --git a/Src/Solid-TradeService/5.ISP/App.config b/Src/Solid-TradeService/5.ISP/App.config index 8324aa6..d1428ad 100644 --- a/Src/Solid-TradeService/5.ISP/App.config +++ b/Src/Solid-TradeService/5.ISP/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Src/Solid-TradeService/5.ISP/DealService.cs b/Src/Solid-TradeService/5.ISP/DealService.cs index 50e752b..430b83b 100644 --- a/Src/Solid-TradeService/5.ISP/DealService.cs +++ b/Src/Solid-TradeService/5.ISP/DealService.cs @@ -11,7 +11,7 @@ public class DealService public DealService(string username) { if (username == null) - { throw new ArgumentNullException(nameof(username)); } + { throw new ArgumentNullException("username"); } if (!Directory.Exists(username)) { Directory.CreateDirectory(username); } @@ -23,16 +23,16 @@ public DealService(string username) Logger = new DealServiceLogger(); } - public virtual IDealCaching Cache { get; } + public virtual IDealCaching Cache { get; set; } - public virtual IDealStorage Storage { get; } + public virtual IDealStorage Storage { get; set; } - public virtual IDealServiceLogger Logger { get; } + public virtual IDealServiceLogger Logger { get; set; } + + public virtual IDealSerializer Serializer { get; set; } + + public string Username { get; set; } - public virtual IDealSerializer Serializer { get; } - - public string Username { get; } - public void Save(string id, Deal deal) { Logger.Saving(deal); diff --git a/Src/Solid-TradeService/5.ISP/Logger/DealServiceLogger.cs b/Src/Solid-TradeService/5.ISP/Logger/DealServiceLogger.cs index bd2b2a9..fac3c66 100644 --- a/Src/Solid-TradeService/5.ISP/Logger/DealServiceLogger.cs +++ b/Src/Solid-TradeService/5.ISP/Logger/DealServiceLogger.cs @@ -9,27 +9,27 @@ public class DealServiceLogger : IDealServiceLogger public virtual void Saving(Deal deal) { - _logger.Info($"Saving deal {deal.Id}."); + _logger.Info(string.Format("Saving deal {0}.", deal.Id)); } public virtual void Saved(Deal deal) { - _logger.Info($"Saved deal {deal.Id}."); + _logger.Info(string.Format("Saved deal {0}.", deal.Id)); } public virtual void Loading(string id) { - _logger.Info($"Loading deal {id}."); + _logger.Info(string.Format("Loading deal {0}.", id)); } public virtual void DidNotFind(string id) { - _logger.Info($"No deal {id} found."); + _logger.Info(string.Format("No deal {0} found.", id)); } public virtual void Loaded(Deal deal) { - _logger.Info($"Returning deal {deal.Id}."); + _logger.Info(string.Format("Returning deal {0}.", deal.Id)); } } } \ No newline at end of file diff --git a/Src/Solid-TradeService/5.ISP/Maybe.cs b/Src/Solid-TradeService/5.ISP/Maybe.cs index bc37dff..7eea997 100644 --- a/Src/Solid-TradeService/5.ISP/Maybe.cs +++ b/Src/Solid-TradeService/5.ISP/Maybe.cs @@ -16,7 +16,7 @@ public Maybe() public Maybe(T value) { - if (value == null) throw new ArgumentNullException(nameof(value)); + if (value == null) throw new ArgumentNullException("value"); _values = new[] {value}; } diff --git a/Src/Solid-TradeService/5.ISP/Models/Deal.cs b/Src/Solid-TradeService/5.ISP/Models/Deal.cs index da47454..7a70266 100644 --- a/Src/Solid-TradeService/5.ISP/Models/Deal.cs +++ b/Src/Solid-TradeService/5.ISP/Models/Deal.cs @@ -12,15 +12,18 @@ private Deal(string id, double price, int quantity, string symbol, DateTime tim Symbol = symbol; } - public static Deal Empty => new Deal("Empty", 0, 0, "Unset", DateTime.MinValue); + public static Deal Empty + { + get { return new Deal("Empty", 0, 0, "Unset", DateTime.MinValue); } + } + + public string Id { get; set; } + public double Price { get; set; } + public DateTime Time { get; set; } + public int Quantity { get; set; } - public string Id { get; } - public double Price { get; } - public DateTime Time { get; } - public int Quantity { get; } + public string Symbol { get; set; } - public string Symbol { get; } - public OrderDirection Direction { get { @@ -42,7 +45,8 @@ public Deal With(string id = null, double? price = null, int? quantity = null, s public override string ToString() { - return $"OrderId: {Id} {Direction} order for {Quantity} unit{(Quantity == 1 ? "" : "s")} of {Symbol}"; + return string.Format("OrderId: {0} {1} order for {2} unit{3} of {4}", Id, Direction, Quantity, + Quantity == 1 ? "" : "s", Symbol); } } } \ No newline at end of file diff --git a/Src/Solid-TradeService/5.ISP/TradeApp.csproj b/Src/Solid-TradeService/5.ISP/TradeApp.csproj index dbf7be4..6a0090c 100644 --- a/Src/Solid-TradeService/5.ISP/TradeApp.csproj +++ b/Src/Solid-TradeService/5.ISP/TradeApp.csproj @@ -9,10 +9,11 @@ Properties TradeApp TradeApp - v4.6 + v4.5 512 true 1 + AnyCPU @@ -66,6 +67,7 @@ Full %28none%29 3 + 5 AnyCPU diff --git a/Src/Solid-TradeService/6.DIP/App.config b/Src/Solid-TradeService/6.DIP/App.config index 8324aa6..d1428ad 100644 --- a/Src/Solid-TradeService/6.DIP/App.config +++ b/Src/Solid-TradeService/6.DIP/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Src/Solid-TradeService/6.DIP/DealService.cs b/Src/Solid-TradeService/6.DIP/DealService.cs index fdc49aa..419abf2 100644 --- a/Src/Solid-TradeService/6.DIP/DealService.cs +++ b/Src/Solid-TradeService/6.DIP/DealService.cs @@ -13,8 +13,8 @@ public class DealService public DealService(IDealWriter writer, IDealReader reader) { - if (writer == null) { throw new ArgumentNullException(nameof(writer)); } - if (reader == null) { throw new ArgumentNullException(nameof(reader)); } + if (writer == null) { throw new ArgumentNullException("writer"); } + if (reader == null) { throw new ArgumentNullException("reader"); } _writer = writer; _reader = reader; diff --git a/Src/Solid-TradeService/6.DIP/Logger/DealServiceLogger.cs b/Src/Solid-TradeService/6.DIP/Logger/DealServiceLogger.cs index f0fd77c..c126c0b 100644 --- a/Src/Solid-TradeService/6.DIP/Logger/DealServiceLogger.cs +++ b/Src/Solid-TradeService/6.DIP/Logger/DealServiceLogger.cs @@ -1,3 +1,4 @@ +using System; using System.Linq; using TradeApp.Logging; using TradeApp.Models; @@ -19,33 +20,33 @@ public DealServiceLogger(IDealReader reader, IDealWriter writer) public virtual void Saving(Maybe deal) { if(deal.Any()) - _logger.Info($"Saving : {deal}."); + _logger.Info(String.Format("Saving : {0}.", deal)); else - _logger.Warn($" Try Saving : {deal}."); + _logger.Warn(String.Format(" Try Saving : {0}.", deal)); } public virtual void Saved(Maybe deal) { if (deal.Any()) - _logger.Info($"Saved : {deal}."); + _logger.Info(String.Format("Saved : {0}.", deal)); else - _logger.Warn($" Try Saved : {deal}."); + _logger.Warn(String.Format(" Try Saved : {0}.", deal)); } public virtual void Loading(string id) { - _logger.Info($"Loading deal {id}."); + _logger.Info(String.Format("Loading deal {0}.", id)); } public virtual void DidNotFind(string id) { - _logger.Warn($"No deal {id} found."); + _logger.Warn(String.Format("No deal {0} found.", id)); } public virtual void Loaded(Deal deal) { - _logger.Info($"Returning deal {deal.Id}."); + _logger.Info(String.Format("Returning deal {0}.", deal.Id)); } public Maybe Load(string id) diff --git a/Src/Solid-TradeService/6.DIP/Maybe.cs b/Src/Solid-TradeService/6.DIP/Maybe.cs index c7b4c69..ac340b8 100644 --- a/Src/Solid-TradeService/6.DIP/Maybe.cs +++ b/Src/Solid-TradeService/6.DIP/Maybe.cs @@ -17,7 +17,7 @@ public Maybe() public Maybe(T value) { - if (value == null) throw new ArgumentNullException(nameof(value)); + if (value == null) throw new ArgumentNullException("value"); _values = new[] {value}; } diff --git a/Src/Solid-TradeService/6.DIP/Models/Deal.cs b/Src/Solid-TradeService/6.DIP/Models/Deal.cs index da47454..e63e4e8 100644 --- a/Src/Solid-TradeService/6.DIP/Models/Deal.cs +++ b/Src/Solid-TradeService/6.DIP/Models/Deal.cs @@ -12,15 +12,18 @@ private Deal(string id, double price, int quantity, string symbol, DateTime tim Symbol = symbol; } - public static Deal Empty => new Deal("Empty", 0, 0, "Unset", DateTime.MinValue); + public static Deal Empty + { + get { return new Deal("Empty", 0, 0, "Unset", DateTime.MinValue); } + } + + public string Id { get; set; } + public double Price { get; set; } + public DateTime Time { get; set; } + public int Quantity { get; set; } - public string Id { get; } - public double Price { get; } - public DateTime Time { get; } - public int Quantity { get; } + public string Symbol { get; set; } - public string Symbol { get; } - public OrderDirection Direction { get { @@ -42,7 +45,8 @@ public Deal With(string id = null, double? price = null, int? quantity = null, s public override string ToString() { - return $"OrderId: {Id} {Direction} order for {Quantity} unit{(Quantity == 1 ? "" : "s")} of {Symbol}"; + return String.Format("OrderId: {0} {1} order for {2} unit{3} of {4}", Id, Direction, Quantity, + Quantity == 1 ? "" : "s", Symbol); } } } \ No newline at end of file diff --git a/Src/Solid-TradeService/6.DIP/TradeApp.csproj b/Src/Solid-TradeService/6.DIP/TradeApp.csproj index bf515d9..e87c4f0 100644 --- a/Src/Solid-TradeService/6.DIP/TradeApp.csproj +++ b/Src/Solid-TradeService/6.DIP/TradeApp.csproj @@ -9,10 +9,11 @@ Properties TradeApp TradeApp - v4.6 + v4.5 512 true 1 + AnyCPU @@ -66,6 +67,7 @@ Full %28none%29 3 + 5 AnyCPU diff --git a/Src/Solid-TradeService/7.IOC/App.config b/Src/Solid-TradeService/7.IOC/App.config index 8324aa6..d1428ad 100644 --- a/Src/Solid-TradeService/7.IOC/App.config +++ b/Src/Solid-TradeService/7.IOC/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Src/Solid-TradeService/7.IOC/Caching/DealCaching.cs b/Src/Solid-TradeService/7.IOC/Caching/DealCaching.cs index c059601..5162ac4 100644 --- a/Src/Solid-TradeService/7.IOC/Caching/DealCaching.cs +++ b/Src/Solid-TradeService/7.IOC/Caching/DealCaching.cs @@ -1,10 +1,8 @@ -using System; -using System.Collections.Immutable; -using System.Linq; +using System.Collections.Immutable; using Functional.Maybe; using TradeApp.Models; -namespace TradeApp +namespace TradeApp.Caching { public class Caching : IReadWrite where T : IIdentifiable { diff --git a/Src/Solid-TradeService/7.IOC/DealService.cs b/Src/Solid-TradeService/7.IOC/DealService.cs index 5672b21..41c76bc 100644 --- a/Src/Solid-TradeService/7.IOC/DealService.cs +++ b/Src/Solid-TradeService/7.IOC/DealService.cs @@ -10,7 +10,7 @@ public class DealService public DealService(IReadWrite dealReadWrite) { - if (dealReadWrite == null) { throw new ArgumentNullException(nameof(dealReadWrite)); } + if (dealReadWrite == null) { throw new ArgumentNullException("dealReadWrite"); } _dealReadWrite = dealReadWrite; } diff --git a/Src/Solid-TradeService/7.IOC/Logger/DealServiceLogger.cs b/Src/Solid-TradeService/7.IOC/Logger/DealServiceLogger.cs index 765efc0..e77a5d9 100644 --- a/Src/Solid-TradeService/7.IOC/Logger/DealServiceLogger.cs +++ b/Src/Solid-TradeService/7.IOC/Logger/DealServiceLogger.cs @@ -1,3 +1,4 @@ +using System; using System.ComponentModel; using System.Linq; using Functional.Maybe; @@ -20,33 +21,33 @@ public Logger(IReadWrite decoretee) public virtual void Saving(Maybe entity) { if(entity.HasValue) - _logger.Info($"Saving : {entity}."); + _logger.Info(String.Format("Saving : {0}.", entity)); else - _logger.Warn($" Try Saving : {entity}."); + _logger.Warn(String.Format(" Try Saving : {0}.", entity)); } public virtual void Saved(Maybe deal) { if (deal.HasValue) - _logger.Info($"Saved : {deal}."); + _logger.Info(String.Format("Saved : {0}.", deal)); else - _logger.Warn($" Try Saved : {deal}."); + _logger.Warn(String.Format(" Try Saved : {0}.", deal)); } public virtual void Loading(string id) { - _logger.Info($"Loading deal {id}."); + _logger.Info(String.Format("Loading deal {0}.", id)); } public virtual void DidNotFind(string id) { - _logger.Warn($"No deal {id} found."); + _logger.Warn(String.Format("No deal {0} found.", id)); } public virtual void Loaded(T entity) { - _logger.Info($"Returning deal {entity.Id}."); + _logger.Info(String.Format("Returning deal {0}.", entity.Id)); } public Maybe Load(string id) diff --git a/Src/Solid-TradeService/7.IOC/Models/Deal.cs b/Src/Solid-TradeService/7.IOC/Models/Deal.cs index 15dffd9..6707591 100644 --- a/Src/Solid-TradeService/7.IOC/Models/Deal.cs +++ b/Src/Solid-TradeService/7.IOC/Models/Deal.cs @@ -12,15 +12,18 @@ private Deal(string id, double price, int quantity, string symbol, DateTime tim Symbol = symbol; } - public static Deal Empty => new Deal("Empty", 0, 0, "Unset", DateTime.MinValue); + public static Deal Empty + { + get { return new Deal("Empty", 0, 0, "Unset", DateTime.MinValue); } + } + + public string Id { get; set; } + public double Price { get; set; } + public DateTime Time { get; set; } + public int Quantity { get; set; } - public string Id { get; } - public double Price { get; } - public DateTime Time { get; } - public int Quantity { get; } + public string Symbol { get; set; } - public string Symbol { get; } - public OrderDirection Direction { get { @@ -42,7 +45,8 @@ public Deal With(string id = null, double? price = null, int? quantity = null, s public override string ToString() { - return $"OrderId: {Id} {Direction} order for {Quantity} unit{(Quantity == 1 ? "" : "s")} of {Symbol}"; + return String.Format("OrderId: {0} {1} order for {2} unit{3} of {4}", Id, Direction, Quantity, + Quantity == 1 ? "" : "s", Symbol); } } } \ No newline at end of file diff --git a/Src/Solid-TradeService/7.IOC/Program.cs b/Src/Solid-TradeService/7.IOC/Program.cs index 8ad7ebe..33f4249 100644 --- a/Src/Solid-TradeService/7.IOC/Program.cs +++ b/Src/Solid-TradeService/7.IOC/Program.cs @@ -3,6 +3,7 @@ using SimpleInjector; using SimpleInjector.Extensions; using TradeApp.App_Packages.LibLog._4._2; +using TradeApp.Caching; using TradeApp.Logging; using TradeApp.Models; diff --git a/Src/Solid-TradeService/7.IOC/TradeApp.csproj b/Src/Solid-TradeService/7.IOC/TradeApp.csproj index 3cb1342..8dc27e4 100644 --- a/Src/Solid-TradeService/7.IOC/TradeApp.csproj +++ b/Src/Solid-TradeService/7.IOC/TradeApp.csproj @@ -9,10 +9,11 @@ Properties TradeApp TradeApp - v4.6 + v4.5 512 true 1 + AnyCPU @@ -66,6 +67,7 @@ Full %28none%29 3 + 5 AnyCPU