enabled caching

account/src/main/java/de/muehlencord/shared/account/business/account/control/AccountControl.java

@@ -90,7 +90,7 @@ public class AccountControl implements Serializable {
      * @return a list of active accounts
      */
     private List<AccountEntity> getActiveAccounts() {
-        Query query = em.createQuery("SELECT a FROM AccountEntity a WHERE a.status <> :status", AccountEntity.class);
+        Query query = em.createNamedQuery ("AccountEntity.findActiveAccounts");        
         query.setParameter("status", AccountStatus.DISABLED.name());
         return query.getResultList();
     }

account/src/main/java/de/muehlencord/shared/account/business/account/entity/AccountEntity.java

@@ -23,6 +23,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 import javax.persistence.Basic;
+import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -36,6 +37,7 @@ import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
+import javax.persistence.QueryHint;
 import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
@@ -50,19 +52,35 @@ import org.hibernate.annotations.Type;
  * @author joern.muehlencord
  */
 @Entity
+@Cacheable
 @Table(name = "account")
 @XmlRootElement
 @NamedQueries({
-    @NamedQuery(name = "AccountEntity.findAll", query = "SELECT a FROM AccountEntity a ORDER by a.lastname, a.firstname"),
+    @NamedQuery(name = "AccountEntity.findAll", query = "SELECT a FROM AccountEntity a ORDER by a.lastname, a.firstname",
-    @NamedQuery(name = "AccountEntity.findByUsername", query = "SELECT a FROM AccountEntity a WHERE a.username = :username"),
+            hints = {
-    @NamedQuery(name = "AccountEntity.findByStatus", query = "SELECT a FROM AccountEntity a WHERE a.status = :status"),
+                @QueryHint(name = "org.hibernate.cacheable", value = "true"),
+                @QueryHint(name = "org.hibernate.cacheRegion", value = "Queries")}),
+    @NamedQuery(name = "AccountEntity.findByUsername", query = "SELECT a FROM AccountEntity a WHERE a.username = :username",
+            hints = {
+                @QueryHint(name = "org.hibernate.cacheable", value = "true"),
+                @QueryHint(name = "org.hibernate.cacheRegion", value = "Queries")}),
+    @NamedQuery(name = "AccountEntity.findByStatus", query = "SELECT a FROM AccountEntity a WHERE a.status = :status",
+            hints = {
+                @QueryHint(name = "org.hibernate.cacheable", value = "true"),
+                @QueryHint(name = "org.hibernate.cacheRegion", value = "Queries")}),
+    @NamedQuery(name = "AccountEntity.findActiveAccounts", query = "SELECT a FROM AccountEntity a WHERE a.status <> :status",
+            hints = {
+                @QueryHint(name = "org.hibernate.cacheable", value = "true"),
+                @QueryHint(name = "org.hibernate.cacheRegion", value = "Queries")}),
     @NamedQuery(name = "AccountEntity.findByCreatedOn", query = "SELECT a FROM AccountEntity a WHERE a.createdOn = :createdOn"),
     @NamedQuery(name = "AccountEntity.findByCreatedBy", query = "SELECT a FROM AccountEntity a WHERE a.createdBy = :createdBy"),
     @NamedQuery(name = "AccountEntity.findByLastUpdatedOn", query = "SELECT a FROM AccountEntity a WHERE a.lastUpdatedOn = :lastUpdatedOn"),
-    @NamedQuery(name = "AccountEntity.findByLastUpdatedBy", query = "SELECT a FROM AccountEntity a WHERE a.lastUpdatedBy = :lastUpdatedBy")})
+    @NamedQuery(name = "AccountEntity.findByLastUpdatedBy", query = "SELECT a FROM AccountEntity a WHERE a.lastUpdatedBy = :lastUpdatedBy")
+
+})
 public class AccountEntity implements Serializable, Account {
 
-    private static final long serialVersionUID = 6216991757526150935L;
+    private static final long serialVersionUID = 2174163529615355336L;
 
     @Id
     @Basic(optional = false)
@@ -149,6 +167,7 @@ public class AccountEntity implements Serializable, Account {
         this.id = id;
     }
 
+    @Override
     public String getUsername() {
         return username;
     }
@@ -165,6 +184,7 @@ public class AccountEntity implements Serializable, Account {
         this.emailaddress = emailaddress;
     }
 
+    @Override
     public String getFirstname() {
         return firstname;
     }
@@ -173,6 +193,7 @@ public class AccountEntity implements Serializable, Account {
         this.firstname = firstname;
     }
 
+    @Override
     public String getLastname() {
         return lastname;
     }

account/src/main/java/de/muehlencord/shared/account/business/account/entity/AccountHistoryEntity.java

@@ -19,6 +19,7 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.UUID;
 import javax.persistence.Basic;
+import javax.persistence.Cacheable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -42,6 +43,7 @@ import org.hibernate.annotations.Type;
  */
 @Entity
 @Table(name = "account_history")
+@Cacheable
 @XmlRootElement
 @NamedQueries({
     @NamedQuery(name = "AccountHistoryEntity.findAll", query = "SELECT a FROM AccountHistoryEntity a"),

account/src/main/java/de/muehlencord/shared/account/business/account/entity/AccountLoginEntity.java

@@ -19,6 +19,7 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.UUID;
 import javax.persistence.Basic;
+import javax.persistence.Cacheable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -42,6 +43,7 @@ import org.hibernate.annotations.Type;
  */
 @Entity
 @Table(name = "account_login")
+@Cacheable
 @XmlRootElement
 @NamedQueries({
     @NamedQuery(name = "AccountLoginEntity.findAll", query = "SELECT a FROM AccountLoginEntity a"),

account/src/main/java/de/muehlencord/shared/account/business/application/entity/ApplicationEntity.java

@@ -20,6 +20,7 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.UUID;
 import javax.persistence.Basic;
+import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -28,6 +29,7 @@ import javax.persistence.Id;
 import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
+import javax.persistence.QueryHint;
 import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
@@ -43,9 +45,18 @@ import org.hibernate.annotations.Type;
 @Entity
 @Table(name = "application")
 @XmlRootElement
+@Cacheable
 @NamedQueries({
-    @NamedQuery(name = "ApplicationEntity.findAll", query = "SELECT a FROM ApplicationEntity a"),
+    @NamedQuery(name = "ApplicationEntity.findAll", query = "SELECT a FROM ApplicationEntity a",
-    @NamedQuery(name = "ApplicationEntity.findByApplicationName", query = "SELECT a FROM ApplicationEntity a WHERE a.applicationName = :applicationName")})
+            hints = {
+                @QueryHint(name = "org.hibernate.cacheable", value = "true"),
+                @QueryHint(name = "org.hibernate.cacheRegion", value = "Queries")}),
+    @NamedQuery(name = "ApplicationEntity.findByApplicationName", query = "SELECT a FROM ApplicationEntity a WHERE a.applicationName = :applicationName",
+            hints = {
+                @QueryHint(name = "org.hibernate.cacheable", value = "true"),
+                @QueryHint(name = "org.hibernate.cacheRegion", value = "Queries")})
+})
+
 public class ApplicationEntity implements Serializable {
 
     private static final long serialVersionUID = -6407525020014743727L;

account/src/main/resources/META-INF/persistence.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
   <persistence-unit name="accountPu" transaction-type="RESOURCE_LOCAL">
-    <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
     <exclude-unlisted-classes>false</exclude-unlisted-classes>
     <shared-cache-mode>ENABLE_SELECTIVE</shared-cache-mode>
     <properties>