Remove ReadByRoute options

CDP4Dal.NetCore.Tests/DAL/DalTestFixture.cs

@@ -250,11 +250,6 @@ public override Task<IEnumerable<Thing>> Write(OperationContainer operationConta
             throw new System.NotImplementedException();
         }
 
-        public override Task<IEnumerable<Thing>> ReadByRoute(string route, CancellationToken cancellationToken, IQueryAttributes attributes = null)
-        {
-            throw new NotImplementedException();
-        }
-
         public override Task<IEnumerable<Thing>> Read<T>(T thing, CancellationToken token, IQueryAttributes attributes = null)
         {
             throw new System.NotImplementedException();
@@ -310,11 +305,6 @@ public override Task<IEnumerable<Thing>> Write(OperationContainer operationConta
             throw new NotImplementedException();
         }
 
-        public override Task<IEnumerable<Thing>> ReadByRoute(string route, CancellationToken cancellationToken, IQueryAttributes attributes = null)
-        {
-            throw new NotImplementedException();
-        }
-
         public override Task<IEnumerable<Thing>> Read<T>(T thing, CancellationToken token, IQueryAttributes attributes = null)
         {
             throw new NotImplementedException();

CDP4Dal.NetCore.Tests/SessionTestFixture.cs

@@ -634,11 +634,6 @@ public Task<IEnumerable<Thing>> Write(OperationContainer operationContainer, IEn
             throw new NotImplementedException();
         }
 
-        public Task<IEnumerable<Thing>> ReadByRoute(string route, CancellationToken cancellationToken, IQueryAttributes attributes = null)
-        {
-            throw new NotImplementedException();
-        }
-
         /// <summary>
         /// Reads the data related to the provided <see cref="Thing"/> from the data-source
         /// </summary>

CDP4Dal.Tests/DAL/DalTestFixture.cs

@@ -250,11 +250,6 @@ public override Task<IEnumerable<Thing>> Write(OperationContainer operationConta
             throw new System.NotImplementedException();
         }
 
-        public override Task<IEnumerable<Thing>> ReadByRoute(string route, CancellationToken cancellationToken, IQueryAttributes attributes = null)
-        {
-            throw new NotImplementedException();
-        }
-
         public override Task<IEnumerable<Thing>> Read<T>(T thing, CancellationToken token, IQueryAttributes attributes = null)
         {
             throw new System.NotImplementedException();
@@ -311,11 +306,6 @@ public override Task<IEnumerable<Thing>> Write(OperationContainer operationConta
             throw new NotImplementedException();
         }
 
-        public override Task<IEnumerable<Thing>> ReadByRoute(string route, CancellationToken cancellationToken, IQueryAttributes attributes = null)
-        {
-            throw new NotImplementedException();
-        }
-
         public override Task<IEnumerable<Thing>> Read<T>(T thing, CancellationToken token, IQueryAttributes attributes = null)
         {
             throw new NotImplementedException();

CDP4Dal.Tests/SessionTestFixture.cs

@@ -634,11 +634,6 @@ public Task<IEnumerable<Thing>> Write(OperationContainer operationContainer, IEn
             throw new NotImplementedException();
         }
 
-        public Task<IEnumerable<Thing>> ReadByRoute(string route, CancellationToken cancellationToken, IQueryAttributes attributes = null)
-        {
-            throw new NotImplementedException();
-        }
-
         /// <summary>
         /// Reads the data related to the provided <see cref="Thing"/> from the data-source
         /// </summary>

CDP4Dal/DAL/Dal.cs

@@ -116,25 +116,6 @@ protected Dal()
         /// </returns>
         public abstract Task<IEnumerable<Thing>> Write(OperationContainer operationContainer, IEnumerable<string> files = null);
 
-        /// <summary>
-        /// Reads the data related to the provided <see cref="Thing"/> from the data-source
-        /// </summary>
-        /// <param name="route">
-        /// The Uri/route of the Thing that needs to be read from the data-source
-        /// </param>
-        /// <param name="cancellationToken">
-        /// The <see cref="CancellationToken"/>
-        /// </param>
-        /// <param name="attributes">
-        /// An instance of <see cref="IQueryAttributes"/> to be used with the request
-        /// </param>
-        /// <returns>
-        /// A list of <see cref="Thing"/>s that are contained by the provided <see cref="Thing"/> including the <see cref="Thing"/>.
-        /// In case the <see cref="Thing"/> is a top container then all the <see cref="Thing"/>s that have been updated since the
-        /// last read will be returned.
-        /// </returns>
-        public abstract Task<IEnumerable<Thing>> ReadByRoute(string route, CancellationToken cancellationToken, IQueryAttributes attributes = null);
-
         /// <summary>
         /// Reads the data related to the provided <see cref="Thing"/> from the data-source
         /// </summary>

CDP4Dal/DAL/IDal.cs

@@ -85,28 +85,6 @@ public interface IDal
         /// </returns>
         Task<IEnumerable<Thing>> Write(OperationContainer operationContainer, IEnumerable<string> files = null);
 
-        /// <summary>
-        /// Reads the data related to the provided <see cref="Thing"/> from the data-source
-        /// </summary>
-        /// <param name="route">
-        /// The Uri/route of the Thing  that needs to be read from the data-source
-        /// </param>
-        /// <param name="cancellationToken">
-        /// The <see cref="CancellationToken"/>
-        /// </param>
-        /// <param name="attributes">
-        /// An instance of <see cref="IQueryAttributes"/> to be used with the request
-        /// </param>
-        /// <returns>
-        /// A list of <see cref="Thing"/> that are contained by the provided <see cref="Thing"/> including the <see cref="Thing"/>.
-        /// In case the 
-        /// <param name="thing">
-        /// </param>
-        /// is a top container then all the <see cref="Thing"/>s that have been updated since the
-        /// last read will be returned.
-        /// </returns>
-        Task<IEnumerable<Thing>> ReadByRoute(string route, CancellationToken cancellationToken, IQueryAttributes attributes = null);
-
         /// <summary>
         /// Reads the data related to the provided <see cref="Thing"/> from the data-source
         /// </summary>

CDP4Dal/ISession.cs

@@ -214,12 +214,12 @@ public interface ISession
         /// <summary>
         /// Read a list of <see cref="Thing"/>s in the associated <see cref="IDal"/>
         /// </summary>
-        /// <param name="routes">The <see cref="IEnumerable{String}"/> that contains the Routes of the things to read</param>
+        /// <param name="things">The <see cref="IEnumerable{Thing}"/> that contains the <see cref="Thing"/>s to read</param>
         /// <param name="queryAttributes">The <see cref="IQueryAttributes"/> to be used to read data</param>
         /// <returns>
         /// an await-able <see cref="Task"/>
         /// </returns>
-        Task Read(IEnumerable<string> routes, IQueryAttributes queryAttributes);
+        Task Read(IEnumerable<Thing> things, IQueryAttributes queryAttributes);
 
         /// <summary>
         /// Write all the <see cref="Operation"/>s from an <see cref="OperationContainer"/> asynchronously.

CDP4Dal/Session.cs

@@ -482,26 +482,26 @@ public async Task Read(Thing thing, IQueryAttributes queryAttributes)
         /// <summary>
         /// Read a list of <see cref="Thing"/>s in the associated <see cref="IDal"/>
         /// </summary>
-        /// <param name="routes">The <see cref="IEnumerable{String}"/> that contains the Routes of the things to read</param>
+        /// <param name="things">The <see cref="IEnumerable{Thing}"/> that contains the <see cref="Thing"/> to read</param>
         /// <param name="queryAttributes">The <see cref="IQueryAttributes"/> to be used to read data</param>
         /// <returns>
         /// an await-able <see cref="Task"/>
         /// </returns>
-        public async Task Read(IEnumerable<string> routes, IQueryAttributes queryAttributes)
+        public async Task Read(IEnumerable<Thing> things, IQueryAttributes queryAttributes)
         {
             if (this.ActivePerson == null)
             {
                 throw new InvalidOperationException($"The data cannot be read when the ActivePerson is null; The Open method must be called prior to any of the Read methods");
             }
 
-            var routeList = routes.ToList();
+            var thingList = things.ToList();
 
-            if (!routeList.Any())
+            if (!thingList.Any())
             {
                 throw new ArgumentException($"The requested list of things is null or empty.");
             }
 
-            logger.Info("Session.Read {0} things", routeList.Count());
+            logger.Info("Session.Read {0} things", thingList.Count());
 
             var foundThings = new List<CDP4Common.DTO.Thing>();
 
@@ -510,23 +510,23 @@ public async Task Read(IEnumerable<string> routes, IQueryAttributes queryAttribu
                 // Max 10 async calls at a time, otherwise we could create a sort of a DDOS attack to the DAL/webservice
                 var loopCount = 10;
 
-                while (routeList.Any())
+                while (thingList.Any())
                 {
                     var tasks = new List<Task<IEnumerable<CDP4Common.DTO.Thing>>>();
 
                     // Create the token source
                     this.cancellationTokenSource = new CancellationTokenSource();
 
-                    foreach (var route in routeList.Take(loopCount))
+                    foreach (var thing in thingList.Take(loopCount))
                     {
-                        tasks.Add(this.Dal.ReadByRoute(route, this.cancellationTokenSource.Token, queryAttributes));
+                        tasks.Add(this.Dal.Read(thing.ToDto(), this.cancellationTokenSource.Token, queryAttributes));
                     }
 
                     var newThings = (await Task.WhenAll(tasks.ToArray())).SelectMany(x => x).ToList();
 
                     foundThings.AddRange(newThings);
 
-                    routeList = routeList.Skip(loopCount).ToList();
+                    thingList = thingList.Skip(loopCount).ToList();
                 }
             }
             catch (OperationCanceledException)

CDP4JsonFileDal/JsonFileDal.cs

@@ -221,28 +221,6 @@ public override Task<IEnumerable<Thing>> Write(OperationContainer operationConta
             throw new NotSupportedException("Writing OperationContainer to the data-source is not supported");
         }
 
-        /// <summary>
-        /// Reads the data related to the provided <see cref="Thing"/> from the data-source
-        /// </summary>
-        /// <param name="route">
-        /// The Uri/route of the Thing that needs to be read from the data-source
-        /// </param>
-        /// <param name="cancellationToken">
-        /// The <see cref="CancellationToken"/>
-        /// </param>
-        /// <param name="attributes">
-        /// An instance of <see cref="IQueryAttributes"/> to be used with the request
-        /// </param>
-        /// <returns>
-        /// A list of <see cref="Thing"/>s that are contained by the provided <see cref="Thing"/> including the <see cref="Thing"/>.
-        /// In case the <see cref="Thing"/> is a top container then all the <see cref="Thing"/>s that have been updated since the
-        /// last read will be returned.
-        /// </returns>
-        public override Task<IEnumerable<Thing>> ReadByRoute(string route, CancellationToken cancellationToken, IQueryAttributes attributes = null)
-        {
-            throw new NotSupportedException("Reading Things by route/URI is not supported");
-        }
-
         /// <summary>
         /// Reads the data related to the provided <see cref="CDP4Common.DTO.Thing"/> from the data-source
         /// </summary>

CDP4ServicesDal/CdpServicesDal.cs

@@ -247,35 +247,6 @@ public override async Task<IEnumerable<Thing>> Read(CDP4Common.DTO.Iteration ite
             return result;
         }
 
-        /// <summary>
-        /// Reads the data related to the provided <see cref="Thing"/> from the data-source
-        /// </summary>
-        /// <param name="route">
-        /// The Uri/route of the Thing  that needs to be read from the data-source
-        /// </param>
-        /// <param name="cancellationToken">
-        /// The <see cref="CancellationToken"/>
-        /// </param>
-        /// <param name="attributes">
-        /// An instance of <see cref="IQueryAttributes"/> to be used with the request
-        /// </param>
-        /// <returns>
-        /// A list of <see cref="Thing"/> that are contained by the provided <see cref="Thing"/> including the <see cref="Thing"/>.
-        /// In case the <see cref="Thing"/> is a top container then all the <see cref="Thing"/>s that have been updated since the
-        /// last read will be returned.
-        /// </returns>
-        public override async Task<IEnumerable<Thing>> ReadByRoute(string route, CancellationToken cancellationToken, IQueryAttributes attributes = null)
-        {
-            if (this.Credentials == null || this.Credentials.Uri == null)
-            {
-                throw new InvalidOperationException("The CDP4 DAL is not open.");
-            }
-
-            var watch = Stopwatch.StartNew();
-
-            return await this.ReadByRoute(watch, route, cancellationToken, attributes);
-        }
-
         /// <summary>
         /// Reads the data related to the provided <see cref="Thing"/> from the data-source
         /// </summary>

CDP4WspDal/WSPDal.cs

@@ -209,28 +209,6 @@ public override async Task<IEnumerable<Thing>> Write(OperationContainer operatio
             return result;
         }
 
-        /// <summary>
-        /// Reads the data related to the provided <see cref="Thing"/> from the data-source
-        /// </summary>
-        /// <param name="route">
-        /// The Uri/route of the Thing that needs to be read from the data-source
-        /// </param>
-        /// <param name="cancellationToken">
-        /// The <see cref="CancellationToken"/>
-        /// </param>
-        /// <param name="attributes">
-        /// An instance of <see cref="IQueryAttributes"/> to be used with the request
-        /// </param>
-        /// <returns>
-        /// A list of <see cref="Thing"/>s that are contained by the provided <see cref="Thing"/> including the <see cref="Thing"/>.
-        /// In case the <see cref="Thing"/> is a top container then all the <see cref="Thing"/>s that have been updated since the
-        /// last read will be returned.
-        /// </returns>
-        public override Task<IEnumerable<Thing>> ReadByRoute(string route, CancellationToken cancellationToken, IQueryAttributes attributes = null)
-        {
-            throw new NotSupportedException("Reading Things by route/URI is not supported");
-        }
-
         /// <summary>
         /// Write all the <see cref="Operation"/>s from all the <see cref="OperationContainer"/>s.
         /// </summary>