Formatted project
Change-Id: I6993ddfab02e06541b4138040280a4777c719562
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java b/full/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java
index 0ebfe42..4aa7cd4 100644
--- a/full/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java
+++ b/full/src/main/java/de/ids_mannheim/korap/dao/AnnotationDao.java
@@ -24,7 +24,8 @@
import jakarta.persistence.criteria.Root;
/**
- * AnnotationDao manages queries to database regarding annotations including
+ * AnnotationDao manages queries to database regarding annotations
+ * including
* foundry and layer pairs.
*
* @author margaretha
@@ -44,8 +45,8 @@
@SuppressWarnings("unchecked")
public List<AnnotationLayer> getAllFoundryLayerPairs () {
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
- CriteriaQuery<AnnotationLayer> query =
- criteriaBuilder.createQuery(AnnotationLayer.class);
+ CriteriaQuery<AnnotationLayer> query = criteriaBuilder
+ .createQuery(AnnotationLayer.class);
Root<AnnotationLayer> layer = query.from(AnnotationLayer.class);
layer.fetch(AnnotationLayer_.foundry);
layer.fetch(AnnotationLayer_.layer);
@@ -72,8 +73,8 @@
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
CriteriaQuery<Object> query = criteriaBuilder.createQuery();
- Root<AnnotationLayer> annotationPair =
- query.from(AnnotationLayer.class);
+ Root<AnnotationLayer> annotationPair = query
+ .from(AnnotationLayer.class);
annotationPair.fetch(AnnotationLayer_.foundry);
annotationPair.fetch(AnnotationLayer_.layer);
annotationPair.fetch(AnnotationLayer_.keys);
@@ -97,8 +98,8 @@
Predicate layerPredicate = criteriaBuilder.equal(annotationPair
.get(AnnotationLayer_.layer).get(Annotation_.code),
layer);
- Predicate andPredicate =
- criteriaBuilder.and(foundryPredicate, layerPredicate);
+ Predicate andPredicate = criteriaBuilder.and(foundryPredicate,
+ layerPredicate);
query.where(andPredicate);
}
}
@@ -109,8 +110,8 @@
public Annotation retrieveAnnotation (String code, String type) {
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
- CriteriaQuery<Annotation> query =
- criteriaBuilder.createQuery(Annotation.class);
+ CriteriaQuery<Annotation> query = criteriaBuilder
+ .createQuery(Annotation.class);
Root<Annotation> annotation = query.from(Annotation.class);
Predicate predicates = criteriaBuilder.and(
@@ -132,8 +133,8 @@
Annotation ann2 = retrieveAnnotation(layer, AnnotationType.LAYER);
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
- CriteriaQuery<AnnotationLayer> query =
- criteriaBuilder.createQuery(AnnotationLayer.class);
+ CriteriaQuery<AnnotationLayer> query = criteriaBuilder
+ .createQuery(AnnotationLayer.class);
Root<AnnotationLayer> annotation = query.from(AnnotationLayer.class);
Predicate predicates = criteriaBuilder.and(
@@ -188,8 +189,8 @@
@Transactional
public AnnotationKey createAnnotationKey (AnnotationLayer layer,
Annotation key) {
- AnnotationKey annotation =
- new AnnotationKey(layer.getId(), key.getId());
+ AnnotationKey annotation = new AnnotationKey(layer.getId(),
+ key.getId());
entityManager.persist(annotation);
return annotation;
}
@@ -198,8 +199,8 @@
Annotation key) {
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
- CriteriaQuery<AnnotationKey> query =
- criteriaBuilder.createQuery(AnnotationKey.class);
+ CriteriaQuery<AnnotationKey> query = criteriaBuilder
+ .createQuery(AnnotationKey.class);
Root<AnnotationKey> annotation = query.from(AnnotationKey.class);
Predicate predicates = criteriaBuilder.and(
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/DefaultSettingDao.java b/full/src/main/java/de/ids_mannheim/korap/dao/DefaultSettingDao.java
index f99990e..a6bfeee 100644
--- a/full/src/main/java/de/ids_mannheim/korap/dao/DefaultSettingDao.java
+++ b/full/src/main/java/de/ids_mannheim/korap/dao/DefaultSettingDao.java
@@ -60,7 +60,7 @@
throws KustvaktException {
ParameterChecker.checkObjectValue(username, "defaultSetting");
DefaultSetting defaultSetting = retrieveDefaultSetting(username);
- if (defaultSetting != null){
+ if (defaultSetting != null) {
entityManager.remove(defaultSetting);
}
}
@@ -70,8 +70,8 @@
ParameterChecker.checkStringValue(username, "username");
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
- CriteriaQuery<DefaultSetting> query =
- criteriaBuilder.createQuery(DefaultSetting.class);
+ CriteriaQuery<DefaultSetting> query = criteriaBuilder
+ .createQuery(DefaultSetting.class);
Root<DefaultSetting> defaultSetting = query.from(DefaultSetting.class);
query.select(defaultSetting);
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/PrivilegeDao.java b/full/src/main/java/de/ids_mannheim/korap/dao/PrivilegeDao.java
index f9c05e6..ad1e77b 100644
--- a/full/src/main/java/de/ids_mannheim/korap/dao/PrivilegeDao.java
+++ b/full/src/main/java/de/ids_mannheim/korap/dao/PrivilegeDao.java
@@ -57,8 +57,8 @@
@SuppressWarnings("unchecked")
public List<Privilege> retrievePrivilegeByRoleId (int roleId) {
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
- CriteriaQuery<Privilege> query =
- criteriaBuilder.createQuery(Privilege.class);
+ CriteriaQuery<Privilege> query = criteriaBuilder
+ .createQuery(Privilege.class);
Root<Privilege> root = query.from(Privilege.class);
root.fetch(Privilege_.role);
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/QueryAccessDao.java b/full/src/main/java/de/ids_mannheim/korap/dao/QueryAccessDao.java
index d341f38..5448b49 100644
--- a/full/src/main/java/de/ids_mannheim/korap/dao/QueryAccessDao.java
+++ b/full/src/main/java/de/ids_mannheim/korap/dao/QueryAccessDao.java
@@ -49,22 +49,19 @@
ParameterChecker.checkIntegerValue(accessId, "accessId");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<QueryAccess> query =
- builder.createQuery(QueryAccess.class);
+ CriteriaQuery<QueryAccess> query = builder
+ .createQuery(QueryAccess.class);
- Root<QueryAccess> access =
- query.from(QueryAccess.class);
+ Root<QueryAccess> access = query.from(QueryAccess.class);
query.select(access);
- query.where(
- builder.equal(access.get(QueryAccess_.id), accessId));
+ query.where(builder.equal(access.get(QueryAccess_.id), accessId));
Query q = entityManager.createQuery(query);
- try{
+ try {
return (QueryAccess) q.getSingleResult();
}
catch (NoResultException e) {
throw new KustvaktException(StatusCodes.NO_RESOURCE_FOUND,
- "Query access is not found",
- String.valueOf(accessId));
+ "Query access is not found", String.valueOf(accessId));
}
}
@@ -74,13 +71,12 @@
ParameterChecker.checkIntegerValue(queryId, "queryId");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<QueryAccess> query =
- builder.createQuery(QueryAccess.class);
+ CriteriaQuery<QueryAccess> query = builder
+ .createQuery(QueryAccess.class);
- Root<QueryAccess> access =
- query.from(QueryAccess.class);
- Join<QueryAccess, QueryDO> accessQuery =
- access.join(QueryAccess_.query);
+ Root<QueryAccess> access = query.from(QueryAccess.class);
+ Join<QueryAccess, QueryDO> accessQuery = access
+ .join(QueryAccess_.query);
Predicate p = builder.and(
builder.equal(accessQuery.get(QueryDO_.id), queryId),
@@ -98,17 +94,17 @@
ParameterChecker.checkStringValue(queryName, "queryName");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<QueryAccess> query =
- builder.createQuery(QueryAccess.class);
+ CriteriaQuery<QueryAccess> query = builder
+ .createQuery(QueryAccess.class);
- Root<QueryAccess> access =
- query.from(QueryAccess.class);
- Join<QueryAccess, QueryDO> accessQuery =
- access.join(QueryAccess_.query);
+ Root<QueryAccess> access = query.from(QueryAccess.class);
+ Join<QueryAccess, QueryDO> accessQuery = access
+ .join(QueryAccess_.query);
Predicate p = builder.and(
builder.equal(accessQuery.get(QueryDO_.name), queryName),
- builder.equal(accessQuery.get(QueryDO_.createdBy), queryCreator),
+ builder.equal(accessQuery.get(QueryDO_.createdBy),
+ queryCreator),
builder.equal(access.get(QueryAccess_.status),
QueryAccessStatus.ACTIVE));
query.select(access);
@@ -116,15 +112,13 @@
TypedQuery<QueryAccess> q = entityManager.createQuery(query);
return q.getResultList();
}
-
- public List<QueryAccess> retrieveAllAccess ()
- throws KustvaktException {
+
+ public List<QueryAccess> retrieveAllAccess () throws KustvaktException {
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<QueryAccess> query =
- builder.createQuery(QueryAccess.class);
- Root<QueryAccess> access =
- query.from(QueryAccess.class);
+ CriteriaQuery<QueryAccess> query = builder
+ .createQuery(QueryAccess.class);
+ Root<QueryAccess> access = query.from(QueryAccess.class);
query.select(access);
TypedQuery<QueryAccess> q = entityManager.createQuery(query);
return q.getResultList();
@@ -136,13 +130,12 @@
ParameterChecker.checkStringValue(queryName, "queryName");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<QueryAccess> query =
- builder.createQuery(QueryAccess.class);
+ CriteriaQuery<QueryAccess> query = builder
+ .createQuery(QueryAccess.class);
- Root<QueryAccess> access =
- query.from(QueryAccess.class);
- Join<QueryAccess, QueryDO> accessQuery =
- access.join(QueryAccess_.query);
+ Root<QueryAccess> access = query.from(QueryAccess.class);
+ Join<QueryAccess, QueryDO> accessQuery = access
+ .join(QueryAccess_.query);
Predicate conditions = builder.and(
builder.equal(accessQuery.get(QueryDO_.createdBy),
@@ -159,13 +152,12 @@
ParameterChecker.checkIntegerValue(groupId, "groupId");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<QueryAccess> query =
- builder.createQuery(QueryAccess.class);
+ CriteriaQuery<QueryAccess> query = builder
+ .createQuery(QueryAccess.class);
- Root<QueryAccess> access =
- query.from(QueryAccess.class);
- Join<QueryAccess, UserGroup> accessQuery =
- access.join(QueryAccess_.userGroup);
+ Root<QueryAccess> access = query.from(QueryAccess.class);
+ Join<QueryAccess, UserGroup> accessQuery = access
+ .join(QueryAccess_.userGroup);
query.select(access);
query.where(builder.equal(accessQuery.get(UserGroup_.id), groupId));
@@ -178,18 +170,17 @@
ParameterChecker.checkIntegerValue(groupId, "groupId");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<QueryAccess> query =
- builder.createQuery(QueryAccess.class);
+ CriteriaQuery<QueryAccess> query = builder
+ .createQuery(QueryAccess.class);
- Root<QueryAccess> access =
- query.from(QueryAccess.class);
- Join<QueryAccess, UserGroup> accessQuery =
- access.join(QueryAccess_.userGroup);
+ Root<QueryAccess> access = query.from(QueryAccess.class);
+ Join<QueryAccess, UserGroup> accessQuery = access
+ .join(QueryAccess_.userGroup);
- Predicate p =
- builder.and(builder.equal(accessQuery.get(UserGroup_.id), groupId),
- builder.equal(access.get(QueryAccess_.status),
- QueryAccessStatus.ACTIVE));
+ Predicate p = builder.and(
+ builder.equal(accessQuery.get(UserGroup_.id), groupId),
+ builder.equal(access.get(QueryAccess_.status),
+ QueryAccessStatus.ACTIVE));
query.select(access);
query.where(p);
@@ -212,13 +203,12 @@
ParameterChecker.checkIntegerValue(queryId, "queryId");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<QueryAccess> query =
- builder.createQuery(QueryAccess.class);
+ CriteriaQuery<QueryAccess> query = builder
+ .createQuery(QueryAccess.class);
- Root<QueryAccess> access =
- query.from(QueryAccess.class);
- Join<QueryAccess, QueryDO> accessQuery =
- access.join(QueryAccess_.query);
+ Root<QueryAccess> access = query.from(QueryAccess.class);
+ Join<QueryAccess, QueryDO> accessQuery = access
+ .join(QueryAccess_.query);
Predicate p = builder.and(
builder.equal(accessQuery.get(QueryDO_.id), queryId),
@@ -241,9 +231,8 @@
}
}
- public void createAccessToQuery (QueryDO query,
- UserGroup userGroup, String createdBy,
- QueryAccessStatus status) {
+ public void createAccessToQuery (QueryDO query, UserGroup userGroup,
+ String createdBy, QueryAccessStatus status) {
QueryAccess queryAccess = new QueryAccess();
queryAccess.setQuery(query);
queryAccess.setUserGroup(userGroup);
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/QueryDao.java b/full/src/main/java/de/ids_mannheim/korap/dao/QueryDao.java
index 366188b..e17582a 100644
--- a/full/src/main/java/de/ids_mannheim/korap/dao/QueryDao.java
+++ b/full/src/main/java/de/ids_mannheim/korap/dao/QueryDao.java
@@ -53,11 +53,11 @@
@PersistenceContext
private EntityManager entityManager;
- public int createQuery (String name, ResourceType type,
- QueryType queryType, CorpusAccess requiredAccess, String koralQuery,
- String definition, String description, String status,
- boolean isCached, String createdBy, String query,
- String queryLanguage) throws KustvaktException {
+ public int createQuery (String name, ResourceType type, QueryType queryType,
+ CorpusAccess requiredAccess, String koralQuery, String definition,
+ String description, String status, boolean isCached,
+ String createdBy, String query, String queryLanguage)
+ throws KustvaktException {
QueryDO q = new QueryDO();
q.setName(name);
@@ -103,18 +103,17 @@
if (status != null && !status.isEmpty()) {
queryDO.setStatus(status);
}
- if(queryStr!=null && !queryStr.isEmpty()) {
+ if (queryStr != null && !queryStr.isEmpty()) {
queryDO.setQuery(queryStr);
}
- if(queryLanguage!=null && !queryLanguage.isEmpty()) {
+ if (queryLanguage != null && !queryLanguage.isEmpty()) {
queryDO.setQueryLanguage(queryLanguage);
}
queryDO.setCached(isCached);
entityManager.merge(queryDO);
}
- public void deleteQuery (QueryDO query)
- throws KustvaktException {
+ public void deleteQuery (QueryDO query) throws KustvaktException {
if (!entityManager.contains(query)) {
query = entityManager.merge(query);
}
@@ -141,23 +140,23 @@
String createdBy, QueryType queryType) throws KustvaktException {
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
- CriteriaQuery<QueryDO> criteriaQuery =
- criteriaBuilder.createQuery(QueryDO.class);
+ CriteriaQuery<QueryDO> criteriaQuery = criteriaBuilder
+ .createQuery(QueryDO.class);
Root<QueryDO> query = criteriaQuery.from(QueryDO.class);
Predicate conditions = criteriaBuilder
.equal(query.get(QueryDO_.queryType), queryType);
if (createdBy != null && !createdBy.isEmpty()) {
- conditions = criteriaBuilder.and(conditions, criteriaBuilder.equal(
- query.get(QueryDO_.createdBy), createdBy));
+ conditions = criteriaBuilder.and(conditions, criteriaBuilder
+ .equal(query.get(QueryDO_.createdBy), createdBy));
if (type != null) {
- conditions = criteriaBuilder.and(conditions, criteriaBuilder
- .equal(query.get(QueryDO_.type), type));
+ conditions = criteriaBuilder.and(conditions,
+ criteriaBuilder.equal(query.get(QueryDO_.type), type));
}
}
else if (type != null) {
- conditions = criteriaBuilder.and(conditions, criteriaBuilder
- .equal(query.get(QueryDO_.type), type));
+ conditions = criteriaBuilder.and(conditions,
+ criteriaBuilder.equal(query.get(QueryDO_.type), type));
}
criteriaQuery.select(query);
@@ -170,12 +169,11 @@
ParameterChecker.checkIntegerValue(id, "id");
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
- CriteriaQuery<QueryDO> criteriaQuery =
- criteriaBuilder.createQuery(QueryDO.class);
+ CriteriaQuery<QueryDO> criteriaQuery = criteriaBuilder
+ .createQuery(QueryDO.class);
Root<QueryDO> query = criteriaQuery.from(QueryDO.class);
criteriaQuery.select(query);
- criteriaQuery.where(criteriaBuilder.equal(query.get(QueryDO_.id),
- id));
+ criteriaQuery.where(criteriaBuilder.equal(query.get(QueryDO_.id), id));
QueryDO qe = null;
try {
@@ -196,14 +194,13 @@
ParameterChecker.checkStringValue(queryName, "queryName");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<QueryDO> criteriaQuery =
- builder.createQuery(QueryDO.class);
+ CriteriaQuery<QueryDO> criteriaQuery = builder
+ .createQuery(QueryDO.class);
Root<QueryDO> query = criteriaQuery.from(QueryDO.class);
Predicate condition = builder.and(
- builder.equal(query.get(QueryDO_.createdBy),
- createdBy),
+ builder.equal(query.get(QueryDO_.createdBy), createdBy),
builder.equal(query.get(QueryDO_.name), queryName));
criteriaQuery.select(query);
@@ -228,20 +225,17 @@
}
@SuppressWarnings("unchecked")
- public List<QueryDO> retrieveOwnerQuery (String userId,
- QueryType queryType) throws KustvaktException {
+ public List<QueryDO> retrieveOwnerQuery (String userId, QueryType queryType)
+ throws KustvaktException {
ParameterChecker.checkStringValue(userId, "userId");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<QueryDO> cq =
- builder.createQuery(QueryDO.class);
+ CriteriaQuery<QueryDO> cq = builder.createQuery(QueryDO.class);
Root<QueryDO> query = cq.from(QueryDO.class);
Predicate conditions = builder.and(
- builder.equal(query.get(QueryDO_.createdBy),
- userId),
- builder.equal(query.get(QueryDO_.queryType),
- queryType));
+ builder.equal(query.get(QueryDO_.createdBy), userId),
+ builder.equal(query.get(QueryDO_.queryType), queryType));
cq.select(query);
cq.where(conditions);
@@ -256,15 +250,13 @@
ParameterChecker.checkStringValue(userId, "userId");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<QueryDO> cq =
- builder.createQuery(QueryDO.class);
+ CriteriaQuery<QueryDO> cq = builder.createQuery(QueryDO.class);
Root<QueryDO> query = cq.from(QueryDO.class);
cq.select(query);
Predicate p = builder.and(
- builder.equal(query.get(QueryDO_.createdBy),
- userId),
+ builder.equal(query.get(QueryDO_.createdBy), userId),
builder.equal(query.get(QueryDO_.type), type));
cq.where(p);
@@ -273,17 +265,15 @@
}
@SuppressWarnings("unchecked")
- public List<QueryDO> retrieveGroupQueryByUser (String userId, QueryType queryType)
- throws KustvaktException {
+ public List<QueryDO> retrieveGroupQueryByUser (String userId,
+ QueryType queryType) throws KustvaktException {
ParameterChecker.checkStringValue(userId, "userId");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<QueryDO> cq =
- builder.createQuery(QueryDO.class);
+ CriteriaQuery<QueryDO> cq = builder.createQuery(QueryDO.class);
Root<QueryDO> query = cq.from(QueryDO.class);
- Join<QueryDO, QueryAccess> access =
- query.join(QueryDO_.queryAccess);
+ Join<QueryDO, QueryAccess> access = query.join(QueryDO_.queryAccess);
// Predicate corpusStatus = builder.and(
// builder.notEqual(access.get(QueryAccess_.status),
@@ -291,28 +281,27 @@
// builder.notEqual(access.get(QueryAccess_.status),
// VirtualCorpusAccessStatus.DELETED));
- Predicate type = builder
- .equal(query.get(QueryDO_.queryType), queryType);
-
- Predicate accessStatus =
- builder.notEqual(access.get(QueryAccess_.status),
- QueryAccessStatus.DELETED);
+ Predicate type = builder.equal(query.get(QueryDO_.queryType),
+ queryType);
- Predicate userGroupStatus =
- builder.notEqual(access.get(QueryAccess_.userGroup)
- .get(UserGroup_.status), UserGroupStatus.DELETED);
+ Predicate accessStatus = builder.notEqual(
+ access.get(QueryAccess_.status), QueryAccessStatus.DELETED);
+
+ Predicate userGroupStatus = builder.notEqual(
+ access.get(QueryAccess_.userGroup).get(UserGroup_.status),
+ UserGroupStatus.DELETED);
Join<UserGroup, UserGroupMember> members = access
.join(QueryAccess_.userGroup).join(UserGroup_.members);
Predicate memberStatus = builder.equal(
members.get(UserGroupMember_.status), GroupMemberStatus.ACTIVE);
- Predicate user =
- builder.equal(members.get(UserGroupMember_.userId), userId);
+ Predicate user = builder.equal(members.get(UserGroupMember_.userId),
+ userId);
cq.select(query);
- cq.where(
- builder.and(type, accessStatus, userGroupStatus, memberStatus, user));
+ cq.where(builder.and(type, accessStatus, userGroupStatus, memberStatus,
+ user));
Query q = entityManager.createQuery(cq);
return q.getResultList();
@@ -324,15 +313,13 @@
ParameterChecker.checkObjectValue(queryType, "queryType");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<QueryDO> criteriaQuery =
- builder.createQuery(QueryDO.class);
+ CriteriaQuery<QueryDO> criteriaQuery = builder
+ .createQuery(QueryDO.class);
Root<QueryDO> query = criteriaQuery.from(QueryDO.class);
Predicate predicate = builder.and(
- builder.equal(query.get(QueryDO_.queryType),
- queryType),
- builder.or(builder.equal(
- query.get(QueryDO_.createdBy), userId),
+ builder.equal(query.get(QueryDO_.queryType), queryType),
+ builder.or(builder.equal(query.get(QueryDO_.createdBy), userId),
builder.equal(query.get(QueryDO_.type),
ResourceType.SYSTEM)));
@@ -361,17 +348,18 @@
ParameterChecker.checkIntegerValue(groupId, "groupId");
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
- CriteriaQuery<QueryDO> criteriaQuery =
- builder.createQuery(QueryDO.class);
+ CriteriaQuery<QueryDO> criteriaQuery = builder
+ .createQuery(QueryDO.class);
Root<QueryDO> query = criteriaQuery.from(QueryDO.class);
- Join<QueryDO, QueryAccess> queryAccess =
- query.join(QueryDO_.queryAccess);
- Join<QueryAccess, UserGroup> accessGroup =
- queryAccess.join(QueryAccess_.userGroup);
+ Join<QueryDO, QueryAccess> queryAccess = query
+ .join(QueryDO_.queryAccess);
+ Join<QueryAccess, UserGroup> accessGroup = queryAccess
+ .join(QueryAccess_.userGroup);
criteriaQuery.select(query);
- criteriaQuery.where(builder.equal(accessGroup.get(UserGroup_.id), groupId));
+ criteriaQuery
+ .where(builder.equal(accessGroup.get(UserGroup_.id), groupId));
Query q = entityManager.createQuery(criteriaQuery);
return q.getResultList();
}
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java b/full/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java
index 002d4ea..c121669 100644
--- a/full/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java
+++ b/full/src/main/java/de/ids_mannheim/korap/dao/ResourceDao.java
@@ -40,8 +40,8 @@
*/
public List<Resource> getAllResources () {
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
- CriteriaQuery<Resource> query =
- criteriaBuilder.createQuery(Resource.class);
+ CriteriaQuery<Resource> query = criteriaBuilder
+ .createQuery(Resource.class);
Root<Resource> resource = query.from(Resource.class);
query.select(resource);
@@ -51,8 +51,8 @@
public Resource retrieveResource (String id) {
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
- CriteriaQuery<Resource> query =
- criteriaBuilder.createQuery(Resource.class);
+ CriteriaQuery<Resource> query = criteriaBuilder
+ .createQuery(Resource.class);
Root<Resource> resource = query.from(Resource.class);
query.select(resource);
query.where(criteriaBuilder.equal(resource.get(Resource_.id), id));
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/RoleDao.java b/full/src/main/java/de/ids_mannheim/korap/dao/RoleDao.java
index 47ddd18..5481d30 100644
--- a/full/src/main/java/de/ids_mannheim/korap/dao/RoleDao.java
+++ b/full/src/main/java/de/ids_mannheim/korap/dao/RoleDao.java
@@ -87,8 +87,8 @@
CriteriaQuery<Role> query = criteriaBuilder.createQuery(Role.class);
Root<Role> root = query.from(Role.class);
- ListJoin<Role, UserGroupMember> memberRole =
- root.join(Role_.userGroupMembers);
+ ListJoin<Role, UserGroupMember> memberRole = root
+ .join(Role_.userGroupMembers);
query.select(root);
query.where(criteriaBuilder.equal(memberRole.get(UserGroupMember_.id),
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/UserDao.java b/full/src/main/java/de/ids_mannheim/korap/dao/UserDao.java
index 51ab9c1..61c24af 100644
--- a/full/src/main/java/de/ids_mannheim/korap/dao/UserDao.java
+++ b/full/src/main/java/de/ids_mannheim/korap/dao/UserDao.java
@@ -5,7 +5,8 @@
import de.ids_mannheim.korap.user.KorAPUser;
import de.ids_mannheim.korap.user.User;
-/** Dummy DAO for testing using basic authentication.
+/**
+ * Dummy DAO for testing using basic authentication.
*
* @author margaretha
*
@@ -19,5 +20,4 @@
return user;
}
-
}
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/UserGroupDao.java b/full/src/main/java/de/ids_mannheim/korap/dao/UserGroupDao.java
index 82ec01e..8a91e9c 100644
--- a/full/src/main/java/de/ids_mannheim/korap/dao/UserGroupDao.java
+++ b/full/src/main/java/de/ids_mannheim/korap/dao/UserGroupDao.java
@@ -55,8 +55,8 @@
@Autowired
private RoleDao roleDao;
- public int createGroup (String name, String description,
- String createdBy, UserGroupStatus status) throws KustvaktException {
+ public int createGroup (String name, String description, String createdBy,
+ UserGroupStatus status) throws KustvaktException {
ParameterChecker.checkStringValue(name, "name");
ParameterChecker.checkStringValue(createdBy, "createdBy");
ParameterChecker.checkObjectValue(status, "UserGroupStatus");
@@ -117,7 +117,7 @@
ParameterChecker.checkObjectValue(group, "user-group");
entityManager.merge(group);
}
-
+
/**
* Retrieves the UserGroup by the given group id. This methods
* does not
@@ -140,8 +140,8 @@
ParameterChecker.checkIntegerValue(groupId, "groupId");
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
- CriteriaQuery<UserGroup> query =
- criteriaBuilder.createQuery(UserGroup.class);
+ CriteriaQuery<UserGroup> query = criteriaBuilder
+ .createQuery(UserGroup.class);
Root<UserGroup> root = query.from(UserGroup.class);
if (fetchMembers) {
@@ -176,13 +176,13 @@
ParameterChecker.checkStringValue(userId, "userId");
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
- CriteriaQuery<UserGroup> query =
- criteriaBuilder.createQuery(UserGroup.class);
+ CriteriaQuery<UserGroup> query = criteriaBuilder
+ .createQuery(UserGroup.class);
Root<UserGroup> root = query.from(UserGroup.class);
- ListJoin<UserGroup, UserGroupMember> members =
- root.join(UserGroup_.members);
+ ListJoin<UserGroup, UserGroupMember> members = root
+ .join(UserGroup_.members);
Predicate restrictions = criteriaBuilder.and(
criteriaBuilder.equal(root.get(UserGroup_.status),
UserGroupStatus.ACTIVE),
@@ -207,13 +207,13 @@
}
}
- public UserGroup retrieveGroupByName (String groupName, boolean fetchMembers)
- throws KustvaktException {
+ public UserGroup retrieveGroupByName (String groupName,
+ boolean fetchMembers) throws KustvaktException {
ParameterChecker.checkStringValue(groupName, "groupName");
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
- CriteriaQuery<UserGroup> query =
- criteriaBuilder.createQuery(UserGroup.class);
+ CriteriaQuery<UserGroup> query = criteriaBuilder
+ .createQuery(UserGroup.class);
Root<UserGroup> root = query.from(UserGroup.class);
if (fetchMembers) {
@@ -238,14 +238,12 @@
ParameterChecker.checkIntegerValue(queryId, "queryId");
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
- CriteriaQuery<UserGroup> criteriaQuery =
- criteriaBuilder.createQuery(UserGroup.class);
+ CriteriaQuery<UserGroup> criteriaQuery = criteriaBuilder
+ .createQuery(UserGroup.class);
Root<UserGroup> root = criteriaQuery.from(UserGroup.class);
- Join<UserGroup, QueryAccess> access =
- root.join(UserGroup_.queryAccess);
- Join<QueryAccess, QueryDO> query =
- access.join(QueryAccess_.query);
+ Join<UserGroup, QueryAccess> access = root.join(UserGroup_.queryAccess);
+ Join<QueryAccess, QueryDO> query = access.join(QueryAccess_.query);
Predicate p = criteriaBuilder.and(
criteriaBuilder.equal(root.get(UserGroup_.status),
@@ -283,8 +281,8 @@
UserGroupStatus status) throws KustvaktException {
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
- CriteriaQuery<UserGroup> query =
- criteriaBuilder.createQuery(UserGroup.class);
+ CriteriaQuery<UserGroup> query = criteriaBuilder
+ .createQuery(UserGroup.class);
Root<UserGroup> root = query.from(UserGroup.class);
@@ -292,8 +290,8 @@
if (userId != null && !userId.isEmpty()) {
- ListJoin<UserGroup, UserGroupMember> members =
- root.join(UserGroup_.members);
+ ListJoin<UserGroup, UserGroupMember> members = root
+ .join(UserGroup_.members);
restrictions = criteriaBuilder.and(criteriaBuilder
.equal(members.get(UserGroupMember_.userId), userId));
@@ -303,8 +301,8 @@
}
}
else if (status != null) {
- restrictions =
- criteriaBuilder.equal(root.get(UserGroup_.status), status);
+ restrictions = criteriaBuilder.equal(root.get(UserGroup_.status),
+ status);
}
@@ -335,9 +333,8 @@
entityManager.persist(accessGroup);
}
- public void addQueryToGroup (List<QueryDO> queries,
- String createdBy, UserGroup group,
- QueryAccessStatus status) {
+ public void addQueryToGroup (List<QueryDO> queries, String createdBy,
+ UserGroup group, QueryAccessStatus status) {
for (QueryDO q : queries) {
addQueryToGroup(q, createdBy, status, group);
@@ -350,25 +347,22 @@
ParameterChecker.checkIntegerValue(groupId, "groupId");
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
- CriteriaQuery<QueryAccess> criteriaQuery =
- criteriaBuilder.createQuery(QueryAccess.class);
+ CriteriaQuery<QueryAccess> criteriaQuery = criteriaBuilder
+ .createQuery(QueryAccess.class);
Root<QueryAccess> root = criteriaQuery.from(QueryAccess.class);
- Join<QueryAccess, QueryDO> queryAccess =
- root.join(QueryAccess_.query);
- Join<QueryAccess, UserGroup> group =
- root.join(QueryAccess_.userGroup);
+ Join<QueryAccess, QueryDO> queryAccess = root.join(QueryAccess_.query);
+ Join<QueryAccess, UserGroup> group = root.join(QueryAccess_.userGroup);
- Predicate query = criteriaBuilder
- .equal(queryAccess.get(QueryDO_.id), queryId);
- Predicate userGroup =
- criteriaBuilder.equal(group.get(UserGroup_.id), groupId);
+ Predicate query = criteriaBuilder.equal(queryAccess.get(QueryDO_.id),
+ queryId);
+ Predicate userGroup = criteriaBuilder.equal(group.get(UserGroup_.id),
+ groupId);
criteriaQuery.select(root);
criteriaQuery.where(criteriaBuilder.and(query, userGroup));
Query q = entityManager.createQuery(criteriaQuery);
- QueryAccess access =
- (QueryAccess) q.getSingleResult();
+ QueryAccess access = (QueryAccess) q.getSingleResult();
entityManager.remove(access);
}
diff --git a/full/src/main/java/de/ids_mannheim/korap/dao/UserGroupMemberDao.java b/full/src/main/java/de/ids_mannheim/korap/dao/UserGroupMemberDao.java
index 7fe96c5..c399fd6 100644
--- a/full/src/main/java/de/ids_mannheim/korap/dao/UserGroupMemberDao.java
+++ b/full/src/main/java/de/ids_mannheim/korap/dao/UserGroupMemberDao.java
@@ -78,8 +78,8 @@
ParameterChecker.checkIntegerValue(groupId, "groupId");
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
- CriteriaQuery<UserGroupMember> query =
- criteriaBuilder.createQuery(UserGroupMember.class);
+ CriteriaQuery<UserGroupMember> query = criteriaBuilder
+ .createQuery(UserGroupMember.class);
Root<UserGroupMember> root = query.from(UserGroupMember.class);
@@ -110,8 +110,8 @@
ParameterChecker.checkIntegerValue(groupId, "groupId");
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
- CriteriaQuery<UserGroupMember> query =
- criteriaBuilder.createQuery(UserGroupMember.class);
+ CriteriaQuery<UserGroupMember> query = criteriaBuilder
+ .createQuery(UserGroupMember.class);
Root<UserGroupMember> root = query.from(UserGroupMember.class);
Join<UserGroupMember, Role> memberRole = root.join("roles");
@@ -146,8 +146,8 @@
public List<UserGroupMember> retrieveMemberByGroupId (int groupId,
boolean isAdmin) throws KustvaktException {
CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
- CriteriaQuery<UserGroupMember> query =
- criteriaBuilder.createQuery(UserGroupMember.class);
+ CriteriaQuery<UserGroupMember> query = criteriaBuilder
+ .createQuery(UserGroupMember.class);
Root<UserGroupMember> root = query.from(UserGroupMember.class);
@@ -169,7 +169,7 @@
}
catch (NoResultException e) {
throw new KustvaktException(StatusCodes.NO_RESULT_FOUND,
- "No member in group " + groupId+" is found",
+ "No member in group " + groupId + " is found",
String.valueOf(groupId));
}
}