From e01e6d75d5667a723b6aebd0abfebe323514f7fa Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 08 Dec 2018 21:45:41 +0000
Subject: [PATCH] refactoring...
---
borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
index 09f5a74..a9a2893 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
@@ -4,7 +4,8 @@
import de.micromata.borgbutler.config.Configuration;
import de.micromata.borgbutler.config.ConfigurationHandler;
import de.micromata.borgbutler.json.JsonUtils;
-import de.micromata.borgbutler.json.borg.Archive;
+import de.micromata.borgbutler.json.borg.Archive1;
+import de.micromata.borgbutler.json.borg.ArchiveList;
import de.micromata.borgbutler.json.borg.RepoInfo;
import de.micromata.borgbutler.json.borg.RepoList;
import org.apache.commons.exec.*;
@@ -44,13 +45,14 @@
* @param archive
* @return
*/
- public static String info(BorgRepoConfig repoConfig, Archive archive) {
+ public static ArchiveList info(BorgRepoConfig repoConfig, Archive1 archive) {
String json = execute(repoConfig, "info", repoConfig.getRepo() + "::" + archive.getArchive(), "--json");
if (json == null) {
return null;
}
- log.info(json);
- return json;
+ ArchiveList archiveList = JsonUtils.fromJson(ArchiveList.class, json);
+ archiveList.setOriginalJson(json);
+ return archiveList;
}
public static RepoList list(BorgRepoConfig repoConfig) {
--
Gitblit v1.10.0