Move shutdown hook registration to dedicated provider

This change would allow using ShutdownHandlerImpl in integration tests.

Change-Id: I854f65d03b9e1a495fda7211fd1b7fd51b4e5ba3
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/infra/impl/src/main/java/io/fd/honeycomb/impl/ShutdownHandlerImpl.java b/infra/impl/src/main/java/io/fd/honeycomb/impl/ShutdownHandlerImpl.java
index 71145817f..f622a603b 100644
--- a/infra/impl/src/main/java/io/fd/honeycomb/impl/ShutdownHandlerImpl.java
+++ b/infra/impl/src/main/java/io/fd/honeycomb/impl/ShutdownHandlerImpl.java
@@ -16,7 +16,6 @@
 
 package io.fd.honeycomb.impl;
 
-import com.google.common.annotations.VisibleForTesting;
 import io.fd.honeycomb.data.init.ShutdownHandler;
 import java.util.Deque;
 import java.util.LinkedList;
@@ -32,7 +31,6 @@ public final class ShutdownHandlerImpl implements ShutdownHandler {
 
     public ShutdownHandlerImpl() {
         components = new LinkedList<>();
-        Runtime.getRuntime().addShutdownHook(new Thread((this::performShutdown)));
     }
 
     @Override
@@ -60,8 +58,8 @@ public final class ShutdownHandlerImpl implements ShutdownHandler {
         }
     }
 
-    @VisibleForTesting
-    void performShutdown() {
+    @Override
+    public void performShutdown() {
         // close components in reverse order that they were registered
         components.descendingIterator().forEachRemaining(closeable -> {
             LOG.info("Closing component {}", closeable.getName());