Add scaffolding for #2815

FasterXML · Aug 11, 2020 · 472c071 · 472c071
1 parent 240fcbf
commit 472c071
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/InetAddressSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/InetAddressSerializer.java
@@ -43,7 +43,7 @@ public InetAddressSerializer(boolean asNumeric) {
         super(InetAddress.class);
         _asNumeric = asNumeric;
     }
-    
+
     @Override
     public JsonSerializer<?> createContextual(SerializerProvider serializers,
             BeanProperty property) throws JsonMappingException

diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/UUIDSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/UUIDSerializer.java
@@ -3,10 +3,12 @@
 import java.io.IOException;
 import java.util.UUID;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonValueFormat;
+import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.fasterxml.jackson.databind.util.TokenBuffer;
 
 /**
@@ -19,6 +21,7 @@
 @SuppressWarnings("serial")
 public class UUIDSerializer
     extends StdScalarSerializer<UUID>
+    implements ContextualSerializer // since 2.11.3 (for databind#2815)
 {
     final static char[] HEX_CHARS = "0123456789abcdef".toCharArray();
 
@@ -35,6 +38,26 @@ public boolean isEmpty(SerializerProvider prov, UUID value)
         return false;
     }
 
+    @Override
+    public JsonSerializer<?> createContextual(SerializerProvider serializers,
+            BeanProperty property) throws JsonMappingException
+    {
+        JsonFormat.Value format = findFormatOverrides(serializers,
+                property, handledType());
+        Boolean asBinary = null;
+        if (format != null) {
+            JsonFormat.Shape shape = format.getShape();
+            if (shape == JsonFormat.Shape.BINARY) {
+                asBinary = true;
+            } else if (shape == JsonFormat.Shape.STRING) {
+                asBinary = false;
+            }
+            // otherwise leave as `null` meaning about same as NATURAL
+        }
+        // !!! TODO:
+        return this;
+    }
+
     @Override
     public void serialize(UUID value, JsonGenerator gen, SerializerProvider provider)
         throws IOException
@@ -50,7 +73,7 @@ public void serialize(UUID value, JsonGenerator gen, SerializerProvider provider
                 return;
             }
         }
-        
+
         // UUID.toString() works ok functionally, but we can make it go much faster
         // (by 4x with micro-benchmark)
 
@@ -93,7 +116,6 @@ private static void _appendShort(int bits, char[] ch, int offset)
         ch[++offset] = HEX_CHARS[(bits >> 8) & 0xF];
         ch[++offset] = HEX_CHARS[(bits >> 4) & 0xF];
         ch[++offset] = HEX_CHARS[bits  & 0xF];
-
     }
 
     private final static byte[] _asBytes(UUID uuid)