Merge pull request #231 from kmcbride/maintenance

Misc maintenance
spotify · Mar 22, 2023 · faa89a8 · faa89a8
2 parents e967626 + ff97f24
commit faa89a8
Show file tree

Hide file tree

Showing 146 changed files with 334 additions and 337 deletions.
diff --git a/Framework/SPTDataLoader.h b/Framework/SPTDataLoader.h
@@ -1,5 +1,5 @@
 /*
- Copyright 2015-2022 Spotify AB
+ Copyright 2015-2023 Spotify AB
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

diff --git a/Sources/SPTDataLoader/NSDictionary+HeaderSize.h b/Sources/SPTDataLoader/NSDictionary+HeaderSize.h
@@ -1,5 +1,5 @@
 /*
- Copyright 2015-2022 Spotify AB
+ Copyright 2015-2023 Spotify AB
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

diff --git a/Sources/SPTDataLoader/NSDictionary+HeaderSize.m b/Sources/SPTDataLoader/NSDictionary+HeaderSize.m
@@ -1,5 +1,5 @@
 /*
- Copyright 2015-2022 Spotify AB
+ Copyright 2015-2023 Spotify AB
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -27,13 +27,13 @@ - (NSInteger)spt_byteSizeOfHeaders
         if (![key isKindOfClass:[NSString class]]) {
             continue;
         }
-        
+
         NSString *keyString = (NSString *)key;
         id object = self[keyString];
         if (![object isKindOfClass:[NSString class]]) {
             continue;
         }
-        
+
         NSString *objectString = (NSString *)object;
         headerSize += [keyString dataUsingEncoding:NSUTF8StringEncoding].length;
         headerSize += [@": \n" dataUsingEncoding:NSUTF8StringEncoding].length;

diff --git a/Sources/SPTDataLoader/SPTDataLoader.m b/Sources/SPTDataLoader/SPTDataLoader.m
@@ -1,5 +1,5 @@
 /*
- Copyright 2015-2022 Spotify AB
+ Copyright 2015-2023 Spotify AB
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -116,13 +116,13 @@ - (void)removeRequest:(SPTDataLoaderRequest *)request
     @synchronized(self.cancellationTokens) {
         [self.cancellationTokens addObject:cancellationToken];
     }
-    
+
     @synchronized(self.requests) {
         [self.requests addObject:copiedRequest];
     }
 
     [self.requestResponseHandlerDelegate requestResponseHandler:self performRequest:copiedRequest];
-    
+
     return cancellationToken;
 }
 
@@ -171,7 +171,7 @@ - (void)successfulResponse:(SPTDataLoaderResponse *)response
     if (![self isRequestExpected:response.request]) {
         return;
     }
-    
+
     [self executeDelegateBlock: ^{
         [self.delegate dataLoader:self didReceiveSuccessfulResponse:response];
     }];
@@ -215,7 +215,7 @@ - (void)receivedDataChunk:(NSData *)data forResponse:(SPTDataLoaderResponse *)re
 
     // Do not send a callback if the request doesn't support it
     NSAssert(response.request.chunks, @"The data loader is receiving a data chunk for a response that doesn't support data chunks");
-    
+
     BOOL didReceiveDataChunkSelectorExists = [self.delegate respondsToSelector:@selector(dataLoader:didReceiveDataChunk:forResponse:)];
     if (didReceiveDataChunkSelectorExists) {
         [self executeDelegateBlock: ^{
@@ -234,7 +234,7 @@ - (void)receivedInitialResponse:(SPTDataLoaderResponse *)response
     if (!response.request.chunks) {
         return;
     }
-    
+
     if ([self.delegate respondsToSelector:@selector(dataLoader:didReceiveInitialResponse:)]) {
         [self executeDelegateBlock: ^{
             [self.delegate dataLoader:self didReceiveInitialResponse:response];

diff --git a/Sources/SPTDataLoader/SPTDataLoaderBlockWrapper.m b/Sources/SPTDataLoader/SPTDataLoaderBlockWrapper.m
@@ -1,5 +1,5 @@
 /*
- Copyright 2015-2022 Spotify AB
+ Copyright 2015-2023 Spotify AB
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

diff --git a/Sources/SPTDataLoader/SPTDataLoaderCancellationTokenFactory.h b/Sources/SPTDataLoader/SPTDataLoaderCancellationTokenFactory.h
@@ -1,5 +1,5 @@
 /*
- Copyright 2015-2022 Spotify AB
+ Copyright 2015-2023 Spotify AB
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

diff --git a/Sources/SPTDataLoader/SPTDataLoaderCancellationTokenFactoryImplementation.h b/Sources/SPTDataLoader/SPTDataLoaderCancellationTokenFactoryImplementation.h
@@ -1,5 +1,5 @@
 /*
- Copyright 2015-2022 Spotify AB
+ Copyright 2015-2023 Spotify AB
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

diff --git a/Sources/SPTDataLoader/SPTDataLoaderCancellationTokenFactoryImplementation.m b/Sources/SPTDataLoader/SPTDataLoaderCancellationTokenFactoryImplementation.m
@@ -1,5 +1,5 @@
 /*
- Copyright 2015-2022 Spotify AB
+ Copyright 2015-2023 Spotify AB
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

diff --git a/Sources/SPTDataLoader/SPTDataLoaderCancellationTokenImplementation.h b/Sources/SPTDataLoader/SPTDataLoaderCancellationTokenImplementation.h
@@ -1,5 +1,5 @@
 /*
- Copyright 2015-2022 Spotify AB
+ Copyright 2015-2023 Spotify AB
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

diff --git a/Sources/SPTDataLoader/SPTDataLoaderCancellationTokenImplementation.m b/Sources/SPTDataLoader/SPTDataLoaderCancellationTokenImplementation.m
@@ -1,5 +1,5 @@
 /*
- Copyright 2015-2022 Spotify AB
+ Copyright 2015-2023 Spotify AB
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ - (instancetype)initWithDelegate:(id<SPTDataLoaderCancellationTokenDelegate>)del
         _delegate = delegate;
         _objectToCancel = cancelObject;
     }
-    
+
     return self;
 }
 
@@ -57,9 +57,9 @@ - (void)cancel
     if (self.cancelled) {
         return;
     }
-    
+
     [self.delegate cancellationTokenDidCancel:self];
-    
+
     self.cancelled = YES;
 }
 

diff --git a/Sources/SPTDataLoader/SPTDataLoaderExponentialTimer.m b/Sources/SPTDataLoader/SPTDataLoaderExponentialTimer.m
@@ -1,5 +1,5 @@
 /*
- Copyright 2015-2022 Spotify AB
+ Copyright 2015-2023 Spotify AB
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -88,22 +88,22 @@ - (void)reset
 - (NSTimeInterval)calculateNext
 {
     NSTimeInterval nextTime = self.timeInterval * self.growFactor;
-    
+
     if (nextTime > self.maxTime) {
         nextTime = self.maxTime;
     }
-    
+
     if (self.jitter < 0.0001) {
         self.timeInterval = nextTime;
     } else {
         const double sigma = self.jitter * nextTime;
         self.timeInterval = [self.class normalWithMu:nextTime sigma:sigma];
     }
-    
+
     if (self.timeInterval > self.maxTime) {
         self.timeInterval = self.maxTime;
     }
-    
+
     return self.timeInterval;
 }
 
@@ -119,7 +119,7 @@ - (NSTimeInterval)timeIntervalAndCalculateNext
 
 #define EXPT_MODULO ((u_int32_t)RAND_MAX)
 #define EXPT_MODULO_F64 ((double)(EXPT_MODULO))
-NS_INLINE double SPTExptRandom()
+NS_INLINE double SPTExptRandom(void)
 {
     // We need [0, 1) interval
     return arc4random_uniform(EXPT_MODULO);
@@ -140,12 +140,12 @@ + (NSTimeInterval)normalWithMu:(double)mu sigma:(double)sigma
         const double b = 1.0 - (SPTExptRandom() / EXPT_MODULO_F64);
         const double c = 1.7155277699214135 * (a - 0.5) / b;
         const double d = c * c / 4.0;
-        
+
         if (d <= -1.0 * log(b)) {
             return mu + c * sigma;
         }
     }
-    
+
     return mu + 2.0 * sigma * (SPTExptRandom() / EXPT_MODULO_F64);
 }
 

diff --git a/Sources/SPTDataLoader/SPTDataLoaderFactory+Private.h b/Sources/SPTDataLoader/SPTDataLoaderFactory+Private.h
@@ -1,5 +1,5 @@
 /*
- Copyright 2015-2022 Spotify AB
+ Copyright 2015-2023 Spotify AB
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

diff --git a/Sources/SPTDataLoader/SPTDataLoaderFactory.m b/Sources/SPTDataLoader/SPTDataLoaderFactory.m
@@ -1,5 +1,5 @@
 /*
- Copyright 2015-2022 Spotify AB
+ Copyright 2015-2023 Spotify AB
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@ - (instancetype)initWithRequestResponseHandlerDelegate:(nullable id<SPTDataLoade
             authoriser.delegate = self;
         }
     }
-    
+
     return self;
 }
 
@@ -108,7 +108,7 @@ - (void)failedResponse:(SPTDataLoaderResponse *)response
             return;
         }
     }
-    
+
     id<SPTDataLoaderRequestResponseHandler> requestResponseHandler = nil;
     @synchronized(self.requestToRequestResponseHandler) {
         requestResponseHandler = [self.requestToRequestResponseHandler objectForKey:response.request];
@@ -161,7 +161,7 @@ - (BOOL)shouldAuthoriseRequest:(SPTDataLoaderRequest *)request
             return YES;
         }
     }
-    
+
     return NO;
 }
 
@@ -192,11 +192,11 @@ - (void)requestResponseHandler:(id<SPTDataLoaderRequestResponseHandler>)requestR
     if (self.offline) {
         request.cachePolicy = NSURLRequestReturnCacheDataDontLoad;
     }
-    
+
     @synchronized(self.requestToRequestResponseHandler) {
         [self.requestToRequestResponseHandler setObject:requestResponseHandler forKey:request];
     }
-    
+
     // Add an absolute timeout for responses
     if (request.timeout > 0.0) {
         __weak __typeof(self) weakSelf = self;
@@ -215,7 +215,7 @@ - (void)requestResponseHandler:(id<SPTDataLoaderRequestResponseHandler>)requestR
                            [strongSelf failedResponse:response];
                        });
     }
-    
+
     [self.requestResponseHandlerDelegate requestResponseHandler:self performRequest:request];
 }
 

diff --git a/Sources/SPTDataLoader/SPTDataLoaderImplementation+Private.h b/Sources/SPTDataLoader/SPTDataLoaderImplementation+Private.h
@@ -1,5 +1,5 @@
 /*
- Copyright 2015-2022 Spotify AB
+ Copyright 2015-2023 Spotify AB
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

diff --git a/Sources/SPTDataLoader/SPTDataLoaderRateLimiter+Private.h b/Sources/SPTDataLoader/SPTDataLoaderRateLimiter+Private.h
@@ -1,5 +1,5 @@
 /*
- Copyright 2015-2022 Spotify AB
+ Copyright 2015-2023 Spotify AB
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -30,4 +30,3 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
diff --git a/Sources/SPTDataLoader/SPTDataLoaderRateLimiter.m b/Sources/SPTDataLoader/SPTDataLoaderRateLimiter.m
@@ -1,5 +1,5 @@
 /*
- Copyright 2015-2022 Spotify AB
+ Copyright 2015-2023 Spotify AB
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -55,14 +55,14 @@ - (instancetype)initWithDefaultRequestsPerSecond:(double)requestsPerSecond
         _serviceEndpointLastExecution = [NSMutableDictionary new];
         _serviceEndpointRetryAt = [NSMutableDictionary new];
     }
-    
+
     return self;
 }
 
 - (NSTimeInterval)earliestTimeUntilRequestCanBeExecuted:(SPTDataLoaderRequest *)request
 {
     NSString *serviceKey = [self serviceKeyFromURL:request.URL];
-    
+
     // First check if we are not accepting requests until a certain time (i.e. Retry-after header)
     CFAbsoluteTime currentTime = self.timeProvider.currentTime;
     CFAbsoluteTime retryAtTime = 0.0;
@@ -72,7 +72,7 @@ - (NSTimeInterval)earliestTimeUntilRequestCanBeExecuted:(SPTDataLoaderRequest *)
     if (currentTime < retryAtTime) {
         return retryAtTime - currentTime;
     }
-    
+
     // Next check that our rate limit is being respected
     double requestsPerSecond = [self requestsPerSecondForServiceKey:serviceKey];
     CFAbsoluteTime lastExecution = 0.0;
@@ -90,7 +90,7 @@ - (NSTimeInterval)earliestTimeUntilRequestCanBeExecuted:(SPTDataLoaderRequest *)
     if (timeInterval < 0.0) {
         timeInterval = 0.0;
     }
-    
+
     return timeInterval;
 }
 
@@ -100,7 +100,7 @@ - (void)executedRequest:(SPTDataLoaderRequest *)request
     if (!serviceKey) {
         return;
     }
-    
+
     @synchronized(self.serviceEndpointLastExecution) {
         self.serviceEndpointLastExecution[serviceKey] = @(self.timeProvider.currentTime);
     }
@@ -126,7 +126,7 @@ - (void)setRetryAfter:(NSTimeInterval)absoluteTime forURL:(NSURL *)URL
     if (!URL) {
         return;
     }
-    
+
     @synchronized(self.serviceEndpointRetryAt) {
         self.serviceEndpointRetryAt[[self serviceKeyFromURL:URL]] = @(absoluteTime);
     }

diff --git a/Sources/SPTDataLoader/SPTDataLoaderRequest+Private.h b/Sources/SPTDataLoader/SPTDataLoaderRequest+Private.h
@@ -1,5 +1,5 @@
 /*
- Copyright 2015-2022 Spotify AB
+ Copyright 2015-2023 Spotify AB
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.