diff options
Diffstat (limited to 'component')
-rw-r--r-- | component/abi-spec.json | 16 | ||||
-rw-r--r-- | component/src/main/java/com/yahoo/component/AbstractComponent.java | 3 | ||||
-rw-r--r-- | component/src/main/java/com/yahoo/component/Deconstructable.java | 13 |
3 files changed, 2 insertions, 30 deletions
diff --git a/component/abi-spec.json b/component/abi-spec.json index 2dfa3e0d71d..5665075f1f2 100644 --- a/component/abi-spec.json +++ b/component/abi-spec.json @@ -2,8 +2,7 @@ "com.yahoo.component.AbstractComponent": { "superClass": "java.lang.Object", "interfaces": [ - "com.yahoo.component.Component", - "com.yahoo.component.Deconstructable" + "com.yahoo.component.Component" ], "attributes": [ "public" @@ -106,19 +105,6 @@ ], "fields": [] }, - "com.yahoo.component.Deconstructable": { - "superClass": "java.lang.Object", - "interfaces": [], - "attributes": [ - "public", - "interface", - "abstract" - ], - "methods": [ - "public abstract void deconstruct()" - ], - "fields": [] - }, "com.yahoo.component.Version": { "superClass": "java.lang.Object", "interfaces": [ diff --git a/component/src/main/java/com/yahoo/component/AbstractComponent.java b/component/src/main/java/com/yahoo/component/AbstractComponent.java index 18a19f3e238..fcaa1e62d56 100644 --- a/component/src/main/java/com/yahoo/component/AbstractComponent.java +++ b/component/src/main/java/com/yahoo/component/AbstractComponent.java @@ -11,7 +11,7 @@ import java.lang.reflect.Method; * * @author bratseth */ -public class AbstractComponent implements Component, Deconstructable { +public class AbstractComponent implements Component { private static final MethodCache deconstructMethods = new MethodCache("deconstruct"); @@ -129,7 +129,6 @@ public class AbstractComponent implements Component, Deconstructable { * <p> * This default implementation does nothing. */ - @Override public void deconstruct() { } /** diff --git a/component/src/main/java/com/yahoo/component/Deconstructable.java b/component/src/main/java/com/yahoo/component/Deconstructable.java deleted file mode 100644 index 4da39cd3420..00000000000 --- a/component/src/main/java/com/yahoo/component/Deconstructable.java +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.component; - -/** - * A component in the component graph that should be deconstructed, to release resources. - * - * @author jonmv - */ -public interface Deconstructable { - - void deconstruct(); - -} |