Make VespaFormatter package private.

4 files changed, 20 insertions, 26 deletions

diff --git a/vespalog/abi-spec.json b/vespalog/abi-spec.json
index aaf98e57410..80ddb265cf8 100644
--- a/vespalog/abi-spec.json
+++ b/vespalog/abi-spec.json
@@ -122,24 +122,5 @@
       "public static void cleanup()"
     ],
     "fields": []
-  },
-  "com.yahoo.log.VespaFormatter": {
-    "superClass": "java.util.logging.SimpleFormatter",
-    "interfaces": [],
-    "attributes": [
-      "public"
-    ],
-    "methods": [
-      "public void <init>()",
-      "public void <init>(java.lang.String, java.lang.String)",
-      "public static java.lang.String unEscape(java.lang.String)",
-      "public java.lang.String format(java.util.logging.LogRecord)",
-      "public void setServiceName(java.lang.String)",
-      "public java.lang.String getServiceName()",
-      "public static java.lang.String toMessageString(java.lang.Throwable)"
-    ],
-    "fields": [
-      "public static final java.lang.String serviceNameUnsetValue"
-    ]
   }
 }
\ No newline at end of file
diff --git a/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java b/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java
index caa68cf3019..140e83f5a51 100644
--- a/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java
+++ b/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java
@@ -19,10 +19,8 @@ import java.util.regex.Pattern;
  * @author  Bjorn Borud
  * @author arnej27959
  *
- * @deprecated Should only be used internally in the log library
  */
-@Deprecated(since = "7", forRemoval = true)
-public class VespaFormatter extends SimpleFormatter {
+class VespaFormatter extends SimpleFormatter {
 
     private static final Pattern backSlash = Pattern.compile("\\\\");
 
@@ -92,6 +90,7 @@ public class VespaFormatter extends SimpleFormatter {
         return s;
     }
 
+    @SuppressWarnings("deprecation")
     public String format(LogRecord r) {
         StringBuilder sbuf = new StringBuilder(300); // initial guess
 
diff --git a/vespalog/src/test/java/com/yahoo/log/TestUtil.java b/vespalog/src/test/java/com/yahoo/log/TestUtil.java
new file mode 100644
index 00000000000..ffb9b2e08de
--- /dev/null
+++ b/vespalog/src/test/java/com/yahoo/log/TestUtil.java
@@ -0,0 +1,15 @@
+package com.yahoo.log;
+
+
+import java.util.logging.LogRecord;
+
+/**
+ * @author gjoranv
+ */
+public class TestUtil {
+
+    public static String formatWithVespaFormatter(LogRecord record) {
+        return new VespaFormatter().format(record);
+    }
+
+}
diff --git a/vespalog/src/test/java/com/yahoo/log/event/EventTestCase.java b/vespalog/src/test/java/com/yahoo/log/event/EventTestCase.java
index beac58e15b8..bbda100cd3a 100644
--- a/vespalog/src/test/java/com/yahoo/log/event/EventTestCase.java
+++ b/vespalog/src/test/java/com/yahoo/log/event/EventTestCase.java
@@ -3,7 +3,7 @@ package com.yahoo.log.event;
 
 import java.util.logging.Logger;
 
-import com.yahoo.log.VespaFormatter;
+import com.yahoo.log.TestUtil;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -132,15 +132,14 @@ public class EventTestCase {
         SingleHandler sh = new SingleHandler();
         assertNull(sh.lastRecord());
 
-        VespaFormatter formatter = new VespaFormatter();
         Logger log = Logger.getLogger(EventTestCase.class.getName());
         synchronized(log) {
             log.setUseParentHandlers(false);
             log.addHandler(sh);
             Event.starting("mintest");
 
-            assertTrue(formatter.format(sh.lastRecord()).
-                       indexOf("\t.com.yahoo.log.event.EventTestCase\tevent\tstarting/1 name=mintest") > -1);
+            assertTrue(TestUtil.formatWithVespaFormatter(sh.lastRecord())
+                               .contains("\t.com.yahoo.log.event.EventTestCase\tevent\tstarting/1 name=mintest"));
 
             Event.starting("startingName");
             Event.started("startedName");