Changes for release v6.1. (#401)

Author: nwbirnie

CHANGELOG.md

@@ -1,10 +1,9 @@
-10.1.0 - 2020-12-14
+11.0.0 - 2021-02-18
 -------------------
-- Switched code generation to new pipeline (a.k.a. microgenerator).
-- Added support for authenticating with service accounts.
-- Added support for loading configuration from environment variables.
-- Updated logging to scrub PII fields from Feed and CreateCustomerClientRequest.
-- Added/updated various code examples.
+- Added support and examples for Google Ads API v6.1.
+- Removed support for Google Ads API v3.0.
+- Fixed FieldMasks.getFieldValue() to support repeated fields (breaking change).
+- Updated personal information log masking to support new fields.
 
 10.0.0 - 2020-11-11
 -------------------

README.md

@@ -18,7 +18,7 @@ This project hosts the Java client library for the Google Ads API.
     <dependency>
       <groupId>com.google.api-ads</groupId>
       <artifactId>google-ads</artifactId>
-      <version>10.1.0</version>
+      <version>11.0.0</version>
     </dependency>
 
 ## Documentation

google-ads-annotation-processing/src/main/java/com/google/ads/googleads/annotations/impl/GoogleAdsCatalogAnnotationProcessor.java

@@ -22,11 +22,6 @@
 import com.google.ads.googleads.annotations.impl.generators.catalog.GeneratedCatalogCodeGenerator;
 import com.google.ads.googleads.annotations.impl.generators.catalog.GoogleAdsAllVersionsCodeGenerator;
 import com.google.ads.googleads.annotations.impl.generators.catalog.VersionCatalogCodeGenerator;
-import com.google.ads.googleads.annotations.impl.generators.messageproxy.CreateCustomerClientRequestProxyGenerator;
-import com.google.ads.googleads.annotations.impl.generators.messageproxy.CustomerUserAccessMessageProxyGenerator;
-import com.google.ads.googleads.annotations.impl.generators.messageproxy.FeedMessageProxyGenerator;
-import com.google.ads.googleads.annotations.impl.generators.messageproxy.SearchPagedResponseMessageProxyGenerator;
-import com.google.ads.googleads.annotations.impl.generators.messageproxy.SearchStreamResponseMessageProxyGenerator;
 import com.google.auto.service.AutoService;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.SortedSetMultimap;
@@ -147,12 +142,7 @@ private Collection<Generator> loadGenerators(
         new AbstractGoogleAdsClientCodeGenerator(
             versions, latestVersion, catalogName, messager, filer),
         new GoogleAdsAllVersionsCodeGenerator(
-            versions, latestVersion, catalogName, messager, filer),
-        new SearchStreamResponseMessageProxyGenerator(versions, messager, filer),
-        new SearchPagedResponseMessageProxyGenerator(versions, messager, filer),
-        new CustomerUserAccessMessageProxyGenerator(versions, messager, filer),
-        new FeedMessageProxyGenerator(versions, messager, filer),
-        new CreateCustomerClientRequestProxyGenerator(versions, messager, filer));
+            versions, latestVersion, catalogName, messager, filer));
   }
 
   /**

google-ads-annotation-processing/src/main/java/com/google/ads/googleads/annotations/impl/generators/catalog/GeneratedCatalogCodeGenerator.java

@@ -193,14 +193,14 @@ public void generate() {
             .addMethod(getLatestVersion)
             .addMethod(createAllVersionsClient);
 
-    // The generated catalog should implement the ApiCatalog class as not to be called directly.
+    // Generated catalog should implement the ApiCatalog interface.
     // This does not, however, apply to catalogs that are generated during the test-compile phase.
     // This is because the createAllVersionsClient method in ApiCatalog will not have a matching
     // implementation for test cases (specifically there will be a mismatch on
     // GoogleAdsAllVersions class name which is suffixed with the catalog name).
     if (generatedCatalogSimpleName.equals("GeneratedCatalog")) {
-      generatedCatalogBuilder.superclass(
-          ClassName.get("com.google.ads.googleads.lib.catalog", "AbstractCatalog"));
+      generatedCatalogBuilder.addSuperinterface(
+          ClassName.get("com.google.ads.googleads.lib.catalog", "ApiCatalog"));
     }
 
     // Creates a version class for each version.

google-ads-annotation-processing/src/main/java/com/google/ads/googleads/annotations/impl/generators/catalog/VersionCatalogCodeGenerator.java

@@ -150,25 +150,10 @@ public void generate() {
               "CreateCustomerClientRequestMessageProxy");
       // Adds a Version instance to the builder with the params as defined above.
       getCatalogBuilder.addStatement(
-          "builder.add(new Version(\n"
-              + "  $S,\n"
-              + "  new $T(),\n"
-              + "  $T.class,\n"
-              + "  new $T(\n"
-              + "    new $T(),\n"
-              + "    new $T(),\n"
-              + "    new $T(),\n"
-              + "    new $T(),\n"
-              + "    new $T())))",
+          "builder.add(new Version(\n" + "  $S,\n" + "  new $T(),\n" + "  $T.class))",
           "v" + version,
           exceptionFactoryName,
-          versionClassName,
-          messageProxyProviderClassName,
-          searchStreamResponseProxyName,
-          searchPagedResponseProxyName,
-          customerUserAccessProxyName,
-          feedMessageProxyName,
-          createCustomerClientRequestProxyName);
+          versionClassName);
     }
 
     getCatalogBuilder.addStatement("return builder.build()");