Skip to content

Commit 86b6655

Browse files
committed
Fix h6/LazyLoadingTest
1 parent e187ee2 commit 86b6655

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

hibernate6/src/main/java/tools/jackson/datatype/hibernate6/Hibernate6ProxySerializer.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import tools.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
2222
import tools.jackson.databind.jsontype.TypeSerializer;
2323
import tools.jackson.databind.ser.impl.PropertySerializerMap;
24-
import tools.jackson.databind.type.TypeFactory;
2524
import tools.jackson.databind.util.NameTransformer;
2625

2726
import jakarta.persistence.EntityNotFoundException;
@@ -192,8 +191,7 @@ protected ValueSerializer<Object> findSerializer(SerializationContext provider,
192191
*/
193192
PropertySerializerMap.SerializerAndMapResult result =
194193
_dynamicSerializers.findAndAddPrimarySerializer(
195-
//TODO find better way to get JavaType
196-
TypeFactory.createDefaultInstance().unsafeSimpleType(type),
194+
provider.constructType(type),
197195
provider,
198196
_property);
199197
if (_dynamicSerializers != result.map) {

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

Lines changed: 5 additions & 7 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.hibernate6.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,12 +63,11 @@ 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-
Hibernate6Module module = new Hibernate6Module();
71-
module.enable(Feature.SERIALIZE_IDENTIFIER_FOR_LAZY_NOT_LOADED_OBJECTS);
72-
ObjectMapper objectMapper =
68+
Hibernate6Module module = new Hibernate6Module();
69+
module.enable(Feature.SERIALIZE_IDENTIFIER_FOR_LAZY_NOT_LOADED_OBJECTS);
70+
ObjectMapper objectMapper =
7371
JsonMapper.builder()
7472
.addModule(module)
7573
.build();

0 commit comments

Comments
 (0)