Skip to content
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

Jump to bottom

Remove default values from initializers #1461

Merged
merged 5 commits into from
Oct 19, 2020
Merged

Remove default values from initializers #1461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
649a47b
Remove default values from initializers
namolnad Oct 19, 2020
c3920cb
Fix test compilation
namolnad Oct 19, 2020
5e34a41
Fix additional test compilation issues
namolnad Oct 19, 2020
c75258d
Try again to fix test compilation (cant run locally)
namolnad Oct 19, 2020
674951b
Fix one TestProvider that is subclass
namolnad Oct 19, 2020
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
2 changes: 1 addition & 1 deletion Sources/Apollo/ApolloClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public class ApolloClient {
/// - Parameters:
/// - networkTransport: A network transport used to send operations to a server.
/// - store: A store used as a local cache. Should default to an empty store backed by an in-memory cache.
public init(networkTransport: NetworkTransport, store: ApolloStore = ApolloStore(cache: InMemoryNormalizedCache())) {
public init(networkTransport: NetworkTransport, store: ApolloStore) {
self.networkTransport = networkTransport
self.store = store
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/Apollo/InterceptorProvider.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ open class LegacyInterceptorProvider: InterceptorProvider {
/// - store: The `ApolloStore` to use when reading from or writing to the cache. Defaults to the default initializer for ApolloStore.
public init(client: URLSessionClient = URLSessionClient(),
shouldInvalidateClientOnDeinit: Bool = true,
store: ApolloStore = ApolloStore()) {
store: ApolloStore) {
self.client = client
self.shouldInvalidateClientOnDeinit = shouldInvalidateClientOnDeinit
self.store = store
Expand Down
33 changes: 22 additions & 11 deletions Tests/ApolloTests/AutomaticPersistedQueriesTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,8 @@ class AutomaticPersistedQueriesTests: XCTestCase {

func testRequestBody() throws {
let mockClient = MockURLSessionClient()
let provider = LegacyInterceptorProvider(client: mockClient)
let store = ApolloStore()
let provider = LegacyInterceptorProvider(client: mockClient, store: store)
let network = RequestChainNetworkTransport(interceptorProvider: provider,
endpointURL: self.endpoint)

Expand All @@ -256,7 +257,8 @@ class AutomaticPersistedQueriesTests: XCTestCase {

func testRequestBodyWithVariable() throws {
let mockClient = MockURLSessionClient()
let provider = LegacyInterceptorProvider(client: mockClient)
let store = ApolloStore()
let provider = LegacyInterceptorProvider(client: mockClient, store: store)
let network = RequestChainNetworkTransport(interceptorProvider: provider,
endpointURL: self.endpoint)

Expand All @@ -281,7 +283,8 @@ class AutomaticPersistedQueriesTests: XCTestCase {

func testRequestBodyForAPQsWithVariable() throws {
let mockClient = MockURLSessionClient()
let provider = LegacyInterceptorProvider(client: mockClient)
let store = ApolloStore()
let provider = LegacyInterceptorProvider(client: mockClient, store: store)
let network = RequestChainNetworkTransport(interceptorProvider: provider,
endpointURL: self.endpoint,
autoPersistQueries: true)
Expand All @@ -307,7 +310,8 @@ class AutomaticPersistedQueriesTests: XCTestCase {

func testMutationRequestBodyForAPQs() throws {
let mockClient = MockURLSessionClient()
let provider = LegacyInterceptorProvider(client: mockClient)
let store = ApolloStore()
let provider = LegacyInterceptorProvider(client: mockClient, store: store)
let network = RequestChainNetworkTransport(interceptorProvider: provider,
endpointURL: self.endpoint,
autoPersistQueries: true)
Expand All @@ -333,7 +337,8 @@ class AutomaticPersistedQueriesTests: XCTestCase {

func testQueryStringForAPQsUseGetMethod() throws {
let mockClient = MockURLSessionClient()
let provider = LegacyInterceptorProvider(client: mockClient)
let store = ApolloStore()
let provider = LegacyInterceptorProvider(client: mockClient, store: store)
let network = RequestChainNetworkTransport(interceptorProvider: provider,
endpointURL: self.endpoint,
autoPersistQueries: true,
Expand All @@ -358,7 +363,8 @@ class AutomaticPersistedQueriesTests: XCTestCase {

func testQueryStringForAPQsUseGetMethodWithVariable() throws {
let mockClient = MockURLSessionClient()
let provider = LegacyInterceptorProvider(client: mockClient)
let store = ApolloStore()
let provider = LegacyInterceptorProvider(client: mockClient, store: store)
let network = RequestChainNetworkTransport(interceptorProvider: provider,
endpointURL: self.endpoint,
autoPersistQueries: true,
Expand All @@ -385,7 +391,8 @@ class AutomaticPersistedQueriesTests: XCTestCase {

func testUseGETForQueriesRequest() throws {
let mockClient = MockURLSessionClient()
let provider = LegacyInterceptorProvider(client: mockClient)
let store = ApolloStore()
let provider = LegacyInterceptorProvider(client: mockClient, store: store)
let network = RequestChainNetworkTransport(interceptorProvider: provider,
endpointURL: self.endpoint,
additionalHeaders: ["Authentication": "Bearer 1234"],
Expand Down Expand Up @@ -413,7 +420,8 @@ class AutomaticPersistedQueriesTests: XCTestCase {

func testNotUseGETForQueriesRequest() throws {
let mockClient = MockURLSessionClient()
let provider = LegacyInterceptorProvider(client: mockClient)
let store = ApolloStore()
let provider = LegacyInterceptorProvider(client: mockClient, store: store)
let network = RequestChainNetworkTransport(interceptorProvider: provider,
endpointURL: self.endpoint)

Expand All @@ -438,7 +446,8 @@ class AutomaticPersistedQueriesTests: XCTestCase {

func testNotUseGETForQueriesAPQsRequest() throws {
let mockClient = MockURLSessionClient()
let provider = LegacyInterceptorProvider(client: mockClient)
let store = ApolloStore()
let provider = LegacyInterceptorProvider(client: mockClient, store: store)
let network = RequestChainNetworkTransport(interceptorProvider: provider,
endpointURL: self.endpoint,
autoPersistQueries: true)
Expand All @@ -464,7 +473,8 @@ class AutomaticPersistedQueriesTests: XCTestCase {

func testUseGETForQueriesAPQsRequest() throws {
let mockClient = MockURLSessionClient()
let provider = LegacyInterceptorProvider(client: mockClient)
let store = ApolloStore()
let provider = LegacyInterceptorProvider(client: mockClient, store: store)
let network = RequestChainNetworkTransport(interceptorProvider: provider,
endpointURL: self.endpoint,
autoPersistQueries: true,
Expand All @@ -491,7 +501,8 @@ class AutomaticPersistedQueriesTests: XCTestCase {

func testNotUseGETForQueriesAPQsGETRequest() throws {
let mockClient = MockURLSessionClient()
let provider = LegacyInterceptorProvider(client: mockClient)
let store = ApolloStore()
let provider = LegacyInterceptorProvider(client: mockClient, store: store)
let network = RequestChainNetworkTransport(interceptorProvider: provider,
endpointURL: self.endpoint,
autoPersistQueries: true,
Expand Down
10 changes: 5 additions & 5 deletions Tests/ApolloTests/InterceptorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class InterceptorTests: XCTestCase {
]
}
}

let testProvider = TestProvider()
let network = RequestChainNetworkTransport(interceptorProvider: testProvider,
endpointURL: TestURL.mockServer.url)
Expand Down Expand Up @@ -92,7 +92,7 @@ class InterceptorTests: XCTestCase {
]
}
}

let testProvider = TestProvider()
let network = RequestChainNetworkTransport(interceptorProvider: testProvider,
endpointURL: TestURL.mockServer.url)
Expand Down Expand Up @@ -138,7 +138,7 @@ class InterceptorTests: XCTestCase {
]
}
}

let network = RequestChainNetworkTransport(interceptorProvider: TestProvider(),
endpointURL: TestURL.mockServer.url)

Expand Down Expand Up @@ -187,7 +187,7 @@ class InterceptorTests: XCTestCase {
]
}
}

let network = RequestChainNetworkTransport(interceptorProvider: TestProvider(),
endpointURL: TestURL.mockServer.url)

Expand Down Expand Up @@ -243,7 +243,7 @@ class InterceptorTests: XCTestCase {
]
}
}

let network = RequestChainNetworkTransport(interceptorProvider: TestProvider(),
endpointURL: TestURL.mockServer.url)

Expand Down
15 changes: 8 additions & 7 deletions Tests/ApolloTests/RequestChainTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ class RequestChainTests: XCTestCase {

lazy var legacyClient: ApolloClient = {
let url = TestURL.starWarsServer.url
let provider = LegacyInterceptorProvider()
let store = ApolloStore()
let provider = LegacyInterceptorProvider(store: store)
let transport = RequestChainNetworkTransport(interceptorProvider: provider,
endpointURL: url)

return ApolloClient(networkTransport: transport)
return ApolloClient(networkTransport: transport, store: store)
}()

func testLoading() {
Expand Down Expand Up @@ -77,7 +78,7 @@ class RequestChainTests: XCTestCase {
[]
}
}

let transport = RequestChainNetworkTransport(interceptorProvider: TestProvider(),
endpointURL: TestURL.mockServer.url)
let expectation = self.expectation(description: "kickoff failed")
Expand Down Expand Up @@ -116,7 +117,7 @@ class RequestChainTests: XCTestCase {
]
}
}

let provider = TestProvider()
let transport = RequestChainNetworkTransport(interceptorProvider: provider,
endpointURL: TestURL.mockServer.url)
Expand Down Expand Up @@ -162,7 +163,7 @@ class RequestChainTests: XCTestCase {
return self.errorInterceptor
}
}

let provider = TestProvider()
let transport = RequestChainNetworkTransport(interceptorProvider: provider,
endpointURL: TestURL.mockServer.url,
Expand Down Expand Up @@ -233,8 +234,8 @@ class RequestChainTests: XCTestCase {
return self.errorInterceptor
}
}
let provider = TestProvider()

let provider = TestProvider(store: ApolloStore())
let transport = RequestChainNetworkTransport(interceptorProvider: provider,
endpointURL: TestURL.mockServer.url,
autoPersistQueries: true)
Expand Down
5 changes: 3 additions & 2 deletions Tests/ApolloTests/UploadTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ class UploadTests: XCTestCase {
let uploadClientURL = TestURL.uploadServer.url

lazy var client: ApolloClient = {
let provider = LegacyInterceptorProvider()
let store = ApolloStore()
let provider = LegacyInterceptorProvider(store: store)
let transport = RequestChainNetworkTransport(interceptorProvider: provider,
endpointURL: self.uploadClientURL)

return ApolloClient(networkTransport: transport)
return ApolloClient(networkTransport: transport, store: store)
}()

override static func tearDown() {
Expand Down
2 changes: 1 addition & 1 deletion Tests/ApolloWebsocketTests/MockWebSocketTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class MockWebSocketTests: XCTestCase {

WebSocketTransport.provider = MockWebSocket.self
networkTransport = WebSocketTransport(request: URLRequest(url: TestURL.mockServer.url))
client = ApolloClient(networkTransport: networkTransport!)
client = ApolloClient(networkTransport: networkTransport!, store: ApolloStore())
}

override func tearDown() {
Expand Down
7 changes: 4 additions & 3 deletions Tests/ApolloWebsocketTests/StarWarsSubscriptionTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class StarWarsSubscriptionTests: XCTestCase {
WebSocketTransport.provider = ApolloWebSocket.self
webSocketTransport = WebSocketTransport(request: URLRequest(url: TestURL.starWarsWebSocket.url))
webSocketTransport.delegate = self
client = ApolloClient(networkTransport: webSocketTransport)
client = ApolloClient(networkTransport: webSocketTransport, store: ApolloStore())

self.wait(for: [self.connectionStartedExpectation!], timeout: 5)
}
Expand Down Expand Up @@ -416,10 +416,11 @@ class StarWarsSubscriptionTests: XCTestCase {
let reviewMutation = CreateAwesomeReviewMutation()

// Send the mutations via a separate transport so they can still be sent when the websocket is disconnected
let interceptorProvider = LegacyInterceptorProvider()
let store = ApolloStore()
let interceptorProvider = LegacyInterceptorProvider(store: store)
let alternateTransport = RequestChainNetworkTransport(interceptorProvider: interceptorProvider,
endpointURL: TestURL.starWarsServer.url)
let alternateClient = ApolloClient(networkTransport: alternateTransport)
let alternateClient = ApolloClient(networkTransport: alternateTransport, store: store)

func sendReview() {
let reviewSentExpectation = self.expectation(description: "review sent")
Expand Down
2 changes: 1 addition & 1 deletion docs/source/tutorial/tutorial-mutations.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class Network {
let url = URL(string: "https://apollo-fullstack-tutorial.herokuapp.com/")!
let transport = RequestChainNetworkTransport(interceptorProvider: provider,
endpointURL: url)
return ApolloClient(networkTransport: transport)
return ApolloClient(networkTransport: transport, store: store)
}()
}
```
Expand Down