From d23915a7b428b04dc35f72f34b2893fab7237a95 Mon Sep 17 00:00:00 2001 From: Christopher Gretzki Date: Wed, 21 Jul 2021 06:37:48 +0200 Subject: [PATCH] [swift5 client] fix filename for binary downloads (#9989) * fix-filename-from-header-response-retrieval: fix early exit of iteration before a match could be found * fix-filename-from-header-response-retrieval: fixed same bug for alamofire usage too * fix-filename-from-header-response-retrieval: build project and update samples Co-authored-by: Christopher Gretzki --- .../libraries/alamofire/AlamofireImplementations.mustache | 2 +- .../libraries/urlsession/URLSessionImplementations.mustache | 2 +- .../Classes/OpenAPIs/AlamofireImplementations.swift | 2 +- .../Classes/OpenAPIs/URLSessionImplementations.swift | 2 +- .../Classes/OpenAPIs/URLSessionImplementations.swift | 2 +- .../Classes/OpenAPIs/URLSessionImplementations.swift | 2 +- .../Classes/OpenAPIs/URLSessionImplementations.swift | 2 +- .../Classes/OpenAPIs/URLSessionImplementations.swift | 2 +- .../Classes/OpenAPIs/URLSessionImplementations.swift | 2 +- .../Classes/OpenAPIs/URLSessionImplementations.swift | 2 +- .../Classes/OpenAPIs/URLSessionImplementations.swift | 2 +- .../Classes/OpenAPIs/URLSessionImplementations.swift | 2 +- .../Classes/OpenAPIs/URLSessionImplementations.swift | 2 +- .../Sources/PetstoreClient/URLSessionImplementations.swift | 2 +- .../Classes/OpenAPIs/URLSessionImplementations.swift | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/swift5/libraries/alamofire/AlamofireImplementations.mustache b/modules/openapi-generator/src/main/resources/swift5/libraries/alamofire/AlamofireImplementations.mustache index 4d53fe6680f..37a03ab1e30 100644 --- a/modules/openapi-generator/src/main/resources/swift5/libraries/alamofire/AlamofireImplementations.mustache +++ b/modules/openapi-generator/src/main/resources/swift5/libraries/alamofire/AlamofireImplementations.mustache @@ -277,7 +277,7 @@ private var managerStore = SynchronizedDictionary() let filenameKey = "filename=" guard let range = contentItem.range(of: filenameKey) else { - break + continue } filename = contentItem diff --git a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift index aa8dcad9b65..84bc1dfd69c 100644 --- a/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift +++ b/samples/client/petstore/swift5/alamofireLibrary/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift @@ -277,7 +277,7 @@ open class AlamofireRequestBuilder: RequestBuilder { let filenameKey = "filename=" guard let range = contentItem.range(of: filenameKey) else { - break + continue } filename = contentItem diff --git a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 41959190a26..9ff1135660e 100644 --- a/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/combineLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -270,7 +270,7 @@ open class URLSessionRequestBuilder: RequestBuilder { let filenameKey = "filename=" guard let range = contentItem.range(of: filenameKey) else { - break + continue } filename = contentItem diff --git a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 41959190a26..9ff1135660e 100644 --- a/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/default/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -270,7 +270,7 @@ open class URLSessionRequestBuilder: RequestBuilder { let filenameKey = "filename=" guard let range = contentItem.range(of: filenameKey) else { - break + continue } filename = contentItem diff --git a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 41959190a26..9ff1135660e 100644 --- a/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/deprecated/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -270,7 +270,7 @@ open class URLSessionRequestBuilder: RequestBuilder { let filenameKey = "filename=" guard let range = contentItem.range(of: filenameKey) else { - break + continue } filename = contentItem diff --git a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 71361b388bb..6091c67f193 100644 --- a/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/nonPublicApi/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -270,7 +270,7 @@ internal class URLSessionRequestBuilder: RequestBuilder { let filenameKey = "filename=" guard let range = contentItem.range(of: filenameKey) else { - break + continue } filename = contentItem diff --git a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 41959190a26..9ff1135660e 100644 --- a/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/objcCompatible/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -270,7 +270,7 @@ open class URLSessionRequestBuilder: RequestBuilder { let filenameKey = "filename=" guard let range = contentItem.range(of: filenameKey) else { - break + continue } filename = contentItem diff --git a/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 41959190a26..9ff1135660e 100644 --- a/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/oneOf/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -270,7 +270,7 @@ open class URLSessionRequestBuilder: RequestBuilder { let filenameKey = "filename=" guard let range = contentItem.range(of: filenameKey) else { - break + continue } filename = contentItem diff --git a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 41959190a26..9ff1135660e 100644 --- a/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/promisekitLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -270,7 +270,7 @@ open class URLSessionRequestBuilder: RequestBuilder { let filenameKey = "filename=" guard let range = contentItem.range(of: filenameKey) else { - break + continue } filename = contentItem diff --git a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 41959190a26..9ff1135660e 100644 --- a/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/readonlyProperties/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -270,7 +270,7 @@ open class URLSessionRequestBuilder: RequestBuilder { let filenameKey = "filename=" guard let range = contentItem.range(of: filenameKey) else { - break + continue } filename = contentItem diff --git a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 41959190a26..9ff1135660e 100644 --- a/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/resultLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -270,7 +270,7 @@ open class URLSessionRequestBuilder: RequestBuilder { let filenameKey = "filename=" guard let range = contentItem.range(of: filenameKey) else { - break + continue } filename = contentItem diff --git a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 41959190a26..9ff1135660e 100644 --- a/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/rxswiftLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -270,7 +270,7 @@ open class URLSessionRequestBuilder: RequestBuilder { let filenameKey = "filename=" guard let range = contentItem.range(of: filenameKey) else { - break + continue } filename = contentItem diff --git a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/URLSessionImplementations.swift b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/URLSessionImplementations.swift index 41959190a26..9ff1135660e 100644 --- a/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/urlsessionLibrary/Sources/PetstoreClient/URLSessionImplementations.swift @@ -270,7 +270,7 @@ open class URLSessionRequestBuilder: RequestBuilder { let filenameKey = "filename=" guard let range = contentItem.range(of: filenameKey) else { - break + continue } filename = contentItem diff --git a/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift index 41959190a26..9ff1135660e 100644 --- a/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift +++ b/samples/client/petstore/swift5/x-swift-hashable/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift @@ -270,7 +270,7 @@ open class URLSessionRequestBuilder: RequestBuilder { let filenameKey = "filename=" guard let range = contentItem.range(of: filenameKey) else { - break + continue } filename = contentItem