Ticket #894 : Fix warning messages in EF

habarthierry-hue · habarthierry-hue · commit 3190fd1bce2e · 2025-06-17T22:23:55.000+02:00
diff --git a/formbuilder/FormBuilder.EF/Configurations/FormRecordConfiguration.cs b/formbuilder/FormBuilder.EF/Configurations/FormRecordConfiguration.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 using FormBuilder.Models;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using System.Collections.ObjectModel;
 using System.Text.Json;
@@ -12,15 +13,26 @@ public class FormRecordConfiguration : IEntityTypeConfiguration<FormRecord>
 {
     public void Configure(EntityTypeBuilder<FormRecord> builder)
     {
+        var formElementComparer = new ValueComparer<ObservableCollection<IFormElementRecord>>(
+            (c1, c2) => false,
+            c => c.Aggregate(0, (a, v) => HashCode.Combine(a, v != null && v.Id != null ? v.Id.GetHashCode() : 0)),
+            c => c == null ? null : new ObservableCollection<IFormElementRecord>(c));
+        var formMessageTranslationComparer = new ValueComparer<List<FormMessageTranslation>>(
+            (c1, c2) => false,
+            c => c.Aggregate(0, (a, v) => HashCode.Combine(a, v != null && v.Key != null ? v.Key.GetHashCode() : 0)),
+            c => c == null ? null : new List<FormMessageTranslation>(c));
         builder.HasKey(f => f.Id);
         builder.Property(w => w.SuccessMessageTranslations).HasConversion(
                 v => JsonSerializer.Serialize(v, (JsonSerializerOptions)null),
-                v => string.IsNullOrWhiteSpace(v) ? null : JsonSerializer.Deserialize<List<FormMessageTranslation>>(v, (JsonSerializerOptions)null));
+                v => string.IsNullOrWhiteSpace(v) ? null : JsonSerializer.Deserialize<List<FormMessageTranslation>>(v, (JsonSerializerOptions)null))
+                .Metadata.SetValueComparer(formMessageTranslationComparer);
         builder.Property(w => w.ErrorMessageTranslations).HasConversion(
                 v => JsonSerializer.Serialize(v, (JsonSerializerOptions)null),
-                v => string.IsNullOrWhiteSpace(v) ? null : JsonSerializer.Deserialize<List<FormMessageTranslation>>(v, (JsonSerializerOptions)null));
+                v => string.IsNullOrWhiteSpace(v) ? null : JsonSerializer.Deserialize<List<FormMessageTranslation>>(v, (JsonSerializerOptions)null))
+                .Metadata.SetValueComparer(formMessageTranslationComparer);
         builder.Property(w => w.Elements).HasConversion(
                 v => JsonSerializer.Serialize(v, (JsonSerializerOptions)null),
-                v => string.IsNullOrWhiteSpace(v) ? null : new ObservableCollection<IFormElementRecord>(JsonSerializer.Deserialize<List<IFormElementRecord>>(v, (JsonSerializerOptions)null)));
+                v => string.IsNullOrWhiteSpace(v) ? null : new ObservableCollection<IFormElementRecord>(JsonSerializer.Deserialize<List<IFormElementRecord>>(v, (JsonSerializerOptions)null)))
+            .Metadata.SetValueComparer(formElementComparer);
     }
 }
diff --git a/formbuilder/FormBuilder.EF/Configurations/TemplateConfiguration.cs b/formbuilder/FormBuilder.EF/Configurations/TemplateConfiguration.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 using FormBuilder.Models;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using System.Text.Json;
 
