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 2012/03/15 11:17:24 UTC
svn commit: r1300882 [14/22] - in /incubator/syncope/trunk:
build-tools/src/main/java/org/syncope/buildtools/
client/src/main/java/org/syncope/annotation/
client/src/main/java/org/syncope/client/
client/src/main/java/org/syncope/client/http/ client/src...
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SchemaMappingCheck.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SchemaMappingCheck.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SchemaMappingCheck.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SchemaMappingCheck.java Thu Mar 15 10:17:12 2012
@@ -26,9 +26,7 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-@Target({
- ElementType.TYPE
-})
+@Target( { ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = SchemaMappingValidator.class)
@Documented
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SchemaMappingValidator.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SchemaMappingValidator.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SchemaMappingValidator.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SchemaMappingValidator.java Thu Mar 15 10:17:12 2012
@@ -26,8 +26,8 @@ import org.syncope.core.util.SchemaMappi
import org.syncope.types.EntityViolationType;
import org.syncope.types.IntMappingType;
-public class SchemaMappingValidator extends AbstractValidator
- implements ConstraintValidator<SchemaMappingCheck, SchemaMapping> {
+public class SchemaMappingValidator extends AbstractValidator implements
+ ConstraintValidator<SchemaMappingCheck, SchemaMapping> {
@Override
public void initialize(final SchemaMappingCheck constraintAnnotation) {
@@ -39,32 +39,33 @@ public class SchemaMappingValidator exte
context.disableDefaultConstraintViolation();
if (StringUtils.isBlank(SchemaMappingUtil.getExtAttrName(mapping))) {
- context.buildConstraintViolationWithTemplate("Missing external attribute name").
- addNode(EntityViolationType.InvalidSchemaMapping.toString()).addConstraintViolation();
+ context.buildConstraintViolationWithTemplate("Missing external attribute name").addNode(
+ EntityViolationType.InvalidSchemaMapping.toString()).addConstraintViolation();
return false;
}
if (StringUtils.isBlank(SchemaMappingUtil.getIntAttrName(mapping))) {
- context.buildConstraintViolationWithTemplate("Missing internal attribute name").
- addNode(EntityViolationType.InvalidSchemaMapping.toString()).addConstraintViolation();
+ context.buildConstraintViolationWithTemplate("Missing internal attribute name").addNode(
+ EntityViolationType.InvalidSchemaMapping.toString()).addConstraintViolation();
return false;
}
- if (mapping.isAccountid() && (IntMappingType.UserVirtualSchema == mapping.getIntMappingType()
- || IntMappingType.RoleVirtualSchema == mapping.getIntMappingType()
- || IntMappingType.MembershipVirtualSchema == mapping.getIntMappingType()
- || IntMappingType.Password == mapping.getIntMappingType())) {
- context.buildConstraintViolationWithTemplate("Virtual attribute as accountId is not permitted").
- addNode(EntityViolationType.InvalidSchemaMapping.toString()).addConstraintViolation();
+ if (mapping.isAccountid()
+ && (IntMappingType.UserVirtualSchema == mapping.getIntMappingType()
+ || IntMappingType.RoleVirtualSchema == mapping.getIntMappingType()
+ || IntMappingType.MembershipVirtualSchema == mapping.getIntMappingType() || IntMappingType.Password == mapping
+ .getIntMappingType())) {
+ context.buildConstraintViolationWithTemplate("Virtual attribute as accountId is not permitted").addNode(
+ EntityViolationType.InvalidSchemaMapping.toString()).addConstraintViolation();
return false;
}
if (mapping.isAccountid() && (IntMappingType.Password == mapping.getIntMappingType() || mapping.isPassword())) {
- context.buildConstraintViolationWithTemplate("Password as accountId is not permitted").
- addNode(EntityViolationType.InvalidSchemaMapping.toString()).addConstraintViolation();
+ context.buildConstraintViolationWithTemplate("Password as accountId is not permitted").addNode(
+ EntityViolationType.InvalidSchemaMapping.toString()).addConstraintViolation();
return false;
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SchemaValidator.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SchemaValidator.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SchemaValidator.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SchemaValidator.java Thu Mar 15 10:17:12 2012
@@ -24,16 +24,14 @@ import org.syncope.core.persistence.bean
import org.syncope.types.EntityViolationType;
import org.syncope.types.SchemaType;
-public class SchemaValidator extends AbstractValidator
- implements ConstraintValidator<SchemaCheck, AbstractSchema> {
+public class SchemaValidator extends AbstractValidator implements ConstraintValidator<SchemaCheck, AbstractSchema> {
@Override
public void initialize(final SchemaCheck constraintAnnotation) {
}
@Override
- public boolean isValid(final AbstractSchema object,
- final ConstraintValidatorContext context) {
+ public boolean isValid(final AbstractSchema object, final ConstraintValidatorContext context) {
boolean isValid = false;
EntityViolationType violation = null;
@@ -42,27 +40,23 @@ public class SchemaValidator extends Abs
if (object == null) {
isValid = true;
} else {
- isValid = object.getType() == null
- || !object.getType().equals(SchemaType.Enum)
+ isValid = object.getType() == null || !object.getType().equals(SchemaType.Enum)
|| object.getEnumerationValues() != null;
if (!isValid) {
- violation =
- EntityViolationType.InvalidSchemaTypeSpecification;
+ violation = EntityViolationType.InvalidSchemaTypeSpecification;
- throw new Exception(object
- + " miss enumeration values");
+ throw new Exception(object + " miss enumeration values");
}
isValid = object.isMultivalue()
- ? !object.isUniqueConstraint() : true;
+ ? !object.isUniqueConstraint()
+ : true;
if (!isValid) {
- violation =
- EntityViolationType.MultivalueAndUniqueConstraint;
+ violation = EntityViolationType.MultivalueAndUniqueConstraint;
- throw new Exception(object
- + " cannot be multivalue and have "
+ throw new Exception(object + " cannot be multivalue and have "
+ "unique constraint at the same time");
}
}
@@ -72,10 +66,8 @@ public class SchemaValidator extends Abs
LOG.error("Error saving schema", e);
context.disableDefaultConstraintViolation();
- context.buildConstraintViolationWithTemplate(
- violation.toString()).
- addNode(object.toString()).
- addConstraintViolation();
+ context.buildConstraintViolationWithTemplate(violation.toString()).addNode(object.toString())
+ .addConstraintViolation();
return false;
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SyncTaskCheck.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SyncTaskCheck.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SyncTaskCheck.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SyncTaskCheck.java Thu Mar 15 10:17:12 2012
@@ -26,9 +26,7 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-@Target({
- ElementType.TYPE
-})
+@Target( { ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = SyncTaskValidator.class)
@Documented
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SyncTaskValidator.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SyncTaskValidator.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SyncTaskValidator.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SyncTaskValidator.java Thu Mar 15 10:17:12 2012
@@ -25,8 +25,7 @@ import org.syncope.core.persistence.bean
import org.syncope.core.scheduling.SyncJobActions;
import org.syncope.types.EntityViolationType;
-public class SyncTaskValidator extends AbstractValidator
- implements ConstraintValidator<SyncTaskCheck, SyncTask> {
+public class SyncTaskValidator extends AbstractValidator implements ConstraintValidator<SyncTaskCheck, SyncTask> {
private final SchedTaskValidator schedV;
@@ -41,8 +40,7 @@ public class SyncTaskValidator extends A
}
@Override
- public boolean isValid(final SyncTask object,
- final ConstraintValidatorContext context) {
+ public boolean isValid(final SyncTask object, final ConstraintValidatorContext context) {
boolean isValid;
@@ -57,20 +55,16 @@ public class SyncTaskValidator extends A
LOG.error("Resource is null");
context.disableDefaultConstraintViolation();
- context.buildConstraintViolationWithTemplate(
- EntityViolationType.InvalidSyncTask.toString()).
- addNode(object + ".resource is NULL").
- addConstraintViolation();
+ context.buildConstraintViolationWithTemplate(EntityViolationType.InvalidSyncTask.toString())
+ .addNode(object + ".resource is NULL").addConstraintViolation();
}
if (StringUtils.isNotBlank(object.getJobActionsClassName())) {
Class syncJobActionsClass = null;
boolean isAssignable = false;
try {
- syncJobActionsClass =
- Class.forName(object.getJobActionsClassName());
- isAssignable = SyncJobActions.class.isAssignableFrom(
- syncJobActionsClass);
+ syncJobActionsClass = Class.forName(object.getJobActionsClassName());
+ isAssignable = SyncJobActions.class.isAssignableFrom(syncJobActionsClass);
} catch (Throwable t) {
LOG.error("Invalid SyncJobActions specified", t);
isValid = false;
@@ -80,11 +74,8 @@ public class SyncTaskValidator extends A
isValid = false;
context.disableDefaultConstraintViolation();
- context.buildConstraintViolationWithTemplate(
- EntityViolationType.InvalidSyncTask.toString()).
- addNode(object
- + ".syncJobActionsClassName is not valid").
- addConstraintViolation();
+ context.buildConstraintViolationWithTemplate(EntityViolationType.InvalidSyncTask.toString())
+ .addNode(object + ".syncJobActionsClassName is not valid").addConstraintViolation();
}
}
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SyncopeUserCheck.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SyncopeUserCheck.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SyncopeUserCheck.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SyncopeUserCheck.java Thu Mar 15 10:17:12 2012
@@ -26,9 +26,7 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-@Target({
- ElementType.TYPE
-})
+@Target( { ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = SyncopeUserValidator.class)
@Documented
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SyncopeUserValidator.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SyncopeUserValidator.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SyncopeUserValidator.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/SyncopeUserValidator.java Thu Mar 15 10:17:12 2012
@@ -37,8 +37,8 @@ import org.syncope.types.AccountPolicySp
import org.syncope.types.EntityViolationType;
import org.syncope.types.PasswordPolicySpec;
-public class SyncopeUserValidator extends AbstractValidator
- implements ConstraintValidator<SyncopeUserCheck, SyncopeUser> {
+public class SyncopeUserValidator extends AbstractValidator implements
+ ConstraintValidator<SyncopeUserCheck, SyncopeUser> {
@Autowired
private PolicyDAO policyDAO;
@@ -57,8 +57,7 @@ public class SyncopeUserValidator extend
}
@Override
- public boolean isValid(final SyncopeUser object,
- final ConstraintValidatorContext context) {
+ public boolean isValid(final SyncopeUser object, final ConstraintValidatorContext context) {
context.disableDefaultConstraintViolation();
@@ -84,8 +83,8 @@ public class SyncopeUserValidator extend
} catch (Exception e) {
LOG.debug("Invalid password");
- context.buildConstraintViolationWithTemplate(
- e.getMessage()).addNode(EntityViolationType.InvalidPassword.toString()).addConstraintViolation();
+ context.buildConstraintViolationWithTemplate(e.getMessage()).addNode(
+ EntityViolationType.InvalidPassword.toString()).addConstraintViolation();
return false;
} finally {
@@ -112,8 +111,8 @@ public class SyncopeUserValidator extend
} catch (Exception e) {
LOG.debug("Invalid username");
- context.buildConstraintViolationWithTemplate(
- e.getMessage()).addNode(EntityViolationType.InvalidUsername.toString()).addConstraintViolation();
+ context.buildConstraintViolationWithTemplate(e.getMessage()).addNode(
+ EntityViolationType.InvalidUsername.toString()).addConstraintViolation();
return false;
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/USchemaCheck.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/USchemaCheck.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/USchemaCheck.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/USchemaCheck.java Thu Mar 15 10:17:12 2012
@@ -26,9 +26,7 @@ import java.lang.annotation.Target;
import javax.validation.Constraint;
import javax.validation.Payload;
-@Target({
- ElementType.TYPE
-})
+@Target( { ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = USchemaValidator.class)
@Documented
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/USchemaValidator.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/USchemaValidator.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/USchemaValidator.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/validation/entity/USchemaValidator.java Thu Mar 15 10:17:12 2012
@@ -28,26 +28,18 @@ import org.syncope.core.persistence.bean
import org.syncope.core.persistence.beans.user.UVirSchema;
import org.syncope.types.EntityViolationType;
-public class USchemaValidator extends AbstractValidator
- implements ConstraintValidator<USchemaCheck, Object> {
+public class USchemaValidator extends AbstractValidator implements ConstraintValidator<USchemaCheck, Object> {
@Transient
- private static List<String> PERMITTED_USCHEMA_NAMES =
- Arrays.asList(new String[]{
- "failedLogins",
- "username",
- "password",
- "lastLoginDate",
- "creationDate",
- "changePwdDate"});
+ private static List<String> PERMITTED_USCHEMA_NAMES = Arrays.asList(new String[] { "failedLogins", "username",
+ "password", "lastLoginDate", "creationDate", "changePwdDate" });
@Override
public void initialize(final USchemaCheck constraintAnnotation) {
}
@Override
- public boolean isValid(final Object object,
- final ConstraintValidatorContext context) {
+ public boolean isValid(final Object object, final ConstraintValidatorContext context) {
EntityViolationType violation = null;
@@ -78,10 +70,8 @@ public class USchemaValidator extends Ab
LOG.error("Error saving schema", e);
context.disableDefaultConstraintViolation();
- context.buildConstraintViolationWithTemplate(
- violation.toString()).
- addNode(object.toString()).
- addConstraintViolation();
+ context.buildConstraintViolationWithTemplate(violation.toString()).addNode(object.toString())
+ .addConstraintViolation();
return false;
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/policy/AccountPolicyEnforcer.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/policy/AccountPolicyEnforcer.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/policy/AccountPolicyEnforcer.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/policy/AccountPolicyEnforcer.java Thu Mar 15 10:17:12 2012
@@ -35,8 +35,7 @@ import org.syncope.types.AccountPolicySp
import org.syncope.types.PolicyType;
@Component
-public class AccountPolicyEnforcer
- extends PolicyEnforcer<AccountPolicySpec, SyncopeUser> {
+public class AccountPolicyEnforcer extends PolicyEnforcer<AccountPolicySpec, SyncopeUser> {
@Autowired
private UserWorkflowAdapter wfAdapter;
@@ -54,10 +53,7 @@ public class AccountPolicyEnforcer
private static final Pattern UCPATTERN = Pattern.compile("[A-Z0-9-_@. ]+");
@Override
- public void enforce(
- final AccountPolicySpec policy,
- final PolicyType type,
- final SyncopeUser user)
+ public void enforce(final AccountPolicySpec policy, final PolicyType type, final SyncopeUser user)
throws AccountPolicyException, PolicyEnforceException {
if (user.getUsername() == null) {
@@ -69,14 +65,12 @@ public class AccountPolicyEnforcer
}
// check min length
- if (policy.getMinLength() > 0
- && policy.getMinLength() > user.getUsername().length()) {
+ if (policy.getMinLength() > 0 && policy.getMinLength() > user.getUsername().length()) {
throw new AccountPolicyException("Username too short");
}
// check max length
- if (policy.getMaxLength() > 0
- && policy.getMaxLength() < user.getUsername().length()) {
+ if (policy.getMaxLength() > 0 && policy.getMaxLength() < user.getUsername().length()) {
throw new AccountPolicyException("Username too long");
}
@@ -88,10 +82,8 @@ public class AccountPolicyEnforcer
}
// check syntax
- if ((policy.isAllLowerCase()
- && !LCPATTERN.matcher(user.getUsername()).matches())
- || (policy.isAllUpperCase()
- && !UCPATTERN.matcher(user.getUsername()).matches())
+ if ((policy.isAllLowerCase() && !LCPATTERN.matcher(user.getUsername()).matches())
+ || (policy.isAllUpperCase() && !UCPATTERN.matcher(user.getUsername()).matches())
|| !PATTERN.matcher(user.getUsername()).matches()) {
throw new AccountPolicyException("Invalid username syntax");
}
@@ -111,13 +103,10 @@ public class AccountPolicyEnforcer
}
// check for subsequent failed logins
- if (user.getFailedLogins() != null
- && policy.getPermittedLoginRetries() > 0
- && user.getFailedLogins() > policy.getPermittedLoginRetries()
- && !user.getSuspended()) {
+ if (user.getFailedLogins() != null && policy.getPermittedLoginRetries() > 0
+ && user.getFailedLogins() > policy.getPermittedLoginRetries() && !user.getSuspended()) {
try {
- LOG.debug("User {}:{} is over to max failed logins",
- user.getId(), user.getUsername());
+ LOG.debug("User {}:{} is over to max failed logins", user.getId(), user.getUsername());
// reduce failed logins number to avoid multiple request
user.setFailedLogins(user.getFailedLogins() - 1);
@@ -127,18 +116,15 @@ public class AccountPolicyEnforcer
// propagate suspension if and only if it is required by policy
if (policy.isPropagateSuspension()) {
- final List<PropagationTask> tasks = propagationManager.getUpdateTaskIds(
- new WorkflowResult<Map.Entry<Long, Boolean>>(
- new DefaultMapEntry(updated.getResult(), Boolean.FALSE),
- updated.getPropByRes(),
- updated.getPerformedTasks()));
+ final List<PropagationTask> tasks = propagationManager
+ .getUpdateTaskIds(new WorkflowResult<Map.Entry<Long, Boolean>>(new DefaultMapEntry(updated
+ .getResult(), Boolean.FALSE), updated.getPropByRes(), updated.getPerformedTasks()));
propagationManager.execute(tasks);
}
if (LOG.isDebugEnabled()) {
- final UserTO savedTO =
- userDataBinder.getUserTO(updated.getResult());
+ final UserTO savedTO = userDataBinder.getUserTO(updated.getResult());
LOG.debug("About to return suspended user\n{}", savedTO);
}
} catch (Exception e) {
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/policy/PasswordPolicyEnforcer.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/policy/PasswordPolicyEnforcer.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/policy/PasswordPolicyEnforcer.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/policy/PasswordPolicyEnforcer.java Thu Mar 15 10:17:12 2012
@@ -24,8 +24,7 @@ import org.syncope.types.PasswordPolicyS
import org.syncope.types.PolicyType;
@Component
-public class PasswordPolicyEnforcer
- extends PolicyEnforcer<PasswordPolicySpec, String> {
+public class PasswordPolicyEnforcer extends PolicyEnforcer<PasswordPolicySpec, String> {
private static final Pattern DIGIT = Pattern.compile(".*\\d+.*");
@@ -50,10 +49,7 @@ public class PasswordPolicyEnforcer
private static final Pattern LASTNONALPHANUMERIC = Pattern.compile(".*\\W");
@Override
- public void enforce(
- final PasswordPolicySpec policy,
- final PolicyType type,
- final String password)
+ public void enforce(final PasswordPolicySpec policy, final PolicyType type, final String password)
throws PasswordPolicyException, PolicyEnforceException {
if (password == null) {
@@ -65,13 +61,11 @@ public class PasswordPolicyEnforcer
}
// check length
- if (policy.getMinLength() > 0
- && policy.getMinLength() > password.length()) {
+ if (policy.getMinLength() > 0 && policy.getMinLength() > password.length()) {
throw new PasswordPolicyException("Password too short");
}
- if (policy.getMaxLength() > 0
- && policy.getMaxLength() < password.length()) {
+ if (policy.getMaxLength() > 0 && policy.getMaxLength() < password.length()) {
throw new PasswordPolicyException("Password too long");
}
@@ -83,23 +77,18 @@ public class PasswordPolicyEnforcer
}
// check digits occurrence
- if (policy.isDigitRequired()
- && !checkForDigit(password)) {
+ if (policy.isDigitRequired() && !checkForDigit(password)) {
throw new PasswordPolicyException("Password must contain digit(s)");
}
// check lowercase alphabetic characters occurrence
- if (policy.isLowercaseRequired()
- && !checkForLowercase(password)) {
- throw new PasswordPolicyException(
- "Password must contain lowercase alphabetic character(s)");
+ if (policy.isLowercaseRequired() && !checkForLowercase(password)) {
+ throw new PasswordPolicyException("Password must contain lowercase alphabetic character(s)");
}
// check uppercase alphabetic characters occurrence
- if (policy.isUppercaseRequired()
- && !checkForUppercase(password)) {
- throw new PasswordPolicyException(
- "Password must contain uppercase alphabetic character(s)");
+ if (policy.isUppercaseRequired() && !checkForUppercase(password)) {
+ throw new PasswordPolicyException("Password must contain uppercase alphabetic character(s)");
}
// check prefix
@@ -117,94 +106,67 @@ public class PasswordPolicyEnforcer
}
// check digit first occurrence
- if (policy.isMustStartWithDigit()
- && !checkForFirstDigit(password)) {
- throw new PasswordPolicyException(
- "Password must start with a digit");
+ if (policy.isMustStartWithDigit() && !checkForFirstDigit(password)) {
+ throw new PasswordPolicyException("Password must start with a digit");
}
- if (policy.isMustntStartWithDigit()
- && checkForFirstDigit(password)) {
- throw new PasswordPolicyException(
- "Password mustn't start with a digit");
+ if (policy.isMustntStartWithDigit() && checkForFirstDigit(password)) {
+ throw new PasswordPolicyException("Password mustn't start with a digit");
}
// check digit last occurrence
- if (policy.isMustEndWithDigit()
- && !checkForLastDigit(password)) {
+ if (policy.isMustEndWithDigit() && !checkForLastDigit(password)) {
throw new PasswordPolicyException("Password must end with a digit");
}
- if (policy.isMustntEndWithDigit()
- && checkForLastDigit(password)) {
- throw new PasswordPolicyException(
- "Password mustn't end with a digit");
+ if (policy.isMustntEndWithDigit() && checkForLastDigit(password)) {
+ throw new PasswordPolicyException("Password mustn't end with a digit");
}
// check alphanumeric characters occurence
- if (policy.isAlphanumericRequired()
- && !checkForAlphanumeric(password)) {
- throw new PasswordPolicyException(
- "Password must contain alphanumeric character(s)");
+ if (policy.isAlphanumericRequired() && !checkForAlphanumeric(password)) {
+ throw new PasswordPolicyException("Password must contain alphanumeric character(s)");
}
// check non alphanumeric characters occurence
- if (policy.isNonAlphanumericRequired()
- && !checkForNonAlphanumeric(password)) {
- throw new PasswordPolicyException(
- "Password must contain non-alphanumeric character(s)");
+ if (policy.isNonAlphanumericRequired() && !checkForNonAlphanumeric(password)) {
+ throw new PasswordPolicyException("Password must contain non-alphanumeric character(s)");
}
// check alphanumeric character first occurrence
- if (policy.isMustStartWithAlpha()
- && !checkForFirstAlphanumeric(password)) {
- throw new PasswordPolicyException(
- "Password must start with an alphanumeric character");
+ if (policy.isMustStartWithAlpha() && !checkForFirstAlphanumeric(password)) {
+ throw new PasswordPolicyException("Password must start with an alphanumeric character");
}
- if (policy.isMustntStartWithAlpha()
- && checkForFirstAlphanumeric(password)) {
- throw new PasswordPolicyException(
- "Password mustn't start with an alphanumeric character");
+ if (policy.isMustntStartWithAlpha() && checkForFirstAlphanumeric(password)) {
+ throw new PasswordPolicyException("Password mustn't start with an alphanumeric character");
}
// check alphanumeric character last occurrence
- if (policy.isMustEndWithAlpha()
- && !checkForLastAlphanumeric(password)) {
- throw new PasswordPolicyException(
- "Password must end with an alphanumeric character");
+ if (policy.isMustEndWithAlpha() && !checkForLastAlphanumeric(password)) {
+ throw new PasswordPolicyException("Password must end with an alphanumeric character");
}
- if (policy.isMustntEndWithAlpha()
- && checkForLastAlphanumeric(password)) {
- throw new PasswordPolicyException(
- "Password mustn't end with an alphanumeric character");
+ if (policy.isMustntEndWithAlpha() && checkForLastAlphanumeric(password)) {
+ throw new PasswordPolicyException("Password mustn't end with an alphanumeric character");
}
// check non alphanumeric character first occurrence
- if (policy.isMustStartWithNonAlpha()
- && !checkForFirstNonAlphanumeric(password)) {
- throw new PasswordPolicyException(
- "Password must start with a non-alphanumeric character");
+ if (policy.isMustStartWithNonAlpha() && !checkForFirstNonAlphanumeric(password)) {
+ throw new PasswordPolicyException("Password must start with a non-alphanumeric character");
}
- if (policy.isMustntStartWithNonAlpha()
- && checkForFirstNonAlphanumeric(password)) {
- throw new PasswordPolicyException(
- "Password mustn't start with a non-alphanumeric character");
+ if (policy.isMustntStartWithNonAlpha() && checkForFirstNonAlphanumeric(password)) {
+ throw new PasswordPolicyException("Password mustn't start with a non-alphanumeric character");
}
// check non alphanumeric character last occurrence
- if (policy.isMustEndWithNonAlpha()
- && !checkForLastNonAlphanumeric(password)) {
- throw new PasswordPolicyException(
- "Password must end with a non-alphanumeric character");
+ if (policy.isMustEndWithNonAlpha() && !checkForLastNonAlphanumeric(password)) {
+ throw new PasswordPolicyException("Password must end with a non-alphanumeric character");
}
- if (policy.isMustntEndWithNonAlpha()
- && checkForLastNonAlphanumeric(password)) {
- throw new PasswordPolicyException(
- "Password mustn't end with a non-alphanumeric character");
+ if (policy.isMustntEndWithNonAlpha() && checkForLastNonAlphanumeric(password)) {
+ throw new PasswordPolicyException("Password mustn't end with a non-alphanumeric character");
}
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/policy/PolicyEnforcer.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/policy/PolicyEnforcer.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/policy/PolicyEnforcer.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/policy/PolicyEnforcer.java Thu Mar 15 10:17:12 2012
@@ -29,10 +29,8 @@ public abstract class PolicyEnforcer<T e
/**
* Logger.
*/
- protected static final Logger LOG =
- LoggerFactory.getLogger(PolicyEnforcer.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(PolicyEnforcer.class);
- public abstract void enforce(
- final T policy, final PolicyType type, final E object)
+ public abstract void enforce(final T policy, final PolicyType type, final E object)
throws InvalidObjectException, Exception;
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/policy/PolicyEvaluator.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/policy/PolicyEvaluator.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/policy/PolicyEvaluator.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/policy/PolicyEvaluator.java Thu Mar 15 10:17:12 2012
@@ -37,11 +37,9 @@ public class PolicyEvaluator {
/**
* Logger.
*/
- protected static final Logger LOG = LoggerFactory.getLogger(
- PolicyEvaluator.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(PolicyEvaluator.class);
- public <T extends AbstractPolicySpec> T evaluate(
- final Policy policy, final AbstractAttributable attributable) {
+ public <T extends AbstractPolicySpec> T evaluate(final Policy policy, final AbstractAttributable attributable) {
T result = null;
@@ -53,39 +51,29 @@ public class PolicyEvaluator {
case PASSWORD:
case GLOBAL_PASSWORD:
final PasswordPolicySpec pspec = policy.getSpecification();
- final PasswordPolicySpec passwordPolicy =
- new PasswordPolicySpec();
+ final PasswordPolicySpec passwordPolicy = new PasswordPolicySpec();
- BeanUtils.copyProperties(
- pspec,
- passwordPolicy,
- new String[]{"schemasNotPermitted"});
+ BeanUtils.copyProperties(pspec, passwordPolicy, new String[] { "schemasNotPermitted" });
for (String schema : pspec.getSchemasNotPermitted()) {
attribute = attributable.getAttribute(schema);
if (attribute != null) {
values = attribute.getValuesAsStrings();
if (values != null && !values.isEmpty()) {
- passwordPolicy.getWordsNotPermitted().add(
- values.get(0));
+ passwordPolicy.getWordsNotPermitted().add(values.get(0));
}
}
}
// Password history verification and update
- final String password =
- ((SyncopeUser) attributable).getPassword();
+ final String password = ((SyncopeUser) attributable).getPassword();
- final List<String> passwordHistory =
- ((SyncopeUser) attributable).getPasswordHistory();
+ final List<String> passwordHistory = ((SyncopeUser) attributable).getPasswordHistory();
- if (((SyncopeUser) attributable).verifyPasswordHistory(
- ((SyncopeUser) attributable).getClearPassword(),
- pspec.getHistoryLength())) {
-
- passwordPolicy.getWordsNotPermitted().
- add(((SyncopeUser) attributable).
- getClearPassword());
+ if (((SyncopeUser) attributable).verifyPasswordHistory(((SyncopeUser) attributable)
+ .getClearPassword(), pspec.getHistoryLength())) {
+
+ passwordPolicy.getWordsNotPermitted().add(((SyncopeUser) attributable).getClearPassword());
} else {
if (pspec.getHistoryLength() > 0 && password != null) {
@@ -93,8 +81,7 @@ public class PolicyEvaluator {
}
if (pspec.getHistoryLength() < passwordHistory.size()) {
- for (int i = 0; i < passwordHistory.size()
- - pspec.getHistoryLength(); i++) {
+ for (int i = 0; i < passwordHistory.size() - pspec.getHistoryLength(); i++) {
passwordHistory.remove(i);
}
@@ -106,21 +93,16 @@ public class PolicyEvaluator {
case ACCOUNT:
case GLOBAL_ACCOUNT:
final AccountPolicySpec spec = policy.getSpecification();
- final AccountPolicySpec accountPolicy =
- new AccountPolicySpec();
+ final AccountPolicySpec accountPolicy = new AccountPolicySpec();
- BeanUtils.copyProperties(
- spec,
- accountPolicy,
- new String[]{"schemasNotPermitted"});
+ BeanUtils.copyProperties(spec, accountPolicy, new String[] { "schemasNotPermitted" });
for (String schema : spec.getSchemasNotPermitted()) {
attribute = attributable.getAttribute(schema);
if (attribute != null) {
values = attribute.getValuesAsStrings();
if (values != null && !values.isEmpty()) {
- accountPolicy.getWordsNotPermitted().add(
- values.get(0));
+ accountPolicy.getWordsNotPermitted().add(values.get(0));
}
}
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/propagation/ConnectorFacadeProxy.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/propagation/ConnectorFacadeProxy.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/propagation/ConnectorFacadeProxy.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/propagation/ConnectorFacadeProxy.java Thu Mar 15 10:17:12 2012
@@ -73,8 +73,7 @@ public class ConnectorFacadeProxy {
/**
* Logger.
*/
- private static final Logger LOG = LoggerFactory.getLogger(
- ConnectorFacadeProxy.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ConnectorFacadeProxy.class);
/**
* Connector facade wrapped instance.
@@ -100,26 +99,21 @@ public class ConnectorFacadeProxy {
* @see ConfigurationProperties
* @see ConnectorFacade
*/
- public ConnectorFacadeProxy(
- final ConnInstance connInstance,
- final ConnBundleManager connBundleManager)
+ public ConnectorFacadeProxy(final ConnInstance connInstance, final ConnBundleManager connBundleManager)
throws NotFoundException {
this.activeConnInstance = connInstance;
// specify a connector.
- ConnectorKey key = new ConnectorKey(
- connInstance.getBundleName(),
- connInstance.getVersion(),
- connInstance.getConnectorName());
+ ConnectorKey key = new ConnectorKey(connInstance.getBundleName(), connInstance.getVersion(), connInstance
+ .getConnectorName());
if (key == null) {
throw new NotFoundException("Connector Key");
}
if (LOG.isDebugEnabled()) {
- LOG.debug("\nBundle name: " + key.getBundleName()
- + "\nBundle version: " + key.getBundleVersion()
+ LOG.debug("\nBundle name: " + key.getBundleName() + "\nBundle version: " + key.getBundleVersion()
+ "\nBundle class: " + key.getConnectorName());
}
@@ -151,8 +145,7 @@ public class ConnectorFacadeProxy {
// Print out what the properties are (not necessary)
if (LOG.isDebugEnabled()) {
for (String propName : properties.getPropertyNames()) {
- LOG.debug("\nProperty Name: {}\nProperty Type: {}",
- properties.getProperty(propName).getName(),
+ LOG.debug("\nProperty Name: {}\nProperty Type: {}", properties.getProperty(propName).getName(),
properties.getProperty(propName).getType());
}
}
@@ -187,27 +180,20 @@ public class ConnectorFacadeProxy {
* @param propagationAttempted if creation is actually performed (based on connector instance's capabilities)
* @return Uid for created user
*/
- public Uid create(
- final PropagationMode propagationMode,
- final ObjectClass objectClass,
- final Set<Attribute> attrs,
- final OperationOptions options,
- final Set<String> propagationAttempted) {
+ public Uid create(final PropagationMode propagationMode, final ObjectClass objectClass, final Set<Attribute> attrs,
+ final OperationOptions options, final Set<String> propagationAttempted) {
Uid result = null;
if (propagationMode == PropagationMode.ONE_PHASE
- ? activeConnInstance.getCapabilities().contains(
- ConnectorCapability.ONE_PHASE_CREATE)
- : activeConnInstance.getCapabilities().contains(
- ConnectorCapability.TWO_PHASES_CREATE)) {
+ ? activeConnInstance.getCapabilities().contains(ConnectorCapability.ONE_PHASE_CREATE)
+ : activeConnInstance.getCapabilities().contains(ConnectorCapability.TWO_PHASES_CREATE)) {
propagationAttempted.add("create");
result = connector.create(objectClass, attrs, options);
} else {
- LOG.info("Create was attempted, although the "
- + "connector only has these capabilities: {}. No action.",
+ LOG.info("Create was attempted, although the " + "connector only has these capabilities: {}. No action.",
activeConnInstance.getCapabilities());
}
@@ -225,29 +211,22 @@ public class ConnectorFacadeProxy {
* @param propagationAttempted if update is actually performed (based on connector instance's capabilities)
* @return Uid for created user
*/
- public Uid update(final PropagationMode propagationMode,
- final ObjectClass objectClass,
- final Uid uid,
- final Set<Attribute> attrs,
- final OperationOptions options,
- final Set<String> propagationAttempted) {
+ public Uid update(final PropagationMode propagationMode, final ObjectClass objectClass, final Uid uid,
+ final Set<Attribute> attrs, final OperationOptions options, final Set<String> propagationAttempted) {
Uid result = null;
if (propagationMode == PropagationMode.ONE_PHASE
- ? activeConnInstance.getCapabilities().contains(
- ConnectorCapability.ONE_PHASE_UPDATE)
- : activeConnInstance.getCapabilities().contains(
- ConnectorCapability.TWO_PHASES_UPDATE)) {
+ ? activeConnInstance.getCapabilities().contains(ConnectorCapability.ONE_PHASE_UPDATE)
+ : activeConnInstance.getCapabilities().contains(ConnectorCapability.TWO_PHASES_UPDATE)) {
propagationAttempted.add("update");
- result = connector.update(
- objectClass, uid, attrs, options);
+ result = connector.update(objectClass, uid, attrs, options);
} else {
LOG.info("Update for {} was attempted, although the "
- + "connector only has these capabilities: {}. No action.",
- uid.getUidValue(), activeConnInstance.getCapabilities());
+ + "connector only has these capabilities: {}. No action.", uid.getUidValue(), activeConnInstance
+ .getCapabilities());
}
return result;
@@ -262,25 +241,20 @@ public class ConnectorFacadeProxy {
* @param options ConnId's OperationOptions
* @param propagationAttempted if deletion is actually performed (based on connector instance's capabilities)
*/
- public void delete(final PropagationMode propagationMode,
- final ObjectClass objectClass,
- final Uid uid,
- final OperationOptions options,
- final Set<String> propagationAttempted) {
+ public void delete(final PropagationMode propagationMode, final ObjectClass objectClass, final Uid uid,
+ final OperationOptions options, final Set<String> propagationAttempted) {
if (propagationMode == PropagationMode.ONE_PHASE
- ? activeConnInstance.getCapabilities().contains(
- ConnectorCapability.ONE_PHASE_DELETE)
- : activeConnInstance.getCapabilities().contains(
- ConnectorCapability.TWO_PHASES_DELETE)) {
+ ? activeConnInstance.getCapabilities().contains(ConnectorCapability.ONE_PHASE_DELETE)
+ : activeConnInstance.getCapabilities().contains(ConnectorCapability.TWO_PHASES_DELETE)) {
propagationAttempted.add("delete");
connector.delete(objectClass, uid, options);
} else {
LOG.info("Delete for {} was attempted, although the "
- + "connector only has these capabilities: {}. No action.",
- uid.getUidValue(), activeConnInstance.getCapabilities());
+ + "connector only has these capabilities: {}. No action.", uid.getUidValue(), activeConnInstance
+ .getCapabilities());
}
}
@@ -290,17 +264,12 @@ public class ConnectorFacadeProxy {
* @param token to be passed to the underlying connector
* @param handler to be used to handle deltas.
*/
- public void sync(
- final SyncToken token,
- final SyncResultsHandler handler,
- final OperationOptions options) {
+ public void sync(final SyncToken token, final SyncResultsHandler handler, final OperationOptions options) {
- if (activeConnInstance.getCapabilities().contains(
- ConnectorCapability.SYNC)) {
+ if (activeConnInstance.getCapabilities().contains(ConnectorCapability.SYNC)) {
connector.sync(ObjectClass.ACCOUNT, token, handler, options);
} else {
- LOG.info("Sync was attempted, although the "
- + "connector only has these capabilities: {}. No action.",
+ LOG.info("Sync was attempted, although the " + "connector only has these capabilities: {}. No action.",
activeConnInstance.getCapabilities());
}
}
@@ -313,13 +282,11 @@ public class ConnectorFacadeProxy {
public SyncToken getLatestSyncToken() {
SyncToken result = null;
- if (activeConnInstance.getCapabilities().contains(
- ConnectorCapability.SYNC)) {
+ if (activeConnInstance.getCapabilities().contains(ConnectorCapability.SYNC)) {
result = connector.getLatestSyncToken(ObjectClass.ACCOUNT);
} else {
LOG.info("getLatestSyncToken was attempted, although the "
- + "connector only has these capabilities: {}. No action.",
- activeConnInstance.getCapabilities());
+ + "connector only has these capabilities: {}. No action.", activeConnInstance.getCapabilities());
}
return result;
@@ -333,10 +300,7 @@ public class ConnectorFacadeProxy {
* @param options ConnId's OperationOptions
* @return ConnId's connector object for given uid
*/
- public ConnectorObject getObject(
- final ObjectClass objectClass,
- final Uid uid,
- final OperationOptions options) {
+ public ConnectorObject getObject(final ObjectClass objectClass, final Uid uid, final OperationOptions options) {
return getObject(null, null, objectClass, uid, options);
}
@@ -352,43 +316,30 @@ public class ConnectorFacadeProxy {
* @param options ConnId's OperationOptions
* @return ConnId's connector object for given uid
*/
- public ConnectorObject getObject(
- final PropagationMode propagationMode,
- final PropagationOperation operationType,
- final ObjectClass objectClass,
- final Uid uid,
- final OperationOptions options) {
+ public ConnectorObject getObject(final PropagationMode propagationMode, final PropagationOperation operationType,
+ final ObjectClass objectClass, final Uid uid, final OperationOptions options) {
ConnectorObject result = null;
- if (activeConnInstance.getCapabilities().contains(
- ConnectorCapability.SEARCH)) {
+ if (activeConnInstance.getCapabilities().contains(ConnectorCapability.SEARCH)) {
if (operationType == null) {
result = connector.getObject(objectClass, uid, options);
} else {
switch (operationType) {
case CREATE:
- if (propagationMode == null
- || (propagationMode == PropagationMode.ONE_PHASE
- ? activeConnInstance.getCapabilities().contains(
- ConnectorCapability.ONE_PHASE_CREATE)
- : activeConnInstance.getCapabilities().contains(
- ConnectorCapability.TWO_PHASES_CREATE))) {
+ if (propagationMode == null || (propagationMode == PropagationMode.ONE_PHASE
+ ? activeConnInstance.getCapabilities().contains(ConnectorCapability.ONE_PHASE_CREATE)
+ : activeConnInstance.getCapabilities().contains(ConnectorCapability.TWO_PHASES_CREATE))) {
- result = connector.getObject(
- objectClass, uid, options);
+ result = connector.getObject(objectClass, uid, options);
}
break;
case UPDATE:
- if (propagationMode == null
- || (propagationMode == PropagationMode.ONE_PHASE
- ? activeConnInstance.getCapabilities().contains(
- ConnectorCapability.ONE_PHASE_UPDATE)
- : activeConnInstance.getCapabilities().contains(
- ConnectorCapability.TWO_PHASES_UPDATE))) {
+ if (propagationMode == null || (propagationMode == PropagationMode.ONE_PHASE
+ ? activeConnInstance.getCapabilities().contains(ConnectorCapability.ONE_PHASE_UPDATE)
+ : activeConnInstance.getCapabilities().contains(ConnectorCapability.TWO_PHASES_UPDATE))) {
- result = connector.getObject(
- objectClass, uid, options);
+ result = connector.getObject(objectClass, uid, options);
}
break;
default:
@@ -396,8 +347,7 @@ public class ConnectorFacadeProxy {
}
}
} else {
- LOG.info("Search was attempted, although the "
- + "connector only has these capabilities: {}. No action.",
+ LOG.info("Search was attempted, although the " + "connector only has these capabilities: {}. No action.",
activeConnInstance.getCapabilities());
}
@@ -412,9 +362,7 @@ public class ConnectorFacadeProxy {
* @param handler to be used to handle deltas.
* @param options ConnId's OperationOptions.
*/
- public void getAllObjects(
- final ObjectClass objectClass,
- final SyncResultsHandler handler,
+ public void getAllObjects(final ObjectClass objectClass, final SyncResultsHandler handler,
final OperationOptions options) {
if (activeConnInstance.getCapabilities().contains(ConnectorCapability.SEARCH)) {
@@ -447,17 +395,13 @@ public class ConnectorFacadeProxy {
* @param attributeName attribute to read
* @return attribute (if present)
*/
- public Attribute getObjectAttribute(
- final ObjectClass objectClass,
- final Uid uid,
- final OperationOptions options,
+ public Attribute getObjectAttribute(final ObjectClass objectClass, final Uid uid, final OperationOptions options,
final String attributeName) {
Attribute attribute = null;
try {
- final ConnectorObject object =
- connector.getObject(objectClass, uid, options);
+ final ConnectorObject object = connector.getObject(objectClass, uid, options);
attribute = object.getAttributeByName(attributeName);
} catch (NullPointerException e) {
@@ -476,9 +420,7 @@ public class ConnectorFacadeProxy {
* @param attributeNames attributes to read
* @return attributes (if present)
*/
- public Set<Attribute> getObjectAttributes(
- final ObjectClass objectClass,
- final Uid uid,
+ public Set<Attribute> getObjectAttributes(final ObjectClass objectClass, final Uid uid,
final OperationOptions options) {
final Set<Attribute> attributes = new HashSet<Attribute>();
@@ -511,11 +453,10 @@ public class ConnectorFacadeProxy {
try {
for (ObjectClassInfo info : schema.getObjectClassInfo()) {
for (AttributeInfo attrInfo : info.getAttributeInfo()) {
- if (showall || (!Name.NAME.equals(attrInfo.getName())
- && !OperationalAttributes.PASSWORD_NAME.equals(
- attrInfo.getName())
- && !OperationalAttributes.ENABLE_NAME.equals(
- attrInfo.getName()))) {
+ if (showall
+ || (!Name.NAME.equals(attrInfo.getName())
+ && !OperationalAttributes.PASSWORD_NAME.equals(attrInfo.getName()) && !OperationalAttributes.ENABLE_NAME
+ .equals(attrInfo.getName()))) {
resourceSchemaNames.add(attrInfo.getName());
}
@@ -545,9 +486,8 @@ public class ConnectorFacadeProxy {
@Override
public String toString() {
- return "ConnectorFacadeProxy{"
- + "connector=" + connector
- + "capabitilies=" + activeConnInstance.getCapabilities() + '}';
+ return "ConnectorFacadeProxy{" + "connector=" + connector + "capabitilies="
+ + activeConnInstance.getCapabilities() + '}';
}
/**
@@ -559,16 +499,15 @@ public class ConnectorFacadeProxy {
return activeConnInstance;
}
- public OperationOptions getOperationOptions(
- final ExternalResource resource) {
+ public OperationOptions getOperationOptions(final ExternalResource resource) {
// -------------------------------------
// Ask just for mapped attributes
// -------------------------------------
final OperationOptionsBuilder oob = new OperationOptionsBuilder();
- final Set<String> attributesToGet = new HashSet<String>(
- Arrays.asList(new String[]{Name.NAME, Uid.NAME, OperationalAttributes.ENABLE_NAME}));
+ final Set<String> attributesToGet = new HashSet<String>(Arrays.asList(new String[] { Name.NAME, Uid.NAME,
+ OperationalAttributes.ENABLE_NAME }));
for (SchemaMapping mapping : resource.getMappings()) {
final String extAttrName = SchemaMappingUtil.getExtAttrName(mapping);
@@ -591,8 +530,8 @@ public class ConnectorFacadeProxy {
if (values != null && !values.isEmpty()) {
try {
- final Class propertySchemaClass =
- ClassUtils.forName(property.getSchema().getType(), ClassUtils.getDefaultClassLoader());
+ final Class propertySchemaClass = ClassUtils.forName(property.getSchema().getType(), ClassUtils
+ .getDefaultClassLoader());
if (GuardedString.class.equals(propertySchemaClass)) {
value = new GuardedString((values.get(0).toString()).toCharArray());
@@ -600,7 +539,8 @@ public class ConnectorFacadeProxy {
value = new GuardedByteArray((byte[]) values.get(0));
} else if (Character.class.equals(propertySchemaClass) || Character.TYPE.equals(propertySchemaClass)) {
value = values.get(0) != null && !values.get(0).toString().isEmpty()
- ? values.get(0).toString().charAt(0) : null;
+ ? values.get(0).toString().charAt(0)
+ : null;
} else if (Integer.class.equals(propertySchemaClass) || Integer.TYPE.equals(propertySchemaClass)) {
value = Integer.parseInt(values.get(0).toString());
} else if (Long.class.equals(propertySchemaClass) || Long.TYPE.equals(propertySchemaClass)) {
@@ -616,7 +556,7 @@ public class ConnectorFacadeProxy {
} else if (File.class.equals(propertySchemaClass)) {
value = new File(values.get(0).toString());
} else if (String[].class.equals(propertySchemaClass)) {
- value = values.toArray(new String[]{});
+ value = values.toArray(new String[] {});
} else {
value = values.get(0).toString();
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/propagation/PropagationByResource.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/propagation/PropagationByResource.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/propagation/PropagationByResource.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/propagation/PropagationByResource.java Thu Mar 15 10:17:12 2012
@@ -84,8 +84,7 @@ public class PropagationByResource imple
* @param resourceName target resource
* @return wether the operation was succeful or not
*/
- public final boolean add(final PropagationOperation type,
- final String resourceName) {
+ public final boolean add(final PropagationOperation type, final String resourceName) {
Set<String> set;
switch (type) {
@@ -113,8 +112,7 @@ public class PropagationByResource imple
* @param resourceNames target resources
* @return wether the operation was succeful or not
*/
- public boolean addAll(final PropagationOperation type,
- final Set<String> resourceNames) {
+ public boolean addAll(final PropagationOperation type, final Set<String> resourceNames) {
Set<String> set;
switch (type) {
@@ -142,8 +140,7 @@ public class PropagationByResource imple
* @param resourceName target resource
* @return wether the operation was succeful or not
*/
- public final boolean remove(final PropagationOperation type,
- final String resourceName) {
+ public final boolean remove(final PropagationOperation type, final String resourceName) {
boolean result = false;
@@ -200,8 +197,7 @@ public class PropagationByResource imple
* @param type resource operation type
* @param resourceNames to be set
*/
- public final void set(final PropagationOperation type,
- final Set<String> resourceNames) {
+ public final void set(final PropagationOperation type, final Set<String> resourceNames) {
switch (type) {
@@ -230,12 +226,9 @@ public class PropagationByResource imple
* @param propByRes to be merged
*/
public final void merge(final PropagationByResource propByRes) {
- toBeCreated.addAll(
- propByRes.get(PropagationOperation.CREATE));
- toBeUpdated.addAll(
- propByRes.get(PropagationOperation.UPDATE));
- toBeDeleted.addAll(
- propByRes.get(PropagationOperation.DELETE));
+ toBeCreated.addAll(propByRes.get(PropagationOperation.CREATE));
+ toBeUpdated.addAll(propByRes.get(PropagationOperation.UPDATE));
+ toBeDeleted.addAll(propByRes.get(PropagationOperation.DELETE));
oldAccountIds.putAll(propByRes.getOldAccountIds());
}
@@ -246,10 +239,7 @@ public class PropagationByResource imple
* old account ids are present
*/
public final boolean isEmpty() {
- return toBeCreated.isEmpty()
- && toBeUpdated.isEmpty()
- && toBeDeleted.isEmpty()
- && oldAccountIds.isEmpty();
+ return toBeCreated.isEmpty() && toBeUpdated.isEmpty() && toBeDeleted.isEmpty() && oldAccountIds.isEmpty();
}
/**
@@ -260,7 +250,7 @@ public class PropagationByResource imple
public Map<String, String> getOldAccountIds() {
return oldAccountIds;
}
-
+
/**
* Fetch old account id for given resource name.
*
@@ -277,8 +267,7 @@ public class PropagationByResource imple
* @param resourceName resourceName resource name
* @param oldAccountId old account id
*/
- public void addOldAccountId(final String resourceName,
- final String oldAccountId) {
+ public void addOldAccountId(final String resourceName, final String oldAccountId) {
if (resourceName != null && oldAccountId != null) {
oldAccountIds.put(resourceName, oldAccountId);
@@ -287,9 +276,7 @@ public class PropagationByResource imple
@Override
public String toString() {
- return "To be Created: " + toBeCreated + ";\n"
- + "To be Updated: " + toBeUpdated + ";\n"
- + "To be Deleted: " + toBeDeleted + ";\n"
- + "Old account Ids: " + oldAccountIds;
+ return "To be Created: " + toBeCreated + ";\n" + "To be Updated: " + toBeUpdated + ";\n" + "To be Deleted: "
+ + toBeDeleted + ";\n" + "Old account Ids: " + oldAccountIds;
}
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/propagation/PropagationException.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/propagation/PropagationException.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/propagation/PropagationException.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/propagation/PropagationException.java Thu Mar 15 10:17:12 2012
@@ -35,11 +35,9 @@ public class PropagationException extend
* @param resourceName name of resource involved in this exception
* @param stackTrace original stacktrace
*/
- public PropagationException(final String resourceName,
- final String stackTrace) {
+ public PropagationException(final String resourceName, final String stackTrace) {
- super("Exception during provision on resource " + resourceName
- + "\n" + stackTrace);
+ super("Exception during provision on resource " + resourceName + "\n" + stackTrace);
this.resourceName = resourceName;
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/propagation/PropagationHandler.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/propagation/PropagationHandler.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/propagation/PropagationHandler.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/propagation/PropagationHandler.java Thu Mar 15 10:17:12 2012
@@ -35,9 +35,6 @@ public abstract class PropagationHandler
* @param before retrieved connector object before operation execution.
* @param after retrieved connector object after operation execution.
*/
- public abstract void handle(
- final String resourceName,
- final PropagationTaskExecStatus executionStatus,
- final ConnectorObject before,
- final ConnectorObject after);
+ public abstract void handle(final String resourceName, final PropagationTaskExecStatus executionStatus,
+ final ConnectorObject before, final ConnectorObject after);
}