LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

CCM NG: Changed names of named queries to include simple name of class 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@3674 8810af33-2d31-482b-a856-94f89814c4df
pull/2/head
jensp 2015-10-08 09:30:55 +00:00
parent 56d545d175
commit dad4ce0c53
14 changed files with 43 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ccm-core/src/main/java/org/libreccm/categorization/Category.java
View File

@ -63,11 +63,11 @@ import javax.validation.constraints.Pattern;
@Entity
@Table(name = "CATEGORIES", schema = DB_SCHEMA)
@NamedQueries({
@NamedQuery(name = "topLevelCategories",
@NamedQuery(name = "Category.topLevelCategories",
query = "SELECT c FROM Category c WHERE c.parentCategory IS NULL")
})
public class Category extends CcmObject implements Serializable {
private static final long serialVersionUID = -7250208963391878547L;
/**
@ -76,7 +76,7 @@ public class Category extends CcmObject implements Serializable {
*/
@Column(name = "UNIQUE_ID", nullable = false)
private String uniqueId;
/**
* The name of the category. This is used as URL stub, therefore only the
* characters a to z, A to Z and 0 to 9 are allowed.

2
ccm-core/src/main/java/org/libreccm/categorization/CategoryRepository.java
View File

@ -50,7 +50,7 @@ public class CategoryRepository extends AbstractEntityRepository<Long, Category>
*/
public List<Category> getTopLevelCategories() {
final TypedQuery<Category> query = getEntityManager().createNamedQuery(
"topLevelCategories", Category.class);
"Category.topLevelCategories", Category.class);
return query.getResultList();
}

2
ccm-core/src/main/java/org/libreccm/core/Group.java
View File

@ -48,7 +48,7 @@ import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Table(name = "CCM_GROUPS", schema = DB_SCHEMA)
@NamedQueries({
@NamedQuery(name = "findGroupByName",
@NamedQuery(name = "Group.findGroupByName",
query = "SELECT g FROM Group g WHERE g.name = :groupName")
})
@XmlRootElement(name = "user-group", namespace = CORE_XML_NS)

2
ccm-core/src/main/java/org/libreccm/core/GroupRepository.java
View File

@ -52,7 +52,7 @@ public class GroupRepository extends AbstractEntityRepository<Long, Group> {
public Group findByGroupName(final String groupName) {
final TypedQuery<Group> query = entityManager.createNamedQuery(
"findGroupByName", Group.class);
"Group.findGroupByName", Group.class);
query.setParameter("groupName", groupName);
final List<Group> result = query.getResultList();

14
ccm-core/src/main/java/org/libreccm/core/Permission.java
View File

@ -49,17 +49,17 @@ import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Table(name = "PERMISSIONS", schema = DB_SCHEMA)
@NamedQueries({
@NamedQuery(name = "findPermissionsForSubject",
@NamedQuery(name = "Permission.findPermissionsForSubject",
query = "SELECT p FROM Permission p WHERE p.grantee = :subject"),
@NamedQuery(name = "findPermissionsForUser",
@NamedQuery(name = "Permission.findPermissionsForUser",
query = "SELECT p FROM Permission p "
+ "WHERE p.grantee = :user "
+ " OR p.grantee IN (SELECT g "
+ " FROM Group g JOIN g.members m"
+ " WHERE m.user = :user)"),
@NamedQuery(name = "findPermissionsForCcmObject",
@NamedQuery(name = "Permission.findPermissionsForCcmObject",
query = "SELECT p FROM Permission p WHERE p.object = :object"),
@NamedQuery(name = "findPermissionsForUserPrivilegeAndObject",
@NamedQuery(name = "Permission.findPermissionsForUserPrivilegeAndObject",
query = "SELECT p FROM Permission p "
+ "WHERE (p.grantee = :user"
+ " OR p.grantee IN (SELECT g "
@ -67,7 +67,7 @@ import javax.xml.bind.annotation.XmlRootElement;
+ " WHERE m.user = :user))"
+ " AND p.grantedPrivilege = :privilege"
+ " AND p.object = :object"),
@NamedQuery(name = "findWildcardPermissionsForUserPrivilegeAndObject",
@NamedQuery(name = "Permission.findWildcardPermissionsForUserPrivilegeAndObject",
query = "SELECT p FROM Permission p "
+ "WHERE (p.grantee = :user"
+ " OR p.grantee IN (SELECT g "
@ -75,12 +75,12 @@ import javax.xml.bind.annotation.XmlRootElement;
+ " WHERE m.user = :user))"
+ " AND p.grantedPrivilege = :privilege"
+ " AND p.object IS NULL"),
@NamedQuery(name = "findPermissionsForSubjectPrivilegeAndObject",
@NamedQuery(name = "Permission.findPermissionsForSubjectPrivilegeAndObject",
query = "SELECT p FROM Permission p "
+ "WHERE p.grantee = :subject"
+ " AND p.grantedPrivilege = :privilege"
+ " AND p.object = :object"),
@NamedQuery(name = "findWildcardPermissionsForSubjectPrivilegeAndObject",
@NamedQuery(name = "Permission.findWildcardPermissionsForSubjectPrivilegeAndObject",
query = "SELECT p FROM Permission p "
+ "WHERE p.grantee = :subject"
+ " AND p.grantedPrivilege = :privilege"

14
ccm-core/src/main/java/org/libreccm/core/PermissionRepository.java
View File

@ -81,7 +81,7 @@ public class PermissionRepository
}
final TypedQuery<Permission> query = entityManager.createNamedQuery(
"findPermissionsForSubject", Permission.class);
"Permission.findPermissionsForSubject", Permission.class);
query.setParameter("subject", subject);
return query.getResultList();
@ -106,7 +106,7 @@ public class PermissionRepository
}
final TypedQuery<Permission> query = entityManager.createNamedQuery(
"findPermissionsForUser", Permission.class);
"Permission.findPermissionsForUser", Permission.class);
query.setParameter("user", user);
return query.getResultList();
@ -126,7 +126,7 @@ public class PermissionRepository
}
final TypedQuery<Permission> query = entityManager.createNamedQuery(
"findPermissionsForCcmObject", Permission.class);
"Permission.findPermissionsForCcmObject", Permission.class);
query.setParameter("object", object);
return query.getResultList();
@ -150,12 +150,12 @@ public class PermissionRepository
final TypedQuery<Permission> query;
if (object == null) {
query = entityManager.createNamedQuery(
"findWildcardPermissionsForUserPrivilegeAndObject",
"Permission.findWildcardPermissionsForUserPrivilegeAndObject",
Permission.class);
} else {
query = entityManager.createNamedQuery(
"findPermissionsForUserPrivilegeAndObject", Permission.class);
"Permission.findPermissionsForUserPrivilegeAndObject", Permission.class);
query.setParameter("object", object);
}
@ -184,11 +184,11 @@ public class PermissionRepository
if (object == null) {
query = entityManager.createNamedQuery(
"findWildcardPermissionsForSubjectPrivilegeAndObject",
"Permission.findWildcardPermissionsForSubjectPrivilegeAndObject",
Permission.class);
} else {
query = entityManager.createNamedQuery(
"findPermissionsForSubjectPrivilegeAndObject", Permission.class);
"Permission.findPermissionsForSubjectPrivilegeAndObject", Permission.class);
query.setParameter("object", object);
}

10
ccm-core/src/main/java/org/libreccm/core/Privilege.java
View File

@ -50,19 +50,19 @@ import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Table(name = "CCM_PRIVILEGES", schema = DB_SCHEMA)
@NamedQueries({
@NamedQuery(name = "findPrivilegeByName",
@NamedQuery(name = "Privilege.findPrivilegeByName",
query = "SELECT p FROM Privilege p "
+ "WHERE p.label = :label"),
@NamedQuery(name = "isPrivilegeInUse",
@NamedQuery(name = "Privilege.isPrivilegeInUse",
query = "SELECT COUNT(p) FROM Permission p "
+ " JOIN p.grantedPrivilege g "
+ " WHERE g.label = :label")
+ " JOIN p.grantedPrivilege g "
+ " WHERE g.label = :label")
})
@XmlRootElement(name = "PRIVILEGE", namespace = CORE_XML_NS)
public class Privilege implements Serializable {
private static final long serialVersionUID = -3986038536996049440L;
/**
* Constant for the {@code admin} privilege because this privilege is used
* very often.

4
ccm-core/src/main/java/org/libreccm/core/PrivilegeRepository.java
View File

@ -50,7 +50,7 @@ public class PrivilegeRepository {
*/
public Privilege retrievePrivilege(final String label) {
final TypedQuery<Privilege> query = entityManager.createNamedQuery(
"findPrivilegeByName", Privilege.class);
"Privilege.findPrivilegeByName", Privilege.class);
query.setParameter("label", label);
try {
@ -111,7 +111,7 @@ public class PrivilegeRepository {
*/
public boolean isPrivilegeInUse(final String label) {
final TypedQuery<Long> query = entityManager.createNamedQuery(
"isPrivilegeInUse", Long.class);
"Privilege.isPrivilegeInUse", Long.class);
query.setParameter("label", label);
final Long result = query.getSingleResult();

6
ccm-core/src/main/java/org/libreccm/core/Role.java
View File

@ -51,15 +51,15 @@ import javax.persistence.NamedQuery;
@Entity
@Table(name = "CCM_ROLES", schema = DB_SCHEMA)
@NamedQueries({
@NamedQuery(name = "findRolesForName",
@NamedQuery(name = "Role.findRolesForName",
query = "SELECT r FROM Role r "
+ "WHERE r.name = :roleName "
+ "ORDER BY r.name"),
@NamedQuery(name = "findRolesForSourceGroup",
@NamedQuery(name = "Role.findRolesForSourceGroup",
query = "SELECT r FROM Role r "
+ "WHERE r.sourceGroup = :sourceGroup "
+ "ORDER BY r.name"),
@NamedQuery(name = "findRolesForImplicitGroup",
@NamedQuery(name = "Role.findRolesForImplicitGroup",
query = "SELECT r FROM Role r "
+ "WHERE r.implicitGroup = :implicitGroup "
+ "ORDER BY r.name")

6
ccm-core/src/main/java/org/libreccm/core/RoleRepository.java
View File

@ -56,7 +56,7 @@ public class RoleRepository extends AbstractEntityRepository<Long, Role> {
*/
public List<Role> findRolesForName(final String roleName) {
final TypedQuery<Role> query = entityManager.createNamedQuery(
"findRolesForName", Role.class);
"Role.findRolesForName", Role.class);
query.setParameter("roleName", roleName);
return query.getResultList();
@ -64,7 +64,7 @@ public class RoleRepository extends AbstractEntityRepository<Long, Role> {
public List<Role> findRolesForSourceGroup(final Group group) {
final TypedQuery<Role> query = entityManager.createNamedQuery(
"findRolesForSourceGroup", Role.class);
"Role.findRolesForSourceGroup", Role.class);
query.setParameter("sourceGroup", group);
return query.getResultList();
@ -72,7 +72,7 @@ public class RoleRepository extends AbstractEntityRepository<Long, Role> {
public List<Role> findRolesForImplicitGroup(final Group group) {
final TypedQuery<Role> query = entityManager.createNamedQuery(
"findRolesForImplicitGroup", Role.class);
"Role.findRolesForImplicitGroup", Role.class);
query.setParameter("implicitGroup", group);
return query.getResultList();

4
ccm-core/src/main/java/org/libreccm/core/User.java
View File

@ -59,9 +59,9 @@ import javax.xml.bind.annotation.XmlTransient;
@Entity
@Table(name = "CCM_USERS", schema = DB_SCHEMA)
@NamedQueries({
@NamedQuery(name = "findUserByScreenName",
@NamedQuery(name = "User.findUserByScreenName",
query = "SELECT u FROM User u WHERE u.screenName = :screenname"),
@NamedQuery(name = "findUserByEmailAddress",
@NamedQuery(name = "User.findUserByEmailAddress",
query = "SELECT u FROM User u JOIN u.emailAddresses e "
+ "WHERE e.address = :emailAddress")})
@XmlRootElement(name = "user", namespace = CORE_XML_NS)

4
ccm-core/src/main/java/org/libreccm/core/UserRepository.java
View File

@ -91,7 +91,7 @@ public class UserRepository extends AbstractEntityRepository<Long, User> {
*/
public User findByScreenName(final String screenname) {
final TypedQuery<User> query = getEntityManager().createNamedQuery(
"findUserByScreenName", User.class);
"User.findUserByScreenName", User.class);
query.setParameter("screenname", screenname);
final List<User> result = query.getResultList();
@ -131,7 +131,7 @@ public class UserRepository extends AbstractEntityRepository<Long, User> {
*/
public User findByEmailAddress(final String emailAddress) {
final TypedQuery<User> query = getEntityManager().createNamedQuery(
"findUserByEmailAddress", User.class);
"User.findUserByEmailAddress", User.class);
query.setParameter("emailAddress", emailAddress);
final List<User> result = query.getResultList();

7
ccm-core/src/main/java/org/libreccm/web/ApplicationRepository.java
View File

@ -54,7 +54,8 @@ public class ApplicationRepository
*/
public CcmApplication retrieveApplicationForPath(final String path) {
final TypedQuery<CcmApplication> query = getEntityManager()
.createNamedQuery("retrieveApplicationForPath", CcmApplication.class);
.createNamedQuery("CcmApplication.retrieveApplicationForPath",
CcmApplication.class);
query.setParameter("path", path);
try {
return query.getSingleResult();
@ -73,8 +74,8 @@ public class ApplicationRepository
*/
public List<CcmApplication> findByType(final String type) {
final TypedQuery<CcmApplication> query = getEntityManager()
.createNamedQuery(
"Application.findByType", CcmApplication.class);
.createNamedQuery("CcmApplication.Application.findByType",
CcmApplication.class);
query.setParameter("type", type);
return query.getResultList();

7
ccm-core/src/main/java/org/libreccm/web/CcmApplication.java
View File

@ -28,17 +28,14 @@ import static org.libreccm.core.CoreConstants.*;
import org.libreccm.core.Resource;
import org.libreccm.core.Group;
import org.libreccm.jpa.utils.UriConverter;
import java.io.Serializable;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import javax.persistence.Column;
import javax.persistence.Convert;
import javax.persistence.Entity;
import javax.persistence.JoinColumn;
import javax.persistence.NamedQueries;
@ -57,10 +54,10 @@ import javax.xml.bind.annotation.XmlRootElement;
@Entity
@Table(name = "APPLICATIONS", schema = DB_SCHEMA)
@NamedQueries({
@NamedQuery(name = "retrieveApplicationForPath",
@NamedQuery(name = "CcmApplication.retrieveApplicationForPath",
query = "SELECT a FROM CcmApplication a "
+ " WHERE a.primaryUrl = :path"),
@NamedQuery(name = "Application.findByType",
@NamedQuery(name = "CcmApplication.Application.findByType",
query = "SELECT A FROM CcmApplication a "
+ "WHERE a.applicationType = :type")
})