diff --git a/wkd-test-suite/src/main/java/pgp/wkd/test_suite/WkdDirectoryStructure.java b/wkd-test-suite/src/main/java/pgp/wkd/test_suite/WkdDirectoryStructure.java index 5e09fa2..f622724 100644 --- a/wkd-test-suite/src/main/java/pgp/wkd/test_suite/WkdDirectoryStructure.java +++ b/wkd-test-suite/src/main/java/pgp/wkd/test_suite/WkdDirectoryStructure.java @@ -25,8 +25,6 @@ public abstract class WkdDirectoryStructure { openpgpkey = new File(wellKnown, "openpgpkey"); } - public abstract File getHu(); - public abstract Path getRelativeCertificatePath(String mailAddress); public abstract void mkdirs() throws IOException; @@ -64,17 +62,12 @@ public abstract class WkdDirectoryStructure { this.policy = new File(openpgpkey, "policy"); } - @Override - public File getHu() { - return hu; - } - @Override public Path getRelativeCertificatePath(String mailAddress) { WKDAddress address = WKDAddress.fromEmail(mailAddress); String path = address.getDirectMethodURI().getPath(); String fileName = path.substring(path.lastIndexOf('/') + 1); - return rootDir.toPath().relativize(new File(getHu(), fileName).toPath()); + return rootDir.toPath().relativize(new File(hu, fileName).toPath()); } @Override @@ -111,17 +104,12 @@ public abstract class WkdDirectoryStructure { this.policy = new File(domainFile, "policy"); } - @Override - public File getHu() { - return hu; - } - @Override public Path getRelativeCertificatePath(String mailAddress) { WKDAddress address = WKDAddress.fromEmail(mailAddress); String path = address.getAdvancedMethodURI().getPath(); String fileName = path.substring(path.lastIndexOf('/') + 1); - return rootDir.toPath().relativize(new File(getHu(), fileName).toPath()); + return rootDir.toPath().relativize(new File(hu, fileName).toPath()); } @Override