Skip to content

Commit 1364bc2

Browse files
cowtowncodercowtowncoder
committed
Update code to conform to 2.3 databind
1 parent c7b899d commit 1364bc2

File tree

8 files changed

+90
-85
lines changed

8 files changed

+90
-85
lines changed

‎hibernate3/src/main/java/com/fasterxml/jackson/datatype/hibernate3/HibernateProxySerializer.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,11 @@ protected JsonSerializer<Object> findSerializer(SerializerProvider provider, Obj
103103
* this avoids potentially costly lookup from global caches and/or construction
104104
* of new serializers
105105
*/
106-
PropertySerializerMap.SerializerAndMapResult result = _dynamicSerializers.findAndAddSerializer(type,
107-
provider, _property);
106+
/* 18-Oct-2013, tatu: Whether this is for the primary property or secondary is
107+
* really anyone's guess at this point; proxies can exist at any level?
108+
*/
109+
PropertySerializerMap.SerializerAndMapResult result =
110+
_dynamicSerializers.findAndAddPrimarySerializer(type, provider, _property);
108111
if (_dynamicSerializers != result.map) {
109112
_dynamicSerializers = result.map;
110113
}

‎hibernate3/src/main/java/com/fasterxml/jackson/datatype/hibernate3/PersistentCollectionSerializer.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,11 @@ public JsonSerializer<?> createContextual(SerializerProvider provider,
5555
BeanProperty property)
5656
throws JsonMappingException
5757
{
58-
JsonSerializer<?> ser = provider.handleContextualization(_serializer, property);
59-
58+
/* 18-Oct-2013, tatu: Whether this is for the primary property or secondary is
59+
* not quite certain; presume primary one for now.
60+
*/
61+
JsonSerializer<?> ser = provider.handlePrimaryContextualization(_serializer, property);
62+
6063
// If we use eager loading, or force it, can just return underlying serializer as is
6164
if (_forceLazyLoading || !usesLazyLoading(property)) {
6265
return ser;

‎hibernate3/src/test/java/com/fasterxml/jackson/datatype/hibernate3/data/OrderDetailId.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,19 @@ public void setProductCode(String productCode) {
3939
this.productCode = productCode;
4040
}
4141

42-
43-
public boolean equals(Object other) {
42+
@Override
43+
public boolean equals(Object other) {
4444
if ( (this == other ) ) return true;
4545
if ( (other == null ) ) return false;
4646
if ( !(other instanceof OrderDetailId) ) return false;
4747
OrderDetailId castOther = ( OrderDetailId ) other;
4848

4949
return ( (this.getOrderNumber()==castOther.getOrderNumber()) || ( this.getOrderNumber()!=null && castOther.getOrderNumber()!=null && this.getOrderNumber().equals(castOther.getOrderNumber()) ) )
50-
&& ( (this.getProductCode()==castOther.getProductCode()) || ( this.getProductCode()!=null && castOther.getProductCode()!=null && this.getProductCode().equals(castOther.getProductCode()) ) );
50+
&& ( (this.getProductCode()==castOther.getProductCode()) || ( this.getProductCode()!=null && castOther.getProductCode()!=null && this.getProductCode().equals(castOther.getProductCode()) ) );
5151
}
5252

53-
public int hashCode() {
53+
@Override
54+
public int hashCode() {
5455
int result = 17;
5556

5657
result = 37 * result + ( getOrderNumber() == null ? 0 : this.getOrderNumber().hashCode() );

‎hibernate3/src/test/java/com/fasterxml/jackson/datatype/hibernate3/data/PaymentId.java

Lines changed: 32 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,59 +6,55 @@
66

77
@SuppressWarnings("serial")
88
@Embeddable
9-
public class PaymentId implements java.io.Serializable {
10-
11-
9+
public class PaymentId implements java.io.Serializable
10+
{
1211
private Integer customerNumber;
1312
private String checkNumber;
1413

15-
public PaymentId() {
16-
}
14+
public PaymentId() { }
1715

18-
public PaymentId(Integer customerNumber, String checkNumber) {
19-
this.customerNumber = customerNumber;
20-
this.checkNumber = checkNumber;
21-
}
22-
16+
public PaymentId(Integer customerNumber, String checkNumber) {
17+
this.customerNumber = customerNumber;
18+
this.checkNumber = checkNumber;
19+
}
2320

24-
@Column(name="customerNumber", nullable=false)
25-
public Integer getCustomerNumber() {
26-
return this.customerNumber;
27-
}
28-
29-
public void setCustomerNumber(Integer customerNumber) {
30-
this.customerNumber = customerNumber;
31-
}
21+
@Column(name="customerNumber", nullable=false)
22+
public Integer getCustomerNumber() {
23+
return this.customerNumber;
24+
}
3225

33-
@Column(name="checkNumber", nullable=false, length=50)
34-
public String getCheckNumber() {
35-
return this.checkNumber;
36-
}
37-
38-
public void setCheckNumber(String checkNumber) {
39-
this.checkNumber = checkNumber;
40-
}
26+
public void setCustomerNumber(Integer customerNumber) {
27+
this.customerNumber = customerNumber;
28+
}
29+
30+
@Column(name="checkNumber", nullable=false, length=50)
31+
public String getCheckNumber() {
32+
return this.checkNumber;
33+
}
4134

35+
public void setCheckNumber(String checkNumber) {
36+
this.checkNumber = checkNumber;
37+
}
4238

43-
public boolean equals(Object other) {
39+
@Override
40+
public boolean equals(Object other) {
4441
if ( (this == other ) ) return true;
45-
if ( (other == null ) ) return false;
46-
if ( !(other instanceof PaymentId) ) return false;
47-
PaymentId castOther = ( PaymentId ) other;
42+
if ( (other == null ) ) return false;
43+
if ( !(other instanceof PaymentId) ) return false;
44+
PaymentId castOther = ( PaymentId ) other;
4845

49-
return ( (this.getCustomerNumber()==castOther.getCustomerNumber()) || ( this.getCustomerNumber()!=null && castOther.getCustomerNumber()!=null && this.getCustomerNumber().equals(castOther.getCustomerNumber()) ) )
50-
&& ( (this.getCheckNumber()==castOther.getCheckNumber()) || ( this.getCheckNumber()!=null && castOther.getCheckNumber()!=null && this.getCheckNumber().equals(castOther.getCheckNumber()) ) );
51-
}
46+
return ( (this.getCustomerNumber()==castOther.getCustomerNumber()) || ( this.getCustomerNumber()!=null && castOther.getCustomerNumber()!=null && this.getCustomerNumber().equals(castOther.getCustomerNumber()) ) )
47+
&& ( (this.getCheckNumber()==castOther.getCheckNumber()) || ( this.getCheckNumber()!=null && castOther.getCheckNumber()!=null && this.getCheckNumber().equals(castOther.getCheckNumber()) ) );
48+
}
5249

53-
public int hashCode() {
50+
@Override
51+
public int hashCode() {
5452
int result = 17;
5553

5654
result = 37 * result + ( getCustomerNumber() == null ? 0 : this.getCustomerNumber().hashCode() );
5755
result = 37 * result + ( getCheckNumber() == null ? 0 : this.getCheckNumber().hashCode() );
5856
return result;
5957
}
60-
61-
6258
}
6359

6460

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,11 @@ protected JsonSerializer<Object> findSerializer(SerializerProvider provider, Obj
118118
* this avoids potentially costly lookup from global caches and/or construction
119119
* of new serializers
120120
*/
121-
PropertySerializerMap.SerializerAndMapResult result = _dynamicSerializers.findAndAddSerializer(type,
122-
provider, _property);
121+
/* 18-Oct-2013, tatu: Whether this is for the primary property or secondary is
122+
* really anyone's guess at this point; proxies can exist at any level?
123+
*/
124+
PropertySerializerMap.SerializerAndMapResult result =
125+
_dynamicSerializers.findAndAddPrimarySerializer(type, provider, _property);
123126
if (_dynamicSerializers != result.map) {
124127
_dynamicSerializers = result.map;
125128
}

‎hibernate4/src/main/java/com/fasterxml/jackson/datatype/hibernate4/PersistentCollectionSerializer.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,10 @@ public JsonSerializer<?> createContextual(SerializerProvider provider,
6161
BeanProperty property)
6262
throws JsonMappingException
6363
{
64-
JsonSerializer<?> ser = provider.handleContextualization(_serializer, property);
64+
/* 18-Oct-2013, tatu: Whether this is for the primary property or secondary is
65+
* not quite certain; presume primary one for now.
66+
*/
67+
JsonSerializer<?> ser = provider.handlePrimaryContextualization(_serializer, property);
6568

6669
// If we use eager loading, or force it, can just return underlying serializer as is
6770
if (_forceLazyLoading || !usesLazyLoading(property)) {

‎hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/data/OrderDetailId.java

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,25 @@ public void setProductCode(String productCode) {
3939
this.productCode = productCode;
4040
}
4141

42-
43-
public boolean equals(Object other) {
44-
if ( (this == other ) ) return true;
45-
if ( (other == null ) ) return false;
46-
if ( !(other instanceof OrderDetailId) ) return false;
47-
OrderDetailId castOther = ( OrderDetailId ) other;
48-
49-
return ( (this.getOrderNumber()==castOther.getOrderNumber()) || ( this.getOrderNumber()!=null && castOther.getOrderNumber()!=null && this.getOrderNumber().equals(castOther.getOrderNumber()) ) )
50-
&& ( (this.getProductCode()==castOther.getProductCode()) || ( this.getProductCode()!=null && castOther.getProductCode()!=null && this.getProductCode().equals(castOther.getProductCode()) ) );
51-
}
42+
@Override
43+
public boolean equals(Object other) {
44+
if ( (this == other ) ) return true;
45+
if ( (other == null ) ) return false;
46+
if ( !(other instanceof OrderDetailId) ) return false;
47+
OrderDetailId castOther = ( OrderDetailId ) other;
48+
49+
return ( (this.getOrderNumber()==castOther.getOrderNumber()) || ( this.getOrderNumber()!=null && castOther.getOrderNumber()!=null && this.getOrderNumber().equals(castOther.getOrderNumber()) ) )
50+
&& ( (this.getProductCode()==castOther.getProductCode()) || ( this.getProductCode()!=null && castOther.getProductCode()!=null && this.getProductCode().equals(castOther.getProductCode()) ) );
51+
}
5252

53-
public int hashCode() {
54-
int result = 17;
55-
56-
result = 37 * result + ( getOrderNumber() == null ? 0 : this.getOrderNumber().hashCode() );
57-
result = 37 * result + ( getProductCode() == null ? 0 : this.getProductCode().hashCode() );
58-
return result;
59-
}
60-
61-
53+
@Override
54+
public int hashCode() {
55+
int result = 17;
56+
57+
result = 37 * result + ( getOrderNumber() == null ? 0 : this.getOrderNumber().hashCode() );
58+
result = 37 * result + ( getProductCode() == null ? 0 : this.getProductCode().hashCode() );
59+
return result;
60+
}
6261
}
6362

6463

‎hibernate4/src/test/java/com/fasterxml/jackson/datatype/hibernate4/data/PaymentId.java

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@
66

77
@SuppressWarnings("serial")
88
@Embeddable
9-
public class PaymentId implements java.io.Serializable {
9+
public class PaymentId implements java.io.Serializable
10+
{
11+
private Integer customerNumber;
12+
private String checkNumber;
1013

11-
12-
private Integer customerNumber;
13-
private String checkNumber;
14-
15-
public PaymentId() {
16-
}
14+
public PaymentId() { }
1715

1816
public PaymentId(Integer customerNumber, String checkNumber) {
1917
this.customerNumber = customerNumber;
@@ -39,26 +37,25 @@ public void setCheckNumber(String checkNumber) {
3937
this.checkNumber = checkNumber;
4038
}
4139

42-
43-
public boolean equals(Object other) {
40+
@Override
41+
public boolean equals(Object other) {
4442
if ( (this == other ) ) return true;
4543
if ( (other == null ) ) return false;
4644
if ( !(other instanceof PaymentId) ) return false;
4745
PaymentId castOther = ( PaymentId ) other;
4846

4947
return ( (this.getCustomerNumber()==castOther.getCustomerNumber()) || ( this.getCustomerNumber()!=null && castOther.getCustomerNumber()!=null && this.getCustomerNumber().equals(castOther.getCustomerNumber()) ) )
50-
&& ( (this.getCheckNumber()==castOther.getCheckNumber()) || ( this.getCheckNumber()!=null && castOther.getCheckNumber()!=null && this.getCheckNumber().equals(castOther.getCheckNumber()) ) );
51-
}
52-
53-
public int hashCode() {
54-
int result = 17;
55-
56-
result = 37 * result + ( getCustomerNumber() == null ? 0 : this.getCustomerNumber().hashCode() );
57-
result = 37 * result + ( getCheckNumber() == null ? 0 : this.getCheckNumber().hashCode() );
58-
return result;
59-
}
48+
&& ( (this.getCheckNumber()==castOther.getCheckNumber()) || ( this.getCheckNumber()!=null && castOther.getCheckNumber()!=null && this.getCheckNumber().equals(castOther.getCheckNumber()) ) );
49+
}
6050

51+
@Override
52+
public int hashCode() {
53+
int result = 17;
6154

55+
result = 37 * result + ( getCustomerNumber() == null ? 0 : this.getCustomerNumber().hashCode() );
56+
result = 37 * result + ( getCheckNumber() == null ? 0 : this.getCheckNumber().hashCode() );
57+
return result;
58+
}
6259
}
6360

6461

0 commit comments

Comments
 (0)