@@ -14,9 +14,7 @@ object JavaConverters {
14
14
def asJava = opt.getOrElse(null )
15
15
}
16
16
17
- implicit class OptMap (val opt : Option [JMap [String , _]]) extends AnyVal {
18
- def asJava = opt.getOrElse(Map .empty.asJava)
19
- }
17
+ def emptyJMap [V ]: JMap [String , V ] = Map .empty[String , V ].asJava
20
18
21
19
implicit class JavaComment (val cmt : Comment ) extends AnyVal {
22
20
def asJava : JMap [String , _] = Map (
@@ -150,7 +148,7 @@ object JavaConverters {
150
148
" name" -> ent.name,
151
149
" path" -> ent.path.asJava,
152
150
" children" -> ent.children.map(_.asJava).asJava,
153
- " comment" -> ent.comment.map(_.asJava).asJava ,
151
+ " comment" -> ent.comment.map(_.asJava).getOrElse(emptyJMap) ,
154
152
" signature" -> ent.signature
155
153
)
156
154
val members = ent match {
@@ -201,13 +199,13 @@ object JavaConverters {
201
199
}
202
200
val implicitlyAddedEntity = ent match {
203
201
case ent : ImplicitlyAddedEntity => Map (
204
- " implicitlyAddedFrom" -> ent.implicitlyAddedFrom.map(_.asJava).asJava
202
+ " implicitlyAddedFrom" -> ent.implicitlyAddedFrom.map(_.asJava).getOrElse(emptyJMap)
205
203
)
206
204
case _ => Map .empty
207
205
}
208
206
val typeAlias : Map [String , _] = ent match {
209
207
case ent : TypeAlias => Map (
210
- " alias" -> ent.alias.map(_.asJava).asJava
208
+ " alias" -> ent.alias.map(_.asJava).getOrElse(emptyJMap)
211
209
)
212
210
case _ => Map .empty
213
211
}
0 commit comments