Skip to content
This repository was archived by the owner on Sep 9, 2023. It is now read-only.

Commit 6bfa58c

Browse files
yoshi-automationchingor13
yoshi-automation
authored and
chingor13
committed
fix!: remove unused fields from EnhancedMeasurementSettings (#137)
This PR was generated using Autosynth. 🌈 Synth log will be available here: https://source.cloud.google.com/results/invocations/1fd91381-8baf-4747-bdeb-1a9742e427d9/targets - [ ] To automatically regenerate this PR, check this box. PiperOrigin-RevId: 351651504 Source-Link: googleapis/googleapis@23e7356 fix!: `update_mask` field is required for all Update operations feat: add pagination support for `ListFirebaseLinks` operation fix!: rename `country_code` field to `region_code` in `Account` fix!: rename `url_query_parameter` field to `uri_query_parameter` in `EnhancedMeasurementSettings` fix!: remove `parent` field from `GoogleAdsLink`
1 parent 6d52546 commit 6bfa58c

File tree

47 files changed

+2502
-2411
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+2502
-2411
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@ target/
1212

1313
# python utilities
1414
*.pyc
15-
__pycache__
15+
__pycache__
16+
17+
.flattened-pom.xml

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
3+
<differences>
4+
<!-- TODO: remove after 0.3.0 is released -->
5+
<difference>
6+
<differenceType>7006</differenceType>
7+
<className>com/google/analytics/admin/v1alpha/AnalyticsAdminServiceClient</className>
8+
<method> com.google.analytics.admin.v1alpha.ListFirebaseLinksResponse listFirebaseLinks(*)</method>
9+
<to>com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient$ListFirebaseLinksPagedResponse</to>
10+
</difference>
11+
<difference>
12+
<differenceType>7006</differenceType>
13+
<className>com/google/analytics/admin/v1alpha/AnalyticsAdminServiceSettings</className>
14+
<method>com.google.api.gax.rpc.UnaryCallSettings listFirebaseLinksSettings()</method>
15+
<to>com.google.api.gax.rpc.PagedCallSettings</to>
16+
</difference>
17+
<difference>
18+
<differenceType>7006</differenceType>
19+
<className>com/google/analytics/admin/v1alpha/AnalyticsAdminServiceSettings$Builder</className>
20+
<method>com.google.api.gax.rpc.UnaryCallSettings$Builder listFirebaseLinksSettings()</method>
21+
<to>com.google.api.gax.rpc.PagedCallSettings$Builder</to>
22+
</difference>
23+
<difference>
24+
<differenceType>7006</differenceType>
25+
<className>com/google/analytics/admin/v1alpha/stub/AnalyticsAdminServiceStubSettings</className>
26+
<method>com.google.api.gax.rpc.UnaryCallSettings listFirebaseLinksSettings()</method>
27+
<to>com.google.api.gax.rpc.PagedCallSettings</to>
28+
</difference>
29+
<difference>
30+
<differenceType>7006</differenceType>
31+
<className>com/google/analytics/admin/v1alpha/stub/AnalyticsAdminServiceStubSettings$Builder</className>
32+
<method>com.google.api.gax.rpc.UnaryCallSettings$Builder listFirebaseLinksSettings()</method>
33+
<to>com.google.api.gax.rpc.PagedCallSettings$Builder</to>
34+
</difference>
35+
</differences>

‎google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/AnalyticsAdminServiceClient.java‎

Lines changed: 130 additions & 70 deletions
Large diffs are not rendered by default.

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAccountSummariesPagedResponse;
2121
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAccountsPagedResponse;
2222
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAndroidAppDataStreamsPagedResponse;
23+
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListFirebaseLinksPagedResponse;
2324
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListGoogleAdsLinksPagedResponse;
2425
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListIosAppDataStreamsPagedResponse;
2526
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListPropertiesPagedResponse;
@@ -329,7 +330,8 @@ public UnaryCallSettings<DeleteFirebaseLinkRequest, Empty> deleteFirebaseLinkSet
329330
}
330331

