From f11b4fdb4e3bcc66d59135602505dc0161da0a09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Chalet?= <kevinchalet@gmail.com>
Date: Sat, 6 Jan 2018 03:48:26 +0100
Subject: [PATCH] Remove the generic OpenIddictExtension class

---
 .../OpenIddictExtension.cs                    | 42 -------------------
 .../OpenIddictExtensions.cs                   |  5 +--
 2 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 src/OpenIddict.EntityFrameworkCore/OpenIddictExtension.cs

diff --git a/src/OpenIddict.EntityFrameworkCore/OpenIddictExtension.cs b/src/OpenIddict.EntityFrameworkCore/OpenIddictExtension.cs
deleted file mode 100644
index 93aa71d7..00000000
--- a/src/OpenIddict.EntityFrameworkCore/OpenIddictExtension.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- * See https://github.com/openiddict/openiddict-core for more information concerning
- * the license and the contributors participating to this project.
- */
-
-using System;
-using JetBrains.Annotations;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.Extensions.DependencyInjection;
-using OpenIddict.Models;
-
-namespace OpenIddict.EntityFrameworkCore
-{
-    public class OpenIddictExtension<TApplication, TAuthorization, TScope, TToken, TKey> : IDbContextOptionsExtension
-        where TApplication : OpenIddictApplication<TKey, TAuthorization, TToken>, new()
-        where TAuthorization : OpenIddictAuthorization<TKey, TApplication, TToken>, new()
-        where TScope : OpenIddictScope<TKey>, new()
-        where TToken : OpenIddictToken<TKey, TApplication, TAuthorization>, new()
-        where TKey : IEquatable<TKey>
-    {
-        public string LogFragment => null;
-
-        public bool ApplyServices([NotNull] IServiceCollection services)
-        {
-            if (services == null)
-            {
-                throw new ArgumentNullException(nameof(services));
-            }
-
-            services.AddSingleton<IModelCustomizer, OpenIddictCustomizer<TApplication, TAuthorization, TScope, TToken, TKey>>();
-
-            // Return false to indicate that no database
-            // provider was registered by this extension.
-            return false;
-        }
-
-        public long GetServiceProviderHashCode() => 0;
-
-        public void Validate([NotNull] IDbContextOptions options) { }
-    }
-}
diff --git a/src/OpenIddict.EntityFrameworkCore/OpenIddictExtensions.cs b/src/OpenIddict.EntityFrameworkCore/OpenIddictExtensions.cs
index b01d996b..31cb2804 100644
--- a/src/OpenIddict.EntityFrameworkCore/OpenIddictExtensions.cs
+++ b/src/OpenIddict.EntityFrameworkCore/OpenIddictExtensions.cs
@@ -161,10 +161,7 @@ namespace Microsoft.Extensions.DependencyInjection
                 throw new ArgumentNullException(nameof(builder));
             }
 
-            var extension = new OpenIddictExtension<TApplication, TAuthorization, TScope, TToken, TKey>();
-            ((IDbContextOptionsBuilderInfrastructure) builder).AddOrUpdateExtension(extension);
-
-            return builder;
+            return builder.ReplaceService<IModelCustomizer, OpenIddictCustomizer<TApplication, TAuthorization, TScope, TToken, TKey>>();
         }
 
         /// <summary>