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/04/15 17:04:28 UTC
svn commit: r1468107 - in
/syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence:
beans/user/UAttrUniqueValue.java dao/impl/UserDAOImpl.java
dao/impl/UserSearchDAOImpl.java
Author: ilgrosso
Date: Mon Apr 15 15:04:28 2013
New Revision: 1468107
URL: http://svn.apache.org/r1468107
Log:
White noise: formatting and minor fixes
Modified:
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttrUniqueValue.java
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java
syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserSearchDAOImpl.java
Modified: syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttrUniqueValue.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttrUniqueValue.java?rev=1468107&r1=1468106&r2=1468107&view=diff
==============================================================================
--- syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttrUniqueValue.java (original)
+++ syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/beans/user/UAttrUniqueValue.java Mon Apr 15 15:04:28 2013
@@ -31,10 +31,13 @@ import org.apache.syncope.core.persisten
public class UAttrUniqueValue extends AbstractAttrUniqueValue {
private static final long serialVersionUID = -64080804563305387L;
+
@Id
private Long id;
+
@OneToOne(optional = false)
private UAttr attribute;
+
@ManyToOne(optional = false)
@JoinColumn(name = "schema_name")
private USchema schema;
Modified: syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java?rev=1468107&r1=1468106&r2=1468107&view=diff
==============================================================================
--- syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java (original)
+++ syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java Mon Apr 15 15:04:28 2013
@@ -30,12 +30,13 @@ import javax.persistence.NoResultExcepti
import javax.persistence.Query;
import javax.persistence.TemporalType;
import javax.persistence.TypedQuery;
+import javax.swing.SortOrder;
import org.apache.commons.jexl2.parser.Parser;
import org.apache.commons.jexl2.parser.ParserConstants;
import org.apache.commons.jexl2.parser.Token;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
-import org.springframework.util.StringUtils;
import org.apache.syncope.core.persistence.beans.AbstractAttrValue;
import org.apache.syncope.core.persistence.beans.AbstractVirAttr;
import org.apache.syncope.core.persistence.beans.ExternalResource;
@@ -70,8 +71,8 @@ public class UserDAOImpl extends Abstrac
@Override
public SyncopeUser find(final Long id) {
- TypedQuery<SyncopeUser> query = entityManager.createQuery("SELECT e FROM " + SyncopeUser.class.getSimpleName()
- + " e " + "WHERE e.id = :id", SyncopeUser.class);
+ TypedQuery<SyncopeUser> query = entityManager.createQuery(
+ "SELECT e FROM " + SyncopeUser.class.getSimpleName() + " e WHERE e.id = :id", SyncopeUser.class);
query.setParameter("id", id);
SyncopeUser result = null;
@@ -172,7 +173,6 @@ public class UserDAOImpl extends Abstrac
@Override
public List<SyncopeUser> findByAttrValue(final String schemaName, final UAttrValue attrValue) {
-
USchema schema = schemaDAO.find(schemaName, USchema.class);
if (schema == null) {
LOG.error("Invalid schema name '{}'", schemaName);
@@ -204,10 +204,9 @@ public class UserDAOImpl extends Abstrac
query.setParameter("doubleValue", attrValue.getDoubleValue());
List<SyncopeUser> result = new ArrayList<SyncopeUser>();
- SyncopeUser user;
- for (AbstractAttrValue value : (List<AbstractAttrValue>) query.getResultList()) {
- user = (SyncopeUser) value.getAttribute().getOwner();
+ for (AbstractAttrValue value : (List<AbstractAttrValue>) query.getResultList()) {
+ SyncopeUser user = (SyncopeUser) value.getAttribute().getOwner();
if (!result.contains(user)) {
result.add(user);
}
@@ -218,7 +217,6 @@ public class UserDAOImpl extends Abstrac
@Override
public SyncopeUser findByAttrUniqueValue(final String schemaName, final UAttrValue attrUniqueValue) {
-
USchema schema = schemaDAO.find(schemaName, USchema.class);
if (schema == null) {
LOG.error("Invalid schema name '{}'", schemaName);
@@ -281,7 +279,6 @@ public class UserDAOImpl extends Abstrac
@Override
public final List<SyncopeUser> findAll(final Set<Long> adminRoles, final int page, final int itemsPerPage) {
-
final Query query = entityManager.createNativeQuery(getFindAllQuery(adminRoles).toString());
query.setFirstResult(itemsPerPage * (page <= 0
@@ -298,19 +295,22 @@ public class UserDAOImpl extends Abstrac
//fix for HHH-5902 - bug hibernate
if (resultList != null) {
for (Object userId : resultList) {
+ final Number userIdNumber;
if (userId instanceof Object[]) {
- userIds.add((Number) ((Object[]) userId)[0]);
+ userIdNumber = (Number) ((Object[]) userId)[0];
} else {
- userIds.add((Number) userId);
+ userIdNumber = (Number) userId;
+ }
+ if (!userIds.contains(userIdNumber)) {
+ userIds.add(userIdNumber);
}
}
}
List<SyncopeUser> result = new ArrayList<SyncopeUser>(userIds.size());
- SyncopeUser user;
- for (Object userId : userIds) {
- user = find(((Number) userId).longValue());
+ for (Number userId : userIds) {
+ SyncopeUser user = find(userId.longValue());
if (user == null) {
LOG.error("Could not find user with id {}, " + "even though returned by the native query", userId);
} else {
@@ -395,8 +395,7 @@ public class UserDAOImpl extends Abstrac
// Get schema names and literals
Token token;
- while ((token = parser.getNextToken()) != null && StringUtils.hasText(token.toString())) {
-
+ while ((token = parser.getNextToken()) != null && StringUtils.isNotBlank(token.toString())) {
if (token.kind == ParserConstants.STRING_LITERAL) {
literals.add(token.toString().substring(1, token.toString().length() - 1));
}
@@ -512,7 +511,6 @@ public class UserDAOImpl extends Abstrac
* @return
*/
private List<String> split(final String attrValue, final List<String> literals) {
-
final List<String> attrValues = new ArrayList<String>();
if (literals.isEmpty()) {
@@ -520,7 +518,6 @@ public class UserDAOImpl extends Abstrac
} else {
for (String token : attrValue.split(Pattern.quote(literals.get(0)))) {
-
attrValues.addAll(split(token, literals.subList(1, literals.size())));
}
}
Modified: syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserSearchDAOImpl.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserSearchDAOImpl.java?rev=1468107&r1=1468106&r2=1468107&view=diff
==============================================================================
--- syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserSearchDAOImpl.java (original)
+++ syncope/branches/1_0_X/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserSearchDAOImpl.java Mon Apr 15 15:04:28 2013
@@ -22,12 +22,13 @@ import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.persistence.Query;
import javax.persistence.TemporalType;
+import javax.swing.SortOrder;
import javax.validation.ValidationException;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import org.apache.syncope.client.search.AttributeCond;
@@ -92,7 +93,6 @@ public class UserSearchDAOImpl extends A
@Override
public int count(final Set<Long> adminRoles, final NodeCond searchCondition) {
-
List<Object> parameters = Collections.synchronizedList(new ArrayList<Object>());
// 1. get the query string from the search condition
@@ -148,7 +148,6 @@ public class UserSearchDAOImpl extends A
@Override
public boolean matches(final SyncopeUser user, final NodeCond searchCondition) {
-
List<Object> parameters = Collections.synchronizedList(new ArrayList<Object>());
// 1. get the query string from the search condition
@@ -171,7 +170,6 @@ public class UserSearchDAOImpl extends A
}
private int setParameter(final List<Object> parameters, final Object parameter) {
-
int key;
synchronized (parameters) {
parameters.add(parameter);
@@ -182,7 +180,6 @@ public class UserSearchDAOImpl extends A
}
private void fillWithParameters(final Query query, final List<Object> parameters) {
-
for (int i = 0; i < parameters.size(); i++) {
if (parameters.get(i) instanceof Date) {
query.setParameter(i + 1, (Date) parameters.get(i), TemporalType.TIMESTAMP);
@@ -217,7 +214,7 @@ public class UserSearchDAOImpl extends A
// 3. prepare the search query
final Query query = entityManager.createNativeQuery(queryString.toString());
- // page starts from 1, while setFirtResult() starts from 0
+ // 4. page starts from 1, while setFirtResult() starts from 0
query.setFirstResult(itemsPerPage * (page <= 0
? 0
: page - 1));
@@ -226,31 +223,34 @@ public class UserSearchDAOImpl extends A
query.setMaxResults(itemsPerPage);
}
- // 4. populate the search query with parameter values
+ // 5. populate the search query with parameter values
fillWithParameters(query, parameters);
LOG.debug("Native query\n{}\nwith parameters\n{}", queryString.toString(), parameters);
- // 5. Prepare the result (avoiding duplicates - set)
- final Set<Number> userIds = new HashSet<Number>();
+ // 6. Prepare the result (avoiding duplicates)
+ final List<Number> userIds = new ArrayList<Number>();
final List resultList = query.getResultList();
//fix for HHH-5902 - bug hibernate
if (resultList != null) {
for (Object userId : resultList) {
+ final Number userIdNumber;
if (userId instanceof Object[]) {
- userIds.add((Number) ((Object[]) userId)[0]);
+ userIdNumber = (Number) ((Object[]) userId)[0];
} else {
- userIds.add((Number) userId);
+ userIdNumber = (Number) userId;
+ }
+ if (!userIds.contains(userIdNumber)) {
+ userIds.add(userIdNumber);
}
}
}
final List<SyncopeUser> result = new ArrayList<SyncopeUser>(userIds.size());
- SyncopeUser user;
- for (Object userId : userIds) {
- user = userDAO.find(((Number) userId).longValue());
+ for (Number userId : userIds) {
+ SyncopeUser user = userDAO.find(userId.longValue());
if (user == null) {
LOG.error("Could not find user with id {}, " + "even though returned by the native query", userId);
} else {
@@ -304,7 +304,6 @@ public class UserSearchDAOImpl extends A
}
private String getQuery(final MembershipCond cond, final boolean not, final List<Object> parameters) {
-
StringBuilder query = new StringBuilder("SELECT DISTINCT user_id FROM user_search WHERE ");
if (not) {
@@ -508,7 +507,7 @@ public class UserSearchDAOImpl extends A
syncopeUserClassField = i.getDeclaredField(cond.getSchema());
} catch (Exception ignore) {
// ignore exception
- LOG.debug("Field '{}' not found on class '{}'", new String[]{cond.getSchema(), i.getSimpleName()},
+ LOG.debug("Field '{}' not found on class '{}'", new String[] {cond.getSchema(), i.getSimpleName()},
ignore);
} finally {
i = i.getSuperclass();