Skip to content

Commit

Permalink
Regenerate code
Browse files Browse the repository at this point in the history
  • Loading branch information
@mbryzek
mbryzek committed Jul 4, 2024
1 parent 2de79c2 commit 447c76c
Show file tree
Hide file tree
Showing 9 changed files with 432 additions and 441 deletions.
4 changes: 2 additions & 2 deletions api/app/generated/ApicollectiveApibuilderApiV0Conversions.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Generated by API Builder - https://www.apibuilder.io
* Service version: 0.16.43
* apibuilder app.apibuilder.io/apicollective/apibuilder-api/latest/anorm_2_8_parsers
* Service version: 0.16.50
* User agent: apibuilder app.apibuilder.io/apicollective/apibuilder-api/latest/anorm_2_8_parsers
*/
package io.apibuilder.api.v0.anorm.conversions {

Expand Down
4 changes: 2 additions & 2 deletions api/app/generated/ApicollectiveApibuilderApiV0Parsers.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Generated by API Builder - https://www.apibuilder.io
* Service version: 0.16.43
* apibuilder app.apibuilder.io/apicollective/apibuilder-api/latest/anorm_2_8_parsers
* Service version: 0.16.50
* User agent: apibuilder app.apibuilder.io/apicollective/apibuilder-api/latest/anorm_2_8_parsers
*/
import anorm._

Expand Down
4 changes: 2 additions & 2 deletions api/conf/routes
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by API Builder - https://www.apibuilder.io
# Service version: 0.16.43
# apibuilder app.apibuilder.io/apicollective/apibuilder-api/latest/play_2_x_routes
# Service version: 0.16.50
# User agent: apibuilder app.apibuilder.io/apicollective/apibuilder-api/latest/play_2_x_routes

GET /attributes controllers.Attributes.get(guid: _root_.scala.Option[_root_.java.util.UUID], name: _root_.scala.Option[String], limit: Long ?= 25L, offset: Long ?= 0L)
GET /attributes/:name controllers.Attributes.getByName(name: String)
Expand Down
140 changes: 70 additions & 70 deletions core/src/main/scala/core/generated/ApicollectiveApibuilderApiJsonV0Models.scala
View file

Large diffs are not rendered by default.

331 changes: 164 additions & 167 deletions generated/app/ApicollectiveApibuilderApiV0Client.scala
View file

Large diffs are not rendered by default.

51 changes: 25 additions & 26 deletions generated/app/ApicollectiveApibuilderCommonV0Client.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Generated by API Builder - https://www.apibuilder.io
* Service version: 0.16.43
* apibuilder app.apibuilder.io/apicollective/apibuilder-common/latest/play_2_8_client
* Service version: 0.16.48
* User agent: apibuilder app.apibuilder.io/apicollective/apibuilder-common/latest/play_2_8_client
*/
package io.apibuilder.common.v0.models {

Expand Down Expand Up @@ -122,11 +122,11 @@ package io.apibuilder.common.v0.models {

implicit def jsonWritesApibuilderCommonMembershipRole: play.api.libs.json.Writes[MembershipRole] = {
(obj: io.apibuilder.common.v0.models.MembershipRole) => {
jsonWritesApibuilderCommonMembershipRole(obj)
io.apibuilder.common.v0.models.json.jsonWritesApibuilderCommonMembershipRole(obj)
}
}

implicit def jsonReadsApibuilderCommonAudit: play.api.libs.json.Reads[Audit] = {
implicit def jsonReadsApibuilderCommonAudit: play.api.libs.json.Reads[io.apibuilder.common.v0.models.Audit] = {
for {
createdAt <- (__ \ "created_at").read[_root_.org.joda.time.DateTime]
createdBy <- (__ \ "created_by").read[io.apibuilder.common.v0.models.ReferenceGuid]
Expand All @@ -138,20 +138,20 @@ package io.apibuilder.common.v0.models {
def jsObjectAudit(obj: io.apibuilder.common.v0.models.Audit): play.api.libs.json.JsObject = {
play.api.libs.json.Json.obj(
"created_at" -> play.api.libs.json.JsString(_root_.org.joda.time.format.ISODateTimeFormat.dateTime.print(obj.createdAt)),
"created_by" -> jsObjectReferenceGuid(obj.createdBy),
"created_by" -> io.apibuilder.common.v0.models.json.jsObjectReferenceGuid(obj.createdBy),
"updated_at" -> play.api.libs.json.JsString(_root_.org.joda.time.format.ISODateTimeFormat.dateTime.print(obj.updatedAt)),
"updated_by" -> jsObjectReferenceGuid(obj.updatedBy)
"updated_by" -> io.apibuilder.common.v0.models.json.jsObjectReferenceGuid(obj.updatedBy)
)
}

implicit def jsonWritesApibuilderCommonAudit: play.api.libs.json.Writes[Audit] = {
(obj: io.apibuilder.common.v0.models.Audit) => {
jsObjectAudit(obj)
io.apibuilder.common.v0.models.json.jsObjectAudit(obj)
}
}

implicit def jsonReadsApibuilderCommonHealthcheck: play.api.libs.json.Reads[Healthcheck] = {
(__ \ "status").read[String].map { x => new Healthcheck(status = x) }
implicit def jsonReadsApibuilderCommonHealthcheck: play.api.libs.json.Reads[io.apibuilder.common.v0.models.Healthcheck] = {
(__ \ "status").read[String].map { x => Healthcheck(status = x) }
}

def jsObjectHealthcheck(obj: io.apibuilder.common.v0.models.Healthcheck): play.api.libs.json.JsObject = {
Expand All @@ -162,11 +162,11 @@ package io.apibuilder.common.v0.models {

implicit def jsonWritesApibuilderCommonHealthcheck: play.api.libs.json.Writes[Healthcheck] = {
(obj: io.apibuilder.common.v0.models.Healthcheck) => {
jsObjectHealthcheck(obj)
io.apibuilder.common.v0.models.json.jsObjectHealthcheck(obj)
}
}

implicit def jsonReadsApibuilderCommonReference: play.api.libs.json.Reads[Reference] = {
implicit def jsonReadsApibuilderCommonReference: play.api.libs.json.Reads[io.apibuilder.common.v0.models.Reference] = {
for {
guid <- (__ \ "guid").read[_root_.java.util.UUID]
key <- (__ \ "key").read[String]
Expand All @@ -182,12 +182,12 @@ package io.apibuilder.common.v0.models {

implicit def jsonWritesApibuilderCommonReference: play.api.libs.json.Writes[Reference] = {
(obj: io.apibuilder.common.v0.models.Reference) => {
jsObjectReference(obj)
io.apibuilder.common.v0.models.json.jsObjectReference(obj)
}
}

implicit def jsonReadsApibuilderCommonReferenceGuid: play.api.libs.json.Reads[ReferenceGuid] = {
(__ \ "guid").read[_root_.java.util.UUID].map { x => new ReferenceGuid(guid = x) }
implicit def jsonReadsApibuilderCommonReferenceGuid: play.api.libs.json.Reads[io.apibuilder.common.v0.models.ReferenceGuid] = {
(__ \ "guid").read[_root_.java.util.UUID].map { x => ReferenceGuid(guid = x) }
}

def jsObjectReferenceGuid(obj: io.apibuilder.common.v0.models.ReferenceGuid): play.api.libs.json.JsObject = {
Expand All @@ -198,7 +198,7 @@ package io.apibuilder.common.v0.models {

implicit def jsonWritesApibuilderCommonReferenceGuid: play.api.libs.json.Writes[ReferenceGuid] = {
(obj: io.apibuilder.common.v0.models.ReferenceGuid) => {
jsObjectReferenceGuid(obj)
io.apibuilder.common.v0.models.json.jsObjectReferenceGuid(obj)
}
}
}
Expand Down Expand Up @@ -323,7 +323,7 @@ package io.apibuilder.common.v0 {

val Namespace = "io.apibuilder.common.v0"
val UserAgent = "apibuilder app.apibuilder.io/apicollective/apibuilder-common/latest/play_2_8_client"
val Version = "0.16.43"
val Version = "0.16.48"
val VersionMajor = 0

}
Expand All @@ -350,12 +350,11 @@ package io.apibuilder.common.v0 {
"User-Agent" -> Constants.UserAgent,
"X-Apidoc-Version" -> Constants.Version,
"X-Apidoc-Version-Major" -> Constants.VersionMajor.toString
).addHttpHeaders(defaultHeaders : _*)
).addHttpHeaders(defaultHeaders: _*)
auth.fold(holder) {
case Authorization.Basic(username, password) => {
holder.withAuth(username, password.getOrElse(""), play.api.libs.ws.WSAuthScheme.BASIC)
}
case a => sys.error("Invalid authorization scheme[" + a.getClass + "]")
}
}

Expand All @@ -380,28 +379,28 @@ package io.apibuilder.common.v0 {
): scala.concurrent.Future[play.api.libs.ws.WSResponse] = {
method.toUpperCase match {
case "GET" => {
_logRequest("GET", _requestHolder(path).addHttpHeaders(requestHeaders:_*).addQueryStringParameters(queryParameters:_*)).get()
_logRequest("GET", _requestHolder(path).addHttpHeaders(requestHeaders: _*).addQueryStringParameters(queryParameters: _*)).get()
}
case "POST" => {
_logRequest("POST", _requestHolder(path).addHttpHeaders(_withJsonContentType(requestHeaders):_*).addQueryStringParameters(queryParameters:_*)).post(body.getOrElse(play.api.libs.json.Json.obj()))
_logRequest("POST", _requestHolder(path).addHttpHeaders(_withJsonContentType(requestHeaders): _*).addQueryStringParameters(queryParameters: _*)).post(body.getOrElse(play.api.libs.json.Json.obj()))
}
case "PUT" => {
_logRequest("PUT", _requestHolder(path).addHttpHeaders(_withJsonContentType(requestHeaders):_*).addQueryStringParameters(queryParameters:_*)).put(body.getOrElse(play.api.libs.json.Json.obj()))
_logRequest("PUT", _requestHolder(path).addHttpHeaders(_withJsonContentType(requestHeaders): _*).addQueryStringParameters(queryParameters: _*)).put(body.getOrElse(play.api.libs.json.Json.obj()))
}
case "PATCH" => {
_logRequest("PATCH", _requestHolder(path).addHttpHeaders(requestHeaders:_*).addQueryStringParameters(queryParameters:_*)).patch(body.getOrElse(play.api.libs.json.Json.obj()))
_logRequest("PATCH", _requestHolder(path).addHttpHeaders(requestHeaders: _*).addQueryStringParameters(queryParameters: _*)).patch(body.getOrElse(play.api.libs.json.Json.obj()))
}
case "DELETE" => {
_logRequest("DELETE", _requestHolder(path).addHttpHeaders(requestHeaders:_*).addQueryStringParameters(queryParameters:_*)).delete()
_logRequest("DELETE", _requestHolder(path).addHttpHeaders(requestHeaders: _*).addQueryStringParameters(queryParameters: _*)).delete()
}
case "HEAD" => {
_logRequest("HEAD", _requestHolder(path).addHttpHeaders(requestHeaders:_*).addQueryStringParameters(queryParameters:_*)).head()
_logRequest("HEAD", _requestHolder(path).addHttpHeaders(requestHeaders: _*).addQueryStringParameters(queryParameters: _*)).head()
}
case "OPTIONS" => {
_logRequest("OPTIONS", _requestHolder(path).addHttpHeaders(requestHeaders:_*).addQueryStringParameters(queryParameters:_*)).options()
_logRequest("OPTIONS", _requestHolder(path).addHttpHeaders(requestHeaders: _*).addQueryStringParameters(queryParameters: _*)).options()
}
case _ => {
_logRequest(method, _requestHolder(path).addHttpHeaders(requestHeaders:_*).addQueryStringParameters(queryParameters:_*))
_logRequest(method, _requestHolder(path).addHttpHeaders(requestHeaders: _*).addQueryStringParameters(queryParameters: _*))
sys.error("Unsupported method[%s]".format(method))
}
}
Expand Down
57 changes: 28 additions & 29 deletions generated/app/ApicollectiveApibuilderGeneratorV0Client.scala
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Generated by API Builder - https://www.apibuilder.io
* Service version: 0.16.43
* apibuilder app.apibuilder.io/apicollective/apibuilder-generator/latest/play_2_8_client
* Service version: 0.16.48
* User agent: apibuilder app.apibuilder.io/apicollective/apibuilder-generator/latest/play_2_8_client
*/
package io.apibuilder.generator.v0.models {

Expand Down Expand Up @@ -193,11 +193,11 @@ package io.apibuilder.generator.v0.models {

implicit def jsonWritesApibuilderGeneratorFileFlag: play.api.libs.json.Writes[FileFlag] = {
(obj: io.apibuilder.generator.v0.models.FileFlag) => {
jsonWritesApibuilderGeneratorFileFlag(obj)
io.apibuilder.generator.v0.models.json.jsonWritesApibuilderGeneratorFileFlag(obj)
}
}

implicit def jsonReadsApibuilderGeneratorAttribute: play.api.libs.json.Reads[Attribute] = {
implicit def jsonReadsApibuilderGeneratorAttribute: play.api.libs.json.Reads[io.apibuilder.generator.v0.models.Attribute] = {
for {
name <- (__ \ "name").read[String]
value <- (__ \ "value").read[String]
Expand All @@ -213,11 +213,11 @@ package io.apibuilder.generator.v0.models {

implicit def jsonWritesApibuilderGeneratorAttribute: play.api.libs.json.Writes[Attribute] = {
(obj: io.apibuilder.generator.v0.models.Attribute) => {
jsObjectAttribute(obj)
io.apibuilder.generator.v0.models.json.jsObjectAttribute(obj)
}
}

implicit def jsonReadsApibuilderGeneratorError: play.api.libs.json.Reads[Error] = {
implicit def jsonReadsApibuilderGeneratorError: play.api.libs.json.Reads[io.apibuilder.generator.v0.models.Error] = {
for {
code <- (__ \ "code").read[String]
message <- (__ \ "message").read[String]
Expand All @@ -233,11 +233,11 @@ package io.apibuilder.generator.v0.models {

implicit def jsonWritesApibuilderGeneratorError: play.api.libs.json.Writes[Error] = {
(obj: io.apibuilder.generator.v0.models.Error) => {
jsObjectError(obj)
io.apibuilder.generator.v0.models.json.jsObjectError(obj)
}
}

implicit def jsonReadsApibuilderGeneratorFile: play.api.libs.json.Reads[File] = {
implicit def jsonReadsApibuilderGeneratorFile: play.api.libs.json.Reads[io.apibuilder.generator.v0.models.File] = {
for {
name <- (__ \ "name").read[String]
dir <- (__ \ "dir").readNullable[String]
Expand All @@ -262,11 +262,11 @@ package io.apibuilder.generator.v0.models {

implicit def jsonWritesApibuilderGeneratorFile: play.api.libs.json.Writes[File] = {
(obj: io.apibuilder.generator.v0.models.File) => {
jsObjectFile(obj)
io.apibuilder.generator.v0.models.json.jsObjectFile(obj)
}
}

implicit def jsonReadsApibuilderGeneratorGenerator: play.api.libs.json.Reads[Generator] = {
implicit def jsonReadsApibuilderGeneratorGenerator: play.api.libs.json.Reads[io.apibuilder.generator.v0.models.Generator] = {
for {
key <- (__ \ "key").read[String]
name <- (__ \ "name").read[String]
Expand All @@ -293,12 +293,12 @@ package io.apibuilder.generator.v0.models {

implicit def jsonWritesApibuilderGeneratorGenerator: play.api.libs.json.Writes[Generator] = {
(obj: io.apibuilder.generator.v0.models.Generator) => {
jsObjectGenerator(obj)
io.apibuilder.generator.v0.models.json.jsObjectGenerator(obj)
}
}

implicit def jsonReadsApibuilderGeneratorHealthcheck: play.api.libs.json.Reads[Healthcheck] = {
(__ \ "status").read[String].map { x => new Healthcheck(status = x) }
implicit def jsonReadsApibuilderGeneratorHealthcheck: play.api.libs.json.Reads[io.apibuilder.generator.v0.models.Healthcheck] = {
(__ \ "status").read[String].map { x => Healthcheck(status = x) }
}

def jsObjectHealthcheck(obj: io.apibuilder.generator.v0.models.Healthcheck): play.api.libs.json.JsObject = {
Expand All @@ -309,11 +309,11 @@ package io.apibuilder.generator.v0.models {

implicit def jsonWritesApibuilderGeneratorHealthcheck: play.api.libs.json.Writes[Healthcheck] = {
(obj: io.apibuilder.generator.v0.models.Healthcheck) => {
jsObjectHealthcheck(obj)
io.apibuilder.generator.v0.models.json.jsObjectHealthcheck(obj)
}
}

implicit def jsonReadsApibuilderGeneratorInvocation: play.api.libs.json.Reads[Invocation] = {
implicit def jsonReadsApibuilderGeneratorInvocation: play.api.libs.json.Reads[io.apibuilder.generator.v0.models.Invocation] = {
for {
source <- (__ \ "source").read[String]
files <- (__ \ "files").read[Seq[io.apibuilder.generator.v0.models.File]]
Expand All @@ -329,11 +329,11 @@ package io.apibuilder.generator.v0.models {

implicit def jsonWritesApibuilderGeneratorInvocation: play.api.libs.json.Writes[Invocation] = {
(obj: io.apibuilder.generator.v0.models.Invocation) => {
jsObjectInvocation(obj)
io.apibuilder.generator.v0.models.json.jsObjectInvocation(obj)
}
}

implicit def jsonReadsApibuilderGeneratorInvocationForm: play.api.libs.json.Reads[InvocationForm] = {
implicit def jsonReadsApibuilderGeneratorInvocationForm: play.api.libs.json.Reads[io.apibuilder.generator.v0.models.InvocationForm] = {
for {
service <- (__ \ "service").read[io.apibuilder.spec.v0.models.Service]
attributes <- (__ \ "attributes").read[Seq[io.apibuilder.generator.v0.models.Attribute]]
Expand All @@ -358,7 +358,7 @@ package io.apibuilder.generator.v0.models {

implicit def jsonWritesApibuilderGeneratorInvocationForm: play.api.libs.json.Writes[InvocationForm] = {
(obj: io.apibuilder.generator.v0.models.InvocationForm) => {
jsObjectInvocationForm(obj)
io.apibuilder.generator.v0.models.json.jsObjectInvocationForm(obj)
}
}
}
Expand Down Expand Up @@ -484,7 +484,7 @@ package io.apibuilder.generator.v0 {
val BaseUrl = "https://api.apibuilder.io"
val Namespace = "io.apibuilder.generator.v0"
val UserAgent = "apibuilder app.apibuilder.io/apicollective/apibuilder-generator/latest/play_2_8_client"
val Version = "0.16.43"
val Version = "0.16.48"
val VersionMajor = 0

}
Expand Down Expand Up @@ -573,12 +573,11 @@ package io.apibuilder.generator.v0 {
"User-Agent" -> Constants.UserAgent,
"X-Apidoc-Version" -> Constants.Version,
"X-Apidoc-Version-Major" -> Constants.VersionMajor.toString
).addHttpHeaders(defaultHeaders : _*)
).addHttpHeaders(defaultHeaders: _*)
auth.fold(holder) {
case Authorization.Basic(username, password) => {
holder.withAuth(username, password.getOrElse(""), play.api.libs.ws.WSAuthScheme.BASIC)
}
case a => sys.error("Invalid authorization scheme[" + a.getClass + "]")
}
}

Expand All @@ -603,28 +602,28 @@ package io.apibuilder.generator.v0 {
): scala.concurrent.Future[play.api.libs.ws.WSResponse] = {
method.toUpperCase match {
case "GET" => {
_logRequest("GET", _requestHolder(path).addHttpHeaders(requestHeaders:_*).addQueryStringParameters(queryParameters:_*)).get()
_logRequest("GET", _requestHolder(path).addHttpHeaders(requestHeaders: _*).addQueryStringParameters(queryParameters: _*)).get()
}
case "POST" => {
_logRequest("POST", _requestHolder(path).addHttpHeaders(_withJsonContentType(requestHeaders):_*).addQueryStringParameters(queryParameters:_*)).post(body.getOrElse(play.api.libs.json.Json.obj()))
_logRequest("POST", _requestHolder(path).addHttpHeaders(_withJsonContentType(requestHeaders): _*).addQueryStringParameters(queryParameters: _*)).post(body.getOrElse(play.api.libs.json.Json.obj()))
}
case "PUT" => {
_logRequest("PUT", _requestHolder(path).addHttpHeaders(_withJsonContentType(requestHeaders):_*).addQueryStringParameters(queryParameters:_*)).put(body.getOrElse(play.api.libs.json.Json.obj()))
_logRequest("PUT", _requestHolder(path).addHttpHeaders(_withJsonContentType(requestHeaders): _*).addQueryStringParameters(queryParameters: _*)).put(body.getOrElse(play.api.libs.json.Json.obj()))
}
case "PATCH" => {
_logRequest("PATCH", _requestHolder(path).addHttpHeaders(requestHeaders:_*).addQueryStringParameters(queryParameters:_*)).patch(body.getOrElse(play.api.libs.json.Json.obj()))
_logRequest("PATCH", _requestHolder(path).addHttpHeaders(requestHeaders: _*).addQueryStringParameters(queryParameters: _*)).patch(body.getOrElse(play.api.libs.json.Json.obj()))
}
case "DELETE" => {
_logRequest("DELETE", _requestHolder(path).addHttpHeaders(requestHeaders:_*).addQueryStringParameters(queryParameters:_*)).delete()
_logRequest("DELETE", _requestHolder(path).addHttpHeaders(requestHeaders: _*).addQueryStringParameters(queryParameters: _*)).delete()
}
case "HEAD" => {
_logRequest("HEAD", _requestHolder(path).addHttpHeaders(requestHeaders:_*).addQueryStringParameters(queryParameters:_*)).head()
_logRequest("HEAD", _requestHolder(path).addHttpHeaders(requestHeaders: _*).addQueryStringParameters(queryParameters: _*)).head()
}
case "OPTIONS" => {
_logRequest("OPTIONS", _requestHolder(path).addHttpHeaders(requestHeaders:_*).addQueryStringParameters(queryParameters:_*)).options()
_logRequest("OPTIONS", _requestHolder(path).addHttpHeaders(requestHeaders: _*).addQueryStringParameters(queryParameters: _*)).options()
}
case _ => {
_logRequest(method, _requestHolder(path).addHttpHeaders(requestHeaders:_*).addQueryStringParameters(queryParameters:_*))
_logRequest(method, _requestHolder(path).addHttpHeaders(requestHeaders: _*).addQueryStringParameters(queryParameters: _*))
sys.error("Unsupported method[%s]".format(method))
}
}
Expand Down
Loading

0 comments on commit 447c76c

Please sign in to comment.