Remove use of ClusterId in ContainerEndpoint in preparation of move

We are moving the ContainerEndpoint class to a different module that does not
have access to ClusterId.  Replacing it with the use of String instead.

7 files changed, 13 insertions, 15 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
index 7af61a6efc1..6483b583014 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
@@ -269,7 +269,7 @@ public class SessionPreparer {
     }
 
     private static List<ContainerEndpoint> toContainerEndpoints(String globalServceId, Set<Rotation> rotations) {
-        return List.of(new ContainerEndpoint(new ClusterId(globalServceId),
+        return List.of(new ContainerEndpoint(globalServceId,
                                              rotations.stream()
                                                       .map(Rotation::getId)
                                                       .collect(Collectors.toUnmodifiableList())));
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpoint.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpoint.java
index b0fd3a81732..387bfc5293d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpoint.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpoint.java
@@ -1,8 +1,6 @@
 // Copyright 2019 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.tenant;
 
-import com.yahoo.vespa.applicationmodel.ClusterId;
-
 import java.util.List;
 import java.util.Objects;
 
@@ -15,15 +13,15 @@ import java.util.Objects;
  */
 public class ContainerEndpoint {
 
-    private final ClusterId clusterId;
+    private final String clusterId;
     private final List<String> names;
 
-    public ContainerEndpoint(ClusterId clusterId, List<String> names) {
+    public ContainerEndpoint(String clusterId, List<String> names) {
         this.clusterId = Objects.requireNonNull(clusterId);
         this.names = List.copyOf(Objects.requireNonNull(names));
     }
 
-    public ClusterId clusterId() {
+    public String clusterId() {
         return clusterId;
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java
index 379af7f71ea..a8846ad10f8 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializer.java
@@ -42,7 +42,7 @@ public class ContainerEndpointSerializer {
             names.add(containerName);
         });
 
-        return new ContainerEndpoint(new ClusterId(clusterId), names);
+        return new ContainerEndpoint(clusterId, names);
     }
 
     public static List<ContainerEndpoint> endpointListFromSlime(Slime slime) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
index 6eba85af37e..dd46a282682 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/PrepareParamsTest.java
@@ -84,10 +84,10 @@ public class PrepareParamsTest {
 
     @Test
     public void testCorrectParsingWithContainerEndpoints() {
-        var endpoints = List.of(new ContainerEndpoint(new ClusterId("qrs1"),
+        var endpoints = List.of(new ContainerEndpoint("qrs1",
                                                       List.of("c1.example.com",
                                                               "c2.example.com")),
-                                new ContainerEndpoint(new ClusterId("qrs2"),
+                                new ContainerEndpoint("qrs2",
                                                       List.of("c3.example.com",
                                                               "c4.example.com")));
         var param = "[\n" +
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
index 6b2810af66c..751b7da737f 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
@@ -218,7 +218,7 @@ public class SessionPreparerTest {
         var params = new PrepareParams.Builder().applicationId(applicationId).rotations(rotations).build();
         prepare(new File("src/test/resources/deploy/hosted-app"), params);
 
-        var expected = List.of(new ContainerEndpoint(new ClusterId("qrs"),
+        var expected = List.of(new ContainerEndpoint("qrs",
                                                      List.of("app1.tenant1.global.vespa.example.com",
                                                              "rotation-042.vespa.global.routing")));
         assertEquals(expected, readContainerEndpoints(applicationId));
@@ -248,10 +248,10 @@ public class SessionPreparerTest {
                                                 .build();
         prepare(new File("src/test/resources/deploy/hosted-app"), params);
 
-        var expected = List.of(new ContainerEndpoint(new ClusterId("foo"),
+        var expected = List.of(new ContainerEndpoint("foo",
                                                      List.of("foo.app1.tenant1.global.vespa.example.com",
                                                              "rotation-042.vespa.global.routing")),
-                               new ContainerEndpoint(new ClusterId("bar"),
+                               new ContainerEndpoint("bar",
                                                      List.of("bar.app1.tenant1.global.vespa.example.com",
                                                              "rotation-043.vespa.global.routing")));
         assertEquals(expected, readContainerEndpoints(applicationId));
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializerTest.java
index aac0b6d1a16..b762f1d0dd1 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointSerializerTest.java
@@ -30,7 +30,7 @@ public class ContainerEndpointSerializerTest {
 
     @Test
     public void writeReadSingleEndpoint() {
-        final var endpoint = new ContainerEndpoint(new ClusterId("foo"), List.of("a", "b"));
+        final var endpoint = new ContainerEndpoint("foo", List.of("a", "b"));
         final var serialized = new Slime();
         ContainerEndpointSerializer.endpointToSlime(serialized.setObject(), endpoint);
         final var deserialized = ContainerEndpointSerializer.endpointFromSlime(serialized.get());
@@ -40,7 +40,7 @@ public class ContainerEndpointSerializerTest {
 
     @Test
     public void writeReadEndpoints() {
-        final var endpoints = List.of(new ContainerEndpoint(new ClusterId("foo"), List.of("a", "b")));
+        final var endpoints = List.of(new ContainerEndpoint("foo", List.of("a", "b")));
         final var serialized = ContainerEndpointSerializer.endpointListToSlime(endpoints);
         final var deserialized = ContainerEndpointSerializer.endpointListFromSlime(serialized);
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointsCacheTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointsCacheTest.java
index 3598b6e63c3..94985c2fb36 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointsCacheTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/tenant/ContainerEndpointsCacheTest.java
@@ -17,7 +17,7 @@ public class ContainerEndpointsCacheTest {
     public void readWriteFromCache() {
         final var cache = new ContainerEndpointsCache(Path.createRoot(), new MockCurator());
         final var endpoints = List.of(
-                new ContainerEndpoint(new ClusterId("the-cluster-1"), List.of("a", "b", "c"))
+                new ContainerEndpoint("the-cluster-1", List.of("a", "b", "c"))
         );
 
         cache.write(ApplicationId.defaultId(), endpoints);