Skip to content

Commit 7c45d8e

Browse files
Add and apply ObjC clang-format configuration. (#1456)
No functional changes. Relates-To: OLPEDGE-2849 Signed-off-by: Rustam Gamidov <ext-rustam.gamidov@here.com>
1 parent a06b5b1 commit 7c45d8e

File tree

6 files changed

+40
-33
lines changed

6 files changed

+40
-33
lines changed

.clang-format

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,8 @@ SpaceInEmptyParentheses: false
3232
SpacesInAngles: false
3333
SpacesInParentheses: false
3434
SpacesInSquareBrackets: false
35+
36+
---
37+
Language: ObjC
38+
BasedOnStyle: Google
39+
ColumnLimit: 80

olp-cpp-sdk-core/src/http/ios/OLPHttpClient.mm

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
#import <CommonCrypto/CommonDigest.h>
2323
#import <Security/Security.h>
2424

25-
#include "olp/core/logging/Log.h"
2625
#include "olp/core/http/Network.h"
2726
#include "olp/core/http/NetworkProxySettings.h"
27+
#include "olp/core/logging/Log.h"
2828

2929
#import "OLPHttpTask+Internal.h"
3030

@@ -389,15 +389,16 @@ - (NSURLSession*)urlSessionWithProxy:
389389
if (ProxyType::SOCKS4 == requestedProxyType ||
390390
ProxyType::SOCKS5 == requestedProxyType ||
391391
ProxyType::SOCKS5_HOSTNAME == requestedProxyType) {
392-
proxyDict[(__bridge NSString*)kCFProxyTypeKey] = (__bridge NSString*)kCFProxyTypeSOCKS;
392+
proxyDict[(__bridge NSString*)kCFProxyTypeKey] =
393+
(__bridge NSString*)kCFProxyTypeSOCKS;
393394
} else if (ProxyType::HTTP == requestedProxyType) {
394-
proxyDict[(__bridge NSString*)kCFNetworkProxiesHTTPEnable] = @(1);
395-
proxyDict[(__bridge NSString*)kCFNetworkProxiesHTTPProxy] = proxyName;
396-
proxyDict[(__bridge NSString*)kCFNetworkProxiesHTTPPort] = @(port);
395+
proxyDict[(__bridge NSString*)kCFNetworkProxiesHTTPEnable] = @(1);
396+
proxyDict[(__bridge NSString*)kCFNetworkProxiesHTTPProxy] = proxyName;
397+
proxyDict[(__bridge NSString*)kCFNetworkProxiesHTTPPort] = @(port);
397398
} else if (ProxyType::HTTPS == requestedProxyType) {
398-
proxyDict[@"HTTPSEnable"] = @(1);
399-
proxyDict[@"HTTPSProxy"] = proxyName;
400-
proxyDict[@"HTTPSPort"] = @(port);
399+
proxyDict[@"HTTPSEnable"] = @(1);
400+
proxyDict[@"HTTPSProxy"] = proxyName;
401+
proxyDict[@"HTTPSPort"] = @(port);
401402
}
402403

403404
proxyDict[(__bridge NSString*)kCFProxyHostNameKey] = proxyName;

olp-cpp-sdk-core/src/http/ios/OLPHttpTask.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ typedef NS_ENUM(NSUInteger, OLPHttpTaskStatus) {
3838

3939
typedef void (^OLPHttpTaskReponseHandler)(NSHTTPURLResponse* response);
4040
typedef void (^OLPHttpTaskDataHandler)(NSData* data);
41-
typedef void (^OLPHttpTaskCompletionHandler)(NSError* error, uint64_t bytesDownloaded, uint64_t bytesUploadeds);
41+
typedef void (^OLPHttpTaskCompletionHandler)(NSError* error,
42+
uint64_t bytesDownloaded,
43+
uint64_t bytesUploadeds);
4244

4345
/**
4446
* @brief This class holds the response data from OLPHttpTask request.

olp-cpp-sdk-core/src/http/ios/OLPHttpTask.mm

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,8 @@ - (BOOL)cancel {
143143

144144
- (void)didCompleteWithError:(NSError*)error {
145145
int status = 0;
146-
if (self.responseData)
147-
{
148-
status = self.responseData.status;
146+
if (self.responseData) {
147+
status = self.responseData.status;
149148
}
150149

151150
OLP_SDK_LOG_DEBUG_F(kLogTag,
@@ -163,9 +162,11 @@ - (void)didCompleteWithError:(NSError*)error {
163162
}
164163

165164
if (completionHandler) {
166-
completionHandler(error,
167-
_headersSizeReceived + (_contentLength ? _contentLength : _dataTask.countOfBytesReceived),
168-
_headersSizeSent + _dataTask.countOfBytesSent);
165+
completionHandler(
166+
error,
167+
_headersSizeReceived +
168+
(_contentLength ? _contentLength : _dataTask.countOfBytesReceived),
169+
_headersSizeSent + _dataTask.countOfBytesSent);
169170
}
170171

171172
@synchronized(self) {
@@ -192,11 +193,9 @@ - (void)didReceiveResponse:(NSURLResponse*)response {
192193

193194
if (responseHandler) {
194195
auto headers = ((NSHTTPURLResponse*)response).allHeaderFields;
195-
for (NSString* key in headers)
196-
{
196+
for (NSString* key in headers) {
197197
NSString* value = headers[key];
198-
if ([key isEqualToString:@"Content-Length"])
199-
{
198+
if ([key isEqualToString:@"Content-Length"]) {
200199
auto longLongValue = [value longLongValue];
201200
_contentLength = longLongValue < 0 ? 0 : longLongValue;
202201
}
@@ -227,7 +226,7 @@ - (void)didReceiveData:(NSData*)data {
227226
}
228227
}
229228

230-
- (NSString*) createTaskDescription {
229+
- (NSString*)createTaskDescription {
231230
return [NSString stringWithFormat:@"%llu", self.requestId];
232231
}
233232

olp-cpp-sdk-core/src/http/ios/OLPNetworkIOS.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ class OLPNetworkIOS : public olp::http::Network {
4242
~OLPNetworkIOS();
4343

4444
olp::http::SendOutcome Send(
45-
olp::http::NetworkRequest request,
46-
std::shared_ptr<std::ostream> payload,
45+
olp::http::NetworkRequest request, std::shared_ptr<std::ostream> payload,
4746
olp::http::Network::Callback callback,
4847
olp::http::Network::HeaderCallback header_callback = nullptr,
4948
olp::http::Network::DataCallback data_callback = nullptr) override;

olp-cpp-sdk-core/src/http/ios/OLPNetworkIOS.mm

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121

2222
#import <Foundation/Foundation.h>
2323

24-
#include "olp/core/logging/Log.h"
2524
#include "olp/core/http/Network.h"
2625
#include "olp/core/http/NetworkTypes.h"
2726
#include "olp/core/http/NetworkUtils.h"
27+
#include "olp/core/logging/Log.h"
2828

2929
#import "OLPHttpClient+Internal.h"
3030
#import "OLPHttpTask.h"
@@ -145,8 +145,8 @@
145145
OLP_SDK_LOG_WARNING_F(kLogTag,
146146
"Send failed - reached max requests "
147147
"count=%lu/%lu, url=%s",
148-
http_client_.activeTasks.count, max_requests_count_,
149-
request.GetUrl().c_str());
148+
http_client_.activeTasks.count,
149+
max_requests_count_, request.GetUrl().c_str());
150150
return SendOutcome(ErrorCode::NETWORK_OVERLOAD_ERROR);
151151
}
152152

@@ -165,8 +165,10 @@
165165
// Setup task request data:
166166
const NetworkSettings& settings = request.GetSettings();
167167

168-
const auto connectionTimeoutSeconds = std::chrono::duration_cast<std::chrono::seconds>(
169-
settings.GetConnectionTimeoutDuration()).count();
168+
const auto connectionTimeoutSeconds =
169+
std::chrono::duration_cast<std::chrono::seconds>(
170+
settings.GetConnectionTimeoutDuration())
171+
.count();
170172

171173
task.url = url;
172174
task.connectionTimeout = static_cast<int>(connectionTimeoutSeconds);
@@ -252,10 +254,9 @@
252254
if (payload->tellp() != std::streampos(response_data.count)) {
253255
payload->seekp(response_data.count);
254256
if (payload->fail()) {
255-
OLP_SDK_LOG_WARNING_F(kLogTag,
256-
"Payload seekp() failed, request_id=%llu, url=%s",
257-
strong_task.requestId,
258-
[strong_task.url UTF8String]);
257+
OLP_SDK_LOG_WARNING_F(
258+
kLogTag, "Payload seekp() failed, request_id=%llu, url=%s",
259+
strong_task.requestId, [strong_task.url UTF8String]);
259260
payload->clear();
260261
}
261262
}
@@ -267,7 +268,8 @@
267268
};
268269

269270
// setup handler for NSURLSessionDataTask::didCompleteWithError callback
270-
task.completionHandler = ^(NSError* error, uint64_t bytesDownloaded, uint64_t bytesUploaded) {
271+
task.completionHandler = ^(NSError* error, uint64_t bytesDownloaded,
272+
uint64_t bytesUploaded) {
271273
if (!weak_task) {
272274
OLP_SDK_LOG_WARNING_F(
273275
kLogTag,
@@ -312,7 +314,6 @@
312314
.WithBytesDownloaded(bytesDownloaded)
313315
.WithBytesUploaded(bytesUploaded));
314316
}
315-
316317
};
317318

318319
// Perform send request asycnrhonously in a NSURLSession's thread

0 commit comments

Comments
 (0)