Skip to content

Commit 164878e

Browse files
michaelbausorgarrettjonesgoogle
michaelbausor
authored and
garrettjonesgoogle
committed
Update gax (#1404)
* Update gax * Update language * Error reporting * Logging * Update pubsub * Monitoring * Speech, trace, vision
1 parent e2bf4d4 commit 164878e

File tree

47 files changed

+2072
-514
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

+2072
-514
lines changed

‎google-cloud-core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<dependency>
112112
<groupId>com.google.api</groupId>
113113
<artifactId>gax</artifactId>
114-
<version>0.0.22</version>
114+
<version>0.0.23</version>
115115
<exclusions>
116116
<exclusion>
117117
<groupId>io.grpc</groupId>

‎google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceTest.java

+37-7
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,16 @@
1515
*/
1616
package com.google.cloud.errorreporting.spi.v1beta1;
1717

18+
import com.google.api.gax.grpc.ApiException;
1819
import com.google.api.gax.testing.MockGrpcService;
1920
import com.google.api.gax.testing.MockServiceHelper;
2021
import com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup;
2122
import com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest;
2223
import com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest;
2324
import com.google.protobuf.GeneratedMessageV3;
25+
import io.grpc.Status;
26+
import io.grpc.StatusRuntimeException;
2427
import java.io.IOException;
25-
import java.util.ArrayList;
2628
import java.util.Arrays;
2729
import java.util.List;
2830
import org.junit.After;
@@ -79,9 +81,7 @@ public void getGroupTest() {
7981
String name = "name3373707";
8082
String groupId = "groupId506361563";
8183
ErrorGroup expectedResponse = ErrorGroup.newBuilder().setName(name).setGroupId(groupId).build();
82-
List<GeneratedMessageV3> expectedResponses = new ArrayList<>();
83-
expectedResponses.add(expectedResponse);
84-
mockErrorGroupService.setResponses(expectedResponses);
84+
mockErrorGroupService.addResponse(expectedResponse);
8585

8686
String formattedGroupName = ErrorGroupServiceApi.formatGroupName("[PROJECT]", "[GROUP]");
8787

@@ -95,15 +95,29 @@ public void getGroupTest() {
9595
Assert.assertEquals(formattedGroupName, actualRequest.getGroupName());
9696
}
9797

98+
@Test
99+
@SuppressWarnings("all")
100+
public void getGroupExceptionTest() throws Exception {
101+
StatusRuntimeException exception = new StatusRuntimeException(Status.INTERNAL);
102+
mockErrorGroupService.addException(exception);
103+
104+
try {
105+
String formattedGroupName = ErrorGroupServiceApi.formatGroupName("[PROJECT]", "[GROUP]");
106+
107+
api.getGroup(formattedGroupName);
108+
Assert.fail("No exception raised");
109+
} catch (ApiException e) {
110+
Assert.assertEquals(Status.INTERNAL.getCode(), e.getStatusCode());
111+
}
112+
}
113+
98114
@Test
99115
@SuppressWarnings("all")
100116
public void updateGroupTest() {
101117
String name = "name3373707";
102118
String groupId = "groupId506361563";
103119
ErrorGroup expectedResponse = ErrorGroup.newBuilder().setName(name).setGroupId(groupId).build();
104-
List<GeneratedMessageV3> expectedResponses = new ArrayList<>();
105-
expectedResponses.add(expectedResponse);
106-
mockErrorGroupService.setResponses(expectedResponses);
120+
mockErrorGroupService.addResponse(expectedResponse);
107121

108122
ErrorGroup group = ErrorGroup.newBuilder().build();
109123

@@ -116,4 +130,20 @@ public void updateGroupTest() {
116130

117131
Assert.assertEquals(group, actualRequest.getGroup());
118132
}
133+
134+
@Test
135+
@SuppressWarnings("all")
136+
public void updateGroupExceptionTest() throws Exception {
137+
StatusRuntimeException exception = new StatusRuntimeException(Status.INTERNAL);
138+
mockErrorGroupService.addException(exception);
139+
140+
try {
141+
ErrorGroup group = ErrorGroup.newBuilder().build();
142+
143+
api.updateGroup(group);
144+
Assert.fail("No exception raised");
145+
} catch (ApiException e) {
146+
Assert.assertEquals(Status.INTERNAL.getCode(), e.getStatusCode());
147+
}
148+
}
119149
}

‎google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceTest.java

+56-10
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import static com.google.cloud.errorreporting.spi.v1beta1.PagedResponseWrappers.ListEventsPagedResponse;
1919
import static com.google.cloud.errorreporting.spi.v1beta1.PagedResponseWrappers.ListGroupStatsPagedResponse;
2020

21+
import com.google.api.gax.grpc.ApiException;
2122
import com.google.api.gax.testing.MockGrpcService;
2223
import com.google.api.gax.testing.MockServiceHelper;
2324
import com.google.common.collect.Lists;
@@ -31,8 +32,9 @@
3132
import com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse;
3233
import com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange;
3334
import com.google.protobuf.GeneratedMessageV3;
35+
import io.grpc.Status;
36+
import io.grpc.StatusRuntimeException;
3437
import java.io.IOException;
35-
import java.util.ArrayList;
3638
import java.util.Arrays;
3739
import java.util.List;
3840
import org.junit.After;
@@ -94,9 +96,7 @@ public void listGroupStatsTest() {
9496
.setNextPageToken(nextPageToken)
9597
.addAllErrorGroupStats(errorGroupStats)
9698
.build();
97-
List<GeneratedMessageV3> expectedResponses = new ArrayList<>();
98-
expectedResponses.add(expectedResponse);
99-
mockErrorStatsService.setResponses(expectedResponses);
99+
mockErrorStatsService.addResponse(expectedResponse);
100100

101101
String formattedProjectName = ErrorStatsServiceApi.formatProjectName("[PROJECT]");
102102
QueryTimeRange timeRange = QueryTimeRange.newBuilder().build();
@@ -116,6 +116,23 @@ public void listGroupStatsTest() {
116116
Assert.assertEquals(timeRange, actualRequest.getTimeRange());
117117
}
118118

119+
@Test
120+
@SuppressWarnings("all")
121+
public void listGroupStatsExceptionTest() throws Exception {
122+
StatusRuntimeException exception = new StatusRuntimeException(Status.INTERNAL);
123+
mockErrorStatsService.addException(exception);
124+
125+
try {
126+
String formattedProjectName = ErrorStatsServiceApi.formatProjectName("[PROJECT]");
127+
QueryTimeRange timeRange = QueryTimeRange.newBuilder().build();
128+
129+
api.listGroupStats(formattedProjectName, timeRange);
130+
Assert.fail("No exception raised");
131+
} catch (ApiException e) {
132+
Assert.assertEquals(Status.INTERNAL.getCode(), e.getStatusCode());
133+
}
134+
}
135+
119136
@Test
120137
@SuppressWarnings("all")
121138
public void listEventsTest() {
@@ -127,9 +144,7 @@ public void listEventsTest() {
127144
.setNextPageToken(nextPageToken)
128145
.addAllErrorEvents(errorEvents)
129146
.build();
130-
List<GeneratedMessageV3> expectedResponses = new ArrayList<>();
131-
expectedResponses.add(expectedResponse);
132-
mockErrorStatsService.setResponses(expectedResponses);
147+
mockErrorStatsService.addResponse(expectedResponse);
133148

134149
String formattedProjectName = ErrorStatsServiceApi.formatProjectName("[PROJECT]");
135150
String groupId = "groupId506361563";
@@ -148,13 +163,28 @@ public void listEventsTest() {
148163
Assert.assertEquals(groupId, actualRequest.getGroupId());
149164
}
150165

166+
@Test
167+
@SuppressWarnings("all")
168+
public void listEventsExceptionTest() throws Exception {
169+
StatusRuntimeException exception = new StatusRuntimeException(Status.INTERNAL);
170+
mockErrorStatsService.addException(exception);
171+
172+
try {
173+
String formattedProjectName = ErrorStatsServiceApi.formatProjectName("[PROJECT]");
174+
String groupId = "groupId506361563";
175+
176+
api.listEvents(formattedProjectName, groupId);
177+
Assert.fail("No exception raised");
178+
} catch (ApiException e) {
179+
Assert.assertEquals(Status.INTERNAL.getCode(), e.getStatusCode());
180+
}
181+
}
182+
151183
@Test
152184
@SuppressWarnings("all")
153185
public void deleteEventsTest() {
154186
DeleteEventsResponse expectedResponse = DeleteEventsResponse.newBuilder().build();
155-
List<GeneratedMessageV3> expectedResponses = new ArrayList<>();
156-
expectedResponses.add(expectedResponse);
157-
mockErrorStatsService.setResponses(expectedResponses);
187+
mockErrorStatsService.addResponse(expectedResponse);
158188

159189
String formattedProjectName = ErrorStatsServiceApi.formatProjectName("[PROJECT]");
160190

@@ -167,4 +197,20 @@ public void deleteEventsTest() {
167197

168198
Assert.assertEquals(formattedProjectName, actualRequest.getProjectName());
169199
}
200+
201+
@Test
202+
@SuppressWarnings("all")
203+
public void deleteEventsExceptionTest() throws Exception {
204+
StatusRuntimeException exception = new StatusRuntimeException(Status.INTERNAL);
205+
mockErrorStatsService.addException(exception);
206+
207+
try {
208+
String formattedProjectName = ErrorStatsServiceApi.formatProjectName("[PROJECT]");
209+
210+
api.deleteEvents(formattedProjectName);
211+
Assert.fail("No exception raised");
212+
} catch (ApiException e) {
213+
Assert.assertEquals(Status.INTERNAL.getCode(), e.getStatusCode());
214+
}
215+
}
170216
}

‎google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorGroupService.java

+10
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,16 @@ public List<GeneratedMessageV3> getRequests() {
3333
return serviceImpl.getRequests();
3434
}
3535

36+
@Override
37+
public void addResponse(GeneratedMessageV3 response) {
38+
serviceImpl.addResponse(response);
39+
}
40+
41+
@Override
42+
public void addException(Exception exception) {
43+
serviceImpl.addException(exception);
44+
}
45+
3646
@Override
3747
public void setResponses(List<GeneratedMessageV3> responses) {
3848
serviceImpl.setResponses(responses);

‎google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorGroupServiceImpl.java

+30-11
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package com.google.cloud.errorreporting.spi.v1beta1;
1717

18-
import com.google.common.collect.Lists;
1918
import com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup;
2019
import com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupServiceGrpc.ErrorGroupServiceImplBase;
2120
import com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest;
@@ -30,7 +29,7 @@
3029
@javax.annotation.Generated("by GAPIC")
3130
public class MockErrorGroupServiceImpl extends ErrorGroupServiceImplBase {
3231
private ArrayList<GeneratedMessageV3> requests;
33-
private Queue<GeneratedMessageV3> responses;
32+
private Queue<Object> responses;
3433

3534
public MockErrorGroupServiceImpl() {
3635
requests = new ArrayList<>();
@@ -41,8 +40,16 @@ public List<GeneratedMessageV3> getRequests() {
4140
return requests;
4241
}
4342

43+
public void addResponse(GeneratedMessageV3 response) {
44+
responses.add(response);
45+
}
46+
4447
public void setResponses(List<GeneratedMessageV3> responses) {
45-
this.responses = Lists.newLinkedList(responses);
48+
this.responses = new LinkedList<Object>(responses);
49+
}
50+
51+
public void addException(Exception exception) {
52+
responses.add(exception);
4653
}
4754

4855
public void reset() {
@@ -52,17 +59,29 @@ public void reset() {
5259

5360
@Override
5461
public void getGroup(GetGroupRequest request, StreamObserver<ErrorGroup> responseObserver) {
55-
ErrorGroup response = (ErrorGroup) responses.remove();
56-
requests.add(request);
57-
responseObserver.onNext(response);
58-
responseObserver.onCompleted();
62+
Object response = responses.remove();
63+
if (response instanceof ErrorGroup) {
64+
requests.add(request);
65+
responseObserver.onNext((ErrorGroup) response);
66+
responseObserver.onCompleted();
67+
} else if (response instanceof Exception) {
68+
responseObserver.onError((Exception) response);
69+
} else {
70+
responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
71+
}
5972
}
6073

6174
@Override
6275
public void updateGroup(UpdateGroupRequest request, StreamObserver<ErrorGroup> responseObserver) {
63-
ErrorGroup response = (ErrorGroup) responses.remove();
64-
requests.add(request);
65-
responseObserver.onNext(response);
66-
responseObserver.onCompleted();
76+
Object response = responses.remove();
77+
if (response instanceof ErrorGroup) {
78+
requests.add(request);
79+
responseObserver.onNext((ErrorGroup) response);
80+
responseObserver.onCompleted();
81+
} else if (response instanceof Exception) {
82+
responseObserver.onError((Exception) response);
83+
} else {
84+
responseObserver.onError(new IllegalArgumentException("Unrecognized response type"));
85+
}
6786
}
6887
}

‎google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorStatsService.java

+10
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,16 @@ public List<GeneratedMessageV3> getRequests() {
3333
return serviceImpl.getRequests();
3434
}
3535

36+
@Override
37+
public void addResponse(GeneratedMessageV3 response) {
38+
serviceImpl.addResponse(response);
39+
}
40+
41+
@Override
42+
public void addException(Exception exception) {
43+
serviceImpl.addException(exception);
44+
}
45+
3646
@Override
3747
public void setResponses(List<GeneratedMessageV3> responses) {
3848
serviceImpl.setResponses(responses);

0 commit comments

Comments
 (0)