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 [12/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/dao/RoleDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/RoleDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/RoleDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/RoleDAO.java Thu Mar 15 10:17:12 2012
@@ -36,15 +36,14 @@ public interface RoleDAO extends DAO {
List<SyncopeRole> findByEntitlement(final Entitlement entitlement);
List<SyncopeRole> findByResource(ExternalResource resource);
-
+
List<SyncopeRole> findChildren(Long roleId);
List<SyncopeRole> findAll();
List<Membership> findMemberships(SyncopeRole role);
- SyncopeRole save(SyncopeRole syncopeRole)
- throws InvalidEntityException;
+ SyncopeRole save(SyncopeRole syncopeRole) throws InvalidEntityException;
void delete(Long id);
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/SchemaDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/SchemaDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/SchemaDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/SchemaDAO.java Thu Mar 15 10:17:12 2012
@@ -30,11 +30,9 @@ public interface SchemaDAO extends DAO {
<T extends AbstractSchema> List<T> findAll(Class<T> reference);
- <T extends AbstractAttr> List<T> getAttributes(
- AbstractSchema schema, Class<T> reference);
+ <T extends AbstractAttr> List<T> getAttributes(AbstractSchema schema, Class<T> reference);
- <T extends AbstractSchema> T save(T schema)
- throws InvalidEntityException;
+ <T extends AbstractSchema> T save(T schema) throws InvalidEntityException;
void delete(String name, AttributableUtil attributableUtil);
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/TaskDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/TaskDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/TaskDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/TaskDAO.java Thu Mar 15 10:17:12 2012
@@ -27,31 +27,27 @@ import org.syncope.core.persistence.vali
public interface TaskDAO extends DAO {
- <T extends Task> T find(Long id);
+ <T extends Task> T find(Long id);
- <T extends Task> List<T> findWithoutExecs(Class<T> reference);
+ <T extends Task> List<T> findWithoutExecs(Class<T> reference);
- <T extends Task> List<T> findAll(ExternalResource resource,
- Class<T> reference);
+ <T extends Task> List<T> findAll(ExternalResource resource, Class<T> reference);
- <T extends Task> List<T> findAll(Class<T> reference);
+ <T extends Task> List<T> findAll(Class<T> reference);
- <T extends Task> List<T> findAll(int page, int itemsPerPage,
- Class<T> reference);
+ <T extends Task> List<T> findAll(int page, int itemsPerPage, Class<T> reference);
List<PropagationTask> findAll(ExternalResource resource, SyncopeUser user);
List<PropagationTask> findAll(SyncopeUser user);
- <T extends Task> int count(Class<T> reference);
+ <T extends Task> int count(Class<T> reference);
- <T extends Task> T save(T task)
- throws InvalidEntityException;
+ <T extends Task> T save(T task) throws InvalidEntityException;
- <T extends Task> void delete(Long id);
+ <T extends Task> void delete(Long id);
- <T extends Task> void delete(T task);
+ <T extends Task> void delete(T task);
- <T extends Task> void deleteAll(ExternalResource resource,
- Class<T> reference);
+ <T extends Task> void deleteAll(ExternalResource resource, Class<T> reference);
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/TaskExecDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/TaskExecDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/TaskExecDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/TaskExecDAO.java Thu Mar 15 10:17:12 2012
@@ -27,14 +27,13 @@ public interface TaskExecDAO extends DAO
TaskExec find(Long id);
- <T extends Task> TaskExec findLatestStarted(T task);
+ <T extends Task> TaskExec findLatestStarted(T task);
- <T extends Task> TaskExec findLatestEnded(T task);
+ <T extends Task> TaskExec findLatestEnded(T task);
- <T extends Task> List<TaskExec> findAll(Class<T> reference);
+ <T extends Task> List<TaskExec> findAll(Class<T> reference);
- TaskExec save(TaskExec execution)
- throws InvalidEntityException;
+ TaskExec save(TaskExec execution) throws InvalidEntityException;
void delete(Long id);
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/UserDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/UserDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/UserDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/UserDAO.java Thu Mar 15 10:17:12 2012
@@ -34,13 +34,11 @@ public interface UserDAO extends DAO {
SyncopeUser findByWorkflowId(String workflowId);
- List<SyncopeUser> findByDerAttrValue(String schemaName, String value)
- throws InvalidSearchConditionException;
+ List<SyncopeUser> findByDerAttrValue(String schemaName, String value) throws InvalidSearchConditionException;
List<SyncopeUser> findByAttrValue(String schemaName, UAttrValue attrValue);
- SyncopeUser findByAttrUniqueValue(String schemaName,
- UAttrValue attrUniqueValue);
+ SyncopeUser findByAttrUniqueValue(String schemaName, UAttrValue attrUniqueValue);
List<SyncopeUser> findByResource(ExternalResource resource);
@@ -50,8 +48,7 @@ public interface UserDAO extends DAO {
int count(Set<Long> adminRoles);
- SyncopeUser save(SyncopeUser user)
- throws InvalidEntityException;
+ SyncopeUser save(SyncopeUser user) throws InvalidEntityException;
void delete(Long id);
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/UserRequestDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/UserRequestDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/UserRequestDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/UserRequestDAO.java Thu Mar 15 10:17:12 2012
@@ -28,8 +28,7 @@ public interface UserRequestDAO extends
List<UserRequest> findAll();
- UserRequest save(UserRequest userRequest)
- throws InvalidEntityException;
+ UserRequest save(UserRequest userRequest) throws InvalidEntityException;
void delete(Long id);
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/UserSearchDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/UserSearchDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/UserSearchDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/UserSearchDAO.java Thu Mar 15 10:17:12 2012
@@ -52,8 +52,7 @@ public interface UserSearchDAO extends D
* @param itemsPerPage number of results per page
* @return the list of users matchin the given search condition
*/
- List<SyncopeUser> search(Set<Long> adminRoles,
- NodeCond searchCondition, int page, int itemsPerPage);
+ List<SyncopeUser> search(Set<Long> adminRoles, NodeCond searchCondition, int page, int itemsPerPage);
/**
* Verify if user matched the given search condition.
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/VirAttrDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/VirAttrDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/VirAttrDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/VirAttrDAO.java Thu Mar 15 10:17:12 2012
@@ -28,8 +28,7 @@ public interface VirAttrDAO extends DAO
<T extends AbstractVirAttr> List<T> findAll(Class<T> reference);
- <T extends AbstractVirAttr> T save(T virtualAttribute)
- throws InvalidEntityException;
+ <T extends AbstractVirAttr> T save(T virtualAttribute) throws InvalidEntityException;
<T extends AbstractVirAttr> void delete(Long id, Class<T> reference);
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/VirSchemaDAO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/VirSchemaDAO.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/VirSchemaDAO.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/VirSchemaDAO.java Thu Mar 15 10:17:12 2012
@@ -30,11 +30,9 @@ public interface VirSchemaDAO extends DA
<T extends AbstractVirSchema> List<T> findAll(Class<T> reference);
- <T extends AbstractVirSchema> T save(T virtualSchema)
- throws InvalidEntityException;
+ <T extends AbstractVirSchema> T save(T virtualSchema) throws InvalidEntityException;
- <T extends AbstractVirAttr> List<T> getAttributes(
- AbstractVirSchema virtualSchema, Class<T> reference);
+ <T extends AbstractVirAttr> List<T> getAttributes(AbstractVirSchema virtualSchema, Class<T> reference);
void delete(String name, AttributableUtil attributableUtil);
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/AbstractDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/AbstractDAOImpl.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/AbstractDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/AbstractDAOImpl.java Thu Mar 15 10:17:12 2012
@@ -36,14 +36,11 @@ public abstract class AbstractDAOImpl im
/**
* Logger.
*/
- protected static final Logger LOG =
- LoggerFactory.getLogger(AbstractDAOImpl.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(AbstractDAOImpl.class);
- private String CACHE_STORE_MODE =
- "javax.persistence.cache.storeMode";
+ private String CACHE_STORE_MODE = "javax.persistence.cache.storeMode";
- private String CACHE_RETRIEVE_MODE =
- "javax.persistence.cache.retrieveMode";
+ private String CACHE_RETRIEVE_MODE = "javax.persistence.cache.retrieveMode";
@Value("#{entityManager}")
@PersistenceContext(type = PersistenceContextType.TRANSACTION)
@@ -51,27 +48,25 @@ public abstract class AbstractDAOImpl im
protected CacheRetrieveMode getCacheRetrieveMode() {
return entityManager.getProperties().containsKey(CACHE_RETRIEVE_MODE)
- ? (CacheRetrieveMode) entityManager.getProperties().get(
- CACHE_RETRIEVE_MODE) : CacheRetrieveMode.BYPASS;
+ ? (CacheRetrieveMode) entityManager.getProperties().get(CACHE_RETRIEVE_MODE)
+ : CacheRetrieveMode.BYPASS;
}
protected void setCacheRetrieveMode(final CacheRetrieveMode retrieveMode) {
if (retrieveMode != null) {
- entityManager.getProperties().
- put(CACHE_RETRIEVE_MODE, retrieveMode);
+ entityManager.getProperties().put(CACHE_RETRIEVE_MODE, retrieveMode);
}
}
protected CacheStoreMode getCacheStoreMode() {
return entityManager.getProperties().containsKey(CACHE_STORE_MODE)
- ? (CacheStoreMode) entityManager.getProperties().get(
- CACHE_STORE_MODE) : CacheStoreMode.BYPASS;
+ ? (CacheStoreMode) entityManager.getProperties().get(CACHE_STORE_MODE)
+ : CacheStoreMode.BYPASS;
}
protected void setCacheStoreMode(final CacheStoreMode storeMode) {
if (storeMode != null) {
- entityManager.getProperties().
- put(CACHE_STORE_MODE, storeMode);
+ entityManager.getProperties().put(CACHE_STORE_MODE, storeMode);
}
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/AttrDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/AttrDAOImpl.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/AttrDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/AttrDAOImpl.java Thu Mar 15 10:17:12 2012
@@ -28,16 +28,14 @@ import org.syncope.core.persistence.dao.
public class AttrDAOImpl extends AbstractDAOImpl implements AttrDAO {
@Override
- public <T extends AbstractAttr> T find(final Long id,
- final Class<T> reference) {
+ public <T extends AbstractAttr> T find(final Long id, final Class<T> reference) {
return entityManager.find(reference, id);
}
@Override
public <T extends AbstractAttr> List<T> findAll(final Class<T> reference) {
- Query query = entityManager.createQuery(
- "SELECT e FROM " + reference.getSimpleName() + " e");
+ Query query = entityManager.createQuery("SELECT e FROM " + reference.getSimpleName() + " e");
return query.getResultList();
}
@@ -47,8 +45,7 @@ public class AttrDAOImpl extends Abstrac
}
@Override
- public <T extends AbstractAttr> void delete(
- final Long id, final Class<T> reference) {
+ public <T extends AbstractAttr> void delete(final Long id, final Class<T> reference) {
T attribute = find(id, reference);
if (attribute == null) {
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/AttrValueDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/AttrValueDAOImpl.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/AttrValueDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/AttrValueDAOImpl.java Thu Mar 15 10:17:12 2012
@@ -25,22 +25,18 @@ import org.syncope.core.persistence.bean
import org.syncope.core.persistence.dao.AttrValueDAO;
@Repository
-public class AttrValueDAOImpl extends AbstractDAOImpl
- implements AttrValueDAO {
+public class AttrValueDAOImpl extends AbstractDAOImpl implements AttrValueDAO {
@Override
- public <T extends AbstractAttrValue> T find(
- final Long id, final Class<T> reference) {
+ public <T extends AbstractAttrValue> T find(final Long id, final Class<T> reference) {
return entityManager.find(reference, id);
}
@Override
- public <T extends AbstractAttrValue> List<T> findAll(
- final Class<T> reference) {
+ public <T extends AbstractAttrValue> List<T> findAll(final Class<T> reference) {
- Query query = entityManager.createQuery(
- "SELECT e FROM " + reference.getSimpleName() + " e");
+ Query query = entityManager.createQuery("SELECT e FROM " + reference.getSimpleName() + " e");
return query.getResultList();
}
@@ -50,8 +46,7 @@ public class AttrValueDAOImpl extends Ab
}
@Override
- public <T extends AbstractAttrValue> void delete(final Long id,
- final Class<T> reference) {
+ public <T extends AbstractAttrValue> void delete(final Long id, final Class<T> reference) {
T attributeValue = find(id, reference);
if (attributeValue == null) {
@@ -62,8 +57,7 @@ public class AttrValueDAOImpl extends Ab
}
@Override
- public <T extends AbstractAttrValue> void delete(
- final T attributeValue) {
+ public <T extends AbstractAttrValue> void delete(final T attributeValue) {
if (attributeValue.getAttribute() != null) {
attributeValue.getAttribute().removeValue(attributeValue);
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ConfDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ConfDAOImpl.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ConfDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ConfDAOImpl.java Thu Mar 15 10:17:12 2012
@@ -29,8 +29,7 @@ import org.syncope.core.persistence.dao.
public class ConfDAOImpl extends AbstractDAOImpl implements ConfDAO {
@Override
- public SyncopeConf find(final String name)
- throws MissingConfKeyException {
+ public SyncopeConf find(final String name) throws MissingConfKeyException {
SyncopeConf result = find(name, null);
if (result == null) {
@@ -42,8 +41,7 @@ public class ConfDAOImpl extends Abstrac
@Override
public SyncopeConf find(final String name, final String defaultValue) {
- SyncopeConf syncopeConf =
- entityManager.find(SyncopeConf.class, name);
+ SyncopeConf syncopeConf = entityManager.find(SyncopeConf.class, name);
if (syncopeConf == null && defaultValue != null) {
syncopeConf = new SyncopeConf();
@@ -56,14 +54,12 @@ public class ConfDAOImpl extends Abstrac
@Override
public List<SyncopeConf> findAll() {
- Query query = entityManager.createQuery(
- "SELECT e FROM SyncopeConf e");
+ Query query = entityManager.createQuery("SELECT e FROM SyncopeConf e");
return query.getResultList();
}
@Override
- public SyncopeConf save(
- final SyncopeConf syncopeConfiguration) {
+ public SyncopeConf save(final SyncopeConf syncopeConfiguration) {
return entityManager.merge(syncopeConfiguration);
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ConnInstanceDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ConnInstanceDAOImpl.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ConnInstanceDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ConnInstanceDAOImpl.java Thu Mar 15 10:17:12 2012
@@ -32,8 +32,7 @@ import org.syncope.core.persistence.dao.
import org.syncope.core.persistence.dao.ResourceDAO;
@Repository
-public class ConnInstanceDAOImpl extends AbstractDAOImpl
- implements ConnInstanceDAO {
+public class ConnInstanceDAOImpl extends AbstractDAOImpl implements ConnInstanceDAO {
@Autowired
private ResourceDAO resourceDAO;
@@ -48,8 +47,7 @@ public class ConnInstanceDAOImpl extends
@Override
public List<ConnInstance> findAll() {
- Query query = entityManager.createQuery("SELECT e "
- + "FROM " + ConnInstance.class.getSimpleName() + " e");
+ Query query = entityManager.createQuery("SELECT e " + "FROM " + ConnInstance.class.getSimpleName() + " e");
return query.getResultList();
}
@@ -75,9 +73,8 @@ public class ConnInstanceDAOImpl extends
return;
}
- Set<String> resourceNames =
- new HashSet<String>(connInstance.getResources().size());
- for (ExternalResource resource: connInstance.getResources()) {
+ Set<String> resourceNames = new HashSet<String>(connInstance.getResources().size());
+ for (ExternalResource resource : connInstance.getResources()) {
resourceNames.add(resource.getName());
}
for (String resourceName : resourceNames) {
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/DerAttrDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/DerAttrDAOImpl.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/DerAttrDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/DerAttrDAOImpl.java Thu Mar 15 10:17:12 2012
@@ -28,31 +28,26 @@ import org.syncope.core.persistence.dao.
public class DerAttrDAOImpl extends AbstractDAOImpl implements DerAttrDAO {
@Override
- public <T extends AbstractDerAttr> T find(
- final Long id, final Class<T> reference) {
+ public <T extends AbstractDerAttr> T find(final Long id, final Class<T> reference) {
return entityManager.find(reference, id);
}
@Override
- public <T extends AbstractDerAttr> List<T> findAll(
- final Class<T> reference) {
+ public <T extends AbstractDerAttr> List<T> findAll(final Class<T> reference) {
- Query query = entityManager.createQuery(
- "SELECT e FROM " + reference.getSimpleName() + " e");
+ Query query = entityManager.createQuery("SELECT e FROM " + reference.getSimpleName() + " e");
return query.getResultList();
}
@Override
- public <T extends AbstractDerAttr> T save(
- final T derivedAttribute) {
+ public <T extends AbstractDerAttr> T save(final T derivedAttribute) {
return entityManager.merge(derivedAttribute);
}
@Override
- public <T extends AbstractDerAttr> void delete(
- final Long id, final Class<T> reference) {
+ public <T extends AbstractDerAttr> void delete(final Long id, final Class<T> reference) {
T derivedAttribute = find(id, reference);
if (derivedAttribute == null) {
@@ -63,12 +58,10 @@ public class DerAttrDAOImpl extends Abst
}
@Override
- public <T extends AbstractDerAttr> void delete(
- final T derivedAttribute) {
+ public <T extends AbstractDerAttr> void delete(final T derivedAttribute) {
if (derivedAttribute.getOwner() != null) {
- derivedAttribute.getOwner().
- removeDerivedAttribute(derivedAttribute);
+ derivedAttribute.getOwner().removeDerivedAttribute(derivedAttribute);
}
entityManager.remove(derivedAttribute);
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/DerSchemaDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/DerSchemaDAOImpl.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/DerSchemaDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/DerSchemaDAOImpl.java Thu Mar 15 10:17:12 2012
@@ -41,18 +41,15 @@ public class DerSchemaDAOImpl extends Ab
private ResourceDAO resourceDAO;
@Override
- public <T extends AbstractDerSchema> T find(final String name,
- final Class<T> reference) {
+ public <T extends AbstractDerSchema> T find(final String name, final Class<T> reference) {
return entityManager.find(reference, name);
}
@Override
- public <T extends AbstractDerSchema> List<T> findAll(
- final Class<T> reference) {
+ public <T extends AbstractDerSchema> List<T> findAll(final Class<T> reference) {
- Query query = entityManager.createQuery(
- "SELECT e FROM " + reference.getSimpleName() + " e");
+ Query query = entityManager.createQuery("SELECT e FROM " + reference.getSimpleName() + " e");
return query.getResultList();
}
@@ -62,22 +59,18 @@ public class DerSchemaDAOImpl extends Ab
}
@Override
- public void delete(final String name,
- final AttributableUtil attributableUtil) {
+ public void delete(final String name, final AttributableUtil attributableUtil) {
- final AbstractDerSchema derivedSchema =
- find(name, attributableUtil.derivedSchemaClass());
+ final AbstractDerSchema derivedSchema = find(name, attributableUtil.derivedSchemaClass());
if (derivedSchema == null) {
return;
}
- List<? extends AbstractDerAttr> attributes = getAttributes(
- derivedSchema,
- attributableUtil.derivedAttributeClass());
+ List<? extends AbstractDerAttr> attributes = getAttributes(derivedSchema, attributableUtil
+ .derivedAttributeClass());
- final Set<Long> derivedAttributeIds =
- new HashSet<Long>(attributes.size());
+ final Set<Long> derivedAttributeIds = new HashSet<Long>(attributes.size());
Class attributeClass = null;
@@ -90,20 +83,18 @@ public class DerSchemaDAOImpl extends Ab
derivedAttributeDAO.delete(derivedAttributeId, attributeClass);
}
- resourceDAO.deleteMappings(
- name, attributableUtil.derivedIntMappingType());
+ resourceDAO.deleteMappings(name, attributableUtil.derivedIntMappingType());
entityManager.remove(derivedSchema);
}
@Override
- public <T extends AbstractDerAttr> List<T> getAttributes(
- final AbstractDerSchema derivedSchema, final Class<T> reference) {
+ public <T extends AbstractDerAttr> List<T> getAttributes(final AbstractDerSchema derivedSchema,
+ final Class<T> reference) {
- Query query = entityManager.createQuery(
- "SELECT e FROM " + reference.getSimpleName() + " e"
+ Query query = entityManager.createQuery("SELECT e FROM " + reference.getSimpleName() + " e"
+ " WHERE e.derivedSchema=:schema");
-
+
query.setParameter("schema", derivedSchema);
return query.getResultList();
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/EntitlementDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/EntitlementDAOImpl.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/EntitlementDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/EntitlementDAOImpl.java Thu Mar 15 10:17:12 2012
@@ -29,8 +29,7 @@ import org.syncope.core.persistence.dao.
import org.syncope.core.util.EntitlementUtil;
@Repository
-public class EntitlementDAOImpl extends AbstractDAOImpl
- implements EntitlementDAO {
+public class EntitlementDAOImpl extends AbstractDAOImpl implements EntitlementDAO {
@Autowired
private RoleDAO roleDAO;
@@ -55,8 +54,7 @@ public class EntitlementDAOImpl extends
@Override
public Entitlement saveEntitlementRole(final SyncopeRole role) {
Entitlement roleEnt = new Entitlement();
- roleEnt.setName(EntitlementUtil.getEntitlementNameFromRoleId(
- role.getId()));
+ roleEnt.setName(EntitlementUtil.getEntitlementNameFromRoleId(role.getId()));
roleEnt.setDescription("Entitlement for managing role " + role.getId());
return save(roleEnt);
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/LoggerDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/LoggerDAOImpl.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/LoggerDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/LoggerDAOImpl.java Thu Mar 15 10:17:12 2012
@@ -36,8 +36,7 @@ public class LoggerDAOImpl extends Abstr
@Override
public List<SyncopeLogger> findAll(final SyncopeLoggerType type) {
- Query query = entityManager.createQuery(
- "SELECT e FROM " + SyncopeLogger.class.getSimpleName() + " e "
+ Query query = entityManager.createQuery("SELECT e FROM " + SyncopeLogger.class.getSimpleName() + " e "
+ "WHERE e.type=:type");
query.setParameter("type", type);
return query.getResultList();
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/MembershipDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/MembershipDAOImpl.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/MembershipDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/MembershipDAOImpl.java Thu Mar 15 10:17:12 2012
@@ -31,8 +31,7 @@ import org.syncope.core.persistence.dao.
import org.syncope.core.persistence.dao.UserDAO;
@Repository
-public class MembershipDAOImpl extends AbstractDAOImpl
- implements MembershipDAO {
+public class MembershipDAOImpl extends AbstractDAOImpl implements MembershipDAO {
@Autowired
private UserDAO userDAO;
@@ -55,11 +54,9 @@ public class MembershipDAOImpl extends A
try {
result = (Membership) query.getSingleResult();
- }
- catch (NoResultException e) {
+ } catch (NoResultException e) {
if (LOG.isDebugEnabled()) {
- LOG.debug("No membership was found for user "
- + user + " and role " + role);
+ LOG.debug("No membership was found for user " + user + " and role " + role);
}
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/NotificationDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/NotificationDAOImpl.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/NotificationDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/NotificationDAOImpl.java Thu Mar 15 10:17:12 2012
@@ -26,8 +26,7 @@ import org.syncope.core.persistence.dao.
import org.syncope.core.persistence.validation.entity.InvalidEntityException;
@Repository
-public class NotificationDAOImpl extends AbstractDAOImpl
- implements NotificationDAO {
+public class NotificationDAOImpl extends AbstractDAOImpl implements NotificationDAO {
@Override
public Notification find(final Long id) {
@@ -36,14 +35,12 @@ public class NotificationDAOImpl extends
@Override
public List<Notification> findAll() {
- Query query = entityManager.createQuery("SELECT e "
- + "FROM " + Notification.class.getSimpleName() + " e");
+ Query query = entityManager.createQuery("SELECT e " + "FROM " + Notification.class.getSimpleName() + " e");
return query.getResultList();
}
@Override
- public Notification save(final Notification notification)
- throws InvalidEntityException {
+ public Notification save(final Notification notification) throws InvalidEntityException {
return entityManager.merge(notification);
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/PolicyDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/PolicyDAOImpl.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/PolicyDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/PolicyDAOImpl.java Thu Mar 15 10:17:12 2012
@@ -29,8 +29,7 @@ import org.syncope.core.persistence.dao.
import org.syncope.types.PolicyType;
@Repository
-public class PolicyDAOImpl extends AbstractDAOImpl
- implements PolicyDAO {
+public class PolicyDAOImpl extends AbstractDAOImpl implements PolicyDAO {
@Override
public Policy find(final Long id) {
@@ -39,8 +38,7 @@ public class PolicyDAOImpl extends Abstr
@Override
public List<? extends Policy> find(final PolicyType type) {
- final Query query = entityManager.createQuery(
- "SELECT e FROM Policy e WHERE e.type=:type");
+ final Query query = entityManager.createQuery("SELECT e FROM Policy e WHERE e.type=:type");
query.setParameter("type", type);
return query.getResultList();
@@ -50,21 +48,24 @@ public class PolicyDAOImpl extends Abstr
public PasswordPolicy getGlobalPasswordPolicy() {
List<? extends Policy> policies = find(PolicyType.GLOBAL_PASSWORD);
return policies == null || policies.isEmpty()
- ? null : (PasswordPolicy) policies.get(0);
+ ? null
+ : (PasswordPolicy) policies.get(0);
}
@Override
public AccountPolicy getGlobalAccountPolicy() {
List<? extends Policy> policies = find(PolicyType.GLOBAL_ACCOUNT);
return policies == null || policies.isEmpty()
- ? null : (AccountPolicy) policies.get(0);
+ ? null
+ : (AccountPolicy) policies.get(0);
}
@Override
public SyncPolicy getGlobalSyncPolicy() {
List<? extends Policy> policies = find(PolicyType.GLOBAL_SYNC);
return policies == null || policies.isEmpty()
- ? null : (SyncPolicy) policies.get(0);
+ ? null
+ : (SyncPolicy) policies.get(0);
}
@Override
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ReportDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ReportDAOImpl.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ReportDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ReportDAOImpl.java Thu Mar 15 10:17:12 2012
@@ -40,10 +40,11 @@ public class ReportDAOImpl extends Abstr
@Override
public List<Report> findAll(final int page, final int itemsPerPage) {
- final Query query = entityManager.createQuery(
- "SELECT e FROM " + Report.class.getSimpleName() + " e");
+ final Query query = entityManager.createQuery("SELECT e FROM " + Report.class.getSimpleName() + " e");
- query.setFirstResult(itemsPerPage * (page <= 0 ? 0 : page - 1));
+ query.setFirstResult(itemsPerPage * (page <= 0
+ ? 0
+ : page - 1));
if (itemsPerPage > 0) {
query.setMaxResults(itemsPerPage);
@@ -54,15 +55,13 @@ public class ReportDAOImpl extends Abstr
@Override
public int count() {
- Query countQuery = entityManager.createNativeQuery(
- "SELECT COUNT(id) FROM " + Report.class.getSimpleName());
+ Query countQuery = entityManager.createNativeQuery("SELECT COUNT(id) FROM " + Report.class.getSimpleName());
return ((Number) countQuery.getSingleResult()).intValue();
}
@Override
- public Report save(final Report report)
- throws InvalidEntityException {
+ public Report save(final Report report) throws InvalidEntityException {
return entityManager.merge(report);
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ReportExecDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ReportExecDAOImpl.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ReportExecDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ReportExecDAOImpl.java Thu Mar 15 10:17:12 2012
@@ -28,27 +28,24 @@ import org.syncope.core.persistence.dao.
import org.syncope.core.persistence.validation.entity.InvalidEntityException;
@Repository
-public class ReportExecDAOImpl extends AbstractDAOImpl
- implements ReportExecDAO {
+public class ReportExecDAOImpl extends AbstractDAOImpl implements ReportExecDAO {
@Override
public ReportExec find(final Long id) {
return entityManager.find(ReportExec.class, id);
}
- private ReportExec findLatest(final Report report,
- final String field) {
+ private ReportExec findLatest(final Report report, final String field) {
- Query query = entityManager.createQuery("SELECT e "
- + "FROM " + ReportExec.class.getSimpleName() + " e "
- + "WHERE e.report=:report "
- + "ORDER BY e." + field + " DESC");
+ Query query = entityManager.createQuery("SELECT e " + "FROM " + ReportExec.class.getSimpleName() + " e "
+ + "WHERE e.report=:report " + "ORDER BY e." + field + " DESC");
query.setParameter("report", report);
query.setMaxResults(1);
List<ReportExec> result = query.getResultList();
return result == null || result.isEmpty()
- ? null : result.iterator().next();
+ ? null
+ : result.iterator().next();
}
@Override
@@ -63,8 +60,7 @@ public class ReportExecDAOImpl extends A
@Override
public List<ReportExec> findAll() {
- Query query = entityManager.createQuery(
- "SELECT e FROM " + ReportExec.class.getSimpleName() + " e");
+ Query query = entityManager.createQuery("SELECT e FROM " + ReportExec.class.getSimpleName() + " e");
return query.getResultList();
}
@@ -78,8 +74,7 @@ public class ReportExecDAOImpl extends A
*/
@Override
@Transactional(rollbackFor = Throwable.class)
- public ReportExec save(final ReportExec execution)
- throws InvalidEntityException {
+ public ReportExec save(final ReportExec execution) throws InvalidEntityException {
return entityManager.merge(execution);
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ResourceDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ResourceDAOImpl.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ResourceDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ResourceDAOImpl.java Thu Mar 15 10:17:12 2012
@@ -40,8 +40,7 @@ import org.syncope.core.persistence.dao.
import org.syncope.types.IntMappingType;
@Repository
-public class ResourceDAOImpl extends AbstractDAOImpl
- implements ResourceDAO {
+public class ResourceDAOImpl extends AbstractDAOImpl implements ResourceDAO {
@Autowired
private TaskDAO taskDAO;
@@ -57,10 +56,8 @@ public class ResourceDAOImpl extends Abs
@Override
public ExternalResource find(final String name) {
- TypedQuery<ExternalResource> query =
- entityManager.createQuery("SELECT e "
- + "FROM " + ExternalResource.class.getSimpleName() + " e "
- + "WHERE e.name = :name", ExternalResource.class);
+ TypedQuery<ExternalResource> query = entityManager.createQuery("SELECT e " + "FROM "
+ + ExternalResource.class.getSimpleName() + " e " + "WHERE e.name = :name", ExternalResource.class);
query.setParameter("name", name);
ExternalResource result = null;
@@ -74,15 +71,13 @@ public class ResourceDAOImpl extends Abs
@Override
public List<ExternalResource> findAll() {
- Query query = entityManager.createQuery("SELECT e "
- + "FROM " + ExternalResource.class.getSimpleName() + " e");
+ Query query = entityManager.createQuery("SELECT e " + "FROM " + ExternalResource.class.getSimpleName() + " e");
return query.getResultList();
}
@Override
public List<ExternalResource> findAllByPriority() {
- Query query = entityManager.createQuery("SELECT e "
- + "FROM " + ExternalResource.class.getSimpleName() + " e "
+ Query query = entityManager.createQuery("SELECT e " + "FROM " + ExternalResource.class.getSimpleName() + " e "
+ "ORDER BY e.propagationPriority");
return query.getResultList();
}
@@ -97,7 +92,7 @@ public class ResourceDAOImpl extends Abs
* @return the same entity, updated
*/
@Override
- @Transactional(rollbackFor = {Throwable.class})
+ @Transactional(rollbackFor = { Throwable.class })
public ExternalResource save(final ExternalResource resource) {
ExternalResource merged = entityManager.merge(resource);
try {
@@ -110,40 +105,32 @@ public class ResourceDAOImpl extends Abs
@Override
public List<SchemaMapping> findAllMappings() {
- Query query = entityManager.createQuery("SELECT e FROM "
- + SchemaMapping.class.getSimpleName() + " e");
+ Query query = entityManager.createQuery("SELECT e FROM " + SchemaMapping.class.getSimpleName() + " e");
return query.getResultList();
}
@Override
- public SchemaMapping getMappingForAccountId(
- final String resourceName) {
+ public SchemaMapping getMappingForAccountId(final String resourceName) {
- Query query = entityManager.createQuery("SELECT m FROM "
- + SchemaMapping.class.getSimpleName() + " m "
- + "WHERE m.resource.name=:resourceName "
- + "AND m.accountid = 1");
+ Query query = entityManager.createQuery("SELECT m FROM " + SchemaMapping.class.getSimpleName() + " m "
+ + "WHERE m.resource.name=:resourceName " + "AND m.accountid = 1");
query.setParameter("resourceName", resourceName);
return (SchemaMapping) query.getSingleResult();
}
@Override
- public void deleteMappings(final String intAttrName,
- final IntMappingType intMappingType) {
+ public void deleteMappings(final String intAttrName, final IntMappingType intMappingType) {
- if (intMappingType == IntMappingType.SyncopeUserId
- || intMappingType == IntMappingType.Password
+ if (intMappingType == IntMappingType.SyncopeUserId || intMappingType == IntMappingType.Password
|| intMappingType == IntMappingType.Username) {
return;
}
- Query query = entityManager.createQuery("DELETE FROM "
- + SchemaMapping.class.getSimpleName()
- + " m WHERE m.intAttrName=:intAttrName "
- + "AND m.intMappingType=:intMappingType");
+ Query query = entityManager.createQuery("DELETE FROM " + SchemaMapping.class.getSimpleName()
+ + " m WHERE m.intAttrName=:intAttrName " + "AND m.intMappingType=:intMappingType");
query.setParameter("intAttrName", intAttrName);
query.setParameter("intMappingType", intMappingType);
@@ -151,8 +138,7 @@ public class ResourceDAOImpl extends Abs
LOG.debug("Removed {} schema mappings", items);
// Make empty SchemaMapping query cache
- entityManager.getEntityManagerFactory().getCache().
- evict(SchemaMapping.class);
+ entityManager.getEntityManagerFactory().getCache().evict(SchemaMapping.class);
}
@Override
@@ -172,8 +158,7 @@ public class ResourceDAOImpl extends Abs
role.removeResource(resource);
}
- if (resource.getConnector() != null
- && resource.getConnector().getResources() != null
+ if (resource.getConnector() != null && resource.getConnector().getResources() != null
&& !resource.getConnector().getResources().isEmpty()) {
resource.getConnector().getResources().remove(resource);
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/RoleDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/RoleDAOImpl.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/RoleDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/RoleDAOImpl.java Thu Mar 15 10:17:12 2012
@@ -40,8 +40,7 @@ public class RoleDAOImpl extends Abstrac
@Override
public SyncopeRole find(final Long id) {
- TypedQuery<SyncopeRole> query = entityManager.createQuery(
- "SELECT e FROM SyncopeRole e WHERE e.id = :id",
+ TypedQuery<SyncopeRole> query = entityManager.createQuery("SELECT e FROM SyncopeRole e WHERE e.id = :id",
SyncopeRole.class);
query.setParameter("id", id);
@@ -56,8 +55,7 @@ public class RoleDAOImpl extends Abstrac
@Override
public List<SyncopeRole> find(final String name) {
- Query query = entityManager.createQuery(
- "SELECT e FROM SyncopeRole e WHERE e.name = :name");
+ Query query = entityManager.createQuery("SELECT e FROM SyncopeRole e WHERE e.name = :name");
query.setParameter("name", name);
return query.getResultList();
@@ -67,25 +65,24 @@ public class RoleDAOImpl extends Abstrac
public SyncopeRole find(final String name, final Long parentId) {
Query query;
if (parentId != null) {
- query = entityManager.createQuery(
- "SELECT r FROM SyncopeRole r WHERE "
+ query = entityManager.createQuery("SELECT r FROM SyncopeRole r WHERE "
+ "r.name=:name AND r.parent.id=:parentId");
query.setParameter("parentId", parentId);
} else {
- query = entityManager.createQuery(
- "SELECT r FROM SyncopeRole r WHERE "
+ query = entityManager.createQuery("SELECT r FROM SyncopeRole r WHERE "
+ "r.name=:name AND r.parent IS NULL");
}
query.setParameter("name", name);
List<SyncopeRole> result = query.getResultList();
- return result.isEmpty() ? null : result.get(0);
+ return result.isEmpty()
+ ? null
+ : result.get(0);
}
@Override
public List<SyncopeRole> findByEntitlement(final Entitlement entitlement) {
- Query query = entityManager.createQuery(
- "SELECT e FROM " + SyncopeRole.class.getSimpleName() + " e "
+ Query query = entityManager.createQuery("SELECT e FROM " + SyncopeRole.class.getSimpleName() + " e "
+ "WHERE :entitlement MEMBER OF e.entitlements");
query.setParameter("entitlement", entitlement);
@@ -94,8 +91,7 @@ public class RoleDAOImpl extends Abstrac
@Override
public List<SyncopeRole> findByResource(final ExternalResource resource) {
- Query query = entityManager.createQuery(
- "SELECT e FROM " + SyncopeRole.class.getSimpleName() + " e "
+ Query query = entityManager.createQuery("SELECT e FROM " + SyncopeRole.class.getSimpleName() + " e "
+ "WHERE :resource MEMBER OF e.resources");
query.setParameter("resource", resource);
@@ -104,9 +100,7 @@ public class RoleDAOImpl extends Abstrac
@Override
public List<SyncopeRole> findChildren(final Long roleId) {
- Query query = entityManager.createQuery(
- "SELECT r FROM SyncopeRole r WHERE "
- + "r.parent.id=:roleId");
+ Query query = entityManager.createQuery("SELECT r FROM SyncopeRole r WHERE " + "r.parent.id=:roleId");
query.setParameter("roleId", roleId);
return query.getResultList();
}
@@ -119,8 +113,7 @@ public class RoleDAOImpl extends Abstrac
@Override
public List<Membership> findMemberships(final SyncopeRole role) {
- Query query = entityManager.createQuery(
- "SELECT e FROM " + Membership.class.getSimpleName() + " e"
+ Query query = entityManager.createQuery("SELECT e FROM " + Membership.class.getSimpleName() + " e"
+ " WHERE e.syncopeRole=:role");
query.setParameter("role", role);
@@ -152,8 +145,7 @@ public class RoleDAOImpl extends Abstrac
return;
}
- Query query = entityManager.createQuery(
- "SELECT r FROM SyncopeRole r WHERE r.parent.id=:id");
+ Query query = entityManager.createQuery("SELECT r FROM SyncopeRole r WHERE r.parent.id=:id");
query.setParameter("id", id);
List<SyncopeRole> childrenRoles = query.getResultList();
for (SyncopeRole child : childrenRoles) {
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/SchemaDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/SchemaDAOImpl.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/SchemaDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/SchemaDAOImpl.java Thu Mar 15 10:17:12 2012
@@ -32,8 +32,7 @@ import org.syncope.core.persistence.dao.
import org.syncope.core.util.AttributableUtil;
@Repository
-public class SchemaDAOImpl extends AbstractDAOImpl
- implements SchemaDAO {
+public class SchemaDAOImpl extends AbstractDAOImpl implements SchemaDAO {
@Autowired
private AttrDAO attributeDAO;
@@ -42,28 +41,23 @@ public class SchemaDAOImpl extends Abstr
private ResourceDAO resourceDAO;
@Override
- public <T extends AbstractSchema> T find(final String name,
- final Class<T> reference) {
+ public <T extends AbstractSchema> T find(final String name, final Class<T> reference) {
return entityManager.find(reference, name);
}
@Override
- public <T extends AbstractSchema> List<T> findAll(
- final Class<T> reference) {
+ public <T extends AbstractSchema> List<T> findAll(final Class<T> reference) {
- Query query = entityManager.createQuery(
- "SELECT e FROM " + reference.getSimpleName() + " e");
+ Query query = entityManager.createQuery("SELECT e FROM " + reference.getSimpleName() + " e");
return query.getResultList();
}
@Override
- public <T extends AbstractAttr> List<T> getAttributes(
- final AbstractSchema schema, final Class<T> reference) {
+ public <T extends AbstractAttr> List<T> getAttributes(final AbstractSchema schema, final Class<T> reference) {
- Query query = entityManager.createQuery(
- "SELECT e FROM " + reference.getSimpleName() + " e"
+ Query query = entityManager.createQuery("SELECT e FROM " + reference.getSimpleName() + " e"
+ " WHERE e.schema=:schema");
query.setParameter("schema", schema);
@@ -76,16 +70,14 @@ public class SchemaDAOImpl extends Abstr
}
@Override
- public void delete(final String name,
- final AttributableUtil attributableUtil) {
+ public void delete(final String name, final AttributableUtil attributableUtil) {
AbstractSchema schema = find(name, attributableUtil.schemaClass());
if (schema == null) {
return;
}
- List<? extends AbstractAttr> attributes = getAttributes(schema,
- attributableUtil.attributeClass());
+ List<? extends AbstractAttr> attributes = getAttributes(schema, attributableUtil.attributeClass());
Set<Long> attributeIds = new HashSet<Long>(attributes.size());
for (AbstractAttr attribute : attributes) {
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/TaskDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/TaskDAOImpl.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/TaskDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/TaskDAOImpl.java Thu Mar 15 10:17:12 2012
@@ -32,8 +32,7 @@ import org.syncope.core.persistence.bean
import org.syncope.core.persistence.dao.TaskDAO;
@Repository
-public class TaskDAOImpl extends AbstractDAOImpl
- implements TaskDAO {
+public class TaskDAOImpl extends AbstractDAOImpl implements TaskDAO {
@Override
@Transactional(readOnly = true)
@@ -41,15 +40,12 @@ public class TaskDAOImpl extends Abstrac
return (T) entityManager.find(Task.class, id);
}
- private <T extends Task> StringBuilder buildfindAllQuery(
- final Class<T> reference) {
+ private <T extends Task> StringBuilder buildfindAllQuery(final Class<T> reference) {
- StringBuilder queryString =
- new StringBuilder("SELECT e FROM ").append(reference.
- getSimpleName()).append(" e ");
+ StringBuilder queryString = new StringBuilder("SELECT e FROM ").append(reference.getSimpleName()).append(" e ");
if (SchedTask.class.equals(reference)) {
- queryString.append("WHERE e.id NOT IN (SELECT e.id FROM ").
- append(SyncTask.class.getSimpleName()).append(" e) ");
+ queryString.append("WHERE e.id NOT IN (SELECT e.id FROM ").append(SyncTask.class.getSimpleName()).append(
+ " e) ");
}
return queryString;
@@ -64,8 +60,7 @@ public class TaskDAOImpl extends Abstrac
}
@Override
- public <T extends Task> List<T> findAll(
- final ExternalResource resource, final Class<T> reference) {
+ public <T extends Task> List<T> findAll(final ExternalResource resource, final Class<T> reference) {
StringBuilder queryString = buildfindAllQuery(reference);
if (SchedTask.class.equals(reference)) {
@@ -87,13 +82,13 @@ public class TaskDAOImpl extends Abstrac
}
@Override
- public <T extends Task> List<T> findAll(final int page,
- final int itemsPerPage, final Class<T> reference) {
+ public <T extends Task> List<T> findAll(final int page, final int itemsPerPage, final Class<T> reference) {
- final Query query = entityManager.createQuery(
- buildfindAllQuery(reference).toString());
+ final Query query = entityManager.createQuery(buildfindAllQuery(reference).toString());
- query.setFirstResult(itemsPerPage * (page <= 0 ? 0 : page - 1));
+ query.setFirstResult(itemsPerPage * (page <= 0
+ ? 0
+ : page - 1));
if (itemsPerPage > 0) {
query.setMaxResults(itemsPerPage);
@@ -113,12 +108,10 @@ public class TaskDAOImpl extends Abstrac
}
@Override
- public List<PropagationTask> findAll(final ExternalResource resource,
- final SyncopeUser user) {
+ public List<PropagationTask> findAll(final ExternalResource resource, final SyncopeUser user) {
StringBuilder queryString = buildfindAllQuery(PropagationTask.class);
- queryString.append("WHERE e.syncopeUser=:user ").
- append("AND e.resource=:resource");
+ queryString.append("WHERE e.syncopeUser=:user ").append("AND e.resource=:resource");
final Query query = entityManager.createQuery(queryString.toString());
query.setParameter("user", user);
query.setParameter("resource", resource);
@@ -128,14 +121,13 @@ public class TaskDAOImpl extends Abstrac
@Override
public <T extends Task> int count(final Class<T> reference) {
- Query countQuery = entityManager.createNativeQuery(
- "SELECT COUNT(id) FROM Task WHERE DTYPE=?1");
+ Query countQuery = entityManager.createNativeQuery("SELECT COUNT(id) FROM Task WHERE DTYPE=?1");
countQuery.setParameter(1, reference.getSimpleName());
return ((Number) countQuery.getSingleResult()).intValue();
}
- @Transactional(rollbackFor = {Throwable.class})
+ @Transactional(rollbackFor = { Throwable.class })
@Override
public <T extends Task> T save(final T task) {
return entityManager.merge(task);
@@ -157,8 +149,7 @@ public class TaskDAOImpl extends Abstrac
}
@Override
- public <T extends Task> void deleteAll(
- final ExternalResource resource, final Class<T> reference) {
+ public <T extends Task> void deleteAll(final ExternalResource resource, final Class<T> reference) {
List<T> tasks = findAll(resource, reference);
if (tasks != null) {
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/TaskExecDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/TaskExecDAOImpl.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/TaskExecDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/TaskExecDAOImpl.java Thu Mar 15 10:17:12 2012
@@ -29,27 +29,24 @@ import org.syncope.core.persistence.bean
import org.syncope.core.persistence.dao.TaskExecDAO;
@Repository
-public class TaskExecDAOImpl extends AbstractDAOImpl
- implements TaskExecDAO {
+public class TaskExecDAOImpl extends AbstractDAOImpl implements TaskExecDAO {
@Override
public TaskExec find(final Long id) {
return entityManager.find(TaskExec.class, id);
}
- private <T extends Task> TaskExec findLatest(final T task,
- final String field) {
+ private <T extends Task> TaskExec findLatest(final T task, final String field) {
- Query query = entityManager.createQuery("SELECT e "
- + "FROM " + TaskExec.class.getSimpleName() + " e "
- + "WHERE e.task=:task "
- + "ORDER BY e." + field + " DESC");
+ Query query = entityManager.createQuery("SELECT e " + "FROM " + TaskExec.class.getSimpleName() + " e "
+ + "WHERE e.task=:task " + "ORDER BY e." + field + " DESC");
query.setParameter("task", task);
query.setMaxResults(1);
List<TaskExec> result = query.getResultList();
return result == null || result.isEmpty()
- ? null : result.iterator().next();
+ ? null
+ : result.iterator().next();
}
@Override
@@ -64,13 +61,11 @@ public class TaskExecDAOImpl extends Abs
@Override
public <T extends Task> List<TaskExec> findAll(Class<T> reference) {
- StringBuilder queryString = new StringBuilder("SELECT e FROM ").append(
- TaskExec.class.getSimpleName()).append(" e WHERE e.task IN (").
- append("SELECT t FROM ").append(reference.getSimpleName()).
- append(" t");
+ StringBuilder queryString = new StringBuilder("SELECT e FROM ").append(TaskExec.class.getSimpleName()).append(
+ " e WHERE e.task IN (").append("SELECT t FROM ").append(reference.getSimpleName()).append(" t");
if (SchedTask.class.equals(reference)) {
- queryString.append(" WHERE t.id NOT IN (SELECT t.id FROM ").
- append(SyncTask.class.getSimpleName()).append(" t) ");
+ queryString.append(" WHERE t.id NOT IN (SELECT t.id FROM ").append(SyncTask.class.getSimpleName()).append(
+ " t) ");
}
queryString.append(')');
@@ -88,7 +83,7 @@ public class TaskExecDAOImpl extends Abs
* @return the same entity, updated
*/
@Override
- @Transactional(rollbackFor = {Throwable.class})
+ @Transactional(rollbackFor = { Throwable.class })
public TaskExec save(final TaskExec execution) {
return entityManager.merge(execution);
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/UserDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/UserDAOImpl.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/UserDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/UserDAOImpl.java Thu Mar 15 10:17:12 2012
@@ -54,8 +54,7 @@ import org.syncope.core.persistence.dao.
import org.syncope.core.rest.controller.InvalidSearchConditionException;
@Repository
-public class UserDAOImpl extends AbstractDAOImpl
- implements UserDAO {
+public class UserDAOImpl extends AbstractDAOImpl implements UserDAO {
@Autowired
private SchemaDAO schemaDAO;
@@ -71,9 +70,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;
@@ -87,9 +85,8 @@ public class UserDAOImpl extends Abstrac
@Override
public SyncopeUser find(final String username) {
- TypedQuery<SyncopeUser> query = entityManager.createQuery(
- "SELECT e FROM " + SyncopeUser.class.getSimpleName() + " e "
- + "WHERE e.username = :username", SyncopeUser.class);
+ TypedQuery<SyncopeUser> query = entityManager.createQuery("SELECT e FROM " + SyncopeUser.class.getSimpleName()
+ + " e " + "WHERE e.username = :username", SyncopeUser.class);
query.setParameter("username", username);
SyncopeUser result = null;
@@ -103,9 +100,8 @@ public class UserDAOImpl extends Abstrac
@Override
public SyncopeUser findByWorkflowId(final String workflowId) {
- TypedQuery<SyncopeUser> query = entityManager.createQuery(
- "SELECT e FROM " + SyncopeUser.class.getSimpleName() + " e "
- + "WHERE e.workflowId = :workflowId", SyncopeUser.class);
+ TypedQuery<SyncopeUser> query = entityManager.createQuery("SELECT e FROM " + SyncopeUser.class.getSimpleName()
+ + " e " + "WHERE e.workflowId = :workflowId", SyncopeUser.class);
query.setParameter("workflowId", workflowId);
return query.getSingleResult();
@@ -124,8 +120,7 @@ public class UserDAOImpl extends Abstrac
* expression.
*/
@Override
- public List<SyncopeUser> findByDerAttrValue(
- final String schemaName, final String value)
+ public List<SyncopeUser> findByDerAttrValue(final String schemaName, final String value)
throws InvalidSearchConditionException {
UDerSchema schema = derSchemaDAO.find(schemaName, UDerSchema.class);
@@ -144,9 +139,8 @@ public class UserDAOImpl extends Abstrac
querystring.append(" AND a.owner_id IN ( ");
}
- querystring.append("SELECT a.owner_id ").
- append("FROM UAttr a, UAttrValue v, USchema s ").
- append("WHERE ").append(clause);
+ querystring.append("SELECT a.owner_id ").append("FROM UAttr a, UAttrValue v, USchema s ").append("WHERE ")
+ .append(clause);
if (subquery) {
querystring.append(')');
@@ -155,8 +149,7 @@ public class UserDAOImpl extends Abstrac
LOG.debug("Execute query {}", querystring);
- final Query query = entityManager.createNativeQuery(
- querystring.toString());
+ final Query query = entityManager.createNativeQuery(querystring.toString());
final List<SyncopeUser> result = new ArrayList<SyncopeUser>();
@@ -172,8 +165,7 @@ public class UserDAOImpl extends Abstrac
}
@Override
- public List<SyncopeUser> findByAttrValue(final String schemaName,
- final UAttrValue attrValue) {
+ public List<SyncopeUser> findByAttrValue(final String schemaName, final UAttrValue attrValue) {
USchema schema = schemaDAO.find(schemaName, USchema.class);
if (schema == null) {
@@ -182,30 +174,23 @@ public class UserDAOImpl extends Abstrac
}
final String entityName = schema.isUniqueConstraint()
- ? UAttrUniqueValue.class.getName() : UAttrValue.class.getName();
+ ? UAttrUniqueValue.class.getName()
+ : UAttrValue.class.getName();
- Query query = entityManager.createQuery(
- "SELECT e FROM " + entityName + " e"
- + " WHERE e.attribute.schema.name = :schemaName "
- + " AND (e.stringValue IS NOT NULL"
- + " AND e.stringValue = :stringValue)"
- + " OR (e.booleanValue IS NOT NULL"
- + " AND e.booleanValue = :booleanValue)"
- + " OR (e.dateValue IS NOT NULL"
- + " AND e.dateValue = :dateValue)"
- + " OR (e.longValue IS NOT NULL"
- + " AND e.longValue = :longValue)"
- + " OR (e.doubleValue IS NOT NULL"
- + " AND e.doubleValue = :doubleValue)");
+ Query query = entityManager.createQuery("SELECT e FROM " + entityName + " e"
+ + " WHERE e.attribute.schema.name = :schemaName " + " AND (e.stringValue IS NOT NULL"
+ + " AND e.stringValue = :stringValue)" + " OR (e.booleanValue IS NOT NULL"
+ + " AND e.booleanValue = :booleanValue)" + " OR (e.dateValue IS NOT NULL"
+ + " AND e.dateValue = :dateValue)" + " OR (e.longValue IS NOT NULL" + " AND e.longValue = :longValue)"
+ + " OR (e.doubleValue IS NOT NULL" + " AND e.doubleValue = :doubleValue)");
query.setParameter("schemaName", schemaName);
query.setParameter("stringValue", attrValue.getStringValue());
- query.setParameter("booleanValue",
- attrValue.getBooleanValue() == null ? null
+ query.setParameter("booleanValue", attrValue.getBooleanValue() == null
+ ? null
: attrValue.getBooleanAsInteger(attrValue.getBooleanValue()));
if (attrValue.getDateValue() != null) {
- query.setParameter("dateValue",
- attrValue.getDateValue(), TemporalType.TIMESTAMP);
+ query.setParameter("dateValue", attrValue.getDateValue(), TemporalType.TIMESTAMP);
} else {
query.setParameter("dateValue", null);
}
@@ -214,8 +199,7 @@ public class UserDAOImpl extends Abstrac
List<SyncopeUser> result = new ArrayList<SyncopeUser>();
SyncopeUser user;
- for (AbstractAttrValue value :
- (List<AbstractAttrValue>) query.getResultList()) {
+ for (AbstractAttrValue value : (List<AbstractAttrValue>) query.getResultList()) {
user = (SyncopeUser) value.getAttribute().getOwner();
if (!result.contains(user)) {
@@ -227,8 +211,7 @@ public class UserDAOImpl extends Abstrac
}
@Override
- public SyncopeUser findByAttrUniqueValue(final String schemaName,
- final UAttrValue attrUniqueValue) {
+ public SyncopeUser findByAttrUniqueValue(final String schemaName, final UAttrValue attrUniqueValue) {
USchema schema = schemaDAO.find(schemaName, USchema.class);
if (schema == null) {
@@ -236,19 +219,19 @@ public class UserDAOImpl extends Abstrac
return null;
}
if (!schema.isUniqueConstraint()) {
- LOG.error("This schema has not unique constraint: '{}'",
- schemaName);
+ LOG.error("This schema has not unique constraint: '{}'", schemaName);
return null;
}
List<SyncopeUser> result = findByAttrValue(schemaName, attrUniqueValue);
- return result.isEmpty() ? null : result.iterator().next();
+ return result.isEmpty()
+ ? null
+ : result.iterator().next();
}
@Override
public List<SyncopeUser> findByResource(final ExternalResource resource) {
- Query query = entityManager.createQuery(
- "SELECT e FROM " + SyncopeUser.class.getSimpleName() + " e "
+ Query query = entityManager.createQuery("SELECT e FROM " + SyncopeUser.class.getSimpleName() + " e "
+ "WHERE :resource MEMBER OF e.resources");
query.setParameter("resource", resource);
@@ -256,17 +239,14 @@ public class UserDAOImpl extends Abstrac
}
private StringBuilder getFindAllQuery(final Set<Long> adminRoles) {
- final StringBuilder queryString = new StringBuilder(
- "SELECT id FROM SyncopeUser WHERE id NOT IN (");
+ final StringBuilder queryString = new StringBuilder("SELECT id FROM SyncopeUser WHERE id NOT IN (");
if (adminRoles == null || adminRoles.isEmpty()) {
queryString.append("SELECT syncopeUser_id AS id FROM Membership");
} else {
- queryString.append("SELECT syncopeUser_id FROM Membership M1 ").
- append("WHERE syncopeRole_id IN (");
- queryString.append("SELECT syncopeRole_id FROM Membership M2 ").
- append("WHERE M2.syncopeUser_id=M1.syncopeUser_id ").
- append("AND syncopeRole_id NOT IN (");
+ queryString.append("SELECT syncopeUser_id FROM Membership M1 ").append("WHERE syncopeRole_id IN (");
+ queryString.append("SELECT syncopeRole_id FROM Membership M2 ").append(
+ "WHERE M2.syncopeUser_id=M1.syncopeUser_id ").append("AND syncopeRole_id NOT IN (");
queryString.append("SELECT id AS syncopeRole_id FROM SyncopeRole");
boolean firstRole = true;
@@ -294,13 +274,13 @@ public class UserDAOImpl extends Abstrac
}
@Override
- public final List<SyncopeUser> findAll(final Set<Long> adminRoles,
- final int page, final int itemsPerPage) {
+ public final List<SyncopeUser> findAll(final Set<Long> adminRoles, final int page, final int itemsPerPage) {
- final Query query = entityManager.createNativeQuery(
- getFindAllQuery(adminRoles).toString());
+ final Query query = entityManager.createNativeQuery(getFindAllQuery(adminRoles).toString());
- query.setFirstResult(itemsPerPage * (page <= 0 ? 0 : page - 1));
+ query.setFirstResult(itemsPerPage * (page <= 0
+ ? 0
+ : page - 1));
if (itemsPerPage > 0) {
query.setMaxResults(itemsPerPage);
@@ -320,15 +300,13 @@ public class UserDAOImpl extends Abstrac
}
}
- List<SyncopeUser> result =
- new ArrayList<SyncopeUser>(userIds.size());
+ List<SyncopeUser> result = new ArrayList<SyncopeUser>(userIds.size());
SyncopeUser user;
for (Object userId : userIds) {
user = find(((Number) userId).longValue());
if (user == null) {
- LOG.error("Could not find user with id {}, "
- + "even though returned by the native query", userId);
+ LOG.error("Could not find user with id {}, " + "even though returned by the native query", userId);
} else {
result.add(user);
}
@@ -343,8 +321,7 @@ public class UserDAOImpl extends Abstrac
queryString.insert(0, "SELECT COUNT(id) FROM (");
queryString.append(") count_user_id");
- Query countQuery =
- entityManager.createNativeQuery(queryString.toString());
+ Query countQuery = entityManager.createNativeQuery(queryString.toString());
return ((Number) countQuery.getSingleResult()).intValue();
}
@@ -400,8 +377,7 @@ public class UserDAOImpl extends Abstrac
* @return where clauses to use to build the query.
* @throws InvalidSearchConditionException in case of errors retrieving identifiers.
*/
- private Set<String> getWhereClause(
- final String expression, final String value)
+ private Set<String> getWhereClause(final String expression, final String value)
throws InvalidSearchConditionException {
final Parser parser = new Parser(new StringReader(expression));
@@ -413,12 +389,10 @@ 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.hasText(token.toString())) {
if (token.kind == ParserConstants.STRING_LITERAL) {
- literals.add(token.toString().
- substring(1, token.toString().length() - 1));
+ literals.add(token.toString().substring(1, token.toString().length() - 1));
}
if (token.kind == ParserConstants.IDENTIFIER) {
@@ -460,8 +434,7 @@ public class UserDAOImpl extends Abstrac
if (attrValues.size() != identifiers.size()) {
LOG.error("Ambiguous jexl expression resolution.");
- throw new InvalidSearchConditionException(
- "literals and values have different size");
+ throw new InvalidSearchConditionException("literals and values have different size");
}
// clauses to be used with INTERSECTed queries
@@ -483,8 +456,7 @@ public class UserDAOImpl extends Abstrac
schema = schemaDAO.find(identifiers.get(i), USchema.class);
if (schema == null) {
LOG.error("Invalid schema name '{}'", identifiers.get(i));
- throw new InvalidSearchConditionException(
- "Invalid schema name " + identifiers.get(i));
+ throw new InvalidSearchConditionException("Invalid schema name " + identifiers.get(i));
}
// clear builder
@@ -493,8 +465,7 @@ public class UserDAOImpl extends Abstrac
bld.append("(");
// set schema name
- bld.append("s.name = '").
- append(identifiers.get(i)).append("'");
+ bld.append("s.name = '").append(identifiers.get(i)).append("'");
bld.append(" AND ");
@@ -507,24 +478,19 @@ public class UserDAOImpl extends Abstrac
// use a value clause different for eanch different schema type
switch (schema.getType()) {
case Boolean:
- bld.append("v.booleanValue = '").
- append(attrValues.get(i)).append("'");
+ bld.append("v.booleanValue = '").append(attrValues.get(i)).append("'");
break;
case Long:
- bld.append("v.longValue = ").
- append(attrValues.get(i));
+ bld.append("v.longValue = ").append(attrValues.get(i));
break;
case Double:
- bld.append("v.doubleValue = ").
- append(attrValues.get(i));
+ bld.append("v.doubleValue = ").append(attrValues.get(i));
break;
case Date:
- bld.append("v.dateValue = '").
- append(attrValues.get(i)).append("'");
+ bld.append("v.dateValue = '").append(attrValues.get(i)).append("'");
break;
default:
- bld.append("v.stringValue = '").
- append(attrValues.get(i)).append("'");
+ bld.append("v.stringValue = '").append(attrValues.get(i)).append("'");
}
bld.append(")");
@@ -547,9 +513,7 @@ public class UserDAOImpl extends Abstrac
* @param literals literals/tokens.
* @return
*/
- private List<String> split(
- final String attrValue,
- final List<String> literals) {
+ private List<String> split(final String attrValue, final List<String> literals) {
final List<String> attrValues = new ArrayList<String>();
@@ -557,11 +521,9 @@ public class UserDAOImpl extends Abstrac
attrValues.add(attrValue);
} else {
- for (String token :
- attrValue.split(Pattern.quote(literals.get(0)))) {
+ for (String token : attrValue.split(Pattern.quote(literals.get(0)))) {
- attrValues.addAll(
- split(token, literals.subList(1, literals.size())));
+ attrValues.addAll(split(token, literals.subList(1, literals.size())));
}
}
Modified: incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/UserRequestDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/UserRequestDAOImpl.java?rev=1300882&r1=1300881&r2=1300882&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/UserRequestDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/UserRequestDAOImpl.java Thu Mar 15 10:17:12 2012
@@ -27,9 +27,8 @@ import org.syncope.core.persistence.dao.
import org.syncope.core.persistence.validation.entity.InvalidEntityException;
@Repository
-@Transactional(noRollbackFor = {Throwable.class})
-public class UserRequestDAOImpl extends AbstractDAOImpl
- implements UserRequestDAO {
+@Transactional(noRollbackFor = { Throwable.class })
+public class UserRequestDAOImpl extends AbstractDAOImpl implements UserRequestDAO {
@Override
@Transactional(readOnly = true)
@@ -40,14 +39,12 @@ public class UserRequestDAOImpl extends
@Override
@Transactional(readOnly = true)
public List<UserRequest> findAll() {
- Query query = entityManager.createQuery("SELECT e "
- + "FROM " + UserRequest.class.getSimpleName() + " e");
+ Query query = entityManager.createQuery("SELECT e " + "FROM " + UserRequest.class.getSimpleName() + " e");
return query.getResultList();
}
@Override
- public UserRequest save(UserRequest userRequest)
- throws InvalidEntityException {
+ public UserRequest save(UserRequest userRequest) throws InvalidEntityException {
return entityManager.merge(userRequest);
}