Skip to content

Commit 8017a55

Browse files
committed
remove unnecessary method
1 parent d5a3bf6 commit 8017a55

File tree

2 files changed

+3
-20
lines changed

2 files changed

+3
-20
lines changed

hibernate6/src/main/java/com/fasterxml/jackson/datatype/hibernate6/Hibernate6ProxySerializer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ private String getIdentifierPropertyName(final LazyInitializer init) {
249249
if (_mapping != null) {
250250
idName = _mapping.getIdentifierPropertyName(init.getEntityName());
251251
} else {
252+
// no unit tests rely on this next call and Hibernate 7 does not support it
252253
idName = ProxySessionReader.getIdentifierPropertyName(init);
253254
if (idName == null) {
254255
idName = ProxyReader.getIdentifierPropertyName(init);

hibernate7/src/main/java/com/fasterxml/jackson/datatype/hibernate7/Hibernate7ProxySerializer.java

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
import java.lang.reflect.Method;
77
import java.util.HashMap;
88

9-
import org.hibernate.engine.spi.SessionFactoryImplementor;
10-
import org.hibernate.engine.spi.SessionImplementor;
11-
import org.hibernate.engine.spi.SharedSessionContractImplementor;
129
import org.hibernate.proxy.HibernateProxy;
1310
import org.hibernate.proxy.LazyInitializer;
1411
import org.hibernate.proxy.pojo.BasicLazyInitializer;
@@ -250,12 +247,9 @@ private String getIdentifierPropertyName(final LazyInitializer init) {
250247
if (_mapping != null) {
251248
idName = _mapping.getIdentifierPropertyName(init.getEntityName());
252249
} else {
253-
idName = ProxySessionReader.getIdentifierPropertyName(init);
250+
idName = ProxyReader.getIdentifierPropertyName(init);
254251
if (idName == null) {
255-
idName = ProxyReader.getIdentifierPropertyName(init);
256-
if (idName == null) {
257-
idName = init.getEntityName();
258-
}
252+
idName = init.getEntityName();
259253
}
260254
}
261255
return idName;
@@ -301,16 +295,4 @@ static String getIdentifierPropertyName(LazyInitializer init) {
301295
}
302296
}
303297
}
304-
305-
protected static class ProxySessionReader {
306-
static String getIdentifierPropertyName(LazyInitializer init) {
307-
final SharedSessionContractImplementor session = init.getSession();
308-
if (session != null) {
309-
SessionFactoryImplementor factory = session.getFactory();
310-
//TODO fixme - used to work with Hibernate 6, but not anymore
311-
//return factory.getIdentifierPropertyName(init.getEntityName());
312-
}
313-
return null;
314-
}
315-
}
316298
}

0 commit comments

Comments
 (0)