Skip to content

Commit d998044

Browse files
garrettjonesgooglemziccard
authored andcommitted
---
yaml --- r: 7621 b: refs/heads/tswast-patch-1 c: dcee473 h: refs/heads/master i: 7619: 7d8ceb0
1 parent 46cd401 commit d998044

48 files changed

Lines changed: 212 additions & 194 deletions

File tree

Some content is hidden

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

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: 6e391f8d74a3cacd8cb2c1da359903126c946883
60+
refs/heads/tswast-patch-1: dcee4732c3c8ec0249f252131ca101d8d4ec7343
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

branches/tswast-patch-1/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceApi.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@ public class ErrorGroupServiceApi implements AutoCloseable {
8787
private final ApiCallable<GetGroupRequest, ErrorGroup> getGroupCallable;
8888
private final ApiCallable<UpdateGroupRequest, ErrorGroup> updateGroupCallable;
8989

90-
public final ErrorGroupServiceSettings getSettings() {
91-
return settings;
92-
}
93-
9490
private static final PathTemplate GROUP_PATH_TEMPLATE =
9591
PathTemplate.createWithoutUrlEncoding("projects/{project}/groups/{group}");
9692

@@ -172,6 +168,10 @@ public void close() throws IOException {
172168
}
173169
}
174170

