Revert "Gjoranv/use container service type"

3 files changed, 0 insertions, 57 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/container/ContainerServiceType.java b/config-model-api/src/main/java/com/yahoo/config/model/api/container/ContainerServiceType.java
deleted file mode 100644
index 0b521881838..00000000000
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/container/ContainerServiceType.java
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.config.model.api.container;
-
-/**
- * @author gjoranv
- */
-public enum ContainerServiceType {
-
-    CONTAINER("container"),
-    QRSERVER("qrserver"),
-    CLUSTERCONTROLLER_CONTAINER("container-clustercontroller"),
-    LOGSERVER_CONTAINER("logserver-container"),
-    METRICS_PROXY_CONTAINER("metrics-proxy-container");
-
-    public final String serviceName;
-
-    ContainerServiceType(String serviceName) {
-        this.serviceName = serviceName;
-    }
-
-}
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/container/package-info.java b/config-model-api/src/main/java/com/yahoo/config/model/api/container/package-info.java
deleted file mode 100644
index c32fdc393d0..00000000000
--- a/config-model-api/src/main/java/com/yahoo/config/model/api/container/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.config.model.api.container;
-
-import com.yahoo.osgi.annotation.ExportPackage;
diff --git a/config-model-api/src/test/java/com/yahoo/config/model/api/container/ContainerServiceTypeTest.java b/config-model-api/src/test/java/com/yahoo/config/model/api/container/ContainerServiceTypeTest.java
deleted file mode 100644
index f6cc1c8d7b3..00000000000
--- a/config-model-api/src/test/java/com/yahoo/config/model/api/container/ContainerServiceTypeTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.yahoo.config.model.api.container;
-
-import org.junit.Test;
-
-import static com.yahoo.config.model.api.container.ContainerServiceType.CLUSTERCONTROLLER_CONTAINER;
-import static com.yahoo.config.model.api.container.ContainerServiceType.CONTAINER;
-import static com.yahoo.config.model.api.container.ContainerServiceType.LOGSERVER_CONTAINER;
-import static com.yahoo.config.model.api.container.ContainerServiceType.METRICS_PROXY_CONTAINER;
-import static com.yahoo.config.model.api.container.ContainerServiceType.QRSERVER;
-import static org.junit.Assert.assertEquals;
-
-/**
- * @author gjoranv
- */
-public class ContainerServiceTypeTest {
-
-    @Test
-    public void new_values_are_not_added_without_updating_tests() {
-        assertEquals(5, ContainerServiceType.values().length);
-    }
-
-    @Test
-    public void service_names_do_not_change() {
-        assertEquals("container", CONTAINER.serviceName);
-        assertEquals("qrserver", QRSERVER.serviceName);
-        assertEquals("container-clustercontroller", CLUSTERCONTROLLER_CONTAINER.serviceName);
-        assertEquals("logserver-container", LOGSERVER_CONTAINER.serviceName);
-        assertEquals("metrics-proxy-container", METRICS_PROXY_CONTAINER.serviceName);
-    }
-
-}