fix!: remove unused fields from EnhancedMeasurementSettings

.gitignore

@@ -12,4 +12,6 @@ target/
 
 # python utilities
 *.pyc
-__pycache__
+__pycache__
+
+.flattened-pom.xml

google-analytics-admin/clirr-ignored-differences.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
+<differences>
+  <!-- TODO: remove after 0.3.0 is released -->
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/analytics/admin/v1alpha/AnalyticsAdminServiceClient</className>
+    <method> com.google.analytics.admin.v1alpha.ListFirebaseLinksResponse listFirebaseLinks(*)</method>
+    <to>com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient$ListFirebaseLinksPagedResponse</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/analytics/admin/v1alpha/AnalyticsAdminServiceSettings</className>
+    <method>com.google.api.gax.rpc.UnaryCallSettings listFirebaseLinksSettings()</method>
+    <to>com.google.api.gax.rpc.PagedCallSettings</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/analytics/admin/v1alpha/AnalyticsAdminServiceSettings$Builder</className>
+    <method>com.google.api.gax.rpc.UnaryCallSettings$Builder listFirebaseLinksSettings()</method>
+    <to>com.google.api.gax.rpc.PagedCallSettings$Builder</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/analytics/admin/v1alpha/stub/AnalyticsAdminServiceStubSettings</className>
+    <method>com.google.api.gax.rpc.UnaryCallSettings listFirebaseLinksSettings()</method>
+    <to>com.google.api.gax.rpc.PagedCallSettings</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/analytics/admin/v1alpha/stub/AnalyticsAdminServiceStubSettings$Builder</className>
+    <method>com.google.api.gax.rpc.UnaryCallSettings$Builder listFirebaseLinksSettings()</method>
+    <to>com.google.api.gax.rpc.PagedCallSettings$Builder</to>
+  </difference>
+</differences>

google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/AnalyticsAdminServiceSettings.java

@@ -20,6 +20,7 @@
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAccountSummariesPagedResponse;
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAccountsPagedResponse;
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAndroidAppDataStreamsPagedResponse;
+import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListFirebaseLinksPagedResponse;
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListGoogleAdsLinksPagedResponse;
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListIosAppDataStreamsPagedResponse;
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListPropertiesPagedResponse;
@@ -329,7 +330,8 @@ public UnaryCallSettings<DeleteFirebaseLinkRequest, Empty> deleteFirebaseLinkSet
   }
 
   /** Returns the object with the settings used for calls to listFirebaseLinks. */
-  public UnaryCallSettings<ListFirebaseLinksRequest, ListFirebaseLinksResponse>
+  public PagedCallSettings<
+          ListFirebaseLinksRequest, ListFirebaseLinksResponse, ListFirebaseLinksPagedResponse>
       listFirebaseLinksSettings() {
     return ((AnalyticsAdminServiceStubSettings) getStubSettings()).listFirebaseLinksSettings();
   }
@@ -720,7 +722,8 @@ public UnaryCallSettings.Builder<DeleteUserLinkRequest, Empty> deleteUserLinkSet
     }
 
     /** Returns the builder for the settings used for calls to listFirebaseLinks. */
-    public UnaryCallSettings.Builder<ListFirebaseLinksRequest, ListFirebaseLinksResponse>
+    public PagedCallSettings.Builder<
+            ListFirebaseLinksRequest, ListFirebaseLinksResponse, ListFirebaseLinksPagedResponse>
         listFirebaseLinksSettings() {
       return getStubSettingsBuilder().listFirebaseLinksSettings();
     }

google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/stub/AnalyticsAdminServiceStub.java

@@ -20,6 +20,7 @@
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAccountSummariesPagedResponse;
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAccountsPagedResponse;
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAndroidAppDataStreamsPagedResponse;
+import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListFirebaseLinksPagedResponse;
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListGoogleAdsLinksPagedResponse;
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListIosAppDataStreamsPagedResponse;
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListPropertiesPagedResponse;
@@ -341,6 +342,11 @@ public UnaryCallable<DeleteFirebaseLinkRequest, Empty> deleteFirebaseLinkCallabl
     throw new UnsupportedOperationException("Not implemented: deleteFirebaseLinkCallable()");
   }
 
+  public UnaryCallable<ListFirebaseLinksRequest, ListFirebaseLinksPagedResponse>
+      listFirebaseLinksPagedCallable() {
+    throw new UnsupportedOperationException("Not implemented: listFirebaseLinksPagedCallable()");
+  }
+
   public UnaryCallable<ListFirebaseLinksRequest, ListFirebaseLinksResponse>
       listFirebaseLinksCallable() {
     throw new UnsupportedOperationException("Not implemented: listFirebaseLinksCallable()");

google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/stub/AnalyticsAdminServiceStubSettings.java

@@ -20,6 +20,7 @@
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAccountSummariesPagedResponse;
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAccountsPagedResponse;
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAndroidAppDataStreamsPagedResponse;
+import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListFirebaseLinksPagedResponse;
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListGoogleAdsLinksPagedResponse;
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListIosAppDataStreamsPagedResponse;
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListPropertiesPagedResponse;
@@ -263,7 +264,8 @@ public class AnalyticsAdminServiceStubSettings
   private final UnaryCallSettings<UpdateFirebaseLinkRequest, FirebaseLink>
       updateFirebaseLinkSettings;
   private final UnaryCallSettings<DeleteFirebaseLinkRequest, Empty> deleteFirebaseLinkSettings;
-  private final UnaryCallSettings<ListFirebaseLinksRequest, ListFirebaseLinksResponse>
+  private final PagedCallSettings<
+          ListFirebaseLinksRequest, ListFirebaseLinksResponse, ListFirebaseLinksPagedResponse>
       listFirebaseLinksSettings;
   private final UnaryCallSettings<GetGlobalSiteTagRequest, GlobalSiteTag> getGlobalSiteTagSettings;
   private final UnaryCallSettings<CreateGoogleAdsLinkRequest, GoogleAdsLink>
@@ -592,6 +594,46 @@ public Iterable<AndroidAppDataStream> extractResources(
             }
           };
 
+  private static final PagedListDescriptor<
+          ListFirebaseLinksRequest, ListFirebaseLinksResponse, FirebaseLink>
+      LIST_FIREBASE_LINKS_PAGE_STR_DESC =
+          new PagedListDescriptor<
+              ListFirebaseLinksRequest, ListFirebaseLinksResponse, FirebaseLink>() {
+            @Override
+            public String emptyToken() {
+              return "";
+            }
+
+            @Override
+            public ListFirebaseLinksRequest injectToken(
+                ListFirebaseLinksRequest payload, String token) {
+              return ListFirebaseLinksRequest.newBuilder(payload).setPageToken(token).build();
+            }
+
+            @Override
+            public ListFirebaseLinksRequest injectPageSize(
+                ListFirebaseLinksRequest payload, int pageSize) {
+              return ListFirebaseLinksRequest.newBuilder(payload).setPageSize(pageSize).build();
+            }
+
+            @Override
+            public Integer extractPageSize(ListFirebaseLinksRequest payload) {
+              return payload.getPageSize();
+            }
+
+            @Override
+            public String extractNextToken(ListFirebaseLinksResponse payload) {
+              return payload.getNextPageToken();
+            }
+
+            @Override
+            public Iterable<FirebaseLink> extractResources(ListFirebaseLinksResponse payload) {
+              return payload.getFirebaseLinksList() == null
+                  ? ImmutableList.<FirebaseLink>of()
+                  : payload.getFirebaseLinksList();
+            }
+          };
+
   private static final PagedListDescriptor<
           ListGoogleAdsLinksRequest, ListGoogleAdsLinksResponse, GoogleAdsLink>
       LIST_GOOGLE_ADS_LINKS_PAGE_STR_DESC =
@@ -798,6 +840,27 @@ public ApiFuture<ListAndroidAppDataStreamsPagedResponse> getFuturePagedResponse(
             }
           };
 
+  private static final PagedListResponseFactory<
+          ListFirebaseLinksRequest, ListFirebaseLinksResponse, ListFirebaseLinksPagedResponse>
+      LIST_FIREBASE_LINKS_PAGE_STR_FACT =
+          new PagedListResponseFactory<
+              ListFirebaseLinksRequest,
+              ListFirebaseLinksResponse,
+              ListFirebaseLinksPagedResponse>() {
+            @Override
+            public ApiFuture<ListFirebaseLinksPagedResponse> getFuturePagedResponse(
+                UnaryCallable<ListFirebaseLinksRequest, ListFirebaseLinksResponse> callable,
+                ListFirebaseLinksRequest request,
+                ApiCallContext context,
+                ApiFuture<ListFirebaseLinksResponse> futureResponse) {
+              PageContext<ListFirebaseLinksRequest, ListFirebaseLinksResponse, FirebaseLink>
+                  pageContext =
+                      PageContext.create(
+                          callable, LIST_FIREBASE_LINKS_PAGE_STR_DESC, request, context);
+              return ListFirebaseLinksPagedResponse.createAsync(pageContext, futureResponse);
+            }
+          };
+
   private static final PagedListResponseFactory<
           ListGoogleAdsLinksRequest, ListGoogleAdsLinksResponse, ListGoogleAdsLinksPagedResponse>
       LIST_GOOGLE_ADS_LINKS_PAGE_STR_FACT =
