diff options
3 files changed, 0 insertions, 21 deletions
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/MutableStatusRegistry.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/MutableStatusRegistry.java index b699a9f8962..18378092a4e 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/MutableStatusRegistry.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/MutableStatusRegistry.java @@ -27,7 +27,6 @@ public interface MutableStatusRegistry extends ReadOnlyStatusRegistry, AutoClose * so we override it here to strip the exception from the signature. */ @Override - @NoThrow void close(); } diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/NoThrow.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/NoThrow.java deleted file mode 100644 index fd6757f83cf..00000000000 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/NoThrow.java +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.orchestrator.status; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Used to annotate methods that do not throw Exceptions. - * They are still allowed to throw Errors, such as AssertionError - * - * TODO: move to vespajlib or find a suitable replacement - * @author Tony Vaagenes - */ -@Target(ElementType.METHOD) -@Retention(RetentionPolicy.SOURCE) -@interface NoThrow {} - diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZookeeperStatusService.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZookeeperStatusService.java index fd6bcb9093c..67b14f29764 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZookeeperStatusService.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/status/ZookeeperStatusService.java @@ -293,7 +293,6 @@ public class ZookeeperStatusService implements StatusService { } @Override - @NoThrow public void close() { try { lock.close(); |