Skip to content

Commit fd94d8e

Browse files
committed
wip
1 parent abdf993 commit fd94d8e

File tree

5 files changed

+15
-10
lines changed

5 files changed

+15
-10
lines changed

hibernate4/src/main/java/tools/jackson/datatype/hibernate4/HibernateAnnotationIntrospector.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.hibernate.bytecode.internal.javassist.FieldHandler;
66

77
import tools.jackson.core.Version;
8+
import tools.jackson.databind.cfg.MapperConfig;
89
import tools.jackson.databind.introspect.AnnotatedClass;
910
import tools.jackson.databind.introspect.AnnotatedMember;
1011
import tools.jackson.databind.introspect.NopAnnotationIntrospector;
@@ -67,12 +68,12 @@ public Version version() {
6768
*/
6869

6970
@Override
70-
public boolean hasIgnoreMarker(AnnotatedMember m) {
71+
public boolean hasIgnoreMarker(MapperConfig<?> config, AnnotatedMember m) {
7172
return _cfgCheckTransient && m.hasAnnotation(Transient.class);
7273
}
7374

7475
@Override
75-
public Boolean isIgnorableType(AnnotatedClass ac)
76+
public Boolean isIgnorableType(MapperConfig<?> config, AnnotatedClass ac)
7677
{
7778
/* 26-Dec-2015, tatu: To fix [datatype-hibernate#72], need to suppress handling
7879
* of `FieldHandled`. Not sure if it works without test (alas, none provided),

hibernate5-jakarta/src/main/java/tools/jackson/datatype/hibernate5/jakarta/Hibernate5JAnnotationIntrospector.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import tools.jackson.core.Version;
44
import tools.jackson.databind.AnnotationIntrospector;
5+
import tools.jackson.databind.cfg.MapperConfig;
56
import tools.jackson.databind.introspect.AnnotatedClass;
67
import tools.jackson.databind.introspect.AnnotatedMember;
78
import tools.jackson.datatype.hibernate5.jakarta.PackageVersion;
@@ -66,12 +67,12 @@ public Version version() {
6667
*/
6768

6869
@Override
69-
public boolean hasIgnoreMarker(AnnotatedMember m) {
70+
public boolean hasIgnoreMarker(MapperConfig<?> config, AnnotatedMember m) {
7071
return _cfgCheckTransient && m.hasAnnotation(Transient.class);
7172
}
7273

7374
@Override
74-
public Boolean isIgnorableType(AnnotatedClass ac)
75+
public Boolean isIgnorableType(MapperConfig<?> config, AnnotatedClass ac)
7576
{
7677
/* 26-Dec-2015, tatu: To fix [datatype-hibernate#72], need to suppress handling
7778
* of `FieldHandled`. Not sure if it works without test (alas, none provided),

hibernate5/src/main/java/tools/jackson/datatype/hibernate5/HibernateAnnotationIntrospector.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import tools.jackson.core.Version;
66
import tools.jackson.databind.AnnotationIntrospector;
7+
import tools.jackson.databind.cfg.MapperConfig;
78
import tools.jackson.databind.introspect.AnnotatedClass;
89
import tools.jackson.databind.introspect.AnnotatedMember;
910

@@ -65,12 +66,12 @@ public Version version() {
6566
*/
6667

6768
@Override
68-
public boolean hasIgnoreMarker(AnnotatedMember m) {
69+
public boolean hasIgnoreMarker(MapperConfig<?> config, AnnotatedMember m) {
6970
return _cfgCheckTransient && m.hasAnnotation(Transient.class);
7071
}
7172

7273
@Override
73-
public Boolean isIgnorableType(AnnotatedClass ac)
74+
public Boolean isIgnorableType(MapperConfig<?> config, AnnotatedClass ac)
7475
{
7576
/* 26-Dec-2015, tatu: To fix [datatype-hibernate#72], need to suppress handling
7677
* of `FieldHandled`. Not sure if it works without test (alas, none provided),

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import tools.jackson.core.Version;
44
import tools.jackson.databind.AnnotationIntrospector;
5+
import tools.jackson.databind.cfg.MapperConfig;
56
import tools.jackson.databind.introspect.AnnotatedClass;
67
import tools.jackson.databind.introspect.AnnotatedMember;
78
import jakarta.persistence.Transient;
@@ -64,12 +65,12 @@ public Version version() {
6465
*/
6566

6667
@Override
67-
public boolean hasIgnoreMarker(AnnotatedMember m) {
68+
public boolean hasIgnoreMarker(MapperConfig<?> config, AnnotatedMember m) {
6869
return _cfgCheckTransient && m.hasAnnotation(Transient.class);
6970
}
7071

7172
@Override
72-
public Boolean isIgnorableType(AnnotatedClass ac)
73+
public Boolean isIgnorableType(MapperConfig<?> config, AnnotatedClass ac)
7374
{
7475
/* 26-Dec-2015, tatu: To fix [datatype-hibernate#72], need to suppress handling
7576
* of `FieldHandled`. Not sure if it works without test (alas, none provided),

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import tools.jackson.core.Version;
44
import tools.jackson.databind.AnnotationIntrospector;
5+
import tools.jackson.databind.cfg.MapperConfig;
56
import tools.jackson.databind.introspect.AnnotatedClass;
67
import tools.jackson.databind.introspect.AnnotatedMember;
78
import jakarta.persistence.Transient;
@@ -64,12 +65,12 @@ public Version version() {
6465
*/
6566

6667
@Override
67-
public boolean hasIgnoreMarker(AnnotatedMember m) {
68+
public boolean hasIgnoreMarker(MapperConfig<?> config, AnnotatedMember m) {
6869
return _cfgCheckTransient && m.hasAnnotation(Transient.class);
6970
}
7071

7172
@Override
72-
public Boolean isIgnorableType(AnnotatedClass ac)
73+
public Boolean isIgnorableType(MapperConfig<?> config, AnnotatedClass ac)
7374
{
7475
/* 26-Dec-2015, tatu: To fix [datatype-hibernate#72], need to suppress handling
7576
* of `FieldHandled`. Not sure if it works without test (alas, none provided),

0 commit comments

Comments
 (0)