Merge pull request #349 from johelvisguzman/options

johelvisguzman · web-flow · commit 5d1d47692560 · 2019-01-02T16:42:30.000-05:00
Changed the repository options With methods to internal
diff --git a/src/DotNetToolkit.Repository.AdoNet/RepositoryOptionsBuilderExtensions.cs b/src/DotNetToolkit.Repository.AdoNet/RepositoryOptionsBuilderExtensions.cs
@@ -24,7 +24,7 @@ public static RepositoryOptionsBuilder UseAdoNet(this RepositoryOptionsBuilder s
             if (nameOrConnectionString == null)
                 throw new ArgumentNullException(nameof(nameOrConnectionString));
 
-            source.Options.With(new AdoNetRepositoryContextFactory(nameOrConnectionString));
+            source.UseInternalContextFactory(new AdoNetRepositoryContextFactory(nameOrConnectionString));
 
             return source;
         }
@@ -47,7 +47,7 @@ public static RepositoryOptionsBuilder UseAdoNet(this RepositoryOptionsBuilder s
             if (connectionString == null)
                 throw new ArgumentNullException(nameof(connectionString));
 
-            source.Options.With(new AdoNetRepositoryContextFactory(providerName, connectionString));
+            source.UseInternalContextFactory(new AdoNetRepositoryContextFactory(providerName, connectionString));
 
             return source;
         }
@@ -66,7 +66,7 @@ public static RepositoryOptionsBuilder UseAdoNet(this RepositoryOptionsBuilder s
             if (existingConnection == null)
                 throw new ArgumentNullException(nameof(existingConnection));
 
-            source.Options.With(new AdoNetRepositoryContextFactory(existingConnection));
+            source.UseInternalContextFactory(new AdoNetRepositoryContextFactory(existingConnection));
 
             return source;
         }
diff --git a/src/DotNetToolkit.Repository.EntityFramework/RepositoryOptionsBuilderExtensions.cs b/src/DotNetToolkit.Repository.EntityFramework/RepositoryOptionsBuilderExtensions.cs
@@ -21,7 +21,7 @@ public static RepositoryOptionsBuilder UseEntityFramework<TDbContext>(this Repos
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            source.Options.With(new EfRepositoryContextFactory<TDbContext>());
+            source.UseInternalContextFactory(new EfRepositoryContextFactory<TDbContext>());
 
             return source;
         }
@@ -40,7 +40,7 @@ public static RepositoryOptionsBuilder UseEntityFramework<TDbContext>(this Repos
             if (nameOrConnectionString == null)
                 throw new ArgumentNullException(nameof(nameOrConnectionString));
 
-            source.Options.With(new EfRepositoryContextFactory<TDbContext>(nameOrConnectionString));
+            source.UseInternalContextFactory(new EfRepositoryContextFactory<TDbContext>(nameOrConnectionString));
 
             return source;
         }
@@ -59,7 +59,7 @@ public static RepositoryOptionsBuilder UseEntityFramework<TDbContext>(this Repos
             if (existingConnection == null)
                 throw new ArgumentNullException(nameof(existingConnection));
 
-            source.Options.With(new EfRepositoryContextFactory<TDbContext>(existingConnection));
+            source.UseInternalContextFactory(new EfRepositoryContextFactory<TDbContext>(existingConnection));
 
             return source;
         }
diff --git a/src/DotNetToolkit.Repository.EntityFrameworkCore/RepositoryOptionsBuilderExtensions.cs b/src/DotNetToolkit.Repository.EntityFrameworkCore/RepositoryOptionsBuilderExtensions.cs
@@ -20,7 +20,7 @@ public static RepositoryOptionsBuilder UseEntityFrameworkCore<TDbContext>(this R
             if (source == null)
                 throw new ArgumentNullException(nameof(source));
 
-            source.Options.With(new EfCoreRepositoryContextFactory<TDbContext>());
+            source.UseInternalContextFactory(new EfCoreRepositoryContextFactory<TDbContext>());
 
             return source;
         }
