@@ -5,7 +5,6 @@ import lombok.*; | |||||
import lombok.experimental.Accessors; | import lombok.experimental.Accessors; | ||||
import lombok.extern.slf4j.Slf4j; | import lombok.extern.slf4j.Slf4j; | ||||
import static org.apache.commons.lang3.StringUtils.chop; | |||||
import static org.cobbzilla.util.daemon.ZillaRuntime.die; | import static org.cobbzilla.util.daemon.ZillaRuntime.die; | ||||
import static org.cobbzilla.util.daemon.ZillaRuntime.empty; | import static org.cobbzilla.util.daemon.ZillaRuntime.empty; | ||||
@@ -16,7 +15,7 @@ public class DnsRecordBase { | |||||
@Getter @Setter protected String fqdn; | @Getter @Setter protected String fqdn; | ||||
public boolean hasFqdn() { return !empty(fqdn); } | public boolean hasFqdn() { return !empty(fqdn); } | ||||
@JsonIgnore public String getNormalFqdn() { return empty(fqdn) ? fqdn : fqdn.endsWith(".") ? chop(fqdn) : fqdn; } | |||||
public static String dropTailingDot(String name) { return name.endsWith(".") ? name.substring(0, name.length()-1) : name; } | |||||
public String getHost (String suffix) { | public String getHost (String suffix) { | ||||
if (!hasFqdn()) return die("getHost: fqdn not set"); | if (!hasFqdn()) return die("getHost: fqdn not set"); | ||||
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonInclude; | |||||
import com.fasterxml.jackson.core.JsonParser; | import com.fasterxml.jackson.core.JsonParser; | ||||
import com.fasterxml.jackson.core.JsonProcessingException; | import com.fasterxml.jackson.core.JsonProcessingException; | ||||
import com.fasterxml.jackson.core.io.JsonStringEncoder; | import com.fasterxml.jackson.core.io.JsonStringEncoder; | ||||
import com.fasterxml.jackson.core.util.BufferRecyclers; | |||||
import com.fasterxml.jackson.databind.*; | import com.fasterxml.jackson.databind.*; | ||||
import com.fasterxml.jackson.databind.node.*; | import com.fasterxml.jackson.databind.node.*; | ||||
import org.cobbzilla.util.io.FileSuffixFilter; | import org.cobbzilla.util.io.FileSuffixFilter; | ||||
@@ -18,9 +17,7 @@ import java.math.BigInteger; | |||||
import java.util.*; | import java.util.*; | ||||
import java.util.concurrent.ConcurrentHashMap; | import java.util.concurrent.ConcurrentHashMap; | ||||
import static org.cobbzilla.util.daemon.ZillaRuntime.big; | |||||
import static org.cobbzilla.util.daemon.ZillaRuntime.die; | |||||
import static org.cobbzilla.util.daemon.ZillaRuntime.empty; | |||||
import static org.cobbzilla.util.daemon.ZillaRuntime.*; | |||||
public class JsonUtil { | public class JsonUtil { | ||||
@@ -522,6 +519,6 @@ public class JsonUtil { | |||||
} | } | ||||
} | } | ||||
public static JsonStringEncoder getJsonStringEncoder() { return BufferRecyclers.getJsonStringEncoder(); } | |||||
public static JsonStringEncoder getJsonStringEncoder() { return JsonStringEncoder.getInstance(); } | |||||
} | } |
@@ -120,7 +120,7 @@ public class ReflectionUtil { | |||||
try { | try { | ||||
return (Class<? extends T>) Class.forName(clazz); | return (Class<? extends T>) Class.forName(clazz); | ||||
} catch (Exception e) { | } catch (Exception e) { | ||||
return die("Class.forName("+clazz+") error: "+e, e); | |||||
return die("Class.forName("+clazz+") error: "+e); | |||||
} | } | ||||
} | } | ||||