Skip to content

Re-generate OFREP client using idiomatic naming strategy #2

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 2 commits into from
Jan 13, 2025
Merged

Re-generate OFREP client using idiomatic naming strategy #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc69ee8
Re-generate OFREP client using idiomatic naming strategy
slashmo Jan 13, 2025
c5c3a6c
[CI] Use ubuntu-22.04 instead of latest (24.04)
slashmo Jan 13, 2025
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
8 changes: 4 additions & 4 deletions .github/workflows/soundness.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ concurrency:
jobs:
unacceptable-language-check:
name: Unacceptable language check
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 1
steps:
- name: Checkout repository
Expand All @@ -17,7 +17,7 @@ jobs:

license-header-check:
name: License headers check
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 1
steps:
- name: Checkout repository
Expand All @@ -27,7 +27,7 @@ jobs:

format-check:
name: Format check
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 5
steps:
- name: Checkout repository
Expand All @@ -43,7 +43,7 @@ jobs:

broken-symlinks-check:
name: Broken symlinks check
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 1
steps:
- name: Checkout repository
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ concurrency:
jobs:
unit-test:
name: Unit Test
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 10
strategy:
fail-fast: false
Expand Down
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ $(GEN_SWIFTS): $(OPENAPI_SPEC) $(OPENAPI_GEN_SWIFT)
$(OPENAPI_SPEC) \
--mode types \
--mode client \
--naming-strategy idiomatic \
--output-directory $(GEN_SWIFT_ROOT)

.PHONY: generate
Expand Down
9 changes: 2 additions & 7 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,13 @@ import PackageDescription

