From b580bf96165691622f19e73d445f346fe29fe74f Mon Sep 17 00:00:00 2001
From: Morten Tokle <mortent@verizonmedia.com>
Date: Mon, 22 Jun 2020 13:08:22 +0200
Subject: Move configuration of test runtime to test invocation

---
 tenant-cd-api/pom.xml                                     |  7 -------
 .../ai/vespa/hosted/cd/internal/TestRuntimeProvider.java  | 15 +++++----------
 .../java/ai/vespa/hosted/cd/internal/package-info.java    |  9 +++++++++
 3 files changed, 14 insertions(+), 17 deletions(-)
 create mode 100644 tenant-cd-api/src/main/java/ai/vespa/hosted/cd/internal/package-info.java

(limited to 'tenant-cd-api')

diff --git a/tenant-cd-api/pom.xml b/tenant-cd-api/pom.xml
index 233788a12a9..b19d42d094f 100644
--- a/tenant-cd-api/pom.xml
+++ b/tenant-cd-api/pom.xml
@@ -40,13 +40,6 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <!-- required to inject component from test implementation -->
-            <groupId>com.yahoo.vespa</groupId>
-            <artifactId>component</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
 
         <!-- compile -->
         <dependency> <!-- TODO(bjorncs): share junit version number with test-runner implementation -->
diff --git a/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/internal/TestRuntimeProvider.java b/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/internal/TestRuntimeProvider.java
index e97fa5faf85..8a12c5de862 100644
--- a/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/internal/TestRuntimeProvider.java
+++ b/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/internal/TestRuntimeProvider.java
@@ -2,28 +2,23 @@
 package ai.vespa.hosted.cd.internal;
 
 import ai.vespa.hosted.cd.TestRuntime;
-import com.yahoo.component.AbstractComponent;
 
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * @author mortent
  */
-public class TestRuntimeProvider extends AbstractComponent {
+public interface TestRuntimeProvider  {
 
-    private static final AtomicReference<TestRuntime> testRuntime = new AtomicReference<>();
+    static final AtomicReference<TestRuntime> testRuntime = new AtomicReference<>();
 
-    public TestRuntimeProvider(TestRuntime testRuntime) {
+    void initialize(byte[] config);
+
+    default void updateReference(TestRuntime testRuntime) {
         TestRuntimeProvider.testRuntime.set(testRuntime);
     }
 
     public static TestRuntime getTestRuntime() {
         return testRuntime.get();
     }
-
-    @Override
-    public void deconstruct() {
-        super.deconstruct();
-        testRuntime.set(null);
-    }
 }
diff --git a/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/internal/package-info.java b/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/internal/package-info.java
new file mode 100644
index 00000000000..9f073852fc6
--- /dev/null
+++ b/tenant-cd-api/src/main/java/ai/vespa/hosted/cd/internal/package-info.java
@@ -0,0 +1,9 @@
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+/**
+ * @author mortent
+ */
+@ExportPackage
+package ai.vespa.hosted.cd.internal;
+
+import com.yahoo.osgi.annotation.ExportPackage;
\ No newline at end of file
-- 
cgit v1.2.3