Support BsonProperty for ADT

Only supports non conflicting names across the classes in the ADT SCALA-485

Author: rozza

bson/src/main/scala/org/mongodb/scala/bson/codecs/macrocodecs/CaseClassCodec.scala

@@ -86,11 +86,11 @@ private[codecs] object CaseClassCodec {
  if (isSealed(mainType) && subClasses.isEmpty) {
  c.abort(c.enclosingPosition, s"No known subclasses of the sealed ${if (mainType.typeSymbol.asClass.isTrait) "trait" else "class"}")
  }
- val knownTypes = (mainType +: subClasses).filterNot(_.typeSymbol.isAbstract).reverse
+ val knownTypes: List[Type] = (mainType +: subClasses).filterNot(_.typeSymbol.isAbstract).reverse
 
- val terms = {
- if (!isAbstractSealed(mainType)) {
- val constructor = mainType.decl(termNames.CONSTRUCTOR)
+ def createTerms(t: Type): List[TermSymbol] = {
+ if (!isAbstractSealed(t)) {
+ val constructor = t.decl(termNames.CONSTRUCTOR)
  if (!constructor.isMethod) c.abort(c.enclosingPosition, "No constructor, unsupported class type")
  constructor.asMethod.paramLists match {
  case h :: _ => h.map(_.asTerm)
@@ -101,6 +101,8 @@ private[codecs] object CaseClassCodec {
  }
  }
 
+ val terms = knownTypes.flatMap(t => createTerms(t))
+
  val fields: Map[Type, List[(TermName, Type)]] = {
  knownTypes.map(
  t => (

bson/src/test/scala/org/mongodb/scala/bson/codecs/MacrosSpec.scala

@@ -87,7 +87,7 @@ class MacrosSpec extends FlatSpec with Matchers {
  case class OptionalRecursive(name: String, value: Option[OptionalRecursive])
 
  sealed class Tree
- case class Branch(b1: Tree, b2: Tree, value: Int) extends Tree
+ case class Branch(@BsonProperty("l1") b1: Tree, @BsonProperty("r1") b2: Tree, value: Int) extends Tree
  case class Leaf(value: Int) extends Tree
 
  case class ContainsADT(name: String, tree: Tree)
@@ -529,7 +529,7 @@ class MacrosSpec extends FlatSpec with Matchers {
  def createTreeJson(tree: Tree): String = {
  tree match {
  case l: Leaf => s"""{_t: "Leaf", value: ${l.value}}"""
- case b: Branch => s"""{_t: "Branch", b1: ${createTreeJson(b.b1)}, b2: ${createTreeJson(b.b2)}, value: ${b.value}}"""
+ case b: Branch => s"""{_t: "Branch", l1: ${createTreeJson(b.b1)}, r1: ${createTreeJson(b.b2)}, value: ${b.value}}"""
  case _ => "{}"
  }
  }

docs/reference/content/changelog.md

@@ -21,6 +21,7 @@ Changes between released versions
  * Added batchSize support for MongoIterable based Observables [SCALA-552](https://jira.mongodb.org/browse/SCALA-552)
  * Added support for sealed traits [SCALA-554](https://jira.mongodb.org/browse/SCALA-554)
  * Added caseclass support for Sets, Vectors and Streams [SCALA-346](https://jira.mongodb.org/browse/SCALA-346)
+ * Improved support for BsonPropery annotations in ADTs [SCALA-485](https://jira.mongodb.org/browse/SCALA-485)
  * Deprecated BsonArray.apply(Iterable[BsonValue]) added BsonArray.fromIterable [SCALA-531](https://jira.mongodb.org/browse/SCALA-531)
  * Fix `UninitializedFieldError` in MacroCodecs under `-Xcheckinit` [SCALA-542](https://jira.mongodb.org/browse/SCALA-542)