bug fixes

Author: ReneSchwarzer

src/WebExpress.WebIndex.Wi/Model/ViewModel.cs

@@ -148,8 +148,9 @@ public bool DropIndexFile()
             var runtimeClass = CurrentObjectType.BuildRuntimeClass();
             var document = IndexManager.GetIndexDocument(runtimeClass);
             var fieldProperty = runtimeClass.GetProperty(CurrentIndexField?.Name);
+            var fieldData = new IndexFieldData(fieldProperty);
             var methodInfo = document.GetType().GetMethod("GetReverseIndex");
-            var reverseIndex = methodInfo.Invoke(document, [fieldProperty]);
+            var reverseIndex = methodInfo.Invoke(document, [fieldData]);
             var termProperty = reverseIndex.GetType().GetProperty("Term");
             var term = termProperty.GetValue(reverseIndex) as IndexStorageSegmentTerm;
 

src/WebExpress.WebIndex.WiUI/Model/MainViewModel.cs

@@ -263,8 +263,9 @@ public ObservableCollection<Term> GetIndexTerms()
             var runtimeClass = _selectedObjectType?.BuildRuntimeClass();
             var document = IndexManager?.GetIndexDocument(runtimeClass!);
             var fieldProperty = runtimeClass?.GetProperty(_selectedIndexField?.Name!);
+            var fieldData = new IndexFieldData(fieldProperty);
             var methodInfo = document?.GetType().GetMethod("GetReverseIndex");
-            var reverseIndex = methodInfo?.Invoke(document, [fieldProperty]);
+            var reverseIndex = methodInfo?.Invoke(document, [fieldData]);
             var termProperty = reverseIndex?.GetType().GetProperty("Term");
             var term = termProperty?.GetValue(reverseIndex) as IndexStorageSegmentTerm;
 

src/WebExpress.WebIndex/IndexFieldData.cs

@@ -35,6 +35,24 @@ public class IndexFieldData
         /// </value>
         public bool Enabled => PropertyInfo.GetCustomAttribute<IndexIgnoreAttribute>() == null;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IndexFieldData"/> class.
+        /// </summary>
+        public IndexFieldData()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IndexFieldData"/> class with the specified property.
+        /// </summary>
+        /// <param name="property">The property information to initialize the index field 
+        public IndexFieldData(PropertyInfo property)
+        {
+            Name = property?.Name;
+            Type = property?.PropertyType;
+            PropertyInfo = property;
+        }
+
         /// <summary>
         /// Retrieves the value of a property from an object based on the specified field.
         /// </summary>

src/WebExpress.WebIndex/Storage/IndexStorageSchema.cs

@@ -16,6 +16,8 @@ public class IndexStorageSchema<TIndexItem> : IIndexSchema<TIndexItem>
     {
         private readonly string _extentions = "ws";
         private readonly int _version = 1;
+        private static readonly JsonSerializerOptions _jsonSerializerOptions = new() { WriteIndented = true };
+        private static readonly JsonSerializerOptions _jsonDeserializerOptions = new() { PropertyNameCaseInsensitive = true };
 
         /// <summary>
         /// Returns the file name.
@@ -61,9 +63,8 @@ public bool HasSchemaChanged()
             var currentSchema = GetSchema();
             var storedSchema = Read();
 
-            var options = new JsonSerializerOptions { WriteIndented = true };
-            var currentJson = JsonSerializer.Serialize(currentSchema, options);
-            var storedJson = JsonSerializer.Serialize(storedSchema, options);
+            var currentJson = JsonSerializer.Serialize(currentSchema, _jsonSerializerOptions);
+            var storedJson = JsonSerializer.Serialize(storedSchema, _jsonSerializerOptions);
 
             return !currentJson.Equals(storedJson);
         }
@@ -133,23 +134,21 @@ private object GetType(PropertyInfo property)
         private void Write()
         {
             var schema = GetSchema();
-            var options = new JsonSerializerOptions { WriteIndented = true };
-            var json = JsonSerializer.Serialize(schema, options);
+            var json = JsonSerializer.Serialize(schema, _jsonSerializerOptions);
 
             File.WriteAllText(FileName, json);
         }
 
         /// <summary>
         /// Reads the object schema from the storage medium.
         /// </summary>
-        /// /// <returns>
+        /// <returns>
         /// The deserialized schema as an dynamic object.
         /// </returns>
         private dynamic Read()
         {
             var json = File.ReadAllText(FileName);
-            var options = new JsonSerializerOptions { PropertyNameCaseInsensitive = true };
-            var schema = JsonSerializer.Deserialize<dynamic>(json, options);
+            var schema = JsonSerializer.Deserialize<dynamic>(json, _jsonDeserializerOptions);
 
             return schema;
         }
@@ -169,7 +168,7 @@ public void Drop()
         /// </summary>
         public virtual void Dispose()
         {
-
+            GC.SuppressFinalize(this);
         }
     }
 }