From 00e597ca1778a5215e2e77fb48a70fb5791eace4 Mon Sep 17 00:00:00 2001
From: Sofia Leon <sofialeon@google.com>
Date: Mon, 29 Jun 2026 23:47:35 +0000
Subject: [PATCH] fix(internal/serviceconfig): normalize transport name for
 Java repo-metadata

Remove the Java-specific mapping in RepoMetadataTransport that translated
transport values to "http" or "both". Now it returns the standard values
("grpc", "rest", "grpc+rest") directly, aligning Java with other languages.

Fixes https://github.com/googleapis/librarian/issues/4854
---
 internal/librarian/java/repometadata_test.go |  6 +++---
 internal/serviceconfig/api.go                | 18 ++----------------
 internal/serviceconfig/api_test.go           | 10 ++++++++--
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/internal/librarian/java/repometadata_test.go b/internal/librarian/java/repometadata_test.go
index c1f42a8ac91..4eb4a1f2e68 100644
--- a/internal/librarian/java/repometadata_test.go
+++ b/internal/librarian/java/repometadata_test.go
@@ -112,7 +112,7 @@ func TestDeriveRepoMetadata_Overrides(t *testing.T) {
 				APIDescription:       "Custom description",
 				ClientDocumentation:  "https://custom.client.docs",
 				ReleaseLevel:         s.ReleaseLevel,
-				Transport:            "both",
+				Transport:            "grpc+rest",
 				Language:             cfg.Language,
 				Repo:                 cfg.Repo,
 				RepoShort:            "java-secretmanager",
@@ -137,7 +137,7 @@ func TestDeriveRepoMetadata_Overrides(t *testing.T) {
 				APIDescription:       wantAPIDescription,
 				ClientDocumentation:  "https://cloud.google.com/java/docs/reference/google-cloud-secretmanager/latest/overview",
 				ReleaseLevel:         "stable",
-				Transport:            "both",
+				Transport:            "grpc+rest",
 				Language:             "java",
 				Repo:                 "googleapis/google-cloud-java",
 				RepoShort:            "java-secretmanager",
@@ -162,7 +162,7 @@ func TestDeriveRepoMetadata_Overrides(t *testing.T) {
 				APIDescription:       wantAPIDescription,
 				ClientDocumentation:  "https://cloud.google.com/java/docs/reference/google-cloud-secretmanager/latest/overview",
 				ReleaseLevel:         "stable",
-				Transport:            "http",
+				Transport:            "rest",
 				Language:             "java",
 				Repo:                 "googleapis/google-cloud-java",
 				RepoShort:            "java-secretmanager",
diff --git a/internal/serviceconfig/api.go b/internal/serviceconfig/api.go
index 16878f488a7..4302e653df2 100644
--- a/internal/serviceconfig/api.go
+++ b/internal/serviceconfig/api.go
@@ -167,24 +167,10 @@ func (api *API) ReleaseLevel(language, version string) string {
 }
 
 // RepoMetadataTransport returns the transport for repo metadata.
-//
-// TODO(https://github.com/googleapis/librarian/issues/4854): delete
-// once the issue is resolved.
-// For Java, it maps the transport to "grpc", "http", or "both".
 func (api *API) RepoMetadataTransport(language string, library *config.Library) string {
 	transport := api.Transport(language)
-	if language == config.LanguageJava {
-		if library != nil && library.Java != nil && library.Java.TransportOverride != "" {
-			transport = Transport(library.Java.TransportOverride)
-		}
-		switch transport {
-		case GRPC:
-			return "grpc"
-		case Rest:
-			return "http"
-		default:
-			return "both"
-		}
+	if language == config.LanguageJava && library != nil && library.Java != nil && library.Java.TransportOverride != "" {
+		transport = Transport(library.Java.TransportOverride)
 	}
 	return string(transport)
 }
diff --git a/internal/serviceconfig/api_test.go b/internal/serviceconfig/api_test.go
index 21d75d00cce..070922f0ccf 100644
--- a/internal/serviceconfig/api_test.go
+++ b/internal/serviceconfig/api_test.go
@@ -330,7 +330,13 @@ func TestRepoMetadataTransport(t *testing.T) {
 				Transports: map[string]Transport{config.LanguageJava: Rest},
 			},
 			language: config.LanguageJava,
-			want:     "http",
+			want:     "rest",
+		},
+		{
+			name:     "java, default",
+			sc:       &API{},
+			language: config.LanguageJava,
+			want:     "grpc+rest",
 		},
 		{
 			name:     "non-java, default",
@@ -365,7 +371,7 @@ func TestRepoMetadataTransport(t *testing.T) {
 					TransportOverride: "rest",
 				},
 			},
-			want: "http",
+			want: "rest",
 		},
 	} {
 		t.Run(test.name, func(t *testing.T) {