PGPainless/cert-d-java
1
0
Fork 0
mirror of https://codeberg.org/PGPainless/cert-d-java.git synced 2024-11-25 00:42:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

DatabaseSubkeyLookupFactory: Make database name configurable

Browse source
This commit is contained in:
Paul Schaub 2022-08-24 13:58:18 +02:00
parent 27f4598437
commit f382189638
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pgp-cert-d-java-jdbc-sqlite-lookup/src/main/java/pgp/cert_d/jdbc/sqlite/DatabaseSubkeyLookupFactory.java
View file

@ -16,9 +16,19 @@ import java.sql.SQLException;
*/ */
public class DatabaseSubkeyLookupFactory implements SubkeyLookupFactory { public class DatabaseSubkeyLookupFactory implements SubkeyLookupFactory {
private String databaseName;
public DatabaseSubkeyLookupFactory() {
this("_pgpainless_subkey_map.db");
}
public DatabaseSubkeyLookupFactory(String databaseName) {
this.databaseName = databaseName;
}
@Override @Override
public SubkeyLookup createFileBasedInstance(File baseDirectory) { public SubkeyLookup createFileBasedInstance(File baseDirectory) {
File databaseFile = new File(baseDirectory, "_pgpainless_subkey_map.db"); File databaseFile = new File(baseDirectory, databaseName);
SubkeyLookupDao dao; SubkeyLookupDao dao;
try { try {
if (!databaseFile.exists()) { if (!databaseFile.exists()) {

14
pgp-cert-d-java-jdbc-sqlite-lookup/src/test/java/pgp/cert_d/jdbc/sqlite/SqliteSubkeyLookupTest.java
View file

@ -22,15 +22,15 @@ import org.junit.jupiter.api.Test;
public class SqliteSubkeyLookupTest { public class SqliteSubkeyLookupTest {
private File databaseFile; private File tempDir;
private DatabaseSubkeyLookup lookup; private DatabaseSubkeyLookup lookup;
@BeforeEach @BeforeEach
public void setupLookup() throws IOException, SQLException { public void setupLookup() throws IOException {
databaseFile = Files.createTempFile("pgp.cert.d-", "lookup.db").toFile(); tempDir = Files.createTempDirectory("pgp.cert.d").toFile();
databaseFile.createNewFile(); tempDir.deleteOnExit();
databaseFile.deleteOnExit(); lookup = (DatabaseSubkeyLookup) new DatabaseSubkeyLookupFactory()
lookup = new DatabaseSubkeyLookup(SqliteSubkeyLookupDaoImpl.forDatabaseFile(databaseFile)); .createFileBasedInstance(tempDir);
} }
@Test @Test
@ -55,7 +55,7 @@ public class SqliteSubkeyLookupTest {
assertEquals(Collections.singleton("eb85bb5fa33a75e15e944e63f231550c4f47e38e"), lookup.getCertificateFingerprintsForSubkeyId(1337)); assertEquals(Collections.singleton("eb85bb5fa33a75e15e944e63f231550c4f47e38e"), lookup.getCertificateFingerprintsForSubkeyId(1337));
// do the lookup using a second db instance on the same file // 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)); assertEquals(Collections.singleton("eb85bb5fa33a75e15e944e63f231550c4f47e38e"), secondInstance.getCertificateFingerprintsForSubkeyId(1337));
} }