fix: name Domain.searchDomain correctly

Change-Id: I5e96477e8e0b9f0f576552066ad431f2e839262c

diff --git a/src/org/cacert/gigi/dbObjects/Domain.java b/src/org/cacert/gigi/dbObjects/Domain.java
index f4a828c3a84543401d09879e71b612a5ed0bd133..fcd6709f2d50c7721d4cebab2f621ac1215a469e 100644 (file)
--- 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 779b0026bb83aeefbdbc98c4ff80defc5559d363..cce4aa0d84929f1a041a51d76451ceec1485f3ae 100644 (file)
--- 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 6d95beaaae6e2208e1fca2e0ff56b2ea92c962b9..49f1b85cb03940b8be38602ed198a3b5b0413d74 100644 (file)
--- 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));
     }