@@ -60,7 +60,7 @@ public static RepositoryOptionsBuilder UseEntityFrameworkCore<TDbContext>(this R
             if (options == null)
                 throw new ArgumentNullException(nameof(options));
 
-            source.Options.With(new EfCoreRepositoryContextFactory<TDbContext>(options));
+            source.UseInternalContextFactory(new EfCoreRepositoryContextFactory<TDbContext>(options));
 
             return source;
         }
diff --git a/src/DotNetToolkit.Repository/Configuration/Options/RepositoryOptions.cs b/src/DotNetToolkit.Repository/Configuration/Options/RepositoryOptions.cs
@@ -90,18 +90,22 @@ public RepositoryOptions(IRepositoryOptions options)
         /// Clones the current configured options to a new instance.
         /// </summary>
         /// <returns>The new clone instance.</returns>
-        public virtual RepositoryOptions Clone()
+        public RepositoryOptions Clone()
         {
             return new RepositoryOptions(this);
         }
 
+        #endregion
+
+        #region Internal Methods
+
         /// <summary>
         /// Returns the option instance with a configured interceptor.
         /// </summary>
         /// <param name="underlyingType">The type of interceptor.</param>
         /// <param name="interceptorFactory">The interceptor factory.</param>
         /// <returns>The same option instance.</returns>
