Skip to content

Commit 1dca10c

Browse files
pjfanningpjfanning
committed
compile issues after BeanDescription.Supplier changes
1 parent d4dbd71 commit 1dca10c

30 files changed

+34
-34
lines changed

‎src/main/scala-2.12/tools/jackson/module/scala/deser/SeqDeserializerModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ trait SeqDeserializerModule extends ScalaTypeModifierModule {
5959

6060
override def findCollectionLikeDeserializer(collectionType: CollectionLikeType,
6161
deserializationConfig: DeserializationConfig,
62-
beanDesc: BeanDescription,
62+
beanDesc: BeanDescription.Supplier,
6363
elementTypeDeserializer: TypeDeserializer,
6464
elementDeserializer: ValueDeserializer[_]): ValueDeserializer[_] = {
6565
val rawClass = collectionType.getRawClass

‎src/main/scala-2.12/tools/jackson/module/scala/deser/UnsortedMapDeserializerModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ trait UnsortedMapDeserializerModule extends MapTypeModifierModule {
3838

3939
override def findMapLikeDeserializer(theType: MapLikeType,
4040
config: DeserializationConfig,
41-
beanDesc: BeanDescription,
41+
beanDesc: BeanDescription.Supplier,
4242
keyDeserializer: KeyDeserializer,
4343
elementTypeDeserializer: TypeDeserializer,
4444
elementDeserializer: ValueDeserializer[_]): ValueDeserializer[_] = {

‎src/main/scala-2.13/tools/jackson/module/scala/deser/SeqDeserializerModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ trait SeqDeserializerModule extends ScalaTypeModifierModule {
6969

7070
override def findCollectionLikeDeserializer(collectionType: CollectionLikeType,
7171
deserializationConfig: DeserializationConfig,
72-
beanDesc: BeanDescription,
72+
beanDesc: BeanDescription.Supplier,
7373
elementTypeDeserializer: TypeDeserializer,
7474
elementDeserializer: ValueDeserializer[_]): ValueDeserializer[_] = {
7575
val rawClass = collectionType.getRawClass

‎src/main/scala-2.13/tools/jackson/module/scala/deser/UnsortedMapDeserializerModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ trait UnsortedMapDeserializerModule extends MapTypeModifierModule {
3838

3939
override def findMapLikeDeserializer(theType: MapLikeType,
4040
config: DeserializationConfig,
41-
beanDesc: BeanDescription,
41+
beanDesc: BeanDescription.Supplier,
4242
keyDeserializer: KeyDeserializer,
4343
elementTypeDeserializer: TypeDeserializer,
4444
elementDeserializer: ValueDeserializer[_]): ValueDeserializer[_] = {

‎src/main/scala-3/tools/jackson/module/scala/deser/EnumDeserializerModule.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ private case class EnumKeyDeserializer[T <: Enum](clazz: Class[T]) extends KeyDe
112112
}
113113

114114
private class EnumDeserializerResolver(config: ScalaModule.Config) extends Deserializers.Base {
115-
override def findBeanDeserializer(javaType: JavaType, config: DeserializationConfig, beanDesc: BeanDescription): ValueDeserializer[Enum] =
115+
override def findBeanDeserializer(javaType: JavaType, config: DeserializationConfig, beanDesc: BeanDescription.Supplier): ValueDeserializer[Enum] =
116116
if (EnumDeserializerShared.EnumClass isAssignableFrom javaType.getRawClass)
117117
EnumDeserializer(javaType.getRawClass.asInstanceOf[Class[Enum]])
118118
else None.orNull
@@ -122,7 +122,7 @@ private class EnumDeserializerResolver(config: ScalaModule.Config) extends Deser
122122
}
123123

124124
private class EnumKeyDeserializerResolver(config: ScalaModule.Config) extends KeyDeserializers {
125-
override def findKeyDeserializer(javaType: JavaType, config: DeserializationConfig, beanDesc: BeanDescription): KeyDeserializer =
125+
override def findKeyDeserializer(javaType: JavaType, config: DeserializationConfig, beanDesc: BeanDescription.Supplier): KeyDeserializer =
126126
if (EnumDeserializerShared.EnumClass isAssignableFrom javaType.getRawClass)
127127
EnumKeyDeserializer(javaType.getRawClass.asInstanceOf[Class[Enum]])
128128
else None.orNull

‎src/main/scala-3/tools/jackson/module/scala/ser/EnumSerializerModule.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ private object EnumKeySerializer extends ValueSerializer[Enum] {
2727
}
2828

2929
private class EnumSerializerResolver(config: ScalaModule.Config) extends Serializers.Base {
30-
override def findSerializer(config: SerializationConfig, javaType: JavaType, beanDesc: BeanDescription,
30+
override def findSerializer(config: SerializationConfig, javaType: JavaType, beanDesc: BeanDescription.Supplier,
3131
formatOverrides: JsonFormat.Value): ValueSerializer[Enum] =
3232
if (EnumSerializerShared.EnumClass.isAssignableFrom(javaType.getRawClass))
3333
EnumSerializer
3434
else None.orNull
3535
}
3636

3737
private class EnumKeySerializerResolver(config: ScalaModule.Config) extends Serializers.Base {
38-
override def findSerializer(config: SerializationConfig, javaType: JavaType, beanDesc: BeanDescription,
38+
override def findSerializer(config: SerializationConfig, javaType: JavaType, beanDesc: BeanDescription.Supplier,
3939
formatOverrides: JsonFormat.Value): ValueSerializer[Enum] =
4040
if (EnumSerializerShared.EnumClass isAssignableFrom javaType.getRawClass)
4141
EnumKeySerializer

‎src/main/scala/tools/jackson/module/scala/BitSetDeserializerModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ object BitSetDeserializerModule extends JacksonModule {
3232

3333
override def findCollectionLikeDeserializer(`type`: CollectionLikeType,
3434
config: DeserializationConfig,
35-
beanDesc: BeanDescription,
35+
beanDesc: BeanDescription.Supplier,
3636
elementTypeDeserializer: TypeDeserializer,
3737
elementDeserializer: ValueDeserializer[_]): ValueDeserializer[_] = {
3838
val rawClass = `type`.getRawClass

‎src/main/scala/tools/jackson/module/scala/deser/EitherDeserializer.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ private class EitherDeserializerResolver(config: ScalaModule.Config) extends Des
113113

114114
private val EITHER = classOf[Either[_, _]]
115115

116-
override def findBeanDeserializer(`type`: JavaType, deserializationConfig: DeserializationConfig, beanDesc: BeanDescription): ValueDeserializer[_] = {
116+
override def findBeanDeserializer(`type`: JavaType, deserializationConfig: DeserializationConfig, beanDesc: BeanDescription.Supplier): ValueDeserializer[_] = {
117117
val rawClass = `type`.getRawClass
118118

119119
if (!EITHER.isAssignableFrom(rawClass)) {
@@ -124,7 +124,7 @@ private class EitherDeserializerResolver(config: ScalaModule.Config) extends Des
124124
}
125125

126126
override def findReferenceDeserializer(refType: ReferenceType, deserializationConfig: DeserializationConfig,
127-
beanDesc: BeanDescription, contentTypeDeserializer: TypeDeserializer,
127+
beanDesc: BeanDescription.Supplier, contentTypeDeserializer: TypeDeserializer,
128128
contentDeserializer: ValueDeserializer[_]): ValueDeserializer[_] = {
129129
val rawClass = refType.getRawClass
130130

‎src/main/scala/tools/jackson/module/scala/deser/EnumerationDeserializerModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ private class EnumerationDeserializerResolver(config: ScalaModule.Config) extend
6363

6464
override def findBeanDeserializer(javaType: JavaType,
6565
deserializationConfig: DeserializationConfig,
66-
beanDesc: BeanDescription) = {
66+
beanDesc: BeanDescription.Supplier) = {
6767

6868
val clazz = javaType.getRawClass
6969
if (ENUMERATION.isAssignableFrom(clazz)) {

‎src/main/scala/tools/jackson/module/scala/deser/GenericFactoryDeserializerResolver.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ abstract class GenericFactoryDeserializerResolver[CC[_], CF[X[_]]](config: Scala
3131

3232
override def findCollectionLikeDeserializer(collectionType: CollectionLikeType,
3333
deserializationConfig: DeserializationConfig,
34-
beanDesc: BeanDescription,
34+
beanDesc: BeanDescription.Supplier,
3535
elementTypeDeserializer: TypeDeserializer,
3636
elementDeserializer: ValueDeserializer[_]): ValueDeserializer[_] = {
3737
if (!CLASS_DOMAIN.isAssignableFrom(collectionType.getRawClass)) null

‎src/main/scala/tools/jackson/module/scala/deser/GenericMapFactoryDeserializerResolver.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ abstract class GenericMapFactoryDeserializerResolver[CC[K, V], CF[X[_, _]]](conf
3232

3333
override def findMapLikeDeserializer(theType: MapLikeType,
3434
deserializationConfig: DeserializationConfig,
35-
beanDesc: BeanDescription,
35+
beanDesc: BeanDescription.Supplier,
3636
keyDeserializer: KeyDeserializer,
3737
elementTypeDeserializer: TypeDeserializer,
3838
elementDeserializer: ValueDeserializer[_]): ValueDeserializer[_] = {

‎src/main/scala/tools/jackson/module/scala/deser/IntMapDeserializerResolver.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ private[deser] object IntMapDeserializerResolver extends Deserializers.Base {
2525

2626
override def findMapLikeDeserializer(theType: MapLikeType,
2727
config: DeserializationConfig,
28-
beanDesc: BeanDescription,
28+
beanDesc: BeanDescription.Supplier,
2929
keyDeserializer: KeyDeserializer,
3030
elementTypeDeserializer: TypeDeserializer,
3131
elementDeserializer: ValueDeserializer[_]): ValueDeserializer[_] = {

‎src/main/scala/tools/jackson/module/scala/deser/LongMapDeserializerResolver.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ private[deser] object LongMapDeserializerResolver extends Deserializers.Base {
2626

2727
override def findMapLikeDeserializer(theType: MapLikeType,
2828
config: DeserializationConfig,
29-
beanDesc: BeanDescription,
29+
beanDesc: BeanDescription.Supplier,
3030
keyDeserializer: KeyDeserializer,
3131
elementTypeDeserializer: TypeDeserializer,
3232
elementDeserializer: ValueDeserializer[_]): ValueDeserializer[_] = {

‎src/main/scala/tools/jackson/module/scala/deser/OptionDeserializerModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ private class OptionDeserializerResolver(config: ScalaModule.Config) extends Des
108108

109109
override def findReferenceDeserializer(refType: ReferenceType,
110110
deserializationConfig: DeserializationConfig,
111-
beanDesc: BeanDescription,
111+
beanDesc: BeanDescription.Supplier,
112112
contentTypeDeserializer: TypeDeserializer,
113113
contentDeserializer: ValueDeserializer[_]): ValueDeserializer[_] = {
114114
if (!OPTION.isAssignableFrom(refType.getRawClass)) None.orNull

‎src/main/scala/tools/jackson/module/scala/deser/ScalaNumberDeserializersModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ private object NumberDeserializers {
4141

4242
private class NumberDeserializers(config: ScalaModule.Config) extends Deserializers.Base {
4343

44-
override def findBeanDeserializer(tpe: JavaType, config: DeserializationConfig, beanDesc: BeanDescription): ValueDeserializer[_] =
44+
override def findBeanDeserializer(tpe: JavaType, config: DeserializationConfig, beanDesc: BeanDescription.Supplier): ValueDeserializer[_] =
4545
tpe.getRawClass match {
4646
case NumberDeserializers.BigDecimalClass => BigDecimalDeserializer
4747
case NumberDeserializers.BigIntClass => BigIntDeserializer

‎src/main/scala/tools/jackson/module/scala/deser/ScalaObjectDeserializerModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ private class ScalaObjectDeserializer(value: Any) extends StdDeserializer[Any](c
2323
}
2424

2525
private class ScalaObjectDeserializerResolver(config: ScalaModule.Config) extends Deserializers.Base {
26-
override def findBeanDeserializer(javaType: JavaType, deserializationConfig: DeserializationConfig, beanDesc: BeanDescription): ValueDeserializer[_] = {
26+
override def findBeanDeserializer(javaType: JavaType, deserializationConfig: DeserializationConfig, beanDesc: BeanDescription.Supplier): ValueDeserializer[_] = {
2727
ClassW(javaType.getRawClass).getModuleField.flatMap { field =>
2828
Option(field.get(null))
2929
}.map(new ScalaObjectDeserializer(_)).orNull

‎src/main/scala/tools/jackson/module/scala/deser/SortedSetDeserializerModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ trait SortedSetDeserializerModule extends ScalaTypeModifierModule {
4343

4444
override def findCollectionLikeDeserializer(collectionType: CollectionLikeType,
4545
config: DeserializationConfig,
46-
beanDesc: BeanDescription,
46+
beanDesc: BeanDescription.Supplier,
4747
elementTypeDeserializer: TypeDeserializer,
4848
elementDeserializer: ValueDeserializer[_]): ValueDeserializer[_] = {
4949
val rawClass = collectionType.getRawClass

‎src/main/scala/tools/jackson/module/scala/deser/SymbolDeserializerModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ private object SymbolDeserializer extends StdDeserializer[Symbol](classOf[Symbol
1818
private class SymbolDeserializerResolver(config: ScalaModule.Config) extends Deserializers.Base {
1919
private val SYMBOL = classOf[Symbol]
2020

21-
override def findBeanDeserializer(javaType: JavaType, deserializationConfig: DeserializationConfig, beanDesc: BeanDescription): ValueDeserializer[Symbol] =
21+
override def findBeanDeserializer(javaType: JavaType, deserializationConfig: DeserializationConfig, beanDesc: BeanDescription.Supplier): ValueDeserializer[Symbol] =
2222
if (SYMBOL isAssignableFrom javaType.getRawClass)
2323
SymbolDeserializer
2424
else null

‎src/main/scala/tools/jackson/module/scala/deser/TupleDeserializerModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private class TupleDeserializerResolver(config: ScalaModule.Config) extends Dese
7474

7575
override def findBeanDeserializer(javaType: JavaType,
7676
deserializationConfig: DeserializationConfig,
77-
beanDesc: BeanDescription): ValueDeserializer[_] = {
77+
beanDesc: BeanDescription.Supplier): ValueDeserializer[_] = {
7878
val cls = javaType.getRawClass
7979
if (!PRODUCT.isAssignableFrom(cls)) null else
8080
// If it's not *actually* a tuple, it's either a case class or a custom Product

‎src/main/scala/tools/jackson/module/scala/deser/UnsortedSetDeserializerModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ trait UnsortedSetDeserializerModule extends ScalaTypeModifierModule {
4040

4141
override def findCollectionLikeDeserializer(collectionType: CollectionLikeType,
4242
config: DeserializationConfig,
43-
beanDesc: BeanDescription,
43+
beanDesc: BeanDescription.Supplier,
4444
elementTypeDeserializer: TypeDeserializer,
4545
elementDeserializer: ValueDeserializer[_]): ValueDeserializer[_] = {
4646
val rawClass = collectionType.getRawClass

‎src/main/scala/tools/jackson/module/scala/deser/UntypedObjectDeserializerModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ private class UntypedObjectDeserializerResolver(config: ScalaModule.Config) exte
5050

5151
override def findBeanDeserializer(javaType: JavaType,
5252
deserializationConfig: DeserializationConfig,
53-
beanDesc: BeanDescription) =
53+
beanDesc: BeanDescription.Supplier) =
5454
if (!objectClass.equals(javaType.getRawClass)) null
5555
else new UntypedScalaObjectDeserializer
5656

‎src/main/scala/tools/jackson/module/scala/introspect/ScalaAnnotationIntrospectorModule.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class ScalaAnnotationIntrospectorInstance(scalaAnnotationIntrospectorModule: Sca
114114
}
115115
}
116116

117-
override def modifyValueInstantiator(deserializationConfig: DeserializationConfig, beanDesc: BeanDescription,
117+
override def modifyValueInstantiator(deserializationConfig: DeserializationConfig, beanDesc: BeanDescription.Supplier,
118118
defaultInstantiator: ValueInstantiator): ValueInstantiator = {
119119
if (scalaAnnotationIntrospectorModule.isMaybeScalaBeanType(beanDesc.getBeanClass)) {
120120
_descriptorFor(beanDesc.getBeanClass).map { descriptor =>
@@ -131,7 +131,7 @@ class ScalaAnnotationIntrospectorInstance(scalaAnnotationIntrospectorModule: Sca
131131
} else defaultInstantiator
132132
}
133133

134-
override def findValueInstantiator(deserializationConfig: DeserializationConfig, beanDesc: BeanDescription): ValueInstantiator = {
134+
override def findValueInstantiator(deserializationConfig: DeserializationConfig, beanDesc: BeanDescription.Supplier): ValueInstantiator = {
135135
None.orNull
136136
}
137137

‎src/main/scala/tools/jackson/module/scala/ser/EitherSerializer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ private class EitherSerializerResolver(config: ScalaModule.Config) extends Seria
147147

148148
override def findReferenceSerializer(serializationConfig: SerializationConfig,
149149
refType: ReferenceType,
150-
beanDesc: BeanDescription,
150+
beanDesc: BeanDescription.Supplier,
151151
formatOverrides: JsonFormat.Value,
152152
contentTypeSerializer: TypeSerializer,
153153
contentValueSerializer: ValueSerializer[AnyRef]): ValueSerializer[_] = {

‎src/main/scala/tools/jackson/module/scala/ser/EnumerationSerializerModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ private class EnumerationSerializerResolver(config: ScalaModule.Config) extends
4545

4646
override def findSerializer(serializationConfig: SerializationConfig,
4747
javaType: JavaType,
48-
beanDescription: BeanDescription,
48+
beanDescription: BeanDescription.Supplier,
4949
formatOverrides: JsonFormat.Value): ValueSerializer[_] = {
5050
val clazz = javaType.getRawClass
5151

‎src/main/scala/tools/jackson/module/scala/ser/IterableSerializerModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private class IterableSerializerResolver(config: ScalaModule.Config) extends Ser
8686

8787
override def findCollectionLikeSerializer(serializationConfig: SerializationConfig,
8888
collectionType: CollectionLikeType,
89-
beanDescription: BeanDescription,
89+
beanDescription: BeanDescription.Supplier,
9090
formatOverrides: JsonFormat.Value,
9191
elementTypeSerializer: TypeSerializer,
9292
elementSerializer: ValueSerializer[Object]): ValueSerializer[_] = {

‎src/main/scala/tools/jackson/module/scala/ser/IteratorSerializerModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ private class ScalaIteratorSerializerResolver(config: ScalaModule.Config) extend
8080

8181
override def findCollectionLikeSerializer(serializationConfig: SerializationConfig,
8282
collectionType: CollectionLikeType,
83-
beanDescription: BeanDescription,
83+
beanDescription: BeanDescription.Supplier,
8484
formatOverrides: JsonFormat.Value,
8585
elementTypeSerializer: TypeSerializer,
8686
elementSerializer: ValueSerializer[Object]): ValueSerializer[_] = {

‎src/main/scala/tools/jackson/module/scala/ser/MapSerializerModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ private class MapSerializerResolver(config: ScalaModule.Config) extends Serializ
3535

3636
override def findMapLikeSerializer(serializationConfig: SerializationConfig,
3737
mapLikeType : MapLikeType,
38-
beanDesc: BeanDescription,
38+
beanDesc: BeanDescription.Supplier,
3939
formatOverrides: JsonFormat.Value,
4040
keySerializer: ValueSerializer[AnyRef],
4141
elementTypeSerializer: TypeSerializer,

‎src/main/scala/tools/jackson/module/scala/ser/OptionSerializerModule.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ private class OptionSerializerResolver(config: ScalaModule.Config) extends Seria
199199

200200
override def findReferenceSerializer(serializationConfig: SerializationConfig,
201201
refType: ReferenceType,
202-
beanDesc: BeanDescription,
202+
beanDesc: BeanDescription.Supplier,
203203
formatOverrides: JsonFormat.Value,
204204
contentTypeSerializer: TypeSerializer,
205205
contentValueSerializer: ValueSerializer[AnyRef]): ValueSerializer[_] = {

0 commit comments

Comments
 (0)