Skip to content

GET as a transport option instead of a parameter + ErrorCancellable #599

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
designatednerd merged 18 commits into from
Jul 2, 2019
Merged

GET as a transport option instead of a parameter + ErrorCancellable #599

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7c5be67
Add `ErrorCancellable` types so we can bail out of things which still…
designatednerd Jun 28, 2019
4b08fa5
update to 2-space indentation on all projects by default
designatednerd Jun 28, 2019
e369360
Make error with no additional parameters just an enum
designatednerd Jun 28, 2019
07199a9
tweak a few descriptions for more consistent swifting
designatednerd Jun 28, 2019
3c97896
pull request and response errors out into their own files
designatednerd Jun 28, 2019
aae0adb
make error cancelable final
designatednerd Jun 28, 2019
3d494a0
enable code coverage for main, SQLite, and WebSocket schemes
designatednerd Jun 28, 2019
c6132ca
add public initializer and fix indentation for ErrorCancellable
designatednerd Jun 28, 2019
2c6bbc9
fix swift warnings in the WebSocket tests
designatednerd Jun 28, 2019
ef5d6de
Make GET for queries an option on transport rather passing parameter …
designatednerd Jun 28, 2019
6564150
HTTP method no longer needs to be public
designatednerd Jun 28, 2019
b02a623
rm whitespace
designatednerd Jul 1, 2019
5a759de
Separator and explanation of why the init is public
designatednerd Jul 1, 2019
2d2853a
remove tests that were duplicated to test `GET`
designatednerd Jul 1, 2019
6a89b50
rename ErrorCancellable -> EmptyCancellable for flexibility
designatednerd Jul 2, 2019
56037ca
Fix a couple `ErrorCancellable`s the renamer missed 🤦‍♀️
designatednerd Jul 2, 2019
52c95bd
Merge branch 'master' into update/get-as-option + fix merge conflicts
designatednerd Jul 2, 2019
94d7bd7
fix indentation in web socket transport
designatednerd Jul 2, 2019
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
30 changes: 26 additions & 4 deletions Apollo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@

/* Begin PBXBuildFile section */
54DDB0921EA045870009DD99 /* InMemoryNormalizedCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54DDB0911EA045870009DD99 /* InMemoryNormalizedCache.swift */; };
5AC6CA4322AAF7B200B7C94D /* FetchHTTPMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AC6CA4222AAF7B200B7C94D /* FetchHTTPMethod.swift */; };
5AC6CA4322AAF7B200B7C94D /* GraphQLHTTPMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AC6CA4222AAF7B200B7C94D /* GraphQLHTTPMethod.swift */; };
9BDE43D122C6655300FD7C7F /* Cancellable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9BDE43D022C6655200FD7C7F /* Cancellable.swift */; };
9BDE43DD22C6705300FD7C7F /* GraphQLHTTPResponseError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9BDE43DC22C6705300FD7C7F /* GraphQLHTTPResponseError.swift */; };
9BDE43DF22C6708600FD7C7F /* GraphQLHTTPRequestError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9BDE43DE22C6708600FD7C7F /* GraphQLHTTPRequestError.swift */; };
9F0CA4451EE7F9E90032DD39 /* ApolloTestSupport.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F8A95781EC0FC1200304A2D /* ApolloTestSupport.framework */; };
9F0CA4461EE7F9E90032DD39 /* ApolloTestSupport.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9F8A95781EC0FC1200304A2D /* ApolloTestSupport.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
9F10A51E1EC1BA0F0045E62B /* MockNetworkTransport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F10A51D1EC1BA0F0045E62B /* MockNetworkTransport.swift */; };
Expand Down Expand Up @@ -231,7 +234,7 @@

