From edeb34d59e8c64310957d5c29d9487fa45f92627 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Wed, 6 Apr 2022 13:41:17 +0200
Subject: [PATCH] Move VKSImpl out of v1 package

---
 .../java/pgp/vks/client/{v1/impl => }/VKSImpl.java     | 10 +++++-----
 .../java/pgp/vks/client/{v1/impl => }/VKSTest.java     |  5 +----
 2 files changed, 6 insertions(+), 9 deletions(-)
 rename vks-java/src/main/java/pgp/vks/client/{v1/impl => }/VKSImpl.java (89%)
 rename vks-java/src/test/java/pgp/vks/client/{v1/impl => }/VKSTest.java (98%)

diff --git a/vks-java/src/main/java/pgp/vks/client/v1/impl/VKSImpl.java b/vks-java/src/main/java/pgp/vks/client/VKSImpl.java
similarity index 89%
rename from vks-java/src/main/java/pgp/vks/client/v1/impl/VKSImpl.java
rename to vks-java/src/main/java/pgp/vks/client/VKSImpl.java
index d0a9526..b760c88 100644
--- a/vks-java/src/main/java/pgp/vks/client/v1/impl/VKSImpl.java
+++ b/vks-java/src/main/java/pgp/vks/client/VKSImpl.java
@@ -2,14 +2,14 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package pgp.vks.client.v1.impl;
+package pgp.vks.client;
 
 import lombok.SneakyThrows;
-import pgp.vks.client.Get;
-import pgp.vks.client.RequestVerify;
-import pgp.vks.client.Upload;
-import pgp.vks.client.VKS;
 import pgp.vks.client.exception.UnsupportedApiException;
+import pgp.vks.client.v1.impl.GetImpl;
+import pgp.vks.client.v1.impl.RequestVerifyImpl;
+import pgp.vks.client.v1.impl.URLMapper;
+import pgp.vks.client.v1.impl.UploadImpl;
 
 import javax.annotation.Nonnull;
 import java.net.MalformedURLException;
diff --git a/vks-java/src/test/java/pgp/vks/client/v1/impl/VKSTest.java b/vks-java/src/test/java/pgp/vks/client/VKSTest.java
similarity index 98%
rename from vks-java/src/test/java/pgp/vks/client/v1/impl/VKSTest.java
rename to vks-java/src/test/java/pgp/vks/client/VKSTest.java
index a3237a4..0339f22 100644
--- a/vks-java/src/test/java/pgp/vks/client/v1/impl/VKSTest.java
+++ b/vks-java/src/test/java/pgp/vks/client/VKSTest.java
@@ -2,15 +2,12 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-package pgp.vks.client.v1.impl;
+package pgp.vks.client;
 
 import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.io.Streams;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
-import pgp.vks.client.RequestVerify;
-import pgp.vks.client.Upload;
-import pgp.vks.client.VKS;
 import pgp.vks.client.exception.CertCannotBePublishedException;
 import pgp.vks.client.exception.CertNotFoundException;