diff options
author | Martin Polden <mpolden@mpolden.no> | 2021-10-28 12:55:36 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2021-11-02 09:01:16 +0100 |
commit | f179c34f92cc73a74965852d14342ca0148ed788 (patch) | |
tree | 21f84f9e3546abcda69c8d6a5ba7cb6ac749f218 /config-model-api/src/main/java/com/yahoo/config/application/api/Endpoint.java | |
parent | 4b6c91ccc1b5f5134cf4c3d6a348d0fb453e97cf (diff) |
Cleanup
Diffstat (limited to 'config-model-api/src/main/java/com/yahoo/config/application/api/Endpoint.java')
-rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/application/api/Endpoint.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/Endpoint.java b/config-model-api/src/main/java/com/yahoo/config/application/api/Endpoint.java index df5b10a5cfa..b3d2aa5e2a1 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/Endpoint.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/Endpoint.java @@ -4,7 +4,6 @@ package com.yahoo.config.application.api; import com.yahoo.config.provision.RegionName; import java.util.Objects; -import java.util.Optional; import java.util.Set; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -20,6 +19,8 @@ import java.util.stream.Collectors; */ public class Endpoint { + public static final String DEFAULT_ID = "default"; + /* * Endpoint IDs must be: * - lowercase @@ -30,13 +31,12 @@ public class Endpoint { */ private static final Pattern endpointPattern = Pattern.compile("^[a-z](?:-?[a-z0-9]+)*$"); private static final int endpointMaxLength = 12; - private static final String defaultEndpointId = "default"; - private final Optional<String> endpointId; + private final String endpointId; private final String containerId; private final Set<RegionName> regions; - public Endpoint(Optional<String> endpointId, String containerId, Set<String> regions) { + public Endpoint(String endpointId, String containerId, Set<String> regions) { this.endpointId = Objects.requireNonNull(endpointId, "endpointId must be non-null"); this.containerId = Objects.requireNonNull(containerId, "containerId must be non-null"); this.regions = Set.copyOf( @@ -50,7 +50,7 @@ public class Endpoint { } public String endpointId() { - return endpointId.orElse(defaultEndpointId); + return endpointId; } public String containerId() { |