Merge pull request #20933 from vespa-engine/revoke-log.event-from-public-api

Deprecate package c.y.log.event.

33 files changed, 43 insertions, 13 deletions

diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java
index 0ae02e4c17b..9340363def8 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ProxyServer.java
@@ -33,6 +33,7 @@ import static com.yahoo.vespa.config.proxy.Mode.ModeName.DEFAULT;
  *
  * @author hmusum
  */
+@SuppressWarnings("removal") // TODO Vespa 8: remove (com.yahoo.log.event)
 public class ProxyServer implements Runnable {
 
     private static final DaemonThreadFactory threadFactory = new DaemonThreadFactory("ProxyServer");
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java
index 5fb90deaa0a..586d1d32d57 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java
@@ -3,7 +3,6 @@ package com.yahoo.prelude.query.parser;
 
 import com.yahoo.language.Language;
 import com.yahoo.language.process.Segmenter;
-import com.yahoo.log.event.*;
 import com.yahoo.prelude.Index;
 import com.yahoo.prelude.IndexFacts;
 import com.yahoo.prelude.query.*;
diff --git a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/MetricsSearcher.java b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/MetricsSearcher.java
index ab9da8ccee5..f20fc85b448 100644
--- a/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/MetricsSearcher.java
+++ b/container-search/src/main/java/com/yahoo/vespa/streamingvisitors/MetricsSearcher.java
@@ -20,6 +20,7 @@ import static com.yahoo.vespa.streamingvisitors.VdsStreamingSearcher.STREAMING_S
 /**
  * Generates mail-specific query metrics.
  */
+@SuppressWarnings("removal") // TODO Vespa 8: remove (com.yahoo.log.event)
 public class MetricsSearcher extends Searcher {
 
     private static final CompoundName metricsearcherId=new CompoundName("metricsearcher.id");
diff --git a/logserver/src/main/java/com/yahoo/logserver/Server.java b/logserver/src/main/java/com/yahoo/logserver/Server.java
index a0f2082e706..ff9939ff244 100644
--- a/logserver/src/main/java/com/yahoo/logserver/Server.java
+++ b/logserver/src/main/java/com/yahoo/logserver/Server.java
@@ -22,7 +22,7 @@ import java.util.logging.Logger;
  * @author Bjorn Borud
  * @author Stig Bakken
  */
-
+@SuppressWarnings("removal") // TODO Vespa 8: remove (com.yahoo.log.event)
 public class Server implements Runnable {
     private final AtomicBoolean signalCaught = new AtomicBoolean(false);
     static final String APPNAME = "logserver";
diff --git a/logserver/src/main/java/com/yahoo/logserver/handlers/logmetrics/LogMetricsHandler.java b/logserver/src/main/java/com/yahoo/logserver/handlers/logmetrics/LogMetricsHandler.java
index 68a32def9ad..59475972279 100644
--- a/logserver/src/main/java/com/yahoo/logserver/handlers/logmetrics/LogMetricsHandler.java
+++ b/logserver/src/main/java/com/yahoo/logserver/handlers/logmetrics/LogMetricsHandler.java
@@ -24,6 +24,7 @@ import com.yahoo.logserver.handlers.AbstractLogHandler;
  *
  * @author hmusum
  */
+@SuppressWarnings("removal") // TODO Vespa 8: remove (com.yahoo.log.event)
 public class LogMetricsHandler extends AbstractLogHandler {
     private static final long EVENTINTERVAL = 5 * 60; // in seconds
 
diff --git a/logserver/src/main/java/com/yahoo/logserver/testutils/VerifyLogfile.java b/logserver/src/main/java/com/yahoo/logserver/testutils/VerifyLogfile.java
index ec99f99b930..0c9af994c3d 100644
--- a/logserver/src/main/java/com/yahoo/logserver/testutils/VerifyLogfile.java
+++ b/logserver/src/main/java/com/yahoo/logserver/testutils/VerifyLogfile.java
@@ -17,7 +17,7 @@ import com.yahoo.log.LogMessage;
  *
  * @author  Bjorn Borud
  */
-@SuppressWarnings("deprecation")
+@SuppressWarnings({"deprecation","removal"}) // TODO Vespa 8: remove (com.yahoo.log.event)
 public class VerifyLogfile {
 
     public static void main (String[] args) throws IOException {
diff --git a/statistics/src/main/java/com/yahoo/statistics/CounterGroup.java b/statistics/src/main/java/com/yahoo/statistics/CounterGroup.java
index 39d8ad19f29..08b700dbe3c 100644
--- a/statistics/src/main/java/com/yahoo/statistics/CounterGroup.java
+++ b/statistics/src/main/java/com/yahoo/statistics/CounterGroup.java
@@ -15,6 +15,7 @@ import java.util.Iterator;
  *
  * @author  <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
  */
+@SuppressWarnings("removal") // TODO Vespa 8: remove (com.yahoo.log.event)
 @Deprecated
 public class CounterGroup extends Group {
     private final boolean resetCounter;
diff --git a/statistics/src/main/java/com/yahoo/statistics/ValueGroup.java b/statistics/src/main/java/com/yahoo/statistics/ValueGroup.java
index e8f26e625d4..ea12c1e4c89 100644
--- a/statistics/src/main/java/com/yahoo/statistics/ValueGroup.java
+++ b/statistics/src/main/java/com/yahoo/statistics/ValueGroup.java
@@ -13,6 +13,7 @@ import java.util.HashMap;
  *
  * @author  <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
  */
+@SuppressWarnings("removal") // TODO Vespa 8: remove (com.yahoo.log.event)
 @Deprecated
 public class ValueGroup extends Group {
     // A map for names of subevents and Value instances
diff --git a/statistics/src/test/java/com/yahoo/statistics/CounterGroupTestCase.java b/statistics/src/test/java/com/yahoo/statistics/CounterGroupTestCase.java
index 323a4fd23c6..c1899aa7e94 100644
--- a/statistics/src/test/java/com/yahoo/statistics/CounterGroupTestCase.java
+++ b/statistics/src/test/java/com/yahoo/statistics/CounterGroupTestCase.java
@@ -18,7 +18,7 @@ import static org.junit.Assert.assertFalse;
  *
  * @author Steinar Knutsen
  */
-@SuppressWarnings("deprecation")
+@SuppressWarnings({"deprecation","removal"}) // TODO Vespa 8: remove
 public class CounterGroupTestCase {
 
     private volatile boolean gotRecord = false;
diff --git a/statistics/src/test/java/com/yahoo/statistics/ValueGroupTestCase.java b/statistics/src/test/java/com/yahoo/statistics/ValueGroupTestCase.java
index f9c3ee79ad7..f57fff8c312 100644
--- a/statistics/src/test/java/com/yahoo/statistics/ValueGroupTestCase.java
+++ b/statistics/src/test/java/com/yahoo/statistics/ValueGroupTestCase.java
@@ -18,7 +18,7 @@ import static org.junit.Assert.assertTrue;
  *
  * @author Steinar Knutsen
  */
-@SuppressWarnings("deprecation")
+@SuppressWarnings({"deprecation","removal"}) // TODO Vespa 8: remove
 public class ValueGroupTestCase {
 
     private volatile boolean gotRecord = false;
diff --git a/statistics/src/test/java/com/yahoo/statistics/ValueTestCase.java b/statistics/src/test/java/com/yahoo/statistics/ValueTestCase.java
index 91a02d90a6e..b7f0d9ca8c4 100644
--- a/statistics/src/test/java/com/yahoo/statistics/ValueTestCase.java
+++ b/statistics/src/test/java/com/yahoo/statistics/ValueTestCase.java
@@ -21,7 +21,7 @@ import org.junit.Test;
  *
  * @author Steinar Knutsen
  */
-@SuppressWarnings("deprecation")
+@SuppressWarnings({"deprecation","removal"}) // TODO Vespa 8: remove
 public class ValueTestCase {
 
     private static final double delta = 0.0000000001;
diff --git a/vespalog/pom.xml b/vespalog/pom.xml
index 08d73816e63..94be1302e30 100644
--- a/vespalog/pom.xml
+++ b/vespalog/pom.xml
@@ -48,6 +48,18 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <!-- TODO Vespa 8: remove configuration.
+             Included to allow 'removal' warnings for classes in its own module -->
+        <configuration>
+          <compilerArgs>
+            <arg>-Xlint:all,-serial,-try,-processing,-removal</arg>
+            <arg>-Werror</arg>
+          </compilerArgs>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <forkMode>once</forkMode>
@@ -59,10 +71,6 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-install-plugin</artifactId>
         <configuration>
           <updateReleaseInfo>true</updateReleaseInfo>
diff --git a/vespalog/src/main/java/com/yahoo/log/LogMessage.java b/vespalog/src/main/java/com/yahoo/log/LogMessage.java
index 8f0deeea3c5..878e041231c 100644
--- a/vespalog/src/main/java/com/yahoo/log/LogMessage.java
+++ b/vespalog/src/main/java/com/yahoo/log/LogMessage.java
@@ -21,7 +21,6 @@ import java.util.regex.Pattern;
  * @author  Bjorn Borud
  * @author bjorncs
  */
-@SuppressWarnings("removal")
 public class LogMessage
 {
     private static Logger log = Logger.getLogger(LogMessage.class.getName());
diff --git a/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java b/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java
index c3fd97a5e7c..caa68cf3019 100644
--- a/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java
+++ b/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java
@@ -21,7 +21,6 @@ import java.util.regex.Pattern;
  *
  * @deprecated Should only be used internally in the log library
  */
-@SuppressWarnings("removal")
 @Deprecated(since = "7", forRemoval = true)
 public class VespaFormatter extends SimpleFormatter {
 
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Collection.java b/vespalog/src/main/java/com/yahoo/log/event/Collection.java
index 5556878fd11..331fdf33d9f 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Collection.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Collection.java
@@ -5,6 +5,7 @@ package com.yahoo.log.event;
  *
  * @author  Bjorn Borud
  */
+@Deprecated(forRemoval = true, since = "7")
 public class Collection extends Event {
     public Collection () {
     }
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Count.java b/vespalog/src/main/java/com/yahoo/log/event/Count.java
index c7c48130a47..284d23e6999 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Count.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Count.java
@@ -5,6 +5,7 @@ package com.yahoo.log.event;
  *
  * @author  Bjorn Borud
  */
+@Deprecated(forRemoval = true, since = "7")
 public class Count extends Event {
     public Count () {
     }
diff --git a/vespalog/src/main/java/com/yahoo/log/event/CountGroup.java b/vespalog/src/main/java/com/yahoo/log/event/CountGroup.java
index a65a38095a0..fc52c577bda 100755
--- a/vespalog/src/main/java/com/yahoo/log/event/CountGroup.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/CountGroup.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.log.event;
 
+@Deprecated(forRemoval = true, since = "7")
 public class CountGroup extends Event {
     public CountGroup () {
     }
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Crash.java b/vespalog/src/main/java/com/yahoo/log/event/Crash.java
index 3cb6b6c0232..bcfaed4cce7 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Crash.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Crash.java
@@ -5,6 +5,7 @@ package com.yahoo.log.event;
  *
  * @author  Bjorn Borud
  */
+@Deprecated(forRemoval = true, since = "7")
 public class Crash extends Event {
     public Crash () {
     }
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Event.java b/vespalog/src/main/java/com/yahoo/log/event/Event.java
index 4346316619a..288fd1f56dc 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Event.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Event.java
@@ -28,7 +28,10 @@ import java.util.regex.Pattern;
  * them through the logging API.
  *
  * @author  Bjorn Borud
+ *
+ * @deprecated Only for internal Vespa usage
  */
+@Deprecated(forRemoval = true, since = "7")
 public abstract class Event implements Serializable {
     private static Logger log = Logger.getLogger(Event.class.getName());
 
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Histogram.java b/vespalog/src/main/java/com/yahoo/log/event/Histogram.java
index f118c0f0bab..08875063a4e 100755
--- a/vespalog/src/main/java/com/yahoo/log/event/Histogram.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Histogram.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.log.event;
 
+@Deprecated(forRemoval = true, since = "7")
 public class Histogram extends Event {
     public Histogram () {
     }
diff --git a/vespalog/src/main/java/com/yahoo/log/event/MalformedEventException.java b/vespalog/src/main/java/com/yahoo/log/event/MalformedEventException.java
index a9f9774fd9f..6283832ff6d 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/MalformedEventException.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/MalformedEventException.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.log.event;
 
+@Deprecated(forRemoval = true, since = "7")
 public class MalformedEventException extends Exception {
     public MalformedEventException (Throwable cause) {
         super(cause);
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Progress.java b/vespalog/src/main/java/com/yahoo/log/event/Progress.java
index f63b7981ddf..2e54e72cb17 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Progress.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Progress.java
@@ -5,6 +5,7 @@ package com.yahoo.log.event;
  *
  * @author  Bjorn Borud
  */
+@Deprecated(forRemoval = true, since = "7")
 public class Progress extends Event {
     public Progress () {
     }
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Reloaded.java b/vespalog/src/main/java/com/yahoo/log/event/Reloaded.java
index bf63ab4c4c6..517c28f5f2e 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Reloaded.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Reloaded.java
@@ -5,6 +5,7 @@ package com.yahoo.log.event;
  *
  * @author  Bjorn Borud
  */
+@Deprecated(forRemoval = true, since = "7")
 public class Reloaded extends Event {
     public Reloaded () {
     }
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Reloading.java b/vespalog/src/main/java/com/yahoo/log/event/Reloading.java
index c7683f6276f..ae537b84316 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Reloading.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Reloading.java
@@ -5,6 +5,7 @@ package com.yahoo.log.event;
  *
  * @author  Bjorn Borud
  */
+@Deprecated(forRemoval = true, since = "7")
 public class Reloading extends Event {
     public Reloading () {
     }
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Started.java b/vespalog/src/main/java/com/yahoo/log/event/Started.java
index 41b6f8f369a..c3d90174893 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Started.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Started.java
@@ -5,6 +5,7 @@ package com.yahoo.log.event;
  *
  * @author  Bjorn Borud
  */
+@Deprecated(forRemoval = true, since = "7")
 public class Started extends Event {
     public Started () {
     }
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Starting.java b/vespalog/src/main/java/com/yahoo/log/event/Starting.java
index aa4141eb788..4f4af50a729 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Starting.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Starting.java
@@ -5,6 +5,7 @@ package com.yahoo.log.event;
  *
  * @author  Bjorn Borud
  */
+@Deprecated(forRemoval = true, since = "7")
 public class Starting extends Event {
     public Starting () {
     }
diff --git a/vespalog/src/main/java/com/yahoo/log/event/State.java b/vespalog/src/main/java/com/yahoo/log/event/State.java
index 6b9479a6518..106f4031fee 100755
--- a/vespalog/src/main/java/com/yahoo/log/event/State.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/State.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.log.event;
 
+@Deprecated(forRemoval = true, since = "7")
 public class State extends Event {
     public State () {
     }
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Stopped.java b/vespalog/src/main/java/com/yahoo/log/event/Stopped.java
index e40d67ed790..c6e95d877c4 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Stopped.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Stopped.java
@@ -5,6 +5,7 @@ package com.yahoo.log.event;
  *
  * @author  Bjorn Borud
  */
+@Deprecated(forRemoval = true, since = "7")
 public class Stopped extends Event {
     public Stopped () {
     }
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Stopping.java b/vespalog/src/main/java/com/yahoo/log/event/Stopping.java
index 9c1f534b6a7..daec0123e80 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Stopping.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Stopping.java
@@ -5,6 +5,7 @@ package com.yahoo.log.event;
  *
  * @author  Bjorn Borud
  */
+@Deprecated(forRemoval = true, since = "7")
 public class Stopping extends Event {
     public Stopping () {
     }
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Unknown.java b/vespalog/src/main/java/com/yahoo/log/event/Unknown.java
index 12305f1059b..b82cfebbaaa 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Unknown.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Unknown.java
@@ -5,6 +5,7 @@ package com.yahoo.log.event;
  *
  * @author Bjorn Borud
  */
+@Deprecated(forRemoval = true, since = "7")
 public class Unknown extends Event {
     public Unknown() {
     }
diff --git a/vespalog/src/main/java/com/yahoo/log/event/Value.java b/vespalog/src/main/java/com/yahoo/log/event/Value.java
index f549b9f4f07..d0d1f6424c7 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/Value.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/Value.java
@@ -5,6 +5,7 @@ package com.yahoo.log.event;
  *
  * @author  Bjorn Borud
  */
+@Deprecated(forRemoval = true, since = "7")
 public class Value extends Event {
     public Value () {
     }
diff --git a/vespalog/src/main/java/com/yahoo/log/event/ValueGroup.java b/vespalog/src/main/java/com/yahoo/log/event/ValueGroup.java
index d164e4c15fd..49835ca8ed4 100755
--- a/vespalog/src/main/java/com/yahoo/log/event/ValueGroup.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/ValueGroup.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.log.event;
 
+@Deprecated(forRemoval = true, since = "7")
 public class ValueGroup extends Event {
     public ValueGroup () {
     }
diff --git a/vespalog/src/main/java/com/yahoo/log/event/package-info.java b/vespalog/src/main/java/com/yahoo/log/event/package-info.java
index 158f89b065b..f2cb20e3ac8 100644
--- a/vespalog/src/main/java/com/yahoo/log/event/package-info.java
+++ b/vespalog/src/main/java/com/yahoo/log/event/package-info.java
@@ -1,6 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
-@PublicApi
+@PublicApi  // TODO Vespa 8: remove
 package com.yahoo.log.event;
 
 import com.yahoo.api.annotations.PublicApi;