fix: guard against null projectId in Firestore routing header

Fixes: #2205.
GoogleCloudPlatform · Sep 29, 2023 · 29229f7 · 29229f7
1 parent 1e8602d
commit 29229f7
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/...n/java/com/google/cloud/spring/autoconfigure/firestore/GcpFirestoreAutoConfiguration.java b/...n/java/com/google/cloud/spring/autoconfigure/firestore/GcpFirestoreAutoConfiguration.java
@@ -166,11 +166,13 @@ public FirestoreTemplate firestoreTemplate(
     public ClientInterceptor firestoreRoutingHeadersInterceptor() {
       // add routing header for custom database id
       Metadata routingHeader = new Metadata();
-      Metadata.Key<String> key =
-          Metadata.Key.of(Headers.DYNAMIC_ROUTING_HEADER_KEY, Metadata.ASCII_STRING_MARSHALLER);
-      routingHeader.put(key,
-          "project_id=" + PERCENT_ESCAPER.escape(projectId)
-              + "&database_id=" + PERCENT_ESCAPER.escape(databaseId));
+      if (projectId != null && databaseId != null) {
+        Metadata.Key<String> key =
+            Metadata.Key.of(Headers.DYNAMIC_ROUTING_HEADER_KEY, Metadata.ASCII_STRING_MARSHALLER);
+        routingHeader.put(key,
+            "project_id=" + PERCENT_ESCAPER.escape(projectId)
+                + "&database_id=" + PERCENT_ESCAPER.escape(databaseId));
+      }
       return MetadataUtils.newAttachHeadersInterceptor(routingHeader);
     }