andreacavalli/scylla-jmx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

API accessor

Browse Source 
* Make config an instance object
* Add functional interfaces
* http options
* Remove dead code
* Clean up/format
This commit is contained in:
elcallio 2016-10-11 14:10:19 +02:00 committed by Calle Wilund
parent f4f3c44dc1
commit 1709ff2d02
3 changed files with 102 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

213
src/main/java/com/scylladb/jmx/api/APIClient.java
View File

@ -14,6 +14,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.function.BiFunction;
import java.util.logging.Logger;
import javax.json.Json; import javax.json.Json;
import javax.json.JsonArray; import javax.json.JsonArray;
@ -35,13 +37,12 @@ import javax.ws.rs.core.Response;
import org.glassfish.jersey.client.ClientConfig; import org.glassfish.jersey.client.ClientConfig;
import com.scylladb.jmx.utils.EstimatedHistogram;
import com.scylladb.jmx.utils.SnapshotDetailsTabularData; import com.scylladb.jmx.utils.SnapshotDetailsTabularData;
import com.yammer.metrics.core.HistogramValues;
public class APIClient { public class APIClient {
Map<String, CacheEntry> cache = new HashMap<String, CacheEntry>(); private Map<String, CacheEntry> cache = new HashMap<String, CacheEntry>();
String getCacheKey(String key, MultivaluedMap<String, String> param, long duration) {
private String getCacheKey(String key, MultivaluedMap<String, String> param, long duration) {
if (duration <= 0) { if (duration <= 0) {
return null; return null;
} }
@ -56,43 +57,40 @@ public class APIClient {
return key; return key;
} }
String getStringFromCache(String key, long duration) { private String getStringFromCache(String key, long duration) {
if (key == null) { if (key == null) {
return null; return null;
} }
CacheEntry value = cache.get(key); CacheEntry value = cache.get(key);
return (value!= null && value.valid(duration))? value.stringValue() : null; return (value != null && value.valid(duration)) ? value.stringValue() : null;
} }
JsonObject getJsonObjectFromCache(String key, long duration) { private JsonObject getJsonObjectFromCache(String key, long duration) {
if (key == null) { if (key == null) {
return null; return null;
} }
CacheEntry value = cache.get(key); CacheEntry value = cache.get(key);
return (value!= null && value.valid(duration))? value.jsonObject() : null; return (value != null && value.valid(duration)) ? value.jsonObject() : null;
} }
EstimatedHistogram getEstimatedHistogramFromCache(String key, long duration) { private JsonReaderFactory factory = Json.createReaderFactory(null);
if (key == null) { private static final Logger logger = Logger.getLogger(APIClient.class.getName());
return null;
} private final APIConfig config;
CacheEntry value = cache.get(key);
return (value!= null && value.valid(duration))? value.getEstimatedHistogram() : null; public APIClient(APIConfig config) {
this.config = config;
} }
JsonReaderFactory factory = Json.createReaderFactory(null); private String getBaseUrl() {
private static final java.util.logging.Logger logger = java.util.logging.Logger return config.getBaseUrl();
.getLogger(APIClient.class.getName());
public static String getBaseUrl() {
return APIConfig.getBaseUrl();
} }
public Invocation.Builder get(String path, MultivaluedMap<String, String> queryParams) { public Invocation.Builder get(String path, MultivaluedMap<String, String> queryParams) {
Client client = ClientBuilder.newClient( new ClientConfig()); Client client = ClientBuilder.newClient(new ClientConfig());
WebTarget webTarget = client.target(getBaseUrl()).path(path); WebTarget webTarget = client.target(getBaseUrl()).path(path);
if (queryParams != null) { if (queryParams != null) {
for (Entry<String, List<String>> qp : queryParams.entrySet()) { for (Entry<String, List<String>> qp : queryParams.entrySet()) {
for (String e : qp.getValue()) { for (String e : qp.getValue()) {
webTarget = webTarget.queryParam(qp.getKey(), e); webTarget = webTarget.queryParam(qp.getKey(), e);
} }
@ -112,8 +110,9 @@ public class APIClient {
public Response post(String path, MultivaluedMap<String, String> queryParams, Object object, String type) { public Response post(String path, MultivaluedMap<String, String> queryParams, Object object, String type) {
try { try {
Response response = get(path, queryParams).post(Entity.entity(object, type)); Response response = get(path, queryParams).post(Entity.entity(object, type));
if (response.getStatus() != Response.Status.OK.getStatusCode() ) { if (response.getStatus() != Response.Status.OK.getStatusCode()) {
throw getException("Scylla API server HTTP POST to URL '" + path + "' failed", response.readEntity(String.class)); throw getException("Scylla API server HTTP POST to URL '" + path + "' failed",
response.readEntity(String.class));
} }
return response; return response;
} catch (ProcessingException e) { } catch (ProcessingException e) {
@ -124,7 +123,7 @@ public class APIClient {
public Response post(String path, MultivaluedMap<String, String> queryParams, Object object) { public Response post(String path, MultivaluedMap<String, String> queryParams, Object object) {
return post(path, queryParams, object, MediaType.TEXT_PLAIN); return post(path, queryParams, object, MediaType.TEXT_PLAIN);
} }
public void post(String path) { public void post(String path) {
post(path, null); post(path, null);
} }
@ -159,8 +158,7 @@ public class APIClient {
delete(path, null); delete(path, null);
} }
public String getRawValue(String string, public String getRawValue(String string, MultivaluedMap<String, String> queryParams, long duration) {
MultivaluedMap<String, String> queryParams, long duration) {
try { try {
if (string.equals("")) { if (string.equals("")) {
return ""; return "";
@ -176,7 +174,8 @@ public class APIClient {
// TBD // TBD
// We are currently not caching errors, // We are currently not caching errors,
// it should be reconsider. // it should be reconsider.
throw getException("Scylla API server HTTP GET to URL '" + string + "' failed", response.readEntity(String.class)); throw getException("Scylla API server HTTP GET to URL '" + string + "' failed",
response.readEntity(String.class));
} }
res = response.readEntity(String.class); res = response.readEntity(String.class);
if (duration > 0) { if (duration > 0) {
@ -188,8 +187,7 @@ public class APIClient {
} }
} }
public String getRawValue(String string, public String getRawValue(String string, MultivaluedMap<String, String> queryParams) {
MultivaluedMap<String, String> queryParams) {
return getRawValue(string, queryParams, 0); return getRawValue(string, queryParams, 0);
} }
@ -202,23 +200,19 @@ public class APIClient {
} }
public String getStringValue(String string, MultivaluedMap<String, String> queryParams) { public String getStringValue(String string, MultivaluedMap<String, String> queryParams) {
return getRawValue(string, return getRawValue(string, queryParams).replaceAll("^\"|\"$", "");
queryParams).replaceAll("^\"|\"$", "");
} }
public String getStringValue(String string, MultivaluedMap<String, String> queryParams, long duration) { public String getStringValue(String string, MultivaluedMap<String, String> queryParams, long duration) {
return getRawValue(string, return getRawValue(string, queryParams, duration).replaceAll("^\"|\"$", "");
queryParams, duration).replaceAll("^\"|\"$", "");
} }
public String getStringValue(String string) { public String getStringValue(String string) {
return getStringValue(string, null); return getStringValue(string, null);
} }
public JsonReader getReader(String string, public JsonReader getReader(String string, MultivaluedMap<String, String> queryParams) {
MultivaluedMap<String, String> queryParams) { return factory.createReader(new StringReader(getRawValue(string, queryParams)));
return factory.createReader(new StringReader(getRawValue(string,
queryParams)));
} }
public JsonReader getReader(String string) { public JsonReader getReader(String string) {
@ -230,8 +224,7 @@ public class APIClient {
return val.toArray(new String[val.size()]); return val.toArray(new String[val.size()]);
} }
public int getIntValue(String string, public int getIntValue(String string, MultivaluedMap<String, String> queryParams) {
MultivaluedMap<String, String> queryParams) {
return Integer.parseInt(getRawValue(string, queryParams)); return Integer.parseInt(getRawValue(string, queryParams));
} }
@ -239,6 +232,19 @@ public class APIClient {
return getIntValue(string, null); return getIntValue(string, null);
} }
public static <T> BiFunction<APIClient, String, T> getReader(Class<T> type) {
if (type == String.class) {
return (c, s) -> type.cast(c.getRawValue(s));
} else if (type == Integer.class) {
return (c, s) -> type.cast(c.getIntValue(s));
} else if (type == Double.class) {
return (c, s) -> type.cast(c.getDoubleValue(s));
} else if (type == Long.class) {
return (c, s) -> type.cast(c.getLongValue(s));
}
throw new IllegalArgumentException(type.getName());
}
public boolean getBooleanValue(String string) { public boolean getBooleanValue(String string) {
return Boolean.parseBoolean(getRawValue(string)); return Boolean.parseBoolean(getRawValue(string));
} }
@ -247,8 +253,7 @@ public class APIClient {
return Double.parseDouble(getRawValue(string)); return Double.parseDouble(getRawValue(string));
} }
public List<String> getListStrValue(String string, public List<String> getListStrValue(String string, MultivaluedMap<String, String> queryParams) {
MultivaluedMap<String, String> queryParams) {
JsonReader reader = getReader(string, queryParams); JsonReader reader = getReader(string, queryParams);
JsonArray arr = reader.readArray(); JsonArray arr = reader.readArray();
List<String> res = new ArrayList<String>(arr.size()); List<String> res = new ArrayList<String>(arr.size());
@ -303,8 +308,7 @@ public class APIClient {
return join(arr, ","); return join(arr, ",");
} }
public static String mapToString(Map<String, String> mp, String pairJoin, public static String mapToString(Map<String, String> mp, String pairJoin, String joiner) {
String joiner) {
String res = ""; String res = "";
if (mp != null) { if (mp != null) {
for (String name : mp.keySet()) { for (String name : mp.keySet()) {
@ -321,19 +325,15 @@ public class APIClient {
return mapToString(mp, "=", ","); return mapToString(mp, "=", ",");
} }
public static boolean set_query_param( public static boolean set_query_param(MultivaluedMap<String, String> queryParams, String key, String value) {
MultivaluedMap<String, String> queryParams, String key, String value) { if (queryParams != null && key != null && value != null && !value.equals("")) {
if (queryParams != null && key != null && value != null
&& !value.equals("")) {
queryParams.add(key, value); queryParams.add(key, value);
return true; return true;
} }
return false; return false;
} }
public static boolean set_bool_query_param( public static boolean set_bool_query_param(MultivaluedMap<String, String> queryParams, String key, boolean value) {
MultivaluedMap<String, String> queryParams, String key,
boolean value) {
if (queryParams != null && key != null && value) { if (queryParams != null && key != null && value) {
queryParams.add(key, "true"); queryParams.add(key, "true");
return true; return true;
@ -352,8 +352,7 @@ public class APIClient {
for (int i = 0; i < arr.size(); i++) { for (int i = 0; i < arr.size(); i++) {
JsonObject obj = arr.getJsonObject(i); JsonObject obj = arr.getJsonObject(i);
if (obj.containsKey("key") && obj.containsKey("value")) { if (obj.containsKey("key") && obj.containsKey("value")) {
map.put(obj.getString("key"), map.put(obj.getString("key"), listStrFromJArr(obj.getJsonArray("value")));
listStrFromJArr(obj.getJsonArray("value")));
} }
} }
reader.close(); reader.close();
@ -375,8 +374,7 @@ public class APIClient {
for (int i = 0; i < arr.size(); i++) { for (int i = 0; i < arr.size(); i++) {
JsonObject obj = arr.getJsonObject(i); JsonObject obj = arr.getJsonObject(i);
if (obj.containsKey("key") && obj.containsKey("value")) { if (obj.containsKey("key") && obj.containsKey("value")) {
map.put(listStrFromJArr(obj.getJsonArray("key")), map.put(listStrFromJArr(obj.getJsonArray("key")), listStrFromJArr(obj.getJsonArray("value")));
listStrFromJArr(obj.getJsonArray("value")));
} }
} }
reader.close(); reader.close();
@ -387,8 +385,7 @@ public class APIClient {
return getMapListStrValue(string, null); return getMapListStrValue(string, null);
} }
public Set<String> getSetStringValue(String string, public Set<String> getSetStringValue(String string, MultivaluedMap<String, String> queryParams) {
MultivaluedMap<String, String> queryParams) {
JsonReader reader = getReader(string, queryParams); JsonReader reader = getReader(string, queryParams);
JsonArray arr = reader.readArray(); JsonArray arr = reader.readArray();
Set<String> res = new HashSet<String>(); Set<String> res = new HashSet<String>();
@ -403,8 +400,7 @@ public class APIClient {
return getSetStringValue(string, null); return getSetStringValue(string, null);
} }
public Map<String, String> getMapStrValue(String string, public Map<String, String> getMapStrValue(String string, MultivaluedMap<String, String> queryParams) {
MultivaluedMap<String, String> queryParams) {
if (string.equals("")) { if (string.equals("")) {
return null; return null;
} }
@ -425,8 +421,7 @@ public class APIClient {
return getMapStrValue(string, null); return getMapStrValue(string, null);
} }
public Map<String, String> getReverseMapStrValue(String string, public Map<String, String> getReverseMapStrValue(String string, MultivaluedMap<String, String> queryParams) {
MultivaluedMap<String, String> queryParams) {
if (string.equals("")) { if (string.equals("")) {
return null; return null;
} }
@ -443,12 +438,11 @@ public class APIClient {
return map; return map;
} }
public Map<String, String> getReverseMapStrValue(String string) { public Map<String, String> getReverseMapStrValue(String string) {
return getReverseMapStrValue(string, null); return getReverseMapStrValue(string, null);
} }
public List<InetAddress> getListInetAddressValue(String string, public List<InetAddress> getListInetAddressValue(String string, MultivaluedMap<String, String> queryParams) {
MultivaluedMap<String, String> queryParams) {
List<String> vals = getListStrValue(string, queryParams); List<String> vals = getListStrValue(string, queryParams);
List<InetAddress> res = new ArrayList<InetAddress>(); List<InetAddress> res = new ArrayList<InetAddress>();
for (String val : vals) { for (String val : vals) {
@ -472,22 +466,20 @@ public class APIClient {
} }
private TabularDataSupport getSnapshotData(String key, JsonArray arr) { private TabularDataSupport getSnapshotData(String key, JsonArray arr) {
TabularDataSupport data = new TabularDataSupport( TabularDataSupport data = new TabularDataSupport(SnapshotDetailsTabularData.TABULAR_TYPE);
SnapshotDetailsTabularData.TABULAR_TYPE);
for (int i = 0; i < arr.size(); i++) { for (int i = 0; i < arr.size(); i++) {
JsonObject obj = arr.getJsonObject(i); JsonObject obj = arr.getJsonObject(i);
if (obj.containsKey("ks") && obj.containsKey("cf")) { if (obj.containsKey("ks") && obj.containsKey("cf")) {
SnapshotDetailsTabularData.from(key, obj.getString("ks"), SnapshotDetailsTabularData.from(key, obj.getString("ks"), obj.getString("cf"), obj.getInt("total"),
obj.getString("cf"), obj.getInt("total"),
obj.getInt("live"), data); obj.getInt("live"), data);
} }
} }
return data; return data;
} }
public Map<String, TabularData> getMapStringSnapshotTabularDataValue( public Map<String, TabularData> getMapStringSnapshotTabularDataValue(String string,
String string, MultivaluedMap<String, String> queryParams) { MultivaluedMap<String, String> queryParams) {
if (string.equals("")) { if (string.equals("")) {
return null; return null;
} }
@ -521,8 +513,7 @@ public class APIClient {
for (int i = 0; i < arr.size(); i++) { for (int i = 0; i < arr.size(); i++) {
try { try {
obj = arr.getJsonObject(i); obj = arr.getJsonObject(i);
res.put(InetAddress.getByName(obj.getString("key")), res.put(InetAddress.getByName(obj.getString("key")), Float.parseFloat(obj.getString("value")));
Float.parseFloat(obj.getString("value")));
} catch (UnknownHostException e) { } catch (UnknownHostException e) {
logger.warning("Bad formatted address " + obj.getString("key")); logger.warning("Bad formatted address " + obj.getString("key"));
} }
@ -534,8 +525,7 @@ public class APIClient {
return getMapInetAddressFloatValue(string, null); return getMapInetAddressFloatValue(string, null);
} }
public Map<String, Long> getMapStringLongValue(String string, public Map<String, Long> getMapStringLongValue(String string, MultivaluedMap<String, String> queryParams) {
MultivaluedMap<String, String> queryParams) {
Map<String, Long> res = new HashMap<String, Long>(); Map<String, Long> res = new HashMap<String, Long>();
JsonReader reader = getReader(string, queryParams); JsonReader reader = getReader(string, queryParams);
@ -553,8 +543,7 @@ public class APIClient {
return getMapStringLongValue(string, null); return getMapStringLongValue(string, null);
} }
public long[] getLongArrValue(String string, public long[] getLongArrValue(String string, MultivaluedMap<String, String> queryParams) {
MultivaluedMap<String, String> queryParams) {
JsonReader reader = getReader(string, queryParams); JsonReader reader = getReader(string, queryParams);
JsonArray arr = reader.readArray(); JsonArray arr = reader.readArray();
long[] res = new long[arr.size()]; long[] res = new long[arr.size()];
@ -569,8 +558,7 @@ public class APIClient {
return getLongArrValue(string, null); return getLongArrValue(string, null);
} }
public Map<String, Integer> getMapStringIntegerValue(String string, public Map<String, Integer> getMapStringIntegerValue(String string, MultivaluedMap<String, String> queryParams) {
MultivaluedMap<String, String> queryParams) {
Map<String, Integer> res = new HashMap<String, Integer>(); Map<String, Integer> res = new HashMap<String, Integer>();
JsonReader reader = getReader(string, queryParams); JsonReader reader = getReader(string, queryParams);
@ -588,8 +576,7 @@ public class APIClient {
return getMapStringIntegerValue(string, null); return getMapStringIntegerValue(string, null);
} }
public int[] getIntArrValue(String string, public int[] getIntArrValue(String string, MultivaluedMap<String, String> queryParams) {
MultivaluedMap<String, String> queryParams) {
JsonReader reader = getReader(string, queryParams); JsonReader reader = getReader(string, queryParams);
JsonArray arr = reader.readArray(); JsonArray arr = reader.readArray();
int[] res = new int[arr.size()]; int[] res = new int[arr.size()];
@ -604,8 +591,7 @@ public class APIClient {
return getIntArrValue(string, null); return getIntArrValue(string, null);
} }
public Map<String, Long> getListMapStringLongValue(String string, public Map<String, Long> getListMapStringLongValue(String string, MultivaluedMap<String, String> queryParams) {
MultivaluedMap<String, String> queryParams) {
if (string.equals("")) { if (string.equals("")) {
return null; return null;
} }
@ -638,8 +624,7 @@ public class APIClient {
return getListMapStringLongValue(string, null); return getListMapStringLongValue(string, null);
} }
public JsonArray getJsonArray(String string, public JsonArray getJsonArray(String string, MultivaluedMap<String, String> queryParams) {
MultivaluedMap<String, String> queryParams) {
if (string.equals("")) { if (string.equals("")) {
return null; return null;
} }
@ -653,8 +638,7 @@ public class APIClient {
return getJsonArray(string, null); return getJsonArray(string, null);
} }
public List<Map<String, String>> getListMapStrValue(String string, public List<Map<String, String>> getListMapStrValue(String string, MultivaluedMap<String, String> queryParams) {
MultivaluedMap<String, String> queryParams) {
JsonArray arr = getJsonArray(string, queryParams); JsonArray arr = getJsonArray(string, queryParams);
List<Map<String, String>> res = new ArrayList<Map<String, String>>(); List<Map<String, String>> res = new ArrayList<Map<String, String>>();
for (int i = 0; i < arr.size(); i++) { for (int i = 0; i < arr.size(); i++) {
@ -672,8 +656,7 @@ public class APIClient {
return null; return null;
} }
public JsonObject getJsonObj(String string, public JsonObject getJsonObj(String string, MultivaluedMap<String, String> queryParams, long duration) {
MultivaluedMap<String, String> queryParams, long duration) {
if (string.equals("")) { if (string.equals("")) {
return null; return null;
} }
@ -690,61 +673,19 @@ public class APIClient {
} }
return res; return res;
} }
public JsonObject getJsonObj(String string,
MultivaluedMap<String, String> queryParams) { public JsonObject getJsonObj(String string, MultivaluedMap<String, String> queryParams) {
return getJsonObj(string, queryParams, 0); return getJsonObj(string, queryParams, 0);
} }
public static HistogramValues json2histogram(JsonObject obj) { public long[] getEstimatedHistogramAsLongArrValue(String string, MultivaluedMap<String, String> queryParams) {
HistogramValues res = new HistogramValues();
res.count = obj.getJsonNumber("count").longValue();
res.max = obj.getJsonNumber("max").longValue();
res.min = obj.getJsonNumber("min").longValue();
res.sum = obj.getJsonNumber("sum").longValue();
res.variance = obj.getJsonNumber("variance").doubleValue();
res.mean = obj.getJsonNumber("mean").doubleValue();
JsonArray arr = obj.getJsonArray("sample");
if (arr != null) {
res.sample = new long[arr.size()];
for (int i = 0; i < arr.size(); i++) {
res.sample[i] = arr.getJsonNumber(i).longValue();
}
}
return res;
}
public HistogramValues getHistogramValue(String url,
MultivaluedMap<String, String> queryParams) {
return json2histogram(getJsonObj(url, queryParams));
}
public HistogramValues getHistogramValue(String url) {
return getHistogramValue(url, null);
}
public EstimatedHistogram getEstimatedHistogram(String string,
MultivaluedMap<String, String> queryParams, long duration) {
String key = getCacheKey(string, queryParams, duration);
EstimatedHistogram res = getEstimatedHistogramFromCache(key, duration);
if (res != null) {
return res;
}
res = new EstimatedHistogram(getEstimatedHistogramAsLongArrValue(string, queryParams));
if (duration > 0) {
cache.put(key, new CacheEntry(res));
}
return res;
}
public long[] getEstimatedHistogramAsLongArrValue(String string,
MultivaluedMap<String, String> queryParams) {
JsonObject obj = getJsonObj(string, queryParams); JsonObject obj = getJsonObj(string, queryParams);
JsonArray arr = obj.getJsonArray("buckets"); JsonArray arr = obj.getJsonArray("buckets");
if (arr == null) { if (arr == null) {
return new long[0]; return new long[0];
} }
long res[] = new long[arr.size()]; long res[] = new long[arr.size()];
for (int i = 0; i< arr.size(); i++) { for (int i = 0; i < arr.size(); i++) {
res[i] = arr.getJsonNumber(i).longValue(); res[i] = arr.getJsonNumber(i).longValue();
} }
return res; return res;
@ -754,8 +695,7 @@ public class APIClient {
return getEstimatedHistogramAsLongArrValue(string, null); return getEstimatedHistogramAsLongArrValue(string, null);
} }
public Map<String, Double> getMapStringDouble(String string, public Map<String, Double> getMapStringDouble(String string, MultivaluedMap<String, String> queryParams) {
MultivaluedMap<String, String> queryParams) {
if (string.equals("")) { if (string.equals("")) {
return null; return null;
} }
@ -783,6 +723,7 @@ public class APIClient {
reader.close(); reader.close();
return map; return map;
} }
public Map<String, Double> getMapStringDouble(String string) { public Map<String, Double> getMapStringDouble(String string) {
return getMapStringDouble(string, null); return getMapStringDouble(string, null);
} }

46
src/main/java/com/scylladb/jmx/api/APIConfig.java
View File

@ -30,23 +30,22 @@ import org.yaml.snakeyaml.Yaml;
*/ */
public class APIConfig { public class APIConfig {
static String address = "localhost"; private String address = "localhost";
static String port = "10000"; private String port = "10000";
public static String getAddress() { public String getAddress() {
return address; return address;
} }
public static String getPort() { public String getPort() {
return port; return port;
} }
public static String getBaseUrl() { public String getBaseUrl() {
return "http://" + address + ":" return "http://" + address + ":" + port;
+ port;
} }
public static void readFile(String name) { private void readFile(String name) {
System.out.println("Using config file: " + name); System.out.println("Using config file: " + name);
InputStream input; InputStream input;
try { try {
@ -61,7 +60,7 @@ public class APIConfig {
address = (String) map.get("api_address"); address = (String) map.get("api_address");
} }
if (map.containsKey("api_port")) { if (map.containsKey("api_port")) {
port = (String) map.get("api_port").toString(); port = map.get("api_port").toString();
} }
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
System.err.println("fail reading from config file: " + name); System.err.println("fail reading from config file: " + name);
@ -74,7 +73,7 @@ public class APIConfig {
return varTmpDir.exists(); return varTmpDir.exists();
} }
public static boolean loadIfExists(String path, String name) { private boolean loadIfExists(String path, String name) {
if (path == null) { if (path == null) {
return false; return false;
} }
@ -84,24 +83,21 @@ public class APIConfig {
readFile(path + name); readFile(path + name);
return true; return true;
} }
/** /**
* setConfig load the JMX proxy configuration * setConfig load the JMX proxy configuration The configuration hierarchy is
* The configuration hierarchy is as follow: * as follow: Command line argument takes precedence over everything Then
* Command line argument takes precedence over everything * configuration file in the command line (command line argument can replace
* Then configuration file in the command line (command line * specific values in it. Then SCYLLA_CONF/scylla.yaml Then
* argument can replace specific values in it. * SCYLLA_HOME/conf/scylla.yaml Then conf/scylla.yaml Then the default
* Then SCYLLA_CONF/scylla.yaml * values With file configuration, to make it clearer what is been used,
* Then SCYLLA_HOME/conf/scylla.yaml * only one file will be chosen with the highest precedence
* Then conf/scylla.yaml
* Then the default values
* With file configuration, to make it clearer what is been used, only
* one file will be chosen with the highest precedence
*/ */
public static void setConfig() { public APIConfig() {
if (!System.getProperty("apiconfig","").equals("")) { if (!System.getProperty("apiconfig", "").equals("")) {
readFile(System.getProperty("apiconfig")); readFile(System.getProperty("apiconfig"));
} else if (!loadIfExists(System.getenv("SCYLLA_CONF"), "/scylla.yaml") && } else if (!loadIfExists(System.getenv("SCYLLA_CONF"), "/scylla.yaml")
!loadIfExists(System.getenv("SCYLLA_HOME"), "/conf/scylla.yaml")) { && !loadIfExists(System.getenv("SCYLLA_HOME"), "/conf/scylla.yaml")) {
loadIfExists("", "conf/scylla.yaml"); loadIfExists("", "conf/scylla.yaml");
} }

14
src/main/java/com/scylladb/jmx/api/CacheEntry.java
View File

@ -23,13 +23,11 @@ package com.scylladb.jmx.api;
import javax.json.JsonObject; import javax.json.JsonObject;
import com.scylladb.jmx.utils.EstimatedHistogram; class CacheEntry {
private long time;
private Object value;
public class CacheEntry { public CacheEntry(Object res) {
long time;
Object value;
CacheEntry(Object res) {
time = System.currentTimeMillis(); time = System.currentTimeMillis();
this.value = res; this.value = res;
} }
@ -42,10 +40,6 @@ public class CacheEntry {
return (String) value; return (String) value;
} }
public EstimatedHistogram getEstimatedHistogram() {
return (EstimatedHistogram)value;
}
public JsonObject jsonObject() { public JsonObject jsonObject() {
return (JsonObject) value; return (JsonObject) value;
} }