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

SessionInfo: allow null and modified API

Browse Source 
The API of the session info returns parameters in snake case instead of
camel case.

This patch chagne the expected field to match the API. It was also
modified to accept empty fields and store them as null.

Signed-off-by: Amnon Heiman <amnon@scylladb.com>
This commit is contained in:
Amnon Heiman 2015-12-31 11:35:48 +02:00
parent cd910aafa9
commit 36c4a7df27
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/apache/cassandra/streaming/SessionInfo.java
View File

@ -76,8 +76,8 @@ public final class SessionInfo implements Serializable
this.peer = peer;
this.sessionIndex = sessionIndex;
this.connecting = connecting;
this.receivingSummaries = ImmutableSet.copyOf(receivingSummaries);
this.sendingSummaries = ImmutableSet.copyOf(sendingSummaries);
this.receivingSummaries = receivingSummaries;
this.sendingSummaries = sendingSummaries;
this.receivingFiles = new ConcurrentHashMap<>();
this.sendingFiles = new ConcurrentHashMap<>();
this.state = state;
@ -94,10 +94,10 @@ public final class SessionInfo implements Serializable
}
public static SessionInfo fromJsonObject(JsonObject obj) {
return new SessionInfo(obj.getString("peer"), obj.getInt("sessionIndex"),
return new SessionInfo(obj.getString("peer"), obj.getInt("session_index"),
obj.getString("connecting"),
StreamSummary.fromJsonArr(obj.getJsonArray("receivingSummaries")),
StreamSummary.fromJsonArr(obj.getJsonArray("sendingSummaries")),
StreamSummary.fromJsonArr(obj.getJsonArray("receiving_summaries")),
StreamSummary.fromJsonArr(obj.getJsonArray("sending_summaries")),
obj.getString("state"));
}
@ -222,6 +222,9 @@ public final class SessionInfo implements Serializable
private long getTotalSizes(Collection<StreamSummary> summaries)
{
if (summaries == null) {
return 0;
}
long total = 0;
for (StreamSummary summary : summaries)
total += summary.totalSize;