From 1c087fae322a1b07bb7bd554ee10ff473c47c727 Mon Sep 17 00:00:00 2001
From: Fin Reinhard <fin.reinhard@icloud.com>
Date: Tue, 22 Jan 2019 20:51:03 +0000
Subject: [PATCH] Merge branch 'master' into feature/15-archive-view-url
---
borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ReposRest.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 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 3152f1c..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
@@ -19,15 +19,15 @@
public class ReposRest {
private static Logger log = LoggerFactory.getLogger(ReposRest.class);
- @GET
- @Path("list")
- @Produces(MediaType.APPLICATION_JSON)
/**
*
* @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 getList(@QueryParam("prettyPrinter") boolean prettyPrinter) {
List<Repository> repositories = ButlerCache.getInstance().getAllRepositories();
if (CollectionUtils.isEmpty(repositories)) {
@@ -36,32 +36,31 @@
return JsonUtils.toJson(repositories, prettyPrinter);
}
- @GET
- @Path("repo")
- @Produces(MediaType.APPLICATION_JSON)
/**
*
* @param id id or name of repo.
- * @param force If true, a reload of all repositories is forced.
* @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
+ @Path("repo")
+ @Produces(MediaType.APPLICATION_JSON)
public String getRepo(@QueryParam("id") String id, @QueryParam("prettyPrinter") boolean prettyPrinter) {
Repository repository = ButlerCache.getInstance().getRepository(id);
return JsonUtils.toJson(repository, prettyPrinter);
}
- @GET
- @Path("repoArchiveList")
- @Produces(MediaType.APPLICATION_JSON)
/**
*
* @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
+ @Path("repoArchiveList")
+ @Produces(MediaType.APPLICATION_JSON)
public String getRepoArchiveList(@QueryParam("id") String id, @QueryParam("force") boolean force,
@QueryParam("prettyPrinter") boolean prettyPrinter) {
if (force) {
--
Gitblit v1.10.0