From e3005343192bdb7519af9ed179afbe43ecc26902 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 20 Apr 2020 16:27:14 -0700 Subject: [PATCH] fix!: reorder Company and Job resources in talent API to be consistent 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 Source-Date: Thu Apr 9 14:25:39 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: ac1f904979899bc598fb0567cf7a367f08b40b43 Source-Link: https://github.com/googleapis/googleapis/commit/ac1f904979899bc598fb0567cf7a367f08b40b43 * chore: allow breaking changes Co-authored-by: Jeff Ching --- .../talent/v4beta1/CompanyServiceClient.java | 18 +-- .../talent/v4beta1/JobServiceClient.java | 18 +-- .../cloud/talent/v4beta1/package-info.java | 4 +- .../v4beta1/ApplicationServiceClientTest.java | 15 ++- .../v4beta1/CompanyServiceClientTest.java | 17 ++- .../talent/v4beta1/JobServiceClientTest.java | 23 ++-- .../clirr-ignored-differences.xml | 83 +++++------- .../cloud/talent/v4beta1/CompanyName.java | 126 ++++++++++-------- .../talent/v4beta1/CompanyResourceProto.java | 4 +- .../google/cloud/talent/v4beta1/JobName.java | 120 ++++++++--------- .../talent/v4beta1/JobResourceProto.java | 4 +- .../google/cloud/talent/v4beta1/company.proto | 2 +- .../google/cloud/talent/v4beta1/job.proto | 2 +- synth.metadata | 4 +- 14 files changed, 217 insertions(+), 223 deletions(-) diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/CompanyServiceClient.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/CompanyServiceClient.java index c2604630..b462751a 100644 --- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/CompanyServiceClient.java +++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/CompanyServiceClient.java @@ -44,7 +44,7 @@ * 
  * 
  * try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
- *   CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
+ *   CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
  *   companyServiceClient.deleteCompany(name);
  * }
  * 
@@ -162,7 +162,7 @@ public CompanyServiceStub getStub() {
    *
    * 

    * try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
-   *   CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
+   *   CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
    *   companyServiceClient.deleteCompany(name);
    * }
    * 

@@ -188,7 +188,7 @@ public final void deleteCompany(CompanyName name) {
    *
    * 

    * try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
-   *   CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
+   *   CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
    *   companyServiceClient.deleteCompany(name.toString());
    * }
    * 

@@ -213,7 +213,7 @@ public final void deleteCompany(String name) {
    *
    * 

    * 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();
@@ -236,7 +236,7 @@ public final void deleteCompany(DeleteCompanyRequest request) {
    *
    * 

    * 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();
@@ -394,7 +394,7 @@ public final UnaryCallable createCompanyCallable(
    *
    * 

    * try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
-   *   CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
+   *   CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
    *   Company response = companyServiceClient.getCompany(name);
    * }
    * 

@@ -420,7 +420,7 @@ public final Company getCompany(CompanyName name) {
    *
    * 

    * try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
-   *   CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
+   *   CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
    *   Company response = companyServiceClient.getCompany(name.toString());
    * }
    * 

@@ -445,7 +445,7 @@ public final Company getCompany(String name) {
    *
    * 

    * 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();
@@ -468,7 +468,7 @@ public final Company getCompany(GetCompanyRequest request) {
    *
    * 

    * 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();
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/JobServiceClient.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/JobServiceClient.java
index ef958c01..c62d25d6 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/JobServiceClient.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/JobServiceClient.java
@@ -49,7 +49,7 @@
  * 
  * 
  * try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
- *   JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
+ *   JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
  *   jobServiceClient.deleteJob(name);
  * }
  * 
@@ -180,7 +180,7 @@ public final OperationsClient getOperationsClient() {
    *
    * 

    * try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
-   *   JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
+   *   JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
    *   jobServiceClient.deleteJob(name);
    * }
    * 

@@ -208,7 +208,7 @@ public final void deleteJob(JobName name) {
    *
    * 

    * try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
-   *   JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
+   *   JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
    *   jobServiceClient.deleteJob(name.toString());
    * }
    * 

@@ -235,7 +235,7 @@ public final void deleteJob(String name) {
    *
    * 

    * 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();
@@ -260,7 +260,7 @@ public final void deleteJob(DeleteJobRequest request) {
    *
    * 

    * 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();
@@ -601,7 +601,7 @@ public final UnaryCallable batchCreateJobsCal
    *
    * 

    * try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
-   *   JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
+   *   JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
    *   Job response = jobServiceClient.getJob(name);
    * }
    * 

@@ -627,7 +627,7 @@ public final Job getJob(JobName name) {
    *
    * 

    * try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
-   *   JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
+   *   JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
    *   Job response = jobServiceClient.getJob(name.toString());
    * }
    * 

@@ -652,7 +652,7 @@ public final Job getJob(String name) {
    *
    * 

    * 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();
@@ -675,7 +675,7 @@ public final Job getJob(GetJobRequest request) {
    *
    * 

    * 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();
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/package-info.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/package-info.java
index 9b58599e..7c905953 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/package-info.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/package-info.java
@@ -45,7 +45,7 @@
  * 
  * 
  * try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
- *   CompanyName name = CompanyName.ofProjectCompanyName("[PROJECT]", "[COMPANY]");
+ *   CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
  *   companyServiceClient.deleteCompany(name);
  * }
  * 
@@ -99,7 +99,7 @@
  * 
  * 
  * try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
- *   JobName name = JobName.ofProjectJobName("[PROJECT]", "[JOB]");
+ *   JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
  *   jobServiceClient.deleteJob(name);
  * }
  * 
diff --git a/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/ApplicationServiceClientTest.java b/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/ApplicationServiceClientTest.java
index 2d64b052..e3fef508 100644
--- a/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/ApplicationServiceClientTest.java
+++ b/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/ApplicationServiceClientTest.java
@@ -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 =
@@ -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 =
@@ -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 =
diff --git a/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/CompanyServiceClientTest.java b/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/CompanyServiceClientTest.java
index 942b3a13..35d3c84d 100644
--- a/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/CompanyServiceClientTest.java
+++ b/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/CompanyServiceClientTest.java
@@ -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);
 
@@ -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");
@@ -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";
@@ -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";
@@ -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);
@@ -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");
@@ -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";
diff --git a/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/JobServiceClientTest.java b/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/JobServiceClientTest.java
index f49363d4..66e34e1c 100644
--- a/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/JobServiceClientTest.java
+++ b/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/JobServiceClientTest.java
@@ -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);
 
@@ -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");
@@ -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";
@@ -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";
@@ -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);
@@ -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");
@@ -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";
diff --git a/proto-google-cloud-talent-v4beta1/clirr-ignored-differences.xml b/proto-google-cloud-talent-v4beta1/clirr-ignored-differences.xml
index 79eb7459..aa8d9fdb 100644
--- a/proto-google-cloud-talent-v4beta1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-talent-v4beta1/clirr-ignored-differences.xml
@@ -1,7 +1,6 @@
 
 
 
