Skip to content

Commit 20bb7e1

Browse files
yoshi-automationjskeet
yoshi-automation
authored and
jskeet
committed
fix!: rename the 'page_size', 'page_token', 'total_size' fields to 'limit', 'offset' and 'row_count' respectively
PiperOrigin-RevId: 361182102 Source-Author: Google APIs <noreply@google.com> Source-Date: Fri Mar 5 11:01:21 2021 -0800 Source-Repo: googleapis/googleapis Source-Sha: d4cd8d96ed6eb5dd7c997aab68a1d6bb0825090c Source-Link: googleapis/googleapis@d4cd8d9
1 parent 605dcf8 commit 20bb7e1

File tree

5 files changed

+379
-394
lines changed

5 files changed

+379
-394
lines changed

‎apis/Google.Analytics.Data.V1Beta/Google.Analytics.Data.V1Beta.Snippets/BetaAnalyticsDataClientSnippets.g.cs‎

Lines changed: 10 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616

1717
namespace Google.Analytics.Data.V1Beta.Snippets
1818
{
19-
using Google.Api.Gax;
20-
using System;
21-
using System.Linq;
2219
using System.Threading.Tasks;
2320

2421
/// <summary>Generated snippets.</summary>
@@ -39,6 +36,8 @@ public void RunReportRequestObject()
3936
DateRanges = { new DateRange(), },
4037
DimensionFilter = new FilterExpression(),
4138
MetricFilter = new FilterExpression(),
39+
Offset = 0L,
40+
Limit = 0L,
4241
MetricAggregations =
4342
{
4443
MetricAggregation.Unspecified,
@@ -50,46 +49,15 @@ public void RunReportRequestObject()
5049
ReturnPropertyQuota = false,
5150
};
5251
// Make the request
53-
PagedEnumerable<RunReportResponse, DimensionHeader> response = betaAnalyticsDataClient.RunReport(request);
54-
55-
// Iterate over all response items, lazily performing RPCs as required
56-
foreach (DimensionHeader item in response)
57-
{
58-
// Do something with each item
59-
Console.WriteLine(item);
60-
}
61-
62-
// Or iterate over pages (of server-defined size), performing one RPC per page
63-
foreach (RunReportResponse page in response.AsRawResponses())
64-
{
65-
// Do something with each page of items
66-
Console.WriteLine("A page of results:");
67-
foreach (DimensionHeader item in page)
68-
{
69-
// Do something with each item
70-
Console.WriteLine(item);
71-
}
72-
}
73-
74-
// Or retrieve a single page of known size (unless it's the final page), performing as many RPCs as required
75-
int pageSize = 10;
76-
Page<DimensionHeader> singlePage = response.ReadPage(pageSize);
77-
// Do something with the page of items
78-
Console.WriteLine($"A page of {pageSize} results (unless it's the final page):");
79-
foreach (DimensionHeader item in singlePage)
80-
{
81-
// Do something with each item
82-
Console.WriteLine(item);
83-
}
84-
// Store the pageToken, for when the next page is required.
85-
string nextPageToken = singlePage.NextPageToken;
52+
RunReportResponse response = betaAnalyticsDataClient.RunReport(request);
8653
// End snippet
8754
}
8855

89-
/// <summary>Snippet for RunReport</summary>
56+
/// <summary>Snippet for RunReportAsync</summary>
9057
public async Task RunReportRequestObjectAsync()
9158
{
9259
// Snippet: RunReportAsync(RunReportRequest, CallSettings)
60+
// Additional: RunReportAsync(RunReportRequest, CancellationToken)
9361
// Create client
9462
BetaAnalyticsDataClient betaAnalyticsDataClient = await BetaAnalyticsDataClient.CreateAsync();
9563
// Initialize request argument(s)
@@ -101,6 +69,8 @@ public async Task RunReportRequestObjectAsync()
10169
DateRanges = { new DateRange(), },
10270
DimensionFilter = new FilterExpression(),
10371
MetricFilter = new FilterExpression(),
72+
Offset = 0L,
73+
Limit = 0L,
10474
MetricAggregations =
10575
{
10676
MetricAggregation.Unspecified,
@@ -112,39 +82,7 @@ public async Task RunReportRequestObjectAsync()
11282
ReturnPropertyQuota = false,
11383
};
11484
// Make the request
115-
PagedAsyncEnumerable<RunReportResponse, DimensionHeader> response = betaAnalyticsDataClient.RunReportAsync(request);
116-
117-
// Iterate over all response items, lazily performing RPCs as required
118-
await response.ForEachAsync((DimensionHeader item) =>
119-
{
120-
// Do something with each item
121-
Console.WriteLine(item);
122-
});
123-
124-
// Or iterate over pages (of server-defined size), performing one RPC per page
125-
await response.AsRawResponses().ForEachAsync((RunReportResponse page) =>
126-
{
127-
// Do something with each page of items
128-
Console.WriteLine("A page of results:");
129-
foreach (DimensionHeader item in page)
130-
{
131-
// Do something with each item
132-
Console.WriteLine(item);
133-
}
134-
});
135-
136-
// Or retrieve a single page of known size (unless it's the final page), performing as many RPCs as required
137-
int pageSize = 10;
138-
Page<DimensionHeader> singlePage = await response.ReadPageAsync(pageSize);
139-
// Do something with the page of items
140-
Console.WriteLine($"A page of {pageSize} results (unless it's the final page):");
141-
foreach (DimensionHeader item in singlePage)
142-
{
143-
// Do something with each item
144-
Console.WriteLine(item);
145-
}
146-
// Store the pageToken, for when the next page is required.
147-
string nextPageToken = singlePage.NextPageToken;
85+
RunReportResponse response = await betaAnalyticsDataClient.RunReportAsync(request);
14886
// End snippet
14987
}
15088

