From 7083045067c5ef66bac6ab0594ae7c94fcb81680 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Fri, 7 Jul 2023 15:42:04 +0200 Subject: [PATCH] Rename API package --- .../src/main/kotlin/org/pgpainless/wot/cli/WotCLI.kt | 2 +- .../org/pgpainless/wot/cli/subcommands/AuthenticateCmd.kt | 2 +- .../org/pgpainless/wot/cli/subcommands/AuthenticateCmdTest.kt | 2 +- .../org/pgpainless/wot/{dijkstra/sq => }/api/AuthenticateAPI.kt | 2 +- .../pgpainless/wot/{dijkstra/sq => }/api/AuthenticationLevel.kt | 2 +- .../kotlin/org/pgpainless/wot/{dijkstra/sq => }/api/Format.kt | 2 +- .../org/pgpainless/wot/{dijkstra/sq => }/api/IdentifyAPI.kt | 2 +- .../kotlin/org/pgpainless/wot/{dijkstra/sq => }/api/ListAPI.kt | 2 +- .../org/pgpainless/wot/{dijkstra/sq => }/api/LookupAPI.kt | 2 +- .../kotlin/org/pgpainless/wot/{dijkstra/sq => }/api/PathAPI.kt | 2 +- .../kotlin/org/pgpainless/wot/{dijkstra/sq => }/api/WoTAPI.kt | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) rename wot-dijkstra/src/main/kotlin/org/pgpainless/wot/{dijkstra/sq => }/api/AuthenticateAPI.kt (97%) rename wot-dijkstra/src/main/kotlin/org/pgpainless/wot/{dijkstra/sq => }/api/AuthenticationLevel.kt (92%) rename wot-dijkstra/src/main/kotlin/org/pgpainless/wot/{dijkstra/sq => }/api/Format.kt (94%) rename wot-dijkstra/src/main/kotlin/org/pgpainless/wot/{dijkstra/sq => }/api/IdentifyAPI.kt (89%) rename wot-dijkstra/src/main/kotlin/org/pgpainless/wot/{dijkstra/sq => }/api/ListAPI.kt (85%) rename wot-dijkstra/src/main/kotlin/org/pgpainless/wot/{dijkstra/sq => }/api/LookupAPI.kt (88%) rename wot-dijkstra/src/main/kotlin/org/pgpainless/wot/{dijkstra/sq => }/api/PathAPI.kt (94%) rename wot-dijkstra/src/main/kotlin/org/pgpainless/wot/{dijkstra/sq => }/api/WoTAPI.kt (98%) diff --git a/pgpainless-wot-cli/src/main/kotlin/org/pgpainless/wot/cli/WotCLI.kt b/pgpainless-wot-cli/src/main/kotlin/org/pgpainless/wot/cli/WotCLI.kt index 3de88038..49de6528 100644 --- a/pgpainless-wot-cli/src/main/kotlin/org/pgpainless/wot/cli/WotCLI.kt +++ b/pgpainless-wot-cli/src/main/kotlin/org/pgpainless/wot/cli/WotCLI.kt @@ -10,7 +10,7 @@ import org.pgpainless.wot.WebOfTrust import org.pgpainless.wot.cli.subcommands.* import org.pgpainless.wot.dijkstra.sq.Fingerprint import org.pgpainless.wot.dijkstra.sq.ReferenceTime -import org.pgpainless.wot.dijkstra.sq.api.WoTAPI +import org.pgpainless.wot.api.WoTAPI import pgp.cert_d.PGPCertificateStoreAdapter import pgp.cert_d.subkey_lookup.InMemorySubkeyLookupFactory import pgp.certificate_store.PGPCertificateStore diff --git a/pgpainless-wot-cli/src/main/kotlin/org/pgpainless/wot/cli/subcommands/AuthenticateCmd.kt b/pgpainless-wot-cli/src/main/kotlin/org/pgpainless/wot/cli/subcommands/AuthenticateCmd.kt index 3d7cc296..92e0140d 100644 --- a/pgpainless-wot-cli/src/main/kotlin/org/pgpainless/wot/cli/subcommands/AuthenticateCmd.kt +++ b/pgpainless-wot-cli/src/main/kotlin/org/pgpainless/wot/cli/subcommands/AuthenticateCmd.kt @@ -4,7 +4,7 @@ package org.pgpainless.wot.cli.subcommands -import org.pgpainless.wot.dijkstra.sq.api.AuthenticateAPI +import org.pgpainless.wot.api.AuthenticateAPI import org.pgpainless.wot.cli.WotCLI import org.pgpainless.wot.dijkstra.sq.Fingerprint import org.pgpainless.wot.dijkstra.sq.Path diff --git a/pgpainless-wot-cli/src/test/kotlin/org/pgpainless/wot/cli/subcommands/AuthenticateCmdTest.kt b/pgpainless-wot-cli/src/test/kotlin/org/pgpainless/wot/cli/subcommands/AuthenticateCmdTest.kt index 93831302..e1e4072c 100644 --- a/pgpainless-wot-cli/src/test/kotlin/org/pgpainless/wot/cli/subcommands/AuthenticateCmdTest.kt +++ b/pgpainless-wot-cli/src/test/kotlin/org/pgpainless/wot/cli/subcommands/AuthenticateCmdTest.kt @@ -1,7 +1,7 @@ package org.pgpainless.wot.cli.subcommands import org.junit.jupiter.api.Test -import org.pgpainless.wot.dijkstra.sq.api.AuthenticateAPI +import org.pgpainless.wot.api.AuthenticateAPI import org.pgpainless.wot.dijkstra.sq.* import java.text.SimpleDateFormat import kotlin.test.assertEquals diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/AuthenticateAPI.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/AuthenticateAPI.kt similarity index 97% rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/AuthenticateAPI.kt rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/AuthenticateAPI.kt index 93e36ce6..cd19a7e4 100644 --- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/AuthenticateAPI.kt +++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/AuthenticateAPI.kt @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 -package org.pgpainless.wot.dijkstra.sq.api +package org.pgpainless.wot.api import org.pgpainless.wot.dijkstra.sq.Fingerprint import org.pgpainless.wot.dijkstra.sq.Paths diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/AuthenticationLevel.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/AuthenticationLevel.kt similarity index 92% rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/AuthenticationLevel.kt rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/AuthenticationLevel.kt index 680f4a56..07303a00 100644 --- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/AuthenticationLevel.kt +++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/AuthenticationLevel.kt @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 -package org.pgpainless.wot.dijkstra.sq.api +package org.pgpainless.wot.api /** * Enum for different levels of Trust. diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/Format.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/Format.kt similarity index 94% rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/Format.kt rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/Format.kt index d39059f5..b54cd868 100644 --- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/Format.kt +++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/Format.kt @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 -package org.pgpainless.wot.dijkstra.sq.api +package org.pgpainless.wot.api /** * Enum listing possible output formats. diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/IdentifyAPI.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/IdentifyAPI.kt similarity index 89% rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/IdentifyAPI.kt rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/IdentifyAPI.kt index 64d179e0..647fdafb 100644 --- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/IdentifyAPI.kt +++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/IdentifyAPI.kt @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 -package org.pgpainless.wot.dijkstra.sq.api +package org.pgpainless.wot.api import org.pgpainless.wot.dijkstra.sq.Fingerprint import org.pgpainless.wot.dijkstra.sq.Paths diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/ListAPI.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/ListAPI.kt similarity index 85% rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/ListAPI.kt rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/ListAPI.kt index 45499865..cf64e056 100644 --- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/ListAPI.kt +++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/ListAPI.kt @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 -package org.pgpainless.wot.dijkstra.sq.api +package org.pgpainless.wot.api import org.pgpainless.wot.dijkstra.sq.Paths diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/LookupAPI.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/LookupAPI.kt similarity index 88% rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/LookupAPI.kt rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/LookupAPI.kt index f13df777..09ff9f75 100644 --- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/LookupAPI.kt +++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/LookupAPI.kt @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 -package org.pgpainless.wot.dijkstra.sq.api +package org.pgpainless.wot.api import org.pgpainless.wot.dijkstra.sq.Paths diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/PathAPI.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/PathAPI.kt similarity index 94% rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/PathAPI.kt rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/PathAPI.kt index 709c6400..01faa9f9 100644 --- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/PathAPI.kt +++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/PathAPI.kt @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 -package org.pgpainless.wot.dijkstra.sq.api +package org.pgpainless.wot.api import org.pgpainless.wot.dijkstra.sq.Fingerprint diff --git a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/WoTAPI.kt b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/WoTAPI.kt similarity index 98% rename from wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/WoTAPI.kt rename to wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/WoTAPI.kt index 70f42162..ce778c32 100644 --- a/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/dijkstra/sq/api/WoTAPI.kt +++ b/wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/WoTAPI.kt @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 -package org.pgpainless.wot.dijkstra.sq.api +package org.pgpainless.wot.api import org.pgpainless.wot.dijkstra.sq.Fingerprint import org.pgpainless.wot.dijkstra.sq.Network