331332
/** Returns the object with the settings used for calls to listFirebaseLinks. */
332-
public UnaryCallSettings<ListFirebaseLinksRequest, ListFirebaseLinksResponse>
333+
public PagedCallSettings<
334+
ListFirebaseLinksRequest, ListFirebaseLinksResponse, ListFirebaseLinksPagedResponse>
333335
listFirebaseLinksSettings() {
334336
return ((AnalyticsAdminServiceStubSettings) getStubSettings()).listFirebaseLinksSettings();
335337
}
@@ -720,7 +722,8 @@ public UnaryCallSettings.Builder<DeleteUserLinkRequest, Empty> deleteUserLinkSet
720722
}
721723

722724
/** Returns the builder for the settings used for calls to listFirebaseLinks. */
723-
public UnaryCallSettings.Builder<ListFirebaseLinksRequest, ListFirebaseLinksResponse>
725+
public PagedCallSettings.Builder<
726+
ListFirebaseLinksRequest, ListFirebaseLinksResponse, ListFirebaseLinksPagedResponse>
724727
listFirebaseLinksSettings() {
725728
return getStubSettingsBuilder().listFirebaseLinksSettings();
726729
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAccountSummariesPagedResponse;
2121
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAccountsPagedResponse;
2222
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAndroidAppDataStreamsPagedResponse;
23+
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListFirebaseLinksPagedResponse;
2324
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListGoogleAdsLinksPagedResponse;
2425
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListIosAppDataStreamsPagedResponse;
2526
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListPropertiesPagedResponse;
@@ -341,6 +342,11 @@ public UnaryCallable<DeleteFirebaseLinkRequest, Empty> deleteFirebaseLinkCallabl
341342
throw new UnsupportedOperationException("Not implemented: deleteFirebaseLinkCallable()");
342343
}
343344

345+
public UnaryCallable<ListFirebaseLinksRequest, ListFirebaseLinksPagedResponse>
346+
listFirebaseLinksPagedCallable() {
347+
throw new UnsupportedOperationException("Not implemented: listFirebaseLinksPagedCallable()");
348+
}
349+
344350
public UnaryCallable<ListFirebaseLinksRequest, ListFirebaseLinksResponse>
345351
listFirebaseLinksCallable() {
346352
throw new UnsupportedOperationException("Not implemented: listFirebaseLinksCallable()");

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

Lines changed: 71 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAccountSummariesPagedResponse;
2121
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAccountsPagedResponse;
2222
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAndroidAppDataStreamsPagedResponse;
23+
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListFirebaseLinksPagedResponse;
2324
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListGoogleAdsLinksPagedResponse;
2425
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListIosAppDataStreamsPagedResponse;
2526
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListPropertiesPagedResponse;
@@ -263,7 +264,8 @@ public class AnalyticsAdminServiceStubSettings
263264
private final UnaryCallSettings<UpdateFirebaseLinkRequest, FirebaseLink>
264265
updateFirebaseLinkSettings;
265266
private final UnaryCallSettings<DeleteFirebaseLinkRequest, Empty> deleteFirebaseLinkSettings;
266-
private final UnaryCallSettings<ListFirebaseLinksRequest, ListFirebaseLinksResponse>
267+
private final PagedCallSettings<
268+
ListFirebaseLinksRequest, ListFirebaseLinksResponse, ListFirebaseLinksPagedResponse>
267269
listFirebaseLinksSettings;
268270
private final UnaryCallSettings<GetGlobalSiteTagRequest, GlobalSiteTag> getGlobalSiteTagSettings;
269271
private final UnaryCallSettings<CreateGoogleAdsLinkRequest, GoogleAdsLink>
@@ -592,6 +594,46 @@ public Iterable<AndroidAppDataStream> extractResources(
592594
}
593595
};
594596

