From 795150d3943926be89dee770666a7b233311e464 Mon Sep 17 00:00:00 2001 From: Kristijan Mitrovic Date: Fri, 22 May 2020 09:20:49 +0200 Subject: [PATCH] Beautify code --- .../cloud/dns/godaddy/GoDaddyDnsDriver.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/bubble-server/src/main/java/bubble/cloud/dns/godaddy/GoDaddyDnsDriver.java b/bubble-server/src/main/java/bubble/cloud/dns/godaddy/GoDaddyDnsDriver.java index 2610143e..e1211ee6 100644 --- a/bubble-server/src/main/java/bubble/cloud/dns/godaddy/GoDaddyDnsDriver.java +++ b/bubble-server/src/main/java/bubble/cloud/dns/godaddy/GoDaddyDnsDriver.java @@ -15,7 +15,6 @@ import org.cobbzilla.util.http.HttpRequestBean; import org.cobbzilla.util.http.HttpResponseBean; import org.cobbzilla.util.http.HttpUtil; -import java.io.IOException; import java.util.*; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; @@ -142,10 +141,6 @@ public class GoDaddyDnsDriver extends DnsDriverBase { return response.isOk() ? response : die("remove: " + response); }, MAX_GODADDY_RETRIES); return record; - - } catch (IOException e) { - return die("remove: "+e); - } finally { if (lock != null && domain.get() != null) unlockDomain(domain.get().getUuid(), lock); } @@ -199,17 +194,17 @@ public class GoDaddyDnsDriver extends DnsDriverBase { private final Map listCache = new ExpirationMap<>(SECONDS.toMillis(10)); - public GoDaddyDnsRecord[] listGoDaddyDnsRecords(String url) throws IOException { - final HttpRequestBean request = auth(url); - return listCache.computeIfAbsent(url, k -> { + public GoDaddyDnsRecord[] listGoDaddyDnsRecords(final String goDaddyApiUrl) { + return listCache.computeIfAbsent(goDaddyApiUrl, url -> { + final var request = auth(url); final HttpResponseBean response; try { response = HttpUtil.getResponse(request); } catch (Exception e) { - log.error("listGoDaddyDnsRecords("+url+"): "+e); + log.error("listGoDaddyDnsRecords(" + url + "): " + e, e); return GoDaddyDnsRecord.EMPTY_ARRAY; } - if (!response.isOk()) throw new IllegalStateException("readRecords: "+response); + if (!response.isOk()) throw new IllegalStateException("listGoDaddyDnsRecords: " + response); return json(response.getEntityString(), GoDaddyDnsRecord[].class); }); }