Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/04/17 17:19:35 (7 years ago)
Author:
gkronber
Message:

#2520: changed all usages of StorableClass to use StorableType with an auto-generated GUID (did not add StorableType to other type definitions yet)

Location:
branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/ArraySerializer.cs

    r14185 r14927  
    2323using System.Collections.Generic;
    2424using HeuristicLab.Persistence.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626using HeuristicLab.Persistence.Interfaces;
    2727
    2828namespace HeuristicLab.Persistence.Default.CompositeSerializers {
    2929
    30   [StorableClass]
     30  [StorableType("17987df2-38f0-4158-b4c7-783ffa2737d1")]
    3131  internal sealed class ArraySerializer : ICompositeSerializer {
    3232
    … …  
    9999        }
    100100        return Array.CreateInstance(t.GetElementType(), lengths, lowerBounds);
    101       }
    102       catch (InvalidOperationException x) {
     101      } catch (InvalidOperationException x) {
    103102        throw new PersistenceException("Insufficient meta information to construct array instance.", x);
    104       }
    105       catch (InvalidCastException x) {
     103      } catch (InvalidCastException x) {
    106104        throw new PersistenceException("Invalid format of array metainfo.", x);
    107105      }
    … …  
    134132          }
    135133        }
    136       }
    137       catch (InvalidOperationException x) {
     134      } catch (InvalidOperationException x) {
    138135        throw new PersistenceException("Insufficient data to fill array instance", x);
    139       }
    140       catch (InvalidCastException x) {
     136      } catch (InvalidCastException x) {
    141137        throw new PersistenceException("Invalid element data. Cannot fill array", x);
    142       }
    143       catch (IndexOutOfRangeException x) {
     138      } catch (IndexOutOfRangeException x) {
    144139        throw new PersistenceException("Too many elements during array deserialization", x);
    145140      }

  • branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/CompactNumberArray2StringSerializer.cs

    r14185 r14927  
    2626using HeuristicLab.Persistence.Auxiliary;
    2727using HeuristicLab.Persistence.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929using HeuristicLab.Persistence.Interfaces;
    3030
    3131namespace HeuristicLab.Persistence.Default.CompositeSerializers {
    3232
    33   [StorableClass]
     33  [StorableType("a5c269da-4122-4ea0-9eb7-c3441be404b8")]
    3434  public sealed class CompactNumberArray2StringSerializer : ICompositeSerializer {
    3535
    … …  
    187187        }
    188188        return a;
    189       }
    190       catch (InvalidOperationException e) {
     189      } catch (InvalidOperationException e) {
    191190        throw new PersistenceException("Insuffictient data to deserialize compact array", e);
    192       }
    193       catch (InvalidCastException e) {
     191      } catch (InvalidCastException e) {
    194192        throw new PersistenceException("Invalid element data during compact array deserialization", e);
    195193      }

  • branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/ConcreteDictionarySerializer.cs

    r14185 r14927  
    2525using System.Linq;
    2626using HeuristicLab.Persistence.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828using HeuristicLab.Persistence.Interfaces;
    2929
    3030namespace HeuristicLab.Persistence.Default.CompositeSerializers {
    3131
    32   [StorableClass]
     32  [StorableType("0ce2011a-5666-40df-9874-f5eeccea5a72")]
    3333  internal sealed class ConcreteDictionarySerializer : ICompositeSerializer {
    3434

  • branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/DictionarySerializer.cs

    r14185 r14927  
    2525using HeuristicLab.Persistence.Auxiliary;
    2626using HeuristicLab.Persistence.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828using HeuristicLab.Persistence.Interfaces;
    2929
    3030namespace HeuristicLab.Persistence.Default.CompositeSerializers {
    3131
    32   [StorableClass]
     32  [StorableType("813d9a0f-a611-478e-8149-e5d338c9a273")]
    3333  internal sealed class DictionarySerializer : ICompositeSerializer {
    3434
    … …  
    7979          dict.Add(key.Value, value.Value);
    8080        }
    81       }
    82       catch (InvalidOperationException e) {
     81      } catch (InvalidOperationException e) {
    8382        throw new PersistenceException("Dictionaries must contain an even number of elements (key+value).", e);
    84       }
    85       catch (NotSupportedException e) {
     83      } catch (NotSupportedException e) {
    8684        throw new PersistenceException("The serialized dictionary type was read-only or had a fixed size and cannot be deserialized.", e);
    87       }
    88       catch (ArgumentNullException e) {
     85      } catch (ArgumentNullException e) {
    8986        throw new PersistenceException("Dictionary key was null.", e);
    90       }
    91       catch (ArgumentException e) {
     87      } catch (ArgumentException e) {
    9288        throw new PersistenceException("Duplicate dictionary key.", e);
    9389      }

  • branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/EnumSerializer.cs

    r14185 r14927  
    2323using System.Collections.Generic;
    2424using HeuristicLab.Persistence.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626using HeuristicLab.Persistence.Interfaces;
    2727
    2828namespace HeuristicLab.Persistence.Default.CompositeSerializers {
    2929
    30   [StorableClass]
     30  [StorableType("7ff55c07-1c83-4d0f-924a-37c28d936d74")]
    3131  internal sealed class EnumSerializer : ICompositeSerializer {
    3232
    … …  
    6060        it.MoveNext();
    6161        return Enum.Parse(t, (string)it.Current.Value);
    62       }
    63       catch (InvalidOperationException e) {
     62      } catch (InvalidOperationException e) {
    6463        throw new PersistenceException("not enough meta information to recstruct enum", e);
    65       }
    66       catch (InvalidCastException e) {
     64      } catch (InvalidCastException e) {
    6765        throw new PersistenceException("invalid meta information found while trying to reconstruct enum", e);
    6866      }

  • branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/EnumerableSerializer.cs

    r14185 r14927  
    2626using HeuristicLab.Persistence.Auxiliary;
    2727using HeuristicLab.Persistence.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929using HeuristicLab.Persistence.Interfaces;
    3030
    3131namespace HeuristicLab.Persistence.Default.CompositeSerializers {
    3232
    33   [StorableClass]
     33  [StorableType("4421c2a4-9ee1-4cfc-b98e-755a81dc5241")]
    3434  internal sealed class EnumerableSerializer : ICompositeSerializer {
    3535
    … …  
    8080        foreach (var tag in tags)
    8181          addMethod.Invoke(instance, new[] { tag.Value });
    82       }
    83       catch (Exception e) {
     82      } catch (Exception e) {
    8483        throw new PersistenceException("Exception caught while trying to populate enumerable.", e);
    8584      }

  • branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/HashSetSerializer.cs

    r14185 r14927  
    2626using System.Reflection;
    2727using HeuristicLab.Persistence.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929using HeuristicLab.Persistence.Interfaces;
    3030
    3131namespace HeuristicLab.Persistence.Default.CompositeSerializers {
    3232
    33   [StorableClass]
     33  [StorableType("51099049-20f2-4a71-8eae-b4ea9d677115")]
    3434  internal sealed class HashSetSerializer : ICompositeSerializer {
    3535

  • branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/KeyValuePairSerializer.cs

    r14185 r14927  
    2525using System.Reflection;
    2626using HeuristicLab.Persistence.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828using HeuristicLab.Persistence.Interfaces;
    2929
    3030namespace HeuristicLab.Persistence.Default.CompositeSerializers {
    3131
    32   [StorableClass]
     32  [StorableType("97d00efc-4eb0-4dc7-a58c-977c45c2904c")]
    3333  internal sealed class KeyValuePairSerializer : ICompositeSerializer {
    3434
    … …  
    6464      try {
    6565        key = new Tag("key", t.GetProperty("Key").GetValue(o, null));
    66       }
    67       catch (Exception e) {
     66      } catch (Exception e) {
    6867        throw new PersistenceException("Exception caught during KeyValuePair decomposition", e);
    6968      }
    … …  
    7170      try {
    7271        value = new Tag("value", t.GetProperty("Value").GetValue(o, null));
    73       }
    74       catch (Exception e) {
     72      } catch (Exception e) {
    7573        throw new PersistenceException("Exception caught during KeyValuePair decomposition", e);
    7674      }
    … …  
    9189        t.GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic)
    9290          .Single(fi => fi.Name == "value").SetValue(instance, iter.Current.Value);
    93       }
    94       catch (InvalidOperationException e) {
     91      } catch (InvalidOperationException e) {
    9592        throw new PersistenceException("Not enough components to populate KeyValuePair instance", e);
    96       }
    97       catch (Exception e) {
     93      } catch (Exception e) {
    9894        throw new PersistenceException("Exception caught during KeyValuePair reconstruction", e);
    9995      }

  • branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Number2StringSerializer.cs

    r14185 r14927  
    2525using HeuristicLab.Persistence.Auxiliary;
    2626using HeuristicLab.Persistence.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828using HeuristicLab.Persistence.Default.Xml;
    2929using HeuristicLab.Persistence.Default.Xml.Primitive;
    … …  
    4040  /// but can be useful in generating custom serializers.
    4141  /// </summary>
    42   [StorableClass]
     42  [StorableType("23af67f5-2af6-4aca-b841-21345eacfb2f")]
    4343  public sealed class Number2StringSerializer : ICompositeSerializer {
    4444
    … …  
    115115      try {
    116116        return numberSerializerMap[Nullable.GetUnderlyingType(type) ?? type].Parse(new XmlString(stringValue));
    117       }
    118       catch (FormatException e) {
     117      } catch (FormatException e) {
    119118        throw new PersistenceException("Invalid element data during number parsing.", e);
    120       }
    121       catch (OverflowException e) {
     119      } catch (OverflowException e) {
    122120        throw new PersistenceException("Overflow during number parsing.", e);
    123121      }
    … …  
    172170        it.MoveNext();
    173171        return Parse((string)it.Current.Value, type);
    174       }
    175       catch (InvalidOperationException e) {
     172      } catch (InvalidOperationException e) {
    176173        throw new PersistenceException(
    177174          String.Format("Insufficient meta information to reconstruct number of type {0}.",
    178175          type.VersionInvariantName()), e);
    179       }
    180       catch (InvalidCastException e) {
     176      } catch (InvalidCastException e) {
    181177        throw new PersistenceException("Invalid meta information element type", e);
    182178      }

  • branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/NumberEnumerable2StringSerializer.cs

    r14185 r14927  
    2626using HeuristicLab.Persistence.Auxiliary;
    2727using HeuristicLab.Persistence.Core;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929using HeuristicLab.Persistence.Interfaces;
    3030
    3131namespace HeuristicLab.Persistence.Default.CompositeSerializers {
    3232
    33   [StorableClass]
     33  [StorableType("8bb7c8b8-89e5-41d4-a37e-c43e5beee451")]
    3434  internal sealed class NumberEnumerable2StringSerializer : ICompositeSerializer {
    3535
    … …  
    136136          addMethod.Invoke(instance, new[] { numberConverter.Parse(value, elementType) });
    137137        }
    138       }
    139       catch (InvalidOperationException e) {
     138      } catch (InvalidOperationException e) {
    140139        throw new PersistenceException("Insufficient element data to reconstruct number enumerable", e);
    141       }
    142       catch (InvalidCastException e) {
     140      } catch (InvalidCastException e) {
    143141        throw new PersistenceException("Invalid element data during reconstruction of number enumerable", e);
    144142      }

  • branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/QueueSerializer.cs

    r14185 r14927  
    2525using System.Reflection;
    2626using HeuristicLab.Persistence.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828using HeuristicLab.Persistence.Interfaces;
    2929
    3030namespace HeuristicLab.Persistence.Default.CompositeSerializers {
    3131
    32   [StorableClass]
     32  [StorableType("7a0dee32-0800-4a78-a1c3-88cd97939ca0")]
    3333  internal sealed class QueueSerializer : ICompositeSerializer {
    3434

  • branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/StackSerializer.cs

    r14185 r14927  
    2525using System.Reflection;
    2626using HeuristicLab.Persistence.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828using HeuristicLab.Persistence.Interfaces;
    2929
    3030namespace HeuristicLab.Persistence.Default.CompositeSerializers {
    3131
    32   [StorableClass]
     32  [StorableType("e395b076-6001-417e-925c-8820cc0354df")]
    3333  internal sealed class StackSerializer : ICompositeSerializer {
    3434
    … …  
    7676        foreach (var tag in tags)
    7777          addMethod.Invoke(instance, new[] { tag.Value });
    78       }
    79       catch (Exception e) {
     78      } catch (Exception e) {
    8079        throw new PersistenceException("Exception caught while trying to populate enumerable.", e);
    8180      }

  • branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/Storable/StorableSerializer.cs

    r14185 r14927  
    2828using HeuristicLab.Persistence.Core;
    2929using HeuristicLab.Persistence.Interfaces;
     30using HeuristicLab.Persistence;
    3031
    3132namespace HeuristicLab.Persistence.Default.CompositeSerializers.Storable {
    … …  
    3839  /// or <c>AllFieldsAndAllProperties</c>.
    3940  /// </summary>
    40   [StorableClass]
     41  [StorableType("ea2bd700-d2c9-4319-9883-b795bd8f078f")]
    4142  public sealed class StorableSerializer : ICompositeSerializer {
    4243

  • branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/StructSerializer.cs

    r14185 r14927  
    2424using System.Reflection;
    2525using HeuristicLab.Persistence.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727using HeuristicLab.Persistence.Interfaces;
    2828
    2929namespace HeuristicLab.Persistence.Default.CompositeSerializers {
    3030
    31   [StorableClass]
     31  [StorableType("070243ae-13d3-490e-ad17-81a96941ea3c")]
    3232  internal sealed class StructSerializer : ICompositeSerializer {
    3333

  • branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/TupleSerializer.cs

    r14185 r14927  
    2525using System.Reflection;
    2626using HeuristicLab.Persistence.Core;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.Persistence;
    2828using HeuristicLab.Persistence.Interfaces;
    2929
    3030namespace HeuristicLab.Persistence.Default.CompositeSerializers {
    3131
    32   [StorableClass]
     32  [StorableType("604ea532-4a4f-4cf6-af44-1e56cf357997")]
    3333  internal sealed class TupleSerializer : ICompositeSerializer {
    3434

  • branches/PersistenceReintegration/HeuristicLab.Persistence/3.3/Default/CompositeSerializers/TypeSerializer.cs

    r14185 r14927  
    2424using HeuristicLab.Persistence.Auxiliary;
    2525using HeuristicLab.Persistence.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727using HeuristicLab.Persistence.Interfaces;
    2828
    2929namespace HeuristicLab.Persistence.Default.CompositeSerializers {
    3030
    31   [StorableClass]
     31  [StorableType("dd23170e-0998-438a-b935-2061a7a4762e")]
    3232  internal sealed class TypeSerializer : ICompositeSerializer {
    3333
    … …  
    6666      try {
    6767        it.MoveNext();
    68       }
    69       catch (InvalidOperationException e) {
     68      } catch (InvalidOperationException e) {
    7069        throw new PersistenceException("Insufficient meta information to instantiate Type object", e);
    7170      }
    7271      try {
    7372        return TypeLoader.Load((string)it.Current.Value);
    74       }
    75       catch (InvalidCastException e) {
     73      } catch (InvalidCastException e) {
    7674        throw new PersistenceException("Invalid meta information during reconstruction of Type object", e);
    77       }
    78       catch (TypeLoadException e) {
     75      } catch (TypeLoadException e) {
    7976        throw new PersistenceException(String.Format(
    8077          "Cannot load Type {0}, make sure all required assemblies are available.",
Note: See TracChangeset for help on using the changeset viewer.