Made JacksonUserType generic for non-collection objects

Author: velo

src/main/java/org/rayjars/hibernate/JacksonUserType.java

@@ -21,10 +21,13 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Types;
+import java.util.Properties;
 
 import org.hibernate.HibernateException;
 import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.usertype.DynamicParameterizedType;
 import org.hibernate.usertype.UserType;
+import org.hibernate.usertype.DynamicParameterizedType.ParameterType;
 import org.postgresql.util.PGobject;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -39,9 +42,10 @@
  *
  * @author Regis Leray
  */
-public abstract class JacksonUserType implements UserType {
+public class JacksonUserType implements UserType, DynamicParameterizedType {
 
     private static final int[] SQL_TYPES = { Types.JAVA_OBJECT };
+    private Class returnedClass;
 
     @Override
     public boolean equals(Object x, Object y) throws HibernateException {
@@ -164,4 +168,18 @@ public int[] sqlTypes() {
         return SQL_TYPES;
     }
 
+    @Override
+    public void setParameterValues(Properties parameters) {
+        final ParameterType reader = (ParameterType) parameters.get(PARAMETER_TYPE);
+
+        if (reader != null) {
+            this.returnedClass = reader.getReturnedClass();
+        }
+    }
+
+    @Override
+    public Class returnedClass() {
+        return this.returnedClass;
+    }
+
 }

src/test/java/org/rayjars/hibernate/LabelUserType.java

@@ -35,7 +35,7 @@ public class Item {
     @Column(name = "name")
     private String name;
 
-    @Type(type = "org.rayjars.hibernate.LabelUserType")
+    @Type(type = "org.rayjars.hibernate.JacksonUserType")
     @Column(name = "label")
     private Label label;