Skip to content

Commit b7bf078

Browse files
kolea2kolea2
authored
Upgrade gax to 1.43.0. (googleapis#4836)
* Upgrade gax to 1.43.0. * code format
1 parent 8f75eac commit b7bf078

9 files changed

Lines changed: 47 additions & 47 deletions

File tree

‎java-logging/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
import com.google.logging.v2.SinkNames;
5252
import com.google.logging.v2.UpdateExclusionRequest;
5353
import com.google.logging.v2.UpdateSinkRequest;
54+
import com.google.protobuf.AbstractMessage;
5455
import com.google.protobuf.Empty;
5556
import com.google.protobuf.FieldMask;
56-
import com.google.protobuf.GeneratedMessageV3;
5757
import io.grpc.Status;
5858
import io.grpc.StatusRuntimeException;
5959
import java.io.IOException;
@@ -128,7 +128,7 @@ public void listSinksTest() {
128128
Assert.assertEquals(1, resources.size());
129129
Assert.assertEquals(expectedResponse.getSinksList().get(0), resources.get(0));
130130

131-
List<GeneratedMessageV3> actualRequests = mockConfigServiceV2.getRequests();
131+
List<AbstractMessage> actualRequests = mockConfigServiceV2.getRequests();
132132
Assert.assertEquals(1, actualRequests.size());
133133
ListSinksRequest actualRequest = (ListSinksRequest) actualRequests.get(0);
134134

@@ -178,7 +178,7 @@ public void getSinkTest() {
178178
LogSink actualResponse = client.getSink(sinkName);
179179
Assert.assertEquals(expectedResponse, actualResponse);
180180

181-
List<GeneratedMessageV3> actualRequests = mockConfigServiceV2.getRequests();
181+
List<AbstractMessage> actualRequests = mockConfigServiceV2.getRequests();
182182
Assert.assertEquals(1, actualRequests.size());
183183
GetSinkRequest actualRequest = (GetSinkRequest) actualRequests.get(0);
184184

@@ -229,7 +229,7 @@ public void createSinkTest() {
229229
LogSink actualResponse = client.createSink(parent, sink);
230230
Assert.assertEquals(expectedResponse, actualResponse);
231231

232-
List<GeneratedMessageV3> actualRequests = mockConfigServiceV2.getRequests();
232+
List<AbstractMessage> actualRequests = mockConfigServiceV2.getRequests();
233233
Assert.assertEquals(1, actualRequests.size());
234234
CreateSinkRequest actualRequest = (CreateSinkRequest) actualRequests.get(0);
235235

@@ -283,7 +283,7 @@ public void updateSinkTest() {
283283
LogSink actualResponse = client.updateSink(sinkName, sink, updateMask);
284284
Assert.assertEquals(expectedResponse, actualResponse);
285285

286-
List<GeneratedMessageV3> actualRequests = mockConfigServiceV2.getRequests();
286+
List<AbstractMessage> actualRequests = mockConfigServiceV2.getRequests();
287287
Assert.assertEquals(1, actualRequests.size());
288288
UpdateSinkRequest actualRequest = (UpdateSinkRequest) actualRequests.get(0);
289289

@@ -338,7 +338,7 @@ public void updateSinkTest2() {
338338
LogSink actualResponse = client.updateSink(sinkName, sink);
339339
Assert.assertEquals(expectedResponse, actualResponse);
340340

341-
List<GeneratedMessageV3> actualRequests = mockConfigServiceV2.getRequests();
341+
List<AbstractMessage> actualRequests = mockConfigServiceV2.getRequests();
342342
Assert.assertEquals(1, actualRequests.size());
343343
UpdateSinkRequest actualRequest = (UpdateSinkRequest) actualRequests.get(0);
344344

@@ -377,7 +377,7 @@ public void deleteSinkTest() {
377377

378378
client.deleteSink(sinkName);
379379

380-
List<GeneratedMessageV3> actualRequests = mockConfigServiceV2.getRequests();
380+
List<AbstractMessage> actualRequests = mockConfigServiceV2.getRequests();
381381
Assert.assertEquals(1, actualRequests.size());
382382
DeleteSinkRequest actualRequest = (DeleteSinkRequest) actualRequests.get(0);
383383

@@ -425,7 +425,7 @@ public void listExclusionsTest() {
425425
Assert.assertEquals(1, resources.size());
426426
Assert.assertEquals(expectedResponse.getExclusionsList().get(0), resources.get(0));
427427

428-
List<GeneratedMessageV3> actualRequests = mockConfigServiceV2.getRequests();
428+
List<AbstractMessage> actualRequests = mockConfigServiceV2.getRequests();
429429
Assert.assertEquals(1, actualRequests.size());
430430
ListExclusionsRequest actualRequest = (ListExclusionsRequest) actualRequests.get(0);
431431

@@ -473,7 +473,7 @@ public void getExclusionTest() {
473473
LogExclusion actualResponse = client.getExclusion(name);
474474
Assert.assertEquals(expectedResponse, actualResponse);
475475

476-
List<GeneratedMessageV3> actualRequests = mockConfigServiceV2.getRequests();
476+
List<AbstractMessage> actualRequests = mockConfigServiceV2.getRequests();
477477
Assert.assertEquals(1, actualRequests.size());
478478
GetExclusionRequest actualRequest = (GetExclusionRequest) actualRequests.get(0);
479479

@@ -522,7 +522,7 @@ public void createExclusionTest() {
522522
LogExclusion actualResponse = client.createExclusion(parent, exclusion);
523523
Assert.assertEquals(expectedResponse, actualResponse);
524524

525-
List<GeneratedMessageV3> actualRequests = mockConfigServiceV2.getRequests();
525+
List<AbstractMessage> actualRequests = mockConfigServiceV2.getRequests();
526526
Assert.assertEquals(1, actualRequests.size());
527527
CreateExclusionRequest actualRequest = (CreateExclusionRequest) actualRequests.get(0);
528528

@@ -574,7 +574,7 @@ public void updateExclusionTest() {
574574
LogExclusion actualResponse = client.updateExclusion(name, exclusion, updateMask);
575575
Assert.assertEquals(expectedResponse, actualResponse);
576576

577-
List<GeneratedMessageV3> actualRequests = mockConfigServiceV2.getRequests();
577+
List<AbstractMessage> actualRequests = mockConfigServiceV2.getRequests();
578578
Assert.assertEquals(1, actualRequests.size());
579579
UpdateExclusionRequest actualRequest = (UpdateExclusionRequest) actualRequests.get(0);
580580

@@ -615,7 +615,7 @@ public void deleteExclusionTest() {
615615

616616
client.deleteExclusion(name);
617617

618-
List<GeneratedMessageV3> actualRequests = mockConfigServiceV2.getRequests();
618+
List<AbstractMessage> actualRequests = mockConfigServiceV2.getRequests();
619619
Assert.assertEquals(1, actualRequests.size());
620620
DeleteExclusionRequest actualRequest = (DeleteExclusionRequest) actualRequests.get(0);
621621

‎java-logging/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
import com.google.logging.v2.ProjectName;
4242
import com.google.logging.v2.WriteLogEntriesRequest;
4343
import com.google.logging.v2.WriteLogEntriesResponse;
44+
import com.google.protobuf.AbstractMessage;
4445
import com.google.protobuf.Empty;
45-
import com.google.protobuf.GeneratedMessageV3;
4646
import io.grpc.Status;
4747
import io.grpc.StatusRuntimeException;
4848
import java.io.IOException;
@@ -112,7 +112,7 @@ public void deleteLogTest() {
112112

113113
client.deleteLog(logName);
114114

115-
List<GeneratedMessageV3> actualRequests = mockLoggingServiceV2.getRequests();
115+
List<AbstractMessage> actualRequests = mockLoggingServiceV2.getRequests();
116116
Assert.assertEquals(1, actualRequests.size());
117117
DeleteLogRequest actualRequest = (DeleteLogRequest) actualRequests.get(0);
118118

@@ -154,7 +154,7 @@ public void writeLogEntriesTest() {
154154
client.writeLogEntries(logName, resource, labels, entries);
155155
Assert.assertEquals(expectedResponse, actualResponse);
156156

157-
List<GeneratedMessageV3> actualRequests = mockLoggingServiceV2.getRequests();
157+
List<AbstractMessage> actualRequests = mockLoggingServiceV2.getRequests();
158158
Assert.assertEquals(1, actualRequests.size());
159159
WriteLogEntriesRequest actualRequest = (WriteLogEntriesRequest) actualRequests.get(0);
160160

@@ -211,7 +211,7 @@ public void listLogEntriesTest() {
211211
Assert.assertEquals(1, resources.size());
212212
Assert.assertEquals(expectedResponse.getEntriesList().get(0), resources.get(0));
213213

214-
List<GeneratedMessageV3> actualRequests = mockLoggingServiceV2.getRequests();
214+
List<AbstractMessage> actualRequests = mockLoggingServiceV2.getRequests();
215215
Assert.assertEquals(1, actualRequests.size());
216216
ListLogEntriesRequest actualRequest = (ListLogEntriesRequest) actualRequests.get(0);
217217

@@ -263,7 +263,7 @@ public void listLogsTest() {
263263
Assert.assertEquals(1, resources.size());
264264
Assert.assertEquals(expectedResponse.getLogNamesList().get(0), resources.get(0));
265265

266-
List<GeneratedMessageV3> actualRequests = mockLoggingServiceV2.getRequests();
266+
List<AbstractMessage> actualRequests = mockLoggingServiceV2.getRequests();
267267
Assert.assertEquals(1, actualRequests.size());
268268
ListLogsRequest actualRequest = (ListLogsRequest) actualRequests.get(0);
269269

‎java-logging/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
import com.google.logging.v2.ProjectMetricName;
3939
import com.google.logging.v2.ProjectName;
4040
import com.google.logging.v2.UpdateLogMetricRequest;
41+
import com.google.protobuf.AbstractMessage;
4142
import com.google.protobuf.Empty;
42-
import com.google.protobuf.GeneratedMessageV3;
4343
import io.grpc.Status;
4444
import io.grpc.StatusRuntimeException;
4545
import java.io.IOException;
@@ -117,7 +117,7 @@ public void listLogMetricsTest() {
117117
Assert.assertEquals(1, resources.size());
118118
Assert.assertEquals(expectedResponse.getMetricsList().get(0), resources.get(0));
119119

120-
List<GeneratedMessageV3> actualRequests = mockMetricsServiceV2.getRequests();
120+
List<AbstractMessage> actualRequests = mockMetricsServiceV2.getRequests();
121121
Assert.assertEquals(1, actualRequests.size());
122122
ListLogMetricsRequest actualRequest = (ListLogMetricsRequest) actualRequests.get(0);
123123

@@ -165,7 +165,7 @@ public void getLogMetricTest() {
165165
LogMetric actualResponse = client.getLogMetric(metricName);
166166
Assert.assertEquals(expectedResponse, actualResponse);
167167

168-
List<GeneratedMessageV3> actualRequests = mockMetricsServiceV2.getRequests();
168+
List<AbstractMessage> actualRequests = mockMetricsServiceV2.getRequests();
169169
Assert.assertEquals(1, actualRequests.size());
170170
GetLogMetricRequest actualRequest = (GetLogMetricRequest) actualRequests.get(0);
171171

@@ -214,7 +214,7 @@ public void createLogMetricTest() {
214214
LogMetric actualResponse = client.createLogMetric(parent, metric);
215215
Assert.assertEquals(expectedResponse, actualResponse);
216216

217-
List<GeneratedMessageV3> actualRequests = mockMetricsServiceV2.getRequests();
217+
List<AbstractMessage> actualRequests = mockMetricsServiceV2.getRequests();
218218
Assert.assertEquals(1, actualRequests.size());
219219
CreateLogMetricRequest actualRequest = (CreateLogMetricRequest) actualRequests.get(0);
220220

@@ -265,7 +265,7 @@ public void updateLogMetricTest() {
265265
LogMetric actualResponse = client.updateLogMetric(metricName, metric);
266266
Assert.assertEquals(expectedResponse, actualResponse);
267267

268-
List<GeneratedMessageV3> actualRequests = mockMetricsServiceV2.getRequests();
268+
List<AbstractMessage> actualRequests = mockMetricsServiceV2.getRequests();
269269
Assert.assertEquals(1, actualRequests.size());
270270
UpdateLogMetricRequest actualRequest = (UpdateLogMetricRequest) actualRequests.get(0);
271271

@@ -304,7 +304,7 @@ public void deleteLogMetricTest() {
304304

305305
client.deleteLogMetric(metricName);
306306

307-
List<GeneratedMessageV3> actualRequests = mockMetricsServiceV2.getRequests();
307+
List<AbstractMessage> actualRequests = mockMetricsServiceV2.getRequests();
308308
Assert.assertEquals(1, actualRequests.size());
309309
DeleteLogMetricRequest actualRequest = (DeleteLogMetricRequest) actualRequests.get(0);
310310

‎java-logging/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import com.google.api.core.BetaApi;
1919
import com.google.api.gax.grpc.testing.MockGrpcService;
20-
import com.google.protobuf.GeneratedMessageV3;
20+
import com.google.protobuf.AbstractMessage;
2121
import io.grpc.ServerServiceDefinition;
2222
import java.util.List;
2323

@@ -31,12 +31,12 @@ public MockConfigServiceV2() {
3131
}
3232

3333
@Override
34-
public List<GeneratedMessageV3> getRequests() {
34+
public List<AbstractMessage> getRequests() {
3535
return serviceImpl.getRequests();
3636
}
3737

3838
@Override
39-
public void addResponse(GeneratedMessageV3 response) {
39+
public void addResponse(AbstractMessage response) {
4040
serviceImpl.addResponse(response);
4141
}
4242

‎java-logging/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import com.google.logging.v2.LogSink;
3232
import com.google.logging.v2.UpdateExclusionRequest;
3333
import com.google.logging.v2.UpdateSinkRequest;
34+
import com.google.protobuf.AbstractMessage;
3435
import com.google.protobuf.Empty;
35-
import com.google.protobuf.GeneratedMessageV3;
3636
import io.grpc.stub.StreamObserver;
3737
import java.util.ArrayList;
3838
import java.util.LinkedList;
@@ -42,23 +42,23 @@
4242
@javax.annotation.Generated("by GAPIC")
4343
@BetaApi
4444
public class MockConfigServiceV2Impl extends ConfigServiceV2ImplBase {
45-
private ArrayList<GeneratedMessageV3> requests;
45+
private ArrayList<AbstractMessage> requests;
4646
private Queue<Object> responses;
4747

4848
public MockConfigServiceV2Impl() {
4949
requests = new ArrayList<>();
5050
responses = new LinkedList<>();
5151
}
5252

53-
public List<GeneratedMessageV3> getRequests() {
53+
public List<AbstractMessage> getRequests() {
5454
return requests;
5555
}
5656

57-
public void addResponse(GeneratedMessageV3 response) {
57+
public void addResponse(AbstractMessage response) {
5858
responses.add(response);
5959
}
6060

61-
public void setResponses(List<GeneratedMessageV3> responses) {
61+
public void setResponses(List<AbstractMessage> responses) {
6262
this.responses = new LinkedList<Object>(responses);
6363
}
6464

‎java-logging/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import com.google.api.core.BetaApi;
1919
import com.google.api.gax.grpc.testing.MockGrpcService;
20-
import com.google.protobuf.GeneratedMessageV3;
20+
import com.google.protobuf.AbstractMessage;
2121
import io.grpc.ServerServiceDefinition;
2222
import java.util.List;
2323

@@ -31,12 +31,12 @@ public MockLoggingServiceV2() {
3131
}
3232

3333
@Override
34-
public List<GeneratedMessageV3> getRequests() {
34+
public List<AbstractMessage> getRequests() {
3535
return serviceImpl.getRequests();
3636
}
3737

3838
@Override
39-
public void addResponse(GeneratedMessageV3 response) {
39+
public void addResponse(AbstractMessage response) {
4040
serviceImpl.addResponse(response);
4141
}
4242

‎java-logging/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import com.google.logging.v2.LoggingServiceV2Grpc.LoggingServiceV2ImplBase;
2727
import com.google.logging.v2.WriteLogEntriesRequest;
2828
import com.google.logging.v2.WriteLogEntriesResponse;
29+
import com.google.protobuf.AbstractMessage;
2930
import com.google.protobuf.Empty;
30-
import com.google.protobuf.GeneratedMessageV3;
3131
import io.grpc.stub.StreamObserver;
3232
import java.util.ArrayList;
3333
import java.util.LinkedList;
@@ -37,23 +37,23 @@
3737
@javax.annotation.Generated("by GAPIC")
3838
@BetaApi
3939
public class MockLoggingServiceV2Impl extends LoggingServiceV2ImplBase {
40-
private ArrayList<GeneratedMessageV3> requests;
40+
private ArrayList<AbstractMessage> requests;
4141
private Queue<Object> responses;
4242

4343
public MockLoggingServiceV2Impl() {
4444
requests = new ArrayList<>();
4545
responses = new LinkedList<>();
4646
}
4747

48-
public List<GeneratedMessageV3> getRequests() {
48+
public List<AbstractMessage> getRequests() {
4949
return requests;
5050
}
5151

52-
public void addResponse(GeneratedMessageV3 response) {
52+
public void addResponse(AbstractMessage response) {
5353
responses.add(response);
5454
}
5555

56-
public void setResponses(List<GeneratedMessageV3> responses) {
56+
public void setResponses(List<AbstractMessage> responses) {
5757
this.responses = new LinkedList<Object>(responses);
5858
}
5959

‎java-logging/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import com.google.api.core.BetaApi;
1919
import com.google.api.gax.grpc.testing.MockGrpcService;
20-
import com.google.protobuf.GeneratedMessageV3;
20+
import com.google.protobuf.AbstractMessage;
2121
import io.grpc.ServerServiceDefinition;
2222
import java.util.List;
2323

@@ -31,12 +31,12 @@ public MockMetricsServiceV2() {
3131
}
3232

3333
@Override
34-
public List<GeneratedMessageV3> getRequests() {
34+
public List<AbstractMessage> getRequests() {
3535
return serviceImpl.getRequests();
3636
}
3737

3838
@Override
39-
public void addResponse(GeneratedMessageV3 response) {
39+
public void addResponse(AbstractMessage response) {
4040
serviceImpl.addResponse(response);
4141
}
4242

‎java-logging/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import com.google.logging.v2.LogMetric;
2525
import com.google.logging.v2.MetricsServiceV2Grpc.MetricsServiceV2ImplBase;
2626
import com.google.logging.v2.UpdateLogMetricRequest;
27+
import com.google.protobuf.AbstractMessage;
2728
import com.google.protobuf.Empty;
28-
import com.google.protobuf.GeneratedMessageV3;
2929
import io.grpc.stub.StreamObserver;
3030
import java.util.ArrayList;
3131
import java.util.LinkedList;
@@ -35,23 +35,23 @@
3535
@javax.annotation.Generated("by GAPIC")
3636
@BetaApi
3737
public class MockMetricsServiceV2Impl extends MetricsServiceV2ImplBase {
38-
private ArrayList<GeneratedMessageV3> requests;
38+
private ArrayList<AbstractMessage> requests;
3939
private Queue<Object> responses;
4040

4141
public MockMetricsServiceV2Impl() {
4242
requests = new ArrayList<>();
4343
responses = new LinkedList<>();
4444
}
4545

46-
public List<GeneratedMessageV3> getRequests() {
46+
public List<AbstractMessage> getRequests() {
4747
return requests;
4848
}
4949

50-
public void addResponse(GeneratedMessageV3 response) {
50+
public void addResponse(AbstractMessage response) {
5151
responses.add(response);
5252
}
5353

54-
public void setResponses(List<GeneratedMessageV3> responses) {
54+
public void setResponses(List<AbstractMessage> responses) {
5555
this.responses = new LinkedList<Object>(responses);
5656
}
5757

0 commit comments

Comments
 (0)