@@ -12,14 +13,29 @@ public class TemplateConfiguration : IEntityTypeConfiguration<Template>
     public void Configure(EntityTypeBuilder<Template> builder)
     {
         builder.HasKey(x => x.Id);
+        var templateStyleComparer = new ValueComparer<List<TemplateStyle>>(
+            (c1, c2) => false,
+            c => c.Aggregate(0, (a, v) => HashCode.Combine(a, v != null && v.Id != null ? v.Id.GetHashCode() : 0)),
+            c => c == null ? null : new List<TemplateStyle>(c));
+        var templateWindowComparer = new ValueComparer<List<TemplateWindow>>(
+            (c1, c2) => false,
+            c => c.Aggregate(0, (a, v) => HashCode.Combine(a, v != null && v.Key != null ? v.Key.GetHashCode() : 0)),
+            c => c == null ? null : new List<TemplateWindow>(c));
+        var templateElementComparer = new ValueComparer<List<TemplateElement>>(
+            (c1, c2) => false,
+            c => c.Aggregate(0, (a, v) => HashCode.Combine(a, v != null && v.Key != null ? v.Key.GetHashCode() : 0)),
+            c => c == null ? null : new List<TemplateElement>(c));
         builder.Property(w => w.Styles).HasConversion(
                 v => JsonSerializer.Serialize(v, (JsonSerializerOptions)null),
-                v => string.IsNullOrWhiteSpace(v) ? null : new List<TemplateStyle>(JsonSerializer.Deserialize<List<TemplateStyle>>(v, (JsonSerializerOptions)null)));
+                v => string.IsNullOrWhiteSpace(v) ? null : new List<TemplateStyle>(JsonSerializer.Deserialize<List<TemplateStyle>>(v, (JsonSerializerOptions)null)))
+            .Metadata.SetValueComparer(templateStyleComparer);
         builder.Property(w => w.Windows).HasConversion(
                 v => JsonSerializer.Serialize(v, (JsonSerializerOptions)null),
-                v => string.IsNullOrWhiteSpace(v) ? null : new List<TemplateWindow>(JsonSerializer.Deserialize<List<TemplateWindow>>(v, (JsonSerializerOptions)null)));
+                v => string.IsNullOrWhiteSpace(v) ? null : new List<TemplateWindow>(JsonSerializer.Deserialize<List<TemplateWindow>>(v, (JsonSerializerOptions)null)))
+            .Metadata.SetValueComparer(templateWindowComparer);
         builder.Property(w => w.Elements).HasConversion(
                 v => JsonSerializer.Serialize(v, (JsonSerializerOptions)null),
-                v => string.IsNullOrWhiteSpace(v) ? null : new List<TemplateElement>(JsonSerializer.Deserialize<List<TemplateElement>>(v, (JsonSerializerOptions)null)));
+                v => string.IsNullOrWhiteSpace(v) ? null : new List<TemplateElement>(JsonSerializer.Deserialize<List<TemplateElement>>(v, (JsonSerializerOptions)null)))
+            .Metadata.SetValueComparer(templateElementComparer);
     }
 }
diff --git a/formbuilder/FormBuilder.EF/Configurations/WorkflowLinkConfiguration.cs b/formbuilder/FormBuilder.EF/Configurations/WorkflowLinkConfiguration.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See LICENSE in the project root for license information.
 using FormBuilder.Models;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using System.Text.Json;
 
@@ -11,6 +12,10 @@ public class WorkflowLinkConfiguration : IEntityTypeConfiguration<WorkflowLink>
 {
     public void Configure(EntityTypeBuilder<WorkflowLink> builder)
     {
+        var workflowLinkTargetComparer = new ValueComparer<List<WorkflowLinkTarget>>(
+            (c1, c2) => false,
+            c => c.Aggregate(0, (a, v) => HashCode.Combine(a, v != null && v.TargetStepId != null ? v.TargetStepId.GetHashCode() : 0)),
+            c => c == null ? null : new List<WorkflowLinkTarget>(c));
         builder.HasKey(w => w.Id);
         builder.Ignore(w => w.IsLinkHoverStep);
         builder.Ignore(w => w.IsHover);
@@ -19,6 +24,7 @@ public void Configure(EntityTypeBuilder<WorkflowLink> builder)
                 v => string.IsNullOrWhiteSpace(v) ? null : JsonSerializer.Deserialize<WorkflowLinkSource>(v, (JsonSerializerOptions)null));
         builder.Property(w => w.Targets).HasConversion(
                 v => JsonSerializer.Serialize(v, (JsonSerializerOptions)null),
-                v => string.IsNullOrWhiteSpace(v) ? null : JsonSerializer.Deserialize<List<WorkflowLinkTarget>>(v, (JsonSerializerOptions)null));
+                v => string.IsNullOrWhiteSpace(v) ? null : JsonSerializer.Deserialize<List<WorkflowLinkTarget>>(v, (JsonSerializerOptions)null))
+            .Metadata.SetValueComparer(workflowLinkTargetComparer);
     }
 }
