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 [11/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/beans/AbstractAttrValue.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractAttrValue.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractAttrValue.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractAttrValue.java Thu Mar 15 10:17:12 2012
@@ -52,21 +52,27 @@ public abstract class AbstractAttrValue
public abstract Long getId();
public Boolean getBooleanValue() {
- return booleanValue == null ? null : isBooleanAsInteger(booleanValue);
+ return booleanValue == null
+ ? null
+ : isBooleanAsInteger(booleanValue);
}
public void setBooleanValue(final Boolean booleanValue) {
this.booleanValue = booleanValue == null
- ? null : getBooleanAsInteger(booleanValue);
+ ? null
+ : getBooleanAsInteger(booleanValue);
}
public Date getDateValue() {
- return dateValue == null ? null : new Date(dateValue.getTime());
+ return dateValue == null
+ ? null
+ : new Date(dateValue.getTime());
}
public void setDateValue(final Date dateValue) {
this.dateValue = dateValue == null
- ? null : new Date(dateValue.getTime());
+ ? null
+ : new Date(dateValue.getTime());
}
public Double getDoubleValue() {
@@ -94,11 +100,15 @@ public abstract class AbstractAttrValue
}
public <T> T getValue() {
- return (T) (booleanValue != null ? getBooleanValue()
- : (dateValue != null ? getDateValue()
- : (doubleValue != null ? getDoubleValue()
- : (longValue != null ? getLongValue()
- : stringValue))));
+ return (T) (booleanValue != null
+ ? getBooleanValue()
+ : (dateValue != null
+ ? getDateValue()
+ : (doubleValue != null
+ ? getDoubleValue()
+ : (longValue != null
+ ? getLongValue()
+ : stringValue))));
}
public String getValueAsString() {
@@ -114,8 +124,7 @@ public abstract class AbstractAttrValue
if (getAttribute().getSchema().getFormatter() == null) {
result = getLongValue().toString();
} else {
- result = getAttribute().getSchema().getFormatter().
- format(getLongValue());
+ result = getAttribute().getSchema().getFormatter().format(getLongValue());
}
break;
@@ -123,8 +132,7 @@ public abstract class AbstractAttrValue
if (getAttribute().getSchema().getFormatter() == null) {
result = getDoubleValue().toString();
} else {
- result = getAttribute().getSchema().getFormatter().
- format(getDoubleValue());
+ result = getAttribute().getSchema().getFormatter().format(getDoubleValue());
}
break;
@@ -132,8 +140,7 @@ public abstract class AbstractAttrValue
if (getAttribute().getSchema().getFormatter() == null) {
result = DATE_FORMAT.get().format(getDateValue());
} else {
- result = getAttribute().getSchema().getFormatter().
- format(getDateValue());
+ result = getAttribute().getSchema().getFormatter().format(getDateValue());
}
break;
@@ -148,12 +155,10 @@ public abstract class AbstractAttrValue
public abstract <T extends AbstractAttr> T getAttribute();
- public abstract <T extends AbstractAttr> void setAttribute(
- T attribute);
+ public abstract <T extends AbstractAttr> void setAttribute(T attribute);
@Override
public String toString() {
- return ReflectionToStringBuilder.toString(this,
- ToStringStyle.MULTI_LINE_STYLE);
+ return ReflectionToStringBuilder.toString(this, ToStringStyle.MULTI_LINE_STYLE);
}
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractAttributable.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractAttributable.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractAttributable.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractAttributable.java Thu Mar 15 10:17:12 2012
@@ -45,9 +45,8 @@ public abstract class AbstractAttributab
T result = null;
T derivedAttribute;
- for (Iterator<? extends AbstractDerAttr> itor =
- getDerivedAttributes().iterator();
- result == null && itor.hasNext();) {
+ for (Iterator<? extends AbstractDerAttr> itor = getDerivedAttributes().iterator(); result == null
+ && itor.hasNext();) {
derivedAttribute = (T) itor.next();
if (derivedAttribute.getDerivedSchema() != null
@@ -64,8 +63,8 @@ public abstract class AbstractAttributab
T result = null;
T virtualAttribute;
- for (Iterator<? extends AbstractVirAttr> itor = getVirtualAttributes().iterator();
- result == null && itor.hasNext();) {
+ for (Iterator<? extends AbstractVirAttr> itor = getVirtualAttributes().iterator(); result == null
+ && itor.hasNext();) {
virtualAttribute = (T) itor.next();
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractBaseBean.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractBaseBean.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractBaseBean.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractBaseBean.java Thu Mar 15 10:17:12 2012
@@ -38,27 +38,23 @@ public abstract class AbstractBaseBean i
/**
* Logger.
*/
- protected static final Logger LOG = LoggerFactory.getLogger(
- AbstractBaseBean.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(AbstractBaseBean.class);
- protected static final ThreadLocal<SimpleDateFormat> DATE_FORMAT =
- new ThreadLocal<SimpleDateFormat>() {
+ protected static final ThreadLocal<SimpleDateFormat> DATE_FORMAT = new ThreadLocal<SimpleDateFormat>() {
- @Override
- protected SimpleDateFormat initialValue() {
- return new SimpleDateFormat(
- SyncopeConstants.DEFAULT_DATE_PATTERN);
- }
- };
+ @Override
+ protected SimpleDateFormat initialValue() {
+ return new SimpleDateFormat(SyncopeConstants.DEFAULT_DATE_PATTERN);
+ }
+ };
- protected static final ThreadLocal<DecimalFormat> DECIMAL_FORMAT =
- new ThreadLocal<DecimalFormat>() {
+ protected static final ThreadLocal<DecimalFormat> DECIMAL_FORMAT = new ThreadLocal<DecimalFormat>() {
- @Override
- protected DecimalFormat initialValue() {
- return new DecimalFormat();
- }
- };
+ @Override
+ protected DecimalFormat initialValue() {
+ return new DecimalFormat();
+ }
+ };
private static final long serialVersionUID = -9017214159540857901L;
@@ -81,7 +77,9 @@ public abstract class AbstractBaseBean i
* @return the integer corresponding to the property param
*/
public final Integer getBooleanAsInteger(final Boolean value) {
- return Boolean.TRUE.equals(value) ? 1 : 0;
+ return Boolean.TRUE.equals(value)
+ ? 1
+ : 0;
}
/**
@@ -90,20 +88,17 @@ public abstract class AbstractBaseBean i
private String[] getExcludeFields() {
Set<String> excludeFields = new HashSet<String>();
- PropertyDescriptor[] propertyDescriptors =
- BeanUtils.getPropertyDescriptors(getClass());
+ PropertyDescriptor[] propertyDescriptors = BeanUtils.getPropertyDescriptors(getClass());
for (int i = 0; i < propertyDescriptors.length; i++) {
- if (propertyDescriptors[i].getPropertyType().isInstance(
- Collections.EMPTY_SET)
- || propertyDescriptors[i].getPropertyType().isInstance(
- Collections.EMPTY_LIST)) {
+ if (propertyDescriptors[i].getPropertyType().isInstance(Collections.EMPTY_SET)
+ || propertyDescriptors[i].getPropertyType().isInstance(Collections.EMPTY_LIST)) {
excludeFields.add(propertyDescriptors[i].getName());
}
}
- return excludeFields.toArray(new String[]{});
+ return excludeFields.toArray(new String[] {});
}
@Override
@@ -123,8 +118,7 @@ public abstract class AbstractBaseBean i
method = BeanUtils.findMethod(getClass(), "getName");
}
- StringBuffer result = new StringBuffer().append(
- getClass().getSimpleName()).append("[");
+ StringBuffer result = new StringBuffer().append(getClass().getSimpleName()).append("[");
if (method != null) {
try {
result.append(method.invoke(this));
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractDerAttr.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractDerAttr.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractDerAttr.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractDerAttr.java Thu Mar 15 10:17:12 2012
@@ -47,41 +47,35 @@ public abstract class AbstractDerAttr ex
* @param attributes the set of attributes against which evaluate this derived attribute
* @return the value of this derived attribute
*/
- public String getValue(
- final Collection<? extends AbstractAttr> attributes) {
+ public String getValue(final Collection<? extends AbstractAttr> attributes) {
final ConfigurableApplicationContext context = ApplicationContextManager.getApplicationContext();
final JexlUtil jexlUtil = context.getBean(JexlUtil.class);
// Prepare context using user attributes
- final JexlContext jexlContext = jexlUtil.addAttrsToContext(
- attributes, null);
+ final JexlContext jexlContext = jexlUtil.addAttrsToContext(attributes, null);
final AbstractAttributable owner = getOwner();
if (owner instanceof SyncopeUser) {
- jexlContext.set("username",
- ((SyncopeUser) owner).getUsername() != null
- ? ((SyncopeUser) owner).getUsername() : "");
- jexlContext.set("creationDate",
- ((SyncopeUser) owner).getCreationDate() != null
- ? ((SyncopeUser) owner).getDateFormatter().
- format(((SyncopeUser) owner).getCreationDate()) : "");
- jexlContext.set("lastLoginDate",
- ((SyncopeUser) owner).getLastLoginDate() != null
- ? ((SyncopeUser) owner).getDateFormatter().
- format(((SyncopeUser) owner).getLastLoginDate()) : "");
- jexlContext.set("failedLogins",
- ((SyncopeUser) owner).getFailedLogins() != null
- ? ((SyncopeUser) owner).getFailedLogins() : "");
- jexlContext.set("changePwdDate",
- ((SyncopeUser) owner).getChangePwdDate() != null
- ? ((SyncopeUser) owner).getDateFormatter().
- format(((SyncopeUser) owner).getChangePwdDate()) : "");
+ jexlContext.set("username", ((SyncopeUser) owner).getUsername() != null
+ ? ((SyncopeUser) owner).getUsername()
+ : "");
+ jexlContext.set("creationDate", ((SyncopeUser) owner).getCreationDate() != null
+ ? ((SyncopeUser) owner).getDateFormatter().format(((SyncopeUser) owner).getCreationDate())
+ : "");
+ jexlContext.set("lastLoginDate", ((SyncopeUser) owner).getLastLoginDate() != null
+ ? ((SyncopeUser) owner).getDateFormatter().format(((SyncopeUser) owner).getLastLoginDate())
+ : "");
+ jexlContext.set("failedLogins", ((SyncopeUser) owner).getFailedLogins() != null
+ ? ((SyncopeUser) owner).getFailedLogins()
+ : "");
+ jexlContext.set("changePwdDate", ((SyncopeUser) owner).getChangePwdDate() != null
+ ? ((SyncopeUser) owner).getDateFormatter().format(((SyncopeUser) owner).getChangePwdDate())
+ : "");
}
// Evaluate expression using the context prepared before
- return jexlUtil.evaluate(
- getDerivedSchema().getExpression(), jexlContext);
+ return jexlUtil.evaluate(getDerivedSchema().getExpression(), jexlContext);
}
public abstract <T extends AbstractAttributable> T getOwner();
@@ -90,6 +84,5 @@ public abstract class AbstractDerAttr ex
public abstract <T extends AbstractDerSchema> T getDerivedSchema();
- public abstract <T extends AbstractDerSchema> void setDerivedSchema(
- T derivedSchema);
+ public abstract <T extends AbstractDerSchema> void setDerivedSchema(T derivedSchema);
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractExec.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractExec.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractExec.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractExec.java Thu Mar 15 10:17:12 2012
@@ -69,21 +69,25 @@ public abstract class AbstractExec exten
public Date getEndDate() {
return endDate == null
- ? null : new Date(endDate.getTime());
+ ? null
+ : new Date(endDate.getTime());
}
public void setEndDate(final Date endDate) {
this.endDate = endDate == null
- ? null : new Date(endDate.getTime());
+ ? null
+ : new Date(endDate.getTime());
}
public Date getStartDate() {
return startDate == null
- ? null : new Date(startDate.getTime());
+ ? null
+ : new Date(startDate.getTime());
}
public void setStartDate(final Date startDate) {
this.startDate = startDate == null
- ? null : new Date(startDate.getTime());
+ ? null
+ : new Date(startDate.getTime());
}
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractSchema.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractSchema.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractSchema.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractSchema.java Thu Mar 15 10:17:12 2012
@@ -147,15 +147,11 @@ public abstract class AbstractSchema ext
if (getValidatorClass() != null && getValidatorClass().length() > 0) {
try {
- Constructor validatorConstructor =
- Class.forName(getValidatorClass()).getConstructor(
- new Class[]{getClass().getSuperclass()});
- validator =
- (AbstractValidator) validatorConstructor.newInstance(
- this);
+ Constructor validatorConstructor = Class.forName(getValidatorClass()).getConstructor(
+ new Class[] { getClass().getSuperclass() });
+ validator = (AbstractValidator) validatorConstructor.newInstance(this);
} catch (Exception e) {
- LOG.error("Could not instantiate validator of type "
- + getValidatorClass()
+ LOG.error("Could not instantiate validator of type " + getValidatorClass()
+ ", reverting to AttributeBasicValidator", e);
}
}
@@ -185,8 +181,7 @@ public abstract class AbstractSchema ext
public String getConversionPattern() {
if (!getType().isConversionPatternNeeded()) {
- LOG.debug("Conversion pattern is not needed: {}'s type is {}",
- this, getType());
+ LOG.debug("Conversion pattern is not needed: {}'s type is {}", this, getType());
}
return conversionPattern;
@@ -194,8 +189,7 @@ public abstract class AbstractSchema ext
public void setConversionPattern(final String conversionPattern) {
if (!getType().isConversionPatternNeeded()) {
- LOG.warn("Conversion pattern will be ignored: "
- + "this attribute type is " + getType());
+ LOG.warn("Conversion pattern will be ignored: " + "this attribute type is " + getType());
}
this.conversionPattern = conversionPattern;
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractVirSchema.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractVirSchema.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractVirSchema.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AbstractVirSchema.java Thu Mar 15 10:17:12 2012
@@ -18,7 +18,6 @@
*/
package org.syncope.core.persistence.beans;
-
import javax.persistence.Id;
import javax.persistence.MappedSuperclass;
import org.syncope.types.SchemaType;
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AccountPolicy.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AccountPolicy.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AccountPolicy.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/AccountPolicy.java Thu Mar 15 10:17:12 2012
@@ -33,6 +33,8 @@ public class AccountPolicy extends Polic
public AccountPolicy(boolean global) {
super();
- this.type = global ? PolicyType.GLOBAL_ACCOUNT : PolicyType.ACCOUNT;
+ this.type = global
+ ? PolicyType.GLOBAL_ACCOUNT
+ : PolicyType.ACCOUNT;
}
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ConnInstance.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ConnInstance.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ConnInstance.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ConnInstance.java Thu Mar 15 10:17:12 2012
@@ -86,7 +86,7 @@ public class ConnInstance extends Abstra
/**
* External resources associated to the connector.
*/
- @OneToMany(cascade = {CascadeType.ALL}, mappedBy = "connector")
+ @OneToMany(cascade = { CascadeType.ALL }, mappedBy = "connector")
private List<ExternalResource> resources;
public ConnInstance() {
@@ -119,9 +119,7 @@ public class ConnInstance extends Abstra
}
public Set<ConnConfProperty> getConfiguration() {
- Set<ConnConfProperty> result =
- XMLSerializer.<HashSet<ConnConfProperty>>deserialize(
- xmlConfiguration);
+ Set<ConnConfProperty> result = XMLSerializer.<HashSet<ConnConfProperty>> deserialize(xmlConfiguration);
if (result == null) {
result = Collections.emptySet();
}
@@ -129,8 +127,7 @@ public class ConnInstance extends Abstra
}
public void setConfiguration(final Set<ConnConfProperty> configuration) {
- xmlConfiguration = XMLSerializer.serialize(
- new HashSet<ConnConfProperty>(configuration));
+ xmlConfiguration = XMLSerializer.serialize(new HashSet<ConnConfProperty>(configuration));
}
public Long getId() {
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ExternalResource.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ExternalResource.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ExternalResource.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ExternalResource.java Thu Mar 15 10:17:12 2012
@@ -74,7 +74,7 @@ public class ExternalResource extends Ab
/**
* The resource type is identified by the associated connector.
*/
- @ManyToOne(fetch = FetchType.EAGER, cascade = {CascadeType.MERGE})
+ @ManyToOne(fetch = FetchType.EAGER, cascade = { CascadeType.MERGE })
@NotNull
private ConnInstance connector;
@@ -83,8 +83,7 @@ public class ExternalResource extends Ab
*
* List type cannot be used. Please, take a look at https://hibernate.onjira.com/browse/HHH-1718
*/
- @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true,
- fetch = FetchType.EAGER, mappedBy = "resource")
+ @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER, mappedBy = "resource")
@Valid
private Set<SchemaMapping> mappings;
@@ -173,8 +172,7 @@ public class ExternalResource extends Ab
}
public void setForceMandatoryConstraint(boolean forceMandatoryConstraint) {
- this.forceMandatoryConstraint =
- getBooleanAsInteger(forceMandatoryConstraint);
+ this.forceMandatoryConstraint = getBooleanAsInteger(forceMandatoryConstraint);
}
public ConnInstance getConnector() {
@@ -318,12 +316,10 @@ public class ExternalResource extends Ab
this.syncPolicy = syncPolicy;
}
- public void setConnectorConfigurationProperties(
- final Set<ConnConfProperty> properties) {
+ public void setConnectorConfigurationProperties(final Set<ConnConfProperty> properties) {
// create new set to make sure it's a serializable set implementation.
- xmlConfiguration = XMLSerializer.serialize(
- new HashSet<ConnConfProperty>(properties));
+ xmlConfiguration = XMLSerializer.serialize(new HashSet<ConnConfProperty>(properties));
}
public Set<ConnConfProperty> getConfiguration() {
@@ -331,7 +327,7 @@ public class ExternalResource extends Ab
Set<ConnConfProperty> deserializedSet;
if (StringUtils.isNotBlank(xmlConfiguration)) {
- deserializedSet = XMLSerializer.<HashSet<ConnConfProperty>>deserialize(xmlConfiguration);
+ deserializedSet = XMLSerializer.<HashSet<ConnConfProperty>> deserialize(xmlConfiguration);
if (deserializedSet != null) {
result = deserializedSet;
}
@@ -347,7 +343,7 @@ public class ExternalResource extends Ab
public SyncToken getSyncToken() {
return serializedSyncToken == null
? null
- : XMLSerializer.<SyncToken>deserialize(serializedSyncToken);
+ : XMLSerializer.<SyncToken> deserialize(serializedSyncToken);
}
public void setSerializedSyncToken(final String serializedSyncToken) {
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Notification.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Notification.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Notification.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Notification.java Thu Mar 15 10:17:12 2012
@@ -91,7 +91,7 @@ public class Notification extends Abstra
}
public NodeCond getAbout() {
- NodeCond result = XMLSerializer.<NodeCond>deserialize(xmlAbout);
+ NodeCond result = XMLSerializer.<NodeCond> deserialize(xmlAbout);
if (result == null) {
result = new NodeCond();
}
@@ -107,7 +107,7 @@ public class Notification extends Abstra
}
public NodeCond getRecipients() {
- NodeCond result = XMLSerializer.<NodeCond>deserialize(xmlRecipients);
+ NodeCond result = XMLSerializer.<NodeCond> deserialize(xmlRecipients);
if (result == null) {
result = new NodeCond();
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/PasswordPolicy.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/PasswordPolicy.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/PasswordPolicy.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/PasswordPolicy.java Thu Mar 15 10:17:12 2012
@@ -34,6 +34,7 @@ public class PasswordPolicy extends Poli
super();
this.type = global
- ? PolicyType.GLOBAL_PASSWORD : PolicyType.PASSWORD;
+ ? PolicyType.GLOBAL_PASSWORD
+ : PolicyType.PASSWORD;
}
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Policy.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Policy.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Policy.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Policy.java Thu Mar 15 10:17:12 2012
@@ -65,11 +65,10 @@ public abstract class Policy extends Abs
}
public <T extends AbstractPolicySpec> T getSpecification() {
- return XMLSerializer.<T>deserialize(specification);
+ return XMLSerializer.<T> deserialize(specification);
}
- public <T extends AbstractPolicySpec> void setSpecification(
- final T policy) {
+ public <T extends AbstractPolicySpec> void setSpecification(final T policy) {
specification = XMLSerializer.serialize(policy);
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/PropagationTask.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/PropagationTask.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/PropagationTask.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/PropagationTask.java Thu Mar 15 10:17:12 2012
@@ -97,7 +97,7 @@ public class PropagationTask extends Tas
}
public Set<Attribute> getAttributes() {
- return XMLSerializer.<Set<Attribute>>deserialize(xmlAttributes);
+ return XMLSerializer.<Set<Attribute>> deserialize(xmlAttributes);
}
public void setAttributes(final Set<Attribute> attributes) {
@@ -116,8 +116,7 @@ public class PropagationTask extends Tas
return propagationOperation;
}
- public void setPropagationOperation(
- PropagationOperation propagationOperation) {
+ public void setPropagationOperation(PropagationOperation propagationOperation) {
this.propagationOperation = propagationOperation;
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Report.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Report.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Report.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Report.java Thu Mar 15 10:17:12 2012
@@ -41,14 +41,12 @@ public class Report extends AbstractBase
@Column(unique = true, nullable = false)
private String name;
- @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true,
- fetch = FetchType.EAGER, mappedBy = "report")
+ @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.EAGER, mappedBy = "report")
private List<ReportletConfInstance> reportletConfs;
private String cronExpression;
- @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true,
- mappedBy = "report")
+ @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, mappedBy = "report")
private List<ReportExec> executions;
public Report() {
@@ -71,8 +69,7 @@ public class Report extends AbstractBase
}
public boolean addExec(ReportExec exec) {
- return exec != null && !executions.contains(exec)
- && executions.add(exec);
+ return exec != null && !executions.contains(exec) && executions.add(exec);
}
public boolean removeExec(ReportExec exec) {
@@ -114,12 +111,13 @@ public class Report extends AbstractBase
}
}
- return found == null ? false : reportletConfs.remove(found);
+ return found == null
+ ? false
+ : reportletConfs.remove(found);
}
public List<ReportletConf> getReportletConfs() {
- List<ReportletConf> result =
- new ArrayList<ReportletConf>(reportletConfs.size());
+ List<ReportletConf> result = new ArrayList<ReportletConf>(reportletConfs.size());
for (ReportletConfInstance instance : reportletConfs) {
result.add(instance.getInstance());
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ReportletConfInstance.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ReportletConfInstance.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ReportletConfInstance.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ReportletConfInstance.java Thu Mar 15 10:17:12 2012
@@ -54,7 +54,7 @@ public class ReportletConfInstance exten
public ReportletConf getInstance() {
return serializedInstance == null
? null
- : XMLSerializer.<ReportletConf>deserialize(serializedInstance);
+ : XMLSerializer.<ReportletConf> deserialize(serializedInstance);
}
public void setInstance(final ReportletConf instance) {
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/SyncPolicy.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/SyncPolicy.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/SyncPolicy.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/SyncPolicy.java Thu Mar 15 10:17:12 2012
@@ -33,6 +33,8 @@ public class SyncPolicy extends Policy {
public SyncPolicy(boolean global) {
super();
- this.type = global ? PolicyType.GLOBAL_SYNC : PolicyType.SYNC;
+ this.type = global
+ ? PolicyType.GLOBAL_SYNC
+ : PolicyType.SYNC;
}
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/SyncTask.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/SyncTask.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/SyncTask.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/SyncTask.java Thu Mar 15 10:17:12 2012
@@ -95,7 +95,7 @@ public class SyncTask extends SchedTask
public UserTO getUserTemplate() {
return userTemplate == null
? new UserTO()
- : XMLSerializer.<UserTO>deserialize(userTemplate);
+ : XMLSerializer.<UserTO> deserialize(userTemplate);
}
public void setUserTemplate(final UserTO userTemplate) {
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Task.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Task.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Task.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Task.java Thu Mar 15 10:17:12 2012
@@ -40,8 +40,7 @@ public class Task extends AbstractBaseBe
@Id
private Long id;
- @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true,
- mappedBy = "task")
+ @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true, mappedBy = "task")
private List<TaskExec> executions;
public Task() {
@@ -55,8 +54,7 @@ public class Task extends AbstractBaseBe
}
public boolean addExec(TaskExec exec) {
- return exec != null && !executions.contains(exec)
- && executions.add(exec);
+ return exec != null && !executions.contains(exec) && executions.add(exec);
}
public boolean removeExec(TaskExec exec) {
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/TaskExec.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/TaskExec.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/TaskExec.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/TaskExec.java Thu Mar 15 10:17:12 2012
@@ -58,12 +58,7 @@ public class TaskExec extends AbstractEx
@Override
public String toString() {
- return getClass().getSimpleName() + "{"
- + "id=" + id + ", "
- + "startDate=" + startDate + ", "
- + "endDate=" + endDate + ", "
- + "task=" + task + ", "
- + "status=" + status + ", "
- + "message=" + message + '}';
+ return getClass().getSimpleName() + "{" + "id=" + id + ", " + "startDate=" + startDate + ", " + "endDate="
+ + endDate + ", " + "task=" + task + ", " + "status=" + status + ", " + "message=" + message + '}';
}
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/UserRequest.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/UserRequest.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/UserRequest.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/UserRequest.java Thu Mar 15 10:17:12 2012
@@ -59,7 +59,7 @@ public class UserRequest extends Abstrac
public UserTO getUserTO() {
return type != UserRequestType.CREATE
? null
- : XMLSerializer.<UserTO>deserialize(payload);
+ : XMLSerializer.<UserTO> deserialize(payload);
}
public void setUserTO(final UserTO userTO) {
@@ -70,7 +70,7 @@ public class UserRequest extends Abstrac
public UserMod getUserMod() {
return type != UserRequestType.UPDATE
? null
- : XMLSerializer.<UserMod>deserialize(payload);
+ : XMLSerializer.<UserMod> deserialize(payload);
}
public void setUserMod(final UserMod userMod) {
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/membership/MAttr.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/membership/MAttr.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/membership/MAttr.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/membership/MAttr.java Thu Mar 15 10:17:12 2012
@@ -49,8 +49,7 @@ public class MAttr extends AbstractAttr
@JoinColumn(name = "schema_name")
private MSchema schema;
- @OneToMany(cascade = CascadeType.MERGE, orphanRemoval = true,
- mappedBy = "attribute")
+ @OneToMany(cascade = CascadeType.MERGE, orphanRemoval = true, mappedBy = "attribute")
@Valid
private List<MAttrValue> values;
@@ -89,19 +88,16 @@ public class MAttr extends AbstractAttr
}
@Override
- public <T extends AbstractAttrValue> boolean addValue(
- final T attributeValue) {
+ public <T extends AbstractAttrValue> boolean addValue(final T attributeValue) {
attributeValue.setAttribute(this);
return values.add((MAttrValue) attributeValue);
}
@Override
- public <T extends AbstractAttrValue> boolean removeValue(
- final T attributeValue) {
+ public <T extends AbstractAttrValue> boolean removeValue(final T attributeValue) {
- boolean result = values.remove(
- (MAttrValue) attributeValue);
+ boolean result = values.remove((MAttrValue) attributeValue);
attributeValue.setAttribute(null);
return result;
}
@@ -112,16 +108,14 @@ public class MAttr extends AbstractAttr
}
@Override
- public <T extends AbstractAttrValue> void setValues(
- final List<T> attributeValues) {
+ public <T extends AbstractAttrValue> void setValues(final List<T> attributeValues) {
this.values.clear();
if (attributeValues != null && !attributeValues.isEmpty()) {
for (T mav : attributeValues) {
mav.setAttribute(this);
}
- this.values.addAll(
- (List<MAttrValue>) attributeValues);
+ this.values.addAll((List<MAttrValue>) attributeValues);
}
}
@@ -131,8 +125,7 @@ public class MAttr extends AbstractAttr
}
@Override
- public <T extends AbstractAttrValue> void setUniqueValue(
- final T uniqueAttributeValue) {
+ public <T extends AbstractAttrValue> void setUniqueValue(final T uniqueAttributeValue) {
this.uniqueValue = (MAttrUniqueValue) uniqueAttributeValue;
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/membership/MDerAttr.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/membership/MDerAttr.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/membership/MDerAttr.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/membership/MDerAttr.java Thu Mar 15 10:17:12 2012
@@ -52,8 +52,7 @@ public class MDerAttr extends AbstractDe
}
@Override
- public <T extends AbstractDerSchema> void setDerivedSchema(
- T derivedSchema) {
+ public <T extends AbstractDerSchema> void setDerivedSchema(T derivedSchema) {
this.derivedSchema = (MDerSchema) derivedSchema;
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/membership/MVirAttr.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/membership/MVirAttr.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/membership/MVirAttr.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/membership/MVirAttr.java Thu Mar 15 10:17:12 2012
@@ -54,8 +54,7 @@ public class MVirAttr extends AbstractVi
}
@Override
- public <T extends AbstractVirSchema> void setVirtualSchema(
- T virtualSchema) {
+ public <T extends AbstractVirSchema> void setVirtualSchema(T virtualSchema) {
this.virtualSchema = (MVirSchema) virtualSchema;
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/membership/Membership.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/membership/Membership.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/membership/Membership.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/membership/Membership.java Thu Mar 15 10:17:12 2012
@@ -39,11 +39,7 @@ import org.syncope.core.persistence.bean
import org.syncope.core.persistence.beans.user.SyncopeUser;
@Entity
-@Table(uniqueConstraints =
-@UniqueConstraint(columnNames = {
- "syncopeUser_id",
- "syncopeRole_id"
-}))
+@Table(uniqueConstraints = @UniqueConstraint(columnNames = { "syncopeUser_id", "syncopeRole_id" }))
public class Membership extends AbstractAttributable {
private static final long serialVersionUID = 5030106264797289469L;
@@ -124,19 +120,15 @@ public class Membership extends Abstract
}
@Override
- public <T extends AbstractDerAttr> boolean addDerivedAttribute(
- T derivedAttribute) {
+ public <T extends AbstractDerAttr> boolean addDerivedAttribute(T derivedAttribute) {
- return derivedAttributes.add(
- (MDerAttr) derivedAttribute);
+ return derivedAttributes.add((MDerAttr) derivedAttribute);
}
@Override
- public <T extends AbstractDerAttr> boolean removeDerivedAttribute(
- T derivedAttribute) {
+ public <T extends AbstractDerAttr> boolean removeDerivedAttribute(T derivedAttribute) {
- return derivedAttributes.remove(
- (MDerAttr) derivedAttribute);
+ return derivedAttributes.remove((MDerAttr) derivedAttribute);
}
@Override
@@ -145,23 +137,19 @@ public class Membership extends Abstract
}
@Override
- public void setDerivedAttributes(
- List<? extends AbstractDerAttr> derivedAttributes) {
+ public void setDerivedAttributes(List<? extends AbstractDerAttr> derivedAttributes) {
- this.derivedAttributes =
- (List<MDerAttr>) derivedAttributes;
+ this.derivedAttributes = (List<MDerAttr>) derivedAttributes;
}
@Override
- public <T extends AbstractVirAttr> boolean addVirtualAttribute(
- T virtualAttribute) {
+ public <T extends AbstractVirAttr> boolean addVirtualAttribute(T virtualAttribute) {
return virtualAttributes.add((MVirAttr) virtualAttribute);
}
@Override
- public <T extends AbstractVirAttr> boolean removeVirtualAttribute(
- T virtualAttribute) {
+ public <T extends AbstractVirAttr> boolean removeVirtualAttribute(T virtualAttribute) {
return virtualAttributes.remove((MVirAttr) virtualAttribute);
}
@@ -172,8 +160,7 @@ public class Membership extends Abstract
}
@Override
- public void setVirtualAttributes(
- List<? extends AbstractVirAttr> virtualAttributes) {
+ public void setVirtualAttributes(List<? extends AbstractVirAttr> virtualAttributes) {
this.virtualAttributes = (List<MVirAttr>) virtualAttributes;
}
@@ -204,8 +191,6 @@ public class Membership extends Abstract
@Override
public String toString() {
- return "Membership[" + "id=" + id
- + ", " + syncopeUser
- + ", " + syncopeRole + ']';
+ return "Membership[" + "id=" + id + ", " + syncopeUser + ", " + syncopeRole + ']';
}
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/package-info.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/package-info.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/package-info.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/package-info.java Thu Mar 15 10:17:12 2012
@@ -17,3 +17,4 @@
* under the License.
*/
package org.syncope.core.persistence.beans;
+
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/role/RAttr.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/role/RAttr.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/role/RAttr.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/role/RAttr.java Thu Mar 15 10:17:12 2012
@@ -49,8 +49,7 @@ public class RAttr extends AbstractAttr
@JoinColumn(name = "schema_name")
private RSchema schema;
- @OneToMany(cascade = CascadeType.MERGE, orphanRemoval = true,
- mappedBy = "attribute")
+ @OneToMany(cascade = CascadeType.MERGE, orphanRemoval = true, mappedBy = "attribute")
@Valid
private List<RAttrValue> values;
@@ -89,15 +88,13 @@ public class RAttr extends AbstractAttr
}
@Override
- public <T extends AbstractAttrValue> boolean addValue(
- final T attributeValue) {
+ public <T extends AbstractAttrValue> boolean addValue(final T attributeValue) {
return values.add((RAttrValue) attributeValue);
}
@Override
- public <T extends AbstractAttrValue> boolean removeValue(
- final T attributeValue) {
+ public <T extends AbstractAttrValue> boolean removeValue(final T attributeValue) {
return values.remove((RAttrValue) attributeValue);
}
@@ -108,8 +105,7 @@ public class RAttr extends AbstractAttr
}
@Override
- public <T extends AbstractAttrValue> void setValues(
- final List<T> attributeValues) {
+ public <T extends AbstractAttrValue> void setValues(final List<T> attributeValues) {
this.values.clear();
if (attributeValues != null && !attributeValues.isEmpty()) {
@@ -126,8 +122,7 @@ public class RAttr extends AbstractAttr
}
@Override
- public <T extends AbstractAttrValue> void setUniqueValue(
- final T uniqueAttributeValue) {
+ public <T extends AbstractAttrValue> void setUniqueValue(final T uniqueAttributeValue) {
this.uniqueValue = (RAttrUniqueValue) uniqueAttributeValue;
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/role/RDerAttr.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/role/RDerAttr.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/role/RDerAttr.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/role/RDerAttr.java Thu Mar 15 10:17:12 2012
@@ -52,8 +52,7 @@ public class RDerAttr extends AbstractDe
}
@Override
- public <T extends AbstractDerSchema> void setDerivedSchema(
- T derivedSchema) {
+ public <T extends AbstractDerSchema> void setDerivedSchema(T derivedSchema) {
this.derivedSchema = (RDerSchema) derivedSchema;
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/role/RVirAttr.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/role/RVirAttr.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/role/RVirAttr.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/role/RVirAttr.java Thu Mar 15 10:17:12 2012
@@ -54,8 +54,7 @@ public class RVirAttr extends AbstractVi
}
@Override
- public <T extends AbstractVirSchema> void setVirtualSchema(
- T virtualSchema) {
+ public <T extends AbstractVirSchema> void setVirtualSchema(T virtualSchema) {
this.virtualSchema = (RVirSchema) virtualSchema;
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/role/SyncopeRole.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/role/SyncopeRole.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/role/SyncopeRole.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/role/SyncopeRole.java Thu Mar 15 10:17:12 2012
@@ -55,11 +55,7 @@ import org.syncope.core.persistence.bean
import org.syncope.core.persistence.beans.PasswordPolicy;
@Entity
-@Table(uniqueConstraints =
-@UniqueConstraint(columnNames = {
- "name",
- "parent_id"
-}))
+@Table(uniqueConstraints = @UniqueConstraint(columnNames = { "name", "parent_id" }))
@Cacheable
public class SyncopeRole extends AbstractAttributable {
@@ -75,10 +71,7 @@ public class SyncopeRole extends Abstrac
private SyncopeRole parent;
@ManyToMany(fetch = FetchType.EAGER)
- @JoinTable(joinColumns =
- @JoinColumn(name = "role_id"),
- inverseJoinColumns =
- @JoinColumn(name = "entitlement_name"))
+ @JoinTable(joinColumns = @JoinColumn(name = "role_id"), inverseJoinColumns = @JoinColumn(name = "entitlement_name"))
private Set<Entitlement> entitlements;
@OneToMany(cascade = CascadeType.ALL, mappedBy = "owner")
@@ -128,10 +121,7 @@ public class SyncopeRole extends Abstrac
* Provisioning external resources.
*/
@ManyToMany(fetch = FetchType.EAGER)
- @JoinTable(joinColumns =
- @JoinColumn(name = "role_id"),
- inverseJoinColumns =
- @JoinColumn(name = "resource_name"))
+ @JoinTable(joinColumns = @JoinColumn(name = "role_id"), inverseJoinColumns = @JoinColumn(name = "resource_name"))
@Valid
private Set<ExternalResource> resources;
@@ -216,18 +206,15 @@ public class SyncopeRole extends Abstrac
}
@Override
- public <T extends AbstractDerAttr> boolean addDerivedAttribute(
- T derivedAttribute) {
+ public <T extends AbstractDerAttr> boolean addDerivedAttribute(T derivedAttribute) {
return derivedAttributes.add((RDerAttr) derivedAttribute);
}
@Override
- public <T extends AbstractDerAttr> boolean removeDerivedAttribute(
- T derivedAttribute) {
+ public <T extends AbstractDerAttr> boolean removeDerivedAttribute(T derivedAttribute) {
- return derivedAttributes.remove(
- (RDerAttr) derivedAttribute);
+ return derivedAttributes.remove((RDerAttr) derivedAttribute);
}
@Override
@@ -236,22 +223,19 @@ public class SyncopeRole extends Abstrac
}
@Override
- public void setDerivedAttributes(
- List<? extends AbstractDerAttr> derivedAttributes) {
+ public void setDerivedAttributes(List<? extends AbstractDerAttr> derivedAttributes) {
this.derivedAttributes = (List<RDerAttr>) derivedAttributes;
}
@Override
- public <T extends AbstractVirAttr> boolean addVirtualAttribute(
- T virtualAttribute) {
+ public <T extends AbstractVirAttr> boolean addVirtualAttribute(T virtualAttribute) {
return virtualAttributes.add((RVirAttr) virtualAttribute);
}
@Override
- public <T extends AbstractVirAttr> boolean removeVirtualAttribute(
- T virtualAttribute) {
+ public <T extends AbstractVirAttr> boolean removeVirtualAttribute(T virtualAttribute) {
return virtualAttributes.remove((RVirAttr) virtualAttribute);
}
@@ -262,8 +246,7 @@ public class SyncopeRole extends Abstrac
}
@Override
- public void setVirtualAttributes(
- List<? extends AbstractVirAttr> virtualAttributes) {
+ public void setVirtualAttributes(List<? extends AbstractVirAttr> virtualAttributes) {
this.virtualAttributes = (List<RVirAttr>) virtualAttributes;
}
@@ -296,8 +279,7 @@ public class SyncopeRole extends Abstrac
// Add attributes not specialized and not already added
for (RAttr attr : getParent().findInheritedAttributes()) {
- if (!attrMap.containsKey(attr.getSchema())
- && !result.containsKey((RSchema) attr.getSchema())) {
+ if (!attrMap.containsKey(attr.getSchema()) && !result.containsKey((RSchema) attr.getSchema())) {
result.put((RSchema) attr.getSchema(), attr);
}
}
@@ -311,8 +293,7 @@ public class SyncopeRole extends Abstrac
}
public void setInheritDerivedAttributes(boolean inheritDerivedAttributes) {
- this.inheritDerivedAttributes =
- getBooleanAsInteger(inheritDerivedAttributes);
+ this.inheritDerivedAttributes = getBooleanAsInteger(inheritDerivedAttributes);
}
@@ -322,16 +303,13 @@ public class SyncopeRole extends Abstrac
* @return a list of inherited and only inherited attributes.
*/
public List<RDerAttr> findInheritedDerivedAttributes() {
- final Map<RDerSchema, RDerAttr> result =
- new HashMap<RDerSchema, RDerAttr>();
+ final Map<RDerSchema, RDerAttr> result = new HashMap<RDerSchema, RDerAttr>();
if (isInheritDerivedAttributes() && getParent() != null) {
- final Map<AbstractDerSchema, AbstractDerAttr> attrMap =
- getDerAttrMap();
+ final Map<AbstractDerSchema, AbstractDerAttr> attrMap = getDerAttrMap();
// Add attributes not specialized
- for (RDerAttr attr :
- (Collection<RDerAttr>) getParent().getDerivedAttributes()) {
+ for (RDerAttr attr : (Collection<RDerAttr>) getParent().getDerivedAttributes()) {
if (!attrMap.containsKey(attr.getDerivedSchema())) {
result.put((RDerSchema) attr.getDerivedSchema(), attr);
}
@@ -340,8 +318,7 @@ public class SyncopeRole extends Abstrac
// Add attributes not specialized and not already added
for (RDerAttr attr : getParent().findInheritedDerivedAttributes()) {
if (!attrMap.containsKey(attr.getDerivedSchema())
- && !result.containsKey(
- (RDerSchema) attr.getDerivedSchema())) {
+ && !result.containsKey((RDerSchema) attr.getDerivedSchema())) {
result.put((RDerSchema) attr.getDerivedSchema(), attr);
}
}
@@ -355,8 +332,7 @@ public class SyncopeRole extends Abstrac
}
public void setInheritVirtualAttributes(boolean inheritVirtualAttributes) {
- this.inheritVirtualAttributes =
- getBooleanAsInteger(inheritVirtualAttributes);
+ this.inheritVirtualAttributes = getBooleanAsInteger(inheritVirtualAttributes);
}
@@ -366,16 +342,13 @@ public class SyncopeRole extends Abstrac
* @return a list of inherited and only inherited attributes.
*/
public List<RVirAttr> findInheritedVirtualAttributes() {
- final Map<RVirSchema, RVirAttr> result =
- new HashMap<RVirSchema, RVirAttr>();
+ final Map<RVirSchema, RVirAttr> result = new HashMap<RVirSchema, RVirAttr>();
if (isInheritVirtualAttributes() && getParent() != null) {
- final Map<AbstractVirSchema, AbstractVirAttr> attrMap =
- getVirAttrMap();
+ final Map<AbstractVirSchema, AbstractVirAttr> attrMap = getVirAttrMap();
// Add attributes not specialized
- for (RVirAttr attr :
- (Collection<RVirAttr>) getParent().getVirtualAttributes()) {
+ for (RVirAttr attr : (Collection<RVirAttr>) getParent().getVirtualAttributes()) {
if (!attrMap.containsKey(attr.getVirtualSchema())) {
result.put((RVirSchema) attr.getVirtualSchema(), attr);
}
@@ -384,8 +357,7 @@ public class SyncopeRole extends Abstrac
// Add attributes not specialized and not already added
for (RVirAttr attr : getParent().findInheritedVirtualAttributes()) {
if (!attrMap.containsKey(attr.getVirtualSchema())
- && !result.containsKey(
- (RVirSchema) attr.getVirtualSchema())) {
+ && !result.containsKey((RVirSchema) attr.getVirtualSchema())) {
result.put((RVirSchema) attr.getVirtualSchema(), attr);
}
}
@@ -402,7 +374,8 @@ public class SyncopeRole extends Abstrac
*/
public PasswordPolicy getPasswordPolicy() {
return isInheritPasswordPolicy() && getParent() != null
- ? getParent().getPasswordPolicy() : passwordPolicy;
+ ? getParent().getPasswordPolicy()
+ : passwordPolicy;
}
public void setPasswordPolicy(PasswordPolicy passwordPolicy) {
@@ -425,7 +398,8 @@ public class SyncopeRole extends Abstrac
*/
public AccountPolicy getAccountPolicy() {
return isInheritAccountPolicy() && getParent() != null
- ? getParent().getAccountPolicy() : accountPolicy;
+ ? getParent().getAccountPolicy()
+ : accountPolicy;
}
public void setAccountPolicy(AccountPolicy accountPolicy) {
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/user/SyncopeUser.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/user/SyncopeUser.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/user/SyncopeUser.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/user/SyncopeUser.java Thu Mar 15 10:17:12 2012
@@ -80,8 +80,7 @@ public class SyncopeUser extends Abstrac
static {
try {
- keySpec = new SecretKeySpec(ArrayUtils.subarray(
- "1abcdefghilmnopqrstuvz2!".getBytes("UTF8"), 0, 16), "AES");
+ keySpec = new SecretKeySpec(ArrayUtils.subarray("1abcdefghilmnopqrstuvz2!".getBytes("UTF8"), 0, 16), "AES");
} catch (Exception e) {
LOG.error("Error during key specification", e);
}
@@ -173,10 +172,7 @@ public class SyncopeUser extends Abstrac
* Provisioning external resources.
*/
@ManyToMany(fetch = FetchType.EAGER)
- @JoinTable(joinColumns =
- @JoinColumn(name = "user_id"),
- inverseJoinColumns =
- @JoinColumn(name = "resource_name"))
+ @JoinTable(joinColumns = @JoinColumn(name = "user_id"), inverseJoinColumns = @JoinColumn(name = "resource_name"))
private Set<ExternalResource> resources;
public SyncopeUser() {
@@ -213,12 +209,10 @@ public class SyncopeUser extends Abstrac
public Membership getMembership(final Long syncopeRoleId) {
Membership result = null;
Membership membership;
- for (Iterator<Membership> itor = getMemberships().iterator();
- result == null && itor.hasNext();) {
+ for (Iterator<Membership> itor = getMemberships().iterator(); result == null && itor.hasNext();) {
membership = itor.next();
- if (membership.getSyncopeRole() != null && syncopeRoleId.equals(
- membership.getSyncopeRole().getId())) {
+ if (membership.getSyncopeRole() != null && syncopeRoleId.equals(membership.getSyncopeRole().getId())) {
result = membership;
}
@@ -284,8 +278,7 @@ public class SyncopeUser extends Abstrac
clearPassword = null;
}
- public void setPassword(final String password,
- final CipherAlgorithm cipherAlgoritm, final int historySize) {
+ public void setPassword(final String password, final CipherAlgorithm cipherAlgoritm, final int historySize) {
// clear password
clearPassword = password;
@@ -323,15 +316,13 @@ public class SyncopeUser extends Abstrac
}
@Override
- public <T extends AbstractDerAttr> boolean addDerivedAttribute(
- final T derivedAttribute) {
+ public <T extends AbstractDerAttr> boolean addDerivedAttribute(final T derivedAttribute) {
return derivedAttributes.add((UDerAttr) derivedAttribute);
}
@Override
- public <T extends AbstractDerAttr> boolean removeDerivedAttribute(
- T derivedAttribute) {
+ public <T extends AbstractDerAttr> boolean removeDerivedAttribute(T derivedAttribute) {
return derivedAttributes.remove((UDerAttr) derivedAttribute);
}
@@ -408,12 +399,12 @@ public class SyncopeUser extends Abstrac
public Date getTokenExpireTime() {
return tokenExpireTime == null
- ? null : new Date(tokenExpireTime.getTime());
+ ? null
+ : new Date(tokenExpireTime.getTime());
}
public boolean checkToken(final String token) {
- return this.token == null || (this.token.equals(token)
- && tokenExpireTime.after(new Date()));
+ return this.token == null || (this.token.equals(token) && tokenExpireTime.after(new Date()));
}
public CipherAlgorithm getCipherAlgoritm() {
@@ -429,25 +420,33 @@ public class SyncopeUser extends Abstrac
}
public Date getChangePwdDate() {
- return changePwdDate == null ? null : new Date(changePwdDate.getTime());
+ return changePwdDate == null
+ ? null
+ : new Date(changePwdDate.getTime());
}
public void setChangePwdDate(final Date changePwdDate) {
this.changePwdDate = changePwdDate == null
- ? null : new Date(changePwdDate.getTime());
+ ? null
+ : new Date(changePwdDate.getTime());
}
public Date getCreationDate() {
- return creationDate == null ? null : new Date(creationDate.getTime());
+ return creationDate == null
+ ? null
+ : new Date(creationDate.getTime());
}
public void setCreationDate(final Date creationDate) {
this.creationDate = creationDate == null
- ? null : new Date(creationDate.getTime());
+ ? null
+ : new Date(creationDate.getTime());
}
public Integer getFailedLogins() {
- return failedLogins != null ? failedLogins : 0;
+ return failedLogins != null
+ ? failedLogins
+ : 0;
}
public void setFailedLogins(final Integer failedLogins) {
@@ -455,12 +454,15 @@ public class SyncopeUser extends Abstrac
}
public Date getLastLoginDate() {
- return lastLoginDate == null ? null : new Date(lastLoginDate.getTime());
+ return lastLoginDate == null
+ ? null
+ : new Date(lastLoginDate.getTime());
}
public void setLastLoginDate(final Date lastLoginDate) {
this.lastLoginDate = lastLoginDate == null
- ? null : new Date(lastLoginDate.getTime());
+ ? null
+ : new Date(lastLoginDate.getTime());
}
public String getUsername() {
@@ -479,22 +481,18 @@ public class SyncopeUser extends Abstrac
return isBooleanAsInteger(suspended);
}
- private String encodePassword(
- final String password, final CipherAlgorithm cipherAlgoritm)
- throws UnsupportedEncodingException, NoSuchAlgorithmException,
- NoSuchPaddingException, InvalidKeyException,
+ private String encodePassword(final String password, final CipherAlgorithm cipherAlgoritm)
+ throws UnsupportedEncodingException, NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException,
IllegalBlockSizeException, BadPaddingException {
String encodedPassword = null;
if (password != null) {
- if (cipherAlgoritm == null
- || cipherAlgoritm == CipherAlgorithm.AES) {
+ if (cipherAlgoritm == null || cipherAlgoritm == CipherAlgorithm.AES) {
final byte[] cleartext = password.getBytes("UTF8");
- final Cipher cipher = Cipher.getInstance(
- CipherAlgorithm.AES.getAlgorithm());
+ final Cipher cipher = Cipher.getInstance(CipherAlgorithm.AES.getAlgorithm());
cipher.init(Cipher.ENCRYPT_MODE, keySpec);
@@ -502,8 +500,7 @@ public class SyncopeUser extends Abstrac
encodedPassword = new String(Base64.encode(encoded));
} else {
- MessageDigest algorithm = MessageDigest.getInstance(
- cipherAlgoritm.getAlgorithm());
+ MessageDigest algorithm = MessageDigest.getInstance(cipherAlgoritm.getAlgorithm());
algorithm.reset();
algorithm.update(password.getBytes());
@@ -526,18 +523,17 @@ public class SyncopeUser extends Abstrac
return encodedPassword;
}
- public boolean verifyPasswordHistory(final String password,
- final int size) {
+ public boolean verifyPasswordHistory(final String password, final int size) {
boolean res = false;
if (size > 0) {
try {
- res = passwordHistory.subList(
- size >= passwordHistory.size() ? 0
- : passwordHistory.size() - size,
- passwordHistory.size()).contains(cipherAlgorithm != null
- ? encodePassword(password, cipherAlgorithm) : password);
+ res = passwordHistory.subList(size >= passwordHistory.size()
+ ? 0
+ : passwordHistory.size() - size, passwordHistory.size()).contains(cipherAlgorithm != null
+ ? encodePassword(password, cipherAlgorithm)
+ : password);
} catch (Throwable t) {
LOG.error("Error evaluating password history", t);
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/user/UAttr.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/user/UAttr.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/user/UAttr.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/user/UAttr.java Thu Mar 15 10:17:12 2012
@@ -64,8 +64,7 @@ public class UAttr extends AbstractAttr
/**
* Values of this attribute (if schema is not UNIQUE).
*/
- @OneToMany(cascade = CascadeType.MERGE, orphanRemoval = true,
- mappedBy = "attribute")
+ @OneToMany(cascade = CascadeType.MERGE, orphanRemoval = true, mappedBy = "attribute")
@Valid
private List<UAttrValue> values;
@@ -110,15 +109,13 @@ public class UAttr extends AbstractAttr
}
@Override
- public <T extends AbstractAttrValue> boolean addValue(
- final T attributeValue) {
+ public <T extends AbstractAttrValue> boolean addValue(final T attributeValue) {
return values.add((UAttrValue) attributeValue);
}
@Override
- public <T extends AbstractAttrValue> boolean removeValue(
- final T attributeValue) {
+ public <T extends AbstractAttrValue> boolean removeValue(final T attributeValue) {
return values.remove((UAttrValue) attributeValue);
}
@@ -129,8 +126,7 @@ public class UAttr extends AbstractAttr
}
@Override
- public <T extends AbstractAttrValue> void setValues(
- final List<T> attributeValues) {
+ public <T extends AbstractAttrValue> void setValues(final List<T> attributeValues) {
this.values.clear();
if (attributeValues != null && !attributeValues.isEmpty()) {
@@ -147,8 +143,7 @@ public class UAttr extends AbstractAttr
}
@Override
- public <T extends AbstractAttrValue> void setUniqueValue(
- final T uniqueAttributeValue) {
+ public <T extends AbstractAttrValue> void setUniqueValue(final T uniqueAttributeValue) {
this.uniqueValue = (UAttrUniqueValue) uniqueAttributeValue;
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/user/UDerAttr.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/user/UDerAttr.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/user/UDerAttr.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/user/UDerAttr.java Thu Mar 15 10:17:12 2012
@@ -52,8 +52,7 @@ public class UDerAttr extends AbstractDe
}
@Override
- public <T extends AbstractDerSchema> void setDerivedSchema(
- T derivedSchema) {
+ public <T extends AbstractDerSchema> void setDerivedSchema(T derivedSchema) {
this.derivedSchema = (UDerSchema) derivedSchema;
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/user/UVirAttr.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/user/UVirAttr.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/user/UVirAttr.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/user/UVirAttr.java Thu Mar 15 10:17:12 2012
@@ -54,8 +54,7 @@ public class UVirAttr extends AbstractVi
}
@Override
- public <T extends AbstractVirSchema> void setVirtualSchema(
- T virtualSchema) {
+ public <T extends AbstractVirSchema> void setVirtualSchema(T virtualSchema) {
this.virtualSchema = (UVirSchema) virtualSchema;
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/AttrDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/AttrDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/AttrDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/AttrDAO.java Thu Mar 15 10:17:12 2012
@@ -28,8 +28,7 @@ public interface AttrDAO extends DAO {
<T extends AbstractAttr> List<T> findAll(Class<T> reference);
- <T extends AbstractAttr> T save(T attribute)
- throws InvalidEntityException;
+ <T extends AbstractAttr> T save(T attribute) throws InvalidEntityException;
<T extends AbstractAttr> void delete(Long id, Class<T> reference);
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/AttrValueDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/AttrValueDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/AttrValueDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/AttrValueDAO.java Thu Mar 15 10:17:12 2012
@@ -28,8 +28,7 @@ public interface AttrValueDAO extends DA
<T extends AbstractAttrValue> List<T> findAll(Class<T> reference);
- <T extends AbstractAttrValue> T save(T attributeValue)
- throws InvalidEntityException;
+ <T extends AbstractAttrValue> T save(T attributeValue) throws InvalidEntityException;
<T extends AbstractAttrValue> void delete(Long id, Class<T> reference);
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ConfDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ConfDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ConfDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ConfDAO.java Thu Mar 15 10:17:12 2012
@@ -24,15 +24,13 @@ import org.syncope.core.persistence.vali
public interface ConfDAO extends DAO {
- SyncopeConf find(String name)
- throws MissingConfKeyException;
+ SyncopeConf find(String name) throws MissingConfKeyException;
SyncopeConf find(String name, String defaultValue);
List<SyncopeConf> findAll();
- SyncopeConf save(SyncopeConf syncopeConfiguration)
- throws InvalidEntityException;
+ SyncopeConf save(SyncopeConf syncopeConfiguration) throws InvalidEntityException;
void delete(String name);
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ConnInstanceDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ConnInstanceDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ConnInstanceDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ConnInstanceDAO.java Thu Mar 15 10:17:12 2012
@@ -28,8 +28,7 @@ public interface ConnInstanceDAO extends
List<ConnInstance> findAll();
- ConnInstance save(ConnInstance connector)
- throws InvalidEntityException;
+ ConnInstance save(ConnInstance connector) throws InvalidEntityException;
void delete(Long id);
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/DAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/DAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/DAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/DAO.java Thu Mar 15 10:17:12 2012
@@ -22,7 +22,7 @@ import org.syncope.core.persistence.bean
public interface DAO {
- <T extends AbstractBaseBean> void refresh(T entity);
+ <T extends AbstractBaseBean> void refresh(T entity);
void detach(Object object);
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/DerAttrDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/DerAttrDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/DerAttrDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/DerAttrDAO.java Thu Mar 15 10:17:12 2012
@@ -28,8 +28,7 @@ public interface DerAttrDAO extends DAO
<T extends AbstractDerAttr> List<T> findAll(Class<T> reference);
- <T extends AbstractDerAttr> T save(T derivedAttribute)
- throws InvalidEntityException;
+ <T extends AbstractDerAttr> T save(T derivedAttribute) throws InvalidEntityException;
<T extends AbstractDerAttr> void delete(Long id, Class<T> reference);
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/DerSchemaDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/DerSchemaDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/DerSchemaDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/DerSchemaDAO.java Thu Mar 15 10:17:12 2012
@@ -30,11 +30,9 @@ public interface DerSchemaDAO extends DA
<T extends AbstractDerSchema> List<T> findAll(Class<T> reference);
- <T extends AbstractDerSchema> T save(T derivedSchema)
- throws InvalidEntityException;
+ <T extends AbstractDerSchema> T save(T derivedSchema) throws InvalidEntityException;
- <T extends AbstractDerAttr> List<T> getAttributes(
- AbstractDerSchema schema, Class<T> reference);
+ <T extends AbstractDerAttr> List<T> getAttributes(AbstractDerSchema schema, Class<T> reference);
void delete(String name, AttributableUtil attributableUtil);
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/EntitlementDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/EntitlementDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/EntitlementDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/EntitlementDAO.java Thu Mar 15 10:17:12 2012
@@ -29,8 +29,7 @@ public interface EntitlementDAO extends
List<Entitlement> findAll();
- Entitlement save(Entitlement entitlement)
- throws InvalidEntityException;
+ Entitlement save(Entitlement entitlement) throws InvalidEntityException;
Entitlement saveEntitlementRole(SyncopeRole role);
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/LoggerDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/LoggerDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/LoggerDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/LoggerDAO.java Thu Mar 15 10:17:12 2012
@@ -29,8 +29,7 @@ public interface LoggerDAO extends DAO {
List<SyncopeLogger> findAll(SyncopeLoggerType type);
- SyncopeLogger save(SyncopeLogger logger)
- throws InvalidEntityException;
+ SyncopeLogger save(SyncopeLogger logger) throws InvalidEntityException;
void delete(String name);
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/MembershipDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/MembershipDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/MembershipDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/MembershipDAO.java Thu Mar 15 10:17:12 2012
@@ -32,8 +32,7 @@ public interface MembershipDAO extends D
List<Membership> findAll();
- Membership save(Membership membership)
- throws InvalidEntityException;
+ Membership save(Membership membership) throws InvalidEntityException;
void delete(Long id);
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/NotificationDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/NotificationDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/NotificationDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/NotificationDAO.java Thu Mar 15 10:17:12 2012
@@ -28,8 +28,7 @@ public interface NotificationDAO extends
List<Notification> findAll();
- Notification save(Notification notification)
- throws InvalidEntityException;
+ Notification save(Notification notification) throws InvalidEntityException;
void delete(Long id);
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/PolicyDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/PolicyDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/PolicyDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/PolicyDAO.java Thu Mar 15 10:17:12 2012
@@ -39,7 +39,7 @@ public interface PolicyDAO extends DAO {
List<Policy> findAll();
- <T extends Policy> T save(T policy);
+ <T extends Policy> T save(T policy);
void delete(Long id);
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ReportDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ReportDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ReportDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ReportDAO.java Thu Mar 15 10:17:12 2012
@@ -32,8 +32,7 @@ public interface ReportDAO extends DAO {
int count();
- Report save(Report report)
- throws InvalidEntityException;
+ Report save(Report report) throws InvalidEntityException;
void delete(Long id);
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ReportExecDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ReportExecDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ReportExecDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ReportExecDAO.java Thu Mar 15 10:17:12 2012
@@ -33,8 +33,7 @@ public interface ReportExecDAO extends D
List<ReportExec> findAll();
- ReportExec save(ReportExec execution)
- throws InvalidEntityException;
+ ReportExec save(ReportExec execution) throws InvalidEntityException;
void delete(Long id);
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ResourceDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ResourceDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ResourceDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ResourceDAO.java Thu Mar 15 10:17:12 2012
@@ -32,8 +32,7 @@ public interface ResourceDAO extends DAO
List<ExternalResource> findAllByPriority();
- ExternalResource save(ExternalResource resource)
- throws InvalidEntityException;
+ ExternalResource save(ExternalResource resource) throws InvalidEntityException;
List<SchemaMapping> findAllMappings();