let package = Package(
name: "swift-ofrep",
platforms: [
.macOS(.v10_15),
.iOS(.v13),
.watchOS(.v6),
.tvOS(.v13),
],
platforms: [.macOS(.v15)],
products: [
.library(name: "OFREP", targets: ["OFREP"])
],
dependencies: [
.package(url: "https://github.com/swift-open-feature/swift-open-feature.git", branch: "main"),
.package(url: "https://github.com/apple/swift-openapi-generator.git", from: "1.0.0"),
.package(url: "https://github.com/apple/swift-openapi-generator.git", from: "1.7.0"),
.package(url: "https://github.com/apple/swift-openapi-runtime.git", from: "1.0.0"),
],
targets: [
Expand Down
60 changes: 30 additions & 30 deletions Sources/OFREP/Generated/Client.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ internal struct Client: APIProtocol {
///
/// - Remark: HTTP `POST /ofrep/v1/evaluate/flags/{key}`.
/// - Remark: Generated from `#/paths//ofrep/v1/evaluate/flags/{key}/post`.
internal func post_sol_ofrep_sol_v1_sol_evaluate_sol_flags_sol__lcub_key_rcub_(_ input: Operations.post_sol_ofrep_sol_v1_sol_evaluate_sol_flags_sol__lcub_key_rcub_.Input) async throws -> Operations.post_sol_ofrep_sol_v1_sol_evaluate_sol_flags_sol__lcub_key_rcub_.Output {
internal func postOfrepV1EvaluateFlagsKey(_ input: Operations.PostOfrepV1EvaluateFlagsKey.Input) async throws -> Operations.PostOfrepV1EvaluateFlagsKey.Output {
try await client.send(
input: input,
forOperation: Operations.post_sol_ofrep_sol_v1_sol_evaluate_sol_flags_sol__lcub_key_rcub_.id,
forOperation: Operations.PostOfrepV1EvaluateFlagsKey.id,
serializer: { input in
let path = try converter.renderedPath(
template: "/ofrep/v1/evaluate/flags/{}",
Expand Down Expand Up @@ -83,7 +83,7 @@ internal struct Client: APIProtocol {
switch response.status.code {
case 200:
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
let body: Operations.post_sol_ofrep_sol_v1_sol_evaluate_sol_flags_sol__lcub_key_rcub_.Output.Ok.Body
let body: Operations.PostOfrepV1EvaluateFlagsKey.Output.Ok.Body
let chosenContentType = try converter.bestContentType(
received: contentType,
options: [
Expand All @@ -93,7 +93,7 @@ internal struct Client: APIProtocol {
switch chosenContentType {
case "application/json":
body = try await converter.getResponseBodyAsJSON(
Components.Schemas.evaluationSuccess.self,
Components.Schemas.EvaluationSuccess.self,
from: responseBody,
transforming: { value in
.json(value)
Expand All @@ -105,7 +105,7 @@ internal struct Client: APIProtocol {
return .ok(.init(body: body))
case 400:
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
let body: Operations.post_sol_ofrep_sol_v1_sol_evaluate_sol_flags_sol__lcub_key_rcub_.Output.BadRequest.Body
let body: Operations.PostOfrepV1EvaluateFlagsKey.Output.BadRequest.Body
let chosenContentType = try converter.bestContentType(
received: contentType,
options: [
Expand All @@ -115,7 +115,7 @@ internal struct Client: APIProtocol {
switch chosenContentType {
case "application/json":
body = try await converter.getResponseBodyAsJSON(
Components.Schemas.evaluationFailure.self,
Components.Schemas.EvaluationFailure.self,
from: responseBody,
transforming: { value in
.json(value)
Expand All @@ -127,7 +127,7 @@ internal struct Client: APIProtocol {
return .badRequest(.init(body: body))
case 404:
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
let body: Operations.post_sol_ofrep_sol_v1_sol_evaluate_sol_flags_sol__lcub_key_rcub_.Output.NotFound.Body
let body: Operations.PostOfrepV1EvaluateFlagsKey.Output.NotFound.Body
let chosenContentType = try converter.bestContentType(
received: contentType,
options: [
Expand All @@ -137,7 +137,7 @@ internal struct Client: APIProtocol {
switch chosenContentType {
case "application/json":
body = try await converter.getResponseBodyAsJSON(
Components.Schemas.flagNotFound.self,
Components.Schemas.FlagNotFound.self,
from: responseBody,
transforming: { value in
.json(value)
Expand All @@ -152,15 +152,15 @@ internal struct Client: APIProtocol {
case 403:
return .forbidden(.init())
case 429:
let headers: Operations.post_sol_ofrep_sol_v1_sol_evaluate_sol_flags_sol__lcub_key_rcub_.Output.TooManyRequests.Headers = .init(Retry_hyphen_After: try converter.getOptionalHeaderFieldAsURI(
let headers: Operations.PostOfrepV1EvaluateFlagsKey.Output.TooManyRequests.Headers = .init(retryAfter: try converter.getOptionalHeaderFieldAsURI(
in: response.headerFields,
name: "Retry-After",
as: Foundation.Date.self
))
return .tooManyRequests(.init(headers: headers))
case 500:
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
let body: Operations.post_sol_ofrep_sol_v1_sol_evaluate_sol_flags_sol__lcub_key_rcub_.Output.InternalServerError.Body
let body: Operations.PostOfrepV1EvaluateFlagsKey.Output.InternalServerError.Body
let chosenContentType = try converter.bestContentType(
received: contentType,
options: [
Expand All @@ -170,7 +170,7 @@ internal struct Client: APIProtocol {
switch chosenContentType {
case "application/json":
body = try await converter.getResponseBodyAsJSON(
Components.Schemas.generalErrorResponse.self,
Components.Schemas.GeneralErrorResponse.self,
from: responseBody,
transforming: { value in
.json(value)
Expand Down Expand Up @@ -200,10 +200,10 @@ internal struct Client: APIProtocol {
///
/// - Remark: HTTP `POST /ofrep/v1/evaluate/flags`.
/// - Remark: Generated from `#/paths//ofrep/v1/evaluate/flags/post`.
internal func post_sol_ofrep_sol_v1_sol_evaluate_sol_flags(_ input: Operations.post_sol_ofrep_sol_v1_sol_evaluate_sol_flags.Input) async throws -> Operations.post_sol_ofrep_sol_v1_sol_evaluate_sol_flags.Output {
internal func postOfrepV1EvaluateFlags(_ input: Operations.PostOfrepV1EvaluateFlags.Input) async throws -> Operations.PostOfrepV1EvaluateFlags.Output {
try await client.send(
input: input,
forOperation: Operations.post_sol_ofrep_sol_v1_sol_evaluate_sol_flags.id,
forOperation: Operations.PostOfrepV1EvaluateFlags.id,
serializer: { input in
let path = try converter.renderedPath(
template: "/ofrep/v1/evaluate/flags",
Expand All @@ -217,7 +217,7 @@ internal struct Client: APIProtocol {
try converter.setHeaderFieldAsURI(
in: &request.headerFields,
name: "If-None-Match",
value: input.headers.If_hyphen_None_hyphen_Match
value: input.headers.ifNoneMatch
)
converter.setAcceptHeader(
in: &request.headerFields,
Expand All @@ -239,13 +239,13 @@ internal struct Client: APIProtocol {
deserializer: { response, responseBody in
switch response.status.code {
case 200:
let headers: Operations.post_sol_ofrep_sol_v1_sol_evaluate_sol_flags.Output.Ok.Headers = .init(ETag: try converter.getOptionalHeaderFieldAsURI(
let headers: Operations.PostOfrepV1EvaluateFlags.Output.Ok.Headers = .init(eTag: try converter.getOptionalHeaderFieldAsURI(
in: response.headerFields,
name: "ETag",
as: Swift.String.self
))
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
let body: Operations.post_sol_ofrep_sol_v1_sol_evaluate_sol_flags.Output.Ok.Body
let body: Operations.PostOfrepV1EvaluateFlags.Output.Ok.Body
let chosenContentType = try converter.bestContentType(
received: contentType,
options: [
Expand All @@ -255,7 +255,7 @@ internal struct Client: APIProtocol {
switch chosenContentType {
case "application/json":
body = try await converter.getResponseBodyAsJSON(
Components.Schemas.bulkEvaluationSuccess.self,
Components.Schemas.BulkEvaluationSuccess.self,
from: responseBody,
transforming: { value in
.json(value)
Expand All @@ -272,7 +272,7 @@ internal struct Client: APIProtocol {
return .notModified(.init())
case 400:
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
let body: Operations.post_sol_ofrep_sol_v1_sol_evaluate_sol_flags.Output.BadRequest.Body
let body: Operations.PostOfrepV1EvaluateFlags.Output.BadRequest.Body
let chosenContentType = try converter.bestContentType(
received: contentType,
options: [
Expand All @@ -282,7 +282,7 @@ internal struct Client: APIProtocol {
switch chosenContentType {
case "application/json":
body = try await converter.getResponseBodyAsJSON(
Components.Schemas.bulkEvaluationFailure.self,
Components.Schemas.BulkEvaluationFailure.self,
from: responseBody,
transforming: { value in
.json(value)
Expand All @@ -297,15 +297,15 @@ internal struct Client: APIProtocol {
case 403:
return .forbidden(.init())
case 429:
let headers: Operations.post_sol_ofrep_sol_v1_sol_evaluate_sol_flags.Output.TooManyRequests.Headers = .init(Retry_hyphen_After: try converter.getOptionalHeaderFieldAsURI(
let headers: Operations.PostOfrepV1EvaluateFlags.Output.TooManyRequests.Headers = .init(retryAfter: try converter.getOptionalHeaderFieldAsURI(
in: response.headerFields,
name: "Retry-After",
as: Foundation.Date.self
))
return .tooManyRequests(.init(headers: headers))
case 500:
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
let body: Operations.post_sol_ofrep_sol_v1_sol_evaluate_sol_flags.Output.InternalServerError.Body
let body: Operations.PostOfrepV1EvaluateFlags.Output.InternalServerError.Body
let chosenContentType = try converter.bestContentType(
received: contentType,
options: [
Expand All @@ -315,7 +315,7 @@ internal struct Client: APIProtocol {
switch chosenContentType {
case "application/json":
body = try await converter.getResponseBodyAsJSON(
Components.Schemas.generalErrorResponse.self,
Components.Schemas.GeneralErrorResponse.self,
from: responseBody,
transforming: { value in
.json(value)
Expand Down Expand Up @@ -345,10 +345,10 @@ internal struct Client: APIProtocol {
///
/// - Remark: HTTP `GET /ofrep/v1/configuration`.
/// - Remark: Generated from `#/paths//ofrep/v1/configuration/get`.
internal func get_sol_ofrep_sol_v1_sol_configuration(_ input: Operations.get_sol_ofrep_sol_v1_sol_configuration.Input) async throws -> Operations.get_sol_ofrep_sol_v1_sol_configuration.Output {
internal func getOfrepV1Configuration(_ input: Operations.GetOfrepV1Configuration.Input) async throws -> Operations.GetOfrepV1Configuration.Output {
try await client.send(
input: input,
forOperation: Operations.get_sol_ofrep_sol_v1_sol_configuration.id,
forOperation: Operations.GetOfrepV1Configuration.id,
serializer: { input in
let path = try converter.renderedPath(
template: "/ofrep/v1/configuration",
Expand All @@ -362,7 +362,7 @@ internal struct Client: APIProtocol {
try converter.setHeaderFieldAsURI(
in: &request.headerFields,
name: "If-None-Match",
value: input.headers.If_hyphen_None_hyphen_Match
value: input.headers.ifNoneMatch
)
converter.setAcceptHeader(
in: &request.headerFields,
Expand All @@ -373,13 +373,13 @@ internal struct Client: APIProtocol {
deserializer: { response, responseBody in
switch response.status.code {
case 200:
let headers: Operations.get_sol_ofrep_sol_v1_sol_configuration.Output.Ok.Headers = .init(ETag: try converter.getOptionalHeaderFieldAsURI(
let headers: Operations.GetOfrepV1Configuration.Output.Ok.Headers = .init(eTag: try converter.getOptionalHeaderFieldAsURI(
in: response.headerFields,
name: "ETag",
as: Swift.String.self
))
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
let body: Operations.get_sol_ofrep_sol_v1_sol_configuration.Output.Ok.Body
let body: Operations.GetOfrepV1Configuration.Output.Ok.Body
let chosenContentType = try converter.bestContentType(
received: contentType,
options: [
Expand All @@ -389,7 +389,7 @@ internal struct Client: APIProtocol {
switch chosenContentType {
case "application/json":
body = try await converter.getResponseBodyAsJSON(
Components.Schemas.configurationResponse.self,
Components.Schemas.ConfigurationResponse.self,
from: responseBody,
transforming: { value in
.json(value)
Expand All @@ -410,7 +410,7 @@ internal struct Client: APIProtocol {
return .forbidden(.init())
case 500:
let contentType = converter.extractContentTypeIfPresent(in: response.headerFields)
let body: Operations.get_sol_ofrep_sol_v1_sol_configuration.Output.InternalServerError.Body
let body: Operations.GetOfrepV1Configuration.Output.InternalServerError.Body
let chosenContentType = try converter.bestContentType(
received: contentType,
options: [
Expand All @@ -420,7 +420,7 @@ internal struct Client: APIProtocol {
switch chosenContentType {
case "application/json":
body = try await converter.getResponseBodyAsJSON(
Components.Schemas.generalErrorResponse.self,
Components.Schemas.GeneralErrorResponse.self,
from: responseBody,
transforming: { value in
.json(value)
Expand Down
Loading