Skip to content

Commit 0d48bd8

Browse files
jradcliffjradcliff
authored
Changes for release v10. (#559)
- Add support for v10 - Remove support for v7 - Remove dependency on `io.netty:netty-tcnative-boringssl-static` (#557, #440) - Fix #174 to pass new login customer ID header after `GoogleAdsClient.toBuilder().setLoginCustomerId().build()` - Update examples using image asset and media bundle to include asset names - Add asset names to AddDisplayUploadAd and UploadImageAsset - Add call ads examples - Update `GetKeywords` example to demonstrate `omit_unselected_resource_names` usage
1 parent 2389631 commit 0d48bd8

7,834 files changed

Lines changed: 1343734 additions & 1124360 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.

‎google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/ApproveMerchantCenterLink.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919
import com.google.ads.googleads.examples.utils.CodeSampleParams;
2020
import com.google.ads.googleads.lib.GoogleAdsClient;
2121
import com.google.ads.googleads.lib.utils.FieldMasks;
22-
import com.google.ads.googleads.v9.enums.MerchantCenterLinkStatusEnum.MerchantCenterLinkStatus;
23-
import com.google.ads.googleads.v9.errors.GoogleAdsError;
24-
import com.google.ads.googleads.v9.errors.GoogleAdsException;
25-
import com.google.ads.googleads.v9.resources.MerchantCenterLink;
26-
import com.google.ads.googleads.v9.services.ListMerchantCenterLinksRequest;
27-
import com.google.ads.googleads.v9.services.ListMerchantCenterLinksResponse;
28-
import com.google.ads.googleads.v9.services.MerchantCenterLinkOperation;
29-
import com.google.ads.googleads.v9.services.MerchantCenterLinkServiceClient;
30-
import com.google.ads.googleads.v9.services.MutateMerchantCenterLinkResponse;
31-
import com.google.ads.googleads.v9.services.MutateMerchantCenterLinkResult;
22+
import com.google.ads.googleads.v10.enums.MerchantCenterLinkStatusEnum.MerchantCenterLinkStatus;
23+
import com.google.ads.googleads.v10.errors.GoogleAdsError;
24+
import com.google.ads.googleads.v10.errors.GoogleAdsException;
25+
import com.google.ads.googleads.v10.resources.MerchantCenterLink;
26+
import com.google.ads.googleads.v10.services.ListMerchantCenterLinksRequest;
27+
import com.google.ads.googleads.v10.services.ListMerchantCenterLinksResponse;
28+
import com.google.ads.googleads.v10.services.MerchantCenterLinkOperation;
29+
import com.google.ads.googleads.v10.services.MerchantCenterLinkServiceClient;
30+
import com.google.ads.googleads.v10.services.MutateMerchantCenterLinkResponse;
31+
import com.google.ads.googleads.v10.services.MutateMerchantCenterLinkResult;
3232
import java.io.FileNotFoundException;
3333
import java.io.IOException;
3434

‎google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/CreateCustomer.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
import com.google.ads.googleads.examples.utils.ArgumentNames;
1919
import com.google.ads.googleads.examples.utils.CodeSampleParams;
2020
import com.google.ads.googleads.lib.GoogleAdsClient;
21-
import com.google.ads.googleads.v9.errors.GoogleAdsError;
22-
import com.google.ads.googleads.v9.errors.GoogleAdsException;
23-
import com.google.ads.googleads.v9.resources.Customer;
24-
import com.google.ads.googleads.v9.services.CreateCustomerClientResponse;
25-
import com.google.ads.googleads.v9.services.CustomerServiceClient;
21+
import com.google.ads.googleads.v10.errors.GoogleAdsError;
22+
import com.google.ads.googleads.v10.errors.GoogleAdsException;
23+
import com.google.ads.googleads.v10.resources.Customer;
24+
import com.google.ads.googleads.v10.services.CreateCustomerClientResponse;
25+
import com.google.ads.googleads.v10.services.CustomerServiceClient;
2626
import java.io.FileNotFoundException;
2727
import java.io.IOException;
2828
import java.time.ZonedDateTime;

‎google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/GetAccountHierarchy.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818
import com.google.ads.googleads.examples.utils.ArgumentNames;
1919
import com.google.ads.googleads.examples.utils.CodeSampleParams;
2020
import com.google.ads.googleads.lib.GoogleAdsClient;
21-
import com.google.ads.googleads.v9.errors.GoogleAdsError;
22-
import com.google.ads.googleads.v9.errors.GoogleAdsException;
23-
import com.google.ads.googleads.v9.resources.CustomerClient;
24-
import com.google.ads.googleads.v9.resources.CustomerName;
25-
import com.google.ads.googleads.v9.services.CustomerServiceClient;
26-
import com.google.ads.googleads.v9.services.GoogleAdsRow;
27-
import com.google.ads.googleads.v9.services.GoogleAdsServiceClient;
28-
import com.google.ads.googleads.v9.services.GoogleAdsServiceClient.SearchPagedResponse;
29-
import com.google.ads.googleads.v9.services.ListAccessibleCustomersRequest;
30-
import com.google.ads.googleads.v9.services.ListAccessibleCustomersResponse;
31-
import com.google.ads.googleads.v9.services.SearchGoogleAdsRequest;
21+
import com.google.ads.googleads.v10.errors.GoogleAdsError;
22+
import com.google.ads.googleads.v10.errors.GoogleAdsException;
23+
import com.google.ads.googleads.v10.resources.CustomerClient;
24+
import com.google.ads.googleads.v10.resources.CustomerName;
25+
import com.google.ads.googleads.v10.services.CustomerServiceClient;
26+
import com.google.ads.googleads.v10.services.GoogleAdsRow;
27+
import com.google.ads.googleads.v10.services.GoogleAdsServiceClient;
28+
import com.google.ads.googleads.v10.services.GoogleAdsServiceClient.SearchPagedResponse;
29+
import com.google.ads.googleads.v10.services.ListAccessibleCustomersRequest;
30+
import com.google.ads.googleads.v10.services.ListAccessibleCustomersResponse;
31+
import com.google.ads.googleads.v10.services.SearchGoogleAdsRequest;
3232
import com.google.common.base.Strings;
3333
import com.google.common.collect.ArrayListMultimap;
3434
import com.google.common.collect.Multimap;

‎google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/GetAccountInformation.java‎

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
import com.google.ads.googleads.examples.utils.ArgumentNames;
1919
import com.google.ads.googleads.examples.utils.CodeSampleParams;
2020
import com.google.ads.googleads.lib.GoogleAdsClient;
21-
import com.google.ads.googleads.v9.errors.GoogleAdsError;
22-
import com.google.ads.googleads.v9.errors.GoogleAdsException;
23-
import com.google.ads.googleads.v9.resources.Customer;
24-
import com.google.ads.googleads.v9.services.CustomerServiceClient;
25-
import com.google.ads.googleads.v9.utils.ResourceNames;
21+
import com.google.ads.googleads.v10.errors.GoogleAdsError;
22+
import com.google.ads.googleads.v10.errors.GoogleAdsException;
23+
import com.google.ads.googleads.v10.resources.Customer;
24+
import com.google.ads.googleads.v10.services.GoogleAdsRow;
25+
import com.google.ads.googleads.v10.services.GoogleAdsServiceClient;
26+
import com.google.ads.googleads.v10.services.GoogleAdsServiceClient.SearchPagedResponse;
2627
import java.io.FileNotFoundException;
2728
import java.io.IOException;
2829

@@ -85,10 +86,26 @@ public static void main(String[] args) {
8586
* @throws GoogleAdsException if an API request failed with one or more service errors.
8687
*/
8788
private void runExample(GoogleAdsClient googleAdsClient, long customerId) {
88-
try (CustomerServiceClient customerServiceClient =
89-
googleAdsClient.getLatestVersion().createCustomerServiceClient()) {
90-
String customerResourceName = ResourceNames.customer(customerId);
91-
Customer customer = customerServiceClient.getCustomer(customerResourceName);
89+
try (GoogleAdsServiceClient googleAdsServiceClient =
90+
googleAdsClient.getLatestVersion().createGoogleAdsServiceClient()) {
91+
// Constructs a query to retrieve the customer.
92+
String query =
93+
"SELECT customer.id, "
94+
+ "customer.descriptive_name, "
95+
+ "customer.currency_code, "
96+
+ "customer.time_zone, "
97+
+ "customer.tracking_url_template, "
98+
+ "customer.auto_tagging_enabled "
99+
+ "FROM customer "
100+
// Limits to 1 to clarify that selecting from the customer resource
101+
// will always return only one row, which will be for the customer
102+
// ID specified in the request.
103+
+ "LIMIT 1";
104+
// Executes the query and gets the Customer object from the single row of the response.
105+
SearchPagedResponse response =
106+
googleAdsServiceClient.search(Long.toString(customerId), query);
107+
GoogleAdsRow googleAdsRow = response.iterateAll().iterator().next();
108+
Customer customer = googleAdsRow.getCustomer();
92109
// Prints account information.
93110
System.out.printf(
94111
"Customer with ID %d, descriptive name '%s', currency code '%s', timezone '%s', "

‎google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/GetChangeDetails.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
import com.google.ads.googleads.examples.utils.CodeSampleParams;
2020
import com.google.ads.googleads.lib.GoogleAdsClient;
2121
import com.google.ads.googleads.lib.utils.FieldMasks;
22-
import com.google.ads.googleads.v9.enums.ChangeEventResourceTypeEnum.ChangeEventResourceType;
23-
import com.google.ads.googleads.v9.enums.ResourceChangeOperationEnum.ResourceChangeOperation;
24-
import com.google.ads.googleads.v9.errors.GoogleAdsError;
25-
import com.google.ads.googleads.v9.errors.GoogleAdsException;
26-
import com.google.ads.googleads.v9.resources.ChangeEvent;
27-
import com.google.ads.googleads.v9.resources.ChangeEvent.ChangedResource;
28-
import com.google.ads.googleads.v9.services.GoogleAdsRow;
29-
import com.google.ads.googleads.v9.services.GoogleAdsServiceClient;
30-
import com.google.ads.googleads.v9.services.GoogleAdsServiceClient.SearchPagedResponse;
22+
import com.google.ads.googleads.v10.enums.ChangeEventResourceTypeEnum.ChangeEventResourceType;
23+
import com.google.ads.googleads.v10.enums.ResourceChangeOperationEnum.ResourceChangeOperation;
24+
import com.google.ads.googleads.v10.errors.GoogleAdsError;
25+
import com.google.ads.googleads.v10.errors.GoogleAdsException;
26+
import com.google.ads.googleads.v10.resources.ChangeEvent;
27+
import com.google.ads.googleads.v10.resources.ChangeEvent.ChangedResource;
28+
import com.google.ads.googleads.v10.services.GoogleAdsRow;
29+
import com.google.ads.googleads.v10.services.GoogleAdsServiceClient;
30+
import com.google.ads.googleads.v10.services.GoogleAdsServiceClient.SearchPagedResponse;
3131
import com.google.protobuf.Message;
3232
import java.io.FileNotFoundException;
3333
import java.io.IOException;

‎google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/GetChangeSummary.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
import com.google.ads.googleads.examples.utils.ArgumentNames;
1919
import com.google.ads.googleads.examples.utils.CodeSampleParams;
2020
import com.google.ads.googleads.lib.GoogleAdsClient;
21-
import com.google.ads.googleads.v9.errors.GoogleAdsError;
22-
import com.google.ads.googleads.v9.errors.GoogleAdsException;
23-
import com.google.ads.googleads.v9.resources.ChangeStatus;
24-
import com.google.ads.googleads.v9.services.GoogleAdsRow;
25-
import com.google.ads.googleads.v9.services.GoogleAdsServiceClient;
26-
import com.google.ads.googleads.v9.services.GoogleAdsServiceClient.SearchPagedResponse;
21+
import com.google.ads.googleads.v10.errors.GoogleAdsError;
22+
import com.google.ads.googleads.v10.errors.GoogleAdsException;
23+
import com.google.ads.googleads.v10.resources.ChangeStatus;
24+
import com.google.ads.googleads.v10.services.GoogleAdsRow;
25+
import com.google.ads.googleads.v10.services.GoogleAdsServiceClient;
26+
import com.google.ads.googleads.v10.services.GoogleAdsServiceClient.SearchPagedResponse;
2727
import java.io.FileNotFoundException;
2828
import java.io.IOException;
2929
import java.util.Optional;

‎google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/GetPendingInvitations.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
import com.google.ads.googleads.examples.utils.ArgumentNames;
1919
import com.google.ads.googleads.examples.utils.CodeSampleParams;
2020
import com.google.ads.googleads.lib.GoogleAdsClient;
21-
import com.google.ads.googleads.v9.errors.GoogleAdsError;
22-
import com.google.ads.googleads.v9.errors.GoogleAdsException;
23-
import com.google.ads.googleads.v9.services.GoogleAdsRow;
24-
import com.google.ads.googleads.v9.services.GoogleAdsServiceClient;
25-
import com.google.ads.googleads.v9.services.GoogleAdsServiceClient.SearchPagedResponse;
21+
import com.google.ads.googleads.v10.errors.GoogleAdsError;
22+
import com.google.ads.googleads.v10.errors.GoogleAdsException;
23+
import com.google.ads.googleads.v10.services.GoogleAdsRow;
24+
import com.google.ads.googleads.v10.services.GoogleAdsServiceClient;
25+
import com.google.ads.googleads.v10.services.GoogleAdsServiceClient.SearchPagedResponse;
2626
import java.io.FileNotFoundException;
2727
import java.io.IOException;
2828

‎google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/InviteUserWithAccessRole.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
import com.google.ads.googleads.examples.utils.ArgumentNames;
1919
import com.google.ads.googleads.examples.utils.CodeSampleParams;
2020
import com.google.ads.googleads.lib.GoogleAdsClient;
21-
import com.google.ads.googleads.v9.enums.AccessRoleEnum.AccessRole;
22-
import com.google.ads.googleads.v9.errors.GoogleAdsError;
23-
import com.google.ads.googleads.v9.errors.GoogleAdsException;
24-
import com.google.ads.googleads.v9.resources.CustomerUserAccessInvitation;
25-
import com.google.ads.googleads.v9.services.CustomerUserAccessInvitationOperation;
26-
import com.google.ads.googleads.v9.services.CustomerUserAccessInvitationServiceClient;
27-
import com.google.ads.googleads.v9.services.MutateCustomerUserAccessInvitationResponse;
21+
import com.google.ads.googleads.v10.enums.AccessRoleEnum.AccessRole;
22+
import com.google.ads.googleads.v10.errors.GoogleAdsError;
23+
import com.google.ads.googleads.v10.errors.GoogleAdsException;
24+
import com.google.ads.googleads.v10.resources.CustomerUserAccessInvitation;
25+
import com.google.ads.googleads.v10.services.CustomerUserAccessInvitationOperation;
26+
import com.google.ads.googleads.v10.services.CustomerUserAccessInvitationServiceClient;
27+
import com.google.ads.googleads.v10.services.MutateCustomerUserAccessInvitationResponse;
2828
import java.io.FileNotFoundException;
2929
import java.io.IOException;
3030

‎google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/LinkManagerToClient.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,19 @@
1919
import com.google.ads.googleads.examples.utils.CodeSampleParams;
2020
import com.google.ads.googleads.lib.GoogleAdsClient;
2121
import com.google.ads.googleads.lib.utils.FieldMasks;
22-
import com.google.ads.googleads.v9.enums.ManagerLinkStatusEnum.ManagerLinkStatus;
23-
import com.google.ads.googleads.v9.errors.GoogleAdsError;
24-
import com.google.ads.googleads.v9.errors.GoogleAdsException;
25-
import com.google.ads.googleads.v9.services.CustomerClientLinkOperation;
26-
import com.google.ads.googleads.v9.services.CustomerClientLinkServiceClient;
27-
import com.google.ads.googleads.v9.services.CustomerManagerLinkOperation;
28-
import com.google.ads.googleads.v9.services.CustomerManagerLinkServiceClient;
29-
import com.google.ads.googleads.v9.services.GoogleAdsRow;
30-
import com.google.ads.googleads.v9.services.GoogleAdsServiceClient;
31-
import com.google.ads.googleads.v9.services.GoogleAdsServiceClient.SearchPagedResponse;
32-
import com.google.ads.googleads.v9.services.MutateCustomerClientLinkResponse;
33-
import com.google.ads.googleads.v9.services.MutateCustomerManagerLinkResponse;
34-
import com.google.ads.googleads.v9.utils.ResourceNames;
22+
import com.google.ads.googleads.v10.enums.ManagerLinkStatusEnum.ManagerLinkStatus;
23+
import com.google.ads.googleads.v10.errors.GoogleAdsError;
24+
import com.google.ads.googleads.v10.errors.GoogleAdsException;
25+
import com.google.ads.googleads.v10.services.CustomerClientLinkOperation;
26+
import com.google.ads.googleads.v10.services.CustomerClientLinkServiceClient;
27+
import com.google.ads.googleads.v10.services.CustomerManagerLinkOperation;
28+
import com.google.ads.googleads.v10.services.CustomerManagerLinkServiceClient;
29+
import com.google.ads.googleads.v10.services.GoogleAdsRow;
30+
import com.google.ads.googleads.v10.services.GoogleAdsServiceClient;
31+
import com.google.ads.googleads.v10.services.GoogleAdsServiceClient.SearchPagedResponse;
32+
import com.google.ads.googleads.v10.services.MutateCustomerClientLinkResponse;
33+
import com.google.ads.googleads.v10.services.MutateCustomerManagerLinkResponse;
34+
import com.google.ads.googleads.v10.utils.ResourceNames;
3535
import java.io.FileNotFoundException;
3636
import java.io.IOException;
3737
import java.util.Arrays;

‎google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/ListAccessibleCustomers.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
package com.google.ads.googleads.examples.accountmanagement;
1616

1717
import com.google.ads.googleads.lib.GoogleAdsClient;
18-
import com.google.ads.googleads.v9.errors.GoogleAdsError;
19-
import com.google.ads.googleads.v9.errors.GoogleAdsException;
20-
import com.google.ads.googleads.v9.services.CustomerServiceClient;
21-
import com.google.ads.googleads.v9.services.ListAccessibleCustomersRequest;
22-
import com.google.ads.googleads.v9.services.ListAccessibleCustomersResponse;
18+
import com.google.ads.googleads.v10.errors.GoogleAdsError;
19+
import com.google.ads.googleads.v10.errors.GoogleAdsException;
20+
import com.google.ads.googleads.v10.services.CustomerServiceClient;
21+
import com.google.ads.googleads.v10.services.ListAccessibleCustomersRequest;
22+
import com.google.ads.googleads.v10.services.ListAccessibleCustomersResponse;
2323
import java.io.FileNotFoundException;
2424
import java.io.IOException;
2525

0 commit comments

Comments
 (0)