597+
private static final PagedListDescriptor<
598+
ListFirebaseLinksRequest, ListFirebaseLinksResponse, FirebaseLink>
599+
LIST_FIREBASE_LINKS_PAGE_STR_DESC =
600+
new PagedListDescriptor<
601+
ListFirebaseLinksRequest, ListFirebaseLinksResponse, FirebaseLink>() {
602+
@Override
603+
public String emptyToken() {
604+
return "";
605+
}
606+
607+
@Override
608+
public ListFirebaseLinksRequest injectToken(
609+
ListFirebaseLinksRequest payload, String token) {
610+
return ListFirebaseLinksRequest.newBuilder(payload).setPageToken(token).build();
611+
}
612+
613+
@Override
614+
public ListFirebaseLinksRequest injectPageSize(
615+
ListFirebaseLinksRequest payload, int pageSize) {
616+
return ListFirebaseLinksRequest.newBuilder(payload).setPageSize(pageSize).build();
617+
}
618+
619+
@Override
620+
public Integer extractPageSize(ListFirebaseLinksRequest payload) {
621+
return payload.getPageSize();
622+
}
623+
624+
@Override
625+
public String extractNextToken(ListFirebaseLinksResponse payload) {
626+
return payload.getNextPageToken();
627+
}
628+
629+
@Override
630+
public Iterable<FirebaseLink> extractResources(ListFirebaseLinksResponse payload) {
631+
return payload.getFirebaseLinksList() == null
632+
? ImmutableList.<FirebaseLink>of()
633+
: payload.getFirebaseLinksList();
634+
}
635+
};
636+
595637
private static final PagedListDescriptor<
596638
ListGoogleAdsLinksRequest, ListGoogleAdsLinksResponse, GoogleAdsLink>
597639
LIST_GOOGLE_ADS_LINKS_PAGE_STR_DESC =
@@ -798,6 +840,27 @@ public ApiFuture<ListAndroidAppDataStreamsPagedResponse> getFuturePagedResponse(
798840
}
799841
};
800842

843+
private static final PagedListResponseFactory<
844+
ListFirebaseLinksRequest, ListFirebaseLinksResponse, ListFirebaseLinksPagedResponse>
845+
LIST_FIREBASE_LINKS_PAGE_STR_FACT =
846+
new PagedListResponseFactory<
847+
ListFirebaseLinksRequest,
848+
ListFirebaseLinksResponse,
849+
ListFirebaseLinksPagedResponse>() {
850+
@Override
851+
public ApiFuture<ListFirebaseLinksPagedResponse> getFuturePagedResponse(
852+
UnaryCallable<ListFirebaseLinksRequest, ListFirebaseLinksResponse> callable,
853+
ListFirebaseLinksRequest request,
854+
ApiCallContext context,
855+
ApiFuture<ListFirebaseLinksResponse> futureResponse) {
856+
PageContext<ListFirebaseLinksRequest, ListFirebaseLinksResponse, FirebaseLink>
857+
pageContext =
858+
PageContext.create(
859+
callable, LIST_FIREBASE_LINKS_PAGE_STR_DESC, request, context);
860+
return ListFirebaseLinksPagedResponse.createAsync(pageContext, futureResponse);
861+
}
862+
};
863+
801864
private static final PagedListResponseFactory<
802865
ListGoogleAdsLinksRequest, ListGoogleAdsLinksResponse, ListGoogleAdsLinksPagedResponse>
803866
LIST_GOOGLE_ADS_LINKS_PAGE_STR_FACT =
@@ -1060,7 +1123,8 @@ public UnaryCallSettings<DeleteFirebaseLinkRequest, Empty> deleteFirebaseLinkSet
10601123
}
10611124

10621125
/** Returns the object with the settings used for calls to listFirebaseLinks. */
1063-
public UnaryCallSettings<ListFirebaseLinksRequest, ListFirebaseLinksResponse>
1126+
public PagedCallSettings<
1127+
ListFirebaseLinksRequest, ListFirebaseLinksResponse, ListFirebaseLinksPagedResponse>
10641128
listFirebaseLinksSettings() {
10651129
return listFirebaseLinksSettings;
10661130
}
@@ -1318,7 +1382,8 @@ public static class Builder
13181382
updateFirebaseLinkSettings;
13191383
private final UnaryCallSettings.Builder<DeleteFirebaseLinkRequest, Empty>
13201384
deleteFirebaseLinkSettings;
1321-
private final UnaryCallSettings.Builder<ListFirebaseLinksRequest, ListFirebaseLinksResponse>
1385+
private final PagedCallSettings.Builder<
1386+
ListFirebaseLinksRequest, ListFirebaseLinksResponse, ListFirebaseLinksPagedResponse>
13221387
listFirebaseLinksSettings;
13231388
private final UnaryCallSettings.Builder<GetGlobalSiteTagRequest, GlobalSiteTag>
13241389
getGlobalSiteTagSettings;
@@ -1428,7 +1493,7 @@ protected Builder(ClientContext clientContext) {
14281493
createFirebaseLinkSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
14291494
updateFirebaseLinkSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
14301495
deleteFirebaseLinkSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
1431-
listFirebaseLinksSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
1496+
listFirebaseLinksSettings = PagedCallSettings.newBuilder(LIST_FIREBASE_LINKS_PAGE_STR_FACT);
14321497
getGlobalSiteTagSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
14331498
createGoogleAdsLinkSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
14341499
updateGoogleAdsLinkSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
@@ -2119,7 +2184,8 @@ public UnaryCallSettings.Builder<DeleteUserLinkRequest, Empty> deleteUserLinkSet
21192184
}
21202185