diff --git a/formbuilder/FormBuilder/Models/FormMessageTranslation.cs b/formbuilder/FormBuilder/Models/FormMessageTranslation.cs
@@ -16,4 +16,12 @@ public string Value
     {
         get; set;
     }
+
+    public string Key
+    {
+        get
+        {
+            return $"{Language}:{Code}";
+        }
+    }
 }
diff --git a/formbuilder/FormBuilder/Models/TemplateElement.cs b/formbuilder/FormBuilder/Models/TemplateElement.cs
@@ -16,4 +16,12 @@ public string Value
     {
         get; set;
     }
+
+    public string Key
+    {
+        get
+        {
+            return $"{Element}:{Name}";
+        }
+    }
 }
diff --git a/src/IdServer/SimpleIdServer.IdServer.Domains/BCAuthorize.cs b/src/IdServer/SimpleIdServer.IdServer.Domains/BCAuthorize.cs
@@ -4,7 +4,6 @@
 using SimpleIdServer.IdServer.Domains.DTOs;
 using System.Data;
 using System.Text;
-using System.Text.Json.Serialization;
 using System.Text.Json;
 
 namespace SimpleIdServer.IdServer.Domains
diff --git a/src/IdServer/SimpleIdServer.IdServer.Domains/Client.cs b/src/IdServer/SimpleIdServer.IdServer.Domains/Client.cs
@@ -137,7 +137,7 @@ public string? PolicyUri
         /// Array of strings representing ways to contact people responsible for this client, typically email addresses.
         /// </summary>
         [JsonPropertyName(OAuthClientParameters.Contacts)]
-        public ICollection<string> Contacts { get; set; } = new List<string>();
+        public IEnumerable<string> Contacts { get; set; } = new List<string>();
         /// <summary>
         /// A unique identifier string assigned by the client developer or software publisher used by registration endpoints to identify the client software to be dynamically registered.
         /// </summary>
diff --git a/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/AuditEventConfiguration.cs b/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/AuditEventConfiguration.cs
@@ -3,16 +3,16 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SimpleIdServer.IdServer.Domains;
+using SimpleIdServer.IdServer.Store.EF.Extensions;
 
-namespace SimpleIdServer.IdServer.Store.Configurations
+namespace SimpleIdServer.IdServer.Store.Configurations;
+
+public class AuditEventConfiguration : IEntityTypeConfiguration<AuditEvent>
 {
-    public class AuditEventConfiguration : IEntityTypeConfiguration<AuditEvent>
+    public void Configure(EntityTypeBuilder<AuditEvent> builder)
     {
-        public void Configure(EntityTypeBuilder<AuditEvent> builder)
-        {
-            builder.HasKey(a => a.Id);
-            builder.Property(a => a.Scopes).HasConversion(v => string.Join(',', v), v => v.Split(",", StringSplitOptions.RemoveEmptyEntries));
-            builder.Property(a => a.Claims).HasConversion(v => string.Join(',', v), v => v.Split(",", StringSplitOptions.RemoveEmptyEntries));
-        }
+        builder.HasKey(a => a.Id);
+        builder.Property(a => a.Scopes).ConfigureSerializer();
+        builder.Property(a => a.Claims).ConfigureSerializer();
     }
 }
diff --git a/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/BCAuthorizeConfiguration.cs b/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/BCAuthorizeConfiguration.cs
@@ -3,6 +3,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SimpleIdServer.IdServer.Domains;
+using SimpleIdServer.IdServer.Store.EF.Extensions;
 
 namespace SimpleIdServer.IdServer.Store.Configurations
 {
@@ -13,9 +14,7 @@ public void Configure(EntityTypeBuilder<BCAuthorize> builder)
             builder.HasKey(bc => bc.Id);
             builder.Ignore(bc => bc.IsActive);
             builder.Ignore(bc => bc.LastHistory);
-            builder.Property(a => a.Scopes).HasConversion(
-                v => string.Join(',', v),
-                v => v.Split(',', StringSplitOptions.None).ToList());
+            builder.Property(a => a.Scopes).ConfigureSerializer();
             builder.HasMany(a => a.Histories).WithOne().OnDelete(DeleteBehavior.Cascade);
             builder.Ignore(bc => bc.AuthorizationDetails);
         }
