From bfcca792614918253ef1f1769c6a0e909eaa2638 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Fri, 25 Jan 2019 06:12:01 +0000
Subject: [PATCH] Don't save demo repos to config file.
---
borgbutler-core/src/main/java/de/micromata/borgbutler/config/Configuration.java | 8 +++++---
borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java | 4 ++--
borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ButlerCache.java | 2 +-
borgbutler-core/src/test/java/de/micromata/borgbutler/cache/CacheTest.java | 12 ++++++------
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ButlerCache.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ButlerCache.java
index ca935d9..15481b2 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ButlerCache.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/cache/ButlerCache.java
@@ -93,7 +93,7 @@
*/
public List<Repository> getAllRepositories() {
List<Repository> repositories = new ArrayList<>();
- for (BorgRepoConfig repoConfig : ConfigurationHandler.getConfiguration().getRepoConfigs()) {
+ for (BorgRepoConfig repoConfig : ConfigurationHandler.getConfiguration().getAllRepoConfigs()) {
if (repoConfig == null) {
// Occurs sometimes for demo repos.
continue;
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/config/Configuration.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/config/Configuration.java
index 10c9d85..5d49c71 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/config/Configuration.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/config/Configuration.java
@@ -50,6 +50,7 @@
@JsonIgnore
private File restoreHomeDir;
+ @JsonProperty
private List<BorgRepoConfig> repoConfigs = new ArrayList<>();
public void add(BorgRepoConfig repoConfig) {
@@ -60,7 +61,7 @@
if (idOrName == null) {
return null;
}
- for (BorgRepoConfig repoConfig : getRepoConfigs()) {
+ for (BorgRepoConfig repoConfig : getAllRepoConfigs()) {
if (StringUtils.equals(idOrName, repoConfig.getRepo()) || StringUtils.equals(idOrName, repoConfig.getId())) {
return repoConfig;
}
@@ -88,11 +89,12 @@
this.showDemoRepos = other.showDemoRepos;
}
- public List<BorgRepoConfig> getRepoConfigs() {
+ @JsonIgnore
+ public List<BorgRepoConfig> getAllRepoConfigs() {
return DemoRepos.getAllRepos(repoConfigs);
}
- List<BorgRepoConfig> _getRepoConfigs() {
+ List<BorgRepoConfig> getRepoConfigs() {
return repoConfigs;
}
}
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java
index 47ab090..17fe788 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java
@@ -56,8 +56,8 @@
return;
}
}
- if (this.configuration._getRepoConfigs() != null) {
- for (BorgRepoConfig repoConfig : this.configuration._getRepoConfigs()) {
+ if (this.configuration.getRepoConfigs() != null) {
+ for (BorgRepoConfig repoConfig : this.configuration.getRepoConfigs()) {
if (StringUtils.isBlank(repoConfig.getDisplayName())) {
repoConfig.setDisplayName(repoConfig.getRepo());
}
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 dbbf8a7..ec173b6 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
@@ -24,24 +24,24 @@
void repoCacheTest() {
ConfigurationHandler configHandler = ConfigurationHandler.getInstance();
Configuration config = ConfigurationHandler.getConfiguration();
- if (config.getRepoConfigs().size() == 0) {
+ if (config.getAllRepoConfigs().size() == 0) {
log.info("No repos configured. Please configure repos first in: " + configHandler.getConfigFile().getAbsolutePath());
return;
}
ButlerCache butlerCache = ButlerCache.getInstance();
{
- for (BorgRepoConfig repoConfig : ConfigurationHandler.getConfiguration().getRepoConfigs()) {
+ for (BorgRepoConfig repoConfig : ConfigurationHandler.getConfiguration().getAllRepoConfigs()) {
Repository repository = ButlerCache.getInstance().getRepository(repoConfig.getRepo());
}
- assertEquals(config.getRepoConfigs().size(), ButlerCache.getInstance().getAllRepositories().size());
+ assertEquals(config.getAllRepoConfigs().size(), ButlerCache.getInstance().getAllRepositories().size());
}
{
- for (BorgRepoConfig repoConfig : ConfigurationHandler.getConfiguration().getRepoConfigs()) {
+ for (BorgRepoConfig repoConfig : ConfigurationHandler.getConfiguration().getAllRepoConfigs()) {
Repository repository = ButlerCache.getInstance().getRepositoryArchives(repoConfig.getRepo());
}
- assertEquals(config.getRepoConfigs().size(), ButlerCache.getInstance().getAllRepositories().size());
+ assertEquals(config.getAllRepoConfigs().size(), ButlerCache.getInstance().getAllRepositories().size());
}
- List<BorgRepoConfig> repoConfigs = ConfigurationHandler.getConfiguration().getRepoConfigs();
+ List<BorgRepoConfig> repoConfigs = ConfigurationHandler.getConfiguration().getAllRepoConfigs();
Archive archive = null;
BorgRepoConfig repoConfig = null;
if (CollectionUtils.isNotEmpty(repoConfigs)) {
--
Gitblit v1.10.0