From 4ece88750272b3e2fc0bbccec7202d2faa1115b8 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 08 Dec 2018 23:32:11 +0000
Subject: [PATCH] cache refactored.

---
 borgbutler-core/src/test/java/de/micromata/borgbutler/cache/CacheTest.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/borgbutler-core/src/test/java/de/micromata/borgbutler/cache/CacheTest.java b/borgbutler-core/src/test/java/de/micromata/borgbutler/cache/CacheTest.java
index 7f68d7a..e16e0bd 100644
--- a/borgbutler-core/src/test/java/de/micromata/borgbutler/cache/CacheTest.java
+++ b/borgbutler-core/src/test/java/de/micromata/borgbutler/cache/CacheTest.java
@@ -52,7 +52,7 @@
         BorgRepoConfig repoConfig = null;
         if (CollectionUtils.isNotEmpty(repoConfigs)) {
             repoConfig = repoConfigs.get(0);
-            RepoList repoList = ButlerCache.getInstance().getRepoListCache().get(repoConfig.getRepo());
+            RepoList repoList = ButlerCache.getInstance().getRepoListCache().get(repoConfig, repoConfig.getRepo());
             if (repoList != null && CollectionUtils.isNotEmpty(repoList.getArchives())) {
                 archive = repoList.getArchives().get(0);
             }
@@ -72,11 +72,11 @@
                 }
             }*/
         }
-        {
+        {/*
             if (archive != null) {
                 String json = BorgCommands.list(repoConfig, archive.getArchive());
                 log.info(json);
-            }
+            }*/
         }
         butlerCache.save();
     }
@@ -85,8 +85,8 @@
         for (BorgRepoConfig repo : config.getRepoConfigs()) {
             log.info("Processing repo info '" + repo + "'");
             RepoInfo repoInfo = BorgCommands.info(repo);
-            repoInfoCache.upsert(repoInfo);
-            repoInfo = repoInfoCache.get(repoInfo.getRepository().getId());
+            repoInfoCache.upsert(repo, repoInfo);
+            repoInfo = repoInfoCache.get(repo, repoInfo.getRepository().getId());
             assertNotNull(repoInfo);
         }
     }
@@ -95,8 +95,8 @@
         for (BorgRepoConfig repo : config.getRepoConfigs()) {
             log.info("Processing repo list '" + repo + "'");
             RepoList repoList = BorgCommands.list(repo);
-            repoListCache.upsert(repoList);
-            repoList = repoListCache.get(repoList.getRepository().getId());
+            repoListCache.upsert(repo, repoList);
+            repoList = repoListCache.get(repo, repoList.getRepository().getId());
             assertNotNull(repoList);
         }
     }
@@ -105,8 +105,8 @@
         for (BorgRepoConfig repo : config.getRepoConfigs()) {
             log.info("Processing repo list '" + repo + "'");
             RepoList repoList = BorgCommands.list(repo);
-            repoListCache.upsert(repoList);
-            repoList = repoListCache.get(repoList.getRepository().getId());
+            repoListCache.upsert(repo, repoList);
+            repoList = repoListCache.get(repo, repoList.getRepository().getId());
             assertNotNull(repoList);
         }
     }

--
Gitblit v1.10.0