diff --git a/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/ClientConfiguration.cs b/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/ClientConfiguration.cs
@@ -3,6 +3,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SimpleIdServer.IdServer.Domains;
+using SimpleIdServer.IdServer.Store.EF.Extensions;
 
 namespace SimpleIdServer.IdServer.Store.Configurations
 {
@@ -11,33 +12,15 @@ public class ClientConfiguration : IEntityTypeConfiguration<Client>
         public void Configure(EntityTypeBuilder<Client> builder)
         {
             builder.HasKey(c => c.Id);
-            builder.Property(a => a.ClientRegistrationTypesSupported).HasConversion(
-                v => string.Join(',', v),
-                v => v.Split(',', StringSplitOptions.None).ToList());
-            builder.Property(a => a.GrantTypes).HasConversion(
-                v => string.Join(',', v),
-                v => v.Split(',', StringSplitOptions.None).ToList());
-            builder.Property(a => a.ResponseTypes).HasConversion(
-                v => string.Join(',', v),
-                v => v.Split(',', StringSplitOptions.None).ToList());
-            builder.Property(a => a.RedirectionUrls).HasConversion(
-                v => string.Join(',', v),
-                v => v.Split(',', StringSplitOptions.None).ToList());
-            builder.Property(a => a.PostLogoutRedirectUris).HasConversion(
-                v => string.Join(',', v),
-                v => v.Split(',', StringSplitOptions.None).ToList());
-            builder.Property(a => a.Contacts).HasConversion(
-                v => string.Join(',', v),
-                v => v.Split(',', StringSplitOptions.None).ToList());
-            builder.Property(a => a.DefaultAcrValues).HasConversion(
-                v => string.Join(',', v),
-                v => v.Split(',', StringSplitOptions.None).ToList());
-            builder.Property(a => a.AuthorizationDataTypes).HasConversion(
-                v => string.Join(',', v),
-                v => v.Split(',', StringSplitOptions.None).ToList());
-            builder.Property(a => a.SubjectSyntaxTypesSupported).HasConversion(
-                v => string.Join(',', v),
-                v => v.Split(',', StringSplitOptions.None).ToList());
+            builder.Property(a => a.ClientRegistrationTypesSupported).ConfigureSerializer();
+            builder.Property(a => a.GrantTypes).ConfigureSerializer();
+            builder.Property(a => a.ResponseTypes).ConfigureSerializer();
+            builder.Property(a => a.RedirectionUrls).ConfigureSerializer();
+            builder.Property(a => a.PostLogoutRedirectUris).ConfigureSerializer();
+            builder.Property(a => a.Contacts).ConfigureSerializer();
+            builder.Property(a => a.DefaultAcrValues).ConfigureSerializer();
+            builder.Property(a => a.AuthorizationDataTypes).ConfigureSerializer();
+            builder.Property(a => a.SubjectSyntaxTypesSupported).ConfigureSerializer();
             builder.HasMany(c => c.Translations).WithOne().OnDelete(DeleteBehavior.Cascade);
             builder.HasMany(c => c.SerializedJsonWebKeys).WithOne().OnDelete(DeleteBehavior.Cascade);
             builder.HasMany(c => c.DeviceAuthCodes).WithOne(a => a.Client).OnDelete(DeleteBehavior.Cascade);
diff --git a/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/ConsentConfiguration.cs b/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/ConsentConfiguration.cs
@@ -3,6 +3,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SimpleIdServer.IdServer.Domains;
+using SimpleIdServer.IdServer.Store.EF.Extensions;
 
 namespace SimpleIdServer.IdServer.Store.Configurations
 {
@@ -11,9 +12,7 @@ public class ConsentConfiguration : IEntityTypeConfiguration<Consent>
         public void Configure(EntityTypeBuilder<Consent> builder)
         {
             builder.HasKey(c => c.Id);
-            builder.Property(c => c.Claims).HasConversion(
-                c => string.Join(',', c),
-                c => c.Split(',', StringSplitOptions.None).ToList());
+            builder.Property(c => c.Claims).ConfigureSerializer();
             builder.Ignore(c => c.AuthorizationDetails);
             builder.HasMany(g => g.Scopes).WithOne(g => g.Consent).OnDelete(DeleteBehavior.Cascade);
         }
diff --git a/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/DeviceAuthCodeConfiguration.cs b/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/DeviceAuthCodeConfiguration.cs
@@ -3,6 +3,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SimpleIdServer.IdServer.Domains;
+using SimpleIdServer.IdServer.Store.EF.Extensions;
 
 namespace SimpleIdServer.IdServer.Store.Configurations
 {
@@ -11,9 +12,7 @@ public class DeviceAuthCodeConfiguration : IEntityTypeConfiguration<DeviceAuthCo
         public void Configure(EntityTypeBuilder<DeviceAuthCode> builder)
         {
             builder.HasKey(d => d.DeviceCode);
-            builder.Property(a => a.Scopes).HasConversion(
-                v => string.Join(',', v),
-                v => v.Split(',', StringSplitOptions.None).ToList());
+            builder.Property(a => a.Scopes).ConfigureSerializer();
         }
     }
 }
diff --git a/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/ExtractedRepresentationStagingConfiguration.cs b/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/ExtractedRepresentationStagingConfiguration.cs
@@ -3,6 +3,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SimpleIdServer.IdServer.Domains;
+using SimpleIdServer.IdServer.Store.EF.Extensions;
 
 namespace SimpleIdServer.IdServer.Store.Configurations;
 
@@ -11,8 +12,6 @@ public class ExtractedRepresentationStagingConfiguration : IEntityTypeConfigurat
     public void Configure(EntityTypeBuilder<ExtractedRepresentationStaging> builder)
     {
         builder.HasKey(r => r.Id);
-        builder.Property(a => a.GroupIds).HasConversion(
-            v => string.Join(',', v),
-            v => v.Split(',', StringSplitOptions.None).ToList());
+        builder.Property(a => a.GroupIds).ConfigureSerializer();
     }
 }
diff --git a/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/MessageBusErrorMessageConfiguration.cs b/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/MessageBusErrorMessageConfiguration.cs
@@ -3,6 +3,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SimpleIdServer.IdServer.Domains;
+using SimpleIdServer.IdServer.Store.EF.Extensions;
 
 namespace SimpleIdServer.IdServer.Store.EF.Configurations;
 
@@ -11,8 +12,6 @@ public class MessageBusErrorMessageConfiguration : IEntityTypeConfiguration<Mess
     public void Configure(EntityTypeBuilder<MessageBusErrorMessage> builder)
     {
         builder.HasKey(m => m.Id);
-        builder.Property(a => a.Exceptions).HasConversion(
-            v => string.Join(',', v),
-            v => v.Split(',', StringSplitOptions.None).ToList());
+        builder.Property(a => a.Exceptions).ConfigureSerializer();
     }
 }