@@ -384,7 +322,7 @@ public void RunRealtimeReportRequestObject()
384322
Metrics = { new Metric(), },
385323
DimensionFilter = new FilterExpression(),
386324
MetricFilter = new FilterExpression(),
387-
PageSize = 0,
325+
Limit = 0L,
388326
MetricAggregations =
389327
{
390328
MetricAggregation.Unspecified,
@@ -412,7 +350,7 @@ public async Task RunRealtimeReportRequestObjectAsync()
412350
Metrics = { new Metric(), },
413351
DimensionFilter = new FilterExpression(),
414352
MetricFilter = new FilterExpression(),
415-
PageSize = 0,
353+
Limit = 0L,
416354
MetricAggregations =
417355
{
418356
MetricAggregation.Unspecified,

‎apis/Google.Analytics.Data.V1Beta/Google.Analytics.Data.V1Beta.Tests/BetaAnalyticsDataClientTest.g.cs‎

Lines changed: 98 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,100 @@ namespace Google.Analytics.Data.V1Beta.Tests
2626
/// <summary>Generated unit tests.</summary>
2727
public sealed class GeneratedBetaAnalyticsDataClientTest
2828
{
29+
[xunit::FactAttribute]
30+
public void RunReportRequestObject()
31+
{
32+
moq::Mock<BetaAnalyticsData.BetaAnalyticsDataClient> mockGrpcClient = new moq::Mock<BetaAnalyticsData.BetaAnalyticsDataClient>(moq::MockBehavior.Strict);
33+
RunReportRequest request = new RunReportRequest
34+
{
35+
Property = "propertyc9b48d1a",
36+
Dimensions = { new Dimension(), },
37+
Metrics = { new Metric(), },
38+
DateRanges = { new DateRange(), },
39+
DimensionFilter = new FilterExpression(),
40+
MetricFilter = new FilterExpression(),
41+
Offset = -4389998161825790342L,
42+
Limit = 7494001492025909162L,
43+
MetricAggregations =
44+
{
45+
MetricAggregation.Minimum,
46+
},
47+
OrderBys = { new OrderBy(), },
48+
CurrencyCode = "currency_code7f81e352",
49+
CohortSpec = new CohortSpec(),
50+
KeepEmptyRows = true,
51+
ReturnPropertyQuota = true,
52+
};
53+
RunReportResponse expectedResponse = new RunReportResponse
54+
{
55+
DimensionHeaders =
56+
{
57+
new DimensionHeader(),
58+
},
59+
MetricHeaders = { new MetricHeader(), },
60+
Rows = { new Row(), },
61+
Totals = { new Row(), },
62+
Maximums = { new Row(), },
63+
Minimums = { new Row(), },
64+
RowCount = 743251772,
65+
Metadata = new ResponseMetaData(),
66+
PropertyQuota = new PropertyQuota(),
67+
};
68+
mockGrpcClient.Setup(x => x.RunReport(request, moq::It.IsAny<grpccore::CallOptions>())).Returns(expectedResponse);
69+
BetaAnalyticsDataClient client = new BetaAnalyticsDataClientImpl(mockGrpcClient.Object, null);
70+
RunReportResponse response = client.RunReport(request);
71+
xunit::Assert.Same(expectedResponse, response);
72+
mockGrpcClient.VerifyAll();
73+
}
74+
75+
[xunit::FactAttribute]
76+
public async stt::Task RunReportRequestObjectAsync()
77+
{
78+
moq::Mock<BetaAnalyticsData.BetaAnalyticsDataClient> mockGrpcClient = new moq::Mock<BetaAnalyticsData.BetaAnalyticsDataClient>(moq::MockBehavior.Strict);
79+
RunReportRequest request = new RunReportRequest
80+
{
81+
Property = "propertyc9b48d1a",
82+
Dimensions = { new Dimension(), },
83+
Metrics = { new Metric(), },
84+
DateRanges = { new DateRange(), },
85+
DimensionFilter = new FilterExpression(),
86+
MetricFilter = new FilterExpression(),
87+
Offset = -4389998161825790342L,
88+
Limit = 7494001492025909162L,
89+
MetricAggregations =
90+
{
91+
MetricAggregation.Minimum,
92+
},
93+
OrderBys = { new OrderBy(), },
94+
CurrencyCode = "currency_code7f81e352",
95+
CohortSpec = new CohortSpec(),
96+
KeepEmptyRows = true,
97+
ReturnPropertyQuota = true,
98+
};
99+
RunReportResponse expectedResponse = new RunReportResponse
100+
{
101+
DimensionHeaders =
102+
{
103+
new DimensionHeader(),
104+
},
105+
MetricHeaders = { new MetricHeader(), },
106+
Rows = { new Row(), },
107+
Totals = { new Row(), },
108+
Maximums = { new Row(), },
109+
Minimums = { new Row(), },
110+
RowCount = 743251772,
111+
Metadata = new ResponseMetaData(),
112+
PropertyQuota = new PropertyQuota(),
113+
};
114+
mockGrpcClient.Setup(x => x.RunReportAsync(request, moq::It.IsAny<grpccore::CallOptions>())).Returns(new grpccore::AsyncUnaryCall<RunReportResponse>(stt::Task.FromResult(expectedResponse), null, null, null, null));
115+
BetaAnalyticsDataClient client = new BetaAnalyticsDataClientImpl(mockGrpcClient.Object, null);
116+
RunReportResponse responseCallSettings = await client.RunReportAsync(request, gaxgrpc::CallSettings.FromCancellationToken(st::CancellationToken.None));
117+
xunit::Assert.Same(expectedResponse, responseCallSettings);
118+
RunReportResponse responseCancellationToken = await client.RunReportAsync(request, st::CancellationToken.None);
119+
xunit::Assert.Same(expectedResponse, responseCancellationToken);
120+
mockGrpcClient.VerifyAll();
121+
}
122+
29123
[xunit::FactAttribute]
30124
public void RunPivotReportRequestObject()
31125
{
@@ -391,7 +485,7 @@ public void RunRealtimeReportRequestObject()
391485
Metrics = { new Metric(), },
392486
DimensionFilter = new FilterExpression(),
393487
MetricFilter = new FilterExpression(),
394-
PageSize = -226905851,
488+
Limit = 7494001492025909162L,
395489
MetricAggregations =
396490
{
397491
MetricAggregation.Minimum,
@@ -410,7 +504,7 @@ public void RunRealtimeReportRequestObject()
410504
Totals = { new Row(), },
411505
Maximums = { new Row(), },
412506
Minimums = { new Row(), },
413-
TotalSize = 1202968108,
507+
RowCount = 743251772,
414508
PropertyQuota = new PropertyQuota(),
415509
};
416510
mockGrpcClient.Setup(x => x.RunRealtimeReport(request, moq::It.IsAny<grpccore::CallOptions>())).Returns(expectedResponse);
@@ -431,7 +525,7 @@ public void RunRealtimeReportRequestObject()
431525
Metrics = { new Metric(), },
432526
DimensionFilter = new FilterExpression(),
433527
MetricFilter = new FilterExpression(),
434-
PageSize = -226905851,
528+
Limit = 7494001492025909162L,
435529
MetricAggregations =
436530
{
437531
MetricAggregation.Minimum,
@@ -450,7 +544,7 @@ public void RunRealtimeReportRequestObject()
450544
Totals = { new Row(), },
451545
Maximums = { new Row(), },
452546
Minimums = { new Row(), },
453-
TotalSize = 1202968108,
547+
RowCount = 743251772,
454548
PropertyQuota = new PropertyQuota(),
455549
};
456550
mockGrpcClient.Setup(x => x.RunRealtimeReportAsync(request, moq::It.IsAny<grpccore::CallOptions>())).Returns(new grpccore::AsyncUnaryCall<RunRealtimeReportResponse>(stt::Task.FromResult(expectedResponse), null, null, null, null));

0 commit comments

Comments
 (0)