From 84c1d5c1527183a4e2830deab5b177d880914f1c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 22 Oct 2011 09:01:20 -0400
Subject: [PATCH] Documentation. Refactoring class names. Re-encapsulate settings.
---
src/com/gitblit/utils/RpcUtils.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/com/gitblit/utils/RpcUtils.java b/src/com/gitblit/utils/RpcUtils.java
index 440dabd..2d409a0 100644
--- a/src/com/gitblit/utils/RpcUtils.java
+++ b/src/com/gitblit/utils/RpcUtils.java
@@ -29,7 +29,7 @@
import com.gitblit.models.FederationSet;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.ServerStatus;
-import com.gitblit.models.SettingModel;
+import com.gitblit.models.ServerSettings;
import com.gitblit.models.UserModel;
import com.google.gson.reflect.TypeToken;
@@ -57,9 +57,6 @@
}.getType();
private static final Type SETS_TYPE = new TypeToken<Collection<FederationSet>>() {
- }.getType();
-
- private static final Type SETTINGS_TYPE = new TypeToken<Map<String, SettingModel>>() {
}.getType();
/**
@@ -341,14 +338,13 @@
* @param serverUrl
* @param account
* @param password
- * @return an Map<String, SettingModel> object
+ * @return an Settings object
* @throws IOException
*/
- public static Map<String, SettingModel> getSettings(String serverUrl, String account,
- char[] password) throws IOException {
+ public static ServerSettings getSettings(String serverUrl, String account, char[] password)
+ throws IOException {
String url = asLink(serverUrl, RpcRequest.LIST_SETTINGS);
- Map<String, SettingModel> settings = JsonUtils.retrieveJson(url, SETTINGS_TYPE, account,
- password);
+ ServerSettings settings = JsonUtils.retrieveJson(url, ServerSettings.class, account, password);
return settings;
}
@@ -363,7 +359,7 @@
*/
public static ServerStatus getStatus(String serverUrl, String account, char[] password)
throws IOException {
- String url = asLink(serverUrl, RpcRequest.LIST_SERVER_STATUS);
+ String url = asLink(serverUrl, RpcRequest.LIST_STATUS);
ServerStatus status = JsonUtils.retrieveJson(url, ServerStatus.class, account, password);
return status;
}
--
Gitblit v1.9.1