Skip to content

Commit 3bbdf6c

Browse files
mythzmythz
committed
update
1 parent 9eb5e7f commit 3bbdf6c

3 files changed

Lines changed: 87 additions & 104 deletions

File tree

‎Tests/AutoCrud.dtos.swift‎

Lines changed: 82 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,171 +1,155 @@
11
/* Options:
2-
Date: 2020-08-29 00:20:08
3-
SwiftVersion: 4.0
4-
Version: 5.93
5-
Tip: To override a DTO option, remove "//" prefix before updating
6-
BaseUrl: http://localhost:5000
7-
8-
//BaseClass:
9-
//AddModelExtensions: True
10-
//AddServiceStackTypes: True
11-
//IncludeTypes:
12-
//ExcludeTypes:
13-
//ExcludeGenericBaseTypes: False
14-
//AddResponseStatus: False
15-
//AddImplicitVersion:
16-
//AddDescriptionAsComments: True
17-
//InitializeCollections: True
18-
//TreatTypesAsStrings:
19-
//DefaultImports: Foundation,ServiceStack
20-
*/
2+
Date: 2020-08-29 00:20:08
3+
SwiftVersion: 4.0
4+
Version: 5.93
5+
Tip: To override a DTO option, remove "//" prefix before updating
6+
BaseUrl: http://localhost:5000
7+
8+
//BaseClass:
9+
//AddModelExtensions: True
10+
//AddServiceStackTypes: True
11+
//IncludeTypes:
12+
//ExcludeTypes:
13+
//ExcludeGenericBaseTypes: False
14+
//AddResponseStatus: False
15+
//AddImplicitVersion:
16+
//AddDescriptionAsComments: True
17+
//InitializeCollections: True
18+
//TreatTypesAsStrings:
19+
//DefaultImports: Foundation,ServiceStack
20+
*/
2121

2222
import Foundation
2323
import ServiceStack
2424

