diff --git a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/PGPCertDCli.java b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/PGPCertDCli.java index 1f4029b..a45a969 100644 --- a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/PGPCertDCli.java +++ b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/PGPCertDCli.java @@ -10,7 +10,7 @@ import pgp.cert_d.BaseDirectoryProvider; import pgp.cert_d.SharedPGPCertificateDirectoryImpl; import pgp.cert_d.cli.commands.Get; import pgp.cert_d.cli.commands.Insert; -import pgp.cert_d.cli.commands.MultiImport; +import pgp.cert_d.cli.commands.Import; import pgp.cert_d.jdbc.sqlite.DatabaseSubkeyLookup; import pgp.cert_d.jdbc.sqlite.SqliteSubkeyLookupDaoImpl; import pgp.certificate_store.SubkeyLookup; @@ -26,7 +26,7 @@ import java.sql.SQLException; description = "Store and manage public OpenPGP certificates", subcommands = { Insert.class, - MultiImport.class, + Import.class, Get.class, } ) diff --git a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/MultiImport.java b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Import.java similarity index 83% rename from pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/MultiImport.java rename to pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Import.java index 6a38460..4c2a484 100644 --- a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/MultiImport.java +++ b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Import.java @@ -19,12 +19,12 @@ import picocli.CommandLine; import java.io.ByteArrayInputStream; import java.io.IOException; -@CommandLine.Command(name = "multi-import", - description = "Import or update multiple certificates") -public class MultiImport implements Runnable { +@CommandLine.Command(name = "import", + description = "Import certificates into the store from stdin") +public class Import implements Runnable { - private static final Logger LOGGER = LoggerFactory.getLogger(MultiImport.class); - private final MergeCallback dummyMerge = new DefaultMergeCallback(); + private static final Logger LOGGER = LoggerFactory.getLogger(Import.class); + private final MergeCallback mergeCallback = new DefaultMergeCallback(); @Override public void run() { @@ -33,7 +33,7 @@ public class MultiImport implements Runnable { for (PGPPublicKeyRing cert : certificates) { ByteArrayInputStream certIn = new ByteArrayInputStream(cert.getEncoded()); Certificate certificate = PGPCertDCli.getCertificateDirectory() - .insertCertificate(certIn, dummyMerge); + .insertCertificate(certIn, mergeCallback); } } catch (IOException e) { LOGGER.error("IO-Error.", e);