From cd0150c4d96135cce7fbd7e8e26d870bca6f4ae7 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Thu, 11 Aug 2022 22:12:52 +0200 Subject: [PATCH] Once again adopt changes from cert-d-java --- .../src/main/java/pgp/cert_d/cli/PGPCertDCli.java | 2 +- .../src/main/java/pgp/cert_d/cli/commands/Get.java | 4 ++-- .../src/main/java/pgp/cert_d/cli/commands/Import.java | 2 +- .../src/main/java/pgp/cert_d/cli/commands/Insert.java | 2 +- .../src/main/java/pgp/cert_d/cli/commands/Setup.java | 2 +- .../org/pgpainless/certificate_store/KeyMaterialReader.java | 2 +- .../org/pgpainless/certificate_store/PGPainlessCertD.java | 6 +++--- .../cert_d/SharedPGPCertificateDirectoryTest.java | 6 +++--- 8 files changed, 13 insertions(+), 13 deletions(-) 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 cb44fdd..ff36878 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 @@ -6,7 +6,7 @@ package pgp.cert_d.cli; import org.pgpainless.certificate_store.PGPainlessCertD; import pgp.cert_d.BaseDirectoryProvider; -import pgp.cert_d.NotAStoreException; +import pgp.cert_d.exception.NotAStoreException; import pgp.cert_d.cli.commands.Export; import pgp.cert_d.cli.commands.Get; import pgp.cert_d.cli.commands.Insert; diff --git a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Get.java b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Get.java index 94d907d..3f303c7 100644 --- a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Get.java +++ b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Get.java @@ -7,8 +7,8 @@ package pgp.cert_d.cli.commands; import org.bouncycastle.util.io.Streams; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import pgp.cert_d.BadDataException; -import pgp.cert_d.BadNameException; +import pgp.cert_d.exception.BadDataException; +import pgp.cert_d.exception.BadNameException; import pgp.cert_d.SpecialNames; import pgp.cert_d.cli.PGPCertDCli; import pgp.certificate.KeyMaterial; diff --git a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Import.java b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Import.java index d201b84..2f35cc7 100644 --- a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Import.java +++ b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Import.java @@ -10,7 +10,7 @@ import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; import org.pgpainless.PGPainless; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import pgp.cert_d.BadDataException; +import pgp.cert_d.exception.BadDataException; import pgp.cert_d.cli.MergeCallbacks; import pgp.cert_d.cli.PGPCertDCli; import pgp.certificate.Certificate; diff --git a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Insert.java b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Insert.java index 30020a8..25a2116 100644 --- a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Insert.java +++ b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Insert.java @@ -6,7 +6,7 @@ package pgp.cert_d.cli.commands; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import pgp.cert_d.BadDataException; +import pgp.cert_d.exception.BadDataException; import pgp.cert_d.cli.MergeCallbacks; import pgp.cert_d.cli.PGPCertDCli; import pgp.certificate.Certificate; diff --git a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Setup.java b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Setup.java index e1a4b5e..3f2d2d9 100644 --- a/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Setup.java +++ b/pgpainless-cert-d-cli/src/main/java/pgp/cert_d/cli/commands/Setup.java @@ -15,7 +15,7 @@ import org.pgpainless.key.generation.type.eddsa.EdDSACurve; import org.pgpainless.util.Passphrase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import pgp.cert_d.BadDataException; +import pgp.cert_d.exception.BadDataException; import pgp.cert_d.cli.MergeCallbacks; import pgp.cert_d.cli.PGPCertDCli; import picocli.CommandLine; diff --git a/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/KeyMaterialReader.java b/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/KeyMaterialReader.java index 7af37f3..b102937 100644 --- a/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/KeyMaterialReader.java +++ b/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/KeyMaterialReader.java @@ -8,7 +8,7 @@ import org.bouncycastle.openpgp.PGPKeyRing; import org.bouncycastle.openpgp.PGPPublicKeyRing; import org.bouncycastle.openpgp.PGPSecretKeyRing; import org.pgpainless.PGPainless; -import pgp.cert_d.BadDataException; +import pgp.cert_d.exception.BadDataException; import pgp.certificate.KeyMaterial; import pgp.certificate.KeyMaterialReaderBackend; diff --git a/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/PGPainlessCertD.java b/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/PGPainlessCertD.java index 8dcb1ba..547e535 100644 --- a/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/PGPainlessCertD.java +++ b/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/PGPainlessCertD.java @@ -5,9 +5,9 @@ package org.pgpainless.certificate_store; import pgp.cert_d.BaseDirectoryProvider; -import pgp.cert_d.FileBasedCertificateDirectoryBackend; -import pgp.cert_d.InMemoryCertificateDirectoryBackend; -import pgp.cert_d.NotAStoreException; +import pgp.cert_d.backend.FileBasedCertificateDirectoryBackend; +import pgp.cert_d.backend.InMemoryCertificateDirectoryBackend; +import pgp.cert_d.exception.NotAStoreException; import pgp.cert_d.PGPCertificateDirectory; import java.io.File; diff --git a/pgpainless-cert-d/src/test/java/org/pgpainless/cert_d/SharedPGPCertificateDirectoryTest.java b/pgpainless-cert-d/src/test/java/org/pgpainless/cert_d/SharedPGPCertificateDirectoryTest.java index 6d3fb26..69386bc 100644 --- a/pgpainless-cert-d/src/test/java/org/pgpainless/cert_d/SharedPGPCertificateDirectoryTest.java +++ b/pgpainless-cert-d/src/test/java/org/pgpainless/cert_d/SharedPGPCertificateDirectoryTest.java @@ -36,9 +36,9 @@ import org.pgpainless.key.OpenPgpFingerprint; import org.pgpainless.key.generation.KeySpec; import org.pgpainless.key.generation.type.KeyType; import org.pgpainless.key.generation.type.eddsa.EdDSACurve; -import pgp.cert_d.BadDataException; -import pgp.cert_d.BadNameException; -import pgp.cert_d.NotAStoreException; +import pgp.cert_d.exception.BadDataException; +import pgp.cert_d.exception.BadNameException; +import pgp.cert_d.exception.NotAStoreException; import pgp.certificate.Certificate; import pgp.certificate.KeyMaterial; import pgp.certificate.KeyMaterialMerger;