21212186
/** Returns the builder for the settings used for calls to listFirebaseLinks. */
2122-
public UnaryCallSettings.Builder<ListFirebaseLinksRequest, ListFirebaseLinksResponse>
2187+
public PagedCallSettings.Builder<
2188+
ListFirebaseLinksRequest, ListFirebaseLinksResponse, ListFirebaseLinksPagedResponse>
21232189
listFirebaseLinksSettings() {
21242190
return listFirebaseLinksSettings;
21252191
}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAccountSummariesPagedResponse;
2121
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAccountsPagedResponse;
2222
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListAndroidAppDataStreamsPagedResponse;
23+
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListFirebaseLinksPagedResponse;
2324
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListGoogleAdsLinksPagedResponse;
2425
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListIosAppDataStreamsPagedResponse;
2526
import static com.google.analytics.admin.v1alpha.AnalyticsAdminServiceClient.ListPropertiesPagedResponse;
@@ -749,6 +750,8 @@ public class GrpcAnalyticsAdminServiceStub extends AnalyticsAdminServiceStub {
749750
private final UnaryCallable<DeleteFirebaseLinkRequest, Empty> deleteFirebaseLinkCallable;
750751
private final UnaryCallable<ListFirebaseLinksRequest, ListFirebaseLinksResponse>
751752
listFirebaseLinksCallable;
753+
private final UnaryCallable<ListFirebaseLinksRequest, ListFirebaseLinksPagedResponse>
754+
listFirebaseLinksPagedCallable;
752755
private final UnaryCallable<GetGlobalSiteTagRequest, GlobalSiteTag> getGlobalSiteTagCallable;
753756
private final UnaryCallable<CreateGoogleAdsLinkRequest, GoogleAdsLink>
754757
createGoogleAdsLinkCallable;
@@ -1643,6 +1646,11 @@ public Map<String, String> extract(GetDataSharingSettingsRequest request) {
16431646
listFirebaseLinksTransportSettings,
16441647
settings.listFirebaseLinksSettings(),
16451648
clientContext);
1649+
this.listFirebaseLinksPagedCallable =
1650+
callableFactory.createPagedCallable(
1651+
listFirebaseLinksTransportSettings,
1652+
settings.listFirebaseLinksSettings(),
1653+
clientContext);
16461654
this.getGlobalSiteTagCallable =
16471655
callableFactory.createUnaryCallable(
16481656
getGlobalSiteTagTransportSettings, settings.getGlobalSiteTagSettings(), clientContext);
@@ -1909,6 +1917,11 @@ public UnaryCallable<DeleteFirebaseLinkRequest, Empty> deleteFirebaseLinkCallabl
19091917
return listFirebaseLinksCallable;
19101918
}
19111919

1920+
public UnaryCallable<ListFirebaseLinksRequest, ListFirebaseLinksPagedResponse>
1921+
listFirebaseLinksPagedCallable() {
1922+
return listFirebaseLinksPagedCallable;
1923+
}
1924+
19121925
public UnaryCallable<GetGlobalSiteTagRequest, GlobalSiteTag> getGlobalSiteTagCallable() {
19131926
return getGlobalSiteTagCallable;
19141927
}

0 commit comments

Comments
 (0)