@@ -1060,7 +1123,8 @@ public UnaryCallSettings<DeleteFirebaseLinkRequest, Empty> deleteFirebaseLinkSet
   }
 
   /** Returns the object with the settings used for calls to listFirebaseLinks. */
-  public UnaryCallSettings<ListFirebaseLinksRequest, ListFirebaseLinksResponse>
+  public PagedCallSettings<
+          ListFirebaseLinksRequest, ListFirebaseLinksResponse, ListFirebaseLinksPagedResponse>
       listFirebaseLinksSettings() {
     return listFirebaseLinksSettings;
   }
@@ -1318,7 +1382,8 @@ public static class Builder
         updateFirebaseLinkSettings;
     private final UnaryCallSettings.Builder<DeleteFirebaseLinkRequest, Empty>
         deleteFirebaseLinkSettings;
-    private final UnaryCallSettings.Builder<ListFirebaseLinksRequest, ListFirebaseLinksResponse>
+    private final PagedCallSettings.Builder<
+            ListFirebaseLinksRequest, ListFirebaseLinksResponse, ListFirebaseLinksPagedResponse>
         listFirebaseLinksSettings;
     private final UnaryCallSettings.Builder<GetGlobalSiteTagRequest, GlobalSiteTag>
         getGlobalSiteTagSettings;
@@ -1428,7 +1493,7 @@ protected Builder(ClientContext clientContext) {
       createFirebaseLinkSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
       updateFirebaseLinkSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
       deleteFirebaseLinkSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-      listFirebaseLinksSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+      listFirebaseLinksSettings = PagedCallSettings.newBuilder(LIST_FIREBASE_LINKS_PAGE_STR_FACT);
       getGlobalSiteTagSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
       createGoogleAdsLinkSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
       updateGoogleAdsLinkSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
@@ -2119,7 +2184,8 @@ public UnaryCallSettings.Builder<DeleteUserLinkRequest, Empty> deleteUserLinkSet
     }
 
     /** Returns the builder for the settings used for calls to listFirebaseLinks. */
-    public UnaryCallSettings.Builder<ListFirebaseLinksRequest, ListFirebaseLinksResponse>
+    public PagedCallSettings.Builder<
+            ListFirebaseLinksRequest, ListFirebaseLinksResponse, ListFirebaseLinksPagedResponse>
         listFirebaseLinksSettings() {
       return listFirebaseLinksSettings;
     }

google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/stub/GrpcAnalyticsAdminServiceStub.java

@@ -20,6 +20,7 @@
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAccountSummariesPagedResponse;
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAccountsPagedResponse;
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAndroidAppDataStreamsPagedResponse;
+import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListFirebaseLinksPagedResponse;
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListGoogleAdsLinksPagedResponse;
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListIosAppDataStreamsPagedResponse;
 import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListPropertiesPagedResponse;
@@ -749,6 +750,8 @@ public class GrpcAnalyticsAdminServiceStub extends AnalyticsAdminServiceStub {
   private final UnaryCallable<DeleteFirebaseLinkRequest, Empty> deleteFirebaseLinkCallable;
   private final UnaryCallable<ListFirebaseLinksRequest, ListFirebaseLinksResponse>
       listFirebaseLinksCallable;
+  private final UnaryCallable<ListFirebaseLinksRequest, ListFirebaseLinksPagedResponse>
+      listFirebaseLinksPagedCallable;
   private final UnaryCallable<GetGlobalSiteTagRequest, GlobalSiteTag> getGlobalSiteTagCallable;
   private final UnaryCallable<CreateGoogleAdsLinkRequest, GoogleAdsLink>
       createGoogleAdsLinkCallable;
@@ -1643,6 +1646,11 @@ public Map<String, String> extract(GetDataSharingSettingsRequest request) {
             listFirebaseLinksTransportSettings,
             settings.listFirebaseLinksSettings(),
             clientContext);
+    this.listFirebaseLinksPagedCallable =
+        callableFactory.createPagedCallable(
+            listFirebaseLinksTransportSettings,
+            settings.listFirebaseLinksSettings(),
+            clientContext);
     this.getGlobalSiteTagCallable =
         callableFactory.createUnaryCallable(
             getGlobalSiteTagTransportSettings, settings.getGlobalSiteTagSettings(), clientContext);
@@ -1909,6 +1917,11 @@ public UnaryCallable<DeleteFirebaseLinkRequest, Empty> deleteFirebaseLinkCallabl
     return listFirebaseLinksCallable;
   }
 
+  public UnaryCallable<ListFirebaseLinksRequest, ListFirebaseLinksPagedResponse>
+      listFirebaseLinksPagedCallable() {
+    return listFirebaseLinksPagedCallable;
+  }
+
   public UnaryCallable<GetGlobalSiteTagRequest, GlobalSiteTag> getGlobalSiteTagCallable() {
     return getGlobalSiteTagCallable;
   }