Revert "Freva/node admin shutdown"

4 files changed, 2 insertions, 32 deletions

diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/lock/Lock.java b/vespajlib/src/main/java/com/yahoo/concurrent/Lock.java
index 1273a298592..3b1919a987d 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/lock/Lock.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/Lock.java
@@ -1,5 +1,5 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.concurrent.lock;
+package com.yahoo.concurrent;
 
 import java.util.concurrent.locks.ReentrantLock;
 
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/lock/Locks.java b/vespajlib/src/main/java/com/yahoo/concurrent/Locks.java
index 0308b26c903..ab167392329 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/lock/Locks.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/Locks.java
@@ -1,5 +1,5 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.concurrent.lock;
+package com.yahoo.concurrent;
 
 import com.google.common.util.concurrent.UncheckedTimeoutException;
 
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/lock/Locking.java b/vespajlib/src/main/java/com/yahoo/concurrent/lock/Locking.java
deleted file mode 100644
index 4d9f45e959e..00000000000
--- a/vespajlib/src/main/java/com/yahoo/concurrent/lock/Locking.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.yahoo.concurrent.lock;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * @author valerijf
- */
-public class Locking {
-    private final Map<Class<?>, ReentrantLock> locks = new ConcurrentHashMap<>();
-
-    /**
-     * Locks class. This will block until the lock is acquired.
-     * Users of this <b>must</b> close any lock acquired.
-     *
-     * @param key the key to lock
-     * @return the acquired lock
-     */
-    public Lock lock(Class<?> key) {
-        ReentrantLock lock = locks.computeIfAbsent(key, k -> new ReentrantLock(true));
-        lock.lock();
-        return new Lock(lock);
-    }
-}
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/lock/package-info.java b/vespajlib/src/main/java/com/yahoo/concurrent/lock/package-info.java
deleted file mode 100644
index 326124e600f..00000000000
--- a/vespajlib/src/main/java/com/yahoo/concurrent/lock/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage
-package com.yahoo.concurrent.lock;
-
-import com.yahoo.osgi.annotation.ExportPackage;