Changeset 17394 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JCGenerator.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/JCGenerator.cs (modified) (3 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JCGenerator.cs

@@ -35 +35 @@
       // which have parameters aswell
       AddInstantiableIItem(Constants.Algorithm, algorithm, genData);
-      //IsConvertable(algorithm, true);
       if (algorithm.Problem != null) // only when an problem exists
         AddInstantiableIItem(Constants.Problem, algorithm.Problem, genData);
@@ -42 +41 @@
       genData.Template[Constants.Parameters] = genData.JsonItems;
       // serialize template and return string
-      return CustomJsonWriter.Serialize(genData.Template);
+      return SingleLineArrayJsonWriter.Serialize(genData.Template);
     }
     
     #region Helper
-    private static bool IsConvertable(object obj, bool throwException = false) {
-      bool tmp = ConvertableAttribute.IsConvertable(obj);
-      if (throwException && tmp)
-        throw new NotSupportedException($"Type {obj.GetType().GetPrettyName(false)} is not convertable!");
-      return tmp;
-    }
 
     private static void AddInstantiableIItem(string metaDataTagName, IItem item, GenData genData) {
       JsonItem jsonItem = JsonItemConverter.Extract(item);
+      
       genData.Template[Constants.Metadata][metaDataTagName] = item.ItemName;
       PopulateJsonItems(jsonItem, genData);
@@ -62 +56 @@
     private static void PopulateJsonItems(JsonItem item, GenData genData) {
       IEnumerable<JsonItem> tmpParameter = item.Children;
-      item.Children = null;
 
       if (item.Value != null || item.Range != null) {