refactoring: rename method

3 files changed, 33 insertions, 33 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
index 70c43d9b4..717a0c827 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
@@ -55,10 +55,10 @@ public class MOAConfigValidator {
 	
 		String check = form.getSaml1SourceID();
 		if (MiscUtil.isNotEmpty(check)) {
-			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
+			if (ValidationHelper.containsNotValidCharacter(check, false)) {
 				log.warn("SAML1 SourceID contains potentail XSS characters: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.SAML1SourceID", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
+						new Object[] {ValidationHelper.getNotValidCharacter(false)}, request ));
 			}
 		}
 	
@@ -217,10 +217,10 @@ public class MOAConfigValidator {
 			log.info("Empty MOA-SP/SS Authblock TrustProfile");
 			errors.add(LanguageHelper.getErrorString("validation.general.moasp.auth.trustprofile.empty", request));
 		} else {
-			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
+			if (ValidationHelper.containsNotValidCharacter(check, false)) {
 				log.info("Authblock TrustProfile is not valid: " +check);
 				errors.add(LanguageHelper.getErrorString("validation.general.moasp.auth.trustprofile.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
+						new Object[] {ValidationHelper.getNotValidCharacter(false)}, request ));
 			}
 		}
 		
@@ -229,10 +229,10 @@ public class MOAConfigValidator {
 			log.info("Empty MOA-SP/SS IdentityLink TrustProfile");
 			errors.add(LanguageHelper.getErrorString("validation.general.moasp.idl.trustprofile.empty", request));
 		} else {
-			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
+			if (ValidationHelper.containsNotValidCharacter(check, false)) {
 				log.info("IdentityLink TrustProfile is not valid: " +check);
 				errors.add(LanguageHelper.getErrorString("validation.general.moasp.idl.trustprofile.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
+						new Object[] {ValidationHelper.getNotValidCharacter(false)}, request ));
 			}
 		}
 		
@@ -241,10 +241,10 @@ public class MOAConfigValidator {
 			log.info("Empty MOA-SP/SS Test-Authblock TrustProfile");
 			errors.add(LanguageHelper.getErrorString("validation.general.moasp.auth.trustprofile.test.empty", request));
 		} else {
-			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
+			if (ValidationHelper.containsNotValidCharacter(check, false)) {
 				log.info("Test-Authblock TrustProfile is not valid: " +check);
 				errors.add(LanguageHelper.getErrorString("validation.general.moasp.auth.trustprofile.test.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
+						new Object[] {ValidationHelper.getNotValidCharacter(false)}, request ));
 			}
 		}
 		
@@ -253,10 +253,10 @@ public class MOAConfigValidator {
 			log.info("Empty MOA-SP/SS Test-IdentityLink TrustProfile");
 			errors.add(LanguageHelper.getErrorString("validation.general.moasp.idl.trustprofile.test.empty", request));
 		} else {
-			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
+			if (ValidationHelper.containsNotValidCharacter(check, false)) {
 				log.info("Test-IdentityLink TrustProfile is not valid: " +check);
 				errors.add(LanguageHelper.getErrorString("validation.general.moasp.idl.trustprofile.test.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
+						new Object[] {ValidationHelper.getNotValidCharacter(false)}, request ));
 			}
 		}
 		
@@ -271,28 +271,28 @@ public class MOAConfigValidator {
 		
 		check = form.getPvp2IssuerName();
 		if (MiscUtil.isNotEmpty(check)) {
-			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
+			if (ValidationHelper.containsNotValidCharacter(check, false)) {
 				log.info("PVP2 IssuerName is not valid: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.protocol.pvp2.issuername.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
+						new Object[] {ValidationHelper.getNotValidCharacter(false)}, request ));
 			}
 		}
 		
 		check = form.getPvp2OrgDisplayName();
 		if (MiscUtil.isNotEmpty(check)) {
-			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
+			if (ValidationHelper.containsNotValidCharacter(check, false)) {
 				log.info("PVP2 organisation display name is not valid: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.protocol.pvp2.org.displayname.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
+						new Object[] {ValidationHelper.getNotValidCharacter(false)}, request ));
 			}
 		}
 		
 		check = form.getPvp2OrgName();
 		if (MiscUtil.isNotEmpty(check)) {
-			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
+			if (ValidationHelper.containsNotValidCharacter(check, false)) {
 				log.info("PVP2 organisation name is not valid: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.protocol.pvp2.org.name.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
+						new Object[] {ValidationHelper.getNotValidCharacter(false)}, request ));
 			}
 		}
 		
@@ -347,10 +347,10 @@ public class MOAConfigValidator {
 		
 		check = form.getSsoFriendlyName();
 		if (MiscUtil.isNotEmpty(check)) {
-			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
+			if (ValidationHelper.containsNotValidCharacter(check, false)) {
 				log.info("SSO friendlyname is not valid: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.sso.friendlyname.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
+						new Object[] {ValidationHelper.getNotValidCharacter(false)}, request ));
 			}
 		}
 		
