Skip to content
This repository was archived by the owner on Dec 15, 2021. It is now read-only.

Commit 6ee5f48

Browse files
committed
Merge pull request #193 from thomasvl/session_fetcher_threadign
SessionFetcher threading and service updates
2 parents 1f626e9 + e1fca67 commit 6ee5f48

174 files changed

Lines changed: 714 additions & 325 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

GoogleAPIClient.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'GoogleAPIClient'
3-
s.version = '1.0.3'
3+
s.version = '1.0.4'
44
s.author = 'Google Inc.'
55
s.homepage = 'https://github.com/google/google-api-objectivec-client'
66
s.license = { :type => 'Apache', :file => 'LICENSE' }

Source/Objects/GTLService.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,11 @@ - (GTLUploadFetcherClass *)uploadFetcherWithRequest:(NSURLRequest *)request
711711

712712
NSString *slug = [uploadParams slug];
713713
if ([slug length] > 0) {
714+
#if GTL_USE_SESSION_FETCHER
715+
[fetcher setRequestValue:slug forHTTPHeaderField:@"Slug"];
716+
#else
714717
[[fetcher mutableRequest] setValue:slug forHTTPHeaderField:@"Slug"];
718+
#endif
715719
}
716720
return fetcher;
717721
}

Source/Services/AdExchangeBuyer/Generated/GTLAdExchangeBuyer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
#import "GTLAdExchangeBuyerDealServingMetadataDealPauseStatus.h"
4747
#import "GTLAdExchangeBuyerDealTerms.h"
4848
#import "GTLAdExchangeBuyerDealTermsGuaranteedFixedPriceTerms.h"
49+
#import "GTLAdExchangeBuyerDealTermsGuaranteedFixedPriceTermsBillingInfo.h"
4950
#import "GTLAdExchangeBuyerDealTermsNonGuaranteedAuctionTerms.h"
5051
#import "GTLAdExchangeBuyerDealTermsNonGuaranteedFixedPriceTerms.h"
5152
#import "GTLAdExchangeBuyerDeleteOrderDealsResponse.h"

Source/Services/AdExchangeBuyer/Generated/GTLAdExchangeBuyerCreative.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2015 Google Inc.
1+
/* Copyright (c) 2016 Google Inc.
22
*
33
* Licensed under the Apache License, Version 2.0 (the "License");
44
* you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
2828
// Documentation:
2929
// https://developers.google.com/ad-exchange/buyer-rest
3030
// Classes:
31-
// GTLAdExchangeBuyerCreative (0 custom class methods, 25 custom properties)
31+
// GTLAdExchangeBuyerCreative (0 custom class methods, 26 custom properties)
3232
// GTLAdExchangeBuyerCreativeCorrectionsItem (0 custom class methods, 2 custom properties)
3333
// GTLAdExchangeBuyerCreativeFilteringReasons (0 custom class methods, 2 custom properties)
3434
// GTLAdExchangeBuyerCreativeNativeAd (0 custom class methods, 12 custom properties)
@@ -69,6 +69,9 @@
6969
// Account id.
7070
@property (nonatomic, retain) NSNumber *accountId; // intValue
7171

72+
// The link to the Ad Preferences page. This is only supported for native ads.
73+
@property (nonatomic, copy) NSString *adChoicesDestinationUrl;
74+
7275
// Detected advertiser id, if any. Read-only. This field should not be set in
7376
// requests.
7477
@property (nonatomic, retain) NSArray *advertiserId; // of NSNumber (longLongValue)

Source/Services/AdExchangeBuyer/Generated/GTLAdExchangeBuyerCreative.m

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2015 Google Inc.
1+
/* Copyright (c) 2016 Google Inc.
22
*
33
* Licensed under the Apache License, Version 2.0 (the "License");
44
* you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
2828
// Documentation:
2929
// https://developers.google.com/ad-exchange/buyer-rest
3030
// Classes:
31-
// GTLAdExchangeBuyerCreative (0 custom class methods, 25 custom properties)
31+
// GTLAdExchangeBuyerCreative (0 custom class methods, 26 custom properties)
3232
// GTLAdExchangeBuyerCreativeCorrectionsItem (0 custom class methods, 2 custom properties)
3333
// GTLAdExchangeBuyerCreativeFilteringReasons (0 custom class methods, 2 custom properties)
3434
// GTLAdExchangeBuyerCreativeNativeAd (0 custom class methods, 12 custom properties)
@@ -48,12 +48,12 @@
4848
//
4949

5050
@implementation GTLAdExchangeBuyerCreative
51-
@dynamic accountId, advertiserId, advertiserName, agencyId, apiUploadTimestamp,
52-
attribute, buyerCreativeId, clickThroughUrl, corrections, dealsStatus,
53-
filteringReasons, height, HTMLSnippet, impressionTrackingUrl, kind,
54-
nativeAd, openAuctionStatus, productCategories, restrictedCategories,
55-
sensitiveCategories, servingRestrictions, vendorType, version,
56-
videoURL, width;
51+
@dynamic accountId, adChoicesDestinationUrl, advertiserId, advertiserName,
52+
agencyId, apiUploadTimestamp, attribute, buyerCreativeId,
53+
clickThroughUrl, corrections, dealsStatus, filteringReasons, height,
54+
HTMLSnippet, impressionTrackingUrl, kind, nativeAd, openAuctionStatus,
55+
productCategories, restrictedCategories, sensitiveCategories,
56+
servingRestrictions, vendorType, version, videoURL, width;
5757

5858
+ (NSDictionary *)arrayPropertyToClassMap {
5959
NSDictionary *map = @{

Source/Services/AdExchangeBuyer/Generated/GTLAdExchangeBuyerDealServingMetadataDealPauseStatus.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
// Documentation:
2929
// https://developers.google.com/ad-exchange/buyer-rest
3030
// Classes:
31-
// GTLAdExchangeBuyerDealServingMetadataDealPauseStatus (0 custom class methods, 2 custom properties)
31+
// GTLAdExchangeBuyerDealServingMetadataDealPauseStatus (0 custom class methods, 3 custom properties)
3232

3333
#if GTL_BUILT_AS_FRAMEWORK
3434
#import "GTL/GTLObject.h"
@@ -42,9 +42,14 @@
4242
//
4343

4444
// Tracks which parties (if any) have paused a deal. The deal is considered
45-
// paused if has_buyer_paused || has_seller_paused.
45+
// paused if has_buyer_paused || has_seller_paused. Each of the has_buyer_paused
46+
// or the has_seller_paused bits can be set independently.
4647

4748
@interface GTLAdExchangeBuyerDealServingMetadataDealPauseStatus : GTLObject
49+
50+
// If the deal is paused, records which party paused the deal first.
51+
@property (nonatomic, copy) NSString *firstPausedBy;
52+
4853
@property (nonatomic, retain) NSNumber *hasBuyerPaused; // boolValue
4954
@property (nonatomic, retain) NSNumber *hasSellerPaused; // boolValue
5055
@end

Source/Services/AdExchangeBuyer/Generated/GTLAdExchangeBuyerDealServingMetadataDealPauseStatus.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
// Documentation:
2929
// https://developers.google.com/ad-exchange/buyer-rest
3030
// Classes:
31-
// GTLAdExchangeBuyerDealServingMetadataDealPauseStatus (0 custom class methods, 2 custom properties)
31+
// GTLAdExchangeBuyerDealServingMetadataDealPauseStatus (0 custom class methods, 3 custom properties)
3232

3333
#import "GTLAdExchangeBuyerDealServingMetadataDealPauseStatus.h"
3434

@@ -38,5 +38,5 @@
3838
//
3939

4040
@implementation GTLAdExchangeBuyerDealServingMetadataDealPauseStatus
41-
@dynamic hasBuyerPaused, hasSellerPaused;
41+
@dynamic firstPausedBy, hasBuyerPaused, hasSellerPaused;
4242
@end

Source/Services/AdExchangeBuyer/Generated/GTLAdExchangeBuyerDealTermsGuaranteedFixedPriceTerms.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,15 @@
2828
// Documentation:
2929
// https://developers.google.com/ad-exchange/buyer-rest
3030
// Classes:
31-
// GTLAdExchangeBuyerDealTermsGuaranteedFixedPriceTerms (0 custom class methods, 3 custom properties)
31+
// GTLAdExchangeBuyerDealTermsGuaranteedFixedPriceTerms (0 custom class methods, 4 custom properties)
3232

3333
#if GTL_BUILT_AS_FRAMEWORK
3434
#import "GTL/GTLObject.h"
3535
#else
3636
#import "GTLObject.h"
3737
#endif
3838

39+
@class GTLAdExchangeBuyerDealTermsGuaranteedFixedPriceTermsBillingInfo;
3940
@class GTLAdExchangeBuyerPricePerBuyer;
4041

4142
// ----------------------------------------------------------------------------
@@ -45,6 +46,10 @@
4546

4647
@interface GTLAdExchangeBuyerDealTermsGuaranteedFixedPriceTerms : GTLObject
4748

49+
// External billing info for this Deal. This field is relevant when external
50+
// billing info such as price has a different currency code than DFP/AdX.
51+
@property (nonatomic, retain) GTLAdExchangeBuyerDealTermsGuaranteedFixedPriceTermsBillingInfo *billingInfo;
52+
4853
// Fixed price for the specified buyer.
4954
@property (nonatomic, retain) NSArray *fixedPrices; // of GTLAdExchangeBuyerPricePerBuyer
5055

Source/Services/AdExchangeBuyer/Generated/GTLAdExchangeBuyerDealTermsGuaranteedFixedPriceTerms.m

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2015 Google Inc.
1+
/* Copyright (c) 2016 Google Inc.
22
*
33
* Licensed under the Apache License, Version 2.0 (the "License");
44
* you may not use this file except in compliance with the License.
@@ -28,10 +28,11 @@
2828
// Documentation:
2929
// https://developers.google.com/ad-exchange/buyer-rest
3030
// Classes:
31-
// GTLAdExchangeBuyerDealTermsGuaranteedFixedPriceTerms (0 custom class methods, 3 custom properties)
31+
// GTLAdExchangeBuyerDealTermsGuaranteedFixedPriceTerms (0 custom class methods, 4 custom properties)
3232

3333
#import "GTLAdExchangeBuyerDealTermsGuaranteedFixedPriceTerms.h"
3434

35+
#import "GTLAdExchangeBuyerDealTermsGuaranteedFixedPriceTermsBillingInfo.h"
3536
#import "GTLAdExchangeBuyerPricePerBuyer.h"
3637

3738
// ----------------------------------------------------------------------------
@@ -40,7 +41,7 @@
4041
//
4142

4243
@implementation GTLAdExchangeBuyerDealTermsGuaranteedFixedPriceTerms
43-
@dynamic fixedPrices, guaranteedImpressions, guaranteedLooks;
44+
@dynamic billingInfo, fixedPrices, guaranteedImpressions, guaranteedLooks;
4445

4546
+ (NSDictionary *)arrayPropertyToClassMap {
4647
NSDictionary *map = @{

0 commit comments

Comments
 (0)