From 7c45d8e36692055e655e83e81f36cf93f84f1655 Mon Sep 17 00:00:00 2001 From: Rustam Gamidov <108531570+rustam-gamidov-here@users.noreply.github.com> Date: Fri, 8 Dec 2023 16:23:44 +0200 Subject: [PATCH] Add and apply ObjC clang-format configuration. (#1456) No functional changes. Relates-To: OLPEDGE-2849 Signed-off-by: Rustam Gamidov --- .clang-format | 5 ++++ .../src/http/ios/OLPHttpClient.mm | 17 +++++++------- olp-cpp-sdk-core/src/http/ios/OLPHttpTask.h | 4 +++- olp-cpp-sdk-core/src/http/ios/OLPHttpTask.mm | 21 ++++++++--------- olp-cpp-sdk-core/src/http/ios/OLPNetworkIOS.h | 3 +-- .../src/http/ios/OLPNetworkIOS.mm | 23 ++++++++++--------- 6 files changed, 40 insertions(+), 33 deletions(-) diff --git a/.clang-format b/.clang-format index e659e3084..6b01b8ae6 100644 --- a/.clang-format +++ b/.clang-format @@ -32,3 +32,8 @@ SpaceInEmptyParentheses: false SpacesInAngles: false SpacesInParentheses: false SpacesInSquareBrackets: false + +--- +Language: ObjC +BasedOnStyle: Google +ColumnLimit: 80 diff --git a/olp-cpp-sdk-core/src/http/ios/OLPHttpClient.mm b/olp-cpp-sdk-core/src/http/ios/OLPHttpClient.mm index 8576e20a8..7f04b366a 100644 --- a/olp-cpp-sdk-core/src/http/ios/OLPHttpClient.mm +++ b/olp-cpp-sdk-core/src/http/ios/OLPHttpClient.mm @@ -22,9 +22,9 @@ #import #import -#include "olp/core/logging/Log.h" #include "olp/core/http/Network.h" #include "olp/core/http/NetworkProxySettings.h" +#include "olp/core/logging/Log.h" #import "OLPHttpTask+Internal.h" @@ -389,15 +389,16 @@ - (NSURLSession*)urlSessionWithProxy: if (ProxyType::SOCKS4 == requestedProxyType || ProxyType::SOCKS5 == requestedProxyType || ProxyType::SOCKS5_HOSTNAME == requestedProxyType) { - proxyDict[(__bridge NSString*)kCFProxyTypeKey] = (__bridge NSString*)kCFProxyTypeSOCKS; + proxyDict[(__bridge NSString*)kCFProxyTypeKey] = + (__bridge NSString*)kCFProxyTypeSOCKS; } else if (ProxyType::HTTP == requestedProxyType) { - proxyDict[(__bridge NSString*)kCFNetworkProxiesHTTPEnable] = @(1); - proxyDict[(__bridge NSString*)kCFNetworkProxiesHTTPProxy] = proxyName; - proxyDict[(__bridge NSString*)kCFNetworkProxiesHTTPPort] = @(port); + proxyDict[(__bridge NSString*)kCFNetworkProxiesHTTPEnable] = @(1); + proxyDict[(__bridge NSString*)kCFNetworkProxiesHTTPProxy] = proxyName; + proxyDict[(__bridge NSString*)kCFNetworkProxiesHTTPPort] = @(port); } else if (ProxyType::HTTPS == requestedProxyType) { - proxyDict[@"HTTPSEnable"] = @(1); - proxyDict[@"HTTPSProxy"] = proxyName; - proxyDict[@"HTTPSPort"] = @(port); + proxyDict[@"HTTPSEnable"] = @(1); + proxyDict[@"HTTPSProxy"] = proxyName; + proxyDict[@"HTTPSPort"] = @(port); } proxyDict[(__bridge NSString*)kCFProxyHostNameKey] = proxyName; diff --git a/olp-cpp-sdk-core/src/http/ios/OLPHttpTask.h b/olp-cpp-sdk-core/src/http/ios/OLPHttpTask.h index 68e336cdd..763e8a0d7 100644 --- a/olp-cpp-sdk-core/src/http/ios/OLPHttpTask.h +++ b/olp-cpp-sdk-core/src/http/ios/OLPHttpTask.h @@ -38,7 +38,9 @@ typedef NS_ENUM(NSUInteger, OLPHttpTaskStatus) { typedef void (^OLPHttpTaskReponseHandler)(NSHTTPURLResponse* response); typedef void (^OLPHttpTaskDataHandler)(NSData* data); -typedef void (^OLPHttpTaskCompletionHandler)(NSError* error, uint64_t bytesDownloaded, uint64_t bytesUploadeds); +typedef void (^OLPHttpTaskCompletionHandler)(NSError* error, + uint64_t bytesDownloaded, + uint64_t bytesUploadeds); /** * @brief This class holds the response data from OLPHttpTask request. diff --git a/olp-cpp-sdk-core/src/http/ios/OLPHttpTask.mm b/olp-cpp-sdk-core/src/http/ios/OLPHttpTask.mm index 5dcb8c558..942f5b3f5 100644 --- a/olp-cpp-sdk-core/src/http/ios/OLPHttpTask.mm +++ b/olp-cpp-sdk-core/src/http/ios/OLPHttpTask.mm @@ -143,9 +143,8 @@ - (BOOL)cancel { - (void)didCompleteWithError:(NSError*)error { int status = 0; - if (self.responseData) - { - status = self.responseData.status; + if (self.responseData) { + status = self.responseData.status; } OLP_SDK_LOG_DEBUG_F(kLogTag, @@ -163,9 +162,11 @@ - (void)didCompleteWithError:(NSError*)error { } if (completionHandler) { - completionHandler(error, - _headersSizeReceived + (_contentLength ? _contentLength : _dataTask.countOfBytesReceived), - _headersSizeSent + _dataTask.countOfBytesSent); + completionHandler( + error, + _headersSizeReceived + + (_contentLength ? _contentLength : _dataTask.countOfBytesReceived), + _headersSizeSent + _dataTask.countOfBytesSent); } @synchronized(self) { @@ -192,11 +193,9 @@ - (void)didReceiveResponse:(NSURLResponse*)response { if (responseHandler) { auto headers = ((NSHTTPURLResponse*)response).allHeaderFields; - for (NSString* key in headers) - { + for (NSString* key in headers) { NSString* value = headers[key]; - if ([key isEqualToString:@"Content-Length"]) - { + if ([key isEqualToString:@"Content-Length"]) { auto longLongValue = [value longLongValue]; _contentLength = longLongValue < 0 ? 0 : longLongValue; } @@ -227,7 +226,7 @@ - (void)didReceiveData:(NSData*)data { } } -- (NSString*) createTaskDescription { +- (NSString*)createTaskDescription { return [NSString stringWithFormat:@"%llu", self.requestId]; } diff --git a/olp-cpp-sdk-core/src/http/ios/OLPNetworkIOS.h b/olp-cpp-sdk-core/src/http/ios/OLPNetworkIOS.h index f5ae5feed..a72b75573 100644 --- a/olp-cpp-sdk-core/src/http/ios/OLPNetworkIOS.h +++ b/olp-cpp-sdk-core/src/http/ios/OLPNetworkIOS.h @@ -42,8 +42,7 @@ class OLPNetworkIOS : public olp::http::Network { ~OLPNetworkIOS(); olp::http::SendOutcome Send( - olp::http::NetworkRequest request, - std::shared_ptr payload, + olp::http::NetworkRequest request, std::shared_ptr payload, olp::http::Network::Callback callback, olp::http::Network::HeaderCallback header_callback = nullptr, olp::http::Network::DataCallback data_callback = nullptr) override; diff --git a/olp-cpp-sdk-core/src/http/ios/OLPNetworkIOS.mm b/olp-cpp-sdk-core/src/http/ios/OLPNetworkIOS.mm index eb89b76c8..a29e710b9 100644 --- a/olp-cpp-sdk-core/src/http/ios/OLPNetworkIOS.mm +++ b/olp-cpp-sdk-core/src/http/ios/OLPNetworkIOS.mm @@ -21,10 +21,10 @@ #import -#include "olp/core/logging/Log.h" #include "olp/core/http/Network.h" #include "olp/core/http/NetworkTypes.h" #include "olp/core/http/NetworkUtils.h" +#include "olp/core/logging/Log.h" #import "OLPHttpClient+Internal.h" #import "OLPHttpTask.h" @@ -145,8 +145,8 @@ OLP_SDK_LOG_WARNING_F(kLogTag, "Send failed - reached max requests " "count=%lu/%lu, url=%s", - http_client_.activeTasks.count, max_requests_count_, - request.GetUrl().c_str()); + http_client_.activeTasks.count, + max_requests_count_, request.GetUrl().c_str()); return SendOutcome(ErrorCode::NETWORK_OVERLOAD_ERROR); } @@ -165,8 +165,10 @@ // Setup task request data: const NetworkSettings& settings = request.GetSettings(); - const auto connectionTimeoutSeconds = std::chrono::duration_cast( - settings.GetConnectionTimeoutDuration()).count(); + const auto connectionTimeoutSeconds = + std::chrono::duration_cast( + settings.GetConnectionTimeoutDuration()) + .count(); task.url = url; task.connectionTimeout = static_cast(connectionTimeoutSeconds); @@ -252,10 +254,9 @@ if (payload->tellp() != std::streampos(response_data.count)) { payload->seekp(response_data.count); if (payload->fail()) { - OLP_SDK_LOG_WARNING_F(kLogTag, - "Payload seekp() failed, request_id=%llu, url=%s", - strong_task.requestId, - [strong_task.url UTF8String]); + OLP_SDK_LOG_WARNING_F( + kLogTag, "Payload seekp() failed, request_id=%llu, url=%s", + strong_task.requestId, [strong_task.url UTF8String]); payload->clear(); } } @@ -267,7 +268,8 @@ }; // setup handler for NSURLSessionDataTask::didCompleteWithError callback - task.completionHandler = ^(NSError* error, uint64_t bytesDownloaded, uint64_t bytesUploaded) { + task.completionHandler = ^(NSError* error, uint64_t bytesDownloaded, + uint64_t bytesUploaded) { if (!weak_task) { OLP_SDK_LOG_WARNING_F( kLogTag, @@ -312,7 +314,6 @@ .WithBytesDownloaded(bytesDownloaded) .WithBytesUploaded(bytesUploaded)); } - }; // Perform send request asycnrhonously in a NSURLSession's thread