Replace SystemType with SystemName::isPublic

3 files changed, 15 insertions, 41 deletions

diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json
index 577105138ea..66cc491d471 100644
--- a/config-provisioning/abi-spec.json
+++ b/config-provisioning/abi-spec.json
@@ -781,7 +781,7 @@
       "public static com.yahoo.config.provision.SystemName defaultSystem()",
       "public static com.yahoo.config.provision.SystemName from(java.lang.String)",
       "public java.lang.String value()",
-      "public com.yahoo.config.provision.SystemType getType()",
+      "public boolean isPublic()",
       "public boolean isCd()",
       "public static java.util.Set all()"
     ],
@@ -794,23 +794,6 @@
       "public static final enum com.yahoo.config.provision.SystemName vaas"
     ]
   },
-  "com.yahoo.config.provision.SystemType": {
-    "superClass": "java.lang.Enum",
-    "interfaces": [],
-    "attributes": [
-      "public",
-      "final",
-      "enum"
-    ],
-    "methods": [
-      "public static com.yahoo.config.provision.SystemType[] values()",
-      "public static com.yahoo.config.provision.SystemType valueOf(java.lang.String)"
-    ],
-    "fields": [
-      "public static final enum com.yahoo.config.provision.SystemType MAIN",
-      "public static final enum com.yahoo.config.provision.SystemType PUBLIC"
-    ]
-  },
   "com.yahoo.config.provision.TenantName": {
     "superClass": "java.lang.Object",
     "interfaces": [
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java b/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java
index 32945c094be..088d0bdb3c3 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java
@@ -12,28 +12,28 @@ import java.util.Set;
 public enum SystemName {
 
     /** Continuous deployment system */
-    cd(SystemType.MAIN, true),
+    cd(false, true),
 
     /** Production system */
-    main(SystemType.MAIN, false),
+    main(false, false),
 
     /** System accessible to the public */
-    Public(SystemType.PUBLIC, false),
+    Public(true, false),
 
     /** Continuous deployment system for testing the Public system */
-    PublicCd(SystemType.PUBLIC, true),
+    PublicCd(true, true),
 
     /** Local development system */
-    dev(SystemType.MAIN, false),
+    dev(false, false),
 
     /** VaaS */
-    vaas(SystemType.PUBLIC, true); // TODO: Remove this and use public everywhere
+    vaas(true, true); // TODO: Remove this and use public everywhere
 
-    private final SystemType type;
+    private final boolean isPublic;
     private final boolean isCd;
 
-    SystemName(SystemType type, boolean isCd) {
-        this.type = type;
+    SystemName(boolean isPublic, boolean isCd) {
+        this.isPublic = isPublic;
         this.isCd = isCd;
     }
 
@@ -65,7 +65,11 @@ public enum SystemName {
         }
     }
 
-    public SystemType getType() { return type; }
+    /** Whether the system is similar to Public, e.g. PublicCd. */
+    public boolean isPublic() { return isPublic; }
+
+    /** Whether the system is used for continuous deployment. */
     public boolean isCd() { return isCd; }
+
     public static Set<SystemName> all() { return EnumSet.allOf(SystemName.class); }
 }
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/SystemType.java b/config-provisioning/src/main/java/com/yahoo/config/provision/SystemType.java
deleted file mode 100644
index 0bdbf28281f..00000000000
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/SystemType.java
+++ /dev/null
@@ -1,13 +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.provision;
-
-/**
- * @author hakonhall
- */
-public enum SystemType {
-    /** Denotes a system similar to SystemName.main, such as cd. */
-    MAIN,
-
-    /** Denotes a system similar to SystemName.Public, such as PublicCd. */
-    PUBLIC;
-}