feat(internal/librarian/java): add api shortname override support (#5304)

An api_shortname_override field is added to the Java configuration to
allow the `api_shortname` field in `.repo-metadata.json` to be
overridden.

This provides flexibility for libraries that require a specific
shortname that differs from the default derived value.

For #5296

Author: JoeWang1127

doc/config-schema.md

@@ -253,6 +253,7 @@ This document describes the schema for the librarian.yaml.
 | `api_id_override` | string | Is the ID of the API (e.g., "pubsub.googleapis.com"), allows the "api_id" field in .repo-metadata.json to be overridden. Defaults to "{library.api_shortname}.googleapis.com". |
 | `api_reference` | string | Is the URL for the API reference documentation. |
 | `api_description_override` | string | Allows the "api_description" field in .repo-metadata.json to be overridden. |
+| `api_shortname_override` | string | Allows the "api_shortname" field in .repo-metadata.json to be overridden. |
 | `client_documentation_override` | string | Allows the "client_documentation" field in .repo-metadata.json to be overridden. |
 | `non_cloud_api` | bool | Indicates whether the API is NOT a Google Cloud API. Defaults to false. |
 | `codeowner_team` | string | Is the GitHub team that owns the code. |

internal/config/language.go

@@ -496,6 +496,10 @@ type JavaModule struct {
 	// .repo-metadata.json to be overridden.
 	APIDescriptionOverride string `yaml:"api_description_override,omitempty"`
 
+	// APIShortnameOverride allows the "api_shortname" field in
+	// .repo-metadata.json to be overridden.
+	APIShortnameOverride string `yaml:"api_shortname_override,omitempty"`
+
 	// ClientDocumentationOverride allows the "client_documentation" field in
 	// .repo-metadata.json to be overridden.
 	ClientDocumentationOverride string `yaml:"client_documentation_override,omitempty"`

internal/librarian/java/repometadata.go

@@ -110,6 +110,10 @@ func deriveRepoMetadata(cfg *config.Config, library *config.Library, googleapisD
 
 	// Java-specific overrides and optional fields
 	if library.Java != nil {
+		if library.Java.APIShortnameOverride != "" {
+			metadata.APIShortname = library.Java.APIShortnameOverride
+			metadata.APIID = fmt.Sprintf("%s.googleapis.com", library.Java.APIShortnameOverride)
+		}
 		if library.Java.APIIDOverride != "" {
 			metadata.APIID = library.Java.APIIDOverride
 		}

internal/librarian/java/repometadata_test.go

@@ -78,42 +78,78 @@ func TestDeriveRepoMetadata_Overrides(t *testing.T) {
 	cfg := sample.Config()
 	cfg.Language = config.LanguageJava
 	cfg.Repo = "googleapis/google-cloud-java"
-	library := &config.Library{
-		Name: "secretmanager",
-		APIs: []*config.API{{Path: apiPath}},
-		Java: &config.JavaModule{
-			GroupID:                      "com.custom",
-			DistributionNameOverride:     "com.custom:custom-artifact",
-			APIIDOverride:                "custom.googleapis.com",
-			APIDescriptionOverride:       "Custom description",
-			NamePrettyOverride:           "Custom Pretty Name",
-			ProductDocumentationOverride: "https://custom.docs",
-			ClientDocumentationOverride:  "https://custom.client.docs",
-			BillingNotRequired:           true,
-			LibraryTypeOverride:          "OTHER",
-		},
-	}
-	got, err := deriveRepoMetadata(cfg, library, googleapis)
-	if err != nil {
-		t.Fatalf("deriveRepoMetadata failed: %v", err)
-	}
 	s := sample.RepoMetadata()
-	want := &repoMetadata{
-		NamePretty:           "Custom Pretty Name",
-		ProductDocumentation: "https://custom.docs",
-		APIDescription:       "Custom description",
-		ClientDocumentation:  "https://custom.client.docs",
-		ReleaseLevel:         s.ReleaseLevel,
-		Transport:            "both",
-		Language:             cfg.Language,
-		Repo:                 cfg.Repo,
-		RepoShort:            "java-secretmanager",
-		DistributionName:     "com.custom:custom-artifact",
-		APIID:                "custom.googleapis.com",
-		LibraryType:          "OTHER",
-		RequiresBilling:      false,
-	}
-	if diff := cmp.Diff(want, got, cmp.AllowUnexported(repoMetadata{})); diff != "" {
-		t.Errorf("mismatch (-want +got):\n%s", diff)
+	for _, test := range []struct {
+		name string
+		java *config.JavaModule
+		want *repoMetadata
+	}{
+		{
+			name: "all overrides",
+			java: &config.JavaModule{
+				GroupID:                      "com.custom",
+				DistributionNameOverride:     "com.custom:custom-artifact",
+				APIIDOverride:                "custom.googleapis.com",
+				APIDescriptionOverride:       "Custom description",
+				APIShortnameOverride:         "custom-shortname",
+				NamePrettyOverride:           "Custom Pretty Name",
+				ProductDocumentationOverride: "https://custom.docs",
+				ClientDocumentationOverride:  "https://custom.client.docs",
+				BillingNotRequired:           true,
+				LibraryTypeOverride:          "OTHER",
+			},
+			want: &repoMetadata{
+				APIShortname:         "custom-shortname",
+				NamePretty:           "Custom Pretty Name",
+				ProductDocumentation: "https://custom.docs",
+				APIDescription:       "Custom description",
+				ClientDocumentation:  "https://custom.client.docs",
+				ReleaseLevel:         s.ReleaseLevel,
+				Transport:            "both",
+				Language:             cfg.Language,
+				Repo:                 cfg.Repo,
+				RepoShort:            "java-secretmanager",
+				DistributionName:     "com.custom:custom-artifact",
+				APIID:                "custom.googleapis.com",
+				LibraryType:          "OTHER",
+				RequiresBilling:      false,
+			},
+		},
+		{
+			name: "only overrides api shortname",
+			java: &config.JavaModule{
+				APIShortnameOverride: "custom-shortname",
+			},
+			want: &repoMetadata{
+				APIShortname:        "custom-shortname",
+				ClientDocumentation: "https://cloud.google.com/java/docs/reference/google-cloud-secretmanager/latest/overview",
+				ReleaseLevel:        "stable",
+				Transport:           "both",
+				Language:            "java",
+				Repo:                "googleapis/google-cloud-java",
+				RepoShort:           "java-secretmanager",
+				DistributionName:    "com.google.cloud:google-cloud-secretmanager",
+				// API ID is also override.
+				APIID:           "custom-shortname.googleapis.com",
+				LibraryType:     "GAPIC_AUTO",
+				RequiresBilling: true,
+			},
+		},
+	} {
+		t.Run(test.name, func(t *testing.T) {
+			library := &config.Library{
+				Name: "secretmanager",
+				APIs: []*config.API{{Path: apiPath}},
+				Java: test.java,
+			}
+			got, err := deriveRepoMetadata(cfg, library, googleapis)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if diff := cmp.Diff(test.want, got, cmp.AllowUnexported(repoMetadata{})); diff != "" {
+				t.Errorf("mismatch (-want +got):\n%s", diff)
+			}
+		})
 	}
+
 }