Skip to content

Commit

Permalink
Update to newly built API from GH Run 117 (#6)
Browse files Browse the repository at this point in the history 
Co-authored-by: OpenApi-Bot <OpenApi-Bot@users.noreply.github.com>
  • Loading branch information
@joerghartmann @openapi-bot
joerghartmann and openapi-bot committed Jul 11, 2022
1 parent 5cc31eb commit 54da278
Show file tree
Hide file tree
Showing 36 changed files with 156 additions and 105 deletions.
51 changes: 51 additions & 0 deletions Sources/CumulocityCoreLibrary/Supplementary/CodableExtensions.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,57 @@ extension KeyedEncodingContainer {
try self.encode(intValue, forKey: key)
} else if let doublevalue = value as? Double {
try self.encode(doublevalue, forKey: key)
} else if let nestedDictionary = value as? [String:Any] {
try self.encode(nestedDictionary, forKey: key)
} else if let nestedArray = value as? [Any] {
try self.encode(nestedArray, forKey: key)
}
}

public mutating func encode(_ value: Dictionary<String, Any>, forKey key: K) throws {
var container = self.nestedContainer(keyedBy: JSONCodingKeys.self, forKey: key)
try container.encode(value)
}

public mutating func encode(_ value: Array<Any>, forKey key: K) throws {
var container = self.nestedUnkeyedContainer(forKey: key)
try container.encode(value)
}

public mutating func encode(_ object: Dictionary<String,Any>) throws {
for key in object.keys {
let value = object[key] as Any
try self.encodeAnyIfPresent(value, forKey: JSONCodingKeys(stringValue: key) as! K)
}
}
}

extension UnkeyedEncodingContainer {

mutating func encode(_ value: Dictionary<String, Any>) throws {
var nestedContainer = self.nestedContainer(keyedBy: JSONCodingKeys.self)
try nestedContainer.encode(value)
}

mutating func encode(_ object: Array<Any>) throws {
for value in object {
if let intValue = value as? Int {
try? self.encode(intValue)
} else if let floatValue = value as? Float {
try? self.encode(floatValue)
} else if let doubleValue = value as? Double {
try? self.encode(doubleValue)
} else if let stringValue = value as? String {
try? self.encode(stringValue)
} else if let dateValue = value as? Date {
try? self.encode(dateValue)
} else if let boolValue = value as? Bool {
try? self.encode(boolValue)
} else if let nestedDictionary = value as? [String:Any] {
try? self.encode(nestedDictionary)
} else if let nestedArray = value as? [Any] {
try? self.encode(nestedArray)
}
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/AlarmsApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class AlarmsApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/ApplicationBinariesApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class ApplicationBinariesApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/ApplicationsApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class ApplicationsApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/AttachmentsApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class AttachmentsApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/AuditsApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class AuditsApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/BinariesApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class BinariesApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/BootstrapUserApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class BootstrapUserApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/BulkOperationsApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class BulkOperationsApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/ChildOperationsApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class ChildOperationsApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/CurrentApplicationApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class CurrentApplicationApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/CurrentUserApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class CurrentUserApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/DeviceCredentialsApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class DeviceCredentialsApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/DeviceStatisticsApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class DeviceStatisticsApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/EventsApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class EventsApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/ExternalIDsApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class ExternalIDsApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/GroupsApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class GroupsApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/IdentityApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class IdentityApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/InventoryApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class InventoryApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/InventoryRolesApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class InventoryRolesApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/LoginOptionsApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class LoginOptionsApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/ManagedObjectsApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class ManagedObjectsApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down
6 changes: 3 additions & 3 deletions Tests/CumulocityCoreLibraryTests/Api/MeasurementsApiTest.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ public class MeasurementsApiTest: XCTestCase {
override func adapt(builder: URLRequestBuilder) -> URLRequestBuilder {
guard let testDataUrl = Bundle.module.path(forResource: "TestData", ofType: "plist") else { return builder }
let resources = NSDictionary(contentsOfFile: testDataUrl)
let scheme = resources["Scheme"] as? String ?? ""
let hostName = resources["HostName"] as? String ?? ""
let authorization = resources["Authorization"] as? String ?? ""
let scheme = resources?["Scheme"] as? String ?? ""
let hostName = resources?["HostName"] as? String ?? ""
let authorization = resources?["Authorization"] as? String ?? ""
return builder.set(scheme: scheme)
.set(host: hostName)
.add(header: "Authorization", value: authorization)
Expand Down

0 comments on commit 54da278

Please sign in to comment.