diff options
author | Jon Marius Venstad <jonmv@gmail.com> | 2022-04-07 15:25:03 +0200 |
---|---|---|
committer | Jon Marius Venstad <jonmv@gmail.com> | 2022-04-07 15:31:59 +0200 |
commit | a838eb3ddf97652e86ea93e798818f8184ddf02d (patch) | |
tree | 00530a30e23528acfc5f3a54f1b6db2954404bac /vespajlib | |
parent | bc90d3ef11656610c95f954802b3154784ff5be9 (diff) |
Replicate host name pattern instead of making public
Diffstat (limited to 'vespajlib')
-rw-r--r-- | vespajlib/src/main/java/ai/vespa/http/DomainName.java | 4 | ||||
-rw-r--r-- | vespajlib/src/main/java/com/yahoo/net/HostName.java | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/vespajlib/src/main/java/ai/vespa/http/DomainName.java b/vespajlib/src/main/java/ai/vespa/http/DomainName.java index f68ee8ffbcd..a566f5b95be 100644 --- a/vespajlib/src/main/java/ai/vespa/http/DomainName.java +++ b/vespajlib/src/main/java/ai/vespa/http/DomainName.java @@ -15,8 +15,8 @@ import static ai.vespa.validation.Validation.requireMatch; */ public class DomainName extends PatternedStringWrapper<DomainName> { - public static final Pattern labelPattern = Pattern.compile("([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]{0,61}[A-Za-z0-9])"); - public static final Pattern domainNamePattern = Pattern.compile("(" + labelPattern + "\\.)*" + labelPattern); + static final Pattern labelPattern = Pattern.compile("([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]{0,61}[A-Za-z0-9])"); + static final Pattern domainNamePattern = Pattern.compile("(" + labelPattern + "\\.)*" + labelPattern); public static final DomainName localhost = DomainName.of("localhost"); diff --git a/vespajlib/src/main/java/com/yahoo/net/HostName.java b/vespajlib/src/main/java/com/yahoo/net/HostName.java index 119b648029e..20f1008055e 100644 --- a/vespajlib/src/main/java/com/yahoo/net/HostName.java +++ b/vespajlib/src/main/java/com/yahoo/net/HostName.java @@ -5,11 +5,12 @@ import ai.vespa.http.DomainName; import ai.vespa.validation.PatternedStringWrapper; import java.util.Optional; +import java.util.regex.Pattern; import static ai.vespa.validation.Validation.requireLength; /** - * Hostnames match {@link DomainName#domainNamePattern}, but are restricted to 64 characters in length. + * Hostnames match {@link #hostNamePattern}, and are restricted to 64 characters in length. * * This class also has utilities for getting the hostname of the system running the JVM. * Detection of the hostname is now done before starting any Vespa @@ -21,10 +22,13 @@ import static ai.vespa.validation.Validation.requireLength; */ public class HostName extends PatternedStringWrapper<HostName> { + static final Pattern labelPattern = Pattern.compile("([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9-]{0,61}[A-Za-z0-9])"); + static final Pattern hostNamePattern = Pattern.compile("(" + labelPattern + "\\.)*" + labelPattern); + private static HostName preferredHostName = null; private HostName(String value) { - super(requireLength(value, "hostname length", 1, 64), DomainName.domainNamePattern, "hostname"); + super(requireLength(value, "hostname length", 1, 64), hostNamePattern, "hostname"); } public static HostName of(String value) { |