[OOM cert-service-client] Add validation of email, ip and domain name

[oom/platform/cert-service.git] / certServiceClient / src / main / java / org / onap / oom / certservice / client / configuration / validation / csr / UriValidator.java

diff --git a/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/validation/UriValidator.java b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/validation/csr/UriValidator.java
similarity index 97%
rename from certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/validation/UriValidator.java
rename to certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/validation/csr/UriValidator.java
index 7800d73..b8073f4 100644 (file)
--- a/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/validation/UriValidator.java
+++ b/certServiceClient/src/main/java/org/onap/oom/certservice/client/configuration/validation/csr/UriValidator.java
@@ -17,16 +17,12 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
-package org.onap.oom.certservice.client.configuration.validation;
+package org.onap.oom.certservice.client.configuration.validation.csr;
 
 /**
  * Compliant with the RFC3986
  */
-public final class UriValidator {
-
-    private UriValidator() {
-    }
+final class UriValidator {
 
     private static final String SCHEME = "([A-Za-z][A-Za-z0-9+\\-.]*):";
 
@@ -63,7 +59,11 @@ public final class UriValidator {
         SCHEME + "(" + AUTHORITY_WITH_PATH + OR + PATH_BEGIN_WITH_SLASH + OR + PATH_WITHOUT_SLASH + OR + "" + ")"
             + QUERY + FRAGMENT;
 
-    public static boolean isValidUri(String uri) {
+    private UriValidator() {
+    }
+
+    static boolean isValid(String uri) {
         return uri.matches(RFC3986_URI_MATCH_PATTERN);
     }
 }
+