[Samples][L7] Improve LogSource inheritance example

Author: florinc

LessonsSamples/LessonsSamples/Lesson7/InheritanceComposition/ILogMessageParser.cs

@@ -4,9 +4,9 @@ namespace LessonsSamples.Lesson7.InheritanceComposition
 {
     internal interface ILogMessageParser
     {
-        string GetVersion(string logMessage);
-        DateTime GetTime(string logMessage);
-        int GetSeverity(string logMessage);
-        string GetDescription(string logMessage);
+        string GetVersion(string logMessage, int messageIndex);
+        DateTime GetTime(string logMessage, int messageIndex);
+        int GetSeverity(string logMessage, int messageIndex);
+        string GetDescription(string logMessage, int messageIndex);
     }
 }

LessonsSamples/LessonsSamples/Lesson7/InheritanceComposition/LogSource.cs

@@ -39,37 +39,41 @@ private IEnumerable<string> LoadLogMessages()
             yield return logMessage;
         }
 
-        public IEnumerable<LogEntry> GetCriticalLogEntries()
-        {
-            return GetAllLogEntries().Where(l => l.Severity > 10);
-        }
-
         protected abstract string GetVersion(string logMessage);
         protected abstract DateTime GetTime(string logMessage);
         protected abstract string GetDescription(string logMessage);
         protected abstract int GetSeverity(string logMessage);
+
+        public IEnumerable<LogEntry> GetCriticalLogEntries()
+        {
+            return GetAllLogEntries().Where(l => l.Severity > 10);
+        }
     }
 
 
     class XmlLogSource : LogSource
     {
         protected override string GetVersion(string logMessage)
         {
+            int index = messageIndex;
             throw new NotImplementedException();
         }
 
         protected override DateTime GetTime(string logMessage)
         {
+            int index = messageIndex;
             throw new NotImplementedException();
         }
 
         protected override string GetDescription(string logMessage)
         {
+            int index = messageIndex;
             throw new NotImplementedException();
         }
 
         protected override int GetSeverity(string logMessage)
         {
+            int index = messageIndex;
             throw new NotImplementedException();
         }
     }
@@ -78,21 +82,25 @@ class CsvLogSource : LogSource
     {
         protected override string GetVersion(string logMessage)
         {
+            int index = messageIndex;
             throw new NotImplementedException();
         }
 
         protected override DateTime GetTime(string logMessage)
         {
+            int index = messageIndex;
             throw new NotImplementedException();
         }
 
         protected override string GetDescription(string logMessage)
         {
+            int index = messageIndex;
             throw new NotImplementedException();
         }
 
         protected override int GetSeverity(string logMessage)
         {
+            int index = messageIndex;
             throw new NotImplementedException();
         }
     }

LessonsSamples/LessonsSamples/Lesson7/InheritanceComposition/LogSource_2.cs

@@ -16,16 +16,16 @@ public LogSource_2(ILogMessageParser messageParser)
 
         public IEnumerable<LogEntry> GetAllLogEntries()
         {
-            IEnumerable<string> logMessages = LoadAllLogEntries();
+            IEnumerable<string> logMessages = LoadLogMessages();
 
             foreach (var message in logMessages)
             {
                 yield return new LogEntry
                 {
-                    Time = messageParser.GetTime(message),
-                    Severity = messageParser.GetSeverity(message),
-                    Description = messageParser.GetDescription(message),
-                    Version = messageParser.GetVersion(message),
+                    Time = messageParser.GetTime(message, messageIndex),
+                    Severity = messageParser.GetSeverity(message, messageIndex),
+                    Description = messageParser.GetDescription(message, messageIndex),
+                    Version = messageParser.GetVersion(message, messageIndex),
                     Body = message
                 };
             }
@@ -36,7 +36,7 @@ public IEnumerable<LogEntry> GetCriticalLogEntries()
             return GetAllLogEntries().Where(l => l.Severity > 10);
         }
 
-        private IEnumerable<string> LoadAllLogEntries()
+        private IEnumerable<string> LoadLogMessages()
         {
             messageIndex = 0;
             string logMessage = string.Empty;
@@ -52,45 +52,45 @@ private IEnumerable<string> LoadAllLogEntries()
 
     internal class XmlLogMessageParser : ILogMessageParser
     {
-        public string GetVersion(string logMessage)
+        public string GetVersion(string logMessage, int messageIndex)
         {
             throw new NotImplementedException();
         }
 
-        public DateTime GetTime(string logMessage)
+        public DateTime GetTime(string logMessage, int messageIndex)
         {
             throw new NotImplementedException();
         }
 
-        public int GetSeverity(string logMessage)
+        public int GetSeverity(string logMessage, int messageIndex)
         {
             throw new NotImplementedException();
         }
 
-        public string GetDescription(string logMessage)
+        public string GetDescription(string logMessage, int messageIndex)
         {
             throw new NotImplementedException();
         }
     }
 
     class CsvLogMessageParser : ILogMessageParser
     {
-        public string GetVersion(string logMessage)
+        public string GetVersion(string logMessage, int messageIndex)
         {
             throw new NotImplementedException();
         }
 
-        public DateTime GetTime(string logMessage)
+        public DateTime GetTime(string logMessage, int messageIndex)
         {
             throw new NotImplementedException();
         }
 
-        public int GetSeverity(string logMessage)
+        public int GetSeverity(string logMessage, int messageIndex)
         {
             throw new NotImplementedException();
         }
 
-        public string GetDescription(string logMessage)
+        public string GetDescription(string logMessage, int messageIndex)
         {
             throw new NotImplementedException();
         }