Include FetchStrategy include paths in ToString for Specification

Jeff Treuting · Jeff Treuting · commit 9420ab221acd · 2014-04-09T21:44:56.000-07:00
Fixes #122
diff --git a/SharpRepository.Repository/FetchStrategies/AbstractFetchStrategy.cs b/SharpRepository.Repository/FetchStrategies/AbstractFetchStrategy.cs
@@ -0,0 +1,21 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+
+namespace SharpRepository.Repository.FetchStrategies
+{
+    public abstract class AbstractFetchStrategy<T> : IFetchStrategy<T>
+    {
+        public abstract IEnumerable<string> IncludePaths { get; }
+        public abstract IFetchStrategy<T> Include(Expression<Func<T, object>> path);
+        public abstract IFetchStrategy<T> Include(string path);
+
+        public override string ToString()
+        {
+            return String.Format("Type: {0} Includes: {1}",
+                    GetType().Name,
+                    String.Join(",", IncludePaths)
+                );
+        }
+    }
+}
diff --git a/SharpRepository.Repository/FetchStrategies/GenericFetchStrategy.cs b/SharpRepository.Repository/FetchStrategies/GenericFetchStrategy.cs
@@ -9,7 +9,7 @@ namespace SharpRepository.Repository.FetchStrategies
     /// <see cref="http://blog.willbeattie.net/2011/02/specification-pattern-entity-framework.html"/>
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    public class GenericFetchStrategy<T> : IFetchStrategy<T>
+    public class GenericFetchStrategy<T> : AbstractFetchStrategy<T>
     {
         private readonly IList<string> _properties;
 
@@ -18,18 +18,18 @@ public GenericFetchStrategy()
             _properties = new List<string>();
         }
 
-        public IEnumerable<string> IncludePaths
+        public override IEnumerable<string> IncludePaths
         {
             get { return _properties; }
         }
 
-        public IFetchStrategy<T> Include(Expression<Func<T, object>> path)
+        public override IFetchStrategy<T> Include(Expression<Func<T, object>> path)
         {
             _properties.Add(path.ToIncludeString());
             return this;
         }
 
-        public IFetchStrategy<T> Include(string path)
+        public override IFetchStrategy<T> Include(string path)
         {
             _properties.Add(path);
             return this;
diff --git a/SharpRepository.Repository/SharpRepository.Repository.csproj b/SharpRepository.Repository/SharpRepository.Repository.csproj
@@ -99,6 +99,7 @@
     <Compile Include="CompoundKeyRepositoryBase.Batch.cs" />
     <Compile Include="CompoundKeyRepositoryBase.BatchItem.cs" />
     <Compile Include="DisabledCache.cs" />
+    <Compile Include="FetchStrategies\AbstractFetchStrategy.cs" />
     <Compile Include="Helpers\InternalCache.cs" />
     <Compile Include="ICrudRepository.cs" />
     <Compile Include="IRepositoryAggregates.cs" />
diff --git a/SharpRepository.Repository/Specifications/Specification.cs b/SharpRepository.Repository/Specifications/Specification.cs
@@ -200,11 +200,11 @@ public static ISpecification<T> OrElse(Expression<Func<T, bool>> predicate, Expr
         /// <returns></returns>
         public override string ToString()
         {
-            return String.Format("Specification Type: {0}\nEntity Type: {1}\nPredicate: {2}\nFetchStrategy Type: {3}",
+            return String.Format("Specification Type: {0}\nEntity Type: {1}\nPredicate: {2}\nFetchStrategy: {3}",
                                  GetType().Name,
                                  (typeof (T)).Name,
                                  HashGenerator.FromPredicate(Predicate),
-                                 FetchStrategy.GetType().Name
+                                 FetchStrategy
                 );
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace SharpRepository.Repository.FetchStrategies`
`9`	`9`	`/// <see cref="http://blog.willbeattie.net/2011/02/specification-pattern-entity-framework.html"/>`
`10`	`10`	`/// </summary>`
`11`	`11`	`/// <typeparam name="T"></typeparam>`
`12`		`- public class GenericFetchStrategy<T> : IFetchStrategy<T>`
	`12`	`+ public class GenericFetchStrategy<T> : AbstractFetchStrategy<T>`
`13`	`13`	`{`
`14`	`14`	`private readonly IList<string> _properties;`
`15`	`15`
`@@ -18,18 +18,18 @@ public GenericFetchStrategy()`
`18`	`18`	`_properties = new List<string>();`
`19`	`19`	`}`
`20`	`20`
`21`		`- public IEnumerable<string> IncludePaths`
	`21`	`+ public override IEnumerable<string> IncludePaths`
`22`	`22`	`{`
`23`	`23`	`get { return _properties; }`
`24`	`24`	`}`
`25`	`25`
`26`		`- public IFetchStrategy<T> Include(Expression<Func<T, object>> path)`
	`26`	`+ public override IFetchStrategy<T> Include(Expression<Func<T, object>> path)`
`27`	`27`	`{`
`28`	`28`	`_properties.Add(path.ToIncludeString());`
`29`	`29`	`return this;`
`30`	`30`	`}`
`31`	`31`
`32`		`- public IFetchStrategy<T> Include(string path)`
	`32`	`+ public override IFetchStrategy<T> Include(string path)`
`33`	`33`	`{`
`34`	`34`	`_properties.Add(path);`
`35`	`35`	`return this;`
Original file line number	Diff line number	Diff line change
`@@ -200,11 +200,11 @@ public static ISpecification<T> OrElse(Expression<Func<T, bool>> predicate, Expr`
`200`	`200`	`/// <returns></returns>`
`201`	`201`	`public override string ToString()`
`202`	`202`	`{`
`203`		`- return String.Format("Specification Type: {0}\nEntity Type: {1}\nPredicate: {2}\nFetchStrategy Type: {3}",`
	`203`	`+ return String.Format("Specification Type: {0}\nEntity Type: {1}\nPredicate: {2}\nFetchStrategy: {3}",`
`204`	`204`	`GetType().Name,`
`205`	`205`	`(typeof (T)).Name,`
`206`	`206`	`HashGenerator.FromPredicate(Predicate),`
`207`		`- FetchStrategy.GetType().Name`
	`207`	`+ FetchStrategy`
`208`	`208`	`);`
`209`	`209`	`}`
`210`	`210`	`}`