Synchronize new proto/yaml changes.

PiperOrigin-RevId: 245084103

google/cloud/talent/v4beta1/talent_gapic.yaml

@@ -34,13 +34,23 @@ collections:
   - language: csharp
     common_resource_name: Google.Api.Gax.ResourceNames.ProjectName
 - name_pattern: projects/{project}/companies/{company}
-  entity_name: company_old
+  entity_name: company_without_tenant
 - name_pattern: projects/{project}/tenants/{tenant}/companies/{company}
-  entity_name: company_new
+  entity_name: company
+  # Override on Java, or we'll get an exception caused by conflicting with company_oneof:
+  # "CompanyName.java: Tried to write the same file twice".
+  language_overrides:
+  - language: java
+    entity_name: company_with_tenant
 - name_pattern: projects/{project}/jobs/{jobs}
-  entity_name: job_old
+  entity_name: job_without_tenant
 - name_pattern: projects/{project}/tenants/{tenant}/jobs/{jobs}
-  entity_name: job_new
+  entity_name: job
+  # Override on Java, or we'll get an exception caused by conflicting with job_oneof:
+  # "JobName.java: Tried to write the same file twice".
+  language_overrides:
+  - language: java
+    entity_name: job_with_tenant
 - name_pattern: projects/{project}/tenants/{tenant}/profiles/{profile}
   entity_name: profile
 - name_pattern: projects/{project}/tenants/{tenant}/profiles/{profile}/applications/{application}
@@ -51,12 +61,12 @@ collections:
 collection_oneofs:
 - oneof_name: company_oneof
   collection_names:
-  - company_old
-  - company_new
+  - company
+  - company_without_tenant
 - oneof_name: job_oneof
   collection_names:
-  - job_old
-  - job_new
+  - job
+  - job_without_tenant
 - oneof_name: tenant_or_project
   collection_names:
   - tenant