Skip to content

Allow null UDTs to nested JavaBean #1325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: b2.5
Choose a base branch
from
Open

Allow null UDTs to nested JavaBean #1325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...rc/main/scala/com/datastax/spark/connector/mapper/GettableDataToMappedTypeConverter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import scala.reflect.runtime.universe._
class GettableDataToMappedTypeConverter[T : TypeTag : ColumnMapper](
structDef: StructDef,
columnSelection: IndexedSeq[ColumnRef])
extends TypeConverter[T] {
extends NullableTypeConverter[T] {

// can't be lazy, because TypeTags are not serializable, and if we made it lazy,
// the right side would be stored in a hidden serialized variable anyway
Expand Down Expand Up @@ -267,4 +267,4 @@ class GettableDataToMappedTypeConverter[T : TypeTag : ColumnMapper](
fillBuffer(data, buf)
factory.newInstance(buf: _*)
}
}
}
12 changes: 11 additions & 1 deletion ...est/scala/com/datastax/spark/connector/mapper/GettableDataToMappedTypeConverterSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,16 @@ class GettableDataToMappedTypeConverterSpec extends FlatSpec with Matchers {
user.getAddress.getNumber shouldBe 5
}

it should "convert a CassandraRow with null UDTs to nested JavaBeans" in {
implicit val cm: ColumnMapper[UserBeanWithAddress] = new JavaBeanColumnMapper[UserBeanWithAddress]
val row = CassandraRow.fromMap(Map("login" -> "foo", "address" -> null))
val converter = new GettableDataToMappedTypeConverter[UserBeanWithAddress](
userTable, userTable.columnRefs)
val user = converter.convert(row)
user.getLogin shouldBe "foo"
user.getAddress shouldBe null
}

class LongBean {
private[this] var number: java.lang.Long = null
def getNumber: java.lang.Long = number
Expand Down Expand Up @@ -410,4 +420,4 @@ class GettableDataToMappedTypeConverterSpec extends FlatSpec with Matchers {
val deserialized = SerializationUtils.roundtrip(converter)
a [NullPointerException] should be thrownBy deserialized.targetTypeTag
}
}
}