Skip to content

Commit 86c6de4

Browse files
committed
and last LazyLoadingTest fix
1 parent 86b6655 commit 86c6de4

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,10 @@
1111
import org.hibernate.type.MappingContext;
1212

1313
import tools.jackson.core.JsonGenerator;
14-
import tools.jackson.databind.BeanProperty;
15-
import tools.jackson.databind.JavaType;
16-
import tools.jackson.databind.DatabindException;
17-
import tools.jackson.databind.ValueSerializer;
18-
import tools.jackson.databind.SerializationContext;
14+
import tools.jackson.databind.*;
1915
import tools.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
2016
import tools.jackson.databind.jsontype.TypeSerializer;
2117
import tools.jackson.databind.ser.impl.PropertySerializerMap;
22-
import tools.jackson.databind.type.TypeFactory;
2318
import tools.jackson.databind.util.NameTransformer;
2419

2520
import jakarta.persistence.EntityNotFoundException;
@@ -190,8 +185,7 @@ protected ValueSerializer<Object> findSerializer(SerializationContext provider,
190185
*/
191186
PropertySerializerMap.SerializerAndMapResult result =
192187
_dynamicSerializers.findAndAddPrimarySerializer(
193-
//TODO find better way to get JavaType
194-
TypeFactory.createDefaultInstance().unsafeSimpleType(type),
188+
provider.constructType(type),
195189
provider,
196190
_property);
197191
if (_dynamicSerializers != result.map) {

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import java.util.Map;
44
import java.util.Set;
55

6+
import org.junit.jupiter.api.Test;
7+
68
import tools.jackson.core.JacksonException;
79
import tools.jackson.databind.ObjectMapper;
810
import tools.jackson.databind.json.JsonMapper;
@@ -11,9 +13,6 @@
1113
import tools.jackson.datatype.hibernate7.data.Payment;
1214
import org.hibernate.Hibernate;
1315

14-
import org.junit.jupiter.api.Disabled;
15-
import org.junit.jupiter.api.Test;
16-
1716
import jakarta.persistence.EntityManager;
1817
import jakarta.persistence.EntityManagerFactory;
1918
import jakarta.persistence.Persistence;
@@ -64,10 +63,9 @@ public void testGetCustomerJson() throws Exception
6463
}
6564
}
6665

67-
@Disabled // https://github.com/FasterXML/jackson-datatype-hibernate/issues/191
6866
@Test
6967
public void testSerializeIdentifierFeature() throws JacksonException {
70-
Hibernate7Module module = new Hibernate7Module();
68+
Hibernate7Module module = new Hibernate7Module();
7169
module.enable(Feature.SERIALIZE_IDENTIFIER_FOR_LAZY_NOT_LOADED_OBJECTS);
7270
ObjectMapper objectMapper =
7371
JsonMapper.builder()

0 commit comments

Comments
 (0)