From 7a4b3a7adce354137ce13482cacc1bbab695b232 Mon Sep 17 00:00:00 2001 From: Dani Estevez Date: Tue, 29 May 2018 15:40:12 -0400 Subject: [PATCH 1/2] Adds minor improvements to readability --- .../arm/compute/config/AzureNameValidator.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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 4b2615afeb5..27c9a8bed0b 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 @@ */ @Singleton public class AzureNameValidator extends Validator { - 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() { @@ -54,7 +55,7 @@ private CharMatcher getAcceptableRange() { protected IllegalArgumentException exception(String name, String reason) { return new IllegalArgumentException( - String.format("Object '%s' doesn't match Azure naming constraints. " + "Reason: %s.", name, + String.format("Object '%s' doesn't match Azure naming constraints. " + "Reason: %s", name, reason)); } From 449b8a42b104989081dc1eab5350004473f128f3 Mon Sep 17 00:00:00 2001 From: Dani Estevez Date: Tue, 29 May 2018 17:05:17 -0400 Subject: [PATCH 2/2] changes exception text for readability --- .../azurecompute/arm/compute/config/AzureNameValidator.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 27c9a8bed0b..1f3bc3e21fa 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 @@ -46,7 +46,7 @@ public void validate(String name) { CharMatcher range = getAcceptableRange(); if (!range.matchesAllOf(name)) throw exception(name, - "Should have lowercase or uppercase ASCII letters, numbers, dashes, underscores and " + "periods"); + "Should have lowercase or uppercase ASCII letters, numbers, dashes, underscores and periods"); } private CharMatcher getAcceptableRange() { @@ -54,8 +54,7 @@ private CharMatcher getAcceptableRange() { } 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)); }