diff --git a/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/MigrationExecutionHistoryConfiguration.cs b/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/MigrationExecutionHistoryConfiguration.cs
@@ -3,6 +3,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SimpleIdServer.IdServer.Domains;
+using SimpleIdServer.IdServer.Store.EF.Extensions;
 
 namespace SimpleIdServer.IdServer.Store.EF.Configurations;
 
@@ -11,8 +12,6 @@ public class MigrationExecutionHistoryConfiguration : IEntityTypeConfiguration<M
     public void Configure(EntityTypeBuilder<MigrationExecutionHistory> builder)
     {
         builder.HasKey(b => b.Id);
-        builder.Property(a => a.Errors).HasConversion(
-            v => string.Join(',', v),
-            v => v.Split(',', StringSplitOptions.None).ToList());
+        builder.Property(a => a.Errors).ConfigureSerializer();
     }
 }
diff --git a/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/PresentationDefinitionInputDescriptorConstraintConfiguration.cs b/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/PresentationDefinitionInputDescriptorConstraintConfiguration.cs
@@ -3,6 +3,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SimpleIdServer.IdServer.Domains;
+using SimpleIdServer.IdServer.Store.EF.Extensions;
 
 namespace SimpleIdServer.IdServer.Store.Configurations;
 
@@ -11,8 +12,6 @@ public class PresentationDefinitionInputDescriptorConstraintConfiguration : IEnt
     public void Configure(EntityTypeBuilder<PresentationDefinitionInputDescriptorConstraint> builder)
     {
         builder.HasKey(p => p.Id);
-        builder.Property(a => a.Path).HasConversion(
-            v => string.Join(',', v),
-            v => v.Split(',', StringSplitOptions.None).ToList());
+        builder.Property(a => a.Path).ConfigureSerializer();
     }
 }
