Changes for release 5.1.0. (#289)

Author: nwbirnie

CHANGELOG.md

@@ -1,3 +1,9 @@
+5.1.0 - 2020-05-06
+------------------
+- Added support for Google Ads API v3_1.
+- Fixed missing entity from ResourceNames for Ad.
+- Added various examples.
+
 5.0.0 - 2020-03-04
 ------------------
 - Added support for Google Ads API v3_0.

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>5.0.0</version>
+      <version>5.1.0</version>
     </dependency>
 
 ## Getting started

google-ads-examples/src/main/java/com/google/ads/googleads/examples/remarketing/AddCustomerMatchUserList.java

@@ -229,6 +229,8 @@
 import com.google.ads.googleads.v2.services.VideoServiceSettings;
 import com.google.ads.googleads.v3.services.CurrencyConstantServiceClient;
 import com.google.ads.googleads.v3.services.CurrencyConstantServiceSettings;
+import com.google.ads.googleads.v3.services.OfflineUserDataJobServiceClient;
+import com.google.ads.googleads.v3.services.UserDataServiceClient;
 import com.google.api.gax.core.FixedCredentialsProvider;
 import com.google.api.gax.rpc.TransportChannelProvider;
 import com.google.auth.Credentials;
@@ -4716,6 +4718,21 @@ public com.google.ads.googleads.v3.services.MutateJobServiceClient createMutateJ
       }
     }
 
+    @Override
+    public OfflineUserDataJobServiceClient createOfflineUserDataJobServiceClient() {
+      try {
+        com.google.ads.googleads.v3.services.OfflineUserDataJobServiceSettings settings =
+            com.google.ads.googleads.v3.services.OfflineUserDataJobServiceSettings.newBuilder()
+                .setCredentialsProvider(FixedCredentialsProvider.create(credentials))
+                .setTransportChannelProvider(provider)
+                .build();
+        return com.google.ads.googleads.v3.services.OfflineUserDataJobServiceClient
+            .create(settings);
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+    }
+
     @Override
     public com.google.ads.googleads.v3.services.OperatingSystemVersionConstantServiceClient createOperatingSystemVersionConstantServiceClient(
     ) {
@@ -4949,6 +4966,20 @@ public com.google.ads.googleads.v3.services.TopicViewServiceClient createTopicVi
       }
     }
 
+    @Override
+    public UserDataServiceClient createUserDataServiceClient() {
+      try {
+        com.google.ads.googleads.v3.services.UserDataServiceSettings settings =
+            com.google.ads.googleads.v3.services.UserDataServiceSettings.newBuilder()
+                .setCredentialsProvider(FixedCredentialsProvider.create(credentials))
+                .setTransportChannelProvider(provider)
+                .build();
+        return com.google.ads.googleads.v3.services.UserDataServiceClient.create(settings);
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+    }
+
     @Override
     public com.google.ads.googleads.v3.services.UserInterestServiceClient createUserInterestServiceClient(
     ) {

google-ads/src/main/java/com/google/ads/googleads/lib/catalog/GeneratedCatalog.java

@@ -150,12 +150,22 @@ private static String getRequestId(Metadata responseHeaders, Metadata responseTr
   }
 
   private static String getCustomerId(Object request) {
+    // Most requests have a customerId field.
     Optional<Method> getter =
         Stream.of(request.getClass().getMethods())
             .filter(method -> method.getName().equals("getCustomerId"))
             .findFirst();
+    // However, some requests only have a resource name (e.g. CustomerService.get()).
+    if (!getter.isPresent()) {
+      getter =
+          Stream.of(request.getClass().getMethods())
+              .filter(method -> method.getName().equals("getResourceName"))
+              .findFirst();
+    }
     if (getter.isPresent()) {
       try {
+        // If the customer ID is stored as a resource name we return the entire resource name rather
+        // than attempting to extract the customer ID.
         return (String) getter.get().invoke(request);
       } catch (IllegalAccessException | InvocationTargetException e) {
         thisClassLogger.error("Unable to retrieve customer ID from " + request);