nodeType as String

src/main/java/io/cryostat/core/discovery/AbstractNode.java

@@ -48,15 +48,15 @@ public abstract class AbstractNode implements Comparable<AbstractNode> {
 
     protected final String name;
 
-    protected final NodeType nodeType;
+    protected final String nodeType;
 
     protected final Map<String, String> labels;
 
     protected AbstractNode(AbstractNode other) {
         this(other.name, other.nodeType, other.labels);
     }
 
-    protected AbstractNode(String name, NodeType nodeType, Map<String, String> labels) {
+    protected AbstractNode(String name, String nodeType, Map<String, String> labels) {
         this.name = name;
         this.nodeType = nodeType;
         this.labels = new HashMap<>(labels);
@@ -66,7 +66,7 @@ public String getName() {
         return name;
     }
 
-    public NodeType getNodeType() {
+    public String getNodeType() {
         return nodeType;
     }
 
@@ -76,10 +76,6 @@ public Map<String, String> getLabels() {
 
     @Override
     public int compareTo(AbstractNode other) {
-        int type = nodeType.ordinal() - other.nodeType.ordinal();
-        if (type != 0) {
-            return type;
-        }
         return name.compareTo(other.name);
     }
 

src/main/java/io/cryostat/core/discovery/BaseNodeType.java

@@ -37,7 +37,7 @@
  */
 package io.cryostat.core.discovery;
 
-public enum BaseNodeType implements NodeType {
+public enum BaseNodeType {
     // represents the entire deployment scenario Cryostat finds itself in
     UNIVERSE("Universe"),
     // represents a division of the deployment scenario - the universe may consist of a
@@ -54,7 +54,6 @@ public enum BaseNodeType implements NodeType {
         this.kind = kind;
     }
 
-    @Override
     public String getKind() {
         return kind;
     }

src/main/java/io/cryostat/core/discovery/EnvironmentNode.java

@@ -54,17 +54,17 @@ public EnvironmentNode(EnvironmentNode other) {
         this(other.name, other.nodeType, other.labels, other.children);
     }
 
-    public EnvironmentNode(String name, NodeType nodeType) {
+    public EnvironmentNode(String name, String nodeType) {
         this(name, nodeType, Collections.emptyMap());
     }
 
-    public EnvironmentNode(String name, NodeType nodeType, Map<String, String> labels) {
+    public EnvironmentNode(String name, String nodeType, Map<String, String> labels) {
         this(name, nodeType, labels, Collections.emptySortedSet());
     }
 
     public EnvironmentNode(
             String name,
-            NodeType nodeType,
+            String nodeType,
             Map<String, String> labels,
             Collection<? extends AbstractNode> children) {
         super(name, nodeType, labels);

src/main/java/io/cryostat/core/discovery/ServiceRef.java

@@ -70,7 +70,7 @@ public ServiceRef(ServiceRef sr) {
         this.annotations = new Annotations(sr.annotations);
     }
 
-    public URI getServiceUri() {
+    public URI getConnectUrl() {
         return connectUrl;
     }
 

src/main/java/io/cryostat/core/discovery/TargetNode.java

@@ -51,13 +51,13 @@ public TargetNode(TargetNode other) {
         this(other.nodeType, other.target, other.labels);
     }
 
-    public TargetNode(NodeType nodeType, ServiceRef target) {
-        super(target.getServiceUri().toString(), nodeType, Collections.emptyMap());
+    public TargetNode(String nodeType, ServiceRef target) {
+        super(target.getConnectUrl().toString(), nodeType, Collections.emptyMap());
         this.target = new ServiceRef(target);
     }
 
-    public TargetNode(NodeType nodeType, ServiceRef target, Map<String, String> labels) {
-        super(target.getServiceUri().toString(), nodeType, labels);
+    public TargetNode(String nodeType, ServiceRef target, Map<String, String> labels) {
+        super(target.getConnectUrl().toString(), nodeType, labels);
         this.target = new ServiceRef(target);
     }
 

src/test/java/io/cryostat/core/discovery/ServiceRefTest.java

@@ -57,7 +57,7 @@ class ServiceRefTest {
     @Test
     void testConstruct() {
         ServiceRef sr = new ServiceRef(EXAMPLE_URI, EXAMPLE_ALIAS);
-        MatcherAssert.assertThat(sr.getServiceUri(), Matchers.equalTo(EXAMPLE_URI));
+        MatcherAssert.assertThat(sr.getConnectUrl(), Matchers.equalTo(EXAMPLE_URI));
         MatcherAssert.assertThat(sr.getAlias(), Matchers.equalTo(Optional.of(EXAMPLE_ALIAS)));
     }