171+
public final ErrorGroupServiceSettings getSettings() {
172+
return settings;
173+
}
174+
175175
// AUTO-GENERATED DOCUMENTATION AND METHOD
176176
/**
177177
* Get the specified group.

branches/tswast-patch-1/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceSettings.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ private ErrorGroupServiceSettings(Builder settingsBuilder) throws IOException {
169169
public static class Builder extends ServiceApiSettings.Builder {
170170
private final ImmutableList<ApiCallSettings.Builder> methodSettingsBuilders;
171171

172-
private SimpleCallSettings.Builder<GetGroupRequest, ErrorGroup> getGroupSettings;
173-
private SimpleCallSettings.Builder<UpdateGroupRequest, ErrorGroup> updateGroupSettings;
172+
private final SimpleCallSettings.Builder<GetGroupRequest, ErrorGroup> getGroupSettings;
173+
private final SimpleCallSettings.Builder<UpdateGroupRequest, ErrorGroup> updateGroupSettings;
174174

175175
private static final ImmutableMap<String, ImmutableSet<Status.Code>> RETRYABLE_CODE_DEFINITIONS;
176176

branches/tswast-patch-1/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceApi.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,6 @@ public class ErrorStatsServiceApi implements AutoCloseable {
103103
listEventsPagedCallable;
104104
private final ApiCallable<DeleteEventsRequest, DeleteEventsResponse> deleteEventsCallable;
105105

106-
public final ErrorStatsServiceSettings getSettings() {
107-
return settings;
108-
}
109-
110106
private static final PathTemplate PROJECT_PATH_TEMPLATE =
111107
PathTemplate.createWithoutUrlEncoding("projects/{project}");
112108

@@ -185,6 +181,10 @@ public void close() throws IOException {
185181
}
186182
}
187183

184+
public final ErrorStatsServiceSettings getSettings() {
185+
return settings;
186+
}
187+
188188
// AUTO-GENERATED DOCUMENTATION AND METHOD
189189
/**
190190
* Lists the specified groups.

branches/tswast-patch-1/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceSettings.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
package com.google.cloud.errorreporting.spi.v1beta1;
1515

1616
import com.google.api.gax.core.ConnectionSettings;
17+
import com.google.api.gax.core.PagedListResponse;
1718
import com.google.api.gax.core.RetrySettings;
1819
import com.google.api.gax.grpc.ApiCallSettings;
1920
import com.google.api.gax.grpc.PageStreamingCallSettings;
@@ -183,7 +184,7 @@ private ErrorStatsServiceSettings(Builder settingsBuilder) throws IOException {
183184
deleteEventsSettings = settingsBuilder.deleteEventsSettings().build();
184185
}
185186

186-
private static PageStreamingDescriptor<
187+
private static final PageStreamingDescriptor<
187188
ListGroupStatsRequest, ListGroupStatsResponse, ErrorGroupStats>
188189
LIST_GROUP_STATS_PAGE_STR_DESC =
189190
new PageStreamingDescriptor<
@@ -220,7 +221,7 @@ public Iterable<ErrorGroupStats> extractResources(ListGroupStatsResponse payload
220221
}
221222
};
222223

223-
private static PageStreamingDescriptor<ListEventsRequest, ListEventsResponse, ErrorEvent>
224+
private static final PageStreamingDescriptor<ListEventsRequest, ListEventsResponse, ErrorEvent>
224225
LIST_EVENTS_PAGE_STR_DESC =
225226
new PageStreamingDescriptor<ListEventsRequest, ListEventsResponse, ErrorEvent>() {
226227
@Override
@@ -260,12 +261,13 @@ public Iterable<ErrorEvent> extractResources(ListEventsResponse payload) {
260261
public static class Builder extends ServiceApiSettings.Builder {
261262
private final ImmutableList<ApiCallSettings.Builder> methodSettingsBuilders;
262263

263-
private PageStreamingCallSettings.Builder<
264+
private final PageStreamingCallSettings.Builder<
264265
ListGroupStatsRequest, ListGroupStatsResponse, ErrorGroupStats>
265266
listGroupStatsSettings;
266-
private PageStreamingCallSettings.Builder<ListEventsRequest, ListEventsResponse, ErrorEvent>
267+
private final PageStreamingCallSettings.Builder<
268+
ListEventsRequest, ListEventsResponse, ErrorEvent>
267269
listEventsSettings;
268-
private SimpleCallSettings.Builder<DeleteEventsRequest, DeleteEventsResponse>
270+
private final SimpleCallSettings.Builder<DeleteEventsRequest, DeleteEventsResponse>
269271
deleteEventsSettings;
270272

271273
private static final ImmutableMap<String, ImmutableSet<Status.Code>> RETRYABLE_CODE_DEFINITIONS;

branches/tswast-patch-1/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceApi.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,6 @@ public class ReportErrorsServiceApi implements AutoCloseable {
8888
private final ApiCallable<ReportErrorEventRequest, ReportErrorEventResponse>
8989
reportErrorEventCallable;
9090

91-
public final ReportErrorsServiceSettings getSettings() {
92-
return settings;
93-
}
94-
9591
private static final PathTemplate PROJECT_PATH_TEMPLATE =
9692
PathTemplate.createWithoutUrlEncoding("projects/{project}");
9793

@@ -161,6 +157,10 @@ public void close() throws IOException {
161157
}
162158
}
163159

160+
public final ReportErrorsServiceSettings getSettings() {
161+
return settings;
162+
}
163+
164164
// AUTO-GENERATED DOCUMENTATION AND METHOD
165165
/**
166166
* Report an individual error event.

branches/tswast-patch-1/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ private ReportErrorsServiceSettings(Builder settingsBuilder) throws IOException
161161
public static class Builder extends ServiceApiSettings.Builder {
162162
private final ImmutableList<ApiCallSettings.Builder> methodSettingsBuilders;
163163

164-
private SimpleCallSettings.Builder<ReportErrorEventRequest, ReportErrorEventResponse>
164+
private final SimpleCallSettings.Builder<ReportErrorEventRequest, ReportErrorEventResponse>
165165
reportErrorEventSettings;
166166

167167
private static final ImmutableMap<String, ImmutableSet<Status.Code>> RETRYABLE_CODE_DEFINITIONS;

branches/tswast-patch-1/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorGroupService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
1515
package com.google.cloud.errorreporting.spi.v1beta1;
1616

1717
import com.google.api.gax.testing.MockGrpcService;
18-
import com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupServiceGrpc;
1918
import com.google.protobuf.GeneratedMessageV3;
2019
import io.grpc.ServerServiceDefinition;
2120
import java.util.List;
2221

2322
@javax.annotation.Generated("by GAPIC")
2423
public class MockErrorGroupService implements MockGrpcService {
25-
private MockErrorGroupServiceImpl serviceImpl;
24+
private final MockErrorGroupServiceImpl serviceImpl;
2625

2726
public MockErrorGroupService() {
2827
serviceImpl = new MockErrorGroupServiceImpl();

branches/tswast-patch-1/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorStatsService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
1515
package com.google.cloud.errorreporting.spi.v1beta1;
1616

1717
import com.google.api.gax.testing.MockGrpcService;
18-
import com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceGrpc;
1918
import com.google.protobuf.GeneratedMessageV3;
2019
import io.grpc.ServerServiceDefinition;
2120
import java.util.List;
2221

2322
@javax.annotation.Generated("by GAPIC")
2423
public class MockErrorStatsService implements MockGrpcService {
25-
private MockErrorStatsServiceImpl serviceImpl;
24+
private final MockErrorStatsServiceImpl serviceImpl;
2625

2726
public MockErrorStatsService() {
2827
serviceImpl = new MockErrorStatsServiceImpl();

branches/tswast-patch-1/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockReportErrorsService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
1515
package com.google.cloud.errorreporting.spi.v1beta1;
1616

1717
import com.google.api.gax.testing.MockGrpcService;
18-
import com.google.devtools.clouderrorreporting.v1beta1.ReportErrorsServiceGrpc;
1918
import com.google.protobuf.GeneratedMessageV3;
2019
import io.grpc.ServerServiceDefinition;
2120
import java.util.List;
2221

2322
@javax.annotation.Generated("by GAPIC")
2423
public class MockReportErrorsService implements MockGrpcService {
25-
private MockReportErrorsServiceImpl serviceImpl;
24+
private final MockReportErrorsServiceImpl serviceImpl;
2625

2726
public MockReportErrorsService() {
2827
serviceImpl = new MockReportErrorsServiceImpl();

0 commit comments

Comments
 (0)