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

SPT 1998 Правки после попытки миграции (5) #135

Merged
merged 6 commits into from
May 24, 2024
Merged

SPT 1998 Правки после попытки миграции (5) #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
07df369
SNP-1238 add public init for cache writer node
NullIsOne May 3, 2024
df851cf
SNP-1238 make accessSafeNode generic
NullIsOne May 6, 2024
5362940
SNP-1238 add output to accessSafeNode test
NullIsOne May 7, 2024
4624c44
SNP-1238 remove outdated unit tests
NullIsOne May 7, 2024
8010db1
SNP-1238 fix xcode warning
NullIsOne May 7, 2024
09fdbc8
SNP-1238 combine ChainBuilderMock and ChainConfigBuilderMock
NullIsOne May 7, 2024
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 NodeKit/NodeKit/CacheNode/ETag/URLETagSaverNode.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import Foundation
/// Содержит указатель на UserDefaults-хранилище для eTag токенов.
extension UserDefaults {
/// Хранилище для eTag-токенов
static var etagStorage = UserDefaults(suiteName: "\(String(describing: self.self))")
static var etagStorage = UserDefaults(suiteName: "\(String(describing: UserDefaults.self))")
}

/// Этот узел сохраняет пришедшие eTag-токены.
Expand Down
2 changes: 2 additions & 0 deletions NodeKit/NodeKit/CacheNode/URLCacheWriterNode.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import Foundation
/// в которой не учитываются server-side политики и прочее.
/// Подразумечается, что этот узел не входит в цепочку, а является листом одного из узлов.
open class URLCacheWriterNode: AsyncNode {

public init() { }

/// Формирует `CachedURLResponse` с политикой `.allowed`, сохраняет его в кэш,
/// а затем возвращает сообщение об успешной операции.
Expand Down
10 changes: 5 additions & 5 deletions NodeKit/NodeKit/Layers/Utils/AccessSafe/AccessSafeNode.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ public enum AccessSafeNodeError: Error {
/// - SeeAlso:
/// - `TransportLayerNode`
/// - `TokenRefresherNode`
open class AccessSafeNode: AsyncNode {
open class AccessSafeNode<Output>: AsyncNode {

/// Следующий в цепочке узел.
public var next: any TransportLayerNode
public var next: any AsyncNode<TransportURLRequest, Output>

/// Цепочка для обновления токена.
/// Эта цепочкаа в самом начале должна выключать узел, который имплементирует заморозку запросов и их возобновление.
Expand All @@ -62,7 +62,7 @@ open class AccessSafeNode: AsyncNode {
/// - Parameters:
/// - next: Следующий в цепочке узел.
/// - updateTokenChain: Цепочка для обновления токена.
public init(next: some TransportLayerNode, updateTokenChain: some AsyncNode<Void, Void>) {
public init(next: some AsyncNode<TransportURLRequest, Output>, updateTokenChain: some AsyncNode<Void, Void>) {
self.next = next
self.updateTokenChain = updateTokenChain
}
Expand All @@ -72,7 +72,7 @@ open class AccessSafeNode: AsyncNode {
open func process(
_ data: TransportURLRequest,
logContext: LoggingContextProtocol
) async -> NodeResult<Json> {
) async -> NodeResult<Output> {
await .withCheckedCancellation {
await next.process(data, logContext: logContext)
}
Expand All @@ -91,7 +91,7 @@ open class AccessSafeNode: AsyncNode {
private func processWithTokenUpdate(
_ data: TransportURLRequest,
logContext: LoggingContextProtocol
) async -> NodeResult<Json> {
) async -> NodeResult<Output> {
await .withCheckedCancellation {
await updateTokenChain.process((), logContext: logContext)
.asyncFlatMap { await next.process(data, logContext: logContext) }
Expand Down
4 changes: 1 addition & 3 deletions NodeKit/NodeKitMock/Builder/ChainBuilderMock.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@

import Foundation

open class ChainBuilderMock<Route: URLRouteProvider>: ChainBuilder {

public init() { }
open class ChainBuilderMock<Route: URLRouteProvider>: ChainConfigBuilderMock, ChainBuilder {

public var invokedRoute = false
public var invokedRouteCount = 0
Expand Down
58 changes: 0 additions & 58 deletions ...t/NodeKitTests/IntegrationTests/Infrastructure/Nodes/CustomServerErrorProcessorNode.swift
View file
Open in desktop
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Эти старые тесты видимо потерялись просто при ребейзах.
Они исключены из pbxproj, но сами файлы остались и не компилировались.
Если открывать проект как package, то Xcode включал их в список тестов и пытался собрать. Безуспешно.

This file was deleted.

2 changes: 1 addition & 1 deletion NodeKit/NodeKitTests/UnitTests/Nodes/AccessSafeNodeTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ final class AccessSafeNodeTests: XCTestCase {

// MARK: - Sut

private var sut: AccessSafeNode!
private var sut: AccessSafeNode<Json>!

// MARK: - Lifecycle

Expand Down
60 changes: 0 additions & 60 deletions NodeKit/NodeKitTests/UnitTests/RequestBuildingLayer/RequestCreatorNodeTests.swift
View file
Open in desktop
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Та же история.
У этого теста точно есть дублер, который Андрей уже написал на новом NodeKit

This file was deleted.

Loading