1 files changed, 9 insertions, 13 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/user/UserAdminValidator.java b/catalog-be/src/main/java/org/openecomp/sdc/be/user/UserAdminValidator.java
index 589fdd8de4..758ac07b89 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/user/UserAdminValidator.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/user/UserAdminValidator.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.be.user;
 
 import java.util.regex.Matcher;
@@ -25,11 +24,17 @@ import java.util.regex.Pattern;
 
 public class UserAdminValidator {
 
+    private static final String EMAIL_PATTERN = "^[_A-Za-z0-9-\\+]+(\\.[_A-Za-z0-9-]+)*@" + "[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$";
+    private static final String USER_ID_PATTERN = "\\w{1,25}";
+    private static UserAdminValidator userAdminValidator = null;
     private Pattern emailPat;
     private Pattern userIdPat;
     private Matcher matcher;
 
-    private static UserAdminValidator userAdminValidator = null;
+    private UserAdminValidator() {
+        emailPat = Pattern.compile(EMAIL_PATTERN);
+        userIdPat = Pattern.compile(USER_ID_PATTERN);
+    }
 
     public static synchronized UserAdminValidator getInstance() {
         if (userAdminValidator == null) {
@@ -38,15 +43,6 @@ public class UserAdminValidator {
         return userAdminValidator;
     }
 
-    private static final String EMAIL_PATTERN = "^[_A-Za-z0-9-\\+]+(\\.[_A-Za-z0-9-]+)*@" + "[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$";
-
-    private static final String USER_ID_PATTERN = "\\w{1,25}";
-
-    private UserAdminValidator() {
-        emailPat = Pattern.compile(EMAIL_PATTERN);
-        userIdPat = Pattern.compile(USER_ID_PATTERN);
-    }
-
     public boolean validateEmail(final String hex) {
         matcher = emailPat.matcher(hex);
         return matcher.matches();