Added streamSlice method for skip and limit

Also renamed Cache.get to stream
FINTLabs · Apr 15, 2020 · 5758119 · 5758119
1 parent 3e0828d
commit 5758119
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 13 deletions.
diff --git a/src/main/java/no/fint/cache/Cache.java b/src/main/java/no/fint/cache/Cache.java
@@ -18,9 +18,9 @@ public interface Cache<T extends Serializable> {
 
     void flush();
 
-    Stream<CacheObject<T>> get();
+    Stream<CacheObject<T>> stream();
 
-    Stream<CacheObject<T>> getSince(long timestamp);
+    Stream<CacheObject<T>> streamSince(long timestamp);
 
     long getLastUpdated();
 

diff --git a/src/main/java/no/fint/cache/CacheService.java b/src/main/java/no/fint/cache/CacheService.java
@@ -82,15 +82,24 @@ public List<T> getAll(String orgId) {
     }
 
     public Stream<T> streamAll(String orgId) {
-        return getCache(orgId).orElseThrow(() -> new CacheNotFoundException(orgId)).get().map(CacheObject::getObject);
+        return getCache(orgId).orElseThrow(() -> new CacheNotFoundException(orgId)).stream().map(CacheObject::getObject);
+    }
+
+    public Stream<T> streamSlice(String orgId, int skip, int limit) {
+        return getCache(orgId)
+                .orElseThrow(() -> new CacheNotFoundException(orgId))
+                .stream()
+                .skip(skip)
+                .limit(limit)
+                .map(CacheObject::getObject);
     }
 
     public List<T> getAll(String orgId, long sinceTimestamp) {
         return streamSince(orgId, sinceTimestamp).collect(Collectors.toList());
     }
 
     public Stream<T> streamSince(String orgId, long sinceTimestamp) {
-        return getCache(orgId).orElseThrow(() -> new CacheNotFoundException(orgId)).getSince(sinceTimestamp).map(CacheObject::getObject);
+        return getCache(orgId).orElseThrow(() -> new CacheNotFoundException(orgId)).streamSince(sinceTimestamp).map(CacheObject::getObject);
     }
 
     public Optional<T> getOne(String orgId, Predicate<T> idFunction) {

diff --git a/src/main/java/no/fint/cache/FintCache.java b/src/main/java/no/fint/cache/FintCache.java
@@ -100,7 +100,7 @@ public void flush() {
     }
 
     @Override
-    public Stream<CacheObject<T>> get() {
+    public Stream<CacheObject<T>> stream() {
         return cacheObjects.stream();
     }
 
@@ -109,7 +109,7 @@ public List<T> getSourceList() {
     }
 
     @Override
-    public Stream<CacheObject<T>> getSince(long timestamp) {
+    public Stream<CacheObject<T>> streamSince(long timestamp) {
         return cacheObjects.stream().filter(cacheObject -> (cacheObject.getLastUpdated() > timestamp));
     }
 

diff --git a/src/main/java/no/fint/cache/HazelcastCache.java b/src/main/java/no/fint/cache/HazelcastCache.java
@@ -55,13 +55,13 @@ public void flush() {
     }
 
     @Override
-    public Stream<CacheObject<T>> get() {
-        return manager.getCacheInternal(key).get();
+    public Stream<CacheObject<T>> stream() {
+        return manager.getCacheInternal(key).stream();
     }
 
     @Override
-    public Stream<CacheObject<T>> getSince(long timestamp) {
-        return manager.getCacheInternal(key).getSince(timestamp);
+    public Stream<CacheObject<T>> streamSince(long timestamp) {
+        return manager.getCacheInternal(key).streamSince(timestamp);
     }
 
     @Override

diff --git a/src/test/groovy/no/fint/cache/FintCacheSpec.groovy b/src/test/groovy/no/fint/cache/FintCacheSpec.groovy
@@ -127,7 +127,7 @@ class FintCacheSpec extends Specification {
         defaultCache.update(values)
 
         when:
-        def updatedSince = defaultCache.getSince(System.currentTimeMillis() - 15000)
+        def updatedSince = defaultCache.streamSince(System.currentTimeMillis() - 15000)
 
         then:
         updatedSince.count() == 1
@@ -141,7 +141,7 @@ class FintCacheSpec extends Specification {
         defaultCache.update(values)
 
         when:
-        def updatedSince = defaultCache.getSince(System.currentTimeMillis() + 15000)
+        def updatedSince = defaultCache.streamSince(System.currentTimeMillis() + 15000)
 
         then:
         updatedSince.count() == 0
@@ -155,7 +155,7 @@ class FintCacheSpec extends Specification {
         defaultCache.update(values)
 
         when:
-        def cachedValues = defaultCache.get()
+        def cachedValues = defaultCache.stream()
 
         then:
         cachedValues.findAny().get().getObject() == values.get(0)