@@ -373,10 +373,10 @@ public class MOAConfigValidator {
 		
 		check = form.getSsoSpecialText();
 		if (MiscUtil.isNotEmpty(check)) {
-			if (ValidationHelper.containsPotentialCSSCharacter(check, true)) {
+			if (ValidationHelper.containsNotValidCharacter(check, true)) {
 				log.info("SSO SpecialText is not valid: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.sso.specialauthtext.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(true)} , request));
+						new Object[] {ValidationHelper.getNotValidCharacter(true)} , request));
 			}
 		}
 		
@@ -388,10 +388,10 @@ public class MOAConfigValidator {
 		} else {
 			if (!ValidationHelper.isValidAdminTarget(check)) {
 				
-				if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
+				if (ValidationHelper.containsNotValidCharacter(check, false)) {
 					log.warn("IdentificationNumber contains potentail XSS characters: " + check);
 					errors.add(LanguageHelper.getErrorString("validation.general.sso.target.valid", 
-							new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
+							new Object[] {ValidationHelper.getNotValidCharacter(false)}, request ));
 				}
 				
 				String num = check.replaceAll(" ", "");
@@ -440,7 +440,7 @@ public class MOAConfigValidator {
 				String filename = form.getFileUploadFileName().get(i);
 				
 				if (MiscUtil.isNotEmpty(filename)) {
-					if (ValidationHelper.containsPotentialCSSCharacter(filename, false)) {
+					if (ValidationHelper.containsNotValidCharacter(filename, false)) {
 						log.info("SL Transformation Filename is not valid");
 						errors.add(LanguageHelper.getErrorString("validation.general.slrequest.filename.valid", request));
 						
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/PVP2ContactValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/PVP2ContactValidator.java
index e4a091c7e..f7edbee71 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/PVP2ContactValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/PVP2ContactValidator.java
@@ -52,28 +52,28 @@ public class PVP2ContactValidator {
 		
 		String check = contact.getCompany();
 		if (MiscUtil.isNotEmpty(check)) {
-			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
+			if (ValidationHelper.containsNotValidCharacter(check, false)) {
 				log.info("PVP2 Contact: Company is not valid: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.protocol.pvp2.contact.company.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
+						new Object[] {ValidationHelper.getNotValidCharacter(false)}, request ));
 			}
 		}
 		
 		check = contact.getGivenname();
 		if (MiscUtil.isNotEmpty(check)) {
-			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
+			if (ValidationHelper.containsNotValidCharacter(check, false)) {
 				log.info("PVP2 Contact: GivenName is not valid: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.protocol.pvp2.contact.givenname.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
+						new Object[] {ValidationHelper.getNotValidCharacter(false)}, request ));
 			}
 		}
 		
 		check = contact.getSurname();
 		if (MiscUtil.isNotEmpty(check)) {
-			if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
+			if (ValidationHelper.containsNotValidCharacter(check, false)) {
 				log.info("PVP2 Contact: SureName is not valid: " + check);
 				errors.add(LanguageHelper.getErrorString("validation.general.protocol.pvp2.contact.surename.valid", 
-						new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
+						new Object[] {ValidationHelper.getNotValidCharacter(false)}, request ));
 			}
 		}
 		
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java
index fbd2f3bb3..41fce8e60 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java
@@ -38,10 +38,10 @@ public class StorkConfigValidator {
 				// check country code
 				String check = current.getCountryCode();
 				if (MiscUtil.isNotEmpty(check)) {
-					if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
+					if (ValidationHelper.containsNotValidCharacter(check, false)) {
 						log.warn("CPEPS config countrycode contains potentail XSS characters: " + check);
 						errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.cc",
-								new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
+								new Object[] {ValidationHelper.getNotValidCharacter(false)}, request ));
 					}
 					if(!check.toLowerCase().matches("(^[a-z][a-z]$)|(^[a-z][a-z]-[a-z,0-9]*)")) {
 							log.warn("CPEPS config countrycode does not comply to ISO 3166-2 : " + check);
@@ -95,10 +95,10 @@ public class StorkConfigValidator {
 			for(StorkAttribute check : form.getAttributes()) {
 				if (check != null && MiscUtil.isNotEmpty(check.getName())) {
 					String tmp = check.getName().replace("eidas/attributes/", ""); // since eIDaS attributes come with a "/", we need to exclude them from validation. TODO Or should we require the admin to escape them in the UI?
-					if (ValidationHelper.containsPotentialCSSCharacter(tmp, true)) { 
+					if (ValidationHelper.containsNotValidCharacter(tmp, true)) { 
 						log.warn("default attributes contains potentail XSS characters: " + check);
 						errors.add(LanguageHelper.getErrorString("validation.stork.requestedattributes",
-								new Object[] {ValidationHelper.getPotentialCSSCharacter(true)}, request ));
+								new Object[] {ValidationHelper.getNotValidCharacter(true)}, request ));
 					}
 					if(!tmp.toLowerCase().matches("^[A-Za-z]*$")) {
 							log.warn("default attributes do not match the requested format : " + check);