From 3137a81fa91b7faea314eb3c736402c2bde06240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Fri, 25 Feb 2022 18:30:18 +0100
Subject: [PATCH] Fix Firestore database name access
---
.../src/main/java/application/firestore/DocumentMapper.java | 2 +-
.../src/main/java/application/firestore/FirestoreConfig.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/DocumentMapper.java b/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/DocumentMapper.java
index ab4617ecd..d7781a933 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/DocumentMapper.java
+++ b/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/DocumentMapper.java
@@ -34,7 +34,7 @@ final class DocumentMapper extends SimpleFunction<ActivePowerRecord, Document> {
private String createDocumentName(final String documentId) {
this.initFirestoreConfig();
return "projects/" + this.firestoreConfig.getProjectId()
- + "/databases/" + this.firestoreConfig.getDatabaseDdlRequest()
+ + "/databases/" + this.firestoreConfig.getDatabase()
+ "/documents/" + this.collection
+ "/" + documentId;
}
diff --git a/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/FirestoreConfig.java b/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/FirestoreConfig.java
index eb62d69f9..1482a5981 100644
--- a/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/FirestoreConfig.java
+++ b/theodolite-benchmarks/uc1-beam/src/main/java/application/firestore/FirestoreConfig.java
@@ -16,8 +16,8 @@ final class FirestoreConfig {
return this.firestoreOptions.getProjectId();
}
- public String getDatabaseDdlRequest() {
- return this.firestoreOptions.getProjectId();
+ public String getDatabase() {
+ return this.firestoreOptions.getDatabaseId();
}
public static FirestoreConfig createFromDefaults() throws IOException {
--
GitLab