sort commands in statistics

Author: oshai

Diff for: src/common/codeine/servlet/AbstractServlet.java

@@ -18,6 +18,7 @@
 import codeine.model.Constants;
 import codeine.permissions.IUserWithPermissions;
 import codeine.permissions.UserPermissionsGetter;
+import codeine.servlet.manage_statistics.ManageStatisticsCollector;
 import codeine.utils.ExceptionUtils;
 import codeine.utils.ServletUtils;
 import codeine.utils.exceptions.InShutdownException;

Diff for: src/common/codeine/servlet/ManageStatisticsCollector.java renamed to src/common/codeine/servlet/manage_statistics/ManageStatisticsCollector.java

@@ -1,4 +1,4 @@
-package codeine.servlet;
+package codeine.servlet.manage_statistics;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -23,13 +23,13 @@ public class ManageStatisticsCollector {
 	public synchronized ManageStatisticsInfo getCollected() {
 		List<StringsCommandPair> lastCommands = Lists.newArrayList(lastCommandsInfo.asMap().values());
 		List<StringWithCount> users = Lists.newArrayList(usersInfo.asMap().values());
-		Comparator<StringWithCount> c = new Comparator<ManageStatisticsCollector.StringWithCount>() {
+		Collections.sort(users, new Comparator<ManageStatisticsCollector.StringWithCount>() {
 			@Override
 			public int compare(StringWithCount o1, StringWithCount o2) {
 				return o1.hitCount == o2.hitCount ? o1.value.compareTo(o2.value) : Integer.compare(o2.hitCount, o1.hitCount);
 			}
-		};
-		Collections.sort(users, c);
+		});
+		Collections.sort(lastCommands, new StringsCommandPair.CommandComparator());
 		return new ManageStatisticsInfo(users, lastCommands, activeUsersInfo.asMap().keySet());
 	}
 	public synchronized void userAccess(IUserWithPermissions user, final String pathInfo) {
@@ -40,8 +40,8 @@ public synchronized void userAccess(IUserWithPermissions user, final String path
 			throw ExceptionUtils.asUnchecked(e);
 		}
 	}
-	public synchronized void commandExecuted(String project, String command_name, String command_id) {
-		lastCommandsInfo.put(project + "_" + command_name + "_" + command_id, new StringsCommandPair(project, command_name, command_id));
+	public synchronized void commandExecuted(String project, String command_name, String command_id, long startTime) {
+		lastCommandsInfo.put(project + "_" + command_name + "_" + command_id, new StringsCommandPair(project, command_name, command_id, startTime));
 	}
 	private Callable<StringWithCount> getCallable(final String pathInfo) {
 		Callable<StringWithCount> callable = new Callable<ManageStatisticsCollector.StringWithCount>() {
@@ -60,14 +60,5 @@ public StringWithCount(String pathInfo) {
 		private String value;
 		private int hitCount;
 	}
-	@SuppressWarnings("unused")
-	public static class StringsCommandPair {
-		public StringsCommandPair(String project, String command_name, String command_id) {
-			this.project = project;
-			this.command_name = command_name;
-			this.command_id = command_id;
-		}
-		private String project, command_name, command_id;
-	}
 
 }

Diff for: src/common/codeine/servlet/ManageStatisticsInfo.java renamed to src/common/codeine/servlet/manage_statistics/ManageStatisticsInfo.java

@@ -1,10 +1,9 @@
-package codeine.servlet;
+package codeine.servlet.manage_statistics;
 
 import java.util.List;
 import java.util.Set;
 
-import codeine.servlet.ManageStatisticsCollector.StringWithCount;
-import codeine.servlet.ManageStatisticsCollector.StringsCommandPair;
+import codeine.servlet.manage_statistics.ManageStatisticsCollector.StringWithCount;
 
 @SuppressWarnings("unused")
 public class ManageStatisticsInfo {

Diff for: src/common/codeine/servlet/manage_statistics/StringsCommandPair.java

@@ -0,0 +1,23 @@
+package codeine.servlet.manage_statistics;
+
+import java.util.Comparator;
+
+@SuppressWarnings("unused")
+public class StringsCommandPair {
+	private long startTime;
+	private String project, command_name, command_id;
+	
+	public StringsCommandPair(String project, String command_name, String command_id, long startTime) {
+		this.project = project;
+		this.command_name = command_name;
+		this.command_id = command_id;
+		this.startTime = startTime;
+	}
+	
+	public static class CommandComparator implements Comparator<StringsCommandPair> {
+		@Override
+		public int compare(StringsCommandPair arg0, StringsCommandPair arg1) {
+			return arg0.startTime == arg1.startTime ? 0 : arg0.startTime < arg1.startTime ? 1 : -1;
+		}
+	}
+}

Diff for: src/web_server/codeine/WebServerModule.java

@@ -8,9 +8,9 @@
 import codeine.permissions.GroupsManager;
 import codeine.permissions.PluginGroupsManager;
 import codeine.plugins.DiscardOldCommandsPlugin;
-import codeine.servlet.ManageStatisticsCollector;
 import codeine.servlet.PrepareForShutdown;
 import codeine.servlet.UsersManager;
+import codeine.servlet.manage_statistics.ManageStatisticsCollector;
 import codeine.statistics.IMonitorStatistics;
 import codeine.statistics.MonitorsStatisticsProvider;
 

Diff for: src/web_server/codeine/servlets/api_servlets/NodesCommandApiServlet.java

@@ -66,7 +66,7 @@ protected void myPost(HttpServletRequest request, HttpServletResponse response)
 		commandData.command_info().overrideByConfiguration(configuredCommand);
 		updateNodes(commandData, projectName);
 		long dir = allNodesCommandExecuterProvider.createExecutor().executeOnAllNodes(permissionsManager.user(request), commandData, project);
-		manageStatisticsCollector().commandExecuted(projectName, command_name, String.valueOf(dir));
+		manageStatisticsCollector().commandExecuted(projectName, command_name, String.valueOf(dir), System.currentTimeMillis());
 		writeResponseJson(response, dir);
 	}
 

Diff for: src/web_server/codeine/servlets/api_servlets/angular/ManageStatisticsInfoApiServlet.java

@@ -5,8 +5,8 @@
 import javax.servlet.http.HttpServletResponse;
 
 import codeine.servlet.AbstractApiServlet;
-import codeine.servlet.ManageStatisticsCollector;
-import codeine.servlet.ManageStatisticsInfo;
+import codeine.servlet.manage_statistics.ManageStatisticsCollector;
+import codeine.servlet.manage_statistics.ManageStatisticsInfo;
 
 public class ManageStatisticsInfoApiServlet extends AbstractApiServlet {
 

Diff for: test/codeine/servlet/manage_statistics/StringsCommandPairTest.java

@@ -0,0 +1,23 @@
+package codeine.servlet.manage_statistics;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.google.common.collect.Lists;
+
+public class StringsCommandPairTest {
+
+	@Test
+	public void testSortOrder() {
+		StringsCommandPair before = new StringsCommandPair(null, null, null, 1);
+		StringsCommandPair after = new StringsCommandPair(null, null, null, 2);
+		List<StringsCommandPair> list = Lists.newArrayList(before, after);
+		Collections.sort(list, new StringsCommandPair.CommandComparator());
+		assertEquals(Lists.newArrayList(after, before), list);
+	}
+
+}