From 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 17:36:12 -0400
Subject: [PATCH] Merge release 1.6.0
---
src/main/java/com/gitblit/transport/ssh/commands/ListCommand.java | 84 +++++++++++++++++++++++++----------------
1 files changed, 51 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/commands/ListCommand.java b/src/main/java/com/gitblit/transport/ssh/commands/ListCommand.java
index 3953433..8d4ddc3 100644
--- a/src/main/java/com/gitblit/transport/ssh/commands/ListCommand.java
+++ b/src/main/java/com/gitblit/transport/ssh/commands/ListCommand.java
@@ -1,61 +1,75 @@
+/*
+ * Copyright 2014 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.gitblit.transport.ssh.commands;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import org.kohsuke.args4j.Argument;
import org.kohsuke.args4j.Option;
-import com.gitblit.utils.StringUtils;
+import com.gitblit.utils.JsonUtils;
+/**
+ * Parent class of a list command.
+ *
+ * @author James Moger
+ *
+ * @param <T>
+ */
public abstract class ListCommand<T> extends SshCommand {
@Option(name = "--verbose", aliases = { "-v" }, usage = "verbose")
protected boolean verbose;
- @Option(name = "--tabbed", aliases = { "-t" }, usage = "as tabbed output")
- private boolean tabbed;
+ @Option(name = "--tabbed", usage = "generate tabbed-text output")
+ protected boolean tabbed;
- @Argument(index = 0, metaVar = "REGEX", usage = "regex filter expression")
- protected String regexFilter;
-
+ @Option(name = "--json", usage = "generate JSON output")
+ protected boolean json;
+
private DateFormat df;
- protected abstract List<T> getItems();
-
- protected abstract boolean matches(T t);
-
- @Override
- public void run() {
- List<T> list = getItems();
- List<T> filtered;
- if (StringUtils.isEmpty(regexFilter)) {
- // no regex filter
- filtered = list;
- } else {
- // regex filter the list
- filtered = new ArrayList<T>();
- for (T t : list) {
- if (matches(t)) {
- filtered.add(t);
- }
- }
- }
+ protected abstract List<T> getItems() throws UnloggedFailure;
+ protected void validateOutputFormat() throws UnloggedFailure {
+ if (tabbed && json) {
+ throw new UnloggedFailure(1, "Please specify --tabbed OR --json, not both!");
+ }
+ }
+
+ @Override
+ public void run() throws UnloggedFailure {
+ validateOutputFormat();
+
+ List<T> list = getItems();
if (tabbed) {
- asTabbed(filtered);
+ asTabbed(list);
+ } else if (json) {
+ asJSON(list);
} else {
- asTable(filtered);
+ asTable(list);
}
}
protected abstract void asTable(List<T> list);
-
+
protected abstract void asTabbed(List<T> list);
-
+
protected void outTabbed(Object... values) {
StringBuilder pattern = new StringBuilder();
for (int i = 0; i < values.length; i++) {
@@ -64,7 +78,11 @@
pattern.setLength(pattern.length() - 1);
stdout.println(String.format(pattern.toString(), values));
}
-
+
+ protected void asJSON(List<T> list) {
+ stdout.println(JsonUtils.toJsonString(list));
+ }
+
protected String formatDate(Date date) {
if (df == null) {
df = new SimpleDateFormat("yyyy-MM-dd");
--
Gitblit v1.9.1