Skip to content

Commit 70c6a54

Browse files
garrettjonesgooglegarrettjonesgoogle
committed
Adding generation update to monitoring
1 parent 2524a3a commit 70c6a54

15 files changed

Lines changed: 221 additions & 134 deletions

‎google-cloud-monitoring/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
<dependency>
3131
<groupId>com.google.api.grpc</groupId>
3232
<artifactId>grpc-google-monitoring-v3</artifactId>
33-
<version>0.0.7</version>
33+
<version>0.1.0</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>io.grpc</groupId>
3737
<artifactId>grpc-all</artifactId>
38-
<version>0.15.0</version>
38+
<version>1.0.1</version>
3939
</dependency>
4040
<dependency>
4141
<groupId>com.google.auto.value</groupId>

‎google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceApi.java‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
package com.google.cloud.monitoring.spi.v3;
1515

1616
import com.google.api.MonitoredResource;
17-
import com.google.api.gax.core.PageAccessor;
17+
import com.google.api.gax.core.PagedListResponse;
1818
import com.google.api.gax.grpc.ApiCallable;
1919
import com.google.api.gax.protobuf.PathTemplate;
2020
import com.google.monitoring.v3.CreateGroupRequest;
@@ -106,14 +106,18 @@ public class GroupServiceApi implements AutoCloseable {
106106
private final List<AutoCloseable> closeables = new ArrayList<>();
107107

108108
private final ApiCallable<ListGroupsRequest, ListGroupsResponse> listGroupsCallable;
109-
private final ApiCallable<ListGroupsRequest, PageAccessor<Group>> listGroupsPagedCallable;
109+
private final ApiCallable<
110+
ListGroupsRequest, PagedListResponse<ListGroupsRequest, ListGroupsResponse, Group>>
111+
listGroupsPagedCallable;
110112
private final ApiCallable<GetGroupRequest, Group> getGroupCallable;
111113
private final ApiCallable<CreateGroupRequest, Group> createGroupCallable;
112114
private final ApiCallable<UpdateGroupRequest, Group> updateGroupCallable;
113115
private final ApiCallable<DeleteGroupRequest, Empty> deleteGroupCallable;
114116
private final ApiCallable<ListGroupMembersRequest, ListGroupMembersResponse>
115117
listGroupMembersCallable;
116-
private final ApiCallable<ListGroupMembersRequest, PageAccessor<MonitoredResource>>
118+
private final ApiCallable<
119+
ListGroupMembersRequest,
120+
PagedListResponse<ListGroupMembersRequest, ListGroupMembersResponse, MonitoredResource>>
117121
listGroupMembersPagedCallable;
118122

119123
public final GroupServiceSettings getSettings() {
@@ -244,7 +248,7 @@ public void close() throws IOException {
244248
* ListGroupsRequest request = ListGroupsRequest.newBuilder()
245249
* .setName(formattedName)
246250
* .build();
247-
* for (Group element : groupServiceApi.listGroups(request)) {
251+
* for (Group element : groupServiceApi.listGroups(request).iterateAllElements()) {
248252
* // doThingsWith(element);
249253
* }
250254
* }
@@ -253,7 +257,8 @@ public void close() throws IOException {
253257
* @param request The request object containing all of the parameters for the API call.
254258
* @throws com.google.api.gax.grpc.ApiException if the remote call fails
255259
*/
256-
public final PageAccessor<Group> listGroups(ListGroupsRequest request) {
260+
public final PagedListResponse<ListGroupsRequest, ListGroupsResponse, Group> listGroups(
261+
ListGroupsRequest request) {
257262
return listGroupsPagedCallable().call(request);
258263
}
259264

@@ -269,15 +274,17 @@ public final PageAccessor<Group> listGroups(ListGroupsRequest request) {
269274
* ListGroupsRequest request = ListGroupsRequest.newBuilder()
270275
* .setName(formattedName)
271276
* .build();
272-
* ListenableFuture&lt;PageAccessor&lt;Group&gt;&gt; future = groupServiceApi.listGroupsPagedCallable().futureCall(request);
277+
* ListenableFuture&lt;PagedListResponse&lt;ListGroupsRequest,ListGroupsResponse,Group&gt;&gt; future = groupServiceApi.listGroupsPagedCallable().futureCall(request);
273278
* // Do something
274-
* for (Group element : future.get()) {
279+
* for (Group element : future.get().iterateAllElements()) {
275280
* // doThingsWith(element);
276281
* }
277282
* }
278283
* </code></pre>
279284
*/
280-
public final ApiCallable<ListGroupsRequest, PageAccessor<Group>> listGroupsPagedCallable() {
285+
public final ApiCallable<
286+
ListGroupsRequest, PagedListResponse<ListGroupsRequest, ListGroupsResponse, Group>>
287+
listGroupsPagedCallable() {
281288
return listGroupsPagedCallable;
282289
}
283290

@@ -622,7 +629,7 @@ public final ApiCallable<DeleteGroupRequest, Empty> deleteGroupCallable() {
622629
* String formattedName = GroupServiceApi.formatGroupName("[PROJECT]", "[GROUP]");
623630
* String filter = "";
624631
* TimeInterval interval = TimeInterval.newBuilder().build();
625-
* for (MonitoredResource element : groupServiceApi.listGroupMembers(formattedName, filter, interval)) {
632+
* for (MonitoredResource element : groupServiceApi.listGroupMembers(formattedName, filter, interval).iterateAllElements()) {
626633
* // doThingsWith(element);
627634
* }
628635
* }
@@ -643,8 +650,9 @@ public final ApiCallable<DeleteGroupRequest, Empty> deleteGroupCallable() {
643650
* membership over the last minute is returned.
644651
* @throws com.google.api.gax.grpc.ApiException if the remote call fails
645652
*/
646-
public final PageAccessor<MonitoredResource> listGroupMembers(
647-
String name, String filter, TimeInterval interval) {
653+
public final PagedListResponse<
654+
ListGroupMembersRequest, ListGroupMembersResponse, MonitoredResource>
655+
listGroupMembers(String name, String filter, TimeInterval interval) {
648656
GROUP_PATH_TEMPLATE.validate(name, "listGroupMembers");
649657
ListGroupMembersRequest request =
650658
ListGroupMembersRequest.newBuilder()
@@ -671,7 +679,7 @@ public final PageAccessor<MonitoredResource> listGroupMembers(
671679
* .setFilter(filter)
672680
* .setInterval(interval)
673681
* .build();
674-
* for (MonitoredResource element : groupServiceApi.listGroupMembers(request)) {
682+
* for (MonitoredResource element : groupServiceApi.listGroupMembers(request).iterateAllElements()) {
675683
* // doThingsWith(element);
676684
* }
677685
* }
@@ -680,7 +688,9 @@ public final PageAccessor<MonitoredResource> listGroupMembers(
680688
* @param request The request object containing all of the parameters for the API call.
681689
* @throws com.google.api.gax.grpc.ApiException if the remote call fails
682690
*/
683-
public final PageAccessor<MonitoredResource> listGroupMembers(ListGroupMembersRequest request) {
691+
public final PagedListResponse<
692+
ListGroupMembersRequest, ListGroupMembersResponse, MonitoredResource>
693+
listGroupMembers(ListGroupMembersRequest request) {
684694
return listGroupMembersPagedCallable().call(request);
685695
}
686696

@@ -700,15 +710,17 @@ public final PageAccessor<MonitoredResource> listGroupMembers(ListGroupMembersRe
700710
* .setFilter(filter)
701711
* .setInterval(interval)
702712
* .build();
703-
* ListenableFuture&lt;PageAccessor&lt;MonitoredResource&gt;&gt; future = groupServiceApi.listGroupMembersPagedCallable().futureCall(request);
713+
* ListenableFuture&lt;PagedListResponse&lt;ListGroupMembersRequest,ListGroupMembersResponse,MonitoredResource&gt;&gt; future = groupServiceApi.listGroupMembersPagedCallable().futureCall(request);
704714
* // Do something
705-
* for (MonitoredResource element : future.get()) {
715+
* for (MonitoredResource element : future.get().iterateAllElements()) {
706716
* // doThingsWith(element);
707717
* }
708718
* }
709719
* </code></pre>
710720
*/
711-
public final ApiCallable<ListGroupMembersRequest, PageAccessor<MonitoredResource>>
721+
public final ApiCallable<
722+
ListGroupMembersRequest,
723+
PagedListResponse<ListGroupMembersRequest, ListGroupMembersResponse, MonitoredResource>>
712724
listGroupMembersPagedCallable() {
713725
return listGroupMembersPagedCallable;
714726
}

‎google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceSettings.java‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,16 @@ public ListGroupsRequest injectToken(ListGroupsRequest payload, Object token) {
227227
return ListGroupsRequest.newBuilder(payload).setPageToken((String) token).build();
228228
}
229229

230+
@Override
231+
public ListGroupsRequest injectPageSize(ListGroupsRequest payload, int pageSize) {
232+
return ListGroupsRequest.newBuilder(payload).setPageSize(pageSize).build();
233+
}
234+
235+
@Override
236+
public Integer extractPageSize(ListGroupsRequest payload) {
237+
return payload.getPageSize();
238+
}
239+
230240
@Override
231241
public Object extractNextToken(ListGroupsResponse payload) {
232242
return payload.getNextPageToken();
@@ -256,6 +266,17 @@ public ListGroupMembersRequest injectToken(
256266
.build();
257267
}
258268

269+
@Override
270+
public ListGroupMembersRequest injectPageSize(
271+
ListGroupMembersRequest payload, int pageSize) {
272+
return ListGroupMembersRequest.newBuilder(payload).setPageSize(pageSize).build();
273+
}
274+
275+
@Override
276+
public Integer extractPageSize(ListGroupMembersRequest payload) {
277+
return payload.getPageSize();
278+
}
279+
259280
@Override
260281
public Object extractNextToken(ListGroupMembersResponse payload) {
261282
return payload.getNextPageToken();

0 commit comments

Comments
 (0)