From aec6bd6c04471b689731ecd01168984c648d1225 Mon Sep 17 00:00:00 2001 From: anhefti Date: Thu, 18 Jan 2024 08:46:47 +0100 Subject: [PATCH] SEBSERV-456 and FeatureService deprecation --- src/main/java/ch/ethz/seb/sebserver/gbl/FeatureService.java | 2 ++ src/main/java/ch/ethz/seb/sebserver/gbl/FeatureServiceImpl.java | 2 ++ .../ethz/seb/sebserver/gbl/model/sebconfig/SEBClientConfig.java | 2 +- .../servicelayer/dao/impl/SEBClientConfigDAOImpl.java | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/FeatureService.java b/src/main/java/ch/ethz/seb/sebserver/gbl/FeatureService.java index 6983e04a..6e67ec20 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/FeatureService.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/FeatureService.java @@ -12,6 +12,8 @@ import ch.ethz.seb.sebserver.gbl.model.exam.CollectingStrategy; import ch.ethz.seb.sebserver.gbl.model.exam.ProctoringServiceSettings.ProctoringServerType; import ch.ethz.seb.sebserver.gbl.model.institution.LmsSetup.LmsType; +@Deprecated // we need another more flexible feature service that also take new User Role and Privileges into account + // SEBSERV-497 public interface FeatureService { String FEATURE_SETTINGS_PREFIX = "sebserver.feature."; diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/FeatureServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/gbl/FeatureServiceImpl.java index 8e4a59c0..e364f9c7 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/FeatureServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/FeatureServiceImpl.java @@ -20,6 +20,8 @@ import ch.ethz.seb.sebserver.gbl.profile.WebServiceProfile; @Lazy @Service @WebServiceProfile +@Deprecated // we need another more flexible feature service that also take new User Role and Privileges into account +// SEBSERV-497 public class FeatureServiceImpl implements FeatureService { private final Environment environment; diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/sebconfig/SEBClientConfig.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/sebconfig/SEBClientConfig.java index 3f3b26ab..890fb6a0 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/sebconfig/SEBClientConfig.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/sebconfig/SEBClientConfig.java @@ -511,7 +511,7 @@ public final class SEBClientConfig implements GrantEntity, Activatable { null, institutionId, null, - ConfigPurpose.CONFIGURE_CLIENT, + ConfigPurpose.START_EXAM, pingIterval, VDIType.NO, null, diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/SEBClientConfigDAOImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/SEBClientConfigDAOImpl.java index 8964a33c..428e4756 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/SEBClientConfigDAOImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/SEBClientConfigDAOImpl.java @@ -532,7 +532,7 @@ public class SEBClientConfigDAOImpl implements SEBClientConfigDAO { SEBClientConfig.ATTR_CONFIG_PURPOSE, (sebClientConfig.configPurpose != null) ? sebClientConfig.configPurpose.name() - : ConfigPurpose.CONFIGURE_CLIENT.name()); + : ConfigPurpose.START_EXAM.name()); this.additionalAttributesDAO.saveAdditionalAttribute( EntityType.SEB_CLIENT_CONFIGURATION,