You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/01/21 12:41:32 UTC
svn commit: r1436292 - in
/syncope/trunk/core/src/main/java/org/apache/syncope/core:
persistence/beans/ persistence/beans/membership/ persistence/beans/role/
persistence/beans/user/ util/
Author: ilgrosso
Date: Mon Jan 21 11:41:32 2013
New Revision: 1436292
URL: http://svn.apache.org/viewvc?rev=1436292&view=rev
Log:
White noise (formatting and PMD / Checkstyle / Findbugs warnings) - please ignore
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractDerSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractVirSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MDerSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MVirSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RDerSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RVirSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UDerSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/USchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UVirSchema.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractDerSchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractDerSchema.java?rev=1436292&r1=1436291&r2=1436292&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractDerSchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractDerSchema.java Mon Jan 21 11:41:32 2013
@@ -21,7 +21,6 @@ package org.apache.syncope.core.persiste
import javax.persistence.Column;
import javax.persistence.Id;
import javax.persistence.MappedSuperclass;
-
import org.apache.syncope.common.types.SchemaType;
@MappedSuperclass
@@ -39,7 +38,7 @@ public abstract class AbstractDerSchema
return name;
}
- public void setName(String name) {
+ public void setName(final String name) {
this.name = name;
}
@@ -47,7 +46,7 @@ public abstract class AbstractDerSchema
return expression;
}
- public void setExpression(String expression) {
+ public void setExpression(final String expression) {
this.expression = expression;
}
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java?rev=1436292&r1=1436291&r2=1436292&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractSchema.java Mon Jan 21 11:41:32 2013
@@ -18,15 +18,13 @@
*/
package org.apache.syncope.core.persistence.beans;
-import static javax.persistence.EnumType.STRING;
-
import java.lang.reflect.Constructor;
import java.text.DecimalFormat;
import java.text.Format;
import java.text.SimpleDateFormat;
-
import javax.persistence.Basic;
import javax.persistence.Column;
+import static javax.persistence.EnumType.STRING;
import javax.persistence.Enumerated;
import javax.persistence.Id;
import javax.persistence.Lob;
@@ -34,7 +32,6 @@ import javax.persistence.MappedSuperclas
import javax.persistence.Transient;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
-
import org.apache.syncope.common.types.SchemaType;
import org.apache.syncope.core.persistence.validation.attrvalue.AbstractValidator;
import org.apache.syncope.core.persistence.validation.attrvalue.BasicValidator;
@@ -112,7 +109,7 @@ public abstract class AbstractSchema ext
return type;
}
- public void setType(SchemaType type) {
+ public void setType(final SchemaType type) {
this.type = type;
}
@@ -211,6 +208,7 @@ public abstract class AbstractSchema ext
this.conversionPattern = conversionPattern;
}
+ @SuppressWarnings("unchecked")
public <T extends Format> T getFormatter() {
T result = null;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractVirSchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractVirSchema.java?rev=1436292&r1=1436291&r2=1436292&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractVirSchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/AbstractVirSchema.java Mon Jan 21 11:41:32 2013
@@ -20,7 +20,6 @@ package org.apache.syncope.core.persiste
import javax.persistence.Id;
import javax.persistence.MappedSuperclass;
-
import org.apache.syncope.common.types.SchemaType;
@MappedSuperclass
@@ -33,7 +32,7 @@ public abstract class AbstractVirSchema
return name;
}
- public void setName(String name) {
+ public void setName(final String name) {
this.name = name;
}
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MDerSchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MDerSchema.java?rev=1436292&r1=1436291&r2=1436292&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MDerSchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MDerSchema.java Mon Jan 21 11:41:32 2013
@@ -20,7 +20,6 @@ package org.apache.syncope.core.persiste
import javax.persistence.Cacheable;
import javax.persistence.Entity;
-
import org.apache.syncope.core.persistence.beans.AbstractDerSchema;
@Entity
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MSchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MSchema.java?rev=1436292&r1=1436291&r2=1436292&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MSchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MSchema.java Mon Jan 21 11:41:32 2013
@@ -20,10 +20,12 @@ package org.apache.syncope.core.persiste
import javax.persistence.Cacheable;
import javax.persistence.Entity;
-
import org.apache.syncope.core.persistence.beans.AbstractSchema;
@Entity
@Cacheable
public class MSchema extends AbstractSchema {
+
+ private static final long serialVersionUID = -8053736450044590651L;
+
}
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MVirSchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MVirSchema.java?rev=1436292&r1=1436291&r2=1436292&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MVirSchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/membership/MVirSchema.java Mon Jan 21 11:41:32 2013
@@ -20,7 +20,6 @@ package org.apache.syncope.core.persiste
import javax.persistence.Cacheable;
import javax.persistence.Entity;
-
import org.apache.syncope.core.persistence.beans.AbstractVirSchema;
@Entity
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RDerSchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RDerSchema.java?rev=1436292&r1=1436291&r2=1436292&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RDerSchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RDerSchema.java Mon Jan 21 11:41:32 2013
@@ -19,7 +19,6 @@
package org.apache.syncope.core.persistence.beans.role;
import javax.persistence.Entity;
-
import org.apache.syncope.core.persistence.beans.AbstractDerSchema;
@Entity
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RSchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RSchema.java?rev=1436292&r1=1436291&r2=1436292&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RSchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RSchema.java Mon Jan 21 11:41:32 2013
@@ -20,10 +20,12 @@ package org.apache.syncope.core.persiste
import javax.persistence.Cacheable;
import javax.persistence.Entity;
-
import org.apache.syncope.core.persistence.beans.AbstractSchema;
@Entity
@Cacheable
public class RSchema extends AbstractSchema {
+
+ private static final long serialVersionUID = -7417234690221851342L;
+
}
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RVirSchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RVirSchema.java?rev=1436292&r1=1436291&r2=1436292&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RVirSchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/role/RVirSchema.java Mon Jan 21 11:41:32 2013
@@ -20,7 +20,6 @@ package org.apache.syncope.core.persiste
import javax.persistence.Cacheable;
import javax.persistence.Entity;
-
import org.apache.syncope.core.persistence.beans.AbstractVirSchema;
@Entity
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UDerSchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UDerSchema.java?rev=1436292&r1=1436291&r2=1436292&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UDerSchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UDerSchema.java Mon Jan 21 11:41:32 2013
@@ -19,7 +19,6 @@
package org.apache.syncope.core.persistence.beans.user;
import javax.persistence.Entity;
-
import org.apache.syncope.core.persistence.beans.AbstractDerSchema;
import org.apache.syncope.core.persistence.validation.entity.USchemaCheck;
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/USchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/USchema.java?rev=1436292&r1=1436291&r2=1436292&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/USchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/USchema.java Mon Jan 21 11:41:32 2013
@@ -20,7 +20,6 @@ package org.apache.syncope.core.persiste
import javax.persistence.Cacheable;
import javax.persistence.Entity;
-
import org.apache.syncope.core.persistence.beans.AbstractSchema;
import org.apache.syncope.core.persistence.validation.entity.USchemaCheck;
@@ -30,4 +29,5 @@ import org.apache.syncope.core.persisten
public class USchema extends AbstractSchema {
private static final long serialVersionUID = -2776513645999914610L;
+
}
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UVirSchema.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UVirSchema.java?rev=1436292&r1=1436291&r2=1436292&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UVirSchema.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UVirSchema.java Mon Jan 21 11:41:32 2013
@@ -20,7 +20,6 @@ package org.apache.syncope.core.persiste
import javax.persistence.Cacheable;
import javax.persistence.Entity;
-
import org.apache.syncope.core.persistence.beans.AbstractVirSchema;
import org.apache.syncope.core.persistence.validation.entity.USchemaCheck;
@@ -30,4 +29,5 @@ import org.apache.syncope.core.persisten
public class UVirSchema extends AbstractVirSchema {
private static final long serialVersionUID = 1089308700791426201L;
+
}
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java?rev=1436292&r1=1436291&r2=1436292&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/util/MappingUtil.java Mon Jan 21 11:41:32 2013
@@ -25,12 +25,12 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import org.apache.syncope.common.mod.AttributeMod;
import org.apache.syncope.common.types.IntMappingType;
import org.apache.syncope.core.persistence.beans.AbstractAttr;
import org.apache.syncope.core.persistence.beans.AbstractAttrValue;
import org.apache.syncope.core.persistence.beans.AbstractAttributable;
+import org.apache.syncope.core.persistence.beans.AbstractBaseBean;
import org.apache.syncope.core.persistence.beans.AbstractDerAttr;
import org.apache.syncope.core.persistence.beans.AbstractMappingItem;
import org.apache.syncope.core.persistence.beans.AbstractVirAttr;
@@ -94,7 +94,6 @@ public final class MappingUtil {
* @param mappingItem mapping item
* @param attributables list of attributables
* @param password password
- * @param schemaDAO schema DAO
* @return attribute values.
*/
public static List<AbstractAttrValue> getIntValues(final AbstractMappingItem mappingItem,
@@ -251,8 +250,8 @@ public final class MappingUtil {
* @param intMappingType source mapping type
* @return corresponding Class object, if any (can be null)
*/
- public static Class getIntMappingTypeClass(final IntMappingType intMappingType) {
- Class result;
+ public static Class<? extends AbstractBaseBean> getIntMappingTypeClass(final IntMappingType intMappingType) {
+ Class<? extends AbstractBaseBean> result;
switch (intMappingType) {
case UserSchema: