Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

feat: deprecate GroupName in favor of ErrorGroupName #30

Merged
chingor13 merged 4 commits into from
Dec 23, 2019
Merged

feat: deprecate GroupName in favor of ErrorGroupName #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
053be61
[CHANGE ME] Re-generated to pick up changes in the API or client lib…
yoshi-automation Dec 21, 2019
1f53e97
Merge branch 'master' into autosynth
chingor13 Dec 23, 2019
ffd427c
fix: deprecate GroupName and put back method as deprecated for compat…
chingor13 Dec 23, 2019
dfad591
fix: modify synth.py to inject deprecated helpers
chingor13 Dec 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/release-please.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
releaseType: java-yoshi
bumpMinorPreMajor: true
14 changes: 10 additions & 4 deletions .kokoro/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ echo ${JOB_TYPE}
mvn install -B -V \
-DskipTests=true \
-Dclirr.skip=true \
-Denforcer.skip=true \
-Dmaven.javadoc.skip=true \
-Dgcloud.download.skip=true \
-T 1C
Expand All @@ -38,7 +39,7 @@ fi

case ${JOB_TYPE} in
test)
mvn test -B -Dclirr.skip=true
mvn test -B -Dclirr.skip=true -Denforcer.skip=true
bash ${KOKORO_GFILE_DIR}/codecov.sh
bash .kokoro/coerce_logs.sh
;;
Expand All @@ -49,12 +50,17 @@ javadoc)
mvn javadoc:javadoc javadoc:test-javadoc
;;
integration)
mvn -B ${INTEGRATION_TEST_ARGS} -DtrimStackTrace=false -Dclirr.skip=true -fae verify
mvn -B ${INTEGRATION_TEST_ARGS} \
-DtrimStackTrace=false \
-Dclirr.skip=true \
-Denforcer.skip=true \
-fae \
verify
bash .kokoro/coerce_logs.sh
;;
clirr)
mvn -B clirr:check
mvn -B -Denforcer.skip=true clirr:check
;;
*)
;;
esac
esac
6 changes: 5 additions & 1 deletion .kokoro/dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,9 @@ echo $JOB_TYPE

export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"

mvn install -DskipTests=true -B -V
# this should run maven enforcer
mvn install -B -V \
-DskipTests=true \
-Dclirr.skip=true

mvn -B dependency:analyze -DfailOnWarning=true
2 changes: 1 addition & 1 deletion .kokoro/release/publish_javadoc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ python3 -m pip install gcp-docuploader
# compile all packages
mvn clean install -B -DskipTests=true

NAME=clouderrorreporting
NAME=google-cloud-errorreporting
VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)

# build the docs
Expand Down
49 changes: 41 additions & 8 deletions ...orting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.google.cloud.errorreporting.v1beta1.stub.ErrorGroupServiceStub;
import com.google.cloud.errorreporting.v1beta1.stub.ErrorGroupServiceStubSettings;
import com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup;
import com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupName;
import com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest;
import com.google.devtools.clouderrorreporting.v1beta1.GroupName;
import com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest;
Expand All @@ -38,7 +39,7 @@
* <pre>
* <code>
* try (ErrorGroupServiceClient errorGroupServiceClient = ErrorGroupServiceClient.create()) {
* GroupName groupName = GroupName.of("[PROJECT]", "[GROUP]");
* ErrorGroupName groupName = ErrorGroupName.of("[PROJECT]", "[GROUP]");
* ErrorGroup response = errorGroupServiceClient.getGroup(groupName);
* }
* </code>
Expand Down Expand Up @@ -149,7 +150,7 @@ public ErrorGroupServiceStub getStub() {
return stub;
}

