make some implementation classes non-public

17 files changed, 28 insertions, 52 deletions

diff --git a/vespalog/src/main/java/com/yahoo/log/DefaultLevelController.java b/vespalog/src/main/java/com/yahoo/log/DefaultLevelController.java
index b90c63b185e..5f6251d291b 100644
--- a/vespalog/src/main/java/com/yahoo/log/DefaultLevelController.java
+++ b/vespalog/src/main/java/com/yahoo/log/DefaultLevelController.java
@@ -7,10 +7,9 @@ import java.util.logging.Level;
 /**
  * a levelcontroller that just implements a simple default
  * (possibly controlled by a system property or environment)
- * @deprecated Should only be used internally in the log library
+ * Should only be used internally in the log library
  */
-@SuppressWarnings("removal")
-@Deprecated(since = "7", forRemoval = true)
+@SuppressWarnings("deprecation")
 class DefaultLevelController implements LevelController {
     private String levelstring;
     private Level levelLimit = LogLevel.EVENT;
diff --git a/vespalog/src/main/java/com/yahoo/log/FileLogTarget.java b/vespalog/src/main/java/com/yahoo/log/FileLogTarget.java
index b4752c23b73..1fe00fbd6f5 100644
--- a/vespalog/src/main/java/com/yahoo/log/FileLogTarget.java
+++ b/vespalog/src/main/java/com/yahoo/log/FileLogTarget.java
@@ -6,11 +6,9 @@ import java.io.*;
 /**
  * @author Ulf Lilleengen
  * @since 5.1
- * @deprecated Should only be used internally in the log library
+ * Should only be used internally in the log library
  */
-@SuppressWarnings("removal")
-@Deprecated(since = "7", forRemoval = true)
-public class FileLogTarget implements LogTarget {
+class FileLogTarget implements LogTarget {
     private final File file;
     private FileOutputStream fileOutputStream;
 
diff --git a/vespalog/src/main/java/com/yahoo/log/LevelController.java b/vespalog/src/main/java/com/yahoo/log/LevelController.java
index c710d5c60eb..cd65c3b5337 100644
--- a/vespalog/src/main/java/com/yahoo/log/LevelController.java
+++ b/vespalog/src/main/java/com/yahoo/log/LevelController.java
@@ -10,10 +10,9 @@ import java.util.logging.Level;
  *
  * @author arnej27959
  *
- * @deprecated Should only be used internally in the log library
+ * Should only be used internally in the log library
  */
-@Deprecated(since = "7", forRemoval = true)
-public interface LevelController {
+interface LevelController {
 
     /**
      * should we actually publish a log message with the given Level now?
diff --git a/vespalog/src/main/java/com/yahoo/log/LevelControllerRepo.java b/vespalog/src/main/java/com/yahoo/log/LevelControllerRepo.java
index ab70ecf2c96..b48cd2ae7fd 100644
--- a/vespalog/src/main/java/com/yahoo/log/LevelControllerRepo.java
+++ b/vespalog/src/main/java/com/yahoo/log/LevelControllerRepo.java
@@ -7,11 +7,9 @@ package com.yahoo.log;
  *
  * @author Ulf Lilleengen
  * @since 5.1
- * @deprecated Should only be used internally in the log library
+ * Should only be used internally in the log library
  */
-@SuppressWarnings("removal")
-@Deprecated(since = "7", forRemoval = true)
-public interface LevelControllerRepo {
+interface LevelControllerRepo {
     /**
      * Return the level controller for a given component.
      * @param component The component name string.
diff --git a/vespalog/src/main/java/com/yahoo/log/LogSetup.java b/vespalog/src/main/java/com/yahoo/log/LogSetup.java
index d285382849e..9879f9d787d 100644
--- a/vespalog/src/main/java/com/yahoo/log/LogSetup.java
+++ b/vespalog/src/main/java/com/yahoo/log/LogSetup.java
@@ -20,7 +20,6 @@ import java.util.logging.Logger;
  * @author  Bjorn Borud
  * @author arnej27959
  */
-@SuppressWarnings("removal")
 public class LogSetup {
 
     private static final Timer taskRunner = new Timer(true);
diff --git a/vespalog/src/main/java/com/yahoo/log/LogTarget.java b/vespalog/src/main/java/com/yahoo/log/LogTarget.java
index ef5974259c8..45ac126e9ac 100644
--- a/vespalog/src/main/java/com/yahoo/log/LogTarget.java
+++ b/vespalog/src/main/java/com/yahoo/log/LogTarget.java
@@ -6,10 +6,9 @@ import java.io.OutputStream;
 /**
  * @author Ulf Lilleengen
  * @since 5.1
- * @deprecated Should only be used internally in the log library
+ * Should only be used internally in the log library
  */
-@Deprecated(since = "7", forRemoval = true)
-public interface LogTarget {
+interface LogTarget {
     /**
      * Opens an output stream for the target. If already open, the stream should be reopened.
      * @return a new outputstream for the log target.
diff --git a/vespalog/src/main/java/com/yahoo/log/LogUtil.java b/vespalog/src/main/java/com/yahoo/log/LogUtil.java
index 2424aa9060f..694cb3cf45c 100644
--- a/vespalog/src/main/java/com/yahoo/log/LogUtil.java
+++ b/vespalog/src/main/java/com/yahoo/log/LogUtil.java
@@ -4,9 +4,8 @@ package com.yahoo.log;
 /**
  * @author Ulf Lilleengen
  * @since 5.1
- * @deprecated Should only be used internally in the log library
+ * Should only be used internally in the log library
  */
-@Deprecated(since = "7", forRemoval = true)
 class LogUtil {
     static boolean empty(String s) {
         return (s == null || s.equals(""));
diff --git a/vespalog/src/main/java/com/yahoo/log/MappedLevelController.java b/vespalog/src/main/java/com/yahoo/log/MappedLevelController.java
index b7e18c83997..49ba78da56b 100644
--- a/vespalog/src/main/java/com/yahoo/log/MappedLevelController.java
+++ b/vespalog/src/main/java/com/yahoo/log/MappedLevelController.java
@@ -9,10 +9,9 @@ import java.util.logging.Level;
 /**
  * a level controller that does lookup in a file via a memory-mapped
  * buffer for realtime logging control.
- * @deprecated Should only be used internally in the log library
+ * Should only be used internally in the log library
  */
-@SuppressWarnings("removal")
-@Deprecated(since = "7", forRemoval = true)
+@SuppressWarnings("deprecation")
 class MappedLevelController implements LevelController {
     private static final int ONVAL  = 0x20204f4e; // equals "  ON" in file
     private static final int OFFVAL = 0x204f4646; // equals " OFF" in file
diff --git a/vespalog/src/main/java/com/yahoo/log/MappedLevelControllerRepo.java b/vespalog/src/main/java/com/yahoo/log/MappedLevelControllerRepo.java
index 97c8aa8f70f..10b4d11c695 100644
--- a/vespalog/src/main/java/com/yahoo/log/MappedLevelControllerRepo.java
+++ b/vespalog/src/main/java/com/yahoo/log/MappedLevelControllerRepo.java
@@ -12,10 +12,8 @@ import java.util.Map;
  *
  * @author Ulf Lilleengen
  * @since 5.1
- * @deprecated Should only be used internally in the log library
+ * Should only be used internally in the log library
  */
-@SuppressWarnings("removal")
-@Deprecated(since = "7", forRemoval = true)
 class MappedLevelControllerRepo {
     private final Map<String, LevelController> levelControllerMap = new HashMap<>();
     private final MappedByteBuffer mapBuf;
diff --git a/vespalog/src/main/java/com/yahoo/log/RejectFilter.java b/vespalog/src/main/java/com/yahoo/log/RejectFilter.java
index b328073b20b..79010bbe7cb 100644
--- a/vespalog/src/main/java/com/yahoo/log/RejectFilter.java
+++ b/vespalog/src/main/java/com/yahoo/log/RejectFilter.java
@@ -9,10 +9,9 @@ import java.util.List;
  *
  * @author Ulf Lilleengen
  * @since 5.1
- * @deprecated Should only be used internally in the log library
+ * Should only be used internally in the log library
  */
-@Deprecated(since = "7", forRemoval = true)
-public class RejectFilter {
+class RejectFilter {
     private final List<String> rejectedMessages = new ArrayList<>();
 
     public boolean shouldReject(String message) {
diff --git a/vespalog/src/main/java/com/yahoo/log/StderrLogTarget.java b/vespalog/src/main/java/com/yahoo/log/StderrLogTarget.java
index b1c245642ff..f4a22d972db 100644
--- a/vespalog/src/main/java/com/yahoo/log/StderrLogTarget.java
+++ b/vespalog/src/main/java/com/yahoo/log/StderrLogTarget.java
@@ -6,11 +6,9 @@ import java.io.OutputStream;
 /**
  * @author Ulf Lilleengen
  * @since 5.1
- * @deprecated Should only be used internally in the log library
+ * Should only be used internally in the log library
  */
-@SuppressWarnings("removal")
-@Deprecated(since = "7", forRemoval = true)
-public class StderrLogTarget implements LogTarget {
+class StderrLogTarget implements LogTarget {
 
     @Override
     public OutputStream open() {
diff --git a/vespalog/src/main/java/com/yahoo/log/StdoutLogTarget.java b/vespalog/src/main/java/com/yahoo/log/StdoutLogTarget.java
index e036e534e00..61e4713ce46 100644
--- a/vespalog/src/main/java/com/yahoo/log/StdoutLogTarget.java
+++ b/vespalog/src/main/java/com/yahoo/log/StdoutLogTarget.java
@@ -6,11 +6,9 @@ import java.io.OutputStream;
 /**
  * @author Ulf Lilleengen
  * @since 5.1
- * @deprecated Should only be used internally in the log library
+ * Should only be used internally in the log library
  */
-@SuppressWarnings("removal")
-@Deprecated(since = "7", forRemoval = true)
-public class StdoutLogTarget implements LogTarget {
+class StdoutLogTarget implements LogTarget {
 
     @Override
     public OutputStream open() {
diff --git a/vespalog/src/main/java/com/yahoo/log/UncloseableOutputStream.java b/vespalog/src/main/java/com/yahoo/log/UncloseableOutputStream.java
index 61e278ef93a..6172bf8d632 100644
--- a/vespalog/src/main/java/com/yahoo/log/UncloseableOutputStream.java
+++ b/vespalog/src/main/java/com/yahoo/log/UncloseableOutputStream.java
@@ -7,9 +7,8 @@ import java.io.OutputStream;
 /**
  * @author Simon Thoresen Hult
  * @since 5.1.14
- * @deprecated Should only be used internally in the log library
+ * Should only be used internally in the log library
  */
-@Deprecated(since = "7", forRemoval = true)
 class UncloseableOutputStream extends OutputStream {
 
     private final OutputStream out;
diff --git a/vespalog/src/main/java/com/yahoo/log/Util.java b/vespalog/src/main/java/com/yahoo/log/Util.java
index 7a7ae5221c4..4b6665a2f41 100644
--- a/vespalog/src/main/java/com/yahoo/log/Util.java
+++ b/vespalog/src/main/java/com/yahoo/log/Util.java
@@ -9,10 +9,9 @@ import static com.yahoo.vespa.defaults.Defaults.getDefaults;
  * @author arnej27959
  * @author bjorncs
  *
- * @deprecated Should only be used internally in the log library
+ * Should only be used internally in the log library
  */
-@Deprecated(since = "7", forRemoval = true)
-public class Util {
+class Util {
 
     public static String getHostName () {
         return getDefaults().vespaHostname();
diff --git a/vespalog/src/main/java/com/yahoo/log/VespaFormat.java b/vespalog/src/main/java/com/yahoo/log/VespaFormat.java
index 21fccb90ad0..646459161f5 100644
--- a/vespalog/src/main/java/com/yahoo/log/VespaFormat.java
+++ b/vespalog/src/main/java/com/yahoo/log/VespaFormat.java
@@ -14,11 +14,9 @@ import java.util.regex.Pattern;
  * @author arnej27959
  * @author bjorncs
  *
- * @deprecated Should only be used internally in the log library
+ * Should only be used internally in the log library
  */
-@SuppressWarnings("removal")
-@Deprecated(since = "7", forRemoval = true)
-public class VespaFormat {
+class VespaFormat {
 
     private static final Pattern special   = Pattern.compile("[\r\\\n\\\t\\\\]+");
     private static final Pattern newLine   = Pattern.compile("\n");
diff --git a/vespalog/src/main/java/com/yahoo/log/VespaLevelControllerRepo.java b/vespalog/src/main/java/com/yahoo/log/VespaLevelControllerRepo.java
index 0163a68bf4c..6f6d29d3a8f 100644
--- a/vespalog/src/main/java/com/yahoo/log/VespaLevelControllerRepo.java
+++ b/vespalog/src/main/java/com/yahoo/log/VespaLevelControllerRepo.java
@@ -17,11 +17,9 @@ import static java.nio.charset.StandardCharsets.US_ASCII;
 /**
  * @author Ulf Lilleengen
  * @since 5.1
- * @deprecated Should only be used internally in the log library
+ * Should only be used internally in the log library
  */
-@SuppressWarnings("removal")
-@Deprecated(since = "7", forRemoval = true)
-public class VespaLevelControllerRepo implements LevelControllerRepo {
+class VespaLevelControllerRepo implements LevelControllerRepo {
 
     private RandomAccessFile ctlFile;
     private FileOutputStream ctlFileAppender;
diff --git a/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java b/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java
index d41ded6a9b4..95cc1e40876 100644
--- a/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java
+++ b/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java
@@ -10,8 +10,7 @@ import java.util.logging.StreamHandler;
  * @author Bjorn Borud
  * @author arnej27959
  */
-@SuppressWarnings("removal")
-@Deprecated(since = "7", forRemoval = true)
+@SuppressWarnings("deprecation")
 class VespaLogHandler extends StreamHandler {
 
     private final LogTarget logTarget;