Skip to content

Commit 80a1f7c

Browse files
committed
Update release notes wrt #97
1 parent 228272a commit 80a1f7c

File tree

4 files changed

+16
-2
lines changed

4 files changed

+16
-2
lines changed

hibernate4/src/main/java/com/fasterxml/jackson/datatype/hibernate4/HibernateProxySerializer.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ public class HibernateProxySerializer
4848
protected final boolean _serializeIdentifier;
4949
protected final boolean _nullMissingEntities;
5050
protected final Mapping _mapping;
51+
52+
// @since 2.11.2 (datatype-hibernate#97)
5153
protected final NameTransformer _unwrapper;
5254

5355
/**
@@ -98,7 +100,7 @@ protected HibernateProxySerializer(boolean forceLazyLoading, boolean serializeId
98100

99101
@Override
100102
public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty property) {
101-
return new HibernateProxySerializer(this._forceLazyLoading, _serializeIdentifier, _nullMissingEntities,
103+
return new HibernateProxySerializer(_forceLazyLoading, _serializeIdentifier, _nullMissingEntities,
102104
_mapping, property, _unwrapper);
103105
}
104106

hibernate5/src/main/java/com/fasterxml/jackson/datatype/hibernate5/HibernateProxySerializer.java

+2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ public class HibernateProxySerializer
4949
protected final boolean _serializeIdentifier;
5050
protected final boolean _nullMissingEntities;
5151
protected final Mapping _mapping;
52+
53+
// @since 2.11.2 (datatype-hibernate#97)
5254
protected final NameTransformer _unwrapper;
5355

5456
/**

release-notes/CREDITS

+6-1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,10 @@ Edouard Oger (eoger@github)
2525

2626
Tiago Peruzzo (peruzzo@github)
2727

28-
#70: Infinite recursion due to `@JsonIgnoreProperties` not passed to property
28+
* Reported #70: Infinite recursion due to `@JsonIgnoreProperties` not passed to property
2929
(2.6.5)
30+
31+
Vladimir Tsanev (tsachev@github)
32+
33+
* Contributed fix for #97: `@JsonUnwrapped` fails for HibernateProxy instances
34+
(2.11.2)

release-notes/VERSION

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ Project: jackson-datatype-hibernate
44
=== Releases ===
55
------------------------------------------------------------------------
66

7+
2.11.2 (not yet released)
8+
9+
#97: `@JsonUnwrapped` fails for HibernateProxy instances
10+
(reported by jwgmeligmeyling@github, fix contributed by Vladimir T)
11+
712
2.11.1 (25-Jun-2020)
813
2.11.0 (26-Apr-2020)
914

0 commit comments

Comments
 (0)