// AUTO-GENERATED DOCUMENTATION AND METHOD
// Inserted by synthtool to preserve backwards-compatibility
/**
* Get the specified group.
*
Expand All @@ -162,14 +163,16 @@ public ErrorGroupServiceStub getStub() {
* }
* </code></pre>
*
* @param groupName [Required] The group resource name. Written as
* @param groupName Required. The group resource name. Written as
* &lt;code&gt;projects/&lt;var&gt;projectID&lt;/var&gt;/groups/&lt;var&gt;group_name&lt;/var&gt;&lt;/code&gt;.
* Call &lt;a href="/error-reporting/reference/rest/v1beta1/projects.groupStats/list"&gt;
* &lt;code&gt;groupStats.list&lt;/code&gt;&lt;/a&gt; to return a list of groups belonging to
* this project.
* <p>Example: &lt;code&gt;projects/my-project-123/groups/my-group&lt;/code&gt;
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
* @deprecated Use ErrorGroupServiceClient#getGroup(ErrorGroupName)
*/
@Deprecated
public final ErrorGroup getGroup(GroupName groupName) {

GetGroupRequest request =
Expand All @@ -187,12 +190,42 @@ public final ErrorGroup getGroup(GroupName groupName) {
*
* <pre><code>
* try (ErrorGroupServiceClient errorGroupServiceClient = ErrorGroupServiceClient.create()) {
* GroupName groupName = GroupName.of("[PROJECT]", "[GROUP]");
* ErrorGroupName groupName = ErrorGroupName.of("[PROJECT]", "[GROUP]");
* ErrorGroup response = errorGroupServiceClient.getGroup(groupName);
* }
* </code></pre>
*
* @param groupName Required. The group resource name. Written as
* &lt;code&gt;projects/&lt;var&gt;projectID&lt;/var&gt;/groups/&lt;var&gt;group_name&lt;/var&gt;&lt;/code&gt;.
* Call &lt;a href="/error-reporting/reference/rest/v1beta1/projects.groupStats/list"&gt;
* &lt;code&gt;groupStats.list&lt;/code&gt;&lt;/a&gt; to return a list of groups belonging to
* this project.
* <p>Example: &lt;code&gt;projects/my-project-123/groups/my-group&lt;/code&gt;
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final ErrorGroup getGroup(ErrorGroupName groupName) {

GetGroupRequest request =
GetGroupRequest.newBuilder()
.setGroupName(groupName == null ? null : groupName.toString())
.build();
return getGroup(request);
}

// AUTO-GENERATED DOCUMENTATION AND METHOD
/**
* Get the specified group.
*
* <p>Sample code:
*
* <pre><code>
* try (ErrorGroupServiceClient errorGroupServiceClient = ErrorGroupServiceClient.create()) {
* ErrorGroupName groupName = ErrorGroupName.of("[PROJECT]", "[GROUP]");
* ErrorGroup response = errorGroupServiceClient.getGroup(groupName.toString());
* }
* </code></pre>
*
* @param groupName [Required] The group resource name. Written as
* @param groupName Required. The group resource name. Written as
* &lt;code&gt;projects/&lt;var&gt;projectID&lt;/var&gt;/groups/&lt;var&gt;group_name&lt;/var&gt;&lt;/code&gt;.
* Call &lt;a href="/error-reporting/reference/rest/v1beta1/projects.groupStats/list"&gt;
* &lt;code&gt;groupStats.list&lt;/code&gt;&lt;/a&gt; to return a list of groups belonging to
Expand All @@ -214,7 +247,7 @@ public final ErrorGroup getGroup(String groupName) {
*
* <pre><code>
* try (ErrorGroupServiceClient errorGroupServiceClient = ErrorGroupServiceClient.create()) {
* GroupName groupName = GroupName.of("[PROJECT]", "[GROUP]");
* ErrorGroupName groupName = ErrorGroupName.of("[PROJECT]", "[GROUP]");
* GetGroupRequest request = GetGroupRequest.newBuilder()
* .setGroupName(groupName.toString())
* .build();
Expand All @@ -237,7 +270,7 @@ public final ErrorGroup getGroup(GetGroupRequest request) {
*
* <pre><code>
* try (ErrorGroupServiceClient errorGroupServiceClient = ErrorGroupServiceClient.create()) {
* GroupName groupName = GroupName.of("[PROJECT]", "[GROUP]");
* ErrorGroupName groupName = ErrorGroupName.of("[PROJECT]", "[GROUP]");
* GetGroupRequest request = GetGroupRequest.newBuilder()
* .setGroupName(groupName.toString())
* .build();
Expand All @@ -264,7 +297,7 @@ public final UnaryCallable<GetGroupRequest, ErrorGroup> getGroupCallable() {
* }
* </code></pre>
*
* @param group [Required] The group which replaces the resource on the server.
* @param group Required. The group which replaces the resource on the server.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final ErrorGroup updateGroup(ErrorGroup group) {
Expand Down
60 changes: 28 additions & 32 deletions ...orting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,17 +181,18 @@ public ErrorStatsServiceStub getStub() {
* }
* </code></pre>
*
* @param projectName [Required] The resource name of the Google Cloud Platform project. Written
* as &lt;code&gt;projects/&lt;/code&gt; plus the &lt;a
* @param projectName Required. The resource name of the Google Cloud Platform project. Written as
* &lt;code&gt;projects/&lt;/code&gt; plus the &lt;a
* href="https://support.google.com/cloud/answer/6158840"&gt;Google Cloud Platform project
* ID&lt;/a&gt;.
* <p>Example: &lt;code&gt;projects/my-project-123&lt;/code&gt;.
* @param timeRange [Optional] List data for the given time range. If not set a default time range
* is used. The field time_range_begin in the response will specify the beginning of this time
* range. Only &lt;code&gt;ErrorGroupStats&lt;/code&gt; with a non-zero count in the given
* time range are returned, unless the request contains an explicit group_id list. If a
* group_id list is given, also &lt;code&gt;ErrorGroupStats&lt;/code&gt; with zero occurrences
* are returned.
* @param timeRange Optional. List data for the given time range. If not set, a default time range
* is used. The field &lt;code&gt;time_range_begin&lt;/code&gt; in the response will specify
* the beginning of this time range. Only &lt;code&gt;ErrorGroupStats&lt;/code&gt; with a
* non-zero count in the given time range are returned, unless the request contains an
* explicit &lt;code&gt;group_id&lt;/code&gt; list. If a &lt;code&gt;group_id&lt;/code&gt;
* list is given, also &lt;code&gt;ErrorGroupStats&lt;/code&gt; with zero occurrences are
* returned.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final ListGroupStatsPagedResponse listGroupStats(
Expand Down Expand Up @@ -220,17 +221,18 @@ public final ListGroupStatsPagedResponse listGroupStats(
* }
* </code></pre>
*
* @param projectName [Required] The resource name of the Google Cloud Platform project. Written
* as &lt;code&gt;projects/&lt;/code&gt; plus the &lt;a
* @param projectName Required. The resource name of the Google Cloud Platform project. Written as
* &lt;code&gt;projects/&lt;/code&gt; plus the &lt;a
* href="https://support.google.com/cloud/answer/6158840"&gt;Google Cloud Platform project
* ID&lt;/a&gt;.
* <p>Example: &lt;code&gt;projects/my-project-123&lt;/code&gt;.
* @param timeRange [Optional] List data for the given time range. If not set a default time range
* is used. The field time_range_begin in the response will specify the beginning of this time
* range. Only &lt;code&gt;ErrorGroupStats&lt;/code&gt; with a non-zero count in the given
* time range are returned, unless the request contains an explicit group_id list. If a
* group_id list is given, also &lt;code&gt;ErrorGroupStats&lt;/code&gt; with zero occurrences
* are returned.
* @param timeRange Optional. List data for the given time range. If not set, a default time range
* is used. The field &lt;code&gt;time_range_begin&lt;/code&gt; in the response will specify
* the beginning of this time range. Only &lt;code&gt;ErrorGroupStats&lt;/code&gt; with a
* non-zero count in the given time range are returned, unless the request contains an
* explicit &lt;code&gt;group_id&lt;/code&gt; list. If a &lt;code&gt;group_id&lt;/code&gt;
* list is given, also &lt;code&gt;ErrorGroupStats&lt;/code&gt; with zero occurrences are
* returned.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final ListGroupStatsPagedResponse listGroupStats(
Expand All @@ -252,10 +254,8 @@ public final ListGroupStatsPagedResponse listGroupStats(
* <pre><code>
* try (ErrorStatsServiceClient errorStatsServiceClient = ErrorStatsServiceClient.create()) {
* ProjectName projectName = ProjectName.of("[PROJECT]");
* QueryTimeRange timeRange = QueryTimeRange.newBuilder().build();
* ListGroupStatsRequest request = ListGroupStatsRequest.newBuilder()
* .setProjectName(projectName.toString())
* .setTimeRange(timeRange)
* .build();
* for (ErrorGroupStats element : errorStatsServiceClient.listGroupStats(request).iterateAll()) {
* // doThingsWith(element);
Expand All @@ -279,10 +279,8 @@ public final ListGroupStatsPagedResponse listGroupStats(ListGroupStatsRequest re
* <pre><code>
* try (ErrorStatsServiceClient errorStatsServiceClient = ErrorStatsServiceClient.create()) {
* ProjectName projectName = ProjectName.of("[PROJECT]");
* QueryTimeRange timeRange = QueryTimeRange.newBuilder().build();
* ListGroupStatsRequest request = ListGroupStatsRequest.newBuilder()
* .setProjectName(projectName.toString())
* .setTimeRange(timeRange)
* .build();
* ApiFuture&lt;ListGroupStatsPagedResponse&gt; future = errorStatsServiceClient.listGroupStatsPagedCallable().futureCall(request);
* // Do something
Expand All @@ -306,10 +304,8 @@ public final ListGroupStatsPagedResponse listGroupStats(ListGroupStatsRequest re
* <pre><code>
* try (ErrorStatsServiceClient errorStatsServiceClient = ErrorStatsServiceClient.create()) {
* ProjectName projectName = ProjectName.of("[PROJECT]");
* QueryTimeRange timeRange = QueryTimeRange.newBuilder().build();
* ListGroupStatsRequest request = ListGroupStatsRequest.newBuilder()
* .setProjectName(projectName.toString())
* .setTimeRange(timeRange)
* .build();
* while (true) {
* ListGroupStatsResponse response = errorStatsServiceClient.listGroupStatsCallable().call(request);
Expand Down Expand Up @@ -347,10 +343,10 @@ public final ListGroupStatsPagedResponse listGroupStats(ListGroupStatsRequest re
* }
* </code></pre>
*
* @param projectName [Required] The resource name of the Google Cloud Platform project. Written
* as `projects/` plus the [Google Cloud Platform project
* @param projectName Required. The resource name of the Google Cloud Platform project. Written as
* `projects/` plus the [Google Cloud Platform project
* ID](https://support.google.com/cloud/answer/6158840). Example: `projects/my-project-123`.
* @param groupId [Required] The group for which events shall be returned.
* @param groupId Required. The group for which events shall be returned.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final ListEventsPagedResponse listEvents(ProjectName projectName, String groupId) {
Expand Down Expand Up @@ -378,10 +374,10 @@ public final ListEventsPagedResponse listEvents(ProjectName projectName, String
* }
* </code></pre>
*
* @param projectName [Required] The resource name of the Google Cloud Platform project. Written
* as `projects/` plus the [Google Cloud Platform project
* @param projectName Required. The resource name of the Google Cloud Platform project. Written as
* `projects/` plus the [Google Cloud Platform project
* ID](https://support.google.com/cloud/answer/6158840). Example: `projects/my-project-123`.
* @param groupId [Required] The group for which events shall be returned.
* @param groupId Required. The group for which events shall be returned.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
public final ListEventsPagedResponse listEvents(String projectName, String groupId) {
Expand Down Expand Up @@ -489,8 +485,8 @@ public final UnaryCallable<ListEventsRequest, ListEventsResponse> listEventsCall
* }
* </code></pre>
*
* @param projectName [Required] The resource name of the Google Cloud Platform project. Written
* as `projects/` plus the [Google Cloud Platform project
* @param projectName Required. The resource name of the Google Cloud Platform project. Written as
* `projects/` plus the [Google Cloud Platform project
* ID](https://support.google.com/cloud/answer/6158840). Example: `projects/my-project-123`.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
Expand All @@ -516,8 +512,8 @@ public final DeleteEventsResponse deleteEvents(ProjectName projectName) {
* }
* </code></pre>
*
* @param projectName [Required] The resource name of the Google Cloud Platform project. Written
* as `projects/` plus the [Google Cloud Platform project
* @param projectName Required. The resource name of the Google Cloud Platform project. Written as
* `projects/` plus the [Google Cloud Platform project
* ID](https://support.google.com/cloud/answer/6158840). Example: `projects/my-project-123`.
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
*/
Expand Down
Loading