From ff8b2a0142c24f22a0fac2518eb0a6cd6b95ef12 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20D=C3=B6rre?= Date: Thu, 18 Aug 2016 19:55:08 +0200 Subject: [PATCH] fix: name Domain.searchDomain correctly Change-Id: I5e96477e8e0b9f0f576552066ad431f2e839262c --- src/org/cacert/gigi/dbObjects/Domain.java | 2 +- .../cacert/gigi/pages/admin/support/FindUserByDomainForm.java | 2 +- tests/org/cacert/gigi/pages/account/TestDomain.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/cacert/gigi/dbObjects/Domain.java b/src/org/cacert/gigi/dbObjects/Domain.java index f4a828c3..fcd6709f 100644 --- a/src/org/cacert/gigi/dbObjects/Domain.java +++ b/src/org/cacert/gigi/dbObjects/Domain.java @@ -173,7 +173,7 @@ public class Domain implements IdCachable, Verifyable { return em; } - public static Domain searchUserIdByDomain(String domain) { + public static Domain searchDomain(String domain) { try (GigiPreparedStatement ps = new GigiPreparedStatement("SELECT `id` FROM `domains` WHERE `domain` = ? AND `deleted` IS NULL")) { ps.setString(1, domain); GigiResultSet res = ps.executeQuery(); diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.java b/src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.java index 779b0026..cce4aa0d 100644 --- a/src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.java +++ b/src/org/cacert/gigi/pages/admin/support/FindUserByDomainForm.java @@ -34,7 +34,7 @@ public class FindUserByDomainForm extends Form { throw new GigiApiException(SprintfCommand.createSimple("No personal domains found matching the id {0}", request.substring(1))); } } else { - d = Domain.searchUserIdByDomain(request); + d = Domain.searchDomain(request); } if (d == null) { throw new GigiApiException(SprintfCommand.createSimple("No personal domains found matching {0}", request)); diff --git a/tests/org/cacert/gigi/pages/account/TestDomain.java b/tests/org/cacert/gigi/pages/account/TestDomain.java index 6d95beaa..49f1b85c 100644 --- a/tests/org/cacert/gigi/pages/account/TestDomain.java +++ b/tests/org/cacert/gigi/pages/account/TestDomain.java @@ -34,13 +34,13 @@ public class TestDomain extends ClientTest { public void testDelete() throws IOException { String domain = uniq + ".de"; assertNull(addDomain(cookie, domain)); - Domain d0 = Domain.searchUserIdByDomain(domain); + Domain d0 = Domain.searchDomain(domain); assertNull(executeBasicWebInteraction(cookie, DomainOverview.PATH, "delete=" + d0.getId(), 0)); // double delete assertNotNull(executeBasicWebInteraction(cookie, DomainOverview.PATH, "delete=" + d0.getId(), 0)); // re-add assertNull(addDomain(cookie, domain)); - Domain d1 = Domain.searchUserIdByDomain(domain); + Domain d1 = Domain.searchDomain(domain); assertNotEquals(d0.getId(), d1.getId()); assertNull(executeBasicWebInteraction(cookie, DomainOverview.PATH, "delete=" + d1.getId(), 0)); } -- 2.39.2