diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-04-27 18:36:06 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:21 +0200 |
commit | be5c208bc697db8bdc3c3549cc3f07e8d8f0cd47 (patch) | |
tree | 3e7bd228351a38fbf9067339e6c4f863eeee8b5c /docproc | |
parent | 3afcbd7b97a2d348e96dcfc6d79748b248956e9b (diff) |
GC deprecated statistics module
Diffstat (limited to 'docproc')
-rw-r--r-- | docproc/abi-spec.json | 6 | ||||
-rw-r--r-- | docproc/pom.xml | 6 | ||||
-rw-r--r-- | docproc/src/main/java/com/yahoo/docproc/Call.java | 12 | ||||
-rw-r--r-- | docproc/src/main/java/com/yahoo/docproc/CallStack.java | 18 |
4 files changed, 1 insertions, 41 deletions
diff --git a/docproc/abi-spec.json b/docproc/abi-spec.json index 5ad2c6d454d..bb7177783de 100644 --- a/docproc/abi-spec.json +++ b/docproc/abi-spec.json @@ -80,8 +80,6 @@ "methods": [ "public void <init>(com.yahoo.docproc.DocumentProcessor)", "public void <init>(com.yahoo.docproc.DocumentProcessor, com.yahoo.jdisc.Metric)", - "public void <init>(com.yahoo.docproc.DocumentProcessor, com.yahoo.statistics.Statistics, com.yahoo.jdisc.Metric)", - "public void <init>(com.yahoo.docproc.DocumentProcessor, java.lang.String, com.yahoo.statistics.Statistics, com.yahoo.jdisc.Metric)", "public void <init>(com.yahoo.docproc.DocumentProcessor, java.lang.String, com.yahoo.jdisc.Metric)", "public java.lang.Object clone()", "public com.yahoo.docproc.DocumentProcessor getDocumentProcessor()", @@ -102,12 +100,9 @@ "public void <init>()", "public void <init>(java.lang.String)", "public void <init>(com.yahoo.jdisc.Metric)", - "public void <init>(com.yahoo.statistics.Statistics, com.yahoo.jdisc.Metric)", - "public void <init>(java.lang.String, com.yahoo.statistics.Statistics, com.yahoo.jdisc.Metric)", "public void <init>(java.lang.String, com.yahoo.jdisc.Metric)", "public void <init>(com.yahoo.docproc.CallStack)", "public void <init>(java.lang.String, java.util.Collection, com.yahoo.jdisc.Metric)", - "public void <init>(java.lang.String, java.util.Collection, com.yahoo.statistics.Statistics, com.yahoo.jdisc.Metric)", "public java.lang.String getName()", "public void setName(java.lang.String)", "public com.yahoo.docproc.CallStack addNext(com.yahoo.docproc.Call)", @@ -133,7 +128,6 @@ "public java.util.ListIterator iterator()", "public int size()", "public java.lang.String toString()", - "public com.yahoo.statistics.Statistics getStatistics()", "public com.yahoo.jdisc.Metric getMetric()" ], "fields": [] diff --git a/docproc/pom.xml b/docproc/pom.xml index f3202973abc..d758606f8b7 100644 --- a/docproc/pom.xml +++ b/docproc/pom.xml @@ -78,12 +78,6 @@ </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>statistics</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> <artifactId>vespajlib</artifactId> <version>${project.version}</version> <scope>provided</scope> diff --git a/docproc/src/main/java/com/yahoo/docproc/Call.java b/docproc/src/main/java/com/yahoo/docproc/Call.java index bb277e5ebfe..75670badf91 100644 --- a/docproc/src/main/java/com/yahoo/docproc/Call.java +++ b/docproc/src/main/java/com/yahoo/docproc/Call.java @@ -11,7 +11,6 @@ import com.yahoo.document.DocumentPut; import com.yahoo.document.DocumentUpdate; import com.yahoo.jdisc.Metric; import com.yahoo.concurrent.SystemTimer; -import com.yahoo.statistics.Statistics; import java.util.List; @@ -40,14 +39,6 @@ public class Call implements Cloneable { public Call(DocumentProcessor processor, Metric metric) { this(processor, "", metric); } - @Deprecated - public Call(DocumentProcessor processor, Statistics manager, Metric metric) { - this(processor, "", metric); - } - @Deprecated - public Call(DocumentProcessor processor, String chainName, Statistics manager, Metric metric) { - this(processor, chainName, metric); - } public Call(DocumentProcessor processor, String chainName, Metric metric) { this.processor = processor; @@ -64,8 +55,7 @@ public class Call implements Cloneable { @Override public Object clone() { try { - Call clone = (Call) super.clone(); - return clone; + return super.clone(); } catch (CloneNotSupportedException e) { throw new RuntimeException("Will not happen"); } diff --git a/docproc/src/main/java/com/yahoo/docproc/CallStack.java b/docproc/src/main/java/com/yahoo/docproc/CallStack.java index 9f59d9e869b..9c7251ee54e 100644 --- a/docproc/src/main/java/com/yahoo/docproc/CallStack.java +++ b/docproc/src/main/java/com/yahoo/docproc/CallStack.java @@ -4,7 +4,6 @@ package com.yahoo.docproc; import com.yahoo.component.ComponentId; import com.yahoo.docproc.jdisc.metric.NullMetric; import com.yahoo.jdisc.Metric; -import com.yahoo.statistics.Statistics; import java.util.Collection; import java.util.Iterator; @@ -47,14 +46,6 @@ public class CallStack { this.name = null; this.metric = metric; } - @Deprecated - public CallStack(Statistics statistics, Metric metric) { - this(metric); - } - @Deprecated - public CallStack(String name, Statistics manager, Metric metric) { - this(name, metric); - } /** Creates an empty stack with a name */ public CallStack(String name, Metric metric) { this.name = name; @@ -87,10 +78,6 @@ public class CallStack { addLast(docproc); } } - @Deprecated - public CallStack(String name, Collection<DocumentProcessor> docprocs, Statistics manager, Metric metric) { - this(name, docprocs, metric); - } /** Returns the name of this stack, or null if it is not named */ public String getName() { @@ -384,11 +371,6 @@ public class CallStack { return b.toString(); } - @Deprecated - public Statistics getStatistics() { - return null; - } - public Metric getMetric() { return metric; } |