diff --git a/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/UMAPendingRequestConfiguration.cs b/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/UMAPendingRequestConfiguration.cs
@@ -3,6 +3,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SimpleIdServer.IdServer.Domains;
+using SimpleIdServer.IdServer.Store.EF.Extensions;
 
 namespace SimpleIdServer.IdServer.Store.Configurations
 {
@@ -12,9 +13,7 @@ public void Configure(EntityTypeBuilder<UMAPendingRequest> builder)
         {
             builder.Property<int>("Id").ValueGeneratedOnAdd();
             builder.HasKey("Id");
-            builder.Property(p => p.Scopes)
-                .HasConversion(p => string.Join(',', p),
-                p => p.Split(',', StringSplitOptions.None));
+            builder.Property(p => p.Scopes).ConfigureSerializer();
             builder.HasOne(p => p.Resource).WithMany().OnDelete(DeleteBehavior.Cascade);
         }
     }
diff --git a/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/UMAPermissionTicketRecordConfiguration.cs b/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/UMAPermissionTicketRecordConfiguration.cs
@@ -4,6 +4,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using SimpleIdServer.IdServer.Domains;
+using SimpleIdServer.IdServer.Store.EF.Extensions;
 
 namespace SimpleIdServer.IdServer.Store.Configurations
 {
@@ -13,9 +14,7 @@ public void Configure(EntityTypeBuilder<UMAPermissionTicketRecord> builder)
         {
             builder.Property<int>("Id").ValueGeneratedOnAdd();
             builder.HasKey("Id");
-            builder.Property(t => t.Scopes).HasConversion(
-                v => string.Join(',', v),
-                v => v.Split(',', StringSplitOptions.None).ToList());
+            builder.Property(t => t.Scopes).ConfigureSerializer();
         }
     }
 }
diff --git a/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/UMAResourcePermissionConfiguration.cs b/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/UMAResourcePermissionConfiguration.cs
diff --git a/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/UmaResourceConfiguration.cs b/src/IdServer/SimpleIdServer.IdServer.Store.EF/Configurations/UmaResourceConfiguration.cs
diff --git a/src/IdServer/SimpleIdServer.IdServer.Store.EF/Extensions/PropertyBuilderExtensions.cs b/src/IdServer/SimpleIdServer.IdServer.Store.EF/Extensions/PropertyBuilderExtensions.cs

Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,12 @@ public string Value`
`16`	`16`	`{`
`17`	`17`	`get; set;`
`18`	`18`	`}`
	`19`	`+`
	`20`	`+ public string Key`
	`21`	`+ {`
	`22`	`+ get`
	`23`	`+ {`
	`24`	`+ return $"{Language}:{Code}";`
	`25`	`+ }`
	`26`	`+ }`
`19`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,16 +3,16 @@`
`3`	`3`	`using Microsoft.EntityFrameworkCore;`
`4`	`4`	`using Microsoft.EntityFrameworkCore.Metadata.Builders;`
`5`	`5`	`using SimpleIdServer.IdServer.Domains;`
	`6`	`+using SimpleIdServer.IdServer.Store.EF.Extensions;`
`6`	`7`
`7`		`-namespace SimpleIdServer.IdServer.Store.Configurations`
	`8`	`+namespace SimpleIdServer.IdServer.Store.Configurations;`
	`9`	`+`
	`10`	`+public class AuditEventConfiguration : IEntityTypeConfiguration<AuditEvent>`
`8`	`11`	`{`
`9`		`- public class AuditEventConfiguration : IEntityTypeConfiguration<AuditEvent>`
	`12`	`+ public void Configure(EntityTypeBuilder<AuditEvent> builder)`
`10`	`13`	`{`
`11`		`- public void Configure(EntityTypeBuilder<AuditEvent> builder)`
`12`		`- {`
`13`		`- builder.HasKey(a => a.Id);`
`14`		`- builder.Property(a => a.Scopes).HasConversion(v => string.Join(',', v), v => v.Split(",", StringSplitOptions.RemoveEmptyEntries));`
`15`		`- builder.Property(a => a.Claims).HasConversion(v => string.Join(',', v), v => v.Split(",", StringSplitOptions.RemoveEmptyEntries));`
`16`		`- }`
	`14`	`+ builder.HasKey(a => a.Id);`
	`15`	`+ builder.Property(a => a.Scopes).ConfigureSerializer();`
	`16`	`+ builder.Property(a => a.Claims).ConfigureSerializer();`
`17`	`17`	`}`
`18`	`18`	`}`