From 6023ba9a87a5fb589234829aa73d0432c69b8b13 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Thu, 2 Jan 2020 21:12:45 -0500
Subject: [PATCH] tweaks

---
 src/main/java/org/cobbzilla/util/dns/DnsRecordBase.java    | 3 +--
 src/main/java/org/cobbzilla/util/json/JsonUtil.java        | 7 ++-----
 .../java/org/cobbzilla/util/reflect/ReflectionUtil.java    | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/cobbzilla/util/dns/DnsRecordBase.java b/src/main/java/org/cobbzilla/util/dns/DnsRecordBase.java
index d72d619..5038bf8 100644
--- a/src/main/java/org/cobbzilla/util/dns/DnsRecordBase.java
+++ b/src/main/java/org/cobbzilla/util/dns/DnsRecordBase.java
@@ -5,7 +5,6 @@ import lombok.*;
 import lombok.experimental.Accessors;
 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.empty;
 
@@ -16,7 +15,7 @@ public class DnsRecordBase {
     @Getter @Setter protected String 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) {
         if (!hasFqdn()) return die("getHost: fqdn not set");
diff --git a/src/main/java/org/cobbzilla/util/json/JsonUtil.java b/src/main/java/org/cobbzilla/util/json/JsonUtil.java
index c521223..e604816 100644
--- a/src/main/java/org/cobbzilla/util/json/JsonUtil.java
+++ b/src/main/java/org/cobbzilla/util/json/JsonUtil.java
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.io.JsonStringEncoder;
-import com.fasterxml.jackson.core.util.BufferRecyclers;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.node.*;
 import org.cobbzilla.util.io.FileSuffixFilter;
@@ -18,9 +17,7 @@ import java.math.BigInteger;
 import java.util.*;
 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 {
 
@@ -522,6 +519,6 @@ public class JsonUtil {
         }
     }
 
-    public static JsonStringEncoder getJsonStringEncoder() { return BufferRecyclers.getJsonStringEncoder(); }
+    public static JsonStringEncoder getJsonStringEncoder() { return JsonStringEncoder.getInstance(); }
 
 }
diff --git a/src/main/java/org/cobbzilla/util/reflect/ReflectionUtil.java b/src/main/java/org/cobbzilla/util/reflect/ReflectionUtil.java
index 111e05a..a331584 100644
--- a/src/main/java/org/cobbzilla/util/reflect/ReflectionUtil.java
+++ b/src/main/java/org/cobbzilla/util/reflect/ReflectionUtil.java
@@ -120,7 +120,7 @@ public class ReflectionUtil {
         try {
             return (Class<? extends T>) Class.forName(clazz);
         } catch (Exception e) {
-            return die("Class.forName("+clazz+") error: "+e, e);
+            return die("Class.forName("+clazz+") error: "+e);
         }
     }