Merge pull request #152 from cryptimeleon/feature/standalone-repr-uuid

Author: JanBobolz

src/main/java/org/cryptimeleon/math/serialization/annotations/StandaloneRepresentationHandler.java

@@ -5,6 +5,7 @@
 
 import java.lang.reflect.Type;
 import java.math.BigInteger;
+import java.util.UUID;
 import java.util.function.Function;
 
 /**
@@ -17,7 +18,7 @@ class StandaloneRepresentationHandler implements RepresentationHandler {
     // that's not null is already set (and int is auto-initialized with 0)
     private static final Class<?>[] supportedTypes = new Class[] {
             StandaloneRepresentable.class, BigInteger.class, Integer.class, String.class, Boolean.class,
-            byte[].class, Enum.class
+            byte[].class, UUID.class, Enum.class
     };
     /**
      * Type of the represented object.
@@ -79,6 +80,10 @@ public Object deserializeFromRepresentation(Representation repr, Function<String
             return repr.bytes().get();
         }
 
+        if (type.isAssignableFrom(UUID.class) && repr instanceof StringRepresentation) {
+            return UUID.fromString(repr.str().get());
+        }
+
         throw new IllegalArgumentException("Don't know how to recreate " + type.getName() + " from a "
                 + repr.getClass().getName());
     }
@@ -129,6 +134,11 @@ public Representation serializeToRepresentation(Object value) {
             return new ByteArrayRepresentation(bytes);
         }
 
+        if (value instanceof UUID) {
+            UUID uuid = (UUID) value;
+            return new StringRepresentation(uuid.toString());
+        }
+
         throw new IllegalArgumentException("Do not know how to handle object of type " + value.getClass().getName()
                 + ". You may have to add an explicit 'restorer' argument to the @Represented annotation");
     }