summaryrefslogtreecommitdiffstats
path: root/config-provisioning
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2023-01-26 08:38:28 +0100
committerjonmv <venstad@gmail.com>2023-01-26 08:38:28 +0100
commitd01b7d1cc323149e65698c41c92a18437470b972 (patch)
tree6a041c4b3a132735261eea08b16d7dc9cfb776c0 /config-provisioning
parentb536ab147d2610dcd3664a2b4742fb4e7a6569fd (diff)
Inline obsolete constructor
Diffstat (limited to 'config-provisioning')
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/ZoneEndpoint.java7
-rw-r--r--config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java4
2 files changed, 3 insertions, 8 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ZoneEndpoint.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ZoneEndpoint.java
index 10e22f8df06..09b71c6a982 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ZoneEndpoint.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ZoneEndpoint.java
@@ -8,9 +8,6 @@ import java.util.Objects;
/**
* Settings for a zone endpoint of a deployment.
*
- * TODO: Fix isEmpty
- * Inline empty and constructor
- *
* @author jonmv
*/
public class ZoneEndpoint {
@@ -21,10 +18,6 @@ public class ZoneEndpoint {
private final boolean isPrivateEndpoint;
private final List<AllowedUrn> allowedUrns;
- public ZoneEndpoint(List<String> allowedUrns) {
- this(true, true, allowedUrns.stream().map(arn -> new AllowedUrn(AccessType.awsPrivateLink, arn)).toList());
- }
-
public ZoneEndpoint(boolean isPublicEndpoint, boolean isPrivateEndpoint, List<AllowedUrn> allowedUrns) {
if ( ! allowedUrns.isEmpty() && ! isPrivateEndpoint)
throw new IllegalArgumentException("cannot list allowed urns, without also enabling private visibility");
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java
index 3404d7ed55e..5e30e8fa99c 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java
@@ -9,6 +9,8 @@ import com.yahoo.config.provision.HostSpec;
import com.yahoo.config.provision.NetworkPorts;
import com.yahoo.config.provision.NodeResources;
import com.yahoo.config.provision.ZoneEndpoint;
+import com.yahoo.config.provision.ZoneEndpoint.AccessType;
+import com.yahoo.config.provision.ZoneEndpoint.AllowedUrn;
import org.junit.jupiter.api.Test;
import java.io.IOException;
@@ -68,7 +70,7 @@ public class AllocatedHostsSerializerTest {
bigSlowDiskSpeedNode,
anyDiskSpeedNode,
ClusterMembership.from("container/test/0/0", Version.fromString("6.73.1"),
- Optional.empty(), new ZoneEndpoint(List.of("burn"))),
+ Optional.empty(), new ZoneEndpoint(true, true, List.of(new AllowedUrn(AccessType.awsPrivateLink, "burn")))),
Optional.empty(),
Optional.empty(),
Optional.empty()));