From 4edb481feaee214a423516e62d4ca76f063d2d8b Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Fri, 7 Jun 2013 13:27:41 +0200
Subject: [PATCH] remove ehcache support as it does not provide a performance
 boost (fix #264)

---
 pom.xml                                       | 15 -------------
 .../com/commafeed/backend/model/Feed.java     |  5 -----
 .../commafeed/backend/model/FeedCategory.java |  6 ------
 .../commafeed/backend/model/FeedEntry.java    |  5 -----
 .../backend/model/FeedEntryContent.java       |  6 ------
 .../backend/model/FeedEntryStatus.java        |  6 ------
 .../backend/model/FeedSubscription.java       |  6 ------
 .../com/commafeed/backend/model/User.java     |  5 -----
 .../com/commafeed/backend/model/UserRole.java |  6 ------
 .../commafeed/backend/model/UserSettings.java |  6 ------
 src/main/resources/META-INF/persistence.xml   |  6 ------
 src/main/resources/ehcache.xml                | 21 -------------------
 12 files changed, 93 deletions(-)
 delete mode 100644 src/main/resources/ehcache.xml

diff --git a/pom.xml b/pom.xml
index 42be0128..aeaf0c24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,9 +101,6 @@
 						<lib>org.hibernate:hibernate-validator:4.3.1.Final</lib>
 						<lib>org.jboss.logging:jboss-logging:3.1.3.GA</lib>
 
-						<lib>net.sf.ehcache:ehcache-core:2.6.6</lib>
-						<lib>org.hibernate:hibernate-ehcache:4.1.11.Final</lib>
-
 						<lib>dom4j:dom4j:1.6.1</lib>
 						<lib>antlr:antlr:2.7.7</lib>
 						<lib>remove:openjpa-</lib>
@@ -164,18 +161,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>net.sf.ehcache</groupId>
-			<artifactId>ehcache-core</artifactId>
-			<version>2.6.6</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-ehcache</artifactId>
-			<version>4.1.11.Final</version>
-			<scope>provided</scope>
-		</dependency>
 
 		<dependency>
 			<groupId>uaihebert.com</groupId>
diff --git a/src/main/java/com/commafeed/backend/model/Feed.java b/src/main/java/com/commafeed/backend/model/Feed.java
index a4922c20..d059d017 100644
--- a/src/main/java/com/commafeed/backend/model/Feed.java
+++ b/src/main/java/com/commafeed/backend/model/Feed.java
@@ -3,7 +3,6 @@ package com.commafeed.backend.model;
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.Cacheable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.ManyToMany;
@@ -12,8 +11,6 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.Index;
 
 import com.google.common.collect.Sets;
@@ -23,8 +20,6 @@ import com.google.common.collect.Sets;
 @org.hibernate.annotations.Table(appliesTo = "FEEDS", indexes = { @Index(name = "disabled_lastupdated_index", columnNames = {
 		"disabledUntil", "lastUpdated" }), })
 @SuppressWarnings("serial")
-@Cacheable
-@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class Feed extends AbstractModel {
 
 	/**
diff --git a/src/main/java/com/commafeed/backend/model/FeedCategory.java b/src/main/java/com/commafeed/backend/model/FeedCategory.java
index e944a7a8..8474c998 100644
--- a/src/main/java/com/commafeed/backend/model/FeedCategory.java
+++ b/src/main/java/com/commafeed/backend/model/FeedCategory.java
@@ -2,7 +2,6 @@ package com.commafeed.backend.model;
 
 import java.util.Set;
 
-import javax.persistence.Cacheable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -11,16 +10,11 @@ import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-
 import com.google.common.collect.Sets;
 
 @Entity
 @Table(name = "FEEDCATEGORIES")
 @SuppressWarnings("serial")
-@Cacheable
-@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class FeedCategory extends AbstractModel {
 
 	@Column(length = 128, nullable = false)
diff --git a/src/main/java/com/commafeed/backend/model/FeedEntry.java b/src/main/java/com/commafeed/backend/model/FeedEntry.java
index 8afa1eda..6afd9b6c 100644
--- a/src/main/java/com/commafeed/backend/model/FeedEntry.java
+++ b/src/main/java/com/commafeed/backend/model/FeedEntry.java
@@ -3,7 +3,6 @@ package com.commafeed.backend.model;
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -18,8 +17,6 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.Index;
 
 import com.google.api.client.util.Sets;
@@ -27,8 +24,6 @@ import com.google.api.client.util.Sets;
 @Entity
 @Table(name = "FEEDENTRIES")
 @SuppressWarnings("serial")
-@Cacheable
-@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class FeedEntry extends AbstractModel {
 
 	@Column(length = 2048, nullable = false)
diff --git a/src/main/java/com/commafeed/backend/model/FeedEntryContent.java b/src/main/java/com/commafeed/backend/model/FeedEntryContent.java
index 20f197bd..119b7204 100644
--- a/src/main/java/com/commafeed/backend/model/FeedEntryContent.java
+++ b/src/main/java/com/commafeed/backend/model/FeedEntryContent.java
@@ -1,19 +1,13 @@
 package com.commafeed.backend.model;
 
-import javax.persistence.Cacheable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Lob;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-
 @Entity
 @Table(name = "FEEDENTRYCONTENTS")
 @SuppressWarnings("serial")
-@Cacheable
-@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class FeedEntryContent extends AbstractModel {
 
 	@Column(length = 2048)
diff --git a/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java b/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java
index d3c361a8..5cd543fc 100644
--- a/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java
+++ b/src/main/java/com/commafeed/backend/model/FeedEntryStatus.java
@@ -1,6 +1,5 @@
 package com.commafeed.backend.model;
 
-import javax.persistence.Cacheable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -8,14 +7,9 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-
 @Entity
 @Table(name = "FEEDENTRYSTATUSES")
 @SuppressWarnings("serial")
-@Cacheable
-@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class FeedEntryStatus extends AbstractModel {
 
 	@ManyToOne(fetch = FetchType.LAZY)
diff --git a/src/main/java/com/commafeed/backend/model/FeedSubscription.java b/src/main/java/com/commafeed/backend/model/FeedSubscription.java
index 6681a7fb..96be770e 100644
--- a/src/main/java/com/commafeed/backend/model/FeedSubscription.java
+++ b/src/main/java/com/commafeed/backend/model/FeedSubscription.java
@@ -2,7 +2,6 @@ package com.commafeed.backend.model;
 
 import java.util.Set;
 
-import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -12,14 +11,9 @@ import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-
 @Entity
 @Table(name = "FEEDSUBSCRIPTIONS")
 @SuppressWarnings("serial")
-@Cacheable
-@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class FeedSubscription extends AbstractModel {
 
 	@ManyToOne(fetch = FetchType.LAZY)
diff --git a/src/main/java/com/commafeed/backend/model/User.java b/src/main/java/com/commafeed/backend/model/User.java
index f07191e1..11dba1d4 100644
--- a/src/main/java/com/commafeed/backend/model/User.java
+++ b/src/main/java/com/commafeed/backend/model/User.java
@@ -3,7 +3,6 @@ package com.commafeed.backend.model;
 import java.util.Date;
 import java.util.Set;
 
-import javax.persistence.Cacheable;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -12,8 +11,6 @@ import javax.persistence.Table;
 import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.Index;
 
 import com.google.common.collect.Sets;
@@ -21,8 +18,6 @@ import com.google.common.collect.Sets;
 @Entity
 @Table(name = "USERS")
 @SuppressWarnings("serial")
-@Cacheable
-@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class User extends AbstractModel {
 
 	@Column(length = 32, nullable = false, unique = true)
diff --git a/src/main/java/com/commafeed/backend/model/UserRole.java b/src/main/java/com/commafeed/backend/model/UserRole.java
index be5f296b..fb9537d2 100644
--- a/src/main/java/com/commafeed/backend/model/UserRole.java
+++ b/src/main/java/com/commafeed/backend/model/UserRole.java
@@ -1,6 +1,5 @@
 package com.commafeed.backend.model;
 
-import javax.persistence.Cacheable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
@@ -10,14 +9,9 @@ import javax.persistence.JoinColumn;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-
 @Entity
 @Table(name = "USERROLES")
 @SuppressWarnings("serial")
-@Cacheable
-@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class UserRole extends AbstractModel {
 
 	public static enum Role {
diff --git a/src/main/java/com/commafeed/backend/model/UserSettings.java b/src/main/java/com/commafeed/backend/model/UserSettings.java
index 2c1174eb..4d4a3d96 100644
--- a/src/main/java/com/commafeed/backend/model/UserSettings.java
+++ b/src/main/java/com/commafeed/backend/model/UserSettings.java
@@ -1,6 +1,5 @@
 package com.commafeed.backend.model;
 
-import javax.persistence.Cacheable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.EnumType;
@@ -11,14 +10,9 @@ import javax.persistence.Lob;
 import javax.persistence.OneToOne;
 import javax.persistence.Table;
 
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-
 @Entity
 @Table(name = "USERSETTINGS")
 @SuppressWarnings("serial")
-@Cacheable
-@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class UserSettings extends AbstractModel {
 
 	public enum ReadingMode {
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index 97d04155..343ec736 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -22,12 +22,6 @@
 			<property name="hibernate.order_inserts" value="true" />
 			<property name="hibernate.order_updates" value="true" />
 
-			<property name="hibernate.cache.region.factory_class"
-				value="org.hibernate.cache.ehcache.SingletonEhCacheRegionFactory" />
-
-			<property name="hibernate.cache.use_second_level_cache"
-				value="true" />
-			<property name="hibernate.cache.use_query_cache" value="true" />
 			<property name="hibernate.generate_statistics" value="true" />
 		</properties>
 	</persistence-unit>
diff --git a/src/main/resources/ehcache.xml b/src/main/resources/ehcache.xml
deleted file mode 100644
index f7e0576e..00000000
--- a/src/main/resources/ehcache.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ehcache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="http://ehcache.org/ehcache.xsd"
-	updateCheck="false" monitoring="autodetect" dynamicConfig="false">
-
-	<diskStore path="java.io.tmpdir" />
-
-	<defaultCache maxEntriesLocalHeap="1000000" eternal="false"
-		timeToIdleSeconds="120" timeToLiveSeconds="120" maxEntriesLocalDisk="10000000"
-		diskExpiryThreadIntervalSeconds="120" memoryStoreEvictionPolicy="LRU">
-		<persistence strategy="localTempSwap" />
-	</defaultCache>
-
-	<cache name="com.commafeed.backend.model.FeedEntryContent"
-		maxEntriesLocalHeap="1000" eternal="false" timeToIdleSeconds="120"
-		timeToLiveSeconds="120" maxEntriesLocalDisk="100000"
-		diskExpiryThreadIntervalSeconds="120" memoryStoreEvictionPolicy="LRU">
-		<persistence strategy="localTempSwap" />
-	</cache>
-
-</ehcache>
\ No newline at end of file