From 6e0d00bf3606a0f31f7d754515bb86431fd2d216 Mon Sep 17 00:00:00 2001 From: Nick Birnie Date: Wed, 31 Mar 2021 10:55:45 +0100 Subject: [PATCH 1/4] Remove hasPartnersBadge() --- .../googleads/examples/accountmanagement/CreateCustomer.java | 1 - .../ads/googleads/examples/basicoperations/AddCampaigns.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/CreateCustomer.java b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/CreateCustomer.java index e362853f4f..de376a72b4 100644 --- a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/CreateCustomer.java +++ b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/accountmanagement/CreateCustomer.java @@ -96,7 +96,6 @@ private void runExample(GoogleAdsClient googleAdsClient, Long managerId) { // Optional: Sets additional attributes of the customer. .setTrackingUrlTemplate("{lpurl}?device={device}") .setFinalUrlSuffix("keyword={keyword}&matchtype={matchtype}&adgroupid={adgroupid}") - .setHasPartnersBadge(false) .build(); // Sends the request to create the customer. diff --git a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/basicoperations/AddCampaigns.java b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/basicoperations/AddCampaigns.java index 5a029de174..6010edcc85 100644 --- a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/basicoperations/AddCampaigns.java +++ b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/basicoperations/AddCampaigns.java @@ -106,7 +106,7 @@ public static void main(String[] args) { private static String addCampaignBudget(GoogleAdsClient googleAdsClient, long customerId) { CampaignBudget budget = CampaignBudget.newBuilder() - .setName("Interplanetary Cruise Budget #" + getPrintableDateTime()) + .setName("Interplanetary Cruise Budget #" ) .setDeliveryMethod(BudgetDeliveryMethod.STANDARD) .setAmountMicros(500_000) .build(); From 2f81266a0fffd748e47e75e098ae4b3b07ac1e76 Mon Sep 17 00:00:00 2001 From: Nick Birnie Date: Wed, 31 Mar 2021 11:02:51 +0100 Subject: [PATCH 2/4] Replace references to AdWords API docs --- .../examples/extensions/AddAffiliateLocationExtensions.java | 2 +- .../ads/googleads/examples/extensions/AddGeoTarget.java | 2 +- .../ads/googleads/examples/extensions/AddSitelinks.java | 2 +- .../googleads/examples/hotelads/AddHotelListingGroupTree.java | 2 +- .../ads/googleads/examples/planning/AddKeywordPlan.java | 4 ++-- .../google/ads/googleads/examples/planning/ForecastReach.java | 2 +- .../ads/googleads/examples/planning/GenerateKeywordIdeas.java | 2 +- .../examples/targeting/AddCampaignTargetingCriteria.java | 2 +- .../examples/targeting/GetGeoTargetConstantsByNames.java | 2 +- .../targeting/SearchForLanguageAndCarrierConstants.java | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/extensions/AddAffiliateLocationExtensions.java b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/extensions/AddAffiliateLocationExtensions.java index fe5f85febc..4d091cfeb0 100644 --- a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/extensions/AddAffiliateLocationExtensions.java +++ b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/extensions/AddAffiliateLocationExtensions.java @@ -75,7 +75,7 @@ private static class AddAffiliateLocationExtensionsParams extends CodeSamplePara names = ArgumentNames.CHAIN_ID, description = "The retail chain ID. See" - + " https://developers.google.com/adwords/api/docs/appendix/codes-formats#chain-idsfor" + + " https://developers.google.com/google-ads/api/reference/data/codes-formats#chain-ids" + " a complete list of valid retail chain IDs", required = true) private long chainId; diff --git a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/extensions/AddGeoTarget.java b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/extensions/AddGeoTarget.java index 25f8887394..21e9e60bd1 100644 --- a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/extensions/AddGeoTarget.java +++ b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/extensions/AddGeoTarget.java @@ -34,7 +34,7 @@ public class AddGeoTarget { // A list of country codes can be referenced here: - // https://developers.google.com/adwords/api/docs/appendix/geotargeting + // https://developers.google.com/google-ads/api/reference/data/geotargets private static long GEO_TARGET_CONSTANT_ID = 2840L; // US private static class AddGeoTargetParams extends CodeSampleParams { diff --git a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/extensions/AddSitelinks.java b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/extensions/AddSitelinks.java index 39f65d033e..69da1de139 100644 --- a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/extensions/AddSitelinks.java +++ b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/extensions/AddSitelinks.java @@ -183,7 +183,7 @@ private static List createExtensionFeedItems( // Targets this sitelink for United States only. // A list of country codes can be referenced here: - // https://developers.google.com/adwords/api/docs/appendix/geotargeting + // https://developers.google.com/google-ads/api/reference/data/geotargets String unitedStates = ResourceNames.geoTargetConstant(2840); ExtensionFeedItem extensionFeedItem2 = diff --git a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/hotelads/AddHotelListingGroupTree.java b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/hotelads/AddHotelListingGroupTree.java index d51a5f1e80..c0b9c30cb5 100644 --- a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/hotelads/AddHotelListingGroupTree.java +++ b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/hotelads/AddHotelListingGroupTree.java @@ -283,7 +283,7 @@ private static void addLevel2Nodes( List operations, long percentCpcBidMicroAmount) { // The criterion ID for Japan is 2392. - // See https://developers.google.com/adwords/api/docs/appendix/geotargeting for criteria ID + // See https://developers.google.com/google-ads/api/reference/data/geotargets for criteria ID // of other countries. long japanGeoTargetConstantId = 2392; ListingDimensionInfo japanDimensionInfo = diff --git a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/planning/AddKeywordPlan.java b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/planning/AddKeywordPlan.java index bf0d3a8e37..5d2c77d502 100644 --- a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/planning/AddKeywordPlan.java +++ b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/planning/AddKeywordPlan.java @@ -171,7 +171,7 @@ private static String createKeywordPlanCampaign( .setKeywordPlanNetwork(KeywordPlanNetwork.GOOGLE_SEARCH) .setKeywordPlan(keywordPlanResource); - // See https://developers.google.com/adwords/api/docs/appendix/geotargeting + // See https://developers.google.com/google-ads/api/reference/data/geotargets // for the list of geo target IDs. campaign.addGeoTargets( KeywordPlanGeoTarget.newBuilder() @@ -179,7 +179,7 @@ private static String createKeywordPlanCampaign( .setGeoTargetConstant(ResourceNames.geoTargetConstant(2840)) .build()); - // See https://developers.google.com/adwords/api/docs/appendix/codes-formats#languages + // See https://developers.google.com/google-ads/api/reference/data/codes-formats#languages // for the list of language criteria IDs. // // Language criteria 1000 is for English. diff --git a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/planning/ForecastReach.java b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/planning/ForecastReach.java index 6bed1a6ddf..f7ca78c213 100644 --- a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/planning/ForecastReach.java +++ b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/planning/ForecastReach.java @@ -257,7 +257,7 @@ private void getReachCurve( * @param reachPlanServiceClient instance of Reach Plan Service client. * @param customerId the customer ID for the reach forecast. * @param locationId location ID to plan for. To find a valid location ID, either see - * https://developers.google.com/adwords/api/docs/appendix/geotargeting or call + * https://developers.google.com/google-ads/api/reference/data/geotargets or call * ReachPlanServiceClient.listPlannableLocations(). * @param currencyCode three-character ISO 4217 currency code. * @param budgetMicros budget in currency to plan for. diff --git a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/planning/GenerateKeywordIdeas.java b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/planning/GenerateKeywordIdeas.java index c9df4393c2..36f73b409b 100644 --- a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/planning/GenerateKeywordIdeas.java +++ b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/planning/GenerateKeywordIdeas.java @@ -47,7 +47,7 @@ private static class GenerateKeywordIdeasParams extends CodeSampleParams { description = "Location criteria IDs. For example, specify 21167 for New York. For more information" + " on determining this value, see: " - + " https://developers.google.com/adwords/api/docs/appendix/geotargeting.") + + " https://developers.google.com/google-ads/api/reference/data/geotargets.") private List locationIds; @Parameter( diff --git a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/targeting/AddCampaignTargetingCriteria.java b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/targeting/AddCampaignTargetingCriteria.java index fdaf92e0b2..737381ff8b 100644 --- a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/targeting/AddCampaignTargetingCriteria.java +++ b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/targeting/AddCampaignTargetingCriteria.java @@ -60,7 +60,7 @@ private static class AddCampaignTargetingCriteriaParams extends CodeSampleParams description = "A location criterion ID. For example, specify 21167 for New York. For more information" + " on determining this value, see: " - + " https://developers.google.com/adwords/api/docs/appendix/geotargeting.") + + " https://developers.google.com/google-ads/api/reference/data/geotargets.") private Long locationId; } diff --git a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/targeting/GetGeoTargetConstantsByNames.java b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/targeting/GetGeoTargetConstantsByNames.java index 2154060224..53e2be958f 100644 --- a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/targeting/GetGeoTargetConstantsByNames.java +++ b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/targeting/GetGeoTargetConstantsByNames.java @@ -77,7 +77,7 @@ private void runExample(GoogleAdsClient googleAdsClient) { requestBuilder.setLocale("en"); // A list of country codes can be referenced here: - // https://developers.google.com/adwords/api/docs/appendix/geotargeting + // https://developers.google.com/google-ads/api/reference/data/geotargets requestBuilder.setCountryCode("FR"); requestBuilder diff --git a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/targeting/SearchForLanguageAndCarrierConstants.java b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/targeting/SearchForLanguageAndCarrierConstants.java index 787210d8d7..086294b9a6 100644 --- a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/targeting/SearchForLanguageAndCarrierConstants.java +++ b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/targeting/SearchForLanguageAndCarrierConstants.java @@ -53,7 +53,7 @@ private static class SearchForLanguageAndCarrierConstantsParams extends CodeSamp description = "Country code for carrier constant filtering. A list of country codes can be" + " referenced here:" - + " https://developers.google.com/adwords/api/docs/appendix/geotargeting.") + + " https://developers.google.com/google-ads/api/reference/data/geotargets.") private String countryCode = "US"; } From 00c5e8a55b6086c5e7fdc3f24d4d3cff49e64da3 Mon Sep 17 00:00:00 2001 From: Nick Birnie Date: Wed, 31 Mar 2021 11:07:02 +0100 Subject: [PATCH 3/4] Remove domain name and language code from DSA example --- .../advancedoperations/AddDynamicPageFeed.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/advancedoperations/AddDynamicPageFeed.java b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/advancedoperations/AddDynamicPageFeed.java index 22c80521d7..860791227f 100644 --- a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/advancedoperations/AddDynamicPageFeed.java +++ b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/advancedoperations/AddDynamicPageFeed.java @@ -67,7 +67,9 @@ import java.util.List; import java.util.Map; -/** Adds a page feed with URLs for a Dynamic Search Ads Campaign. */ +/** + * Adds a page feed with URLs for a Dynamic Search Ads Campaign. + */ public class AddDynamicPageFeed { private static final int PAGE_SIZE = 1_000; @@ -415,8 +417,8 @@ private static DynamicSearchAdsSetting getDsaSetting( // You must request all DSA fields in order to update the DSA settings in the following step. String query = String.format( - "SELECT campaign.id, campaign.name, campaign.dynamic_search_ads_setting.domain_name," - + " campaign.dynamic_search_ads_setting.language_code," + "SELECT campaign.id, " + + " campaign.name, " + " campaign.dynamic_search_ads_setting.use_supplied_urls_only " + "FROM campaign " + "WHERE campaign.id = '%s'", @@ -446,8 +448,7 @@ private static DynamicSearchAdsSetting getDsaSetting( .getResults(0) .getCampaign() .hasDynamicSearchAdsSetting()) { - throw new IllegalArgumentException( - String.format("Campaign with ID '%s' is not a " + "DSA campaign.", campaignId)); + throw new IllegalArgumentException("Campaign with ID '%s' is not a DSA campaign."); } // Retrieves and returns the DSA setting. From 9fa5393ecd68be6f877af1cd0822ac78ea934242 Mon Sep 17 00:00:00 2001 From: Nick Birnie Date: Wed, 31 Mar 2021 13:59:16 +0100 Subject: [PATCH 4/4] Address Devin's review comments --- .../examples/advancedoperations/AddDynamicPageFeed.java | 1 - .../ads/googleads/examples/basicoperations/AddCampaigns.java | 2 +- .../googleads/examples/hotelads/AddHotelListingGroupTree.java | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/advancedoperations/AddDynamicPageFeed.java b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/advancedoperations/AddDynamicPageFeed.java index 860791227f..ade811a434 100644 --- a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/advancedoperations/AddDynamicPageFeed.java +++ b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/advancedoperations/AddDynamicPageFeed.java @@ -414,7 +414,6 @@ private static void updateCampaignDsaSetting( private static DynamicSearchAdsSetting getDsaSetting( GoogleAdsClient googleAdsClient, long customerId, long campaignId) { // Creates the query. - // You must request all DSA fields in order to update the DSA settings in the following step. String query = String.format( "SELECT campaign.id, " diff --git a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/basicoperations/AddCampaigns.java b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/basicoperations/AddCampaigns.java index 6010edcc85..5a029de174 100644 --- a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/basicoperations/AddCampaigns.java +++ b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/basicoperations/AddCampaigns.java @@ -106,7 +106,7 @@ public static void main(String[] args) { private static String addCampaignBudget(GoogleAdsClient googleAdsClient, long customerId) { CampaignBudget budget = CampaignBudget.newBuilder() - .setName("Interplanetary Cruise Budget #" ) + .setName("Interplanetary Cruise Budget #" + getPrintableDateTime()) .setDeliveryMethod(BudgetDeliveryMethod.STANDARD) .setAmountMicros(500_000) .build(); diff --git a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/hotelads/AddHotelListingGroupTree.java b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/hotelads/AddHotelListingGroupTree.java index c0b9c30cb5..3879088020 100644 --- a/google-ads-examples/src/main/java/com/google/ads/googleads/examples/hotelads/AddHotelListingGroupTree.java +++ b/google-ads-examples/src/main/java/com/google/ads/googleads/examples/hotelads/AddHotelListingGroupTree.java @@ -283,7 +283,7 @@ private static void addLevel2Nodes( List operations, long percentCpcBidMicroAmount) { // The criterion ID for Japan is 2392. - // See https://developers.google.com/google-ads/api/reference/data/geotargets for criteria ID + // See https://developers.google.com/google-ads/api/reference/data/geotargets for criteria IDs // of other countries. long japanGeoTargetConstantId = 2392; ListingDimensionInfo japanDimensionInfo =