Fix h5 LazyLoadingTest

Author: cowtowncoder

hibernate4/src/main/java/tools/jackson/datatype/hibernate4/HibernateProxySerializer.java

@@ -8,11 +8,7 @@
 import javax.persistence.EntityNotFoundException;
 
 import tools.jackson.core.*;
-import tools.jackson.databind.BeanProperty;
-import tools.jackson.databind.JavaType;
-import tools.jackson.databind.DatabindException;
-import tools.jackson.databind.ValueSerializer;
-import tools.jackson.databind.SerializationContext;
+import tools.jackson.databind.*;
 import tools.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import tools.jackson.databind.jsontype.TypeSerializer;
 import tools.jackson.databind.ser.impl.PropertySerializerMap;
@@ -231,7 +227,6 @@ protected ValueSerializer<Object> findSerializer(SerializationContext provider,
          */
         PropertySerializerMap.SerializerAndMapResult result =
                 _dynamicSerializers.findAndAddPrimarySerializer(
-                        //TODO find better way to get JavaType
                         provider.constructType(type),
                         provider,
                         _property);

hibernate5/src/main/java/tools/jackson/datatype/hibernate5/HibernateProxySerializer.java

@@ -8,15 +8,10 @@
 import javax.persistence.EntityNotFoundException;
 
 import tools.jackson.core.JsonGenerator;
-import tools.jackson.databind.BeanProperty;
-import tools.jackson.databind.JavaType;
-import tools.jackson.databind.DatabindException;
-import tools.jackson.databind.ValueSerializer;
-import tools.jackson.databind.SerializationContext;
+import tools.jackson.databind.*;
 import tools.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import tools.jackson.databind.jsontype.TypeSerializer;
 import tools.jackson.databind.ser.impl.PropertySerializerMap;
-import tools.jackson.databind.type.TypeFactory;
 import tools.jackson.databind.util.NameTransformer;
 
 import org.hibernate.engine.spi.Mapping;
@@ -233,8 +228,7 @@ protected ValueSerializer<Object> findSerializer(SerializationContext provider,
          */
         PropertySerializerMap.SerializerAndMapResult result =
                 _dynamicSerializers.findAndAddPrimarySerializer(
-                        //TODO find better way to get JavaType
-                        TypeFactory.createDefaultInstance().unsafeSimpleType(type),
+                        provider.constructType(type),
                         provider,
                         _property);
         if (_dynamicSerializers != result.map) {

hibernate5/src/test/java/tools/jackson/datatype/hibernate5/LazyLoadingTest.java

@@ -2,6 +2,8 @@
 
 import java.util.*;
 
+import org.junit.jupiter.api.Test;
+
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
@@ -14,8 +16,6 @@
 import tools.jackson.datatype.hibernate5.data.Payment;
 
 import org.hibernate.Hibernate;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -64,7 +64,6 @@ public void testGetCustomerJson() throws Exception
         }
     }
 
-    @Disabled // https://github.com/FasterXML/jackson-datatype-hibernate/issues/191
     @Test
     public void testSerializeIdentifierFeature() throws JacksonException {
 		Hibernate5Module module = new Hibernate5Module();