From d4a820cbc652edb06c12fc93a9967e2a3b2c10d1 Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Fri, 4 Nov 2022 17:33:50 +0000 Subject: [PATCH 1/3] Update spring getLibName to use parsedApiShortName approach --- .../api/generator/spring/utils/Utils.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/utils/Utils.java b/src/main/java/com/google/api/generator/spring/utils/Utils.java index dea2b743f3..50802262f0 100644 --- a/src/main/java/com/google/api/generator/spring/utils/Utils.java +++ b/src/main/java/com/google/api/generator/spring/utils/Utils.java @@ -28,7 +28,6 @@ import com.google.api.generator.gapic.model.Service; import com.google.common.base.CaseFormat; import com.google.common.base.Preconditions; -import com.google.common.base.Splitter; import com.google.protobuf.Duration; import com.google.protobuf.util.Durations; import io.grpc.serviceconfig.MethodConfig.RetryPolicy; @@ -60,12 +59,17 @@ public static String getLibName(GapicContext context) { // discrepancies // eg. for vision proto: "com.google.cloud.vision.v1" // https://github.com/googleapis/java-vision/blob/main/proto-google-cloud-vision-v1/src/main/proto/google/cloud/vision/v1/image_annotator.proto#L36 - List pakkagePhrases = Splitter.on(".").splitToList(getPackageName(context)); - return pakkagePhrases.get(pakkagePhrases.size() - 2); - - // Option 3: Parse ApiShortName from service proto's default host (e.g. vision.googleapis.com) - // TODO: Replace implementation above to reuse parsing logic from SampleGen: - // https://github.com/googleapis/gapic-generator-java/pull/1040 + // List pakkagePhrases = Splitter.on(".").splitToList(getPackageName(context)); + // return pakkagePhrases.get(pakkagePhrases.size() - 2); + + // Option 3: Use parsed apiShortName from service proto's default host + // (e.g. vision.googleapis.com => vision) + String apiShortName = context.services().get(0).apiShortName(); + // For testing with showcase (localhost:7469) + if (apiShortName.equals("localhost:7469")) { + apiShortName = "showcase"; + } + return apiShortName; } public static String getPackageName(GapicContext context) { From 797932aa8c6263f72a92aef555bf2d8bbb720489 Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Fri, 4 Nov 2022 18:30:21 +0000 Subject: [PATCH 2/3] Comment fix --- src/main/java/com/google/api/generator/spring/utils/Utils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/google/api/generator/spring/utils/Utils.java b/src/main/java/com/google/api/generator/spring/utils/Utils.java index 50802262f0..5c9ce917cf 100644 --- a/src/main/java/com/google/api/generator/spring/utils/Utils.java +++ b/src/main/java/com/google/api/generator/spring/utils/Utils.java @@ -65,7 +65,7 @@ public static String getLibName(GapicContext context) { // Option 3: Use parsed apiShortName from service proto's default host // (e.g. vision.googleapis.com => vision) String apiShortName = context.services().get(0).apiShortName(); - // For testing with showcase (localhost:7469) + // Cover special case with showcase (localhost:7469) for testing if (apiShortName.equals("localhost:7469")) { apiShortName = "showcase"; } From c2ab7d1389e2aa4b3ae03390d688d23e645f21dd Mon Sep 17 00:00:00 2001 From: Emily Wang Date: Mon, 7 Nov 2022 16:26:04 -0500 Subject: [PATCH 3/3] Remove extra clause for showcase pretty name and update goldens --- .../java/com/google/api/generator/spring/utils/Utils.java | 7 +------ .../spring/composer/goldens/SpringPackageInfo.golden | 2 +- .../spring/composer/goldens/SpringPackageInfoFull.golden | 2 +- .../spring/goldens/SpringAdditionalMetadataJson.golden | 2 +- .../api/generator/spring/goldens/SpringPackagePom.golden | 4 ++-- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/google/api/generator/spring/utils/Utils.java b/src/main/java/com/google/api/generator/spring/utils/Utils.java index 5c9ce917cf..ce02532b84 100644 --- a/src/main/java/com/google/api/generator/spring/utils/Utils.java +++ b/src/main/java/com/google/api/generator/spring/utils/Utils.java @@ -64,12 +64,7 @@ public static String getLibName(GapicContext context) { // Option 3: Use parsed apiShortName from service proto's default host // (e.g. vision.googleapis.com => vision) - String apiShortName = context.services().get(0).apiShortName(); - // Cover special case with showcase (localhost:7469) for testing - if (apiShortName.equals("localhost:7469")) { - apiShortName = "showcase"; - } - return apiShortName; + return context.services().get(0).apiShortName(); } public static String getPackageName(GapicContext context) { diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfo.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfo.golden index d7ed65e461..d88f6b6892 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfo.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfo.golden @@ -1,4 +1,4 @@ -/** Spring Boot auto-configurations for showcase. */ +/** Spring Boot auto-configurations for localhost:7469. */ @Generated("by gapic-generator-java") package com.google.showcase.v1beta1.spring; diff --git a/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfoFull.golden b/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfoFull.golden index 4be7458a76..a73703ef49 100644 --- a/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfoFull.golden +++ b/src/test/java/com/google/api/generator/spring/composer/goldens/SpringPackageInfoFull.golden @@ -14,7 +14,7 @@ * limitations under the License. */ -/** Spring Boot auto-configurations for showcase. */ +/** Spring Boot auto-configurations for localhost:7469. */ @Generated("by gapic-generator-java") package com.google.showcase.v1beta1.spring; diff --git a/src/test/java/com/google/api/generator/spring/goldens/SpringAdditionalMetadataJson.golden b/src/test/java/com/google/api/generator/spring/goldens/SpringAdditionalMetadataJson.golden index 5da3bd87f0..16963f0b1c 100644 --- a/src/test/java/com/google/api/generator/spring/goldens/SpringAdditionalMetadataJson.golden +++ b/src/test/java/com/google/api/generator/spring/goldens/SpringAdditionalMetadataJson.golden @@ -3,7 +3,7 @@ { "name": "com.google.showcase.v1beta1.spring.auto.echo.enabled", "type": "java.lang.Boolean", - "description": "Auto-configure Google Cloud showcase/Echo components.", + "description": "Auto-configure Google Cloud localhost:7469/Echo components.", "defaultValue": true } ] diff --git a/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden b/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden index 4c6080fe0d..e772bef703 100644 --- a/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden +++ b/src/test/java/com/google/api/generator/spring/goldens/SpringPackagePom.golden @@ -6,8 +6,8 @@ com.google.cloud com-google-showcase-v1beta1-spring-starter {{starter-version}} - Spring Boot Starter - showcase - Spring Boot Starter with AutoConfiguration for showcase + Spring Boot Starter - localhost:7469 + Spring Boot Starter with AutoConfiguration for localhost:7469