cleanups

bhuism · Jul 11, 2020 · ecfa173 · ecfa173
1 parent 4059286
commit ecfa173
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/src/main/java/nl/appsource/badge/expected/GitHubImpl.java b/src/main/java/nl/appsource/badge/expected/GitHubImpl.java
@@ -71,8 +71,10 @@ public BadgeStatus getBadgeStatus(final String owner, final String repo, final S
         final BadgeStatus cacheValue = cache.getIfPresent(getKey(owner, repo, branch, commit_sha));
 
         if (cacheValue != null) {
+            log.info("Cache hit");
             return cacheValue;
         } else {
+            log.info("Cache miss");
             return callGitHub(owner, repo, branch, commit_sha);
         }
 

diff --git a/src/main/java/nl/appsource/badge/expected/GitLabImpl.java b/src/main/java/nl/appsource/badge/expected/GitLabImpl.java
@@ -41,8 +41,10 @@ public BadgeStatus getBadgeStatus(final String id, final String branch, final St
         final BadgeStatus cacheValue = cache.getIfPresent(getKey(id, branch, commit_sha));
 
         if (cacheValue != null) {
+            log.info("Cache hit");
             return cacheValue;
         } else {
+            log.info("Cache miss");
             return callGitLab(id, branch, commit_sha);
         }
 

diff --git a/src/main/java/nl/appsource/badge/expected/MyCacheImpl.java b/src/main/java/nl/appsource/badge/expected/MyCacheImpl.java
@@ -4,7 +4,6 @@
 
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
 
 @Slf4j
 public class MyCacheImpl<K, V> implements MyCache<K, V> {
@@ -16,20 +15,19 @@ public class MyCacheImpl<K, V> implements MyCache<K, V> {
 
     @Override
     public V getIfPresent(final K key) {
+
         synchronized (this) {
 
-            final Long expired = System.currentTimeMillis() + (EXPIRED_IN_SECONDS * 1000);
-
-            _timestamp.keySet().removeAll(
-                    _timestamp
-                            .entrySet()
-                            .stream()
-                            .filter(e -> e.getValue() < expired)
-                            .map(Entry::getKey)
-                            .map(_cache::remove)
-                            .collect(Collectors.toSet()))
-            ;
+            final Long expired = System.currentTimeMillis() - (EXPIRED_IN_SECONDS * 1000);
+
+            _timestamp
+                    .entrySet()
+                    .stream()
+                    .filter(e -> e.getValue() < expired)
+                    .map(Entry::getKey)
+                    .forEach(_cache::remove);
         }
+
         return _cache.get(key);
     }