-        public virtual RepositoryOptions With(Type underlyingType, Func<IRepositoryInterceptor> interceptorFactory)
+        internal RepositoryOptions With(Type underlyingType, Func<IRepositoryInterceptor> interceptorFactory)
         {
             if (underlyingType == null)
                 throw new ArgumentNullException(nameof(underlyingType));
@@ -124,7 +128,7 @@ public virtual RepositoryOptions With(Type underlyingType, Func<IRepositoryInter
         /// </summary>
         /// <param name="contextFactory">The context factory.</param>
         /// <returns>The same option instance.</returns>
-        public virtual RepositoryOptions With(IRepositoryContextFactory contextFactory)
+        internal RepositoryOptions With(IRepositoryContextFactory contextFactory)
         {
             if (contextFactory == null)
                 throw new ArgumentNullException(nameof(contextFactory));
@@ -139,7 +143,7 @@ public virtual RepositoryOptions With(IRepositoryContextFactory contextFactory)
         /// </summary>
         /// <param name="loggerProvider">The logger factory.</param>
         /// <returns>The same option instance.</returns>
-        public virtual RepositoryOptions With(ILoggerProvider loggerProvider)
+        internal RepositoryOptions With(ILoggerProvider loggerProvider)
         {
             if (loggerProvider == null)
                 throw new ArgumentNullException(nameof(loggerProvider));
@@ -154,7 +158,7 @@ public virtual RepositoryOptions With(ILoggerProvider loggerProvider)
         /// </summary>
         /// <param name="cacheProvider">The caching provider.</param>
         /// <returns>The same option instance.</returns>
-        public virtual RepositoryOptions With(ICacheProvider cacheProvider)
+        internal RepositoryOptions With(ICacheProvider cacheProvider)
         {
             if (cacheProvider == null)
                 throw new ArgumentNullException(nameof(cacheProvider));

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public static RepositoryOptionsBuilder UseAdoNet(this RepositoryOptionsBuilder s`
`24`	`24`	`if (nameOrConnectionString == null)`
`25`	`25`	`throw new ArgumentNullException(nameof(nameOrConnectionString));`
`26`	`26`
`27`		`- source.Options.With(new AdoNetRepositoryContextFactory(nameOrConnectionString));`
	`27`	`+ source.UseInternalContextFactory(new AdoNetRepositoryContextFactory(nameOrConnectionString));`
`28`	`28`
`29`	`29`	`return source;`
`30`	`30`	`}`
`@@ -47,7 +47,7 @@ public static RepositoryOptionsBuilder UseAdoNet(this RepositoryOptionsBuilder s`
`47`	`47`	`if (connectionString == null)`
`48`	`48`	`throw new ArgumentNullException(nameof(connectionString));`
`49`	`49`
`50`		`- source.Options.With(new AdoNetRepositoryContextFactory(providerName, connectionString));`
	`50`	`+ source.UseInternalContextFactory(new AdoNetRepositoryContextFactory(providerName, connectionString));`
`51`	`51`
`52`	`52`	`return source;`
`53`	`53`	`}`
`@@ -66,7 +66,7 @@ public static RepositoryOptionsBuilder UseAdoNet(this RepositoryOptionsBuilder s`
`66`	`66`	`if (existingConnection == null)`
`67`	`67`	`throw new ArgumentNullException(nameof(existingConnection));`
`68`	`68`
`69`		`- source.Options.With(new AdoNetRepositoryContextFactory(existingConnection));`
	`69`	`+ source.UseInternalContextFactory(new AdoNetRepositoryContextFactory(existingConnection));`
`70`	`70`
`71`	`71`	`return source;`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public static RepositoryOptionsBuilder UseEntityFramework<TDbContext>(this Repos`
`21`	`21`	`if (source == null)`
`22`	`22`	`throw new ArgumentNullException(nameof(source));`
`23`	`23`
`24`		`- source.Options.With(new EfRepositoryContextFactory<TDbContext>());`
	`24`	`+ source.UseInternalContextFactory(new EfRepositoryContextFactory<TDbContext>());`
`25`	`25`
`26`	`26`	`return source;`
`27`	`27`	`}`
`@@ -40,7 +40,7 @@ public static RepositoryOptionsBuilder UseEntityFramework<TDbContext>(this Repos`
`40`	`40`	`if (nameOrConnectionString == null)`
`41`	`41`	`throw new ArgumentNullException(nameof(nameOrConnectionString));`
`42`	`42`
`43`		`- source.Options.With(new EfRepositoryContextFactory<TDbContext>(nameOrConnectionString));`
	`43`	`+ source.UseInternalContextFactory(new EfRepositoryContextFactory<TDbContext>(nameOrConnectionString));`
`44`	`44`
`45`	`45`	`return source;`
`46`	`46`	`}`
`@@ -59,7 +59,7 @@ public static RepositoryOptionsBuilder UseEntityFramework<TDbContext>(this Repos`
`59`	`59`	`if (existingConnection == null)`
`60`	`60`	`throw new ArgumentNullException(nameof(existingConnection));`
`61`	`61`
`62`		`- source.Options.With(new EfRepositoryContextFactory<TDbContext>(existingConnection));`
	`62`	`+ source.UseInternalContextFactory(new EfRepositoryContextFactory<TDbContext>(existingConnection));`
`63`	`63`
`64`	`64`	`return source;`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public static RepositoryOptionsBuilder UseEntityFrameworkCore<TDbContext>(this R`
`20`	`20`	`if (source == null)`
`21`	`21`	`throw new ArgumentNullException(nameof(source));`
`22`	`22`
`23`		`- source.Options.With(new EfCoreRepositoryContextFactory<TDbContext>());`
	`23`	`+ source.UseInternalContextFactory(new EfCoreRepositoryContextFactory<TDbContext>());`
`24`	`24`
`25`	`25`	`return source;`
`26`	`26`	`}`
`@@ -60,7 +60,7 @@ public static RepositoryOptionsBuilder UseEntityFrameworkCore<TDbContext>(this R`
`60`	`60`	`if (options == null)`
`61`	`61`	`throw new ArgumentNullException(nameof(options));`
`62`	`62`
`63`		`- source.Options.With(new EfCoreRepositoryContextFactory<TDbContext>(options));`
	`63`	`+ source.UseInternalContextFactory(new EfCoreRepositoryContextFactory<TDbContext>(options));`
`64`	`64`
`65`	`65`	`return source;`
`66`	`66`	`}`