You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/09/20 15:29:11 UTC
svn commit: r1524998 - in
/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/persistence/validation/entity:
AbstractValidator.java EntitlementValidator.java
Author: ilgrosso
Date: Fri Sep 20 13:29:10 2013
New Revision: 1524998
URL: http://svn.apache.org/r1524998
Log:
[SYNCOPE-418] Now working with JDK 6 as well...
Modified:
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AbstractValidator.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/EntitlementValidator.java
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AbstractValidator.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AbstractValidator.java?rev=1524998&r1=1524997&r2=1524998&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AbstractValidator.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/AbstractValidator.java Fri Sep 20 13:29:10 2013
@@ -33,7 +33,7 @@ public abstract class AbstractValidator<
protected static final Logger LOG = LoggerFactory.getLogger(AbstractValidator.class);
protected static final Pattern NAME_PATTERN =
- Pattern.compile("^[\\w \\-@.]+", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CHARACTER_CLASS);
+ Pattern.compile("^[\\w \\-@.]+", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
@Override
public void initialize(final A annotation) {
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/EntitlementValidator.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/EntitlementValidator.java?rev=1524998&r1=1524997&r2=1524998&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/EntitlementValidator.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/persistence/validation/entity/EntitlementValidator.java Fri Sep 20 13:29:10 2013
@@ -18,7 +18,6 @@
*/
package org.apache.syncope.core.persistence.validation.entity;
-import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.validation.ConstraintValidatorContext;
import org.apache.syncope.common.types.EntityViolationType;
@@ -30,26 +29,14 @@ public class EntitlementValidator extend
@Override
public boolean isValid(final Entitlement object, final ConstraintValidatorContext context) {
- boolean isValid;
-
- if (object == null) {
- isValid = true;
- } else {
- if (object.getName() == null) {
- isValid = false;
- } else {
- Matcher matcher = ROLE_ENTITLEMENT_NAME_PATTERN.matcher(object.getName());
- isValid = !matcher.matches();
- }
-
- if (!isValid) {
- LOG.error(object + " cannot have name starting by ROLE_");
-
- context.disableDefaultConstraintViolation();
- context.buildConstraintViolationWithTemplate(getTemplate(
- EntityViolationType.InvalidName, object + " cannot have name starting by ROLE_")).
- addNode("name").addConstraintViolation();
- }
+ boolean isValid = !ROLE_ENTITLEMENT_NAME_PATTERN.matcher(object.getName()).matches();
+ if (!isValid) {
+ LOG.error(object + " cannot have name starting by ROLE_");
+
+ context.disableDefaultConstraintViolation();
+ context.buildConstraintViolationWithTemplate(getTemplate(
+ EntityViolationType.InvalidName, object + " cannot have name starting by ROLE_")).
+ addNode("name").addConstraintViolation();
}
return isValid;