From c4a08913f9e054e5413cb915672663ee4c603f0d Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Fri, 18 Jan 2019 07:09:18 +0000
Subject: [PATCH] Repo config...
---
borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ReposRest.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ReposRest.java b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ReposRest.java
index a7673f7..125f2a0 100644
--- a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ReposRest.java
+++ b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ReposRest.java
@@ -1,6 +1,8 @@
package de.micromata.borgbutler.server.rest;
import de.micromata.borgbutler.cache.ButlerCache;
+import de.micromata.borgbutler.config.BorgRepoConfig;
+import de.micromata.borgbutler.config.ConfigurationHandler;
import de.micromata.borgbutler.data.Repository;
import de.micromata.borgbutler.json.JsonUtils;
import de.micromata.borgbutler.json.borg.BorgRepository;
@@ -40,7 +42,7 @@
*
* @param id id or name of repo.
* @param prettyPrinter If true then the json output will be in pretty format.
- * @return Repository (without list of archives) as json string.
+ * @return {@link Repository} (without list of archives) as json string.
* @see JsonUtils#toJson(Object, boolean)
*/
@GET
@@ -55,22 +57,22 @@
*
* @param id id or name of repo.
* @param prettyPrinter If true then the json output will be in pretty format.
- * @return BorgRepoConf as json string.
+ * @return {@link BorgRepoConfig} as json string.
* @see JsonUtils#toJson(Object, boolean)
*/
@GET
- @Path("repo-config")
+ @Path("repoConfig")
@Produces(MediaType.APPLICATION_JSON)
public String getRepoConfig(@QueryParam("id") String id, @QueryParam("prettyPrinter") boolean prettyPrinter) {
- Repository repository = ButlerCache.getInstance().getRepository(id);
- return JsonUtils.toJson(repository, prettyPrinter);
+ BorgRepoConfig repoConfig = ConfigurationHandler.getConfiguration().getRepoConfig(id);
+ return JsonUtils.toJson(repoConfig, prettyPrinter);
}
/**
*
* @param id id or name of repo.
* @param prettyPrinter If true then the json output will be in pretty format.
- * @return Repository (including list of archives) as json string.
+ * @return {@link Repository} (including list of archives) as json string.
* @see JsonUtils#toJson(Object, boolean)
*/
@GET
--
Gitblit v1.10.0