From 41daf2acb8954a168a3ef370ba9633a41b51ac11 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Fri, 14 Dec 2018 17:54:01 +0000
Subject: [PATCH] Renamed Borg json objects. Started with own objects, such as Repository.
---
borgbutler-core/src/test/java/de/micromata/borgbutler/cache/CacheTest.java | 26 ++++++++++++--------------
1 files changed, 12 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 86ff0a8..6544eff 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
@@ -3,11 +3,9 @@
import de.micromata.borgbutler.config.BorgRepoConfig;
import de.micromata.borgbutler.config.Configuration;
import de.micromata.borgbutler.config.ConfigurationHandler;
-import de.micromata.borgbutler.json.borg.Archive;
-import de.micromata.borgbutler.json.borg.FilesystemItem;
-import de.micromata.borgbutler.json.borg.RepoInfo;
-import de.micromata.borgbutler.json.borg.RepoList;
-import org.apache.commons.collections4.CollectionUtils;
+import de.micromata.borgbutler.data.Repository;
+import de.micromata.borgbutler.json.borg.BorgArchive;
+import de.micromata.borgbutler.json.borg.BorgFilesystemItem;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,29 +29,29 @@
ButlerCache butlerCache = ButlerCache.getInstance();
{
for (BorgRepoConfig repoConfig : ConfigurationHandler.getConfiguration().getRepoConfigs()) {
- RepoInfo repoInfo = ButlerCache.getInstance().getRepoInfo(repoConfig.getRepo());
+ Repository repository = ButlerCache.getInstance().getRepository(repoConfig.getRepo());
}
assertEquals(config.getRepoConfigs().size(), ButlerCache.getInstance().getAllRepositories().size());
}
- {
+/* {
for (BorgRepoConfig repoConfig : ConfigurationHandler.getConfiguration().getRepoConfigs()) {
- RepoList repoList = ButlerCache.getInstance().getRepoList(repoConfig.getRepo());
+ BorgRepoList repoList = ButlerCache.getInstance().getRepoList(repoConfig.getRepo());
}
assertEquals(config.getRepoConfigs().size(), ButlerCache.getInstance().getAllRepositories().size());
- }
+ }*/
List<BorgRepoConfig> repoConfigs = ConfigurationHandler.getConfiguration().getRepoConfigs();
- Archive archive = null;
+ BorgArchive archive = null;
BorgRepoConfig repoConfig = null;
- if (CollectionUtils.isNotEmpty(repoConfigs)) {
+/* if (CollectionUtils.isNotEmpty(repoConfigs)) {
repoConfig = repoConfigs.get(0);
- RepoList repoList = ButlerCache.getInstance().getRepoList(repoConfig.getRepo());
+ BorgRepoList repoList = ButlerCache.getInstance().getRepoList(repoConfig.getRepo());
if (repoList != null && CollectionUtils.isNotEmpty(repoList.getArchives())) {
archive = repoList.getArchives().get(0);
}
- }
+ }*/
{
if (archive != null) {
- FilesystemItem[] content = ButlerCache.getInstance().getArchiveContent(repoConfig, archive);
+ BorgFilesystemItem[] content = ButlerCache.getInstance().getArchiveContent(repoConfig, archive);
log.info("Number of items (content) of archive: " + content.length);
content = ButlerCache.getInstance().getArchiveContent(repoConfig, archive);
log.info("Number of items (content) of archive: " + content.length);
--
Gitblit v1.10.0