diff --git a/src/main/java/ru/di9/ihc/IhcClient.java b/src/main/java/ru/di9/ihc/IhcClient.java index a372cd2..8b34fc4 100644 --- a/src/main/java/ru/di9/ihc/IhcClient.java +++ b/src/main/java/ru/di9/ihc/IhcClient.java @@ -61,7 +61,7 @@ public class IhcClient { return isAuth; } - public List> getDomains() { + public List> getDomains() { if (!isAuth) { throw new RuntimeException("IS NOT AUTH"); } @@ -75,13 +75,13 @@ public class IhcClient { return Collections.emptyList(); } - List> list = new ArrayList<>(); + List> list = new ArrayList<>(); Document document = Jsoup.parse(resp.getEntity().getContent(), StandardCharsets.UTF_8.name(), baseUrl); Elements elements = document.select("li[class='zoneList__zone'] a"); for (Element element : elements) { Integer id = Integer.valueOf(element.attr("href").substring(1).split("/")[2]); String domain = element.text(); - list.add(Pair.of(id, domain)); + list.add(Pair.of(domain, id)); } return list; diff --git a/src/test/java/ru/di9/ihc/GetDomainsTest.java b/src/test/java/ru/di9/ihc/GetDomainsTest.java index 2609104..f49c6e4 100644 --- a/src/test/java/ru/di9/ihc/GetDomainsTest.java +++ b/src/test/java/ru/di9/ihc/GetDomainsTest.java @@ -50,10 +50,10 @@ class GetDomainsTest { var ihc = new IhcClient("http://localhost:%d".formatted(port)); ihc.auth("user1", "passwd1"); - List> domains = ihc.getDomains(); + List> domains = ihc.getDomains(); assertEquals(2, domains.size()); - assertEquals(Pair.of(111111, "example-1.ru"), domains.get(0)); - assertEquals(Pair.of(222222, "example-2.ru"), domains.get(1)); + assertEquals(Pair.of("example-1.ru", 111111), domains.get(0)); + assertEquals(Pair.of("example-2.ru", 222222), domains.get(1)); } }