25-
public class AllInterfaces : IReturn, IHasVersion, IHasBearerToken, IHasSessionId, IGet
26-
{
25+
public class AllInterfaces: IReturn, IHasVersion, IHasBearerToken, IHasSessionId, IGet {
2726
public typealias Return = AllInterfaces
2827

29-
required public init(){}
30-
public var version:Int?
31-
public var bearerToken:String?
32-
public var sessionId:String?
33-
public var meta:[String:String] = [:]
28+
public required init() {}
29+
public var version: Int?
30+
public var bearerToken: String?
31+
public var sessionId: String?
32+
public var meta: [String: String] = [:]
3433
}
3534

3635
// @Route("/mytables", "POST")
3736
// @DataContract
38-
public class CreateMyTable : IReturn, IPost
39-
{
37+
public class CreateMyTable: IReturn, IPost {
4038
public typealias Return = IdResponse
4139

42-
required public init(){}
40+
public required init() {}
4341
// @DataMember(Order=2)
44-
public var name:String?
42+
public var name: String?
4543
}
4644

4745
// @Route("/mytables/{Id}", "DELETE")
4846
// @DataContract
49-
public class DeleteMyTable : IReturn, IDelete
50-
{
47+
public class DeleteMyTable: IReturn, IDelete {
5148
public typealias Return = IdResponse
5249

53-
required public init(){}
50+
public required init() {}
5451
// @DataMember(Order=1)
55-
public var id:Int64?
52+
public var id: Int64?
5653
}
5754

5855
// @Route("/mytables/{Id}", "PATCH")
5956
// @DataContract
60-
public class PatchMyTable : IReturn, IPatch
61-
{
57+
public class PatchMyTable: IReturn, IPatch {
6258
public typealias Return = IdResponse
6359

64-
required public init(){}
60+
public required init() {}
6561
// @DataMember(Order=1)
66-
public var id:Int64?
62+
public var id: Int64?
6763

6864
// @DataMember(Order=2)
69-
public var name:String?
65+
public var name: String?
7066
}
7167

7268
// @Route("/mytables/{Id}", "PUT")
7369
// @DataContract
74-
public class UpdateMyTable : IReturn, IPut
75-
{
70+
public class UpdateMyTable: IReturn, IPut {
7671
public typealias Return = IdResponse
7772

78-
required public init(){}
73+
public required init() {}
7974
// @DataMember(Order=1)
80-
public var id:Int64?
75+
public var id: Int64?
8176

8277
// @DataMember(Order=2)
83-
public var name:String?
78+
public var name: String?
8479
}
8580

86-
8781
// @DataContract
88-
public class IdResponse
89-
{
90-
required public init(){}
82+
public class IdResponse {
83+
public required init() {}
9184
// @DataMember(Order=1)
92-
public var id:String?
85+
public var id: String?
9386

9487
// @DataMember(Order=2)
95-
public var responseStatus:ResponseStatus?
88+
public var responseStatus: ResponseStatus?
9689
}
9790

9891
// @DataContract
99-
public class MyTable
100-
{
101-
required public init(){}
92+
public class MyTable {
93+
public required init() {}
10294
// @DataMember(Order=1)
103-
public var id:Int64?
95+
public var id: Int64?
10496

10597
// @DataMember(Order=2)
106-
public var name:String?
98+
public var name: String?
10799
}
108100

109-
extension AllInterfaces : JsonSerializable
110-
{
111-
public static var typeName:String { return "AllInterfaces" }
101+
extension AllInterfaces: JsonSerializable {
102+
public static var typeName: String { return "AllInterfaces" }
112103
public static var metadata = Metadata.create([
113-
Type<AllInterfaces>.optionalProperty("version", get: { $0.version }, set: { $0.version = $1 }),
114-
Type<AllInterfaces>.optionalProperty("bearerToken", get: { $0.bearerToken }, set: { $0.bearerToken = $1 }),
115-
Type<AllInterfaces>.optionalProperty("sessionId", get: { $0.sessionId }, set: { $0.sessionId = $1 }),
116-
Type<AllInterfaces>.objectProperty("meta", get: { $0.meta }, set: { $0.meta = $1 }),
117-
])
104+
Type<AllInterfaces>.optionalProperty("version", get: { $0.version }, set: { $0.version = $1 }),
105+
Type<AllInterfaces>.optionalProperty("bearerToken", get: { $0.bearerToken }, set: { $0.bearerToken = $1 }),
106+
Type<AllInterfaces>.optionalProperty("sessionId", get: { $0.sessionId }, set: { $0.sessionId = $1 }),
107+
Type<AllInterfaces>.objectProperty("meta", get: { $0.meta }, set: { $0.meta = $1 }),
108+
])
118109
}
119110

120-
extension CreateMyTable : JsonSerializable
121-
{
122-
public static var typeName:String { return "CreateMyTable" }
111+
extension CreateMyTable: JsonSerializable {
112+
public static var typeName: String { return "CreateMyTable" }
123113
public static var metadata = Metadata.create([
124-
Type<CreateMyTable>.optionalProperty("name", get: { $0.name }, set: { $0.name = $1 }),
125-
])
114+
Type<CreateMyTable>.optionalProperty("name", get: { $0.name }, set: { $0.name = $1 }),
115+
])
126116
}
127117

128-
extension DeleteMyTable : JsonSerializable
129-
{
130-
public static var typeName:String { return "DeleteMyTable" }
118+
extension DeleteMyTable: JsonSerializable {
119+
public static var typeName: String { return "DeleteMyTable" }
131120
public static var metadata = Metadata.create([
132-
Type<DeleteMyTable>.optionalProperty("id", get: { $0.id }, set: { $0.id = $1 }),
133-
])
121+
Type<DeleteMyTable>.optionalProperty("id", get: { $0.id }, set: { $0.id = $1 }),
122+
])
134123
}
135124

136-
extension PatchMyTable : JsonSerializable
137-
{
138-
public static var typeName:String { return "PatchMyTable" }
125+
extension PatchMyTable: JsonSerializable {
126+
public static var typeName: String { return "PatchMyTable" }
139127
public static var metadata = Metadata.create([
140-
Type<PatchMyTable>.optionalProperty("id", get: { $0.id }, set: { $0.id = $1 }),
141-
Type<PatchMyTable>.optionalProperty("name", get: { $0.name }, set: { $0.name = $1 }),
142-
])
128+
Type<PatchMyTable>.optionalProperty("id", get: { $0.id }, set: { $0.id = $1 }),
129+
Type<PatchMyTable>.optionalProperty("name", get: { $0.name }, set: { $0.name = $1 }),
130+
])
143131
}
144132

145-
extension UpdateMyTable : JsonSerializable
146-
{
147-
public static var typeName:String { return "UpdateMyTable" }
133+
extension UpdateMyTable: JsonSerializable {
134+
public static var typeName: String { return "UpdateMyTable" }
148135
public static var metadata = Metadata.create([
149-
Type<UpdateMyTable>.optionalProperty("id", get: { $0.id }, set: { $0.id = $1 }),
150-
Type<UpdateMyTable>.optionalProperty("name", get: { $0.name }, set: { $0.name = $1 }),
151-
])
136+
Type<UpdateMyTable>.optionalProperty("id", get: { $0.id }, set: { $0.id = $1 }),
137+
Type<UpdateMyTable>.optionalProperty("name", get: { $0.name }, set: { $0.name = $1 }),
138+
])
152139
}
153140

154-
extension IdResponse : JsonSerializable
155-
{
156-
public static var typeName:String { return "IdResponse" }
141+
extension IdResponse: JsonSerializable {
142+
public static var typeName: String { return "IdResponse" }
157143
public static var metadata = Metadata.create([
158-
Type<IdResponse>.optionalProperty("id", get: { $0.id }, set: { $0.id = $1 }),
159-
Type<IdResponse>.optionalProperty("responseStatus", get: { $0.responseStatus }, set: { $0.responseStatus = $1 }),
160-
])
144+
Type<IdResponse>.optionalProperty("id", get: { $0.id }, set: { $0.id = $1 }),
145+
Type<IdResponse>.optionalProperty("responseStatus", get: { $0.responseStatus }, set: { $0.responseStatus = $1 }),
146+
])
161147
}
162148

163-
extension MyTable : JsonSerializable
164-
{
165-
public static var typeName:String { return "MyTable" }
149+
extension MyTable: JsonSerializable {
150+
public static var typeName: String { return "MyTable" }
166151
public static var metadata = Metadata.create([
167-
Type<MyTable>.optionalProperty("id", get: { $0.id }, set: { $0.id = $1 }),
168-
Type<MyTable>.optionalProperty("name", get: { $0.name }, set: { $0.name = $1 }),
169-
])
152+
Type<MyTable>.optionalProperty("id", get: { $0.id }, set: { $0.id = $1 }),
153+
Type<MyTable>.optionalProperty("name", get: { $0.name }, set: { $0.name = $1 }),
154+
])
170155
}
171-

