From c13ed2023218378d4ffe28a06eef3672766c2140 Mon Sep 17 00:00:00 2001 From: Arne H Juul Date: Thu, 2 Jun 2022 20:14:08 +0000 Subject: com.yahoo.log.event cleanup --- .../main/java/com/yahoo/log/event/Collection.java | 17 --------- .../src/main/java/com/yahoo/log/event/Count.java | 3 +- .../main/java/com/yahoo/log/event/CountGroup.java | 17 --------- .../src/main/java/com/yahoo/log/event/Crash.java | 3 +- .../src/main/java/com/yahoo/log/event/Event.java | 40 +--------------------- .../main/java/com/yahoo/log/event/Histogram.java | 18 ---------- .../yahoo/log/event/MalformedEventException.java | 1 - .../main/java/com/yahoo/log/event/Progress.java | 3 +- .../main/java/com/yahoo/log/event/Reloaded.java | 16 --------- .../main/java/com/yahoo/log/event/Reloading.java | 16 --------- .../src/main/java/com/yahoo/log/event/Started.java | 3 +- .../main/java/com/yahoo/log/event/Starting.java | 3 +- .../src/main/java/com/yahoo/log/event/State.java | 3 +- .../src/main/java/com/yahoo/log/event/Stopped.java | 3 +- .../main/java/com/yahoo/log/event/Stopping.java | 3 +- .../src/main/java/com/yahoo/log/event/Unknown.java | 3 +- .../src/main/java/com/yahoo/log/event/Value.java | 3 +- .../main/java/com/yahoo/log/event/ValueGroup.java | 17 --------- 18 files changed, 11 insertions(+), 161 deletions(-) delete mode 100644 vespalog/src/main/java/com/yahoo/log/event/Collection.java delete mode 100755 vespalog/src/main/java/com/yahoo/log/event/CountGroup.java delete mode 100755 vespalog/src/main/java/com/yahoo/log/event/Histogram.java delete mode 100644 vespalog/src/main/java/com/yahoo/log/event/Reloaded.java delete mode 100644 vespalog/src/main/java/com/yahoo/log/event/Reloading.java delete mode 100755 vespalog/src/main/java/com/yahoo/log/event/ValueGroup.java (limited to 'vespalog/src/main/java/com') diff --git a/vespalog/src/main/java/com/yahoo/log/event/Collection.java b/vespalog/src/main/java/com/yahoo/log/event/Collection.java deleted file mode 100644 index 331fdf33d9f..00000000000 --- a/vespalog/src/main/java/com/yahoo/log/event/Collection.java +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.log.event; - -/** - * - * @author Bjorn Borud - */ -@Deprecated(forRemoval = true, since = "7") -public class Collection extends Event { - public Collection () { - } - - public Collection (long collectionId, String name) { - setValue("collectionId", Long.toString(collectionId)); - setValue("name", name); - } -} 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 284d23e6999..bc411628776 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/Count.java +++ b/vespalog/src/main/java/com/yahoo/log/event/Count.java @@ -5,8 +5,7 @@ package com.yahoo.log.event; * * @author Bjorn Borud */ -@Deprecated(forRemoval = true, since = "7") -public class Count extends Event { +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 deleted file mode 100755 index fc52c577bda..00000000000 --- a/vespalog/src/main/java/com/yahoo/log/event/CountGroup.java +++ /dev/null @@ -1,17 +0,0 @@ -// 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 () { - } - - public CountGroup (String name, String values) { - init(name, values); - } - - private void init (String name, String counts) { - setValue("name", name); - setValue("values", counts); - } -} 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 bcfaed4cce7..93efc64b061 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/Crash.java +++ b/vespalog/src/main/java/com/yahoo/log/event/Crash.java @@ -5,8 +5,7 @@ package com.yahoo.log.event; * * @author Bjorn Borud */ -@Deprecated(forRemoval = true, since = "7") -public class Crash extends Event { +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 288fd1f56dc..925b90dbf1d 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/Event.java +++ b/vespalog/src/main/java/com/yahoo/log/event/Event.java @@ -29,9 +29,8 @@ import java.util.regex.Pattern; * * @author Bjorn Borud * - * @deprecated Only for internal Vespa usage + * 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()); @@ -425,20 +424,6 @@ public abstract class Event implements Serializable { log(getCallerLogger(), new Stopped(name, pid, exitcode)); } - /** - * Static method for logging the reloading event. - */ - public static final void reloading (String name) { - log(getCallerLogger(), new Reloading(name)); - } - - /** - * Static method for logging the reloaded event. - */ - public static final void reloaded (String name) { - log(getCallerLogger(), new Reloaded(name)); - } - /** * Static method for logging the count event. */ @@ -453,29 +438,6 @@ public abstract class Event implements Serializable { log(getCallerLogger(), new Value(name, value)); } - /** - * Static method for logging the histogram event. - */ - public static final void histogram (String name, String value, - String representation) { - log(getCallerLogger(), new Histogram(name, value, - representation)); - } - - /** - * Static method for logging a set of value events. - */ - public static final void valueGroup (String name, String value) { - log(getCallerLogger(), new ValueGroup(name, value)); - } - - /** - * Static method for logging a set of count events. - */ - public static final void countGroup (String name, String value) { - log(getCallerLogger(), new CountGroup(name, value)); - } - /** * Static method for logging the progress event. */ diff --git a/vespalog/src/main/java/com/yahoo/log/event/Histogram.java b/vespalog/src/main/java/com/yahoo/log/event/Histogram.java deleted file mode 100755 index 08875063a4e..00000000000 --- a/vespalog/src/main/java/com/yahoo/log/event/Histogram.java +++ /dev/null @@ -1,18 +0,0 @@ -// 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 () { - } - - public Histogram (String name, String value, String representation) { - init(name, value, representation); - } - - private void init (String name, String value, String representation) { - setValue("name", name); - setValue("counts", value); - setValue("representation", representation); - } -} 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 6283832ff6d..a9f9774fd9f 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/MalformedEventException.java +++ b/vespalog/src/main/java/com/yahoo/log/event/MalformedEventException.java @@ -1,7 +1,6 @@ // 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 2e54e72cb17..14ef9efe520 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/Progress.java +++ b/vespalog/src/main/java/com/yahoo/log/event/Progress.java @@ -5,8 +5,7 @@ package com.yahoo.log.event; * * @author Bjorn Borud */ -@Deprecated(forRemoval = true, since = "7") -public class Progress extends Event { +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 deleted file mode 100644 index 517c28f5f2e..00000000000 --- a/vespalog/src/main/java/com/yahoo/log/event/Reloaded.java +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.log.event; - -/** - * - * @author Bjorn Borud - */ -@Deprecated(forRemoval = true, since = "7") -public class Reloaded extends Event { - public Reloaded () { - } - - public Reloaded (String name) { - setValue("name", name); - } -} diff --git a/vespalog/src/main/java/com/yahoo/log/event/Reloading.java b/vespalog/src/main/java/com/yahoo/log/event/Reloading.java deleted file mode 100644 index ae537b84316..00000000000 --- a/vespalog/src/main/java/com/yahoo/log/event/Reloading.java +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.log.event; - -/** - * - * @author Bjorn Borud - */ -@Deprecated(forRemoval = true, since = "7") -public class Reloading extends Event { - public Reloading () { - } - - public Reloading (String name) { - setValue("name", name); - } -} 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 c3d90174893..af1e1bef7f7 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/Started.java +++ b/vespalog/src/main/java/com/yahoo/log/event/Started.java @@ -5,8 +5,7 @@ package com.yahoo.log.event; * * @author Bjorn Borud */ -@Deprecated(forRemoval = true, since = "7") -public class Started extends Event { +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 4f4af50a729..9a37a4b504e 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/Starting.java +++ b/vespalog/src/main/java/com/yahoo/log/event/Starting.java @@ -5,8 +5,7 @@ package com.yahoo.log.event; * * @author Bjorn Borud */ -@Deprecated(forRemoval = true, since = "7") -public class Starting extends Event { +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 106f4031fee..fd90ac3b95b 100755 --- a/vespalog/src/main/java/com/yahoo/log/event/State.java +++ b/vespalog/src/main/java/com/yahoo/log/event/State.java @@ -1,8 +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 { +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 c6e95d877c4..15c7aee395e 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/Stopped.java +++ b/vespalog/src/main/java/com/yahoo/log/event/Stopped.java @@ -5,8 +5,7 @@ package com.yahoo.log.event; * * @author Bjorn Borud */ -@Deprecated(forRemoval = true, since = "7") -public class Stopped extends Event { +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 daec0123e80..65693dc4a5b 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/Stopping.java +++ b/vespalog/src/main/java/com/yahoo/log/event/Stopping.java @@ -5,8 +5,7 @@ package com.yahoo.log.event; * * @author Bjorn Borud */ -@Deprecated(forRemoval = true, since = "7") -public class Stopping extends Event { +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 b82cfebbaaa..388f8c5f363 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/Unknown.java +++ b/vespalog/src/main/java/com/yahoo/log/event/Unknown.java @@ -5,8 +5,7 @@ package com.yahoo.log.event; * * @author Bjorn Borud */ -@Deprecated(forRemoval = true, since = "7") -public class Unknown extends Event { +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 d0d1f6424c7..2598a34ba14 100644 --- a/vespalog/src/main/java/com/yahoo/log/event/Value.java +++ b/vespalog/src/main/java/com/yahoo/log/event/Value.java @@ -5,8 +5,7 @@ package com.yahoo.log.event; * * @author Bjorn Borud */ -@Deprecated(forRemoval = true, since = "7") -public class Value extends Event { +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 deleted file mode 100755 index 49835ca8ed4..00000000000 --- a/vespalog/src/main/java/com/yahoo/log/event/ValueGroup.java +++ /dev/null @@ -1,17 +0,0 @@ -// 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 () { - } - - public ValueGroup (String name, String values) { - init(name, values); - } - - private void init (String name, String value) { - setValue("name", name); - setValue("values", value); - } -} -- cgit v1.2.3