From 2c0bcc25aa59b9bfc3a1dca81b70444857902d86 Mon Sep 17 00:00:00 2001 From: anhefti Date: Wed, 8 Feb 2023 09:11:05 +0100 Subject: [PATCH] code cleanup --- .../gbl/model/session/ClientConnection.java | 25 ++++++++----------- .../gui/service/ResourceService.java | 1 - 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientConnection.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientConnection.java index f7117b1d..c426e18c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientConnection.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientConnection.java @@ -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; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java index 7c1e8e3f..337b9720 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java @@ -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> RESOURCE_COMPARATOR = Comparator.comparing(t -> t._2); public static final Comparator> RESOURCE_COMPARATOR_TUPLE_3 = Comparator.comparing(t -> t._2);