wip

Author: pjfanning

hibernate7/src/main/java/tools/jackson/datatype/hibernate7/PersistentCollectionSerializer.java

@@ -17,6 +17,7 @@
 import tools.jackson.databind.*;
 import tools.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import tools.jackson.databind.jsontype.TypeSerializer;
+import tools.jackson.databind.ser.std.StdContainerSerializer;
 import tools.jackson.databind.util.NameTransformer;
 
 import jakarta.persistence.ElementCollection;
@@ -33,7 +34,7 @@
  * and <code>Map</code> types (unlike in JDK).
  */
 public class PersistentCollectionSerializer
-    extends ValueSerializer<Object>
+    extends StdContainerSerializer<Object>
 {
     private static final long serialVersionUID = 1L;
 
@@ -93,6 +94,20 @@ protected PersistentCollectionSerializer _withSerializer(ValueSerializer<?> ser)
         return new PersistentCollectionSerializer(this, ser);
     }
 
+    // from `ContainerSerializer`
+    @Override
+    protected StdContainerSerializer<?> _withValueTypeSerializer(TypeSerializer vts)
+    {
+        StdContainerSerializer<?> ser0 = _containerSerializer();
+        if (ser0 != null) {
+            return _withSerializer(ser0.withValueTypeSerializer(vts));
+        }
+        // 03-Jan-2016, tatu: Not sure what to do here; most likely can not make it work without
+        //    knowing how to pass various calls... so in a way, should limit to only accepting
+        //    ContainerSerializers as delegates.
+        return this;
+    }
+
     /*
     /**********************************************************************
     /* Contextualization
@@ -161,6 +176,43 @@ public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType t
         _serializer.acceptJsonFormatVisitor(visitor, typeHint);
     }
 
+    /*
+    /**********************************************************************
+    /* ContainerSerializer methods
+    /**********************************************************************
+     */
+
+    @Override
+    public JavaType getContentType() {
+        StdContainerSerializer<?> ser = _containerSerializer();
+        if (ser != null) {
+            return ser.getContentType();
+        }
+        return _originalType.getContentType();
+    }
+
+    @Override
+    public ValueSerializer<?> getContentSerializer() {
+        StdContainerSerializer<?> ser = _containerSerializer();
+        if (ser != null) {
+            return ser.getContentSerializer();
+        }
+        // no idea, alas
+        return null;
+    }
+
+    @Override
+    public boolean hasSingleElement(Object value) {
+        if (value instanceof Collection<?>) {
+            return ((Collection<?>) value).size() == 1;
+        }
+        if (value instanceof Map<?,?>) {
+            return ((Map<?,?>) value).size() == 1;
+        }
+        return false;
+    }
+
+
     /*
     /**********************************************************************
     /* ValueSerializer, actual serialization
@@ -217,6 +269,13 @@ public void serializeWithType(Object value, JsonGenerator g, SerializationContex
     /**********************************************************************
      */
 
+    protected StdContainerSerializer<?> _containerSerializer() {
+        if (_serializer instanceof StdContainerSerializer) {
+            return (StdContainerSerializer<?>) _serializer;
+        }
+        return null;
+    }
+
     protected Object findLazyValue(PersistentCollection coll) {
         // If lazy-loaded, not yet loaded, may serialize as null?
         if (!Hibernate7Module.Feature.FORCE_LAZY_LOADING.enabledIn(_features) && !coll.wasInitialized()) {

pom.xml

@@ -77,6 +77,10 @@
   </dependencyManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
     <dependency>
       <groupId>tools.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
@@ -102,13 +106,6 @@
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
-
-    <!-- But there are also some well-known test dependencies we may as well add directly -->
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <!-- Need to include snapshot reference to find snapshot of parent -->
@@ -143,7 +140,7 @@
           <artifactId>maven-surefire-plugin</artifactId>
           <configuration>
             <excludes>
-              <exclude>com/fasterxml/jackson/**/failing/*.java</exclude>
+              <exclude>tools/jackson/**/failing/*.java</exclude>
             </excludes>
           </configuration>
         </plugin>