Skip to content

SWIFT5: sort query items alphabetically to allow better server side caching of requests with same URL #18239

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
Apr 5, 2024
Merged

SWIFT5: sort query items alphabetically to allow better server side caching of requests with same URL #18239

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
1ce6df7
sort query items alphabetically to allow better server side caching o…
mbruegmann Mar 27, 2024
d6da418
updarted samples
mbruegmann Mar 27, 2024
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
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/swift5/APIHelper.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ import Vapor{{/useVapor}}
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}

/// maps all values from source to query parameters
Expand All @@ -115,6 +115,6 @@ import Vapor{{/useVapor}}
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}
}
4 changes: 2 additions & 2 deletions ...s/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}

/// maps all values from source to query parameters
Expand All @@ -114,6 +114,6 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}
}
4 changes: 2 additions & 2 deletions .../client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}

/// maps all values from source to query parameters
Expand All @@ -114,6 +114,6 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}
}
4 changes: 2 additions & 2 deletions .../client/petstore/swift5/asyncAwaitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}

/// maps all values from source to query parameters
Expand All @@ -114,6 +114,6 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}
}
4 changes: 2 additions & 2 deletions ...les/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}

/// maps all values from source to query parameters
Expand All @@ -114,6 +114,6 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}
}
4 changes: 2 additions & 2 deletions samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}

/// maps all values from source to query parameters
Expand All @@ -114,6 +114,6 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}
}
4 changes: 2 additions & 2 deletions samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}

/// maps all values from source to query parameters
Expand All @@ -114,6 +114,6 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}
}
4 changes: 2 additions & 2 deletions samples/client/petstore/swift5/frozenEnums/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}

/// maps all values from source to query parameters
Expand All @@ -114,6 +114,6 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}
}
4 changes: 2 additions & 2 deletions samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ internal struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}

/// maps all values from source to query parameters
Expand All @@ -114,6 +114,6 @@ internal struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}
}
4 changes: 2 additions & 2 deletions ...les/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}

/// maps all values from source to query parameters
Expand All @@ -114,6 +114,6 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}
}
4 changes: 2 additions & 2 deletions samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}

/// maps all values from source to query parameters
Expand All @@ -114,6 +114,6 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}
}
4 changes: 2 additions & 2 deletions .../client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}

/// maps all values from source to query parameters
Expand All @@ -114,6 +114,6 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}
}
4 changes: 2 additions & 2 deletions ...client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}

/// maps all values from source to query parameters
Expand All @@ -114,6 +114,6 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}
}
4 changes: 2 additions & 2 deletions samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}

/// maps all values from source to query parameters
Expand All @@ -114,6 +114,6 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}
}
4 changes: 2 additions & 2 deletions ...les/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}

/// maps all values from source to query parameters
Expand All @@ -114,6 +114,6 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}
}
4 changes: 2 additions & 2 deletions samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}

/// maps all values from source to query parameters
Expand All @@ -114,6 +114,6 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}
}
4 changes: 2 additions & 2 deletions samples/client/petstore/swift5/validation/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}

/// maps all values from source to query parameters
Expand All @@ -114,6 +114,6 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}
}
4 changes: 2 additions & 2 deletions ...s/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}

/// maps all values from source to query parameters
Expand All @@ -114,6 +114,6 @@ public struct APIHelper {
if destination.isEmpty {
return nil
}
return destination
return destination.sorted { $0.name < $1.name }
}
}
Loading