Changeset 17394 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/BaseConverter.cs

Timestamp:

01/07/20 16:25:39 (4 years ago)

Author:

dpiringe

Message:

#3026:

• deleted: ConvertableAttribute, DummyConverter, ObjectExtensions
• renamed: CustomJsonWriter -> SingleLineArrayJsonWriter, JCInstantiator -> JsonTemplateInstantiator
• added: JsonItemConverterFactory, UnsupportedJsonItem
• IJsonItemConverter:
  • added two new properties: Priority and ConvertableType -> because converters are automatically collected by plugin infrastructure now
  • Extract, Inject references a root converter now -> typically an instance of JsonItemConverter -> to prevent cycles
• JsonItemConverter:
  • now implements the interface IJsonItemConverter
  • is now a dynamic class
  • is only instantiable with an factory (JsonItemConverterFactory)
  • still has the old (but now public) static methods Extract and Inject (without ref param IJsonItemConverter root) -> creates instance with factory and calls methods of instance
  • removed register and unregister methods, because the factory collects all converters automatically now (on first call of Create)
  • has cycle detection for Extract and Inject
  • renamed method Get to GetConverter

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/BaseConverter.cs (modified) (1 diff)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/BaseConverter.cs

@@ -11 +11 @@
   public abstract class BaseConverter : IJsonItemConverter
   {
-    public void Inject(IItem item, JsonItem data) {
-      InjectData(item, data);
+    public abstract int Priority { get; }
+    public abstract Type ConvertableType { get; }
+
+    public void Inject(IItem item, JsonItem data, IJsonItemConverter root) {
+
+      InjectData(item, data, root);
     }
 
-    public JsonItem Extract(IItem value) {
-      JsonItem data = ExtractData(value);
-      data.Name = string.IsNullOrEmpty(data.Name) ? value.ItemName : data.Name;
+    public JsonItem Extract(IItem value, IJsonItemConverter root) {
+      JsonItem data = new JsonItem() { Name = value.ItemName };
+      Populate(value, data, root);
       return data;
     }
     
-    public abstract void InjectData(IItem item, JsonItem data);
-    public abstract JsonItem ExtractData(IItem value);
+    public abstract void InjectData(IItem item, JsonItem data, IJsonItemConverter root);
+    public abstract void Populate(IItem value, JsonItem item, IJsonItemConverter root);
 
     #region Helper
     protected ValueType CastValue<ValueType>(object obj) {
       if (obj is JToken)
-        return obj.Cast<JToken>().ToObject<ValueType>();
+        return ((JToken)obj).ToObject<ValueType>();
       else if (obj is IConvertible)
-        return Convert.ChangeType(obj, typeof(ValueType)).Cast<ValueType>();
+        return (ValueType)Convert.ChangeType(obj, typeof(ValueType));
       else return (ValueType)obj;
     }