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

code cleanup

Browse source
This commit is contained in:
anhefti 2023-02-08 09:11:05 +01:00
parent 99b26e52d1
commit 2c0bcc25aa
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientConnection.java
View file

@ -108,16 +108,15 @@ public final class ClientConnection implements GrantEntity {
@JsonProperty(Domain.CLIENT_CONNECTION.ATTR_CLIENT_VERSION_GRANTED)
public final Boolean clientVersionGranted;
@JsonIgnore // not used yet on GUI side
//@JsonProperty(Domain.CLIENT_CONNECTION.ATTR_VDI)
public final Boolean vdi;
@JsonIgnore // not used yet on GUI side
//@JsonProperty(Domain.CLIENT_CONNECTION.ATTR_VDI_PAIR_TOKEN)
public final String vdiPairToken;
//@JsonIgnore
@JsonProperty(Domain.CLIENT_CONNECTION.ATTR_CLIENT_ADDRESS)
public final String clientAddress;
@JsonProperty(Domain.CLIENT_CONNECTION.ATTR_CLIENT_OS_NAME)
public final String sebOSName;
@JsonProperty(Domain.CLIENT_CONNECTION.ATTR_CLIENT_VERSION)
public final String sebVersion;
@JsonIgnore
public final Long remoteProctoringRoomId;
@JsonIgnore
@ -128,14 +127,12 @@ public final class ClientConnection implements GrantEntity {
public final Long updateTime;
@JsonIgnore
public final Boolean remoteProctoringRoomUpdate;
//@JsonIgnore
@JsonProperty(Domain.CLIENT_CONNECTION.ATTR_CLIENT_OS_NAME)
public final String sebOSName;
@JsonIgnore // not used yet on GUI side
public final Boolean vdi;
@JsonIgnore // not used yet on GUI side
public final String vdiPairToken;
@JsonIgnore
public final String sebMachineName;
//@JsonIgnore
@JsonProperty(Domain.CLIENT_CONNECTION.ATTR_CLIENT_VERSION)
public final String sebVersion;
@JsonIgnore
public final String ask;

1
src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java
View file

@ -100,7 +100,6 @@ public class ResourceService {
private static final String MISSING_CLIENT_PING_NAME_KEY = "MISSING_PING";
private static final String DENIED_CLIENT_SEC_GRANT_NAME_KEY = "GRANT_DENIED";
private static final String MISSING_CLIENT_SEC_GRANT_NAME_KEY = "MISSING_GRANT";
private static final String DENIED_CLIENT_SEB_VERSION_NAME_KEY = "SEB_VERSION_DENIED";
public static final Comparator<Tuple<String>> RESOURCE_COMPARATOR = Comparator.comparing(t -> t._2);
public static final Comparator<Tuple3<String>> RESOURCE_COMPARATOR_TUPLE_3 = Comparator.comparing(t -> t._2);