From dad4ce0c5366c0b3070797255e0817786cb77526 Mon Sep 17 00:00:00 2001 From: jensp Date: Thu, 8 Oct 2015 09:30:55 +0000 Subject: [PATCH] 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 --- .../java/org/libreccm/categorization/Category.java | 6 +++--- .../categorization/CategoryRepository.java | 2 +- .../src/main/java/org/libreccm/core/Group.java | 2 +- .../java/org/libreccm/core/GroupRepository.java | 2 +- .../main/java/org/libreccm/core/Permission.java | 14 +++++++------- .../org/libreccm/core/PermissionRepository.java | 14 +++++++------- .../src/main/java/org/libreccm/core/Privilege.java | 10 +++++----- .../org/libreccm/core/PrivilegeRepository.java | 4 ++-- ccm-core/src/main/java/org/libreccm/core/Role.java | 6 +++--- .../java/org/libreccm/core/RoleRepository.java | 6 +++--- ccm-core/src/main/java/org/libreccm/core/User.java | 4 ++-- .../java/org/libreccm/core/UserRepository.java | 4 ++-- .../org/libreccm/web/ApplicationRepository.java | 7 ++++--- .../main/java/org/libreccm/web/CcmApplication.java | 7 ++----- 14 files changed, 43 insertions(+), 45 deletions(-) diff --git a/ccm-core/src/main/java/org/libreccm/categorization/Category.java b/ccm-core/src/main/java/org/libreccm/categorization/Category.java index 0e70d0b21..f079e8323 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/Category.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/Category.java @@ -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. diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryRepository.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryRepository.java index 7e4ae67ae..9534e6b06 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryRepository.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryRepository.java @@ -50,7 +50,7 @@ public class CategoryRepository extends AbstractEntityRepository */ public List getTopLevelCategories() { final TypedQuery query = getEntityManager().createNamedQuery( - "topLevelCategories", Category.class); + "Category.topLevelCategories", Category.class); return query.getResultList(); } diff --git a/ccm-core/src/main/java/org/libreccm/core/Group.java b/ccm-core/src/main/java/org/libreccm/core/Group.java index 1abe07ed9..f3937b70c 100644 --- a/ccm-core/src/main/java/org/libreccm/core/Group.java +++ b/ccm-core/src/main/java/org/libreccm/core/Group.java @@ -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) diff --git a/ccm-core/src/main/java/org/libreccm/core/GroupRepository.java b/ccm-core/src/main/java/org/libreccm/core/GroupRepository.java index f881fc2ed..61f7face0 100644 --- a/ccm-core/src/main/java/org/libreccm/core/GroupRepository.java +++ b/ccm-core/src/main/java/org/libreccm/core/GroupRepository.java @@ -52,7 +52,7 @@ public class GroupRepository extends AbstractEntityRepository { public Group findByGroupName(final String groupName) { final TypedQuery query = entityManager.createNamedQuery( - "findGroupByName", Group.class); + "Group.findGroupByName", Group.class); query.setParameter("groupName", groupName); final List result = query.getResultList(); diff --git a/ccm-core/src/main/java/org/libreccm/core/Permission.java b/ccm-core/src/main/java/org/libreccm/core/Permission.java index 5f8973c12..87cce1971 100644 --- a/ccm-core/src/main/java/org/libreccm/core/Permission.java +++ b/ccm-core/src/main/java/org/libreccm/core/Permission.java @@ -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" diff --git a/ccm-core/src/main/java/org/libreccm/core/PermissionRepository.java b/ccm-core/src/main/java/org/libreccm/core/PermissionRepository.java index c6cc33c7d..d3f3c861d 100644 --- a/ccm-core/src/main/java/org/libreccm/core/PermissionRepository.java +++ b/ccm-core/src/main/java/org/libreccm/core/PermissionRepository.java @@ -81,7 +81,7 @@ public class PermissionRepository } final TypedQuery 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 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 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 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); } diff --git a/ccm-core/src/main/java/org/libreccm/core/Privilege.java b/ccm-core/src/main/java/org/libreccm/core/Privilege.java index 1b8154ac7..dbe0240e3 100644 --- a/ccm-core/src/main/java/org/libreccm/core/Privilege.java +++ b/ccm-core/src/main/java/org/libreccm/core/Privilege.java @@ -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. diff --git a/ccm-core/src/main/java/org/libreccm/core/PrivilegeRepository.java b/ccm-core/src/main/java/org/libreccm/core/PrivilegeRepository.java index 2bf14d4e0..44873d4b3 100644 --- a/ccm-core/src/main/java/org/libreccm/core/PrivilegeRepository.java +++ b/ccm-core/src/main/java/org/libreccm/core/PrivilegeRepository.java @@ -50,7 +50,7 @@ public class PrivilegeRepository { */ public Privilege retrievePrivilege(final String label) { final TypedQuery 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 query = entityManager.createNamedQuery( - "isPrivilegeInUse", Long.class); + "Privilege.isPrivilegeInUse", Long.class); query.setParameter("label", label); final Long result = query.getSingleResult(); diff --git a/ccm-core/src/main/java/org/libreccm/core/Role.java b/ccm-core/src/main/java/org/libreccm/core/Role.java index fdf19747f..61ec1cca0 100644 --- a/ccm-core/src/main/java/org/libreccm/core/Role.java +++ b/ccm-core/src/main/java/org/libreccm/core/Role.java @@ -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") diff --git a/ccm-core/src/main/java/org/libreccm/core/RoleRepository.java b/ccm-core/src/main/java/org/libreccm/core/RoleRepository.java index 6b5cbd708..f643d85ef 100644 --- a/ccm-core/src/main/java/org/libreccm/core/RoleRepository.java +++ b/ccm-core/src/main/java/org/libreccm/core/RoleRepository.java @@ -56,7 +56,7 @@ public class RoleRepository extends AbstractEntityRepository { */ public List findRolesForName(final String roleName) { final TypedQuery 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 { public List findRolesForSourceGroup(final Group group) { final TypedQuery 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 { public List findRolesForImplicitGroup(final Group group) { final TypedQuery query = entityManager.createNamedQuery( - "findRolesForImplicitGroup", Role.class); + "Role.findRolesForImplicitGroup", Role.class); query.setParameter("implicitGroup", group); return query.getResultList(); diff --git a/ccm-core/src/main/java/org/libreccm/core/User.java b/ccm-core/src/main/java/org/libreccm/core/User.java index 7c2acfd77..3ad9a031b 100644 --- a/ccm-core/src/main/java/org/libreccm/core/User.java +++ b/ccm-core/src/main/java/org/libreccm/core/User.java @@ -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) diff --git a/ccm-core/src/main/java/org/libreccm/core/UserRepository.java b/ccm-core/src/main/java/org/libreccm/core/UserRepository.java index 04761bcbf..b26897466 100644 --- a/ccm-core/src/main/java/org/libreccm/core/UserRepository.java +++ b/ccm-core/src/main/java/org/libreccm/core/UserRepository.java @@ -91,7 +91,7 @@ public class UserRepository extends AbstractEntityRepository { */ public User findByScreenName(final String screenname) { final TypedQuery query = getEntityManager().createNamedQuery( - "findUserByScreenName", User.class); + "User.findUserByScreenName", User.class); query.setParameter("screenname", screenname); final List result = query.getResultList(); @@ -131,7 +131,7 @@ public class UserRepository extends AbstractEntityRepository { */ public User findByEmailAddress(final String emailAddress) { final TypedQuery query = getEntityManager().createNamedQuery( - "findUserByEmailAddress", User.class); + "User.findUserByEmailAddress", User.class); query.setParameter("emailAddress", emailAddress); final List result = query.getResultList(); diff --git a/ccm-core/src/main/java/org/libreccm/web/ApplicationRepository.java b/ccm-core/src/main/java/org/libreccm/web/ApplicationRepository.java index 551b507ce..8ceaa5ff7 100644 --- a/ccm-core/src/main/java/org/libreccm/web/ApplicationRepository.java +++ b/ccm-core/src/main/java/org/libreccm/web/ApplicationRepository.java @@ -54,7 +54,8 @@ public class ApplicationRepository */ public CcmApplication retrieveApplicationForPath(final String path) { final TypedQuery 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 findByType(final String type) { final TypedQuery query = getEntityManager() - .createNamedQuery( - "Application.findByType", CcmApplication.class); + .createNamedQuery("CcmApplication.Application.findByType", + CcmApplication.class); query.setParameter("type", type); return query.getResultList(); diff --git a/ccm-core/src/main/java/org/libreccm/web/CcmApplication.java b/ccm-core/src/main/java/org/libreccm/web/CcmApplication.java index 5035d13ba..4bb58485b 100644 --- a/ccm-core/src/main/java/org/libreccm/web/CcmApplication.java +++ b/ccm-core/src/main/java/org/libreccm/web/CcmApplication.java @@ -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") })