Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReader.cs
===================================================================
diff -u -re581f7fd8199f0fb565bfea26384ce38040d10e4 -r3b368e38644b163189a58233f9fc1fb9701bf68c
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReader.cs	(.../HydraulicBoundaryDatabaseReader.cs)	(revision e581f7fd8199f0fb565bfea26384ce38040d10e4)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReader.cs	(.../HydraulicBoundaryDatabaseReader.cs)	(revision 3b368e38644b163189a58233f9fc1fb9701bf68c)
@@ -1,173 +1,173 @@
-// Copyright (C) Stichting Deltares 2017. All rights reserved.
-//
-// This file is part of Ringtoets.
-//
-// Ringtoets is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <http://www.gnu.org/licenses/>.
-//
-// All names, logos, and references to "Deltares" are registered trademarks of
-// Stichting Deltares and remain full property of Stichting Deltares at all times.
-// All rights reserved.
-
-using System;
-using System.Data;
-using System.Data.SQLite;
-using Core.Common.Base.IO;
-using Core.Common.IO.Exceptions;
-using Core.Common.IO.Readers;
-using Core.Common.Util.Builders;
-using Ringtoets.HydraRing.IO.Properties;
-
-namespace Ringtoets.HydraRing.IO.HydraulicBoundaryDatabase
-{
-    /// <summary>
-    /// This class reads a SqLite database file and constructs <see cref="ReadHydraulicBoundaryLocation"/>
-    /// instances from this database.
-    /// </summary>
-    public class HydraulicBoundaryDatabaseReader : SqLiteDatabaseReaderBase
-    {
-        private IDataReader sqliteDataReader;
-
-        /// <summary>
-        /// Creates a new instance of <see cref="HydraulicBoundaryDatabaseReader"/>,
-        /// which will use the <paramref name="databaseFilePath"/> as its source.
-        /// </summary>
-        /// <param name="databaseFilePath">The path of the database file to open.</param>
-        /// <exception cref="CriticalFileReadException">Thrown when:
-        /// <list type="bullet">
-        /// <item>The <paramref name="databaseFilePath"/> contains invalid characters.</item>
-        /// <item>No file could be found at <paramref name="databaseFilePath"/>.</item>
-        /// </list>
-        /// </exception>
-        public HydraulicBoundaryDatabaseReader(string databaseFilePath) : base(databaseFilePath) {}
-
-        /// <summary>
-        /// Gets a value indicating whether or not more hydraulic boundary locations can
-        /// be read using the <see cref="HydraulicBoundaryDatabaseReader"/>.
-        /// </summary>
-        public bool HasNext { get; private set; }
-
-        public void PrepareReadLocation()
-        {
-            CloseDataReader();
-            HasNext = false;
-
-            sqliteDataReader = CreateDataReader(HydraulicBoundaryDatabaseQueryBuilder.GetRelevantLocationsQuery());
-            MoveNext();
-        }
-
-        /// <summary>
-        /// Reads the next location from the database.
-        /// </summary>
-        /// <returns>A new instance of <see cref="ReadHydraulicBoundaryLocation"/> based on the data read from
-        /// the database or <c>null</c> if no data is available.</returns>
-        /// <exception cref="LineParseException">Thrown when the database contains incorrect values for required properties.</exception>
-        public ReadHydraulicBoundaryLocation ReadLocation()
-        {
-            if (!HasNext)
-            {
-                return null;
-            }
-
-            try
-            {
-                var id = sqliteDataReader.Read<long>(HrdLocationsTableDefinitions.HrdLocationId);
-                var name = sqliteDataReader.Read<string>(HrdLocationsTableDefinitions.Name);
-                var x = sqliteDataReader.Read<double>(HrdLocationsTableDefinitions.XCoordinate);
-                var y = sqliteDataReader.Read<double>(HrdLocationsTableDefinitions.YCoordinate);
-
-                return new ReadHydraulicBoundaryLocation(id, name, x, y);
-            }
-            catch (ConversionException e)
-            {
-                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column);
-                throw new LineParseException(message, e);
-            }
-            finally
-            {
-                MoveNext();
-            }
-        }
-
-        /// <summary>
-        /// Gets the version of the hydraulic boundary database.
-        /// </summary>
-        /// <returns>The version found in the database, or <see cref="string.Empty"/> if the version cannot be found.</returns>
-        /// <exception cref="CriticalFileReadException">Thrown when a query could not be executed on the database schema.</exception>
-        public string GetVersion()
-        {
-            try
-            {
-                using (IDataReader dataReader = CreateDataReader(HydraulicBoundaryDatabaseQueryBuilder.GetVersionQuery(), null))
-                {
-                    return !dataReader.Read() ? string.Empty : Convert.ToString(dataReader[GeneralTableDefinitions.GeneratedVersion]);
-                }
-            }
-            catch (SQLiteException exception)
-            {
-                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.Error_HydraulicBoundaryLocation_read_from_database);
-                throw new CriticalFileReadException(message, exception);
-            }
-        }
-
-        /// <summary>
-        /// Gets the track id from the hydraulic boundary database.
-        /// </summary>
-        /// <returns>The track id found in the database, or 0 if the track id cannot be found.</returns>
-        /// <exception cref="LineParseException">Thrown when the database contains incorrect values for required properties.</exception>
-        /// <exception cref="CriticalFileReadException">Thrown when a query could not be executed on the database schema.</exception>
-        public long GetTrackId()
-        {
-            try
-            {
-                using (IDataReader dataReader = CreateDataReader(HydraulicBoundaryDatabaseQueryBuilder.GetTrackIdQuery(),
-                                                                 new SQLiteParameter
-                                                                 {
-                                                                     DbType = DbType.String
-                                                                 }))
-                {
-                    return !dataReader.Read() ? 0 : Convert.ToInt64(dataReader[GeneralTableDefinitions.TrackId]);
-                }
-            }
-            catch (InvalidCastException exception)
-            {
-                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column);
-                throw new LineParseException(message, exception);
-            }
-            catch (SQLiteException exception)
-            {
-                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.Error_HydraulicBoundaryLocation_read_from_database);
-                throw new CriticalFileReadException(message, exception);
-            }
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            CloseDataReader();
-            base.Dispose(disposing);
-        }
-
-        /// <summary>
-        /// Moves the reader to the next record in the database.
-        /// </summary>
-        private void MoveNext()
-        {
-            HasNext = MoveNext(sqliteDataReader);
-        }
-
-        private void CloseDataReader()
-        {
-            sqliteDataReader?.Dispose();
-        }
-    }
+// Copyright (C) Stichting Deltares 2018. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SQLite;
+using System.Linq;
+using Core.Common.Base.IO;
+using Core.Common.IO.Exceptions;
+using Core.Common.IO.Readers;
+using Core.Common.Util.Builders;
+using Riskeer.HydraRing.IO.Properties;
+
+namespace Riskeer.HydraRing.IO.HydraulicBoundaryDatabase
+{
+    /// <summary>
+    /// This class reads a hydraulic boundary database file and constructs a
+    /// <see cref="ReadHydraulicBoundaryDatabase"/> instance from this database.
+    /// </summary>
+    public class HydraulicBoundaryDatabaseReader : SqLiteDatabaseReaderBase
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="HydraulicBoundaryDatabaseReader"/>,
+        /// which will use the <paramref name="databaseFilePath"/> as its source.
+        /// </summary>
+        /// <param name="databaseFilePath">The path of the database file to open.</param>
+        /// <exception cref="CriticalFileReadException">Thrown when:
+        /// <list type="bullet">
+        /// <item>The <paramref name="databaseFilePath"/> contains invalid characters.</item>
+        /// <item>No file could be found at <paramref name="databaseFilePath"/>.</item>
+        /// </list>
+        /// </exception>
+        public HydraulicBoundaryDatabaseReader(string databaseFilePath) : base(databaseFilePath) {}
+
+        /// <summary>
+        /// Reads the hydraulic boundary database.
+        /// </summary>
+        /// <returns>A <see cref="ReadHydraulicBoundaryDatabase"/>.</returns>
+        /// <exception cref="LineParseException">Thrown when the database contains incorrect values for required properties.</exception>
+        /// <exception cref="CriticalFileReadException">Thrown when the data cannot be read.</exception>
+        public ReadHydraulicBoundaryDatabase Read()
+        {
+            return new ReadHydraulicBoundaryDatabase(ReadTrackId(), ReadVersion(), ReadLocations().ToArray());
+        }
+
+        /// <summary>
+        /// Reads the track Id from the hydraulic boundary database.
+        /// </summary>
+        /// <returns>The track Id found in the database.</returns>
+        /// <exception cref="LineParseException">Thrown when the database contains incorrect values for required properties.</exception>
+        /// <exception cref="CriticalFileReadException">Thrown when the track Id cannot be read.</exception>
+        public long ReadTrackId()
+        {
+            try
+            {
+                using (IDataReader reader = CreateDataReader(HydraulicBoundaryDatabaseQueryBuilder.GetTrackIdQuery(),
+                                                             new SQLiteParameter
+                                                             {
+                                                                 DbType = DbType.String
+                                                             }))
+                {
+                    if (reader.Read())
+                    {
+                        return Convert.ToInt64(reader[GeneralTableDefinitions.TrackId]);
+                    }
+
+                    throw new CriticalFileReadException(new FileReaderErrorMessageBuilder(Path)
+                                                            .Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column));
+                }
+            }
+            catch (InvalidCastException exception)
+            {
+                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column);
+                throw new LineParseException(message, exception);
+            }
+            catch (SQLiteException exception)
+            {
+                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.Error_HydraulicBoundaryLocation_read_from_database);
+                throw new CriticalFileReadException(message, exception);
+            }
+        }
+
+        /// <summary>
+        /// Gets the version of the hydraulic boundary database.
+        /// </summary>
+        /// <returns>The version found in the database, or <see cref="string.Empty"/> if the version cannot be found.</returns>
+        /// <exception cref="CriticalFileReadException">Thrown when the version cannot be read..</exception>
+        public string ReadVersion()
+        {
+            try
+            {
+                using (IDataReader reader = CreateDataReader(HydraulicBoundaryDatabaseQueryBuilder.GetVersionQuery(), null))
+                {
+
+                    if (reader.Read())
+                    {
+                        string version = Convert.ToString(reader[GeneralTableDefinitions.GeneratedVersion]);
+
+                        if (!string.IsNullOrEmpty(version))
+                        {
+                            return version;
+                        }
+                    }
+
+                    string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column);
+                    throw new CriticalFileReadException(message);
+                }
+            }
+            catch (SQLiteException e)
+            {
+                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.Error_HydraulicBoundaryLocation_read_from_database);
+                throw new CriticalFileReadException(message, e);
+            }
+        }
+
+        /// <summary>
+        /// Reads the locations from the database.
+        /// </summary>
+        /// <exception cref="LineParseException">Thrown when the database contains incorrect values for required properties.</exception>
+        private IEnumerable<ReadHydraulicBoundaryLocation> ReadLocations()
+        {
+            using (IDataReader reader = CreateDataReader(HydraulicBoundaryDatabaseQueryBuilder.GetRelevantLocationsQuery()))
+            {
+                while (MoveNext(reader))
+                {
+                    yield return ReadLocation(reader);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Reads a location from the database.
+        /// </summary>
+        /// <returns>A <see cref="ReadHydraulicBoundaryLocation"/> based on the data read from the database.</returns>
+        /// <exception cref="LineParseException">Thrown when the database contains incorrect values for required properties.</exception>
+        private ReadHydraulicBoundaryLocation ReadLocation(IDataReader reader)
+        {
+            try
+            {
+                var id = reader.Read<long>(HrdLocationsTableDefinitions.HrdLocationId);
+                var name = reader.Read<string>(HrdLocationsTableDefinitions.Name);
+                var x = reader.Read<double>(HrdLocationsTableDefinitions.XCoordinate);
+                var y = reader.Read<double>(HrdLocationsTableDefinitions.YCoordinate);
+
+                return new ReadHydraulicBoundaryLocation(id, name, x, y);
+            }
+            catch (ConversionException e)
+            {
+                string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column);
+                throw new LineParseException(message, e);
+            }
+        }
+    }
 }
\ No newline at end of file