zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBSERV-240 fixed

Browse source
This commit is contained in:
anhefti 2022-05-19 13:53:46 +02:00
parent 9416ffbb5b
commit c342dcdbdd
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ClientConnectionController.java
View file

@ -20,6 +20,7 @@ import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.mybatis.dynamic.sql.SqlTable; import org.mybatis.dynamic.sql.SqlTable;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
@ -290,16 +291,13 @@ public class ClientConnectionController extends ReadonlyEntityController<ClientC
public int compare(final ClientConnection cc1, final ClientConnection cc2) { public int compare(final ClientConnection cc1, final ClientConnection cc2) {
int result = 0; int result = 0;
if (Domain.CLIENT_CONNECTION.ATTR_EXAM_USER_SESSION_ID.equals(this.sortColumn)) { if (Domain.CLIENT_CONNECTION.ATTR_EXAM_USER_SESSION_ID.equals(this.sortColumn)) {
result = cc1.userSessionId result = ObjectUtils.compare(cc1.userSessionId, cc2.userSessionId);
.compareTo(cc2.userSessionId);
} else if (ClientConnection.ATTR_INFO.equals(this.sortColumn)) { } else if (ClientConnection.ATTR_INFO.equals(this.sortColumn)) {
result = cc1.getInfo().compareTo(cc2.getInfo()); result = ObjectUtils.compare(cc1.getInfo(), cc2.getInfo());
} else if (Domain.CLIENT_CONNECTION.ATTR_STATUS.equals(this.sortColumn)) { } else if (Domain.CLIENT_CONNECTION.ATTR_STATUS.equals(this.sortColumn)) {
result = cc1.getStatus() result = ObjectUtils.compare(cc1.getStatus(), cc2.getStatus());
.compareTo(cc2.getStatus());
} else { } else {
result = cc1.userSessionId result = ObjectUtils.compare(cc1.userSessionId, cc2.userSessionId);
.compareTo(cc2.userSessionId);
} }
return (this.descending) ? -result : result; return (this.descending) ? -result : result;
} }