Adds minor improvements to readability
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/39d770ff Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/39d770ff Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/39d770ff Branch: refs/heads/master Commit: 39d770ffc399408d340be5e403c1853ec16f4a62 Parents: 3171e4c Author: Dani Estevez <[email protected]> Authored: Tue May 29 15:40:12 2018 -0400 Committer: Ignasi Barrera <[email protected]> Committed: Tue Jun 26 09:05:43 2018 +0200 ---------------------------------------------------------------------- .../arm/compute/config/AzureNameValidator.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/39d770ff/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzureNameValidator.java ---------------------------------------------------------------------- diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzureNameValidator.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzureNameValidator.java index 4b2615a..1f3bc3e 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzureNameValidator.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/config/AzureNameValidator.java @@ -33,19 +33,20 @@ import com.google.inject.Singleton; */ @Singleton public class AzureNameValidator extends Validator<String> { - private final int min = 2; - private final int max = 63; + private static final int minLength = 2; + private static final int maxLength = 63; public void validate(String name) { - if (name == null || name.length() < min || name.length() > max) - throw exception(name, "Can't be null or empty. Length must be " + min + " to " + max + " symbols."); - if (CharMatcher.JAVA_LETTER_OR_DIGIT.indexIn(name) != 0) + if (name == null || name.length() < minLength || name.length() > maxLength) + throw exception(name, "Can't be null or empty. Length must be " + minLength + " to " + maxLength + " symbols"); + if (!CharMatcher.JAVA_LETTER_OR_DIGIT.matches(name.charAt(0))) throw exception(name, "Should start with letter/number"); CharMatcher range = getAcceptableRange(); if (!range.matchesAllOf(name)) - throw exception(name, "Should have lowercase or uppercase ASCII letters, numbers, or dashes"); + throw exception(name, + "Should have lowercase or uppercase ASCII letters, numbers, dashes, underscores and periods"); } private CharMatcher getAcceptableRange() { @@ -53,8 +54,7 @@ public class AzureNameValidator extends Validator<String> { } protected IllegalArgumentException exception(String name, String reason) { - return new IllegalArgumentException( - String.format("Object '%s' doesn't match Azure naming constraints. " + "Reason: %s.", name, + return new IllegalArgumentException(String.format("Object '%s' doesn't match Azure naming constraints: %s", name, reason)); }
