From 28a5a5bee5ff8006ae3473fb5ff41fde71424297 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 08 Dec 2018 22:22:38 +0000
Subject: [PATCH] Tried to merge all caches to one EntityCache (failed due to Jackson-marshalling/unmarshalling problems with elements). I ended up in LinkedHashMaps instead of PoJos.
---
borgbutler-core/src/test/java/de/micromata/borgbutler/cache/CacheTest.java | 18 ++++--------------
1 files changed, 4 insertions(+), 14 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 0b1bfef..20dd109 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
@@ -35,14 +35,14 @@
//butlerCache.removeAllCacheFiles();
butlerCache.read();
{
- RepoInfoCache repoInfoCache = ButlerCache.getRepoInfoCache();
+ EntityCache<RepoInfo> repoInfoCache = ButlerCache.getRepoInfoCache();
if (repoInfoCache.getElements().size() != config.getRepoConfigs().size()) {
refreshRepoInfoCache(config, repoInfoCache);
}
assertEquals(config.getRepoConfigs().size(), repoInfoCache.getElements().size());
}
{
- RepoListCache repoListCache = ButlerCache.getRepoListCache();
+ EntityCache<RepoList> repoListCache = ButlerCache.getRepoListCache();
if (repoListCache.getElements().size() != config.getRepoConfigs().size()) {
refreshRepoListCache(config, repoListCache);
}
@@ -65,7 +65,7 @@
butlerCache.save();
}
- private void refreshRepoInfoCache(Configuration config, RepoInfoCache repoInfoCache) {
+ private void refreshRepoInfoCache(Configuration config, EntityCache<RepoInfo> repoInfoCache) {
for (BorgRepoConfig repo : config.getRepoConfigs()) {
log.info("Processing repo info '" + repo + "'");
RepoInfo repoInfo = BorgCommands.info(repo);
@@ -75,17 +75,7 @@
}
}
- private void refreshRepoListCache(Configuration config, RepoListCache repoListCache) {
- 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());
- assertNotNull(repoList);
- }
- }
-
- private void refresArchiveListCache(Configuration config, RepoListCache repoListCache) {
+ private void refreshRepoListCache(Configuration config, EntityCache<RepoList> repoListCache) {
for (BorgRepoConfig repo : config.getRepoConfigs()) {
log.info("Processing repo list '" + repo + "'");
RepoList repoList = BorgCommands.list(repo);
--
Gitblit v1.10.0