-  
   
     7012
     com/google/cloud/talent/v4beta1/*OrBuilder
@@ -17,77 +16,57 @@
     com/google/cloud/talent/v4beta1/*OrBuilder
     boolean has*(*)
   
+  
   
-    8001
-    com/google/cloud/talent/v4beta1/TenantOrProjectName
-  
-  
-    8001
-    com/google/cloud/talent/v4beta1/TenantOrProjectNames
-  
-  
-    8001
-    com/google/cloud/talent/v4beta1/UntypedTenantOrProjectName
-  
-  
-    8001
-    com/google/cloud/talent/v4beta1/CompanyWithTenantName
+    7004
+    com/google/cloud/talent/v4beta1/CompanyName
+    java.lang.String format(java.lang.String, java.lang.String)
   
   
-    8001
-    com/google/cloud/talent/v4beta1/CompanyWithoutTenantName
+    7004
+    com/google/cloud/talent/v4beta1/CompanyName
+    com.google.cloud.talent.v4beta1.CompanyName of(java.lang.String, java.lang.String)
   
   
-    8001
-    com/google/cloud/talent/v4beta1/CompanyOldName
+    7004
+    com/google/cloud/talent/v4beta1/JobName
+    java.lang.String format(java.lang.String, java.lang.String)
   
   
-    8001
-    com/google/cloud/talent/v4beta1/CompanyNewName
+    7004
+    com/google/cloud/talent/v4beta1/JobName
+    com.google.cloud.talent.v4beta1.JobName of(java.lang.String, java.lang.String)
   
   
     8001
-    com/google/cloud/talent/v4beta1/CompanyNames
+    com/google/cloud/talent/v4beta1/CompanyName$ProjectTenantCompanyBuilder
   
   
     8001
-    com/google/cloud/talent/v4beta1/UntypedCompanyName
+    com/google/cloud/talent/v4beta1/JobName$ProjectTenantJobBuilder
   
   
-    8001
-    com/google/cloud/talent/v4beta1/JobWithTenantName
+    7006
+    com/google/cloud/talent/v4beta1/CompanyName
+    com.google.cloud.talent.v4beta1.CompanyName$Builder newProjectCompanyBuilder()
+    com.google.cloud.talent.v4beta1.CompanyName$ProjectCompanyBuilder
   
   
-    8001
-    com/google/cloud/talent/v4beta1/JobWithoutTenantName
+    7006
+    com/google/cloud/talent/v4beta1/CompanyName
+    com.google.cloud.talent.v4beta1.CompanyName$ProjectTenantCompanyBuilder newProjectTenantCompanyBuilder()
+    com.google.cloud.talent.v4beta1.CompanyName$Builder
   
   
-    8001
-    com/google/cloud/talent/v4beta1/JobOldName
-  
-  
-    8001
-    com/google/cloud/talent/v4beta1/JobNewName
-  
-  
-    8001
-    com/google/cloud/talent/v4beta1/UntypedJobName
-  
-  
-    8001
-    com/google/cloud/talent/v4beta1/JobNames
-  
-  
-    8001
-    com/google/cloud/talent/v4beta1/UntypedTenantName
-  
-  
-    8001
-    com/google/cloud/talent/v4beta1/*Name$Builder
+    7006
+    com/google/cloud/talent/v4beta1/JobName
+    com.google.cloud.talent.v4beta1.JobName$Builder newProjectJobBuilder()
+    com.google.cloud.talent.v4beta1.JobName$ProjectJobBuilder
   
   
-    5001
-    com/google/cloud/talent/v4beta1/*Name
-    com/google/cloud/talent/v4beta1/TenantOrProjectName
+    7006
+    com/google/cloud/talent/v4beta1/JobName
+    com.google.cloud.talent.v4beta1.JobName$ProjectTenantJobBuilder newProjectTenantJobBuilder()
+    com.google.cloud.talent.v4beta1.JobName$Builder
   
 
diff --git a/proto-google-cloud-talent-v4beta1/src/main/java/com/google/cloud/talent/v4beta1/CompanyName.java b/proto-google-cloud-talent-v4beta1/src/main/java/com/google/cloud/talent/v4beta1/CompanyName.java
index 0a068208..a2fc9721 100644
--- a/proto-google-cloud-talent-v4beta1/src/main/java/com/google/cloud/talent/v4beta1/CompanyName.java
+++ b/proto-google-cloud-talent-v4beta1/src/main/java/com/google/cloud/talent/v4beta1/CompanyName.java
@@ -32,43 +32,43 @@ public class CompanyName implements ResourceName {
   @Deprecated
   protected CompanyName() {}
 
-  private static final PathTemplate PROJECT_COMPANY_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}/companies/{company}");
   private static final PathTemplate PROJECT_TENANT_COMPANY_PATH_TEMPLATE =
       PathTemplate.createWithoutUrlEncoding(
           "projects/{project}/tenants/{tenant}/companies/{company}");
+  private static final PathTemplate PROJECT_COMPANY_PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding("projects/{project}/companies/{company}");
 
   private volatile Map fieldValuesMap;
   private PathTemplate pathTemplate;
   private String fixedValue;
 
   private String project;
-  private String company;
   private String tenant;
+  private String company;
 
   public String getProject() {
     return project;
   }
 
-  public String getCompany() {
-    return company;
-  }
-
   public String getTenant() {
     return tenant;
   }
 
+  public String getCompany() {
+    return company;
+  }
+
   private CompanyName(Builder builder) {
     project = Preconditions.checkNotNull(builder.getProject());
+    tenant = Preconditions.checkNotNull(builder.getTenant());
     company = Preconditions.checkNotNull(builder.getCompany());
-    pathTemplate = PROJECT_COMPANY_PATH_TEMPLATE;
+    pathTemplate = PROJECT_TENANT_COMPANY_PATH_TEMPLATE;
   }
 
-  private CompanyName(ProjectTenantCompanyBuilder builder) {
+  private CompanyName(ProjectCompanyBuilder builder) {
     project = Preconditions.checkNotNull(builder.getProject());
-    tenant = Preconditions.checkNotNull(builder.getTenant());
     company = Preconditions.checkNotNull(builder.getCompany());
-    pathTemplate = PROJECT_TENANT_COMPANY_PATH_TEMPLATE;
+    pathTemplate = PROJECT_COMPANY_PATH_TEMPLATE;
   }
 
   public static Builder newBuilder() {
@@ -76,26 +76,25 @@ public static Builder newBuilder() {
   }
 
   @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
-  public static Builder newProjectCompanyBuilder() {
+  public static Builder newProjectTenantCompanyBuilder() {
     return new Builder();
   }
 
   @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
-  public static ProjectTenantCompanyBuilder newProjectTenantCompanyBuilder() {
-    return new ProjectTenantCompanyBuilder();
+  public static ProjectCompanyBuilder newProjectCompanyBuilder() {
+    return new ProjectCompanyBuilder();
   }
 
   public Builder toBuilder() {
     return new Builder(this);
   }
 
-  public static CompanyName of(String project, String company) {
-    return newProjectCompanyBuilder().setProject(project).setCompany(company).build();
-  }
-
-  @BetaApi("The static create methods are not stable yet and may be changed in the future.")
-  public static CompanyName ofProjectCompanyName(String project, String company) {
-    return newProjectCompanyBuilder().setProject(project).setCompany(company).build();
+  public static CompanyName of(String project, String tenant, String company) {
+    return newProjectTenantCompanyBuilder()
+        .setProject(project)
+        .setTenant(tenant)
+        .setCompany(company)
+        .build();
   }
 
   @BetaApi("The static create methods are not stable yet and may be changed in the future.")
@@ -108,19 +107,24 @@ public static CompanyName ofProjectTenantCompanyName(
         .build();
   }
 
-  public static String format(String project, String company) {
-    return newBuilder().setProject(project).setCompany(company).build().toString();
+  @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static CompanyName ofProjectCompanyName(String project, String company) {
+    return newProjectCompanyBuilder().setProject(project).setCompany(company).build();
   }
 
-  @BetaApi("The static format methods are not stable yet and may be changed in the future.")
-  public static String formatProjectCompanyName(String project, String company) {
-    return newBuilder().setProject(project).setCompany(company).build().toString();
+  public static String format(String project, String tenant, String company) {
+    return newBuilder()
+        .setProject(project)
+        .setTenant(tenant)
+        .setCompany(company)
+        .build()
+        .toString();
   }
 
   @BetaApi("The static format methods are not stable yet and may be changed in the future.")
   public static String formatProjectTenantCompanyName(
       String project, String tenant, String company) {
-    return newProjectTenantCompanyBuilder()
+    return newBuilder()
         .setProject(project)
         .setTenant(tenant)
         .setCompany(company)
@@ -128,24 +132,29 @@ public static String formatProjectTenantCompanyName(
         .toString();
   }
 
+  @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatProjectCompanyName(String project, String company) {
+    return newProjectCompanyBuilder().setProject(project).setCompany(company).build().toString();
+  }
+
   public static CompanyName parse(String formattedString) {
     if (formattedString.isEmpty()) {
       return null;
     }
-    if (PROJECT_COMPANY_PATH_TEMPLATE.matches(formattedString)) {
-      Map matchMap = PROJECT_COMPANY_PATH_TEMPLATE.match(formattedString);
-      return ofProjectCompanyName(matchMap.get("project"), matchMap.get("company"));
-    } else if (PROJECT_TENANT_COMPANY_PATH_TEMPLATE.matches(formattedString)) {
+    if (PROJECT_TENANT_COMPANY_PATH_TEMPLATE.matches(formattedString)) {
       Map matchMap = PROJECT_TENANT_COMPANY_PATH_TEMPLATE.match(formattedString);
       return ofProjectTenantCompanyName(
           matchMap.get("project"), matchMap.get("tenant"), matchMap.get("company"));
+    } else if (PROJECT_COMPANY_PATH_TEMPLATE.matches(formattedString)) {
+      Map matchMap = PROJECT_COMPANY_PATH_TEMPLATE.match(formattedString);
+      return ofProjectCompanyName(matchMap.get("project"), matchMap.get("company"));
     }
     throw new ValidationException("JobName.parse: formattedString not in valid format");
   }
 
   public static boolean isParsableFrom(String formattedString) {
-    return PROJECT_COMPANY_PATH_TEMPLATE.matches(formattedString)
-        || PROJECT_TENANT_COMPANY_PATH_TEMPLATE.matches(formattedString);
+    return PROJECT_TENANT_COMPANY_PATH_TEMPLATE.matches(formattedString)
+        || PROJECT_COMPANY_PATH_TEMPLATE.matches(formattedString);
   }
 
   @Override
@@ -157,12 +166,12 @@ public Map getFieldValuesMap() {
           if (project != null) {
             fieldMapBuilder.put("project", project);
           }
-          if (company != null) {
-            fieldMapBuilder.put("company", company);
-          }
           if (tenant != null) {
             fieldMapBuilder.put("tenant", tenant);
           }
+          if (company != null) {
+            fieldMapBuilder.put("company", company);
+          }
           fieldValuesMap = fieldMapBuilder.build();
         }
       }
@@ -179,10 +188,11 @@ public String toString() {
     return fixedValue != null ? fixedValue : pathTemplate.instantiate(getFieldValuesMap());
   }
 
-  /** Builder for projects/{project}/companies/{company}. */
+  /** Builder for projects/{project}/tenants/{tenant}/companies/{company}. */
   public static class Builder {
 
     private String project;
+    private String tenant;
     private String company;
 
     protected Builder() {}
@@ -191,6 +201,10 @@ public String getProject() {
       return project;
     }
 
+    public String getTenant() {
+      return tenant;
+    }
+
     public String getCompany() {
       return company;
     }
@@ -200,6 +214,11 @@ public Builder setProject(String project) {
       return this;
     }
 
+    public Builder setTenant(String tenant) {
+      this.tenant = tenant;
+      return this;
+    }
+
     public Builder setCompany(String company) {
       this.company = company;
       return this;
@@ -207,10 +226,11 @@ public Builder setCompany(String company) {
 
     private Builder(CompanyName companyName) {
       Preconditions.checkArgument(
-          companyName.pathTemplate == PROJECT_COMPANY_PATH_TEMPLATE,
+          companyName.pathTemplate == PROJECT_TENANT_COMPANY_PATH_TEMPLATE,
           "toBuilder is only supported when CompanyName has the pattern of "
-              + "projects/{project}/companies/{company}.");
+              + "projects/{project}/tenants/{tenant}/companies/{company}.");
       project = companyName.project;
+      tenant = companyName.tenant;
       company = companyName.company;
     }
 
@@ -219,39 +239,29 @@ public CompanyName build() {
     }
   }
 
-  /** Builder for projects/{project}/tenants/{tenant}/companies/{company}. */
+  /** Builder for projects/{project}/companies/{company}. */
   @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
-  public static class ProjectTenantCompanyBuilder {
+  public static class ProjectCompanyBuilder {
 
     private String project;
-    private String tenant;
     private String company;
 
-    private ProjectTenantCompanyBuilder() {}
+    private ProjectCompanyBuilder() {}
 
     public String getProject() {
       return project;
     }
 
-    public String getTenant() {
-      return tenant;
-    }
-
     public String getCompany() {
       return company;
     }
 
-    public ProjectTenantCompanyBuilder setProject(String project) {
+    public ProjectCompanyBuilder setProject(String project) {
       this.project = project;
       return this;
     }
 
-    public ProjectTenantCompanyBuilder setTenant(String tenant) {
-      this.tenant = tenant;
-      return this;
-    }
-
-    public ProjectTenantCompanyBuilder setCompany(String company) {
+    public ProjectCompanyBuilder setCompany(String company) {
       this.company = company;
       return this;
     }
@@ -269,8 +279,8 @@ public boolean equals(Object o) {
     if (o != null || getClass() == o.getClass()) {
       CompanyName that = (CompanyName) o;
       return (Objects.equals(this.project, that.project))
-          && (Objects.equals(this.company, that.company))
-          && (Objects.equals(this.tenant, that.tenant));
+          && (Objects.equals(this.tenant, that.tenant))
+          && (Objects.equals(this.company, that.company));
     }
     return false;
   }
@@ -283,9 +293,9 @@ public int hashCode() {
     h *= 1000003;
     h ^= Objects.hashCode(project);
     h *= 1000003;
-    h ^= Objects.hashCode(company);
-    h *= 1000003;
     h ^= Objects.hashCode(tenant);
+    h *= 1000003;
+    h ^= Objects.hashCode(company);
     return h;
   }
 }
diff --git a/proto-google-cloud-talent-v4beta1/src/main/java/com/google/cloud/talent/v4beta1/CompanyResourceProto.java b/proto-google-cloud-talent-v4beta1/src/main/java/com/google/cloud/talent/v4beta1/CompanyResourceProto.java
index 684161c7..a7c4487b 100644
--- a/proto-google-cloud-talent-v4beta1/src/main/java/com/google/cloud/talent/v4beta1/CompanyResourceProto.java
+++ b/proto-google-cloud-talent-v4beta1/src/main/java/com/google/cloud/talent/v4beta1/CompanyResourceProto.java
@@ -62,9 +62,9 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "A\003\022\026\n\tsuspended\030\r \001(\010B\003\340A\003\032S\n\013DerivedInf"
           + "o\022D\n\025headquarters_location\030\001 \001(\0132%.googl"
           + "e.cloud.talent.v4beta1.Location:\201\001\352A~\n\033j"
-          + "obs.googleapis.com/Company\022&projects/{pr"
-          + "oject}/companies/{company}\0227projects/{pr"
+          + "obs.googleapis.com/Company\0227projects/{pr"
           + "oject}/tenants/{tenant}/companies/{compa"
+          + "ny}\022&projects/{project}/companies/{compa"
           + "ny}B\202\001\n\037com.google.cloud.talent.v4beta1B"
           + "\024CompanyResourceProtoP\001ZAgoogle.golang.o"
           + "rg/genproto/googleapis/cloud/talent/v4be"
diff --git a/proto-google-cloud-talent-v4beta1/src/main/java/com/google/cloud/talent/v4beta1/JobName.java b/proto-google-cloud-talent-v4beta1/src/main/java/com/google/cloud/talent/v4beta1/JobName.java
index 89deb63c..8e822be0 100644
--- a/proto-google-cloud-talent-v4beta1/src/main/java/com/google/cloud/talent/v4beta1/JobName.java
+++ b/proto-google-cloud-talent-v4beta1/src/main/java/com/google/cloud/talent/v4beta1/JobName.java
@@ -32,42 +32,42 @@ public class JobName implements ResourceName {
   @Deprecated
   protected JobName() {}
 
-  private static final PathTemplate PROJECT_JOB_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}/jobs/{job}");
   private static final PathTemplate PROJECT_TENANT_JOB_PATH_TEMPLATE =
       PathTemplate.createWithoutUrlEncoding("projects/{project}/tenants/{tenant}/jobs/{job}");
+  private static final PathTemplate PROJECT_JOB_PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding("projects/{project}/jobs/{job}");
 
   private volatile Map fieldValuesMap;
   private PathTemplate pathTemplate;
   private String fixedValue;
 
   private String project;
-  private String job;
   private String tenant;
+  private String job;
 
   public String getProject() {
     return project;
   }
 
-  public String getJob() {
-    return job;
-  }
-
   public String getTenant() {
     return tenant;
   }
 
+  public String getJob() {
+    return job;
+  }
+
   private JobName(Builder builder) {
     project = Preconditions.checkNotNull(builder.getProject());
+    tenant = Preconditions.checkNotNull(builder.getTenant());
     job = Preconditions.checkNotNull(builder.getJob());
-    pathTemplate = PROJECT_JOB_PATH_TEMPLATE;
+    pathTemplate = PROJECT_TENANT_JOB_PATH_TEMPLATE;
   }
 
-  private JobName(ProjectTenantJobBuilder builder) {
+  private JobName(ProjectJobBuilder builder) {
     project = Preconditions.checkNotNull(builder.getProject());
-    tenant = Preconditions.checkNotNull(builder.getTenant());
     job = Preconditions.checkNotNull(builder.getJob());
-    pathTemplate = PROJECT_TENANT_JOB_PATH_TEMPLATE;
+    pathTemplate = PROJECT_JOB_PATH_TEMPLATE;
   }
 
   public static Builder newBuilder() {
@@ -75,70 +75,65 @@ public static Builder newBuilder() {
   }
 
   @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
-  public static Builder newProjectJobBuilder() {
+  public static Builder newProjectTenantJobBuilder() {
     return new Builder();
   }
 
   @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
-  public static ProjectTenantJobBuilder newProjectTenantJobBuilder() {
-    return new ProjectTenantJobBuilder();
+  public static ProjectJobBuilder newProjectJobBuilder() {
+    return new ProjectJobBuilder();
   }
 
   public Builder toBuilder() {
     return new Builder(this);
   }
 
-  public static JobName of(String project, String job) {
-    return newProjectJobBuilder().setProject(project).setJob(job).build();
+  public static JobName of(String project, String tenant, String job) {
+    return newProjectTenantJobBuilder().setProject(project).setTenant(tenant).setJob(job).build();
   }
 
   @BetaApi("The static create methods are not stable yet and may be changed in the future.")
-  public static JobName ofProjectJobName(String project, String job) {
-    return newProjectJobBuilder().setProject(project).setJob(job).build();
+  public static JobName ofProjectTenantJobName(String project, String tenant, String job) {
+    return newProjectTenantJobBuilder().setProject(project).setTenant(tenant).setJob(job).build();
   }
 
   @BetaApi("The static create methods are not stable yet and may be changed in the future.")
-  public static JobName ofProjectTenantJobName(String project, String tenant, String job) {
-    return newProjectTenantJobBuilder().setProject(project).setTenant(tenant).setJob(job).build();
+  public static JobName ofProjectJobName(String project, String job) {
+    return newProjectJobBuilder().setProject(project).setJob(job).build();
   }
 
-  public static String format(String project, String job) {
-    return newBuilder().setProject(project).setJob(job).build().toString();
+  public static String format(String project, String tenant, String job) {
+    return newBuilder().setProject(project).setTenant(tenant).setJob(job).build().toString();
   }
 
   @BetaApi("The static format methods are not stable yet and may be changed in the future.")
-  public static String formatProjectJobName(String project, String job) {
-    return newBuilder().setProject(project).setJob(job).build().toString();
+  public static String formatProjectTenantJobName(String project, String tenant, String job) {
+    return newBuilder().setProject(project).setTenant(tenant).setJob(job).build().toString();
   }
 
   @BetaApi("The static format methods are not stable yet and may be changed in the future.")
-  public static String formatProjectTenantJobName(String project, String tenant, String job) {
-    return newProjectTenantJobBuilder()
-        .setProject(project)
-        .setTenant(tenant)
-        .setJob(job)
-        .build()
-        .toString();
+  public static String formatProjectJobName(String project, String job) {
+    return newProjectJobBuilder().setProject(project).setJob(job).build().toString();
   }
 
   public static JobName parse(String formattedString) {
     if (formattedString.isEmpty()) {
       return null;
     }
-    if (PROJECT_JOB_PATH_TEMPLATE.matches(formattedString)) {
-      Map matchMap = PROJECT_JOB_PATH_TEMPLATE.match(formattedString);
-      return ofProjectJobName(matchMap.get("project"), matchMap.get("job"));
-    } else if (PROJECT_TENANT_JOB_PATH_TEMPLATE.matches(formattedString)) {
+    if (PROJECT_TENANT_JOB_PATH_TEMPLATE.matches(formattedString)) {
       Map matchMap = PROJECT_TENANT_JOB_PATH_TEMPLATE.match(formattedString);
       return ofProjectTenantJobName(
           matchMap.get("project"), matchMap.get("tenant"), matchMap.get("job"));
+    } else if (PROJECT_JOB_PATH_TEMPLATE.matches(formattedString)) {
+      Map matchMap = PROJECT_JOB_PATH_TEMPLATE.match(formattedString);
+      return ofProjectJobName(matchMap.get("project"), matchMap.get("job"));
     }
     throw new ValidationException("JobName.parse: formattedString not in valid format");
   }
 
   public static boolean isParsableFrom(String formattedString) {
-    return PROJECT_JOB_PATH_TEMPLATE.matches(formattedString)
-        || PROJECT_TENANT_JOB_PATH_TEMPLATE.matches(formattedString);
+    return PROJECT_TENANT_JOB_PATH_TEMPLATE.matches(formattedString)
+        || PROJECT_JOB_PATH_TEMPLATE.matches(formattedString);
   }
 
   @Override
@@ -150,12 +145,12 @@ public Map getFieldValuesMap() {
           if (project != null) {
             fieldMapBuilder.put("project", project);
           }
-          if (job != null) {
-            fieldMapBuilder.put("job", job);
-          }
           if (tenant != null) {
             fieldMapBuilder.put("tenant", tenant);
           }
+          if (job != null) {
+            fieldMapBuilder.put("job", job);
+          }
           fieldValuesMap = fieldMapBuilder.build();
         }
       }
@@ -172,10 +167,11 @@ public String toString() {
     return fixedValue != null ? fixedValue : pathTemplate.instantiate(getFieldValuesMap());
   }
 
-  /** Builder for projects/{project}/jobs/{job}. */
+  /** Builder for projects/{project}/tenants/{tenant}/jobs/{job}. */
   public static class Builder {
 
     private String project;
+    private String tenant;
     private String job;
 
     protected Builder() {}
@@ -184,6 +180,10 @@ public String getProject() {
       return project;
     }
 
+    public String getTenant() {
+      return tenant;
+    }
+
     public String getJob() {
       return job;
     }
@@ -193,6 +193,11 @@ public Builder setProject(String project) {
       return this;
     }
 
+    public Builder setTenant(String tenant) {
+      this.tenant = tenant;
+      return this;
+    }
+
     public Builder setJob(String job) {
       this.job = job;
       return this;
@@ -200,10 +205,11 @@ public Builder setJob(String job) {
 
     private Builder(JobName jobName) {
       Preconditions.checkArgument(
-          jobName.pathTemplate == PROJECT_JOB_PATH_TEMPLATE,
+          jobName.pathTemplate == PROJECT_TENANT_JOB_PATH_TEMPLATE,
           "toBuilder is only supported when JobName has the pattern of "
-              + "projects/{project}/jobs/{job}.");
+              + "projects/{project}/tenants/{tenant}/jobs/{job}.");
       project = jobName.project;
+      tenant = jobName.tenant;
       job = jobName.job;
     }
 
@@ -212,39 +218,29 @@ public JobName build() {
     }
   }
 
-  /** Builder for projects/{project}/tenants/{tenant}/jobs/{job}. */
+  /** Builder for projects/{project}/jobs/{job}. */
   @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
-  public static class ProjectTenantJobBuilder {
+  public static class ProjectJobBuilder {
 
     private String project;
-    private String tenant;
     private String job;
 
-    private ProjectTenantJobBuilder() {}
+    private ProjectJobBuilder() {}
 
     public String getProject() {
       return project;
     }
 
-    public String getTenant() {
-      return tenant;
-    }
-
     public String getJob() {
       return job;
     }
 
-    public ProjectTenantJobBuilder setProject(String project) {
+    public ProjectJobBuilder setProject(String project) {
       this.project = project;
       return this;
     }
 
-    public ProjectTenantJobBuilder setTenant(String tenant) {
-      this.tenant = tenant;
-      return this;
-    }
-
-    public ProjectTenantJobBuilder setJob(String job) {
+    public ProjectJobBuilder setJob(String job) {
       this.job = job;
       return this;
     }
@@ -262,8 +258,8 @@ public boolean equals(Object o) {
     if (o != null || getClass() == o.getClass()) {
       JobName that = (JobName) o;
       return (Objects.equals(this.project, that.project))
-          && (Objects.equals(this.job, that.job))
-          && (Objects.equals(this.tenant, that.tenant));
+          && (Objects.equals(this.tenant, that.tenant))
+          && (Objects.equals(this.job, that.job));
     }
     return false;
   }
@@ -276,9 +272,9 @@ public int hashCode() {
     h *= 1000003;
     h ^= Objects.hashCode(project);
     h *= 1000003;
-    h ^= Objects.hashCode(job);
-    h *= 1000003;
     h ^= Objects.hashCode(tenant);
+    h *= 1000003;
+    h ^= Objects.hashCode(job);
     return h;
   }
 }
diff --git a/proto-google-cloud-talent-v4beta1/src/main/java/com/google/cloud/talent/v4beta1/JobResourceProto.java b/proto-google-cloud-talent-v4beta1/src/main/java/com/google/cloud/talent/v4beta1/JobResourceProto.java
index 7c33edff..2058c80b 100644
--- a/proto-google-cloud-talent-v4beta1/src/main/java/com/google/cloud/talent/v4beta1/JobResourceProto.java
+++ b/proto-google-cloud-talent-v4beta1/src/main/java/com/google/cloud/talent/v4beta1/JobResourceProto.java
@@ -111,8 +111,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "stomAttributesEntry\022\013\n\003key\030\001 \001(\t\022;\n\005valu"
           + "e\030\002 \001(\0132,.google.cloud.talent.v4beta1.Cu"
           + "stomAttribute:\0028\001:k\352Ah\n\027jobs.googleapis."
-          + "com/Job\022\035projects/{project}/jobs/{job}\022."
-          + "projects/{project}/tenants/{tenant}/jobs"
+          + "com/Job\022.projects/{project}/tenants/{ten"
+          + "ant}/jobs/{job}\022\035projects/{project}/jobs"
           + "/{job}B~\n\037com.google.cloud.talent.v4beta"
           + "1B\020JobResourceProtoP\001ZAgoogle.golang.org"
           + "/genproto/googleapis/cloud/talent/v4beta"
diff --git a/proto-google-cloud-talent-v4beta1/src/main/proto/google/cloud/talent/v4beta1/company.proto b/proto-google-cloud-talent-v4beta1/src/main/proto/google/cloud/talent/v4beta1/company.proto
index 4ab6aaa6..c6894572 100644
--- a/proto-google-cloud-talent-v4beta1/src/main/proto/google/cloud/talent/v4beta1/company.proto
+++ b/proto-google-cloud-talent-v4beta1/src/main/proto/google/cloud/talent/v4beta1/company.proto
@@ -33,8 +33,8 @@ option objc_class_prefix = "CTS";
 message Company {
   option (google.api.resource) = {
     type: "jobs.googleapis.com/Company"
-    pattern: "projects/{project}/companies/{company}"
     pattern: "projects/{project}/tenants/{tenant}/companies/{company}"
+    pattern: "projects/{project}/companies/{company}"
   };
 
   // Derived details about the company.
diff --git a/proto-google-cloud-talent-v4beta1/src/main/proto/google/cloud/talent/v4beta1/job.proto b/proto-google-cloud-talent-v4beta1/src/main/proto/google/cloud/talent/v4beta1/job.proto
index 86a5c38f..b2ffa2bc 100644
--- a/proto-google-cloud-talent-v4beta1/src/main/proto/google/cloud/talent/v4beta1/job.proto
+++ b/proto-google-cloud-talent-v4beta1/src/main/proto/google/cloud/talent/v4beta1/job.proto
@@ -35,8 +35,8 @@ option objc_class_prefix = "CTS";
 message Job {
   option (google.api.resource) = {
     type: "jobs.googleapis.com/Job"
-    pattern: "projects/{project}/jobs/{job}"
     pattern: "projects/{project}/tenants/{tenant}/jobs/{job}"
+    pattern: "projects/{project}/jobs/{job}"
   };
 
   // Application related details of a job posting.
diff --git a/synth.metadata b/synth.metadata
index e005e410..2090aac4 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -11,8 +11,8 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "ee4ea76504aa60c2bff9b7c11269c155d8c21e0d",
-        "internalRef": "305619145"
+        "sha": "ac1f904979899bc598fb0567cf7a367f08b40b43",
+        "internalRef": "305760190"
       }
     },
     {