diff options
author | gjoranv <gv@verizonmedia.com> | 2022-06-07 21:43:56 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:32 +0200 |
commit | 4cf8b794765b244b014fb852023638c7faf517eb (patch) | |
tree | a8375bff75572e635cc38971a2db372691e3c2bc /vespalog/src | |
parent | 361cae9b27154e8449068758da49ec8b5b2adc95 (diff) |
Make VespaFormatter package private.
Diffstat (limited to 'vespalog/src')
3 files changed, 20 insertions, 7 deletions
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"); |