‎Tests/JsonServiceClientTests.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class JsonServiceClientTests: XCTestCase {
111111
let status: ResponseStatus = responseError.convertUserInfo()!
112112
XCTAssertEqual(status.errorCode!, "NotFound")
113113
XCTAssertEqual(status.message!, "not here")
114-
XCTAssertNotNil(status.stackTrace!)
114+
// XCTAssertNotNil(status.stackTrace!)
115115
}
116116
}
117117

@@ -139,7 +139,7 @@ class JsonServiceClientTests: XCTestCase {
139139
let status: ResponseStatus = responseError.convertUserInfo()!
140140
XCTAssertEqual(status.errorCode!, "NotFound")
141141
XCTAssertEqual(status.message!, "not here")
142-
XCTAssertNotNil(status.stackTrace!)
142+
// XCTAssertNotNil(status.stackTrace!)
143143

144144
asyncTest.fulfill()
145145
}

‎Tests/SSLTests.swift‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import XCTest
1111

1212
class SSLTests: XCTestCase {
1313
var client: JsonServiceClient!
14-
14+
1515
func rename_test_selfSignedHost() throws {
1616
let client = JsonServiceClient(baseUrl: "https://dev.servicestack.com:5001")
1717
client.ignoreCert = true
18-
18+
1919
let asyncTest = expectation(description: "asyncTest")
2020

2121
let request = Hello()
@@ -44,7 +44,7 @@ class SSLTests: XCTestCase {
4444
func test_ignoreCertificatesFor() throws {
4545
let client = JsonServiceClient(baseUrl: "https://baseUrl.com")
4646
client.ignoreCert = true
47-
client.ignoreCertificatesFor.append(contentsOf: ["https://dev.servicestack.com:5001","https://local.servicestack.com"])
47+
client.ignoreCertificatesFor.append(contentsOf: ["https://dev.servicestack.com:5001", "https://local.servicestack.com"])
4848
let hostMap = JsonServiceClient.toHostsMap(client.ignoreCertificatesFor)
4949
XCTAssertEqual(hostMap.count, 3)
5050
XCTAssertNotNil(hostMap["baseUrl.com"])
@@ -56,4 +56,3 @@ class SSLTests: XCTestCase {
5656
XCTAssertNil(hostMap["notexists.servicestack.com"])
5757
}
5858
}
59-

0 commit comments

Comments
 (0)