/* Begin PBXFileReference section */
54DDB0911EA045870009DD99 /* InMemoryNormalizedCache.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InMemoryNormalizedCache.swift; sourceTree = "<group>"; };
5AC6CA4222AAF7B200B7C94D /* FetchHTTPMethod.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FetchHTTPMethod.swift; sourceTree = "<group>"; };
5AC6CA4222AAF7B200B7C94D /* GraphQLHTTPMethod.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GraphQLHTTPMethod.swift; sourceTree = "<group>"; };
90690D05224333DA00FC2E54 /* Apollo-Project-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Apollo-Project-Debug.xcconfig"; sourceTree = "<group>"; };
90690D06224333DA00FC2E54 /* Apollo-Target-Framework.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Apollo-Target-Framework.xcconfig"; sourceTree = "<group>"; };
90690D07224333DA00FC2E54 /* Apollo-Project-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Apollo-Project-Release.xcconfig"; sourceTree = "<group>"; };
Expand All @@ -243,6 +246,9 @@
90690D2322433C5900FC2E54 /* Apollo-Target-CacheDependentTests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Apollo-Target-CacheDependentTests.xcconfig"; sourceTree = "<group>"; };
90690D2422433C8000FC2E54 /* Apollo-Target-PerformanceTests.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Apollo-Target-PerformanceTests.xcconfig"; sourceTree = "<group>"; };
90690D2522433CAF00FC2E54 /* Apollo-Target-TestSupport.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Apollo-Target-TestSupport.xcconfig"; sourceTree = "<group>"; };
9BDE43D022C6655200FD7C7F /* Cancellable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Cancellable.swift; sourceTree = "<group>"; };
9BDE43DC22C6705300FD7C7F /* GraphQLHTTPResponseError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GraphQLHTTPResponseError.swift; sourceTree = "<group>"; };
9BDE43DE22C6708600FD7C7F /* GraphQLHTTPRequestError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GraphQLHTTPRequestError.swift; sourceTree = "<group>"; };
9F10A51D1EC1BA0F0045E62B /* MockNetworkTransport.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MockNetworkTransport.swift; sourceTree = "<group>"; };
9F19D8431EED568200C57247 /* ResultOrPromise.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ResultOrPromise.swift; sourceTree = "<group>"; };
9F19D8451EED8D3B00C57247 /* ResultOrPromiseTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ResultOrPromiseTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -434,6 +440,14 @@
path = Configuration/Apollo;
sourceTree = "<group>";
};
9BDE43D222C6658D00FD7C7F /* Protocols */ = {
isa = PBXGroup;
children = (
9BDE43D022C6655200FD7C7F /* Cancellable.swift */,
);
name = Protocols;
sourceTree = "<group>";
};
9F27D4601D40363A00715680 /* Execution */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -516,7 +530,9 @@
90690D04224333DA00FC2E54 /* Configuration */,
9FC750451D2A532C00458D91 /* Products */,
);
indentWidth = 2;
sourceTree = "<group>";
tabWidth = 2;
};
9FC750451D2A532C00458D91 /* Products */ = {
isa = PBXGroup;
Expand All @@ -537,11 +553,11 @@
isa = PBXGroup;
children = (
9FC750621D2A59F600458D91 /* ApolloClient.swift */,
5AC6CA4222AAF7B200B7C94D /* FetchHTTPMethod.swift */,
9FC750601D2A59C300458D91 /* GraphQLOperation.swift */,
9FC9A9BE1E2C27FB0023C4D5 /* GraphQLResult.swift */,
9FC9A9D21E2FD48B0023C4D5 /* GraphQLError.swift */,
9FCDFD281E33D0CE007519DC /* GraphQLQueryWatcher.swift */,
9BDE43D222C6658D00FD7C7F /* Protocols */,
9FC9A9CE1E2FD0CC0023C4D5 /* Network */,
9FC9A9CA1E2FD05C0023C4D5 /* Store */,
9F27D4601D40363A00715680 /* Execution */,
Expand Down Expand Up @@ -592,6 +608,9 @@
children = (
9F69FFA81D42855900E000B1 /* NetworkTransport.swift */,
9F4DAF2D1E48B84B00EBFF0B /* HTTPNetworkTransport.swift */,
5AC6CA4222AAF7B200B7C94D /* GraphQLHTTPMethod.swift */,
9BDE43DC22C6705300FD7C7F /* GraphQLHTTPResponseError.swift */,
9BDE43DE22C6708600FD7C7F /* GraphQLHTTPRequestError.swift */,
9FF90A5B1DDDEB100034C3B6 /* GraphQLResponse.swift */,
);
name = Network;
Expand Down Expand Up @@ -1064,6 +1083,7 @@
9F295E381E277B2A00A24949 /* GraphQLResultNormalizer.swift in Sources */,
9F86B68B1E6438D700B885FF /* GraphQLSelectionSetMapper.swift in Sources */,
9F55347B1DE1DB2100E54264 /* ApolloStore.swift in Sources */,
9BDE43D122C6655300FD7C7F /* Cancellable.swift in Sources */,
9F69FFA91D42855900E000B1 /* NetworkTransport.swift in Sources */,
9FCDFD291E33D0CE007519DC /* GraphQLQueryWatcher.swift in Sources */,
9FC2333D1E66BBF7001E4541 /* GraphQLDependencyTracker.swift in Sources */,
Expand All @@ -1073,6 +1093,7 @@
9FEB050D1DB5732300DA3B44 /* JSONSerializationFormat.swift in Sources */,
54DDB0921EA045870009DD99 /* InMemoryNormalizedCache.swift in Sources */,
9FC9A9C51E2D6CE70023C4D5 /* GraphQLSelectionSet.swift in Sources */,
9BDE43DD22C6705300FD7C7F /* GraphQLHTTPResponseError.swift in Sources */,
9FCDFD231E33A0D8007519DC /* AsynchronousOperation.swift in Sources */,
9FC9A9CC1E2FD0760023C4D5 /* Record.swift in Sources */,
9FC4B9201D2A6F8D0046A641 /* JSON.swift in Sources */,
Expand All @@ -1086,7 +1107,8 @@
9FA6F3681E65DF4700BF8D73 /* GraphQLResultAccumulator.swift in Sources */,
9FF90A651DDDEB100034C3B6 /* GraphQLExecutor.swift in Sources */,
9FC750611D2A59C300458D91 /* GraphQLOperation.swift in Sources */,
5AC6CA4322AAF7B200B7C94D /* FetchHTTPMethod.swift in Sources */,
9BDE43DF22C6708600FD7C7F /* GraphQLHTTPRequestError.swift in Sources */,
5AC6CA4322AAF7B200B7C94D /* GraphQLHTTPMethod.swift in Sources */,
9FE941D01E62C771007CDD89 /* Promise.swift in Sources */,
9FC750631D2A59F600458D91 /* ApolloClient.swift in Sources */,
9F86B6901E65533D00B885FF /* GraphQLResponseGenerator.swift in Sources */,
Expand Down
11 changes: 11 additions & 0 deletions Apollo.xcodeproj/xcshareddata/xcschemes/Apollo.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,18 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
codeCoverageEnabled = "YES"
onlyGenerateCoverageForSpecifiedTargets = "YES"
shouldUseLaunchSchemeArgsEnv = "NO">
<CodeCoverageTargets>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "9FC750431D2A532C00458D91"
BuildableName = "Apollo.framework"
BlueprintName = "Apollo"
ReferencedContainer = "container:Apollo.xcodeproj">
</BuildableReference>
</CodeCoverageTargets>
<Testables>
<TestableReference
skipped = "NO">
Expand Down
2 changes: 2 additions & 0 deletions ApolloSQLite.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,9 @@
9FA86C581EA7B6780073E1ED /* Frameworks */,
54DDB0BF1EA1523E0009DD99 /* Products */,
);
indentWidth = 2;
sourceTree = "<group>";
tabWidth = 2;
};
54DDB0BF1EA1523E0009DD99 /* Products */ = {
isa = PBXGroup;
Expand Down
11 changes: 11 additions & 0 deletions ApolloSQLite.xcodeproj/xcshareddata/xcschemes/ApolloSQLite.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,18 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
codeCoverageEnabled = "YES"
onlyGenerateCoverageForSpecifiedTargets = "YES"
shouldUseLaunchSchemeArgsEnv = "NO">
<CodeCoverageTargets>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "54DDB0BD1EA1523E0009DD99"
BuildableName = "ApolloSQLite.framework"
BlueprintName = "ApolloSQLite"
ReferencedContainer = "container:ApolloSQLite.xcodeproj">
</BuildableReference>
</CodeCoverageTargets>
<Testables>
<TestableReference
skipped = "NO">
Expand Down
2 changes: 2 additions & 0 deletions ApolloWebSocket.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@
720F147A206AB52F00D061DB /* Frameworks */,
720160CC206AB3D30052B2EE /* Products */,
);
indentWidth = 2;
sourceTree = "<group>";
tabWidth = 2;
};
720160CC206AB3D30052B2EE /* Products */ = {
isa = PBXGroup;
Expand Down
11 changes: 11 additions & 0 deletions ApolloWebSocket.xcodeproj/xcshareddata/xcschemes/ApolloWebSocket.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,18 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
codeCoverageEnabled = "YES"
onlyGenerateCoverageForSpecifiedTargets = "YES"
shouldUseLaunchSchemeArgsEnv = "NO">
<CodeCoverageTargets>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "720160CA206AB3D30052B2EE"
BuildableName = "ApolloWebSocket.framework"
BlueprintName = "ApolloWebSocket"
ReferencedContainer = "container:ApolloWebSocket.xcodeproj">
</BuildableReference>
</CodeCoverageTargets>
<Testables>
<TestableReference
skipped = "NO">
Expand Down
Loading
⚡