diff --git a/helenus-core.iml b/helenus-core.iml
index 7b75a06..2578277 100644
--- a/helenus-core.iml
+++ b/helenus-core.iml
@@ -36,7 +36,6 @@
-
@@ -118,6 +117,7 @@
+
diff --git a/pom.xml b/pom.xml
index d6a9172..0011e00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,22 +154,6 @@
20.0
-
- ca.exprofesso
- guava-jcache
- 1.0.4
-
-
- com.google.guava
- guava
-
-
- javax.cache
- cache-api
-
-
-
-
io.zipkin.java
@@ -239,6 +223,24 @@
test
+
+
+ ca.exprofesso
+ guava-jcache
+ 1.0.4
+
+
+ com.google.guava
+ guava
+
+
+ javax.cache
+ cache-api
+
+
+ test
+
+
commons-io
commons-io
diff --git a/src/main/java/net/helenus/core/AbstractUnitOfWork.java b/src/main/java/net/helenus/core/AbstractUnitOfWork.java
index 22491f7..46ad287 100644
--- a/src/main/java/net/helenus/core/AbstractUnitOfWork.java
+++ b/src/main/java/net/helenus/core/AbstractUnitOfWork.java
@@ -28,10 +28,8 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.stream.Collectors;
-
import javax.cache.Cache;
import javax.cache.CacheManager;
-
import net.helenus.core.cache.CacheUtil;
import net.helenus.core.cache.Facet;
import net.helenus.core.operation.AbstractOperation;
@@ -320,7 +318,7 @@ public abstract class AbstractUnitOfWork
if (facet.alone()) {
String columnName = facet.name() + "==" + facet.value();
if (result == null) result = cache.get(tableName, columnName);
- cache.put(tableName, columnName, Either.left(value));
+ cache.put(tableName, columnName, Either.left(value));
}
}
}
@@ -400,29 +398,29 @@ public abstract class AbstractUnitOfWork
});
// Merge our statement cache into the session cache if it exists.
- CacheManager cacheManager = session.getCacheManager();
- if (cacheManager != null) {
- for (Map.Entry entry : statementCache.entrySet()) {
- String[] keyParts = entry.getKey().split("\\.");
- if (keyParts.length == 2) {
- String cacheName = keyParts[0];
- String key = keyParts[1];
- if (!StringUtils.isBlank(cacheName) && !StringUtils.isBlank(key)) {
- Cache