Improve validation of country code (2)

Issue-ID: AAF-1107

Signed-off-by: pwielebs <piotr.wielebski@nokia.com>
Change-Id: I2de9d1ddb01212d6953699c82556a342ab8c70cd

diff --git a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactory.java b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactory.java
index 092cd3c..b72ef7a 100644 (file)
--- a/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactory.java
+++ b/certServiceClient/src/main/java/org/onap/aaf/certservice/client/configuration/factory/AbstractConfigurationFactory.java
@@ -25,9 +25,7 @@ import org.onap.aaf.certservice.client.configuration.exception.CsrConfigurationE
 import org.onap.aaf.certservice.client.configuration.model.ConfigurationModel;
 
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.Locale;
-import java.util.Set;
 import java.util.regex.Pattern;
 
 public abstract class AbstractConfigurationFactory<T extends ConfigurationModel> {
@@ -53,6 +51,10 @@ public abstract class AbstractConfigurationFactory<T extends ConfigurationModel>
         return Pattern.compile("[~#@*$+%!()?/{}<>\\|_^]").matcher(stringToCheck).find();
     }
 
+    public boolean isCountryValid(String country) {
+        return Arrays.asList(Locale.getISOCountries()).contains(country);
+    }
+
     private boolean isPortNumberPresent(String stringToCheck) {
         return Pattern.compile(":[0-9]{1,5}").matcher(stringToCheck).find();
     }
@@ -64,9 +66,4 @@ public abstract class AbstractConfigurationFactory<T extends ConfigurationModel>
     private boolean isHttpProtocolsPresent(String stringToCheck) {
         return Pattern.compile("[h][t][t][p][:][/][/]|[h][t][t][p][s][:][/][/]").matcher(stringToCheck).find();
     }
-
-    public boolean isCountryValid(String country) {
-        Set<String> countryNames = new HashSet<>(Arrays.asList(Locale.getISOCountries()));
-        return countryNames.contains(country);
-    }
 }