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

Commit

Permalink
fix!: reorder Company and Job resources in talent API to be consisten…
Browse files Browse the repository at this point in the history 
…t with old gapic config (#143)

BREAKING CHANGE: The default `of` methods of CompanyName and JobName have changed. This should not happen again, but to insulate yourself, please use the specific `of[Named Type]Name()`

* fix (breaking change): reorder Company and Job resources in talent API to be consistent with old gapic config.

committer: @hzyi-google
PiperOrigin-RevId: 305760190

Source-Author: Google APIs <noreply@google.com>
Source-Date: Thu Apr 9 14:25:39 2020 -0700
Source-Repo: googleapis/googleapis
Source-Sha: ac1f904979899bc598fb0567cf7a367f08b40b43
Source-Link: googleapis/googleapis@ac1f904

* chore: allow breaking changes

Co-authored-by: Jeff Ching <chingor@google.com>
  • Loading branch information
@yoshi-automation @chingor13
yoshi-automation and chingor13 committed Apr 20, 2020
1 parent 55c00bc commit e300534
Show file tree
Hide file tree
Showing 14 changed files with 217 additions and 223 deletions.
18 changes: 9 additions & 9 deletions google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/CompanyServiceClient.java
View file
Expand Up @@ -44,7 +44,7 @@
* <pre>
* <code>
* try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
* CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
* CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
* companyServiceClient.deleteCompany(name);
* }
* </code>
Expand Down Expand Up @@ -162,7 +162,7 @@ public CompanyServiceStub getStub() {
*
* <pre><code>
* try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
* CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
* CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
* companyServiceClient.deleteCompany(name);
* }
* </code></pre>
Expand All @@ -188,7 +188,7 @@ public final void deleteCompany(CompanyName name) {
*
* <pre><code>
* try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
* CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
* CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
* companyServiceClient.deleteCompany(name.toString());
* }
* </code></pre>
Expand All @@ -213,7 +213,7 @@ public final void deleteCompany(String name) {
*
* <pre><code>
* try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
* CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
* CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
* DeleteCompanyRequest request = DeleteCompanyRequest.newBuilder()
* .setName(name.toString())
* .build();
Expand All @@ -236,7 +236,7 @@ public final void deleteCompany(DeleteCompanyRequest request) {
*
* <pre><code>
* try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
* CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
* CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
* DeleteCompanyRequest request = DeleteCompanyRequest.newBuilder()
* .setName(name.toString())
* .build();
Expand Down Expand Up @@ -394,7 +394,7 @@ public final UnaryCallable<CreateCompanyRequest, Company> createCompanyCallable(
*
* <pre><code>
* try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
* CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
* CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
* Company response = companyServiceClient.getCompany(name);
* }
* </code></pre>
Expand All @@ -420,7 +420,7 @@ public final Company getCompany(CompanyName name) {
*
* <pre><code>
* try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
* CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
* CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
* Company response = companyServiceClient.getCompany(name.toString());
* }
* </code></pre>
Expand All @@ -445,7 +445,7 @@ public final Company getCompany(String name) {
*
* <pre><code>
* try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
* CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
* CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
* GetCompanyRequest request = GetCompanyRequest.newBuilder()
* .setName(name.toString())
* .build();
Expand All @@ -468,7 +468,7 @@ public final Company getCompany(GetCompanyRequest request) {
*
* <pre><code>
* try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
* CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
* CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
* GetCompanyRequest request = GetCompanyRequest.newBuilder()
* .setName(name.toString())
* .build();
Expand Down
18 changes: 9 additions & 9 deletions google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/JobServiceClient.java
View file
Expand Up @@ -49,7 +49,7 @@
* <pre>
* <code>
* try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
* JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
* JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
* jobServiceClient.deleteJob(name);
* }
* </code>
Expand Down Expand Up @@ -180,7 +180,7 @@ public final OperationsClient getOperationsClient() {
*
* <pre><code>
* try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
* JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
* JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
* jobServiceClient.deleteJob(name);
* }
* </code></pre>
Expand Down Expand Up @@ -208,7 +208,7 @@ public final void deleteJob(JobName name) {
*
* <pre><code>
* try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
* JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
* JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
* jobServiceClient.deleteJob(name.toString());
* }
* </code></pre>
Expand All @@ -235,7 +235,7 @@ public final void deleteJob(String name) {
*
* <pre><code>
* try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
* JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
* JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
* DeleteJobRequest request = DeleteJobRequest.newBuilder()
* .setName(name.toString())
* .build();
Expand All @@ -260,7 +260,7 @@ public final void deleteJob(DeleteJobRequest request) {
*
* <pre><code>
* try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
* JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
* JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
* DeleteJobRequest request = DeleteJobRequest.newBuilder()
* .setName(name.toString())
* .build();
Expand Down Expand Up @@ -601,7 +601,7 @@ public final UnaryCallable<BatchCreateJobsRequest, Operation> batchCreateJobsCal
*
* <pre><code>
* try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
* JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
* JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
* Job response = jobServiceClient.getJob(name);
* }
* </code></pre>
Expand All @@ -627,7 +627,7 @@ public final Job getJob(JobName name) {
*
* <pre><code>
* try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
* JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
* JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
* Job response = jobServiceClient.getJob(name.toString());
* }
* </code></pre>
Expand All @@ -652,7 +652,7 @@ public final Job getJob(String name) {
*
* <pre><code>
* try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
* JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
* JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
* GetJobRequest request = GetJobRequest.newBuilder()
* .setName(name.toString())
* .build();
Expand All @@ -675,7 +675,7 @@ public final Job getJob(GetJobRequest request) {
*
* <pre><code>
* try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
* JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
* JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
* GetJobRequest request = GetJobRequest.newBuilder()
* .setName(name.toString())
* .build();
Expand Down
4 changes: 2 additions & 2 deletions google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/package-info.java
View file
Expand Up @@ -45,7 +45,7 @@
* <pre>
* <code>
* try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
* CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
* CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
* companyServiceClient.deleteCompany(name);
* }
* </code>
Expand Down Expand Up @@ -99,7 +99,7 @@
* <pre>
* <code>
* try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
* JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
* JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
* jobServiceClient.deleteJob(name);
* }
* </code>
Expand Down
15 changes: 9 additions & 6 deletions ...ud-talent/src/test/java/com/google/cloud/talent/v4beta1/ApplicationServiceClientTest.java
View file
Expand Up @@ -144,8 +144,9 @@ public void createApplicationTest() {
ApplicationName.of("[PROJECT]", "[TENANT]", "[PROFILE]", "[APPLICATION]");
String externalId = "externalId-1153075697";
String profile = "profile-309425751";
JobName job = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
CompanyName company = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
JobName job = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
CompanyName company =
CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
String outcomeNotes = "outcomeNotes-355961964";
String jobTitleSnippet = "jobTitleSnippet-1100512972";
Application expectedResponse =
Expand Down Expand Up @@ -202,8 +203,9 @@ public void getApplicationTest() {
ApplicationName.of("[PROJECT]", "[TENANT]", "[PROFILE]", "[APPLICATION]");
String externalId = "externalId-1153075697";
String profile = "profile-309425751";
JobName job = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
CompanyName company = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
JobName job = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
CompanyName company =
CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
String outcomeNotes = "outcomeNotes-355961964";
String jobTitleSnippet = "jobTitleSnippet-1100512972";
Application expectedResponse =
Expand Down Expand Up @@ -259,8 +261,9 @@ public void updateApplicationTest() {
ApplicationName.of("[PROJECT]", "[TENANT]", "[PROFILE]", "[APPLICATION]");
String externalId = "externalId-1153075697";
String profile = "profile-309425751";
JobName job = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
CompanyName company = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
JobName job = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
CompanyName company =
CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
String outcomeNotes = "outcomeNotes-355961964";
String jobTitleSnippet = "jobTitleSnippet-1100512972";
Application expectedResponse =
Expand Down
17 changes: 10 additions & 7 deletions ...-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/CompanyServiceClientTest.java
View file
Expand Up @@ -104,7 +104,7 @@ public void deleteCompanyTest() {
Empty expectedResponse = Empty.newBuilder().build();
mockCompanyService.addResponse(expectedResponse);

CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");

client.deleteCompany(name);

Expand All @@ -126,7 +126,8 @@ public void deleteCompanyExceptionTest() throws Exception {
mockCompanyService.addException(exception);

try {
CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
CompanyName name =
CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");

client.deleteCompany(name);
Assert.fail("No exception raised");
Expand All @@ -138,7 +139,7 @@ public void deleteCompanyExceptionTest() throws Exception {
@Test
@SuppressWarnings("all")
public void createCompanyTest() {
CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
String displayName = "displayName1615086568";
String externalId = "externalId-1153075697";
String headquartersAddress = "headquartersAddress-1879520036";
Expand Down Expand Up @@ -201,7 +202,8 @@ public void createCompanyExceptionTest() throws Exception {
@Test
@SuppressWarnings("all")
public void getCompanyTest() {
CompanyName name2 = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
CompanyName name2 =
CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
String displayName = "displayName1615086568";
String externalId = "externalId-1153075697";
String headquartersAddress = "headquartersAddress-1879520036";
Expand All @@ -226,7 +228,7 @@ public void getCompanyTest() {
.build();
mockCompanyService.addResponse(expectedResponse);

CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");

Company actualResponse = client.getCompany(name);
Assert.assertEquals(expectedResponse, actualResponse);
Expand All @@ -249,7 +251,8 @@ public void getCompanyExceptionTest() throws Exception {
mockCompanyService.addException(exception);

try {
CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
CompanyName name =
CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");

client.getCompany(name);
Assert.fail("No exception raised");
Expand All @@ -261,7 +264,7 @@ public void getCompanyExceptionTest() throws Exception {
@Test
@SuppressWarnings("all")
public void updateCompanyTest() {
CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
String displayName = "displayName1615086568";
String externalId = "externalId-1153075697";
String headquartersAddress = "headquartersAddress-1879520036";
Expand Down
23 changes: 13 additions & 10 deletions google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/JobServiceClientTest.java
View file
Expand Up @@ -111,7 +111,7 @@ public void deleteJobTest() {
Empty expectedResponse = Empty.newBuilder().build();
mockJobService.addResponse(expectedResponse);

JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");

client.deleteJob(name);

Expand All @@ -133,7 +133,7 @@ public void deleteJobExceptionTest() throws Exception {
mockJobService.addException(exception);

try {
JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");

client.deleteJob(name);
Assert.fail("No exception raised");
Expand All @@ -145,8 +145,9 @@ public void deleteJobExceptionTest() throws Exception {
@Test
@SuppressWarnings("all")
public void createJobTest() {
JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
CompanyName company = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
CompanyName company =
CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
String requisitionId = "requisitionId980224926";
String title = "title110371416";
String description = "description-1724546052";
Expand Down Expand Up @@ -261,8 +262,9 @@ public void batchCreateJobsExceptionTest() throws Exception {
@Test
@SuppressWarnings("all")
public void getJobTest() {
JobName name2 = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
CompanyName company = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
JobName name2 = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
CompanyName company =
CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
String requisitionId = "requisitionId980224926";
String title = "title110371416";
String description = "description-1724546052";
Expand Down Expand Up @@ -290,7 +292,7 @@ public void getJobTest() {
.build();
mockJobService.addResponse(expectedResponse);

JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");

Job actualResponse = client.getJob(name);
Assert.assertEquals(expectedResponse, actualResponse);
Expand All @@ -313,7 +315,7 @@ public void getJobExceptionTest() throws Exception {
mockJobService.addException(exception);

try {
JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");

client.getJob(name);
Assert.fail("No exception raised");
Expand All @@ -325,8 +327,9 @@ public void getJobExceptionTest() throws Exception {
@Test
@SuppressWarnings("all")
public void updateJobTest() {
JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
CompanyName company = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
CompanyName company =
CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
String requisitionId = "requisitionId980224926";
String title = "title110371416";
String description = "description-1724546052";
Expand Down

0 comments on commit e300534

Please sign in to comment.