From eb50dae89589e5179bb1fc7fe163f23a90a9f535 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Fri, 18 Jan 2019 15:43:18 +0000
Subject: [PATCH] BorgRepoConfig stuff -> BorgRepoConfigsRest.
---
borgbutler-webapp/src/components/views/repos/RepoConfigPanel.jsx | 4 +-
borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/BorgRepoConfigsRest.java | 63 +++++++++++++++++++++++++++++++
borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ReposRest.java | 39 ++-----------------
3 files changed, 69 insertions(+), 37 deletions(-)
diff --git a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/BorgRepoConfigsRest.java b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/BorgRepoConfigsRest.java
new file mode 100644
index 0000000..b6009ba
--- /dev/null
+++ b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/BorgRepoConfigsRest.java
@@ -0,0 +1,63 @@
+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.json.JsonUtils;
+import de.micromata.borgbutler.json.borg.BorgRepository;
+import org.apache.commons.collections4.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import java.util.List;
+
+@Path("/repoConfig")
+public class BorgRepoConfigsRest {
+ private static Logger log = LoggerFactory.getLogger(BorgRepoConfigsRest.class);
+
+ /**
+ * @param prettyPrinter If true then the json output will be in pretty format.
+ * @return A list of repositories of type {@link BorgRepository}.
+ * @see JsonUtils#toJson(Object, boolean)
+ */
+ @GET
+ @Path("list")
+ @Produces(MediaType.APPLICATION_JSON)
+ public String getRepoConfigs(@QueryParam("prettyPrinter") boolean prettyPrinter) {
+ List<BorgRepoConfig> repoConfigs = ConfigurationHandler.getConfiguration().getRepoConfigs();
+ if (CollectionUtils.isEmpty(repoConfigs)) {
+ return "[]";
+ }
+ return JsonUtils.toJson(repoConfigs, prettyPrinter);
+ }
+
+ /**
+ * @param id id or name of repo.
+ * @param prettyPrinter If true then the json output will be in pretty format.
+ * @return {@link BorgRepoConfig} as json string.
+ * @see JsonUtils#toJson(Object, boolean)
+ */
+ @GET
+ @Produces(MediaType.APPLICATION_JSON)
+ public String getRepoConfig(@QueryParam("id") String id, @QueryParam("prettyPrinter") boolean prettyPrinter) {
+ BorgRepoConfig repoConfig = ConfigurationHandler.getConfiguration().getRepoConfig(id);
+ return JsonUtils.toJson(repoConfig, prettyPrinter);
+ }
+
+ @POST
+ @Produces(MediaType.TEXT_PLAIN)
+ public void setRepoConfig(String jsonConfig) {
+ BorgRepoConfig newRepoConfig = JsonUtils.fromJson(BorgRepoConfig.class, jsonConfig);
+ BorgRepoConfig repoConfig = ConfigurationHandler.getConfiguration().getRepoConfig(newRepoConfig.getId());
+ if (repoConfig == null) {
+ log.error("Can't find repo config '" + newRepoConfig.getId() + "'. Can't save new settings.");
+ return;
+ }
+ ButlerCache.getInstance().clearRepoCacheAccess(repoConfig.getRepo());
+ ButlerCache.getInstance().clearRepoCacheAccess(newRepoConfig.getRepo());
+ repoConfig.copyFrom(newRepoConfig);
+ ConfigurationHandler.getInstance().save();
+ }
+}
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 8c4660e..337dfb6 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,8 +1,6 @@
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;
@@ -10,7 +8,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.ws.rs.*;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import java.util.List;
@@ -54,38 +55,6 @@
*
* @param id id or name of repo.
* @param prettyPrinter If true then the json output will be in pretty format.
- * @return {@link BorgRepoConfig} as json string.
- * @see JsonUtils#toJson(Object, boolean)
- */
- @GET
- @Path("repoConfig")
- @Produces(MediaType.APPLICATION_JSON)
- public String getRepoConfig(@QueryParam("id") String id, @QueryParam("prettyPrinter") boolean prettyPrinter) {
- BorgRepoConfig repoConfig = ConfigurationHandler.getConfiguration().getRepoConfig(id);
- return JsonUtils.toJson(repoConfig, prettyPrinter);
- }
-
- @POST
- @Path("repoConfig")
- @Produces(MediaType.TEXT_PLAIN)
- public void setRepoConfig(String jsonConfig) {
- BorgRepoConfig newRepoConfig = JsonUtils.fromJson(BorgRepoConfig.class, jsonConfig);
- BorgRepoConfig repoConfig = ConfigurationHandler.getConfiguration().getRepoConfig(newRepoConfig.getId());
- if (repoConfig == null) {
- log.error("Can't find repo config '" + newRepoConfig.getId() + "'. Can't save new settings.");
- return;
- }
- ButlerCache.getInstance().clearRepoCacheAccess(repoConfig.getRepo());
- ButlerCache.getInstance().clearRepoCacheAccess(newRepoConfig.getRepo());
- repoConfig.copyFrom(newRepoConfig);
- ConfigurationHandler.getInstance().save();
- }
-
-
- /**
- *
- * @param id id or name of repo.
- * @param prettyPrinter If true then the json output will be in pretty format.
* @return {@link Repository} (including list of archives) as json string.
* @see JsonUtils#toJson(Object, boolean)
*/
diff --git a/borgbutler-webapp/src/components/views/repos/RepoConfigPanel.jsx b/borgbutler-webapp/src/components/views/repos/RepoConfigPanel.jsx
index 93a9303..bb549df 100644
--- a/borgbutler-webapp/src/components/views/repos/RepoConfigPanel.jsx
+++ b/borgbutler-webapp/src/components/views/repos/RepoConfigPanel.jsx
@@ -30,7 +30,7 @@
failed: false,
repoConfig: undefined
});
- fetch(getRestServiceUrl('repos/repoConfig', {
+ fetch(getRestServiceUrl('repoConfig', {
id: this.props.id
}), {
method: 'GET',
@@ -60,7 +60,7 @@
}
async onSave(event) {
- const response = fetch(getRestServiceUrl("repos/repoConfig"), {
+ const response = fetch(getRestServiceUrl("repoConfig"), {
method: 'POST',
headers: {
'Content-Type': 'application/json'
--
Gitblit v1.10.0