From f38218963874675f93a474367ded32df51ce9687 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Wed, 24 Aug 2022 13:58:18 +0200
Subject: [PATCH] DatabaseSubkeyLookupFactory: Make database name configurable

---
 .../jdbc/sqlite/DatabaseSubkeyLookupFactory.java   | 12 +++++++++++-
 .../cert_d/jdbc/sqlite/SqliteSubkeyLookupTest.java | 14 +++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/pgp-cert-d-java-jdbc-sqlite-lookup/src/main/java/pgp/cert_d/jdbc/sqlite/DatabaseSubkeyLookupFactory.java b/pgp-cert-d-java-jdbc-sqlite-lookup/src/main/java/pgp/cert_d/jdbc/sqlite/DatabaseSubkeyLookupFactory.java
index d2cecd3..d0a259a 100644
--- a/pgp-cert-d-java-jdbc-sqlite-lookup/src/main/java/pgp/cert_d/jdbc/sqlite/DatabaseSubkeyLookupFactory.java
+++ b/pgp-cert-d-java-jdbc-sqlite-lookup/src/main/java/pgp/cert_d/jdbc/sqlite/DatabaseSubkeyLookupFactory.java
@@ -16,9 +16,19 @@ import java.sql.SQLException;
  */
 public class DatabaseSubkeyLookupFactory implements SubkeyLookupFactory {
 
+    private String databaseName;
+
+    public DatabaseSubkeyLookupFactory() {
+        this("_pgpainless_subkey_map.db");
+    }
+
+    public DatabaseSubkeyLookupFactory(String databaseName) {
+        this.databaseName = databaseName;
+    }
+
     @Override
     public SubkeyLookup createFileBasedInstance(File baseDirectory) {
-        File databaseFile = new File(baseDirectory, "_pgpainless_subkey_map.db");
+        File databaseFile = new File(baseDirectory, databaseName);
         SubkeyLookupDao dao;
         try {
             if (!databaseFile.exists()) {
diff --git a/pgp-cert-d-java-jdbc-sqlite-lookup/src/test/java/pgp/cert_d/jdbc/sqlite/SqliteSubkeyLookupTest.java b/pgp-cert-d-java-jdbc-sqlite-lookup/src/test/java/pgp/cert_d/jdbc/sqlite/SqliteSubkeyLookupTest.java
index b71337c..5539d12 100644
--- a/pgp-cert-d-java-jdbc-sqlite-lookup/src/test/java/pgp/cert_d/jdbc/sqlite/SqliteSubkeyLookupTest.java
+++ b/pgp-cert-d-java-jdbc-sqlite-lookup/src/test/java/pgp/cert_d/jdbc/sqlite/SqliteSubkeyLookupTest.java
@@ -22,15 +22,15 @@ import org.junit.jupiter.api.Test;
 
 public class SqliteSubkeyLookupTest {
 
-    private File databaseFile;
+    private File tempDir;
     private DatabaseSubkeyLookup lookup;
 
     @BeforeEach
-    public void setupLookup() throws IOException, SQLException {
-        databaseFile = Files.createTempFile("pgp.cert.d-", "lookup.db").toFile();
-        databaseFile.createNewFile();
-        databaseFile.deleteOnExit();
-        lookup = new DatabaseSubkeyLookup(SqliteSubkeyLookupDaoImpl.forDatabaseFile(databaseFile));
+    public void setupLookup() throws IOException {
+        tempDir = Files.createTempDirectory("pgp.cert.d").toFile();
+        tempDir.deleteOnExit();
+        lookup = (DatabaseSubkeyLookup) new DatabaseSubkeyLookupFactory()
+                .createFileBasedInstance(tempDir);
     }
 
     @Test
@@ -55,7 +55,7 @@ public class SqliteSubkeyLookupTest {
         assertEquals(Collections.singleton("eb85bb5fa33a75e15e944e63f231550c4f47e38e"), lookup.getCertificateFingerprintsForSubkeyId(1337));
 
         // do the lookup using a second db instance on the same file
-        DatabaseSubkeyLookup secondInstance = new DatabaseSubkeyLookup(SqliteSubkeyLookupDaoImpl.forDatabaseFile(databaseFile));
+        DatabaseSubkeyLookup secondInstance = (DatabaseSubkeyLookup) new DatabaseSubkeyLookupFactory().createFileBasedInstance(tempDir);
         assertEquals(Collections.singleton("eb85bb5fa33a75e15e944e63f231550c4f47e38e"), secondInstance.getCertificateFingerprintsForSubkeyId(1337));
     }