From 11ec58f6958c6b7dc2efdaed2ea9c50a70a4c648 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 17 Apr 2021 12:20:07 +0000
Subject: [PATCH] WIP
---
borgbutler-core/src/main/java/de/micromata/borgbutler/demo/DemoRepos.java | 2 +-
borgbutler-core/src/main/kotlin/de/micromata/borgbutler/config/Configuration.kt | 9 ++-------
borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/SystemInfoRest.kt | 2 +-
borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/SystemInfo.kt | 4 ++--
4 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/demo/DemoRepos.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/demo/DemoRepos.java
index df4865d..487e918 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/demo/DemoRepos.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/demo/DemoRepos.java
@@ -39,7 +39,7 @@
* @return repo list including demo repos if configured. If not configured, the given list is returned (no op).
*/
public static List<BorgRepoConfig> getAllRepos(List<BorgRepoConfig> repositoryList) {
- if (!ConfigurationHandler.getConfiguration().isShowDemoRepos()) {
+ if (!ConfigurationHandler.getConfiguration().getShowDemoRepos()) {
return repositoryList;
}
init(repositoryList);
diff --git a/borgbutler-core/src/main/kotlin/de/micromata/borgbutler/config/Configuration.kt b/borgbutler-core/src/main/kotlin/de/micromata/borgbutler/config/Configuration.kt
index d8781f5..6959a37 100644
--- a/borgbutler-core/src/main/kotlin/de/micromata/borgbutler/config/Configuration.kt
+++ b/borgbutler-core/src/main/kotlin/de/micromata/borgbutler/config/Configuration.kt
@@ -37,7 +37,7 @@
*/
var maxArchiveContentCacheCapacityMb = 100
private set
- var isShowDemoRepos = true
+ var showDemoRepos = true
private set
/**
@@ -100,7 +100,7 @@
fun copyFrom(other: Configuration) {
borgCommand = other.borgCommand
maxArchiveContentCacheCapacityMb = other.maxArchiveContentCacheCapacityMb
- isShowDemoRepos = other.isShowDemoRepos
+ showDemoRepos = other.showDemoRepos
}
@get:JsonIgnore
@@ -121,11 +121,6 @@
return this
}
- fun setShowDemoRepos(showDemoRepos: Boolean): Configuration {
- isShowDemoRepos = showDemoRepos
- return this
- }
-
companion object {
/**
* Default dir name for restoring archives.
diff --git a/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/SystemInfo.kt b/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/SystemInfo.kt
index d6a9d15..3b8e904 100644
--- a/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/SystemInfo.kt
+++ b/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/SystemInfo.kt
@@ -11,7 +11,7 @@
class SystemInfo {
var queueStatistics: BorgQueueStatistics? = null
private set
- var isConfigurationOK = false
+ var configurationOK = false
private set
var borgVersion: BorgVersion? = null
private set
@@ -22,7 +22,7 @@
}
fun setConfigurationOK(configurationOK: Boolean): SystemInfo {
- isConfigurationOK = configurationOK
+ this.configurationOK = configurationOK
return this
}
diff --git a/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/SystemInfoRest.kt b/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/SystemInfoRest.kt
index 943cbb4..28e6b87 100644
--- a/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/SystemInfoRest.kt
+++ b/borgbutler-server/src/main/kotlin/de/micromata/borgbutler/server/rest/SystemInfoRest.kt
@@ -19,7 +19,7 @@
val borgVersion = BorgInstallation.getInstance().getBorgVersion()
val systemInfonfo = SystemInfo()
.setQueueStatistics(BorgQueueExecutor.getInstance().getStatistics())
- .setConfigurationOK(borgVersion.isVersionOK())
+ .setConfigurationOK(borgVersion.isVersionOK)
.setBorgVersion(borgVersion)
return systemInfonfo
}
--
Gitblit v1.10.0