diff --git a/core/src/main/scala/core/generator/Play2Models.scala b/core/src/main/scala/core/generator/Play2Models.scala index 83cb18ab8..386bcd52f 100644 --- a/core/src/main/scala/core/generator/Play2Models.scala +++ b/core/src/main/scala/core/generator/Play2Models.scala @@ -24,18 +24,18 @@ package ${ssd.packageName}.models { import play.api.libs.json.Writes import play.api.libs.functional.syntax._ - private[${ssd.packageName}] implicit val jsonReadsUUID = __.read[String].map(java.util.UUID.fromString) + private[${ssd.packageNamePrivate}] implicit val jsonReadsUUID = __.read[String].map(java.util.UUID.fromString) - private[${ssd.packageName}] implicit val jsonWritesUUID = new Writes[java.util.UUID] { + private[${ssd.packageNamePrivate}] implicit val jsonWritesUUID = new Writes[java.util.UUID] { def writes(x: java.util.UUID) = JsString(x.toString) } - private[${ssd.packageName}] implicit val jsonReadsJodaDateTime = __.read[String].map { str => + private[${ssd.packageNamePrivate}] implicit val jsonReadsJodaDateTime = __.read[String].map { str => import org.joda.time.format.ISODateTimeFormat.dateTimeParser dateTimeParser.parseDateTime(str) } - private[${ssd.packageName}] implicit val jsonWritesJodaDateTime = new Writes[org.joda.time.DateTime] { + private[${ssd.packageNamePrivate}] implicit val jsonWritesJodaDateTime = new Writes[org.joda.time.DateTime] { def writes(x: org.joda.time.DateTime) = { import org.joda.time.format.ISODateTimeFormat.dateTime val str = dateTime.print(x) diff --git a/core/src/main/scala/core/generator/ScalaServiceDescription.scala b/core/src/main/scala/core/generator/ScalaServiceDescription.scala index 1c6a23ec6..3a3c76ad0 100644 --- a/core/src/main/scala/core/generator/ScalaServiceDescription.scala +++ b/core/src/main/scala/core/generator/ScalaServiceDescription.scala @@ -71,6 +71,8 @@ class ScalaServiceDescription(val serviceDescription: ServiceDescription, metada case Some(name) => name + "." + ScalaUtil.packageName(serviceDescription.name) } + val packageNamePrivate = packageName.split("\\.").last + val resources = serviceDescription.resources.map { new ScalaResource(serviceDescription, packageName, _) } }