Skip to content

[Runtime] Design away EncodableBodyContent #30

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

Merged
merged 1 commit into from
Jul 31, 2023
Merged

[Runtime] Design away EncodableBodyContent #30

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
36 changes: 0 additions & 36 deletions Sources/OpenAPIRuntime/Base/EncodableBodyContent.swift
View file
Open in desktop

This file was deleted.

64 changes: 32 additions & 32 deletions Sources/OpenAPIRuntime/Conversion/Converter+Client.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,113 +90,113 @@ extension Converter {
}

// | client | set | request body | text | string-convertible | optional | setOptionalRequestBodyAsText |
public func setOptionalRequestBodyAsText<T: _StringConvertible, C>(
_ value: C?,
public func setOptionalRequestBodyAsText<T: _StringConvertible>(
_ value: T?,
headerFields: inout [HeaderField],
transforming transform: (C) -> EncodableBodyContent<T>
contentType: String
) throws -> Data? {
try setOptionalRequestBody(
value,
headerFields: &headerFields,
transforming: transform,
contentType: contentType,
convert: convertStringConvertibleToTextData
)
}

// | client | set | request body | text | string-convertible | required | setRequiredRequestBodyAsText |
public func setRequiredRequestBodyAsText<T: _StringConvertible, C>(
_ value: C,
public func setRequiredRequestBodyAsText<T: _StringConvertible>(
_ value: T,
headerFields: inout [HeaderField],
transforming transform: (C) -> EncodableBodyContent<T>
contentType: String
) throws -> Data {
try setRequiredRequestBody(
value,
headerFields: &headerFields,
transforming: transform,
contentType: contentType,
convert: convertStringConvertibleToTextData
)
}

// | client | set | request body | text | date | optional | setOptionalRequestBodyAsText |
public func setOptionalRequestBodyAsText<C>(
_ value: C?,
public func setOptionalRequestBodyAsText(
_ value: Date?,
headerFields: inout [HeaderField],
transforming transform: (C) -> EncodableBodyContent<Date>
contentType: String
) throws -> Data? {
try setOptionalRequestBody(
value,
headerFields: &headerFields,
transforming: transform,
contentType: contentType,
convert: convertDateToTextData
)
}

// | client | set | request body | text | date | required | setRequiredRequestBodyAsText |
public func setRequiredRequestBodyAsText<C>(
_ value: C,
public func setRequiredRequestBodyAsText(
_ value: Date,
headerFields: inout [HeaderField],
transforming transform: (C) -> EncodableBodyContent<Date>
contentType: String
) throws -> Data {
try setRequiredRequestBody(
value,
headerFields: &headerFields,
transforming: transform,
contentType: contentType,
convert: convertDateToTextData
)
}

// | client | set | request body | JSON | codable | optional | setOptionalRequestBodyAsJSON |
public func setOptionalRequestBodyAsJSON<T: Encodable, C>(
_ value: C?,
public func setOptionalRequestBodyAsJSON<T: Encodable>(
_ value: T?,
headerFields: inout [HeaderField],
transforming transform: (C) -> EncodableBodyContent<T>
contentType: String
) throws -> Data? {
try setOptionalRequestBody(
value,
headerFields: &headerFields,
transforming: transform,
contentType: contentType,
convert: convertBodyCodableToJSON
)
}

// | client | set | request body | JSON | codable | required | setRequiredRequestBodyAsJSON |
public func setRequiredRequestBodyAsJSON<T: Encodable, C>(
_ value: C,
public func setRequiredRequestBodyAsJSON<T: Encodable>(
_ value: T,
headerFields: inout [HeaderField],
transforming transform: (C) -> EncodableBodyContent<T>
contentType: String
) throws -> Data {
try setRequiredRequestBody(
value,
headerFields: &headerFields,
transforming: transform,
contentType: contentType,
convert: convertBodyCodableToJSON
)
}

// | client | set | request body | binary | data | optional | setOptionalRequestBodyAsBinary |
public func setOptionalRequestBodyAsBinary<C>(
_ value: C?,
public func setOptionalRequestBodyAsBinary(
_ value: Data?,
headerFields: inout [HeaderField],
transforming transform: (C) -> EncodableBodyContent<Data>
contentType: String
) throws -> Data? {
try setOptionalRequestBody(
value,
headerFields: &headerFields,
transforming: transform,
contentType: contentType,
convert: convertDataToBinary
)
}

// | client | set | request body | binary | data | required | setRequiredRequestBodyAsBinary |
public func setRequiredRequestBodyAsBinary<C>(
_ value: C,
public func setRequiredRequestBodyAsBinary(
_ value: Data,
headerFields: inout [HeaderField],
transforming transform: (C) -> EncodableBodyContent<Data>
contentType: String
) throws -> Data {
try setRequiredRequestBody(
value,
headerFields: &headerFields,
transforming: transform,
contentType: contentType,
convert: convertDataToBinary
)
}
Expand Down
32 changes: 16 additions & 16 deletions Sources/OpenAPIRuntime/Conversion/Converter+Server.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,57 +296,57 @@ public extension Converter {
}

// | server | set | response body | text | string-convertible | required | setResponseBodyAsText |
func setResponseBodyAsText<T: _StringConvertible, C>(
_ value: C,
func setResponseBodyAsText<T: _StringConvertible>(
_ value: T,
headerFields: inout [HeaderField],
transforming transform: (C) -> EncodableBodyContent<T>
contentType: String
) throws -> Data {
try setResponseBody(
value,
headerFields: &headerFields,
transforming: transform,
contentType: contentType,
convert: convertStringConvertibleToTextData
)
}

// | server | set | response body | text | date | required | setResponseBodyAsText |
func setResponseBodyAsText<C>(
_ value: C,
func setResponseBodyAsText(
_ value: Date,
headerFields: inout [HeaderField],
transforming transform: (C) -> EncodableBodyContent<Date>
contentType: String
) throws -> Data {
try setResponseBody(
value,
headerFields: &headerFields,
transforming: transform,
contentType: contentType,
convert: convertDateToTextData
)
}

// | server | set | response body | JSON | codable | required | setResponseBodyAsJSON |
func setResponseBodyAsJSON<T: Encodable, C>(
_ value: C,
func setResponseBodyAsJSON<T: Encodable>(
_ value: T,
headerFields: inout [HeaderField],
transforming transform: (C) -> EncodableBodyContent<T>
contentType: String
) throws -> Data {
try setResponseBody(
value,
headerFields: &headerFields,
transforming: transform,
contentType: contentType,
convert: convertBodyCodableToJSON
)
}

// | server | set | response body | binary | data | required | setResponseBodyAsBinary |
func setResponseBodyAsBinary<C>(
_ value: C,
func setResponseBodyAsBinary(
_ value: Data,
headerFields: inout [HeaderField],
transforming transform: (C) -> EncodableBodyContent<Data>
contentType: String
) throws -> Data {
try setResponseBody(
value,
headerFields: &headerFields,
transforming: transform,
contentType: contentType,
convert: convertDataToBinary
)
}
Expand Down
32 changes: 14 additions & 18 deletions Sources/OpenAPIRuntime/Conversion/CurrencyExtensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,22 +347,20 @@ extension Converter {
return values
}

func setRequiredRequestBody<T, C>(
_ value: C,
func setRequiredRequestBody<T>(
_ value: T,
headerFields: inout [HeaderField],
transforming transform: (C) -> EncodableBodyContent<T>,
contentType: String,
convert: (T) throws -> Data
) throws -> Data {
let body = transform(value)
headerFields.add(name: "content-type", value: body.contentType)
let convertibleValue = body.value
return try convert(convertibleValue)
headerFields.add(name: "content-type", value: contentType)
return try convert(value)
}

func setOptionalRequestBody<T, C>(
_ value: C?,
func setOptionalRequestBody<T>(
_ value: T?,
headerFields: inout [HeaderField],
transforming transform: (C) -> EncodableBodyContent<T>,
contentType: String,
convert: (T) throws -> Data
) throws -> Data? {
guard let value else {
Expand All @@ -371,7 +369,7 @@ extension Converter {
return try setRequiredRequestBody(
value,
headerFields: &headerFields,
transforming: transform,
contentType: contentType,
convert: convert
)
}
Expand Down Expand Up @@ -419,16 +417,14 @@ extension Converter {
return transformedValue
}

func setResponseBody<T, C>(
_ value: C,
func setResponseBody<T>(
_ value: T,
headerFields: inout [HeaderField],
transforming transform: (C) -> EncodableBodyContent<T>,
contentType: String,
convert: (T) throws -> Data
) throws -> Data {
let body = transform(value)
headerFields.add(name: "content-type", value: body.contentType)
let convertibleValue = body.value
return try convert(convertibleValue)
headerFields.add(name: "content-type", value: contentType)
return try convert(value)
}

func convertBinaryToData(
Expand Down
Loading