From 9c109b0f906d2c0a3207c6b6080098d961096627 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 13 Sep 2022 15:35:26 -0400 Subject: [PATCH] fix: Fix recommendationengine resource name configuration (#572) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: Fix recommendationengine resource name configuration PiperOrigin-RevId: 473779245 Source-Link: https://github.com/googleapis/googleapis/commit/ee05df98143628e2e7231d367b0f50d03f71c29a Source-Link: https://github.com/googleapis/googleapis-gen/commit/d151c136b7de66b7b524817360c639d011ef003d Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDE1MWMxMzZiN2RlNjZiN2I1MjQ4MTczNjBjNjM5ZDAxMWVmMDAzZCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot --- .../v1beta1/CatalogItemPathName.java | 4 +-- .../RecommendationengineResources.java | 32 +++++++++---------- .../recommendationengine_resources.proto | 11 ++----- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/proto-google-cloud-recommendations-ai-v1beta1/src/main/java/com/google/cloud/recommendationengine/v1beta1/CatalogItemPathName.java b/proto-google-cloud-recommendations-ai-v1beta1/src/main/java/com/google/cloud/recommendationengine/v1beta1/CatalogItemPathName.java index 7830e142..c75e087d 100644 --- a/proto-google-cloud-recommendations-ai-v1beta1/src/main/java/com/google/cloud/recommendationengine/v1beta1/CatalogItemPathName.java +++ b/proto-google-cloud-recommendations-ai-v1beta1/src/main/java/com/google/cloud/recommendationengine/v1beta1/CatalogItemPathName.java @@ -31,7 +31,7 @@ public class CatalogItemPathName implements ResourceName { private static final PathTemplate PROJECT_LOCATION_CATALOG_CATALOG_ITEM_PATH = PathTemplate.createWithoutUrlEncoding( - "projects/{project}/locations/{location}/catalogs/{catalog}/catalogItems/{catalog_item_path=**}"); + "projects/{project}/locations/{location}/catalogs/{catalog}/catalogItems/{catalog_item_path}"); private volatile Map fieldValuesMap; private final String project; private final String location; @@ -209,7 +209,7 @@ public int hashCode() { /** * Builder for - * projects/{project}/locations/{location}/catalogs/{catalog}/catalogItems/{catalog_item_path=**}. + * projects/{project}/locations/{location}/catalogs/{catalog}/catalogItems/{catalog_item_path}. */ public static class Builder { private String project; diff --git a/proto-google-cloud-recommendations-ai-v1beta1/src/main/java/com/google/cloud/recommendationengine/v1beta1/RecommendationengineResources.java b/proto-google-cloud-recommendations-ai-v1beta1/src/main/java/com/google/cloud/recommendationengine/v1beta1/RecommendationengineResources.java index 5bbf66e8..02fd0e5a 100644 --- a/proto-google-cloud-recommendations-ai-v1beta1/src/main/java/com/google/cloud/recommendationengine/v1beta1/RecommendationengineResources.java +++ b/proto-google-cloud-recommendations-ai-v1beta1/src/main/java/com/google/cloud/recommendationengine/v1beta1/RecommendationengineResources.java @@ -38,7 +38,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "\nNgoogle/cloud/recommendationengine/v1be" + "ta1/recommendationengine_resources.proto" + "\022)google.cloud.recommendationengine.v1be" - + "ta1\032\031google/api/resource.protoB\253\010\n-com.g" + + "ta1\032\031google/api/resource.protoB\250\010\n-com.g" + "oogle.cloud.recommendationengine.v1beta1" + "P\001Z]google.golang.org/genproto/googleapi" + "s/cloud/recommendationengine/v1beta1;rec" @@ -48,24 +48,24 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "le::Cloud::RecommendationEngine::V1beta1" + "\352Ai\n+recommendationengine.googleapis.com" + "/Catalog\022:projects/{project}/locations/{" - + "location}/catalogs/{catalog}\352A\225\001\n3recomm" + + "location}/catalogs/{catalog}\352A\222\001\n3recomm" + "endationengine.googleapis.com/CatalogIte" - + "mPath\022^projects/{project}/locations/{loc" + + "mPath\022[projects/{project}/locations/{loc" + "ation}/catalogs/{catalog}/catalogItems/{" - + "catalog_item_path=**}\352A\206\001\n.recommendatio" - + "nengine.googleapis.com/EventStore\022Tproje" - + "cts/{project}/locations/{location}/catal" - + "ogs/{catalog}/eventStores/{event_store}\352" - + "A\331\001\n@recommendationengine.googleapis.com" - + "/PredictionApiKeyRegistration\022\224\001projects" + + "catalog_item_path}\352A\206\001\n.recommendationen" + + "gine.googleapis.com/EventStore\022Tprojects" + "/{project}/locations/{location}/catalogs" - + "/{catalog}/eventStores/{event_store}/pre" - + "dictionApiKeyRegistrations/{prediction_a" - + "pi_key_registration}\352A\234\001\n-recommendation" - + "engine.googleapis.com/Placement\022kproject" - + "s/{project}/locations/{location}/catalog" - + "s/{catalog}/eventStores/{event_store}/pl" - + "acements/{placement}b\006proto3" + + "/{catalog}/eventStores/{event_store}\352A\331\001" + + "\n@recommendationengine.googleapis.com/Pr" + + "edictionApiKeyRegistration\022\224\001projects/{p" + + "roject}/locations/{location}/catalogs/{c" + + "atalog}/eventStores/{event_store}/predic" + + "tionApiKeyRegistrations/{prediction_api_" + + "key_registration}\352A\234\001\n-recommendationeng" + + "ine.googleapis.com/Placement\022kprojects/{" + + "project}/locations/{location}/catalogs/{" + + "catalog}/eventStores/{event_store}/place" + + "ments/{placement}b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-recommendations-ai-v1beta1/src/main/proto/google/cloud/recommendationengine/v1beta1/recommendationengine_resources.proto b/proto-google-cloud-recommendations-ai-v1beta1/src/main/proto/google/cloud/recommendationengine/v1beta1/recommendationengine_resources.proto index fbec2a55..816cf27c 100644 --- a/proto-google-cloud-recommendations-ai-v1beta1/src/main/proto/google/cloud/recommendationengine/v1beta1/recommendationengine_resources.proto +++ b/proto-google-cloud-recommendations-ai-v1beta1/src/main/proto/google/cloud/recommendationengine/v1beta1/recommendationengine_resources.proto @@ -18,6 +18,8 @@ syntax = "proto3"; package google.cloud.recommendationengine.v1beta1; +import "google/api/resource.proto"; + option csharp_namespace = "Google.Cloud.RecommendationEngine.V1Beta1"; option go_package = "google.golang.org/genproto/googleapis/cloud/recommendationengine/v1beta1;recommendationengine"; option java_multiple_files = true; @@ -25,29 +27,22 @@ option java_package = "com.google.cloud.recommendationengine.v1beta1"; option objc_class_prefix = "RECAI"; option php_namespace = "Google\\Cloud\\RecommendationEngine\\V1beta1"; option ruby_package = "Google::Cloud::RecommendationEngine::V1beta1"; - -import "google/api/resource.proto"; - option (google.api.resource_definition) = { type: "recommendationengine.googleapis.com/Catalog" pattern: "projects/{project}/locations/{location}/catalogs/{catalog}" }; - option (google.api.resource_definition) = { type: "recommendationengine.googleapis.com/CatalogItemPath" - pattern: "projects/{project}/locations/{location}/catalogs/{catalog}/catalogItems/{catalog_item_path=**}" + pattern: "projects/{project}/locations/{location}/catalogs/{catalog}/catalogItems/{catalog_item_path}" }; - option (google.api.resource_definition) = { type: "recommendationengine.googleapis.com/EventStore" pattern: "projects/{project}/locations/{location}/catalogs/{catalog}/eventStores/{event_store}" }; - option (google.api.resource_definition) = { type: "recommendationengine.googleapis.com/PredictionApiKeyRegistration" pattern: "projects/{project}/locations/{location}/catalogs/{catalog}/eventStores/{event_store}/predictionApiKeyRegistrations/{prediction_api_key_registration}" }; - option (google.api.resource_definition) = { type: "recommendationengine.googleapis.com/Placement" pattern: "projects/{project}/locations/{location}/catalogs/{catalog}/eventStores/{event_store}/placements/{placement}"